dev

ollydev · ollydev · commit 960117fef78d · 2025-12-21T17:31:19.000Z
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,4 +1,4 @@
-﻿name: build
+name: build
 
 on: 
   push:
@@ -19,116 +19,77 @@ jobs:
       fail-fast: false
       matrix:
         config:         
-          # note: names must equal Simba build modes   
-          - name: Win64 
-            runs-on: windows-latest
-            binary: Simba-Win64.exe
-            test: Simba-Win64.exe
-          
-          - name: Win64 DebugInfo
-            runs-on: windows-latest
-            binary: Simba-Win64-Debug.exe
-            test: Simba-Win64-Debug.exe
+          - name: Mac Custom
+            runs-on: macos-15-intel
+            build-mode: Mac
+            binary: Simba-Mac.dmg
+            url: https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0g/fpclazup-x86_64-darwin
 
-          - name: Win32
-            runs-on: windows-latest
-            binary: Simba-Win32.exe
-            test: Simba-Win32.exe
+          - name: Mac arm64
+            runs-on: macos-26
+            build-mode: Mac Arm
+            binary: Simba-Mac-Arm.dmg  
+            url: https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0g/fpclazup-aarch64-darwin
 
-          - name: Linux
-            runs-on: ubuntu-22.04
-            binary: Simba-Linux64
-            test: Simba-Linux64
-          
-          - name: Linux Arm
-            runs-on: ubuntu-22.04-arm
-            binary: Simba-Linux
-            #test: Simba-Linux MatchTemplateMask test fails, investigate later
-
-          - name: Mac Arm
-            runs-on: macos-14
-            binary: Simba-Mac-Arm.dmg
-            #test: Simba MatchTemplateMask test fails, investigate later
-
-            # GitHub removing macos 13 causes this problem on newer runners:   
-            #  "non-private labels cannot appear between .cfi_startproc / .cfi_endproc pairs"  
-            #  Fixed in new FPC but that will never release... (sort of like this project xD)
-            #  Just comment out since x86 macos is quickly not existent in the year of 2025.
-            # - name: Mac
-            #   runs-on: macos-13
-            #   binary: Simba-Mac.dmg
-            
     steps:
       - uses: actions/checkout@v6.0.1
         with: 
           submodules: true
 
-      - name: Install Lazarus (Mac Arm)
-        if: matrix.config.name == 'Mac Arm'
-        uses: ollydev/setup-lazarus@v3.6
+      - name: Restore
+        id: restore-cache
+        uses: actions/cache/restore@v4
         with:
-          laz-url: https://sourceforge.net/projects/lazarus/files/Lazarus%20macOS%20aarch64/Lazarus%204.4/lazarus-darwin-aarch64-4.4.zip
-          fpc-url: |
-            https://sourceforge.net/projects/lazarus/files/Lazarus%20macOS%20aarch64/Lazarus%204.4/fpc-3.2.2.intelarm64-macosx.dmg
+          path: ${{ runner.temp }}/fpclazup
+          key: ${{ matrix.config.name }}
 
-      - name: Install Lazarus (Linux)
-        if: matrix.config.name == 'Linux'
-        uses: ollydev/setup-lazarus@v3.6
-        with:
-          laz-url: https://sourceforge.net/projects/lazarus/files/Lazarus%20Linux%20amd64%20DEB/Lazarus%204.4/lazarus-project_4.4.0-0_amd64.deb
-          fpc-url: |
-            https://sourceforge.net/projects/lazarus/files/Lazarus%20Linux%20amd64%20DEB/Lazarus%204.4/fpc-laz_3.2.2-210709_amd64.deb
-            https://sourceforge.net/projects/lazarus/files/Lazarus%20Linux%20amd64%20DEB/Lazarus%204.4/fpc-src_3.2.2-210709_amd64.deb
-            
-      - name: Install Lazarus (Linux Arm)
-        if: matrix.config.name == 'Linux Arm'
-        uses: ollydev/setup-lazarus@v3.6
-        with:
-          laz-url: https://sourceforge.net/projects/lazarus/files/Lazarus%20Linux%20arm64%20DEB/Lazarus%204.4/lazarus-project_4.4.0-0_arm64.deb
-          fpc-url: |
-            https://sourceforge.net/projects/lazarus/files/Lazarus%20Linux%20arm64%20DEB/Lazarus%204.4/fpc-laz_3.2.3-240813_arm64.deb
-            https://sourceforge.net/projects/lazarus/files/Lazarus%20Linux%20arm64%20DEB/Lazarus%204.4/fpc-src_3.2.3-240813_arm64.deb
+      - name: Install Lazarus
+        working-directory: ${{ runner.temp }}
+        if: steps.restore-cache.outputs.cache-hit != 'true'
+        run: |
+          curl --retry 5 -L -o installer ${{ matrix.config.url }}
+          chmod +x installer  
+          ./installer --lazOPT="-g -gl -gw2 -O1" --fpcOPT="-g -gl -gw2 -O1" --only=docker --lazVersion="stable.gitlab" --fpcVersion="trunk.gitlab" --installdir=fpclazup --noconfirm --verbose
 
