Upgrade to FPC 3.2.0, add FPCVersion to our version string. Closes #66.

dss-extensions · Jul 5, 2020 · bbb6be5 · bbb6be5
1 parent b07c546
commit bbb6be5
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,7 @@ matrix:
       os: linux
       sudo: required
       env: 
-        - DOCKER_IMAGE=pmeira/manylinux_wheel_cmake_fpc
+        - DOCKER_IMAGE=pmeira/manylinux_wheel_cmake_fpc320
         - KLUSOLVE_URL=https://github.com/dss-extensions/klusolve/releases/download/1.1.0a2/klusolve_1.1.0a2_linux_x64.tar.gz
       services:
         - docker
@@ -23,7 +23,7 @@ matrix:
       os: linux
       sudo: required
       env: 
-        - DOCKER_IMAGE=pmeira/manylinux_wheel_cmake_fpc_i686
+        - DOCKER_IMAGE=pmeira/manylinux_wheel_cmake_fpc320_i686
         - KLUSOLVE_URL=https://github.com/dss-extensions/klusolve/releases/download/1.1.0a2/klusolve_1.1.0a2_linux_x86.tar.gz
       services:
         - docker
@@ -42,9 +42,9 @@ matrix:
         - KLUSOLVE_URL=https://github.com/dss-extensions/klusolve/releases/download/1.1.0a2/klusolve_1.1.0a2_darwin_x64.tar.gz
       before_install:
         - |
-          wget https://sourceforge.net/projects/freepascal/files/Mac%20OS%20X/3.0.4/fpc-3.0.4a.intel-macosx.dmg/download -Ofpc.dmg -q
+          wget https://sourceforge.net/projects/freepascal/files/Mac%20OS%20X/3.2.0/fpc-3.2.0.intel-macosx.dmg/download -Ofpc.dmg -q
           sudo hdiutil attach fpc.dmg
-          sudo installer -package /Volumes/fpc-3.0.4a.intel-macosx/fpc-3.0.4a.intel-macosx.pkg -target /
+          sudo installer -package /Volumes/fpc-3.2.0.intel-macosx/fpc-3.2.0-intel-macosx.pkg -target /
       install: true
       script: 
         - wget "${KLUSOLVE_URL}" -Oklusolve.tar.gz -q

diff --git a/Version7/Source/Common/DSSGlobals.pas b/Version7/Source/Common/DSSGlobals.pas
@@ -662,6 +662,8 @@ function GetOutputDirectory:String;
     {$IFDEF DSS_CAPI_MVMULT}
               + ' MVMULT'
     {$ENDIF}
+              + '  [FPC ' + {$include %FPCVersion%} + ']'
+
               ;
 END;
 {$ELSE}

diff --git a/appveyor.yml b/appveyor.yml
@@ -4,21 +4,25 @@ build_script:
 - cmd: >-
     "c:\Program Files\Git\bin\bash" -c "bash ./make_metadata.sh"
 
-    appveyor downloadfile https://sourceforge.net/projects/dss-capi/files/FPC/FPC-win32-win64-3.0.4.7z/download -FileName FPC-win32-win64-3.0.4.7z
+    appveyor downloadfile https://sourceforge.net/projects/freepascal/files/Win32/3.2.0/fpc-3.2.0.i386-win32.exe/download -FileName fpc-3.2.0.i386-win32.exe
+    
+    appveyor downloadfile https://sourceforge.net/projects/freepascal/files/Win32/3.2.0/fpc-3.2.0.i386-win32.cross.x86_64-win64.exe/download -FileName fpc-3.2.0.i386-win32.cross.x86_64-win64.exe
 
     appveyor downloadfile https://github.com/dss-extensions/klusolve/releases/download/1.1.0a2/klusolve_1.1.0a2_win_x86-msvc2017.zip -FileName klusolve_x86.zip
     
     appveyor downloadfile https://github.com/dss-extensions/klusolve/releases/download/1.1.0a2/klusolve_1.1.0a2_win_x64-gcc8.1.zip -FileName klusolve_x64.zip
 
-    7z x -oC:\ FPC-win32-win64-3.0.4.7z
+    fpc-3.2.0.i386-win32.exe /VERYSILENT
+    
+    fpc-3.2.0.i386-win32.cross.x86_64-win64.exe /VERYSILENT
 
     7z x -y -oC:\dss_capi\ klusolve_x86.zip
 
     7z x -y -oC:\dss_capi\ klusolve_x64.zip
     
     xcopy /E c:\dss_capi\klusolve\lib c:\dss_capi\lib
 
-    set PATH=%PATH%;C:\FPC\3.0.4\bin\i386-win32
+    set PATH=%PATH%;C:\FPC\3.2.0\bin\i386-win32
     
     set PATH=%PATH%;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin
 

diff --git a/build_win_x64.bat b/build_win_x64.bat
@@ -3,8 +3,8 @@
 
 where /q fpc
 if errorlevel 1 (
-    if exist c:\lazarus\fpc\3.0.4\bin\x86_64-win64\fpc.exe (
-        set "PATH=%PATH%;c:\lazarus\fpc\3.0.4\bin\x86_64-win64"
+    if exist c:\lazarus\fpc\3.2.0\bin\x86_64-win64\fpc.exe (
+        set "PATH=%PATH%;c:\lazarus\fpc\3.2.0\bin\x86_64-win64"
     ) else (
         echo ERROR: Please put fpc.exe in your executable search path and try again.
         exit /B 1

diff --git a/build_win_x86.bat b/build_win_x86.bat
@@ -3,8 +3,8 @@
 
 where /q fpc
 if errorlevel 1 (
-    if exist c:\lazarus\fpc\3.0.4\bin\i386-win32\fpc.exe (
-        set "PATH=%PATH%;c:\lazarus\fpc\3.0.4\bin\i386-win32"
+    if exist c:\lazarus\fpc\3.2.0\bin\i386-win32\fpc.exe (
+        set "PATH=%PATH%;c:\lazarus\fpc\3.2.0\bin\i386-win32"
     ) else (
         echo ERROR: Please put fpc.exe in your executable search path and try again.
         exit /B 1

diff --git a/src/v7/darwin-x64.cfg b/src/v7/darwin-x64.cfg
@@ -21,6 +21,7 @@
 -k-Llib/darwin_x64
 -FElib/darwin_x64
 -Scghi
+-CF64
 -Cg
 -O3
 -l 

diff --git a/src/v7/linux-x64.cfg b/src/v7/linux-x64.cfg
@@ -20,6 +20,7 @@
 -Fllib/linux_x64
 -FElib/linux_x64
 -Scghi
+-CF64
 -Cg
 -O3
 -l 

diff --git a/src/v7/linux-x86.cfg b/src/v7/linux-x86.cfg
@@ -20,6 +20,7 @@
 -Fllib/linux_x86
 -FElib/linux_x86
 -Scghi
+-CF64
 -Cg
 -O3
 -l 

diff --git a/src/v7/windows-x64.cfg b/src/v7/windows-x64.cfg
@@ -20,6 +20,7 @@
 -Fllib/win_x64
 -FElib/win_x64
 -Scghi
+-CF64
 -Ct
 -O3
 -l 

diff --git a/src/v7/windows-x86.cfg b/src/v7/windows-x86.cfg
@@ -20,6 +20,7 @@
 -Fllib/win_x86
 -FElib/win_x86
 -Scghi
+-CF64
 -Ct
 -O3
 -l
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,6 +21,7 @@ @@
     -k-Llib/darwin_x64
     -FElib/darwin_x64
     -Scghi
+    -CF64
     -Cg
     -O3
     -l
@@ Expand Down @@