diff --git a/fpcup.ini b/fpcup.ini index 10b048ef..0340f960 100755 --- a/fpcup.ini +++ b/fpcup.ini @@ -19,7 +19,7 @@ ; ... and you can define your own, like below: [fpcupinfo] -inifileversion=1.1.8.28 +inifileversion=1.1.8.30 [ALIASfpcURL] stable=https://svn.freepascal.org/svn/fpc/tags/release_3_2_0 @@ -27,8 +27,7 @@ stable.git=https://github.com/LongDirtyAnimAlf/fpcsource_3_2_0.git trunk=https://svn.freepascal.org/svn/fpc/trunk trunk.git=https://github.com/graemeg/freepascal.git trunk.zip=https://github.com/graemeg/freepascal/archive/master.zip -embedded-mir=https://github.com/michael-ring/freepascal.git -embedded=https://github.com/LongDirtyAnimAlf/freepascal.git +embedded=https://github.com/michael-ring/freepascal.git 3.3.1=https://svn.freepascal.org/svn/fpc/trunk fixes=https://svn.freepascal.org/svn/fpc/branches/fixes_3_2 fixes3.2=https://svn.freepascal.org/svn/fpc/branches/fixes_3_2 @@ -72,7 +71,6 @@ stable.git=https://github.com/LongDirtyAnimAlf/lazarussource_2_0_12.git trunk=https://svn.freepascal.org/svn/lazarus/trunk trunk.git=https://github.com/graemeg/lazarus.git trunk.zip=https://github.com/graemeg/lazarus/archive/upstream.zip -embedded=https://github.com/LongDirtyAnimAlf/lazarus.git 2.1.0=https://svn.freepascal.org/svn/lazarus/trunk fixes=https://svn.freepascal.org/svn/lazarus/branches/fixes_2_0 fixes2.0=https://svn.freepascal.org/svn/lazarus/branches/fixes_2_0 @@ -99,6 +97,7 @@ fixes1.8=https://svn.freepascal.org/svn/lazarus/branches/fixes_1_8 1.8.0=https://svn.freepascal.org/svn/lazarus/tags/lazarus_1_8_0 1.7.zip=ftp://ftp.freepascal.org/pub/lazarus/snapshots/lazarus-1.7-54568-20170408-src.zip aroslazarus=https://github.com/alb42/lazarus.git +embedded-old=https://github.com/LongDirtyAnimAlf/lazarus.git fixes1.6=https://svn.freepascal.org/svn/lazarus/branches/fixes_1_6 1.6.zip=ftp://ftp.freepascal.org/pub/lazarus/snapshots/lazarus-1.6.5-62324-20191204-src.zip 1.6.4=https://svn.freepascal.org/svn/lazarus/tags/lazarus_1_6_4 diff --git a/fpcupdeluxe.res b/fpcupdeluxe.res index e892c4a3..931b0d18 100644 Binary files a/fpcupdeluxe.res and b/fpcupdeluxe.res differ diff --git a/fpcupdeluxemainform.pas b/fpcupdeluxemainform.pas index 75b6a82d..74adcd63 100644 --- a/fpcupdeluxemainform.pas +++ b/fpcupdeluxemainform.pas @@ -1910,8 +1910,8 @@ procedure TForm1.QuickBtnClick(Sender: TObject); s:='Going to install FPC and Lazarus for Wio Terminal.'; aModule:='develtools4fpc,mbf-freertos-wio'; end; - aFPCTarget:='embedded-mir'; - aLazarusTarget:='embedded'; + aFPCTarget:='embedded'; + aLazarusTarget:='trunk'; end; if Sender=mORMotBtn then diff --git a/scripts/windows/cross_android_arm.bat b/scripts/windows/cross_android_arm.bat deleted file mode 100644 index 1b859d54..00000000 --- a/scripts/windows/cross_android_arm.bat +++ /dev/null @@ -1,35 +0,0 @@ -@ECHO OFF -REM ############################################### -REM fpcup for windows -REM cross compile script. -REM ############################################### - -ECHO. -ECHO ============================================== -ECHO Build cross compiler for android arm -ECHO ============================================== -ECHO. - -if '%1'=='noconfirm' ( -SET wait=--noconfirm -) - -if EXIST .\fpcup.exe ( -fpcup.exe --ostarget="android" --cputarget="arm" --only="FPCCleanOnly,FPCBuildOnly" %wait% -) - -REM ############################################### -REM fpclazup can also be used -REM -REM if EXIST .\fpclazup.exe ( -REM fpclazup.exe --ostarget="android" --cputarget="arm" --only="FPCCleanOnly,FPCBuildOnly" %wait% -REM ) -REM -REM ############################################### - -ECHO. -ECHO ============================================== -ECHO Build cross compiler for android arm ready -ECHO ============================================== -ECHO. -PAUSE \ No newline at end of file diff --git a/scripts/windows/cross_android_arm_lamw.bat b/scripts/windows/cross_android_arm_lamw.bat deleted file mode 100644 index 2682609b..00000000 --- a/scripts/windows/cross_android_arm_lamw.bat +++ /dev/null @@ -1,37 +0,0 @@ -@ECHO OFF -REM ############################################### -REM fpcup for windows -REM cross compile script. -REM ############################################### - -ECHO. -ECHO ============================================== -ECHO Build cross compiler for linux arm lamw -ECHO (l)amw = android module wizard !! -ECHO ============================================== -ECHO. - -if '%1'=='noconfirm' ( -SET wait=--noconfirm -) - -if EXIST .\fpcup.exe ( -fpcup.exe --installdir="c:\prg" --ostarget="android" --cputarget="arm" --fpcOPT="-dFPC_ARMHF" --crossOPT="-CfSoft -CpARMV6" --only="FPCCleanOnly,FPCBuildOnly" --verbose %wait% -) - -REM ############################################### -REM fpclazup can also be used -REM -REM if EXIST .\fpclazup.exe ( -REM fpclazup.exe --installdir="c:\prg" --ostarget="android" --cputarget="arm" --fpcOPT="-dFPC_ARMHF" --crossOPT="-CfSoft -CpARMV6" -- -REM only="FPCCleanOnly,FPCBuildOnly" --verbose %wait% -REM ) -REM -REM ############################################### - -ECHO. -ECHO =============================================== -ECHO Build cross compiler for linux arm lamw ready -ECHO =============================================== -ECHO. -PAUSE \ No newline at end of file diff --git a/scripts/windows/cross_android_arm_library.bat b/scripts/windows/cross_android_arm_library.bat deleted file mode 100644 index fb6efbd8..00000000 --- a/scripts/windows/cross_android_arm_library.bat +++ /dev/null @@ -1,30 +0,0 @@ -@ECHO OFF -REM ############################################### -REM fpcup for windows -REM cross compile script. -REM ############################################### - -ECHO. -ECHO ============================================== -ECHO Build cross compiler for android arm with path -ECHO ============================================== -ECHO. - -if '%1'=='noconfirm' ( -SET wait=--noconfirm -) - -if EXIST .\fpcup.exe ( -fpcup.exe --ostarget="android" --cputarget="arm" --only="FPCCleanOnly,FPCBuildOnly" --crossbindir=C:\Users\Me\Downloads\android-ndk-r10e\toolchains\arm-linux-androideabi-4.9\prebuilt\windows\bin --crosslibdir=C:\Users\Me\Downloads\android-ndk-r10e\platforms\android-21\arch-arm\usr\lib %wait% -) - -REM Delphi auto-installed toolchains can also be used ! -REM --crossbindir=C:\Users\Public\Documents\Embarcadero\Studio\17.0\PlatformSDKs\android-ndk-r9c\toolchains\arm-linux-androideabi-4.9\prebuilt\windows\bin -REM --crosslibdir=C:\Users\Public\Documents\Embarcadero\Studio\17.0\PlatformSDKs\android-ndk-r9c\platforms\android-21\arch-arm\usr\lib - -ECHO. -ECHO ============================================== -ECHO Build cross compiler for android arm ready -ECHO ============================================== -ECHO. -PAUSE \ No newline at end of file diff --git a/scripts/windows/cross_android_armhf.bat b/scripts/windows/cross_android_armhf.bat deleted file mode 100644 index 56f50861..00000000 --- a/scripts/windows/cross_android_armhf.bat +++ /dev/null @@ -1,35 +0,0 @@ -@ECHO OFF -REM ############################################### -REM fpcup for windows -REM cross compile script. -REM ############################################### - -ECHO. -ECHO ============================================== -ECHO Build cross compiler for android armhf -ECHO ============================================== -ECHO. - -if '%1'=='noconfirm' ( -SET wait=--noconfirm -) - -if EXIST .\fpcup.exe ( -fpcup.exe --ostarget="android" --cputarget="arm" --only="FPCCleanOnly,FPCBuildOnly" --fpcOPT="-dFPC_ARMHF" --crossOPT="-CpARMV7A -CfVFPV3 -OoFASTMATH -CaEABIHF" %wait% -) - -REM ############################################### -REM fpclazup can also be used -REM -REM if EXIST .\fpclazup.exe ( -REM fpclazup.exe --ostarget="android" --cputarget="arm" --only="FPCCleanOnly,FPCBuildOnly" --fpcOPT="-dFPC_ARMHF" --crossOPT="-CpARMV7A -CfVFPV3 -OoFASTMATH -CaEABIHF" %wait% -REM ) -REM -REM ############################################### - -ECHO. -ECHO ============================================== -ECHO Build cross compiler for android armhf ready -ECHO ============================================== -ECHO. -PAUSE \ No newline at end of file diff --git a/scripts/windows/cross_android_jvm.bat b/scripts/windows/cross_android_jvm.bat deleted file mode 100644 index b1f405fa..00000000 --- a/scripts/windows/cross_android_jvm.bat +++ /dev/null @@ -1,35 +0,0 @@ -@ECHO OFF -REM ############################################# -REM fpcup for windows -REM cross compile script. -REM ############################################# - -ECHO. -ECHO ============================================ -ECHO Build cross compiler for android jvm -ECHO ============================================ -ECHO. - -if '%1'=='noconfirm' ( -SET wait=--noconfirm -) - -if EXIST .\fpcup.exe ( -fpcup.exe --ostarget="android" --cputarget="jvm" --only="FPCCleanOnly,FPCBuildOnly" %wait% -) - -REM ############################################### -REM fpclazup can also be used -REM -REM if EXIST .\fpclazup.exe ( -REM fpclazup.exe --ostarget="android" --cputarget="jvm" --only="FPCCleanOnly,FPCBuildOnly" %wait% -REM ) -REM -REM ############################################### - -ECHO. -ECHO ============================================ -ECHO Build cross compiler for android jvm ready -ECHO ============================================ -ECHO. -PAUSE \ No newline at end of file diff --git a/scripts/windows/cross_java_jvm.bat b/scripts/windows/cross_java_jvm.bat deleted file mode 100644 index 7609ab18..00000000 --- a/scripts/windows/cross_java_jvm.bat +++ /dev/null @@ -1,35 +0,0 @@ -@ECHO OFF -REM ############################################# -REM fpcup for windows -REM cross compile script. -REM ############################################# - -ECHO. -ECHO ============================================ -ECHO Build cross compiler for java jvm -ECHO ============================================ -ECHO. - -if '%1'=='noconfirm' ( -SET wait=--noconfirm -) - -if EXIST .\fpcup.exe ( -fpcup.exe --ostarget="java" --cputarget="jvm" --only="FPCCleanOnly,FPCBuildOnly" %wait% -) - -REM ############################################### -REM fpclazup can also be used -REM -REM if EXIST .\fpclazup.exe ( -REM fpclazup.exe --ostarget="java" --cputarget="jvm" --only="FPCCleanOnly,FPCBuildOnly" %wait% -REM ) -REM -REM ############################################### - -ECHO. -ECHO ============================================ -ECHO Build cross compiler for java jvm ready -ECHO ============================================ -ECHO. -PAUSE \ No newline at end of file diff --git a/scripts/windows/cross_linux_aarch64.bat b/scripts/windows/cross_linux_aarch64.bat deleted file mode 100644 index bfa076ab..00000000 --- a/scripts/windows/cross_linux_aarch64.bat +++ /dev/null @@ -1,35 +0,0 @@ -@ECHO OFF -REM ############################################### -REM fpcup for windows -REM cross compile script. -REM ############################################### - -ECHO. -ECHO ============================================== -ECHO Build cross compiler for linux aarch64 -ECHO ============================================== -ECHO. - -if '%1'=='noconfirm' ( -SET wait=--noconfirm -) - -if EXIST .\fpcup.exe ( -fpcup.exe --ostarget="linux" --cputarget="aarch64" --only="FPCCleanOnly,FPCBuildOnly" %wait% -) - -REM ############################################### -REM fpclazup can also be used -REM -REM if EXIST .\fpclazup.exe ( -REM fpclazup.exe --ostarget="linux" --cputarget="aarch64" --only="FPCCleanOnly,FPCBuildOnly" %wait% -REM ) -REM -REM ############################################### - -ECHO. -ECHO ============================================== -ECHO Build cross compiler for linux aarch64 ready -ECHO ============================================== -ECHO. -PAUSE \ No newline at end of file diff --git a/scripts/windows/cross_linux_armhf.bat b/scripts/windows/cross_linux_armhf.bat deleted file mode 100644 index 2977d6d8..00000000 --- a/scripts/windows/cross_linux_armhf.bat +++ /dev/null @@ -1,36 +0,0 @@ -@ECHO OFF -REM ############################################### -REM fpcup for windows -REM cross compile script. -REM ############################################### - -ECHO. -ECHO ============================================== -ECHO Build cross compiler for linux arm hardfloat -ECHO ============================================== -ECHO. - -if '%1'=='noconfirm' ( -SET wait=--noconfirm -) - -if EXIST .\fpcup.exe ( -fpcup.exe --ostarget="linux" --cputarget="arm" --fpcOPT="-dFPC_ARMHF" --crossOPT="-CpARMV7A -CfVFPV3 -OoFASTMATH -CaEABIHF" --only="FPCCleanOnly,FPCBuildOnly" %wait% -) - -REM ############################################### -REM fpclazup can also be used -REM -REM if EXIST .\fpclazup.exe ( -REM fpclazup.exe --ostarget="linux" --cputarget="arm" --fpcOPT="-dFPC_ARMHF" --crossOPT="-CpARMV7A -CfVFPV3 -OoFASTMATH -CaEABIHF" -- -REM only="FPCCleanOnly,FPCBuildOnly" %wait% -REM ) -REM -REM ############################################### - -ECHO. -ECHO ============================================== -ECHO Build cross compiler for linux arm ready -ECHO ============================================== -ECHO. -PAUSE \ No newline at end of file diff --git a/scripts/windows/cross_linux_i386.bat b/scripts/windows/cross_linux_i386.bat deleted file mode 100644 index 7bde214a..00000000 --- a/scripts/windows/cross_linux_i386.bat +++ /dev/null @@ -1,35 +0,0 @@ -@ECHO OFF -REM ############################################# -REM fpcup for windows -REM cross compile script. -REM ############################################# - -ECHO. -ECHO ============================================ -ECHO Build cross compiler for linux i386 -ECHO ============================================ -ECHO. - -if '%1'=='noconfirm' ( -SET wait=--noconfirm -) - -if EXIST .\fpcup.exe ( -fpcup.exe --ostarget="linux" --cputarget="i386" --only="FPCCleanOnly,FPCBuildOnly" %wait% -) - -REM ############################################### -REM fpclazup can also be used -REM -REM if EXIST .\fpclazup.exe ( -REM fpclazup.exe --ostarget="linux" --cputarget="i386" --only="FPCCleanOnly,FPCBuildOnly" %wait% -REM ) -REM -REM ############################################### - -ECHO. -ECHO ============================================ -ECHO Build cross compiler for linux i386 ready -ECHO ============================================ -ECHO. -PAUSE \ No newline at end of file diff --git a/scripts/windows/cross_linux_x64.bat b/scripts/windows/cross_linux_x64.bat deleted file mode 100644 index 40ac8f87..00000000 --- a/scripts/windows/cross_linux_x64.bat +++ /dev/null @@ -1,35 +0,0 @@ -@ECHO OFF -REM ############################################### -REM fpcup for windows -REM cross compile script. -REM ############################################### - -ECHO. -ECHO ============================================== -ECHO Build cross compiler for linux 64 bit -ECHO ============================================== -ECHO. - -if '%1'=='noconfirm' ( -SET wait=--noconfirm -) - -if EXIST .\fpcup.exe ( -fpcup.exe --ostarget="linux" --cputarget="x86_64" --only="FPCCleanOnly,FPCBuildOnly" %wait% -) - -REM ############################################### -REM fpclazup can also be used -REM -REM if EXIST .\fpclazup.exe ( -REM fpclazup.exe --ostarget="linux" --cputarget="x86_64" --only="FPCCleanOnly,FPCBuildOnly" %wait% -REM ) -REM -REM ############################################### - -ECHO. -ECHO ============================================== -ECHO Build cross compiler for linux 64 bit ready -ECHO ============================================== -ECHO. -PAUSE \ No newline at end of file diff --git a/scripts/windows/cross_win_x64.bat b/scripts/windows/cross_win_x64.bat deleted file mode 100644 index 75b90477..00000000 --- a/scripts/windows/cross_win_x64.bat +++ /dev/null @@ -1,26 +0,0 @@ -@ECHO OFF -REM ############################################### -REM fpcup for windows -REM cross compile script. -REM ############################################### - -ECHO. -ECHO ============================================== -ECHO Build cross compiler for windows 64 bit -ECHO ============================================== -ECHO. - -if '%1'=='noconfirm' ( -SET wait=--noconfirm -) - -if EXIST .\fpclazup.exe ( -fpclazup.exe --only="crosswin32-64" %wait% -) - -ECHO. -ECHO =============================================== -ECHO Build cross compiler for windows 64 bit ready -ECHO =============================================== -ECHO. -PAUSE \ No newline at end of file diff --git a/scripts/windows/cross_windows_ce.bat b/scripts/windows/cross_windows_ce.bat deleted file mode 100644 index bb63214e..00000000 --- a/scripts/windows/cross_windows_ce.bat +++ /dev/null @@ -1,26 +0,0 @@ -@ECHO OFF -REM ############################################### -REM fplazcup for windows -REM cross compile script. -REM ############################################### - -ECHO. -ECHO =============================================== -ECHO Build cross compiler for windows 64 bit -ECHO =============================================== -ECHO. - -if '%1'=='noconfirm' ( -SET wait=--noconfirm -) - -if EXIST .\fpclazup.exe ( -fpclazup.exe --ostarget="wince" --cputarget="arm" --only="FPCCleanOnly,FPCBuildOnly" --verbose %wait% -) - -ECHO. -ECHO =============================================== -ECHO Build cross compiler for windows 64 bit ready -ECHO =============================================== -ECHO. -PAUSE \ No newline at end of file diff --git a/scripts/windows/cross_windows_x64.bat b/scripts/windows/cross_windows_x64.bat deleted file mode 100644 index 26c791d7..00000000 --- a/scripts/windows/cross_windows_x64.bat +++ /dev/null @@ -1,26 +0,0 @@ -@ECHO OFF -REM ############################################### -REM fplazcup for windows -REM cross compile script. -REM ############################################### - -ECHO. -ECHO =============================================== -ECHO Build cross compiler for windows 64 bit -ECHO =============================================== -ECHO. - -if '%1'=='noconfirm' ( -SET wait=--noconfirm -) - -if EXIST .\fpclazup.exe ( -fpclazup.exe --ostarget="win64" --cputarget="x86_64" --only="FPCCleanOnly,FPCBuildOnly" --verbose %wait% -) - -ECHO. -ECHO =============================================== -ECHO Build cross compiler for windows 64 bit ready -ECHO =============================================== -ECHO. -PAUSE \ No newline at end of file diff --git a/scripts/windows/crosslibs.bat b/scripts/windows/crosslibs.bat deleted file mode 100644 index a0f02d8c..00000000 --- a/scripts/windows/crosslibs.bat +++ /dev/null @@ -1,34 +0,0 @@ -del WinCrossAndroidARM.rar -del WinCrossLinuxAarch64.rar -del WinCrossLinuxARM.rar -del WinCrossLinuxi386.rar -del WinCrossLinuxx64.rar -del WinCrossWinceARM.rar -del WinCrossFreeBSDx64.rar -del WinCrossFreeBSDi386.rar - -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r WinCrossAndroidARM.rar ..\cross\bin\arm-android -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r WinCrossAndroidARM.rar ..\cross\lib\arm-android - -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r WinCrossLinuxAarch64.rar ..\cross\bin\aarch64-linux -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r WinCrossLinuxAarch64.rar ..\cross\lib\aarch64-linux - -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r WinCrossLinuxARM.rar ..\cross\bin\arm-linux -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r WinCrossLinuxARM.rar ..\cross\lib\arm-linux - -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r WinCrossLinuxi386.rar ..\cross\bin\i386-linux -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r WinCrossLinuxi386.rar ..\cross\lib\i386-linux - -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r WinCrossLinuxx64.rar ..\cross\bin\x86_64-linux -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r WinCrossLinuxx64.rar ..\cross\lib\x86_64-linux - -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r WinCrossWinceARM.rar ..\cross\bin\arm-wince -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r WinCrossWinceARM.rar ..\cross\lib\arm-wince - -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r WinCrossFreeBSDx64.rar ..\cross\bin\x86_64-freebsd -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r WinCrossFreeBSDx64.rar ..\cross\lib\x86_64-freebsd - -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r WinCrossFreeBSDi386.rar ..\cross\bin\i386-freebsd -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r WinCrossFreeBSDi386.rar ..\cross\lib\i386-freebsd - -pause \ No newline at end of file diff --git a/scripts/windows/fpclazup-newpascal.bat b/scripts/windows/fpclazup-newpascal.bat deleted file mode 100644 index 99191688..00000000 --- a/scripts/windows/fpclazup-newpascal.bat +++ /dev/null @@ -1,2 +0,0 @@ -fpclazup --installdir="C:\NewPascal" --fpcURL="newpascal" --lazURL="newpascal" -pause diff --git a/scripts/windows/fpclazup_fpconly.bat b/scripts/windows/fpclazup_fpconly.bat deleted file mode 100644 index ce4b599e..00000000 --- a/scripts/windows/fpclazup_fpconly.bat +++ /dev/null @@ -1,21 +0,0 @@ -@ECHO OFF -REM ##################################################### -REM fpclazup for windows -REM ##################################################### - -ECHO. -ECHO ==================================================== -ECHO Fpclazup default; fpc only -ECHO ==================================================== -ECHO. - -if EXIST .\fpclazup.exe ( -fpclazup.exe --only="fpc,FPCCrossWin32-64" --verbose -) - -ECHO. -ECHO ==================================================== -ECHO Fpclazup default ready; fpc only -ECHO ==================================================== -ECHO. -PAUSE \ No newline at end of file diff --git a/scripts/windows/fpclazup_freesparta.bat b/scripts/windows/fpclazup_freesparta.bat deleted file mode 100644 index e3ffbe2a..00000000 --- a/scripts/windows/fpclazup_freesparta.bat +++ /dev/null @@ -1,21 +0,0 @@ -@ECHO OFF -REM ###################################################################################### -REM fpclazup for windows -REM ###################################################################################### - -ECHO. -ECHO ===================================================================================== -ECHO Fpclazup for freesparta -ECHO ===================================================================================== -ECHO. - -if EXIST .\fpclazup.exe ( -fpclazup.exe --installdir="c:\freesparta" --lazURL="sparta" --include=freesparta -) - -ECHO. -ECHO ===================================================================================== -ECHO Fpclazup for freesparta ready; -ECHO ===================================================================================== -ECHO. -PAUSE \ No newline at end of file diff --git a/scripts/windows/fpclazup_lazarusonly.bat b/scripts/windows/fpclazup_lazarusonly.bat deleted file mode 100644 index 78b74458..00000000 --- a/scripts/windows/fpclazup_lazarusonly.bat +++ /dev/null @@ -1,21 +0,0 @@ -@ECHO OFF -REM ##################################################### -REM fpclazup for windows -REM ##################################################### - -ECHO. -ECHO ==================================================== -ECHO Fpclazup default; Lazarus only -ECHO ==================================================== -ECHO. - -if EXIST .\fpclazup.exe ( -fpclazup.exe --lazURL="default" --skip="fpc,FPCCrossWin32-64" --verbose -) - -ECHO. -ECHO ==================================================== -ECHO Fpclazup default ready; Lazarus only -ECHO ==================================================== -ECHO. -PAUSE \ No newline at end of file diff --git a/scripts/windows/fpclazup_moduleonly.bat b/scripts/windows/fpclazup_moduleonly.bat deleted file mode 100644 index 858d6674..00000000 --- a/scripts/windows/fpclazup_moduleonly.bat +++ /dev/null @@ -1,24 +0,0 @@ -@ECHO OFF -REM ##################################################### -REM fpclazup for windows -REM ##################################################### - -ECHO. -ECHO ==================================================== -ECHO Fpclazup for modules only: -ECHO install a single module (zeos) only -ECHO or install multiple modules only -ECHO ==================================================== -ECHO. - -if EXIST .\fpclazup.exe ( -fpclazup.exe --only="zeos" --verbose -) - -REM fpclazup.exe --only="lazpaint,bgracontrols,bgragames,ecc,indy,turbobird,notepas,uos,lazradio,treelistview" --verbose -ECHO. -ECHO ==================================================== -ECHO Fpclazup for modules only -ECHO ==================================================== -ECHO. -PAUSE \ No newline at end of file diff --git a/scripts/windows/fpclazup_stable.bat b/scripts/windows/fpclazup_stable.bat deleted file mode 100644 index 05afe3b7..00000000 --- a/scripts/windows/fpclazup_stable.bat +++ /dev/null @@ -1,21 +0,0 @@ -@ECHO OFF -REM ############################################### -REM fpclazup for windows -REM ############################################### - -ECHO. -ECHO ============================================== -ECHO Fpclazup stable and defaults -ECHO ============================================== -ECHO. - -if EXIST .\fpclazup.exe ( -fpclazup.exe --fpcURL="stable" --lazURL="stable" --verbose -) - -ECHO. -ECHO ============================================== -ECHO Fpclazup stable and defaults ready -ECHO ============================================== -ECHO. -PAUSE \ No newline at end of file diff --git a/scripts/windows/fpclazup_trunk.bat b/scripts/windows/fpclazup_trunk.bat deleted file mode 100644 index a420a687..00000000 --- a/scripts/windows/fpclazup_trunk.bat +++ /dev/null @@ -1,21 +0,0 @@ -@ECHO OFF -REM ############################################### -REM fpclazup for windows -REM ############################################### - -ECHO. -ECHO ============================================== -ECHO Fpclazup with trunk and defaults -ECHO ============================================== -ECHO. - -if EXIST .\fpclazup.exe ( -fpclazup.exe --fpcURL="trunk" --lazURL="trunk" --verbose -) - -ECHO. -ECHO ============================================== -ECHO Fpclazup with trunk and defaults ready -ECHO ============================================== -ECHO. -PAUSE \ No newline at end of file diff --git a/scripts/windows/fpclazup_withrttipatch.bat b/scripts/windows/fpclazup_withrttipatch.bat deleted file mode 100644 index 49d3288d..00000000 --- a/scripts/windows/fpclazup_withrttipatch.bat +++ /dev/null @@ -1,21 +0,0 @@ -@ECHO OFF -REM ############################################### -REM fpclazup for windows -REM ############################################### - -ECHO. -ECHO ============================================== -ECHO Fpclazup with trunk and RTTI patch -ECHO ============================================== -ECHO. - -if EXIST .\fpclazup.exe ( -fpclazup.exe --fpcURL="trunk" --lazURL="trunk" --fpcPATCH="fpctrunkrtti.patch" -) - -ECHO. -ECHO ============================================== -ECHO Fpclazup with trunk and RTTI patch ready -ECHO ============================================== -ECHO. -PAUSE diff --git a/scripts/windows/fpcup_default.bat b/scripts/windows/fpcup_default.bat deleted file mode 100644 index ef045aa0..00000000 --- a/scripts/windows/fpcup_default.bat +++ /dev/null @@ -1,22 +0,0 @@ -@ECHO OFF -REM ##################################################### -REM fpcup for windows -REM ##################################################### - -ECHO. -ECHO ==================================================== -ECHO Fpcup default; fpc only -ECHO ==================================================== -ECHO. - -if EXIST .\fpcup.exe ( -fpcup.exe --verbose -) - -ECHO. -ECHO ==================================================== -ECHO Fpcup default ready; fpc only -ECHO ==================================================== -ECHO. - -PAUSE \ No newline at end of file diff --git a/scripts/windows/fpcup_newpascal.bat b/scripts/windows/fpcup_newpascal.bat deleted file mode 100644 index 27641192..00000000 --- a/scripts/windows/fpcup_newpascal.bat +++ /dev/null @@ -1,21 +0,0 @@ -@ECHO OFF -REM ###################################################################################### -REM fpcup for windows -REM ###################################################################################### - -ECHO. -ECHO ===================================================================================== -ECHO Fpcup by NewPascal -ECHO ===================================================================================== -ECHO. - -if EXIST .\fpcup.exe ( -fpcup.exe --installdir="c:\NewPascalFPConly" --fpcURL="newpascal" -) - -ECHO. -ECHO ===================================================================================== -ECHO Fpcup by NewPascal ready; -ECHO ===================================================================================== -ECHO. -PAUSE \ No newline at end of file diff --git a/scripts/windows/fpcup_trunk.bat b/scripts/windows/fpcup_trunk.bat deleted file mode 100644 index 99bcaf73..00000000 --- a/scripts/windows/fpcup_trunk.bat +++ /dev/null @@ -1,21 +0,0 @@ -@ECHO OFF -REM ###################################################################################### -REM fpcup for windows -REM ###################################################################################### - -ECHO. -ECHO ===================================================================================== -ECHO Fpcup for trunk (latest) -ECHO ===================================================================================== -ECHO. - -if EXIST .\fpcup.exe ( -fpcup.exe --installdir="c:\fpctrunk" --fpcURL="trunk" -) - -ECHO. -ECHO ===================================================================================== -ECHO Fpcup for trunk (latest) ready -ECHO ===================================================================================== -ECHO. -PAUSE \ No newline at end of file diff --git a/scripts/windows/fpcup_withrttipatch.bat b/scripts/windows/fpcup_withrttipatch.bat deleted file mode 100644 index 2e740dfe..00000000 --- a/scripts/windows/fpcup_withrttipatch.bat +++ /dev/null @@ -1,21 +0,0 @@ -@ECHO OFF -REM ###################################################################################### -REM fpcup for windows -REM ###################################################################################### - -ECHO. -ECHO ===================================================================================== -ECHO Fpcup for interface rtti -ECHO ===================================================================================== -ECHO. - -if EXIST .\fpcup.exe ( -fpcup.exe --installdir="c:\fpcrtti" --fpcURL="trunk" --fpcPATCH="fpctrunkrtti.patch" -) - -ECHO. -ECHO ===================================================================================== -ECHO Fpcup for interface rtti ready; -ECHO ===================================================================================== -ECHO. -PAUSE \ No newline at end of file diff --git a/scripts/windows/makefile-windows.bat b/scripts/windows/makefile-windows.bat new file mode 100644 index 00000000..36f59eaf --- /dev/null +++ b/scripts/windows/makefile-windows.bat @@ -0,0 +1,27 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Regenerate makefile buildscript for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem set FPC=C:\fpclazbydeluxe\trunklatest2\fpc\bin\i386-win32 +set FPC=C:\fpclazbydeluxe\trunklatest2\fpcscr +set FPCDIR=C:\fpclazbydeluxe\trunklatest2\fpcscr +@rem set LAZARUS=C:\fpclazbydeluxe\trunklatest2\lazarus +set LAZARUS=C:\Users\Alfred\Documents\GitHub\lazarus + +set path=C:\fpclazbydeluxe\trunklatest2\fpc\bin\i386-win32;%path% +@rem set path=C:\fpclazbydeluxe\trunklatest2\fpc;%path% +@rem set path=C:\fpclazbydeluxe\trunklatest2\fpcscr;%path% + +@rem call %LAZARUS%\project1.exe + +call %LAZARUS%\fpcmake.exe -Tall -v -r -w %LAZARUS%\ide\Makefile.fpc + +if "%OS%"=="Windows_NT" endlocal + +pause \ No newline at end of file diff --git a/scripts/windows/mysettings-fpcup-trunkall-verbose.bat b/scripts/windows/mysettings-fpcup-trunkall-verbose.bat deleted file mode 100644 index bf3a11fb..00000000 --- a/scripts/windows/mysettings-fpcup-trunkall-verbose.bat +++ /dev/null @@ -1,2 +0,0 @@ -fpcup --inifile=mysettings.ini --inisection=TrunkAll --verbose -pause \ No newline at end of file diff --git a/scripts/windows/mysettings-fpcup-trunkall.bat b/scripts/windows/mysettings-fpcup-trunkall.bat deleted file mode 100644 index 6113900e..00000000 --- a/scripts/windows/mysettings-fpcup-trunkall.bat +++ /dev/null @@ -1,2 +0,0 @@ -fpcup --inifile=mysettings.ini --inisection=TrunkAll -pause \ No newline at end of file diff --git a/scripts/windows/mysettings-fpcup-trunklaz-verbose.bat b/scripts/windows/mysettings-fpcup-trunklaz-verbose.bat deleted file mode 100644 index c0aa610f..00000000 --- a/scripts/windows/mysettings-fpcup-trunklaz-verbose.bat +++ /dev/null @@ -1,2 +0,0 @@ -fpcup --inifile=mysettings.ini --inisection=TrunkLaz --verbose -pause \ No newline at end of file diff --git a/scripts/windows/mysettings-fpcup-trunklaz.bat b/scripts/windows/mysettings-fpcup-trunklaz.bat deleted file mode 100644 index 7e431d08..00000000 --- a/scripts/windows/mysettings-fpcup-trunklaz.bat +++ /dev/null @@ -1,2 +0,0 @@ -fpcup --inifile=mysettings.ini --inisection=TrunkLaz -pause \ No newline at end of file diff --git a/scripts/windows/mysettings.ini b/scripts/windows/mysettings.ini deleted file mode 100644 index 87ae08e6..00000000 --- a/scripts/windows/mysettings.ini +++ /dev/null @@ -1,163 +0,0 @@ -; example settings for fpcup -; Options not specified take the default value - -; use e.g. -; fpcup --inifile=settings.ini --inisection=devfull -; to compile with the options specified in that section - -[TrunkAll] -; Full FPC TRUNK + LAZARUS TRUNK download and compile -installdir=c:\Prg\Lazarus\TrunkAll -; Here use FPC trunk instead of the default fixes version: (accepts shortcuts: 2.7.1,trunk,fixes,2.6.2,2.6.0) -;fpcurl=http://svn.freepascal.org/svn/fpc/trunk -fpcurl=trunk -;fpcopt="-g -gl -O1" -;fpcopt="-gl -O2 -g- -Xs" -; Here use LAZ trunk which is also default: (accepts shortcuts: trunk,1.3,1.0.14,1.0.12) -lazurl=trunk -;lazopt="-g -gl -O1" -;lazopt="-gl -O2 -g- -Xs" -; Use our own names to avoid overwiting defaults -fpcuplinkname=UpTrunkAll -lazlinkname=TrunkAll -; Keeps changes you made to the svn checkout: -keeplocalchanges=false -; You can enable/disable modules specified in fpcup.ini: -anchordocking=1 -; you need lazpaint or bgrabitmap for this -bgracontrols=1 -rutils=1 -brookframework=1 -codelibrarian=1 -dcpcrypt=1 -doceditor=1 -ecc=1 -fblib=1 -fpcdocs=1 -fpcup=1 -; fpspreadsheet=1 <<<<<<<<<< already in lazarus_ccr -glscene=1 -greyhound=1 -;helpfpc=1 -;helplazarus=1 -indy=1 -lamw=1 -; installerlazwin=1 <<<<<<<<<< windows installer not needed -; kzdesktop=1 <<<<<<<<<< anchor docking is more stable -lazarus_ccr=1 -;lazbuild=1 -lazdatadesktop=1 -; lazpackager=1 -lazpaint=1 -lazres=1 -leptonica=1 -lhelp=1 -ljgridutils=1 -lnet=1 -mormot=1 -mupdf=1 -nxpascal=1 -OCRivist=1 -pascalsane=1 -;pascalscada=1 -patchwrangler=1 -; rx=1 <<<<<<<<<< already in suggestedpackages -simplegraph=1 -;suggestedpackages=1 -synapse=1 -tesseract=1 -tiopf=1 -;USERIDE=1 -uecontrols=1 -vampyre=1 -; vtv=1 <<<<<<<<<< already in lazarus_ccr -zeos=1 -; -abbrevia=1 -baregame=1 -;bgragames=1 -;cm630commons=1 -;lazmer=1 -turbobird=1 -uos=1 -wst=1 -; notepas=1 -; lazradio=1 -; zcad=1 -; laz4android=1 - -[TrunkLaz] -; Full FPC FIXES + LAZARUS TRUNK download and compile -installdir=c:\Prg\Lazarus\TrunkLaz -; Here use default fixes version: (accepts shortcuts: 2.7.1,trunk,fixes,2.6.2,2.6.0) -;fpcurl=http://svn.freepascal.org/svn/fpc/branches/fixes_2_6 -fpcurl=fixes -fpcopt="-gl -O2 -g- -Xs" -lazurl=trunk -lazopt="-gl -O2 -g- -Xs" -; Use our own names to avoid overwiting defaults -fpcuplinkname=UpTrunkLaz -lazlinkname=TrunkLaz -; Keeps changes you made to the svn checkout: -keeplocalchanges=false -; You can enable/disable modules specified in fpcup.ini: -anchordocking=1 -bgracontrols=1 -brookframework=1 -codelibrarian=1 -dcpcrypt=1 -default=1 -doceditor=1 -ecc=1 -fblib=1 -fpcdocs=1 -fpcup=1 -; fpspreadsheet=1 <<<<<<<<<< already in lazarus_ccr -glscene=1 -greyhound=1 -helpfpc=1 -helplazarus=1 -indy=1 -; installerlazwin=1 <<<<<<<<<< windows installer not needed -; kzdesktop=1 <<<<<<<<<< anchor docking is more stable -lazarus_ccr=1 -lazbuild=1 -lazdatadesktop=1 -; lazpackager=1 -lazpaint=1 -lazres=1 -leptonica=1 -lhelp=1 -ljgridutils=1 -lnet=1 -mormot=1 -mupdf=1 -nxpascal=1 -OCRivist=1 -pascalsane=1 -pascalscada=1 -patchwrangler=1 -; rx=1 <<<<<<<<<< already in suggestedpackages -simplegraph=1 -suggestedpackages=1 -synapse=1 -tesseract=1 -tiopf=1 -USERIDE=1 -vampyre=1 -; vtv=1 <<<<<<<<<< already in lazarus_ccr -zeos=1 -; -abbrevia=1 -baregame=1 -bgragames=1 -cm630commons=1 -lazmer=1 -spktoolbar=1 -turbobird=1 -uos=1 -wst=1 -; notepas=1 -; lazradio=1 -; zcad=1 -; laz4android=1 diff --git a/scripts/windows/newpascal_release.bat b/scripts/windows/newpascal_release.bat deleted file mode 100644 index 9a37ce0c..00000000 --- a/scripts/windows/newpascal_release.bat +++ /dev/null @@ -1,60 +0,0 @@ -del ..\NPLazBaseWin32.rar -del ..\CrossAndroidARM.rar -del ..\CrossLinuxAarch64.rar -del ..\CrossLinuxARM.rar -del ..\CrossLinuxi386.rar -del ..\CrossLinuxx64.rar -del ..\CrossWinceARM.rar -del ..\CrossFreeBSDi386.rar -del ..\CrossFreeBSDx64.rar - - -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r -x..\fpc\.svn -x..\lazarus\.svn -x..\fpc\units -x..\fpc\bin -x..\cross -x..\newpascalbatchfiles -x..\apps -x..\ccr ..\NPLazBaseWin32.rar ..\ -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r ..\NPLazBaseWin32.rar ..\fpc\bin\i386-win32 -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r ..\NPLazBaseWin32.rar ..\fpc\bin\x86_64-win64 -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r ..\NPLazBaseWin32.rar ..\fpc\units\i386-win32 -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r ..\NPLazBaseWin32.rar ..\fpc\units\x86_64-win64 -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r ..\NPLazBaseWin32.rar ..\ccr\mORMot -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r ..\NPLazBaseWin32.rar ..\mingw - -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r ..\CrossAndroidARM.rar ..\fpc\bin\arm-android -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r ..\CrossAndroidARM.rar ..\fpc\units\arm-android -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r ..\CrossAndroidARM.rar ..\cross\bin\arm-android -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r ..\CrossAndroidARM.rar ..\cross\lib\arm-android - -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r ..\CrossLinuxAarch64.rar ..\fpc\bin\aarch64-linux -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r ..\CrossLinuxAarch64.rar ..\fpc\units\aarch64-linux -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r ..\CrossLinuxAarch64.rar ..\cross\bin\aarch64-linux -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r ..\CrossLinuxAarch64.rar ..\cross\lib\aarch64-linux - -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r ..\CrossLinuxARM.rar ..\fpc\bin\arm-linux -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r ..\CrossLinuxARM.rar ..\fpc\units\arm-linux -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r ..\CrossLinuxARM.rar ..\cross\bin\arm-linux -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r ..\CrossLinuxARM.rar ..\cross\lib\arm-linux - -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r ..\CrossLinuxi386.rar ..\fpc\bin\i386-linux -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r ..\CrossLinuxi386.rar ..\fpc\units\i386-linux -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r ..\CrossLinuxi386.rar ..\cross\bin\i386-linux -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r ..\CrossLinuxi386.rar ..\cross\lib\i386-linux - -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r ..\CrossLinuxx64.rar ..\fpc\bin\x86_64-linux -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r ..\CrossLinuxx64.rar ..\fpc\units\x86_64-linux -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r ..\CrossLinuxx64.rar ..\cross\bin\x86_64-linux -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r ..\CrossLinuxx64.rar ..\cross\lib\x86_64-linux - -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r ..\CrossWinceARM.rar ..\fpc\bin\arm-wince -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r ..\CrossWinceARM.rar ..\fpc\units\arm-wince -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r ..\CrossWinceARM.rar ..\cross\bin\arm-wince -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r ..\CrossWinceARM.rar ..\cross\lib\arm-wince - -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r ..\CrossFreeBSDi386.rar ..\fpc\bin\i386-freebsd -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r ..\CrossFreeBSDi386.rar ..\fpc\units\i386-freebsd -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r ..\CrossFreeBSDi386.rar ..\cross\bin\i386-freebsd -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r ..\CrossFreeBSDi386.rar ..\cross\lib\i386-freebsd - -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r ..\CrossFreeBSDx64.rar ..\fpc\bin\x86_64-freebsd -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r ..\CrossFreeBSDx64.rar ..\fpc\units\x86_64-freebsd -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r ..\CrossFreeBSDx64.rar ..\cross\bin\x86_64-freebsd -"C:\Program Files (x86)\WinRAR\Rar.exe" a -r ..\CrossFreeBSDx64.rar ..\cross\lib\x86_64-freebsd - -pause \ No newline at end of file