-      - name: Install Lazarus (Win32)
-        if: startsWith(matrix.config.name, 'Win32') == true
-        uses: ollydev/setup-lazarus@v3.6
-        with:
-          laz-url: https://sourceforge.net/projects/lazarus/files/Lazarus%20Windows%2032%20bits/Lazarus%204.4/lazarus-4.4-fpc-3.2.2-win32.exe
+          #git clone https://gitlab.com/freepascal.org/fpc/source fpclazup/fpc
+          # Use a known working trunk commit   
+          #git -C fpclazup/fpc checkout de30ac10d4f228c5d4915c49d48715063ea55787 
+          #./installer --lazOPT="-g -gl -gw -O1" --fpcOPT="-g -gl -gw -O1" --only=FPCBuildOnly,LazarusGetOnly,LazBuild,LazarusConfigOnly --lazVersion="stable.gitlab" --installdir=fpclazup --noconfirm --verbose
+        
+      - name: Add custom to path
+        run: |
+          echo "${{ runner.temp }}/fpclazup/lazarus/" >> $GITHUB_PATH
 
-      - name: Install Lazarus (Win64)
-        if: startsWith(matrix.config.name, 'Win64') == true
-        uses: ollydev/setup-lazarus@v3.6
+      - name: Save Lazarus
+        if: steps.restore-cache.outputs.cache-hit != 'true'
+        uses: actions/cache/save@v4
         with:
-          laz-url: https://sourceforge.net/projects/lazarus/files/Lazarus%20Windows%2064%20bits/Lazarus%204.4/lazarus-4.4-fpc-3.2.2-win64.exe
+          path: ${{ runner.temp }}/fpclazup
+          key: ${{ matrix.config.name }}
 
       - name: Build Simba
         run: |
+          echo "${{ matrix.config.build-mode }}"
           export GITHUB_SHORT_SHA=$(git rev-parse --short HEAD)
-          lazbuild --build-mode="${{ matrix.config.name }}" "Source/Simba.lpi"
+          lazbuild --build-mode="${{ matrix.config.build-mode }}" "Source/Simba.lpi"
+
+      - name: Debug
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: debug
+          path: build/Mac Arm
 
       - name: Create Mac Image
-        if: startsWith(matrix.config.name, 'Mac') == true
         run: |
           brew install create-dmg
-          
           for i in {1..10}; 
           do 
             create-dmg --window-size 500 330 --icon-size 48 --icon "Simba.app" 130 135 --app-drop-link 380 135 --background "Source/macosbundle/installer.tff" "${{ matrix.config.binary }}" "Simba.app" && break || sleep 15; 
           done
 
-      - name: Test Simba
-        if: matrix.config.test != ''
-        run: |
-          if [[ "${{ matrix.config.runs-on }}" == ubuntu* ]]; then
-              export DISPLAY=:1
-              Xvfb :1 & sleep 2
-          fi
-          
-          chmod +x ${{ matrix.config.test }}
-          ./${{ matrix.config.test }} --run "Tests/RunTests/tester.simba"
-          
       - name: Upload Simba Binary 
         uses: actions/upload-artifact@v6.0.0
         with:
           name: ${{ matrix.config.name }}
-          path: ${{ matrix.config.binary }}
+          path: ${{ matrix.config.binary }}    
diff --git a/Source/Simba.lpi b/Source/Simba.lpi
@@ -27,11 +27,11 @@
         <Resource_6 FileName="..\Examples\image_drawtext.simba" Type="RCDATA" ResourceName="EXAMPLE_IMAGE_DRAW_TEXT"/>
         <Resource_7 FileName="..\Examples\cluster_points.simba" Type="RCDATA" ResourceName="EXAMPLE_CLUSTER_POINTS"/>
         <Resource_8 FileName="..\Examples\form.simba" Type="RCDATA" ResourceName="EXAMPLE_FORM"/>
