Changeset 172 for trunk

Timestamp:

Aug 20, 2024, 8:58:56 PM (3 months ago)

Author:

chronos

Message:

• Modified: Updated flatpak.
• Modified: fgl unit usage replaced by Generics.Collections.
• Modified: Updated snap file.

Location:

trunk

Files:

• Install/flatpak (modified) (1 prop)
• Install/flatpak/net.zdechov.app.lazfuck.appdata.xml (modified) (1 diff)
• Install/flatpak/net.zdechov.app.lazfuck.desktop (modified) (1 diff)
• Install/flatpak/net.zdechov.app.lazfuck.yml (modified) (1 diff)
• Install/snap/local/build.sh (modified) (1 diff)
• Install/snap/snapcraft.yaml (modified) (5 diffs)
• Project.pas (modified) (2 diffs)
• Target.pas (modified) (5 diffs)

trunk/Install/flatpak/net.zdechov.app.lazfuck.appdata.xml

@@ -4 +4 @@
 
   <name>2048</name>
-  <summary>Simple BrainFuck IDE.</summary>
+  <summary>Simple BrainFuck IDE</summary>
   <developer_name>Chronos</developer_name>
 

trunk/Install/flatpak/net.zdechov.app.lazfuck.desktop

@@ -4 +4 @@
 Comment=A simple BrainFuck IDE written in Lazarus/FPC.
 Exec=LazFuck
-Icon=LazFuck
+Icon=net.zdechov.app.lazfuck.png
 Terminal=false
 Type=Application

trunk/Install/flatpak/net.zdechov.app.lazfuck.yml

@@ -25 +25 @@
       - type: svn
         url: https://svn.zdechov.net/LazFuck/trunk
-        revision: r169
+        revision: r171
     buildsystem: simple
     build-commands:

trunk/Install/snap/local/build.sh

@@ -4 +4 @@
 
 pushd ../../..
-snapcraft --debug --use-lxd
+snapcraft --debug --use-lxd --verbose $@
 popd
 

trunk/Install/snap/snapcraft.yaml

@@ -4 +4 @@
 summary: A simple BrainFuck IDE written in Lazarus/FPC.
 description: |
-  LazFuck is GUI application for writing, executing, compiling and debugging programs written in famous BrainFuck esoteric programming language. 
-  
+  LazFuck is GUI application for writing, executing, compiling and debugging programs written in famous BrainFuck esoteric programming language.
+
   Features:
   * Graphical code editor with color syntax highlighting
@@ -33 +33 @@
       install -s -m 755 LazFuck $SNAPCRAFT_PART_INSTALL/usr/bin/LazFuck
       install -d -m 755 $SNAPCRAFT_PART_INSTALL/usr/share/LazFuck/Languages
-      install -m 644 Languages/LazFuck.pot $SNAPCRAFT_PART_INSTALL/usr/share/LazFuck/Languages
-      install -m 644 Languages/LazFuck.cs.po $SNAPCRAFT_PART_INSTALL/usr/share/LazFuck/Languages
-      install -m 644 Languages/UFormAbout.pot $SNAPCRAFT_PART_INSTALL/usr/share/LazFuck/Languages
-      install -m 644 Languages/UFormAbout.cs.po $SNAPCRAFT_PART_INSTALL/usr/share/LazFuck/Languages
+      install -m 644 Languages/*.po $SNAPCRAFT_PART_INSTALL/usr/share/LazFuck/Languages
+      install -m 644 Packages/Common/Languages/*.po $SNAPCRAFT_PART_INSTALL/usr/share/LazFuck/Languages
       install -d -m 755 $SNAPCRAFT_PART_INSTALL/usr/share/applications
       install -m 755 Install/snap/local/LazFuck.desktop $SNAPCRAFT_PART_INSTALL/usr/share/applications
@@ -46 +44 @@
     after:
     - desktop-gtk2
+    - lazarus
     stage:
     - etc
@@ -86 +85 @@
     - libxrandr2
     - libxrender1
+  lazarus:
+    plugin: nil
+    source: .
+    source-type: local
+    build-packages:
+    - wget
+    - libgtk2.0-dev
+    override-build: |
+      wget -nc https://downloads.sourceforge.net/project/lazarus/Lazarus%20Linux%20amd64%20DEB/Lazarus%203.4/lazarus-project_3.4.0-0_amd64.deb
+      wget -nc https://downloads.sourceforge.net/project/lazarus/Lazarus%20Linux%20amd64%20DEB/Lazarus%203.4/fpc-laz_3.2.2-210709_amd64.deb
+      wget -nc https://downloads.sourceforge.net/project/lazarus/Lazarus%20Linux%20amd64%20DEB/Lazarus%203.4/fpc-src_3.2.2-210709_amd64.deb
+      apt install ./lazarus-project_3.4.0-0_amd64.deb ./fpc-laz_3.2.2-210709_amd64.deb ./fpc-src_3.2.2-210709_amd64.deb
+    stage: [-*]
+    prime: [-*]
 
   desktop-gtk2:
@@ -115 +128 @@
 
 # Additional plugs to pick up the GTK theme and icons from the system
-plugs: 
+plugs:
   icon-themes:
     interface: content

trunk/Project.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, fgl;
+  Classes, SysUtils, Generics.Collections;
 
 type
@@ -11 +11 @@
   end;
 
-  TProjectItems = class(TFPGObjectList<TProjectItem>)
+  TProjectItems = class(TObjectList<TProjectItem>)
   end;
 

trunk/Target.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, StrUtils, Registry, RegistryEx, fgl, Dialogs,
-  FileUtil, Process, Menus, LazFileUtils;
+  Classes, SysUtils, StrUtils, Registry, RegistryEx, Generics.Collections,
+  Dialogs, FileUtil, Process, Menus, LazFileUtils;
 
 type
@@ -27 +27 @@
   { TDebugSteps }
 
-  TDebugSteps = class(TFPGObjectList<TDebugStep>)
+  TDebugSteps = class(TObjectList<TDebugStep>)
     function SearchBySourcePos(Pos: Integer): TDebugStep;
     function SearchByProgramPos(Pos: Integer): TDebugStep;
@@ -44 +44 @@
   { TBreakPoints }
 
-  TBreakPoints = class(TFPGObjectList<TBreakPoint>)
+  TBreakPoints = class(TObjectList<TBreakPoint>)
     procedure AddItem(TargetAddress: Integer);
     procedure SetSystem(TargetAddress: Integer);
@@ -59 +59 @@
   { TMessages }
 
-  TMessages = class(TFPGObjectList<TMessage>)
+  TMessages = class(TObjectList<TMessage>)
   private
     FOnChange: TNotifyEvent;
@@ -148 +148 @@
   { TTargets }
 
-  TTargets = class(TFPGObjectList<TTarget>)
+  TTargets = class(TObjectList<TTarget>)
     procedure LoadFromRegistry(Context: TRegistryContext);
     procedure SaveToRegistry(Context: TRegistryContext);