Build in Win 64

markmal · Jun 10, 2024 · 29747d0 · 29747d0
1 parent 2db3e04
commit 29747d0
Show file tree

Hide file tree

Showing 19 changed files with 64,700 additions and 8,962 deletions.
diff --git a/FreeShip.lpi b/FreeShip.lpi
@@ -30,8 +30,7 @@
       <UseVersionInfo Value="True"/>
       <AutoIncrementBuild Value="True"/>
       <MajorVersionNr Value="5"/>
-      <MinorVersionNr Value="1"/>
-      <RevisionNr Value="2"/>
+      <MinorVersionNr Value="2"/>
       <BuildNr Value="512"/>
       <Attributes pvaDebug="True" pvaPreRelease="True" pvaPatched="True"/>
       <StringTable LegalCopyright="GPLv3" OriginalFilename="FreeShip" ProductName="FREE!ship" ProductVersion="4.4"/>
@@ -343,9 +342,14 @@
     </PublishOptions>
     <RunParams>
       <local>
-        <CommandLineParams Value="--log-debug --nosplash-I-ACCEPT-GPLv3-TERMS-AND-CONDITIONS"/>
-        <WorkingDirectory Value="/usr/bin/"/>
+        <CommandLineParams Value="--debug --log-debug --nosplash-I-ACCEPT-GPLv3-TERMS-AND-CONDITIONS"/>
+        <WorkingDirectory Value="D:/my/prj/freeship-plus-in-lazarus"/>
       </local>
+      <environment>
+        <UserOverrides Count="1">
+          <Variable0 Name="LD_LIBRARY_PATH" Value="/home/mark/MyProjects/freeship-plus-in-lazarus/lib"/>
+        </UserOverrides>
+      </environment>
       <FormatVersion Value="2"/>
       <Modes Count="7">
         <Mode0 Name="default">
@@ -1137,7 +1141,7 @@
     <SearchPaths>
       <IncludeFiles Value="Units;Forms;$(ProjOutDir)"/>
       <Libraries Value="lib"/>
-      <OtherUnitFiles Value="Units;Forms;/usr/share/lazarus/$(LazVer)/lcl/interfaces/gtk3/gtk3bindings/"/>
+      <OtherUnitFiles Value="Units;Forms;/usr/share/lazarus/$(LazVer)/lcl/interfaces/gtk3/gtk3bindings"/>
       <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>

diff --git a/Units/FreePreferences.inc b/Units/FreePreferences.inc
@@ -214,16 +214,16 @@ const DS = DirectorySeparator;
   begin
     if Dir[Length(Dir)] <> DirectorySeparator then
       Dir := Dir + DirectorySeparator;
-    if FindFirst(Dir + '*.po', faAnyfile, SearchRec)
+    if FindFirstUTF8(Dir + '*.po', faAnyfile, SearchRec)
       { *Converted from FindFirst* } = 0 then
     begin
       if Uppercase(ExtractFileExt(SearchRec.Name)) = '.PO' then
         Add(Searchrec.Name);
-      while FindNext(SearchRec) { *Converted from FindNext* } = 0 do
+      while FindNextUTF8(SearchRec) { *Converted from FindNext* } = 0 do
         if (SearchRec.Name <> '.') and (SearchRec.Name <> '..') then
           if Uppercase(ExtractFileExt(SearchRec.Name)) = '.PO' then
             Add(Searchrec.Name);
-      FindClose(SearchRec); { *Converted from FindClose* }
+      FindCloseUTF8(SearchRec); { *Converted from FindClose* }
     end;
   end;{Browse}
 

diff --git a/Units/FreeStringsUnit.pas b/Units/FreeStringsUnit.pas
@@ -2,6 +2,7 @@
 
 {$IFDEF FPC}
   { $MODE Delphi}
+  {$modeswitch result+}
 {$ENDIF}
 
 interface