-        <Resource_9 FileName="..\Examples\form_dragablepanel.simba" Type="RCDATA" ResourceName="EXAMPLE_FORM_DRAGABLE_PANEL"/>  
-        <Resource_10 FileName="..\Examples\form_imagebox.simba" Type="RCDATA" ResourceName="EXAMPLE_FORM_IMAGEBOX"/>     
+        <Resource_9 FileName="..\Examples\form_dragablepanel.simba" Type="RCDATA" ResourceName="EXAMPLE_FORM_DRAGABLE_PANEL"/>
+        <Resource_10 FileName="..\Examples\form_imagebox.simba" Type="RCDATA" ResourceName="EXAMPLE_FORM_IMAGEBOX"/>
         <Resource_11 FileName="..\Examples\irc.simba" Type="RCDATA" ResourceName="EXAMPLE_IRC"/>
         <Resource_12 FileName="..\Examples\asyncmouse.simba" Type="RCDATA" ResourceName="EXAMPLE_ASYNCMOUSE"/>
-        <Resource_13 FileName="..\Examples\mouse_path.simba" Type="RCDATA" ResourceName="MOUSE_PATH"/>           
+        <Resource_13 FileName="..\Examples\mouse_path.simba" Type="RCDATA" ResourceName="MOUSE_PATH"/>
         <Resource_14 FileName="..\Examples\randomleft.simba" Type="RCDATA" ResourceName="EXAMPLE_RANDOM_LEFT"/>
         <Resource_15 FileName="..\Examples\method-property.simba" Type="RCDATA" ResourceName="EXAMPLE_METHOD_PROPERTY"/>
         <Resource_16 FileName="..\Examples\method-property-index.simba" Type="RCDATA" ResourceName="EXAMPLE_METHOD_PROPERTY_INDEX"/>
@@ -352,20 +352,15 @@
             </SyntaxOptions>
           </Parsing>
           <CodeGeneration>
-            <SmartLinkUnit Value="True"/>
             <TargetCPU Value="x86_64"/>
             <TargetOS Value="darwin"/>
-            <Optimizations>
-              <OptimizationLevel Value="3"/>
-            </Optimizations>
           </CodeGeneration>
           <Linking>
             <Debugging>
               <GenerateDebugInfo Value="False"/>
               <DebugInfoType Value="dsDwarf2Set"/>
               <StripSymbols Value="True"/>
             </Debugging>
-            <LinkSmart Value="True"/>
             <Options>
               <Win32>
                 <GraphicApplication Value="True"/>
@@ -405,20 +400,14 @@
             </SyntaxOptions>
           </Parsing>
           <CodeGeneration>
-            <SmartLinkUnit Value="True"/>
             <TargetCPU Value="aarch64"/>
             <TargetOS Value="darwin"/>
-            <Optimizations>
-              <OptimizationLevel Value="3"/>
-            </Optimizations>
           </CodeGeneration>
           <Linking>
             <Debugging>
               <GenerateDebugInfo Value="False"/>
               <DebugInfoType Value="dsDwarf2Set"/>
-              <StripSymbols Value="True"/>
             </Debugging>
-            <LinkSmart Value="True"/>
             <Options>
               <Win32>
                 <GraphicApplication Value="True"/>
diff --git a/Source/ide/codetools/simba.ide_codetools_base.pas b/Source/ide/codetools/simba.ide_codetools_base.pas
@@ -10,15 +10,15 @@
 interface
 
 uses
-  Classes, SysUtils,
-  simba.base;
+  Classes, SysUtils;
 
 type
   // "Perfect Hashing"
   // A hashtable with no collisions.
   generic TKeywordDictionary<_T> = class(TObject)
-  type
-    TBucketArray = array of record Key: String; Value: _T; end;
+  public type
+    TBucket = record Key: String; Value: _T; end;
+    TBucketArray = array of TBucket;
   protected
     FBuckets: TBucketArray;
     FSeed: UInt32;
diff --git a/Source/simba.fftpack4.pas b/Source/simba.fftpack4.pas
@@ -16,10 +16,6 @@
 [==============================================================================}
 {$i simba.inc}
 
-{$IFOPT D-}
-  {$OPTIMIZATION LEVEL4}
-{$ENDIF}
-
 {$MODESWITCH ARRAYOPERATORS OFF}
 
 interface
diff --git a/Source/simba.fftpack4_core.pas b/Source/simba.fftpack4_core.pas
@@ -10,10 +10,6 @@
 [==============================================================================}
 {$i simba.inc}
 
-{$IFOPT D-}
-  {$OPTIMIZATION LEVEL4}
-{$ENDIF}
-
 {$MODESWITCH ARRAYOPERATORS OFF}
 
 interface
diff --git a/Third-Party/lape b/Third-Party/lape
@@ -1 +1 @@
-Subproject commit b5114d7bf1d2e3f8b3d816b19631b9eafbd1fa6b
+Subproject commit d19c367021416fe8a0d7022f69b8cd7b50360057