diff --git a/instpkg/wix/FreeShip_x64.wxs b/instpkg/wix/FreeShip_x64.wxs
@@ -112,8 +112,6 @@
 						 Section="Directories" Key="GlobalOpenDirectory" Value="[APPLICATIONFOLDER]Ships" />
 				<IniFile Id="ini_GlobalImportDirectory" Directory="GlobalFreeShipIniFolder" Name="FreeShip.ini" Action="createLine"
 						 Section="Directories" Key="GlobalImportDirectory" Value="[APPLICATIONFOLDER]Import" />
-				<IniFile Id="ini_LanguagesDirectory" Directory="GlobalFreeShipIniFolder" Name="FreeShip.ini" Action="createLine"
-						 Section="Directories" Key="LanguagesDirectory" Value="[APPLICATIONFOLDER]Languages" />
 				<IniFile Id="ini_ExecDirectory" Directory="GlobalFreeShipIniFolder" Name="FreeShip.ini" Action="createLine"
 						 Section="Directories" Key="ExecDirectory" Value="[APPLICATIONFOLDER]Exec" />
 				<IniFile Id="ini_ManualsDirectory" Directory="GlobalFreeShipIniFolder" Name="FreeShip.ini" Action="createLine"
@@ -163,7 +161,6 @@
 		<ComponentRef Id="COPYING" />
 		<ComponentRef Id="copyright" />
 		<ComponentRef Id="README.txt" />
-		<ComponentGroupRef Id="Languages" />
 		<ComponentGroupRef Id="locale" />
 		<ComponentGroupRef Id="Manuals" />
 		<ComponentGroupRef Id="Ships" />

diff --git a/instpkg/wix/make_installer.cmd b/instpkg/wix/make_installer.cmd
@@ -9,9 +9,10 @@ del FreeShip_x64.msi
 
 set SRCPATH=D:\my\prj\freeship-plus-in-lazarus
 
-candle.exe -v -pedantic -arch x64 -dSrcPath="%SRCPATH%" FreeShip_x64.wxs -dLanguages="%SRCPATH%\Languages" languages.wxs -dlocale="%SRCPATH%\locale" locale.wxs -dManuals="%SRCPATH%\Manuals" manuals.wxs -dShips="%SRCPATH%\Ships" ships.wxs -dThemes="%SRCPATH%\Themes" themes.wxs -dExec="%SRCPATH%\Exec" exec.wxs   
+::candle.exe -v -pedantic -arch x64 -dSrcPath="%SRCPATH%" FreeShip_x64.wxs -dLanguages="%SRCPATH%\Languages" languages.wxs -dlocale="%SRCPATH%\locale" locale.wxs -dManuals="%SRCPATH%\Manuals" manuals.wxs -dShips="%SRCPATH%\Ships" ships.wxs -dThemes="%SRCPATH%\Themes" themes.wxs -dExec="%SRCPATH%\Exec" exec.wxs   
+candle.exe -v -pedantic -arch x64 -dSrcPath="%SRCPATH%" FreeShip_x64.wxs -dlocale="%SRCPATH%\locale" locale.wxs -dManuals="%SRCPATH%\Manuals" manuals.wxs -dShips="%SRCPATH%\Ships" ships.wxs -dThemes="%SRCPATH%\Themes" themes.wxs -dExec="%SRCPATH%\Exec" exec.wxs   
 
-light.exe -ext WixUIExtension -cultures:en-us -dWixUILicenseRtf="%SRCPATH%\Manuals\gpl-3.0.rtf" FreeShip_x64.wixobj languages.wixobj locale.wixobj manuals.wixobj ships.wixobj themes.wixobj exec.wixobj -out FreeShip_x64.msi
+light.exe -ext WixUIExtension -cultures:en-us -dWixUILicenseRtf="%SRCPATH%\Manuals\gpl-3.0.rtf" FreeShip_x64.wixobj locale.wixobj manuals.wixobj ships.wixobj themes.wixobj exec.wixobj -out FreeShip_x64.msi
 
 rem copy FreeShip_x64.msi C:\D\