diff --git a/fpclazup.lps b/fpclazup.lps index 5e9b5b60..1a6b6ae4 100644 --- a/fpclazup.lps +++ b/fpclazup.lps @@ -4,12 +4,11 @@ - + - @@ -47,7 +46,7 @@ - + diff --git a/fpcup.lps b/fpcup.lps index f674bbe5..ee6303f6 100644 --- a/fpcup.lps +++ b/fpcup.lps @@ -9,7 +9,6 @@ - diff --git a/fpcup.res b/fpcup.res index 6429dbcd..f3b2ede1 100644 Binary files a/fpcup.res and b/fpcup.res differ diff --git a/fpcupdeluxe.lps b/fpcupdeluxe.lps index 19613f17..1fab3eba 100644 --- a/fpcupdeluxe.lps +++ b/fpcupdeluxe.lps @@ -5,7 +5,7 @@ - + @@ -21,7 +21,8 @@ - + + @@ -32,8 +33,9 @@ - - + + + @@ -75,7 +77,7 @@ - + @@ -84,7 +86,7 @@ - + @@ -94,7 +96,7 @@ - + @@ -113,27 +115,29 @@ - + - - - - + + + + + - - - - + + + + + - + @@ -143,10 +147,10 @@ - - - - + + + + @@ -159,10 +163,10 @@ - - - - + + + + @@ -174,13 +178,12 @@ - - - - + + + - + @@ -188,7 +191,7 @@ - + @@ -196,16 +199,17 @@ - - - - + + + + + - - + + @@ -219,21 +223,21 @@ - + - + - + @@ -249,46 +253,50 @@ - - + + + + + - - - - + + + + + - + - + - + - + - + @@ -296,42 +304,42 @@ - + - + - + - + - + - + @@ -339,7 +347,7 @@ - + @@ -347,7 +355,7 @@ - + @@ -355,7 +363,7 @@ - + @@ -363,7 +371,7 @@ - + @@ -371,7 +379,7 @@ - + @@ -379,7 +387,7 @@ - + @@ -387,7 +395,7 @@ - + @@ -395,7 +403,7 @@ - + @@ -403,7 +411,7 @@ - + @@ -411,7 +419,7 @@ - + @@ -419,7 +427,7 @@ - + @@ -427,7 +435,7 @@ - + @@ -435,7 +443,7 @@ - + @@ -445,34 +453,36 @@ - - - + + + - - - + + + - - + + + + - - - + + + - - + + @@ -497,35 +507,35 @@ - + - + - + - + - + @@ -543,97 +553,97 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -645,54 +655,54 @@ - + - + - + - + - + - + - + - + @@ -700,21 +710,21 @@ - + - + - + @@ -722,14 +732,14 @@ - + - + @@ -737,41 +747,41 @@ - + - + - + - + - + - + @@ -780,36 +790,34 @@ - - - - - - + + + + - - - + + + - + - + - + @@ -817,28 +825,28 @@ - + - + - + - + @@ -918,40 +926,40 @@ - - - + + + - - - + + + - - - + + + - - - + + + - + - + @@ -959,7 +967,7 @@ - + @@ -967,7 +975,7 @@ - + @@ -975,7 +983,7 @@ - + @@ -983,7 +991,7 @@ - + @@ -991,7 +999,7 @@ - + @@ -999,39 +1007,39 @@ - + - + - + - + - + - + @@ -1046,7 +1054,7 @@ - + @@ -1054,14 +1062,14 @@ - + - + @@ -1075,14 +1083,14 @@ - + - + @@ -1090,7 +1098,7 @@ - + @@ -1098,7 +1106,7 @@ - + @@ -1106,35 +1114,35 @@ - + - + - + - + - + @@ -1142,42 +1150,42 @@ - + - + - + - + - + - + @@ -1185,49 +1193,49 @@ - + - + - + - + - + - + - + @@ -1235,7 +1243,7 @@ - + @@ -1243,7 +1251,7 @@ - + @@ -1251,7 +1259,7 @@ - + @@ -1259,14 +1267,14 @@ - + - + @@ -1274,7 +1282,7 @@ - + @@ -1282,7 +1290,7 @@ - + @@ -1290,7 +1298,7 @@ - + @@ -1298,7 +1306,7 @@ - + @@ -1306,7 +1314,7 @@ - + @@ -1314,7 +1322,7 @@ - + @@ -1322,7 +1330,7 @@ - + @@ -1330,7 +1338,7 @@ - + @@ -1338,7 +1346,7 @@ - + @@ -1346,7 +1354,7 @@ - + @@ -1354,7 +1362,7 @@ - + @@ -1362,7 +1370,7 @@ - + @@ -1370,7 +1378,7 @@ - + @@ -1378,7 +1386,7 @@ - + @@ -1386,14 +1394,14 @@ - + - + @@ -1401,21 +1409,21 @@ - + - + - + @@ -1423,7 +1431,7 @@ - + @@ -1431,7 +1439,7 @@ - + @@ -1439,7 +1447,7 @@ - + @@ -1447,14 +1455,14 @@ - + - + @@ -1468,7 +1476,7 @@ - + @@ -1476,21 +1484,21 @@ - + - + - + @@ -1498,7 +1506,7 @@ - + @@ -1506,28 +1514,28 @@ - + - + - + - + @@ -1535,7 +1543,7 @@ - + @@ -1558,7 +1566,7 @@ - + @@ -1571,7 +1579,7 @@ - + @@ -1585,105 +1593,105 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -2509,14 +2517,14 @@ - + - + @@ -2524,7 +2532,7 @@ - + @@ -2532,7 +2540,7 @@ - + @@ -2540,14 +2548,14 @@ - + - + @@ -3002,8 +3010,8 @@ - - + + @@ -3016,8 +3024,8 @@ - - + + @@ -3028,77 +3036,77 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -3112,27 +3120,27 @@ - + - + - + - + @@ -3145,7 +3153,7 @@ - + @@ -3153,41 +3161,41 @@ - + - + - + - + - + - + @@ -3195,7 +3203,7 @@ - + @@ -3258,133 +3266,350 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + + - - + + - - + + - - + + - - + + - + + - - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - diff --git a/languages/fpcupdeluxe-i386-win32.pot b/languages/fpcupdeluxe-i386-win32.pot index 5a97681c..cd4c8fcc 100644 --- a/languages/fpcupdeluxe-i386-win32.pot +++ b/languages/fpcupdeluxe-i386-win32.pot @@ -37,10 +37,6 @@ msgstr "" msgid "Build FPC unicode." msgstr "" -#: extrasettings.captioncheckfpcupbootstrappersonly -msgid "Only use fpcup bootstrappers." -msgstr "" - #: extrasettings.captioncheckgetupdates msgid "Check for fpcupdeluxe updates." msgstr "" @@ -164,209 +160,168 @@ msgid "Enable software emulation of 80 bit floats." msgstr "" #: fpcupdeluxemainform.upadvertisetools -msgctxt "fpcupdeluxemainform.upadvertisetools" msgid "FPCUPdeluxe can try to download them if available !" msgstr "" #: fpcupdeluxemainform.upbuildallcrosscompilers -msgctxt "fpcupdeluxemainform.upbuildallcrosscompilers" msgid "Going to auto-build all installed cross-compilers !" msgstr "" #: fpcupdeluxemainform.upbuildallcrosscompilerscheck -msgctxt "fpcupdeluxemainform.upbuildallcrosscompilerscheck" msgid "Checking FPC configfile [fpc.cfg] for cross-compilers in " msgstr "" #: fpcupdeluxemainform.upbuildallcrosscompilersfound -msgctxt "fpcupdeluxemainform.upbuildallcrosscompilersfound" msgid "Found crosscompiler for " msgstr "" #: fpcupdeluxemainform.upbuildallcrosscompilersupdate -msgctxt "fpcupdeluxemainform.upbuildallcrosscompilersupdate" msgid "Going to update cross-compiler." msgstr "" #: fpcupdeluxemainform.upbuildcrosscompiler -msgctxt "fpcupdeluxemainform.upbuildcrosscompiler" msgid "Going to install a cross-compiler from available sources." msgstr "" #: fpcupdeluxemainform.upcheckupdate -msgctxt "fpcupdeluxemainform.upcheckupdate" msgid "Please wait. Checking for updates." msgstr "" #: fpcupdeluxemainform.updarwinfolderwarning1 -msgctxt "fpcupdeluxemainform.updarwinfolderwarning1" msgid "FPCUPdeluxe cannot be run inside the Downloads folder." msgstr "" #: fpcupdeluxemainform.updarwinfolderwarning2 -msgctxt "fpcupdeluxemainform.updarwinfolderwarning2" msgid "This is NOT allowed by OSX security measures." msgstr "" #: fpcupdeluxemainform.updarwinfolderwarning3 -msgctxt "fpcupdeluxemainform.updarwinfolderwarning3" msgid "Copy FPCUPdeluxe into its own directory and run from there." msgstr "" #: fpcupdeluxemainform.upfolderwarning1 -msgctxt "fpcupdeluxemainform.upfolderwarning1" msgid "FPCUPdeluxe could not create its necessary setting-files." msgstr "" #: fpcupdeluxemainform.upfolderwarning2 -msgctxt "fpcupdeluxemainform.upfolderwarning2" msgid "Please check the folder permissions, and re-start." msgstr "" #: fpcupdeluxemainform.upinstallconfimation #, object-pascal-format -msgctxt "fpcupdeluxemainform.upinstallconfimation" msgid "Going to install %s and %s%s." msgstr "" #: fpcupdeluxemainform.upinstallconfimationsimple #, object-pascal-format -msgctxt "fpcupdeluxemainform.upinstallconfimationsimple" msgid "Going to install the %s." msgstr "" #: fpcupdeluxemainform.upinstallcrosscompiler -msgctxt "fpcupdeluxemainform.upinstallcrosscompiler" msgid "Going to install the cross-compiler for" msgstr "" #: fpcupdeluxemainform.upinstalldirectory -msgctxt "fpcupdeluxemainform.upinstalldirectory" msgid "Install directory" msgstr "" #: fpcupdeluxemainform.upinstalldirectorycurrent -msgctxt "fpcupdeluxemainform.upinstalldirectorycurrent" msgid "Current install directory" msgstr "" #: fpcupdeluxemainform.upinstallfpc -msgctxt "fpcupdeluxemainform.upinstallfpc" msgid "Going to install/update FPC." msgstr "" #: fpcupdeluxemainform.upinstallfpclazarus -msgctxt "fpcupdeluxemainform.upinstallfpclazarus" msgid "Going to install/update FPC and Lazarus." msgstr "" #: fpcupdeluxemainform.upinstalllazarus -msgctxt "fpcupdeluxemainform.upinstalllazarus" msgid "Going to install/update Lazarus." msgstr "" #: fpcupdeluxemainform.upinstallmodule -msgctxt "fpcupdeluxemainform.upinstallmodule" msgid "Going to install/update module" msgstr "" #: fpcupdeluxemainform.upinstallsettingscurrent -msgctxt "fpcupdeluxemainform.upinstallsettingscurrent" msgid "Got settings from install directory" msgstr "" #: fpcupdeluxemainform.uplookup -msgctxt "fpcupdeluxemainform.uplookup" msgid "Looking for" msgstr "" #: fpcupdeluxemainform.uplookupbintools -msgctxt "fpcupdeluxemainform.uplookupbintools" msgid "Going to look for the right cross-bins. Can (will) take some time !" msgstr "" #: fpcupdeluxemainform.uplookuplibtools -msgctxt "fpcupdeluxemainform.uplookuplibtools" msgid "Going to look for the right cross-libraries. Can (will) take some time !" msgstr "" #: fpcupdeluxemainform.uplookuptools -msgctxt "fpcupdeluxemainform.uplookuptools" msgid "Looking for FPCUPdeluxe cross-tools on GitHub (if any)." msgstr "" #: fpcupdeluxemainform.upmissingtools -msgctxt "fpcupdeluxemainform.upmissingtools" msgid "The building of a crosscompiler failed due to missing cross-tools." msgstr "" #: fpcupdeluxemainform.upquestioncontinue -msgctxt "fpcupdeluxemainform.upquestioncontinue" msgid "Do you want to continue ?" msgstr "" #: fpcupdeluxemainform.upquitrequest -msgctxt "fpcupdeluxemainform.upquitrequest" msgid "Please quit FPCUPdeluxe." msgstr "" #: fpcupdeluxemainform.upremovecrosscompiler -msgctxt "fpcupdeluxemainform.upremovecrosscompiler" msgid "Going to remove the cross-compiler for" msgstr "" #: fpcupdeluxemainform.upremovemodule -msgctxt "fpcupdeluxemainform.upremovemodule" msgid "Going to remove module" msgstr "" #: fpcupdeluxemainform.upselectcputarget -msgctxt "fpcupdeluxemainform.upselectcputarget" msgid "Please select a CPU target first." msgstr "" #: fpcupdeluxemainform.upselectfpclazarustarget -msgctxt "fpcupdeluxemainform.upselectfpclazarustarget" msgid "Please select a FPC and Lazarus target first" msgstr "" #: fpcupdeluxemainform.upselectfpctarget -msgctxt "fpcupdeluxemainform.upselectfpctarget" msgid "Please select a FPC target first" msgstr "" #: fpcupdeluxemainform.upselectlazarustarget -msgctxt "fpcupdeluxemainform.upselectlazarustarget" msgid "Please select a Lazarus target first" msgstr "" #: fpcupdeluxemainform.upselectostarget -msgctxt "fpcupdeluxemainform.upselectostarget" msgid "Please select an OS target first." msgstr "" #: fpcupdeluxemainform.upspacewarning -msgctxt "fpcupdeluxemainform.upspacewarning" msgid "Having a space in your install path is very ill-advised !" msgstr "" #: fpcupdeluxemainform.uptrybuildcrosscompiler -msgctxt "fpcupdeluxemainform.uptrybuildcrosscompiler" msgid "Trying to build the cross-compiler for" msgstr "" #: fpcupdeluxemainform.upupdatecrossall -msgctxt "fpcupdeluxemainform.upupdatecrossall" msgid "Going to update all crosscompilers" msgstr "" #: fpcupdeluxemainform.upupdatefound -msgctxt "fpcupdeluxemainform.upupdatefound" msgid "New FPCUPdeluxe version available" msgstr "" #: fpcupdeluxemainform.upupdatenotfound -msgctxt "fpcupdeluxemainform.upupdatenotfound" msgid "No updates found." msgstr "" @@ -589,7 +544,6 @@ msgid "Dock" msgstr "" #: tform1.dockbtn.hint -msgctxt "tform1.dockbtn.hint" msgid "Will change Lazarus into a single form docked editor." msgstr "" @@ -763,6 +717,10 @@ msgstr "" msgid "Portuguese (PT)" msgstr "" +#: tform1.mturkishlanguage.caption +msgid "Turkish (TR)" +msgstr "" + #: tform1.mukrainianlanguage.caption msgid "Ukrainian (UK)" msgstr "" @@ -776,7 +734,6 @@ msgid "OPM" msgstr "" #: tform1.opmbtn.hint -msgctxt "tform1.opmbtn.hint" msgid "Will install/update the Online Package Manager" msgstr "" @@ -831,7 +788,7 @@ msgid "Will install/update trunk version of both FPC and Lazarus." msgstr "" #: tform1.ultibobtn.hint -msgid "Install baremetal Ultibo for RPi3" +msgid "Install baremetal Ultibo for RPi2/3/4/5" msgstr "" #: tform1.wabtn.caption diff --git a/public/gitrevision.txt b/public/gitrevision.txt index d290b3af..098c6ef9 100644 --- a/public/gitrevision.txt +++ b/public/gitrevision.txt @@ -1 +1 @@ -[master]v2.4.0e-2897(ee9d6aa) +[master]v2.4.0e-2898(f43e73f) diff --git a/sources/crossinstallers/m_any_to_aixpowerpc.pas b/sources/crossinstallers/m_any_to_aixpowerpc.pas index 0e89c7e3..4ce65dbf 100644 --- a/sources/crossinstallers/m_any_to_aixpowerpc.pas +++ b/sources/crossinstallers/m_any_to_aixpowerpc.pas @@ -62,9 +62,6 @@ TAny_AIXPowerPC = class(TCrossInstaller) FAlreadyWarned: boolean; //did we warn user about errors and fixes already? public function GetLibs(Basepath:string):boolean;override; - {$ifndef FPCONLY} - function GetLibsLCL(LCL_Platform:string; Basepath:string):boolean;override; - {$endif} function GetBinUtils(Basepath:string):boolean;override; constructor Create; destructor Destroy; override; @@ -112,15 +109,6 @@ function TAny_AIXPowerPC.GetLibs(Basepath:string): boolean; FLibsFound:=True; end; -{$ifndef FPCONLY} -function TAny_AIXPowerPC.GetLibsLCL(LCL_Platform: string; Basepath: string): boolean; -begin - // todo: get gtk at least, add to FFPCCFGSnippet - ShowInfo('Implement lcl libs path from basepath '+BasePath+' for platform '+LCL_Platform,etdebug); - result:=inherited; -end; -{$endif} - function TAny_AIXPowerPC.GetBinUtils(Basepath:string): boolean; var AsFile: string; diff --git a/sources/crossinstallers/m_any_to_aixpowerpc64.pas b/sources/crossinstallers/m_any_to_aixpowerpc64.pas index 9f52afee..fb5762eb 100644 --- a/sources/crossinstallers/m_any_to_aixpowerpc64.pas +++ b/sources/crossinstallers/m_any_to_aixpowerpc64.pas @@ -62,9 +62,6 @@ TAny_AIXPowerPC64 = class(TCrossInstaller) FAlreadyWarned: boolean; //did we warn user about errors and fixes already? public function GetLibs(Basepath:string):boolean;override; - {$ifndef FPCONLY} - function GetLibsLCL(LCL_Platform:string; Basepath:string):boolean;override; - {$endif} function GetBinUtils(Basepath:string):boolean;override; constructor Create; destructor Destroy; override; @@ -126,15 +123,6 @@ function TAny_AIXPowerPC64.GetLibs(Basepath:string): boolean; FLibsFound:=True; end; -{$ifndef FPCONLY} -function TAny_AIXPowerPC64.GetLibsLCL(LCL_Platform: string; Basepath: string): boolean; -begin - // todo: get gtk at least, add to FFPCCFGSnippet - ShowInfo('Implement lcl libs path from basepath '+BasePath+' for platform '+LCL_Platform,etdebug); - result:=inherited; -end; -{$endif} - function TAny_AIXPowerPC64.GetBinUtils(Basepath:string): boolean; var AsFile: string; diff --git a/sources/crossinstallers/m_any_to_amigam68k.pas b/sources/crossinstallers/m_any_to_amigam68k.pas index face1428..4ec787c1 100644 --- a/sources/crossinstallers/m_any_to_amigam68k.pas +++ b/sources/crossinstallers/m_any_to_amigam68k.pas @@ -49,9 +49,6 @@ Tany_Amigam68k = class(TCrossInstaller) FAlreadyWarned: boolean; //did we warn user about errors and fixes already? public function GetLibs(Basepath:string):boolean;override; - {$ifndef FPCONLY} - function GetLibsLCL(LCL_Platform:string; Basepath:string):boolean;override; - {$endif} function GetBinUtils(Basepath:string):boolean;override; constructor Create; destructor Destroy; override; @@ -90,14 +87,6 @@ function Tany_Amigam68k.GetLibs(Basepath:string): boolean; end; end; -{$ifndef FPCONLY} -function Tany_Amigam68k.GetLibsLCL(LCL_Platform: string; Basepath: string): boolean; -begin - // todo: get gtk at least - result:=inherited; -end; -{$endif} - function Tany_Amigam68k.GetBinUtils(Basepath:string): boolean; var AsFile: string; diff --git a/sources/crossinstallers/m_any_to_aros386.pas b/sources/crossinstallers/m_any_to_aros386.pas index 68f0f571..b9ac5618 100644 --- a/sources/crossinstallers/m_any_to_aros386.pas +++ b/sources/crossinstallers/m_any_to_aros386.pas @@ -49,9 +49,6 @@ Tany_Aros386 = class(TCrossInstaller) FAlreadyWarned: boolean; //did we warn user about errors and fixes already? public function GetLibs(Basepath:string):boolean;override; - {$ifndef FPCONLY} - function GetLibsLCL(LCL_Platform:string; Basepath:string):boolean;override; - {$endif} function GetBinUtils(Basepath:string):boolean;override; constructor Create; destructor Destroy; override; @@ -90,14 +87,6 @@ function Tany_Aros386.GetLibs(Basepath:string): boolean; end; end; -{$ifndef FPCONLY} -function Tany_Aros386.GetLibsLCL(LCL_Platform: string; Basepath: string): boolean; -begin - // todo: get gtk at least - result:=inherited; -end; -{$endif} - function Tany_Aros386.GetBinUtils(Basepath:string): boolean; var AsFile: string; diff --git a/sources/crossinstallers/m_any_to_arosarm.pas b/sources/crossinstallers/m_any_to_arosarm.pas index 359f3cf2..4b99df4f 100644 --- a/sources/crossinstallers/m_any_to_arosarm.pas +++ b/sources/crossinstallers/m_any_to_arosarm.pas @@ -49,9 +49,6 @@ Tany_ArosARM = class(TCrossInstaller) FAlreadyWarned: boolean; //did we warn user about errors and fixes already? public function GetLibs(Basepath:string):boolean;override; - {$ifndef FPCONLY} - function GetLibsLCL(LCL_Platform:string; Basepath:string):boolean;override; - {$endif} function GetBinUtils(Basepath:string):boolean;override; constructor Create; destructor Destroy; override; @@ -89,14 +86,6 @@ function Tany_ArosARM.GetLibs(Basepath:string): boolean; end; end; -{$ifndef FPCONLY} -function Tany_ArosARM.GetLibsLCL(LCL_Platform: string; Basepath: string): boolean; -begin - // todo: get gtk at least - result:=inherited; -end; -{$endif} - function Tany_ArosARM.GetBinUtils(Basepath:string): boolean; var AsFile: string; diff --git a/sources/crossinstallers/m_any_to_arosx64.pas b/sources/crossinstallers/m_any_to_arosx64.pas index 74cdef29..06772507 100644 --- a/sources/crossinstallers/m_any_to_arosx64.pas +++ b/sources/crossinstallers/m_any_to_arosx64.pas @@ -49,9 +49,6 @@ Tany_Arosx64 = class(TCrossInstaller) FAlreadyWarned: boolean; //did we warn user about errors and fixes already? public function GetLibs(Basepath:string):boolean;override; - {$ifndef FPCONLY} - function GetLibsLCL(LCL_Platform:string; Basepath:string):boolean;override; - {$endif} function GetBinUtils(Basepath:string):boolean;override; constructor Create; destructor Destroy; override; @@ -89,14 +86,6 @@ function Tany_Arosx64.GetLibs(Basepath:string): boolean; end; end; -{$ifndef FPCONLY} -function Tany_Arosx64.GetLibsLCL(LCL_Platform: string; Basepath: string): boolean; -begin - // todo: get gtk at least - result:=inherited; -end; -{$endif} - function Tany_Arosx64.GetBinUtils(Basepath:string): boolean; var AsFile: string; diff --git a/sources/crossinstallers/m_any_to_atarim68k.pas b/sources/crossinstallers/m_any_to_atarim68k.pas index 25ca18c6..355d7bc8 100644 --- a/sources/crossinstallers/m_any_to_atarim68k.pas +++ b/sources/crossinstallers/m_any_to_atarim68k.pas @@ -49,9 +49,6 @@ Tany_atarim68k = class(TCrossInstaller) FAlreadyWarned: boolean; //did we warn user about errors and fixes already? public function GetLibs(Basepath:string):boolean;override; - {$ifndef FPCONLY} - function GetLibsLCL(LCL_Platform:string; Basepath:string):boolean;override; - {$endif} function GetBinUtils(Basepath:string):boolean;override; constructor Create; destructor Destroy; override; @@ -90,14 +87,6 @@ function Tany_atarim68k.GetLibs(Basepath:string): boolean; end; end; -{$ifndef FPCONLY} -function Tany_atarim68k.GetLibsLCL(LCL_Platform: string; Basepath: string): boolean; -begin - // todo: get gtk at least - result:=inherited; -end; -{$endif} - function Tany_atarim68k.GetBinUtils(Basepath:string): boolean; var AsFile: string; diff --git a/sources/crossinstallers/m_any_to_dragonflyx64.pas b/sources/crossinstallers/m_any_to_dragonflyx64.pas index 5b484de8..16ab515d 100644 --- a/sources/crossinstallers/m_any_to_dragonflyx64.pas +++ b/sources/crossinstallers/m_any_to_dragonflyx64.pas @@ -49,9 +49,6 @@ Tany_dragonflyx64 = class(TCrossInstaller) FAlreadyWarned: boolean; //did we warn user about errors and fixes already? public function GetLibs(Basepath:string):boolean;override; - {$ifndef FPCONLY} - function GetLibsLCL(LCL_Platform:string; Basepath:string):boolean;override; - {$endif} function GetBinUtils(Basepath:string):boolean;override; constructor Create; destructor Destroy; override; @@ -98,14 +95,6 @@ function Tany_dragonflyx64.GetLibs(Basepath:string): boolean; end; end; -{$ifndef FPCONLY} -function Tany_dragonflyx64.GetLibsLCL(LCL_Platform: string; Basepath: string): boolean; -begin - // todo: get gtk at least - result:=inherited; -end; -{$endif} - function Tany_dragonflyx64.GetBinUtils(Basepath:string): boolean; var AsFile: string; diff --git a/sources/crossinstallers/m_any_to_embeddedaarch64.pas b/sources/crossinstallers/m_any_to_embeddedaarch64.pas index 3841abd7..6536ae46 100644 --- a/sources/crossinstallers/m_any_to_embeddedaarch64.pas +++ b/sources/crossinstallers/m_any_to_embeddedaarch64.pas @@ -48,9 +48,6 @@ TAny_Embeddedaarch64 = class(TCrossInstaller) FAlreadyWarned: boolean; //did we warn user about errors and fixes already? public function GetLibs(Basepath:string):boolean;override; - {$ifndef FPCONLY} - function GetLibsLCL(LCL_Platform:string; Basepath:string):boolean;override; - {$endif} function GetBinUtils(Basepath:string):boolean;override; constructor Create; destructor Destroy; override; @@ -112,15 +109,6 @@ function TAny_Embeddedaarch64.GetLibs(Basepath:string): boolean; end; end; -{$ifndef FPCONLY} -function TAny_Embeddedaarch64.GetLibsLCL(LCL_Platform: string; Basepath: string): boolean; -begin - // todo: get gtk at least, add to FFPCCFGSnippet - ShowInfo('Todo: implement lcl libs path from basepath '+BasePath,etdebug); - result:=inherited; -end; -{$endif} - function TAny_Embeddedaarch64.GetBinUtils(Basepath:string): boolean; var AsFile: string; diff --git a/sources/crossinstallers/m_any_to_embeddedarm.pas b/sources/crossinstallers/m_any_to_embeddedarm.pas index 84dd9216..0e41b4ba 100644 --- a/sources/crossinstallers/m_any_to_embeddedarm.pas +++ b/sources/crossinstallers/m_any_to_embeddedarm.pas @@ -48,9 +48,6 @@ TAny_Embeddedarm = class(TCrossInstaller) FAlreadyWarned: boolean; //did we warn user about errors and fixes already? public function GetLibs(Basepath:string):boolean;override; - {$ifndef FPCONLY} - function GetLibsLCL(LCL_Platform:string; Basepath:string):boolean;override; - {$endif} function GetBinUtils(Basepath:string):boolean;override; constructor Create; destructor Destroy; override; @@ -124,15 +121,6 @@ function TAny_Embeddedarm.GetLibs(Basepath:string): boolean; end; end; -{$ifndef FPCONLY} -function TAny_Embeddedarm.GetLibsLCL(LCL_Platform: string; Basepath: string): boolean; -begin - // todo: get gtk at least, add to FFPCCFGSnippet - ShowInfo('Todo: implement lcl libs path from basepath '+BasePath,etdebug); - result:=inherited; -end; -{$endif} - function TAny_Embeddedarm.GetBinUtils(Basepath:string): boolean; var AsFile: string; diff --git a/sources/crossinstallers/m_any_to_embeddedavr.pas b/sources/crossinstallers/m_any_to_embeddedavr.pas index 36f5c77f..d1a85e68 100644 --- a/sources/crossinstallers/m_any_to_embeddedavr.pas +++ b/sources/crossinstallers/m_any_to_embeddedavr.pas @@ -64,9 +64,6 @@ TAny_Embeddedavr = class(TCrossInstaller) FAlreadyWarned: boolean; //did we warn user about errors and fixes already? public function GetLibs(Basepath:string):boolean;override; - {$ifndef FPCONLY} - function GetLibsLCL(LCL_Platform:string; Basepath:string):boolean;override; - {$endif} function GetBinUtils(Basepath:string):boolean;override; constructor Create; destructor Destroy; override; @@ -159,15 +156,6 @@ function TAny_Embeddedavr.GetLibs(Basepath:string): boolean; end; end; -{$ifndef FPCONLY} -function TAny_Embeddedavr.GetLibsLCL(LCL_Platform: string; Basepath: string): boolean; -begin - // todo: get gtk at least, add to FFPCCFGSnippet - ShowInfo('Todo: implement lcl libs path from basepath '+BasePath,etdebug); - result:=inherited; -end; -{$endif} - function TAny_Embeddedavr.GetBinUtils(Basepath:string): boolean; var AsFile: string; diff --git a/sources/crossinstallers/m_any_to_embeddedmipsel.pas b/sources/crossinstallers/m_any_to_embeddedmipsel.pas index 43d68610..59d14ef0 100644 --- a/sources/crossinstallers/m_any_to_embeddedmipsel.pas +++ b/sources/crossinstallers/m_any_to_embeddedmipsel.pas @@ -64,9 +64,6 @@ TAny_Embeddedmipsel = class(TCrossInstaller) FAlreadyWarned: boolean; //did we warn user about errors and fixes already? public function GetLibs(Basepath:string):boolean;override; - {$ifndef FPCONLY} - function GetLibsLCL(LCL_Platform:string; Basepath:string):boolean;override; - {$endif} function GetBinUtils(Basepath:string):boolean;override; constructor Create; destructor Destroy; override; @@ -123,15 +120,6 @@ function TAny_Embeddedmipsel.GetLibs(Basepath:string): boolean; FLibsFound:=True; end; -{$ifndef FPCONLY} -function TAny_Embeddedmipsel.GetLibsLCL(LCL_Platform: string; Basepath: string): boolean; -begin - // todo: get gtk at least, add to FFPCCFGSnippet - ShowInfo('Todo: implement lcl libs path from basepath '+BasePath,etdebug); - result:=inherited; -end; -{$endif} - function TAny_Embeddedmipsel.GetBinUtils(Basepath:string): boolean; var AsFile: string; diff --git a/sources/crossinstallers/m_any_to_freebsdaarch64.pas b/sources/crossinstallers/m_any_to_freebsdaarch64.pas index 56e11f26..f03526cf 100644 --- a/sources/crossinstallers/m_any_to_freebsdaarch64.pas +++ b/sources/crossinstallers/m_any_to_freebsdaarch64.pas @@ -53,9 +53,6 @@ Tany_freebsdaarch64 = class(TCrossInstaller) FAlreadyWarned: boolean; //did we warn user about errors and fixes already? public function GetLibs(Basepath:string):boolean;override; - {$ifndef FPCONLY} - function GetLibsLCL(LCL_Platform:string; Basepath:string):boolean;override; - {$endif} function GetBinUtils(Basepath:string):boolean;override; constructor Create; destructor Destroy; override; @@ -108,14 +105,6 @@ function Tany_freebsdaarch64.GetLibs(Basepath:string): boolean; end; end; -{$ifndef FPCONLY} -function Tany_freebsdaarch64.GetLibsLCL(LCL_Platform: string; Basepath: string): boolean; -begin - // todo: get gtk at least - result:=inherited; -end; -{$endif} - function Tany_freebsdaarch64.GetBinUtils(Basepath:string): boolean; var AsFile: string; diff --git a/sources/crossinstallers/m_any_to_freebsdx64.pas b/sources/crossinstallers/m_any_to_freebsdx64.pas index 674e100c..3e78bf68 100644 --- a/sources/crossinstallers/m_any_to_freebsdx64.pas +++ b/sources/crossinstallers/m_any_to_freebsdx64.pas @@ -53,9 +53,6 @@ Tany_freebsdx64 = class(TCrossInstaller) FAlreadyWarned: boolean; //did we warn user about errors and fixes already? public function GetLibs(Basepath:string):boolean;override; - {$ifndef FPCONLY} - function GetLibsLCL(LCL_Platform:string; Basepath:string):boolean;override; - {$endif} function GetBinUtils(Basepath:string):boolean;override; constructor Create; destructor Destroy; override; @@ -108,14 +105,6 @@ function Tany_freebsdx64.GetLibs(Basepath:string): boolean; end; end; -{$ifndef FPCONLY} -function Tany_freebsdx64.GetLibsLCL(LCL_Platform: string; Basepath: string): boolean; -begin - // todo: get gtk at least - result:=inherited; -end; -{$endif} - function Tany_freebsdx64.GetBinUtils(Basepath:string): boolean; var AsFile: string; diff --git a/sources/crossinstallers/m_any_to_go32v2i386.pas b/sources/crossinstallers/m_any_to_go32v2i386.pas index c662c4b4..b351a1ac 100644 --- a/sources/crossinstallers/m_any_to_go32v2i386.pas +++ b/sources/crossinstallers/m_any_to_go32v2i386.pas @@ -53,7 +53,7 @@ TAny_go32v2i386 = class(TCrossInstaller) public function GetLibs(Basepath:string):boolean;override; {$ifndef FPCONLY} - function GetLibsLCL(LCL_Platform:string; Basepath:string):boolean;override; + function GetLibsLCL(LCL_Platform:LCL_TYPE; Basepath:string):boolean;override; {$endif} function GetBinUtils(Basepath:string):boolean;override; constructor Create; @@ -89,9 +89,9 @@ function TAny_go32v2i386.GetLibs(Basepath:string): boolean; end; {$ifndef FPCONLY} -function TAny_go32v2i386.GetLibsLCL(LCL_Platform: string; Basepath: string): boolean; +function TAny_go32v2i386.GetLibsLCL(LCL_Platform: LCL_TYPE; Basepath: string): boolean; begin - ShowInfo('No support for LCL platform '+LCL_Platform,etInfo); + ShowInfo('No support for LCL platform '+GetLCLName(LCL_Platform),etInfo); result:=inherited; end; {$endif} diff --git a/sources/crossinstallers/m_any_to_haiku386.pas b/sources/crossinstallers/m_any_to_haiku386.pas index 688169cb..334442d1 100644 --- a/sources/crossinstallers/m_any_to_haiku386.pas +++ b/sources/crossinstallers/m_any_to_haiku386.pas @@ -56,9 +56,6 @@ Tany_haiku386 = class(TCrossInstaller) FAlreadyWarned: boolean; //did we warn user about errors and fixes already? public function GetLibs(Basepath:string):boolean;override; - {$ifndef FPCONLY} - function GetLibsLCL(LCL_Platform:string; Basepath:string):boolean;override; - {$endif} function GetBinUtils(Basepath:string):boolean;override; constructor Create; destructor Destroy; override; @@ -93,14 +90,6 @@ function Tany_haiku386.GetLibs(Basepath:string): boolean; end; -{$ifndef FPCONLY} -function Tany_haiku386.GetLibsLCL(LCL_Platform: string; Basepath: string): boolean; -begin - // todo: get gtk at least - result:=inherited; -end; -{$endif} - function Tany_haiku386.GetBinUtils(Basepath:string): boolean; var AsFile: string; diff --git a/sources/crossinstallers/m_any_to_haikux64.pas b/sources/crossinstallers/m_any_to_haikux64.pas index 304d3b9d..3482eccd 100644 --- a/sources/crossinstallers/m_any_to_haikux64.pas +++ b/sources/crossinstallers/m_any_to_haikux64.pas @@ -57,9 +57,6 @@ Tany_haikux64 = class(TCrossInstaller) FAlreadyWarned: boolean; //did we warn user about errors and fixes already? public function GetLibs(Basepath:string):boolean;override; - {$ifndef FPCONLY} - function GetLibsLCL(LCL_Platform:string; Basepath:string):boolean;override; - {$endif} function GetBinUtils(Basepath:string):boolean;override; constructor Create; destructor Destroy; override; @@ -92,14 +89,6 @@ function Tany_haikux64.GetLibs(Basepath:string): boolean; end; -{$ifndef FPCONLY} -function Tany_haikux64.GetLibsLCL(LCL_Platform: string; Basepath: string): boolean; -begin - // todo: get gtk at least - result:=inherited; -end; -{$endif} - function Tany_haikux64.GetBinUtils(Basepath:string): boolean; var AsFile: string; diff --git a/sources/crossinstallers/m_any_to_javajvm.pas b/sources/crossinstallers/m_any_to_javajvm.pas index 07c30a1c..0ea7c628 100644 --- a/sources/crossinstallers/m_any_to_javajvm.pas +++ b/sources/crossinstallers/m_any_to_javajvm.pas @@ -56,9 +56,6 @@ Tany_javajvm = class(TCrossInstaller) FAlreadyWarned: boolean; //did we warn user about errors and fixes already? public function GetLibs({%H-}Basepath:string):boolean;override; - {$ifndef FPCONLY} - function GetLibsLCL(LCL_Platform:string; Basepath:string):boolean;override; - {$endif} function GetBinUtils(Basepath:string):boolean;override; constructor Create; destructor Destroy; override; @@ -92,14 +89,6 @@ function Tany_javajvm.GetLibs(Basepath:string): boolean; end; -{$ifndef FPCONLY} -function Tany_javajvm.GetLibsLCL(LCL_Platform: string; Basepath: string): boolean; -begin - // todo: get gtk at least - result:=inherited; -end; -{$endif} - function Tany_javajvm.GetBinUtils(Basepath:string): boolean; begin result:=inherited; diff --git a/sources/crossinstallers/m_any_to_linux_base.pas b/sources/crossinstallers/m_any_to_linux_base.pas index f065bea4..32e7e467 100644 --- a/sources/crossinstallers/m_any_to_linux_base.pas +++ b/sources/crossinstallers/m_any_to_linux_base.pas @@ -64,9 +64,6 @@ Tany_linux = class(TCrossInstaller) {$ENDIF MULTILIB} public function GetLibs(Basepath:string):boolean;override; - {$ifndef FPCONLY} - function GetLibsLCL(LCL_Platform:string; Basepath:string):boolean;override; - {$endif} function GetBinUtils(Basepath:string):boolean;override; constructor Create; destructor Destroy; override; @@ -389,14 +386,6 @@ function Tany_linux.GetLibs(Basepath:string): boolean; end; end; -{$ifndef FPCONLY} -function Tany_linux.GetLibsLCL(LCL_Platform: string; Basepath: string): boolean; -begin - // todo: get gtk at least - result:=inherited; -end; -{$endif} - function Tany_linux.GetBinUtils(Basepath:string): boolean; var AsFile: string; diff --git a/sources/crossinstallers/m_any_to_linuxarm.pas b/sources/crossinstallers/m_any_to_linuxarm.pas index cf5eb75c..a8c3a57c 100644 --- a/sources/crossinstallers/m_any_to_linuxarm.pas +++ b/sources/crossinstallers/m_any_to_linuxarm.pas @@ -56,9 +56,6 @@ Tany_linuxarm = class(TCrossInstaller) FAlreadyWarned: boolean; //did we warn user about errors and fixes already? public function GetLibs(Basepath:string):boolean;override; - {$ifndef FPCONLY} - function GetLibsLCL(LCL_Platform:string; Basepath:string):boolean;override; - {$endif} function GetBinUtils(Basepath:string):boolean;override; constructor Create; end; @@ -98,15 +95,6 @@ function Tany_linuxarm.GetLibs(Basepath:string): boolean; end; end; -{$ifndef FPCONLY} -function Tany_linuxarm.GetLibsLCL(LCL_Platform: string; Basepath: string): boolean; -begin - // todo: get gtk at least, add to FFPCCFGSnippet - ShowInfo('Implement lcl libs path from basepath '+BasePath+' for platform '+LCL_Platform,etDebug); - result:=inherited; -end; -{$endif} - function Tany_linuxarm.GetBinUtils(Basepath:string): boolean; var AsFile: string; diff --git a/sources/crossinstallers/m_any_to_linuxloongarch64.pas b/sources/crossinstallers/m_any_to_linuxloongarch64.pas index c34af5d0..dbbb091c 100644 --- a/sources/crossinstallers/m_any_to_linuxloongarch64.pas +++ b/sources/crossinstallers/m_any_to_linuxloongarch64.pas @@ -49,9 +49,6 @@ Tany_linuxloongarch64 = class(TCrossInstaller) FAlreadyWarned: boolean; //did we warn user about errors and fixes already? public function GetLibs(Basepath:string):boolean;override; - {$ifndef FPCONLY} - function GetLibsLCL(LCL_Platform:string; Basepath:string):boolean;override; - {$endif} function GetBinUtils(Basepath:string):boolean;override; constructor Create; destructor Destroy; override; @@ -99,14 +96,6 @@ function Tany_linuxloongarch64.GetLibs(Basepath:string): boolean; end; end; -{$ifndef FPCONLY} -function Tany_linuxloongarch64.GetLibsLCL(LCL_Platform: string; Basepath: string): boolean; -begin - // todo: get gtk at least - result:=inherited; -end; -{$endif} - function Tany_linuxloongarch64.GetBinUtils(Basepath:string): boolean; var AsFile: string; diff --git a/sources/crossinstallers/m_any_to_linuxm68k.pas b/sources/crossinstallers/m_any_to_linuxm68k.pas index dfea2247..426c692b 100644 --- a/sources/crossinstallers/m_any_to_linuxm68k.pas +++ b/sources/crossinstallers/m_any_to_linuxm68k.pas @@ -48,9 +48,6 @@ TAny_Linuxm68k = class(TCrossInstaller) FAlreadyWarned: boolean; //did we warn user about errors and fixes already? public function GetLibs(Basepath:string):boolean;override; - {$ifndef FPCONLY} - function GetLibsLCL(LCL_Platform:string; Basepath:string):boolean;override; - {$endif} function GetBinUtils(Basepath:string):boolean;override; constructor Create; destructor Destroy; override; @@ -87,15 +84,6 @@ function TAny_Linuxm68k.GetLibs(Basepath:string): boolean; end; end; -{$ifndef FPCONLY} -function TAny_Linuxm68k.GetLibsLCL(LCL_Platform: string; Basepath: string): boolean; -begin - // todo: get gtk at least, add to FFPCCFGSnippet - ShowInfo('Todo: implement lcl libs path from basepath '+BasePath,etdebug); - result:=inherited; -end; -{$endif} - function TAny_Linuxm68k.GetBinUtils(Basepath:string): boolean; var AsFile : string; diff --git a/sources/crossinstallers/m_any_to_linuxmips.pas b/sources/crossinstallers/m_any_to_linuxmips.pas index c8329709..fdc8924c 100644 --- a/sources/crossinstallers/m_any_to_linuxmips.pas +++ b/sources/crossinstallers/m_any_to_linuxmips.pas @@ -48,9 +48,6 @@ Tany_linuxmips = class(TCrossInstaller) FAlreadyWarned: boolean; //did we warn user about errors and fixes already? public function GetLibs(Basepath:string):boolean;override; - {$ifndef FPCONLY} - function GetLibsLCL(LCL_Platform:string; Basepath:string):boolean;override; - {$endif} function GetBinUtils(Basepath:string):boolean;override; constructor Create; destructor Destroy; override; @@ -89,14 +86,6 @@ function Tany_linuxmips.GetLibs(Basepath:string): boolean; end; end; -{$ifndef FPCONLY} -function Tany_linuxmips.GetLibsLCL(LCL_Platform: string; Basepath: string): boolean; -begin - // todo: get gtk at least - result:=inherited; -end; -{$endif} - function Tany_linuxmips.GetBinUtils(Basepath:string): boolean; var AsFile: string; diff --git a/sources/crossinstallers/m_any_to_linuxmipsel.pas b/sources/crossinstallers/m_any_to_linuxmipsel.pas index fee5f47b..d2e9c649 100644 --- a/sources/crossinstallers/m_any_to_linuxmipsel.pas +++ b/sources/crossinstallers/m_any_to_linuxmipsel.pas @@ -93,9 +93,6 @@ Tany_linuxmipsel = class(TCrossInstaller) FAlreadyWarned: boolean; //did we warn user about errors and fixes already? public function GetLibs(Basepath:string):boolean;override; - {$ifndef FPCONLY} - function GetLibsLCL(LCL_Platform:string; Basepath:string):boolean;override; - {$endif} function GetBinUtils(Basepath:string):boolean;override; constructor Create; destructor Destroy; override; @@ -134,14 +131,6 @@ function Tany_linuxmipsel.GetLibs(Basepath:string): boolean; end; end; -{$ifndef FPCONLY} -function Tany_linuxmipsel.GetLibsLCL(LCL_Platform: string; Basepath: string): boolean; -begin - // todo: get gtk at least - result:=inherited; -end; -{$endif} - function Tany_linuxmipsel.GetBinUtils(Basepath:string): boolean; // You can copy the files from Android NDK, e.g. // android-ndk-r9c\toolchains\mipsel-linux-android-4.8\prebuilt\windows-x86_64\bin\mipsel-linux-android-as.exe diff --git a/sources/crossinstallers/m_any_to_linuxpowerpc64.pas b/sources/crossinstallers/m_any_to_linuxpowerpc64.pas index 0027b4a0..fa926d34 100644 --- a/sources/crossinstallers/m_any_to_linuxpowerpc64.pas +++ b/sources/crossinstallers/m_any_to_linuxpowerpc64.pas @@ -49,9 +49,6 @@ Tany_linuxpowerpc64 = class(TCrossInstaller) FAlreadyWarned: boolean; //did we warn user about errors and fixes already? public function GetLibs(Basepath:string):boolean;override; - {$ifndef FPCONLY} - function GetLibsLCL(LCL_Platform:string; Basepath:string):boolean;override; - {$endif} function GetBinUtils(Basepath:string):boolean;override; constructor Create; destructor Destroy; override; @@ -125,14 +122,6 @@ function Tany_linuxpowerpc64.GetLibs(Basepath:string): boolean; end; end; -{$ifndef FPCONLY} -function Tany_linuxpowerpc64.GetLibsLCL(LCL_Platform: string; Basepath: string): boolean; -begin - // todo: get gtk at least - result:=inherited; -end; -{$endif} - function Tany_linuxpowerpc64.GetBinUtils(Basepath:string): boolean; var AsFile: string; diff --git a/sources/crossinstallers/m_any_to_linuxxtensa.pas b/sources/crossinstallers/m_any_to_linuxxtensa.pas index 33aa3f39..1075b272 100644 --- a/sources/crossinstallers/m_any_to_linuxxtensa.pas +++ b/sources/crossinstallers/m_any_to_linuxxtensa.pas @@ -48,9 +48,6 @@ TAny_LinuxXtensa = class(TCrossInstaller) FAlreadyWarned: boolean; //did we warn user about errors and fixes already? public function GetLibs(Basepath:string):boolean;override; - {$ifndef FPCONLY} - function GetLibsLCL(LCL_Platform:string; Basepath:string):boolean;override; - {$endif} function GetBinUtils(Basepath:string):boolean;override; constructor Create; destructor Destroy; override; @@ -89,15 +86,6 @@ function TAny_LinuxXtensa.GetLibs(Basepath:string): boolean; end; end; -{$ifndef FPCONLY} -function TAny_LinuxXtensa.GetLibsLCL(LCL_Platform: string; Basepath: string): boolean; -begin - // todo: get gtk at least, add to FFPCCFGSnippet - ShowInfo('Todo: implement lcl libs path from basepath '+BasePath,etdebug); - result:=inherited; -end; -{$endif} - function TAny_LinuxXtensa.GetBinUtils(Basepath:string): boolean; var AsFile: string; diff --git a/sources/crossinstallers/m_any_to_morphospowerpc.pas b/sources/crossinstallers/m_any_to_morphospowerpc.pas index e5563eca..c31ceac0 100644 --- a/sources/crossinstallers/m_any_to_morphospowerpc.pas +++ b/sources/crossinstallers/m_any_to_morphospowerpc.pas @@ -49,9 +49,6 @@ Tany_MorphosPowerPC = class(TCrossInstaller) FAlreadyWarned: boolean; //did we warn user about errors and fixes already? public function GetLibs(Basepath:string):boolean;override; - {$ifndef FPCONLY} - function GetLibsLCL(LCL_Platform:string; Basepath:string):boolean;override; - {$endif} function GetBinUtils(Basepath:string):boolean;override; constructor Create; destructor Destroy; override; @@ -89,14 +86,6 @@ function Tany_MorphosPowerPC.GetLibs(Basepath:string): boolean; end; end; -{$ifndef FPCONLY} -function Tany_MorphosPowerPC.GetLibsLCL(LCL_Platform: string; Basepath: string): boolean; -begin - // todo: get gtk at least - result:=inherited; -end; -{$endif} - function Tany_MorphosPowerPC.GetBinUtils(Basepath:string): boolean; var AsFile: string; diff --git a/sources/crossinstallers/m_any_to_msdosi8086.pas b/sources/crossinstallers/m_any_to_msdosi8086.pas index 74bb305a..831716f7 100644 --- a/sources/crossinstallers/m_any_to_msdosi8086.pas +++ b/sources/crossinstallers/m_any_to_msdosi8086.pas @@ -54,7 +54,7 @@ TAny_msdosi8086 = class(TCrossInstaller) public function GetLibs(Basepath:string):boolean;override; {$ifndef FPCONLY} - function GetLibsLCL(LCL_Platform:string; Basepath:string):boolean;override; + function GetLibsLCL(LCL_Platform:LCL_TYPE; Basepath:string):boolean;override; {$endif} function GetBinUtils(Basepath:string):boolean;override; constructor Create; @@ -114,9 +114,9 @@ function TAny_msdosi8086.GetLibs(Basepath:string): boolean; end; {$ifndef FPCONLY} -function TAny_msdosi8086.GetLibsLCL(LCL_Platform: string; Basepath: string): boolean; +function TAny_msdosi8086.GetLibsLCL(LCL_Platform: LCL_TYPE; Basepath: string): boolean; begin - ShowInfo('No support for LCL platform '+LCL_Platform,etInfo); + ShowInfo('No support for LCL platform '+GetLCLName(LCL_Platform),etInfo); result:=inherited; end; {$endif} diff --git a/sources/crossinstallers/m_any_to_openbsd_base.pas b/sources/crossinstallers/m_any_to_openbsd_base.pas index 584db16b..1491a6c6 100644 --- a/sources/crossinstallers/m_any_to_openbsd_base.pas +++ b/sources/crossinstallers/m_any_to_openbsd_base.pas @@ -45,9 +45,6 @@ Tany_openbsd_base = class(TCrossInstaller) FAlreadyWarned: boolean; //did we warn user about errors and fixes already? public function GetLibs(Basepath:string):boolean;override; - {$ifndef FPCONLY} - function GetLibsLCL(LCL_Platform:string; Basepath:string):boolean;override; - {$endif} function GetBinUtils(Basepath:string):boolean;override; constructor Create; destructor Destroy; override; @@ -104,15 +101,6 @@ function Tany_openbsd_base.GetLibs(Basepath:string): boolean; end; end; -{$ifndef FPCONLY} -function Tany_openbsd_base.GetLibsLCL(LCL_Platform: string; Basepath: string): boolean; -begin - // todo: get gtk at least, add to FFPCCFGSnippet - ShowInfo('Implement lcl libs path from basepath '+BasePath+' for platform '+LCL_Platform,etDebug); - result:=inherited; -end; -{$endif} - function Tany_openbsd_base.GetBinUtils(Basepath:string): boolean; var AsFile: string; diff --git a/sources/crossinstallers/m_linux386_to_mips.pas b/sources/crossinstallers/m_linux386_to_mips.pas index 3ac95eb5..8fe862c0 100644 --- a/sources/crossinstallers/m_linux386_to_mips.pas +++ b/sources/crossinstallers/m_linux386_to_mips.pas @@ -83,9 +83,6 @@ TLinux386_mips = class(TCrossInstaller) FAlreadyWarned: boolean; //did we warn user about errors and fixes already? public function GetLibs(Basepath:string):boolean;override; - {$ifndef FPCONLY} - function GetLibsLCL(LCL_Platform:string; Basepath:string):boolean;override; - {$endif} function GetBinUtils(Basepath:string):boolean;override; constructor Create; destructor Destroy; override; @@ -117,14 +114,6 @@ function TLinux386_mips.GetLibs(Basepath:string): boolean; end; end; -{$ifndef FPCONLY} -function TLinux386_mips.GetLibsLCL(LCL_Platform: string; Basepath: string): boolean; -begin - // todo: get gtk at least - result:=inherited; -end; -{$endif} - function TLinux386_mips.GetBinUtils(Basepath:string): boolean; var AsFile: string; diff --git a/sources/crossinstallers/m_linux386_to_mipsel.pas b/sources/crossinstallers/m_linux386_to_mipsel.pas index 9619fe5f..a9d0d2ee 100644 --- a/sources/crossinstallers/m_linux386_to_mipsel.pas +++ b/sources/crossinstallers/m_linux386_to_mipsel.pas @@ -84,9 +84,6 @@ TLinux386_mipsel = class(TCrossInstaller) FAlreadyWarned: boolean; //did we warn user about errors and fixes already? public function GetLibs(Basepath:string):boolean;override; - {$ifndef FPCONLY} - function GetLibsLCL(LCL_Platform:string; Basepath:string):boolean;override; - {$endif} function GetBinUtils(Basepath:string):boolean;override; constructor Create; destructor Destroy; override; @@ -120,14 +117,6 @@ function TLinux386_mipsel.GetLibs(Basepath:string): boolean; end; end; -{$ifndef FPCONLY} -function TLinux386_mipsel.GetLibsLCL(LCL_Platform: string; Basepath: string): boolean; -begin - // todo: get gtk at least - result:=inherited; -end; -{$endif} - function TLinux386_mipsel.GetBinUtils(Basepath:string): boolean; const DirName='mipsel-linux'; diff --git a/sources/crossinstallers/m_linux386_to_wincearm.pas b/sources/crossinstallers/m_linux386_to_wincearm.pas index 56d88c8d..33f702d8 100644 --- a/sources/crossinstallers/m_linux386_to_wincearm.pas +++ b/sources/crossinstallers/m_linux386_to_wincearm.pas @@ -46,9 +46,6 @@ TLinux386_wincearm = class(TCrossInstaller) FAlreadyWarned: boolean; //did we warn user about errors and fixes already? public function GetLibs(Basepath:string):boolean;override; - {$ifndef FPCONLY} - function GetLibsLCL(LCL_Platform:string; Basepath:string):boolean;override; - {$endif} function GetBinUtils(Basepath:string):boolean;override; constructor Create; destructor Destroy; override; @@ -81,15 +78,6 @@ function TLinux386_wincearm.GetLibs(Basepath:string): boolean; end; end; -{$ifndef FPCONLY} -function TLinux386_wincearm.GetLibsLCL(LCL_Platform: string; Basepath: string): boolean; -begin - // todo: get gtk at least, add to FFPCCFGSnippet - ShowInfo('Todo: implement lcl libs path from basepath '+BasePath,etdebug); - result:=inherited; -end; -{$endif} - function TLinux386_wincearm.GetBinUtils(Basepath:string): boolean; var AsFile: string; diff --git a/sources/crossinstallers/m_win32_to_linuxmips.pas b/sources/crossinstallers/m_win32_to_linuxmips.pas index a76eed61..f6997ed8 100644 --- a/sources/crossinstallers/m_win32_to_linuxmips.pas +++ b/sources/crossinstallers/m_win32_to_linuxmips.pas @@ -68,9 +68,6 @@ Twin32_linuxmips = class(TCrossInstaller) FAlreadyWarned: boolean; //did we warn user about errors and fixes already? public function GetLibs(Basepath:string):boolean;override; - {$ifndef FPCONLY} - function GetLibsLCL(LCL_Platform:string; Basepath:string):boolean;override; - {$endif} function GetBinUtils(Basepath:string):boolean;override; constructor Create; destructor Destroy; override; @@ -101,14 +98,6 @@ function Twin32_linuxmips.GetLibs(Basepath:string): boolean; end; end; -{$ifndef FPCONLY} -function Twin32_linuxmips.GetLibsLCL(LCL_Platform: string; Basepath: string): boolean; -begin - // todo: get gtk at least - result:=inherited; -end; -{$endif} - function Twin32_linuxmips.GetBinUtils(Basepath:string): boolean; var AsFile: string; diff --git a/sources/crossinstallers/m_win32_to_wincearm.pas b/sources/crossinstallers/m_win32_to_wincearm.pas index 16f5754d..0a1bd34e 100644 --- a/sources/crossinstallers/m_win32_to_wincearm.pas +++ b/sources/crossinstallers/m_win32_to_wincearm.pas @@ -64,9 +64,6 @@ TWin32_wincearm = class(TCrossInstaller) FAlreadyWarned: boolean; //did we warn user about errors and fixes already? public function GetLibs(Basepath:string):boolean;override; - {$ifndef FPCONLY} - function GetLibsLCL(LCL_Platform:string; Basepath:string):boolean;override; - {$endif} function GetBinUtils(Basepath:string):boolean;override; constructor Create; destructor Destroy; override; @@ -100,15 +97,6 @@ function TWin32_wincearm.GetLibs(Basepath:string): boolean; end; end; -{$ifndef FPCONLY} -function TWin32_wincearm.GetLibsLCL(LCL_Platform: string; Basepath: string): boolean; -begin - // todo: get gtk at least, add to FFPCCFGSnippet - ShowInfo('Todo: implement lcl libs path from basepath '+BasePath,etdebug); - result:=inherited; -end; -{$endif} - function TWin32_wincearm.GetBinUtils(Basepath:string): boolean; var AsFile: string; diff --git a/sources/fpcup.ini b/sources/fpcup.ini index b4764a43..92b910c1 100644 --- a/sources/fpcup.ini +++ b/sources/fpcup.ini @@ -19,7 +19,7 @@ ; ... and you can define your own, like below: [fpcupinfo] -inifileversion=2.2.7.4 +inifileversion=2.2.7.5 [ALIASfpcURL] stable.git=https://github.com/LongDirtyAnimAlf/fpcsource_3_2_2.git @@ -2711,6 +2711,15 @@ ArchiveURL=https://github.com/Fr0sT-Brutal/Delphi_OSMMap/archive/refs/heads/mast AddPackage=$(Installdir)/Packages/OSMMapLaz.lpk UnInstall=rm -Rf $(Installdir) +[FPCUpModule261] +Name=imgui +Description="FreePascal / Delphi bindings for dear ImGui with docking v1.90.0" +Installdir=$(basedir)/ccr/$(name) +Enabled=0 +GITURL=https://github.com/Coldzer0/ImGui-Pascal +ArchiveURL=https://github.com/Coldzer0/ImGui-Pascal/archive/refs/heads/main.zip +UnInstall=rm -Rf $(Installdir) + [HiddenModule1] Name=encconv Description="Lazarus library to convert encoding in string." diff --git a/sources/installercore.pas b/sources/installercore.pas index b3f0dedf..1d4830f1 100644 --- a/sources/installercore.pas +++ b/sources/installercore.pas @@ -669,7 +669,6 @@ TInstaller = class(TObject) //Source revision function CreateRevision(ModuleName,aRevision:string): boolean; function GetRevision(ModuleName:string): string; - function GetRevisionFromVersion(aModuleName,aVersion:string): string; // Uninstall module function UnInstallModule(ModuleName: string): boolean; virtual; @@ -690,7 +689,17 @@ TInstaller = class(TObject) TBaseUniversalInstaller = class(TInstaller); TBaseFPCInstaller = class(TInstaller); + {$ifndef FPCONLY} + TBaseLazarusInstaller = class(TInstaller) + private + FLCL_Platform: LCL_TYPE; + public + // LCL widget set to be built (NOT OS/CPU combination) + property LCL_Platform: LCL_TYPE read FLCL_Platform write FLCL_Platform; + end; + {$else} TBaseLazarusInstaller = class(TInstaller); + {$endif} TBaseHelpInstaller = class(TInstaller); TBaseWinInstaller = class(TInstaller); @@ -3809,64 +3818,6 @@ function TInstaller.GetRevision(ModuleName:string): string; result:=RevString; end; -function TInstaller.GetRevisionFromVersion(aModuleName,aVersion:string): string; -type - TVersionTable = record - Version:string; - Revision:string; - end; -const - FPCVersionsTable: array[0..5] of TVersionTable = ( - (Version:'2.6.4';Revision:'26970'), - (Version:'3.0.0';Revision:'32319'), - (Version:'3.0.2';Revision:'35401'), - (Version:'3.0.4';Revision:'37149'), - (Version:'3.2.0';Revision:'45643'), - (Version:'3.2.2';Revision:'49371') - ); - LazarusVersionsTable: array[0..10] of TVersionTable = ( - (Version:'1.6.4';Revision:'54278'), - (Version:'1.8.0';Revision:'56623'), - (Version:'1.8.2';Revision:'57369'), - (Version:'1.8.4';Revision:'57972'), - (Version:'2.0.0';Revision:'60307'), - (Version:'2.0.2';Revision:'60954'), - (Version:'2.0.4';Revision:'61665'), - (Version:'2.0.6';Revision:'62129'), - (Version:'2.0.8';Revision:'62944'), - (Version:'2.0.10';Revision:'63526'), - (Version:'2.0.12';Revision:'64642') - ); -var - aVersionTable:TVersionTable; -begin - result:=''; - - if aModuleName=_FPC then - begin - for aVersionTable in FPCVersionsTable do - begin - if aVersionTable.Version=aVersion then - begin - result:=aVersionTable.Revision; - exit; - end; - end; - end; - - if aModuleName=_LAZARUS then - begin - for aVersionTable in LazarusVersionsTable do - begin - if aVersionTable.Version=aVersion then - begin - result:=aVersionTable.Revision; - exit; - end; - end; - end; -end; - function TInstaller.UnInstallModule(ModuleName: string): boolean; begin result:=false; diff --git a/sources/installerfpc.pas b/sources/installerfpc.pas index b571426b..d320d4d7 100644 --- a/sources/installerfpc.pas +++ b/sources/installerfpc.pas @@ -5065,16 +5065,7 @@ function TFPCInstaller.GetModule(ModuleName: string): boolean; if result then begin SourceVersion:=GetVersion; - if (SourceVersion<>'0.0.0') then - begin - s:=GetRevisionFromVersion(ModuleName,SourceVersion); - if (Length(s)>0) then - begin - //FActualRevision:=s; - //FPreviousRevision:=s; - end; - end - else + if (SourceVersion='0.0.0') then begin Infoln(infotext+'Could not get version of ' + ModuleName + ' sources. Expect severe errors.',etError); end; diff --git a/sources/installerlazarus.pas b/sources/installerlazarus.pas index f2fd51c5..1c7955d7 100644 --- a/sources/installerlazarus.pas +++ b/sources/installerlazarus.pas @@ -222,7 +222,6 @@ interface TLazarusInstaller = class(TBaseLazarusInstaller) private - FLCL_Platform: string; InitDone: boolean; function LCLCrossActionNeeded:boolean; protected @@ -235,8 +234,6 @@ TLazarusInstaller = class(TBaseLazarusInstaller) function IsCross:boolean;override; function InitModule: boolean; public - // LCL widget set to be built (NOT OS/CPU combination) - property LCL_Platform: string write FLCL_Platform; function BuildModule(ModuleName: string): boolean; override; // Create configuration in FLazarusPrimaryConfigPath function ConfigModule(ModuleName: string): boolean; override; @@ -279,9 +276,11 @@ implementation uses m_crossinstaller, + LCLPlatformDef, StrUtils, FileUtil, fpcuputil, + InterfaceBase, repoclient, processutils, {$ifdef Unix} @@ -323,7 +322,7 @@ function TLazarusCrossInstaller.BuildModuleCustom(ModuleName: string): boolean; if(ieLibs in FErrorCodes) then Infoln(infotext+'Failed to get cross libraries', etError) else - if not CrossInstaller.GetLibsLCL(FLCL_Platform, BaseDirectory) then + if not CrossInstaller.GetLibsLCL(LCL_Platform, BaseDirectory) then Infoln(infotext+'Failed to get LCL cross libraries', etError) else begin @@ -430,8 +429,10 @@ function TLazarusCrossInstaller.BuildModuleCustom(ModuleName: string): boolean; Options:=Trim(Options); if Length(Options)>0 then Processor.SetParamNameData('OPT',Options); - if FLCL_Platform <> '' then - Processor.SetParamNameData('LCL_PLATFORM',FLCL_Platform); + if (LCL_Platform <> GetDefaultLCLWidgetType) then + GetLCLName(LCL_Platform); + + Processor.SetParamNameData('LCL_PLATFORM',GetLCLName(LCL_Platform)); //Processor.SetParamData('all'); @@ -466,8 +467,8 @@ function TLazarusCrossInstaller.BuildModuleCustom(ModuleName: string): boolean; if (GetSourceOS<>CrossInstaller.TargetOSName) then Processor.SetParamData('--os=' + CrossInstaller.TargetOSName); - if FLCL_Platform <> '' then - Processor.SetParamData('--ws=' + FLCL_Platform); + if (LCL_Platform <> GetDefaultLCLWidgetType) then + Processor.SetParamData('--ws=' + GetLCLName(LCL_Platform)); // Also add the default components ! Processor.SetParamData(ConcatPaths(['packager','registration','fcl.lpk'])); @@ -479,11 +480,7 @@ function TLazarusCrossInstaller.BuildModuleCustom(ModuleName: string): boolean; Processor.SetParamData(ConcatPaths(['components','ideintf','ideintf.lpk'])); end; - if FLCL_Platform = '' then - Infoln(infotext+'Compiling LCL for ' + GetFPCTarget(false) + ' using ' + ExtractFileName(Processor.Executable), etInfo) - else - Infoln(infotext+'Compiling LCL for ' + GetFPCTarget(false) + '/' + FLCL_Platform + ' using ' + ExtractFileName(Processor.Executable), etInfo); - + Infoln(infotext+'Compiling LCL for ' + GetFPCTarget(false) + '/' + GetLCLName(LCL_Platform) + ' using ' + ExtractFileName(Processor.Executable), etInfo); // Add binutils path to path if necessary if CrossInstaller.BinUtilsPathInPath then @@ -493,7 +490,7 @@ function TLazarusCrossInstaller.BuildModuleCustom(ModuleName: string): boolean; ProcessorResult:=Processor.ExecuteAndWait; Result := (ProcessorResult = 0); if (not Result) then - WritelnLog(etError,infotext+'Error compiling LCL for ' + GetFPCTarget(false) + ' ' + FLCL_Platform + LineEnding + + WritelnLog(etError,infotext+'Error compiling LCL for ' + GetFPCTarget(false) + ' ' + GetLCLName(LCL_Platform) + LineEnding + 'Details: ' + FErrorLog.Text, true); except on E: Exception do @@ -714,8 +711,8 @@ function TLazarusNativeInstaller.BuildModuleCustom(ModuleName: string): boolean; //Todo: to be investigated //Processor.SetParamNamePathData('FPCFPMAKE',ExtractFilePath(FCompiler)+GetCompilerName(GetSourceCPU)); - if FLCL_Platform <> '' then - Processor.SetParamNameData('LCL_PLATFORM',FLCL_Platform); + if (LCL_Platform <> GetDefaultLCLWidgetType) then + Processor.SetParamNameData('LCL_PLATFORM',GetLCLName(LCL_Platform)); //Set standard options s1:=STANDARDCOMPILERVERBOSITYOPTIONS; @@ -923,7 +920,7 @@ function TLazarusNativeInstaller.BuildModuleCustom(ModuleName: string): boolean; Result := false; exit; end; - if FLCL_Platform<>'' then Processor.SetParamNameData('LCL_PLATFORM',FLCL_Platform); + if (LCL_Platform<>GetDefaultLCLWidgetType) then Processor.SetParamNameData('LCL_PLATFORM',GetLCLName(LCL_Platform)); end; try @@ -1012,8 +1009,8 @@ function TLazarusNativeInstaller.BuildModuleCustom(ModuleName: string): boolean; Processor.SetParamNameData('--cpu',GetSourceCPU); Processor.SetParamNameData('--os',GetSourceOS); - if FLCL_Platform <> '' then - Processor.SetParamNameData('--ws',FLCL_Platform); + if (LCL_Platform <> GetDefaultLCLWidgetType) then + Processor.SetParamNameData('--ws',GetLCLName(LCL_Platform)); // Support keeping userdefined installed packages when building. // Compile with selected compiler options @@ -1090,8 +1087,8 @@ function TLazarusNativeInstaller.BuildModuleCustom(ModuleName: string): boolean; Processor.SetParamData('--cpu=' + GetSourceCPU); Processor.SetParamData('--os=' + GetSourceOS); - if FLCL_Platform <> '' then - Processor.SetParamData('--ws=' + FLCL_Platform); + if LCL_Platform <> '' then + Processor.SetParamData('--ws=' + LCL_Platform); Processor.SetParamData(DoubleQuoteIfNeeded(IncludeTrailingPathDelimiter(SourceDirectory)+ 'ide'+DirectorySeparator+'startlazarus.lpi')); @@ -2135,9 +2132,9 @@ function TLazarusInstaller.CleanModule(ModuleName: string): boolean; _LCL: begin CleanDirectory:='lcl'; - if (CrossCompiling) AND (FLCL_Platform <> '') then + if (CrossCompiling) AND (LCL_Platform <> GetDefaultLCLWidgetType) then begin - Processor.SetParamData('LCL_PLATFORM=' + FLCL_Platform); + Processor.SetParamData('LCL_PLATFORM=' + GetLCLName(LCL_Platform)); CleanCommand:='cleanintf'; end else @@ -2148,18 +2145,18 @@ function TLazarusInstaller.CleanModule(ModuleName: string): boolean; _COMPONENTS: begin CleanDirectory:='components'; - if (IsCross) AND (FLCL_Platform <> '') then + if (IsCross) AND (LCL_Platform <> GetDefaultLCLWidgetType) then begin - Processor.SetParamData('LCL_PLATFORM=' + FLCL_Platform); + Processor.SetParamData('LCL_PLATFORM=' + GetLCLName(LCL_Platform)); end; CleanCommand:='clean'; end; _PACKAGER: begin CleanDirectory:='packager'; - if (IsCross) AND (FLCL_Platform <> '') then + if (IsCross) AND (LCL_Platform <> GetDefaultLCLWidgetType) then begin - Processor.SetParamData('LCL_PLATFORM=' + FLCL_Platform); + Processor.SetParamData('LCL_PLATFORM=' + GetLCLName(LCL_Platform)); end; CleanCommand:='clean'; end; @@ -2168,7 +2165,7 @@ function TLazarusInstaller.CleanModule(ModuleName: string): boolean; CleanDirectory:='lcl'; if (LCLCrossActionNeeded) then begin - Processor.SetParamData('LCL_PLATFORM=' + FLCL_Platform); + Processor.SetParamData('LCL_PLATFORM=' + GetLCLName(LCL_Platform)); CleanCommand:='cleanintf'; end else @@ -2446,16 +2443,7 @@ function CreateQT5Symlinks(aApp:string):boolean; if result then begin SourceVersion:=GetVersion; - if (SourceVersion<>'0.0.0') then - begin - s:=GetRevisionFromVersion(ModuleName,SourceVersion); - if (Length(s)>0) then - begin - //FActualRevision:=s; - //FPreviousRevision:=s; - end; - end - else + if (SourceVersion='0.0.0') then begin Infoln(infotext+'Could not get version of ' + ModuleName + ' sources. Expect severe errors.',etError); end; @@ -2865,27 +2853,30 @@ function TLazarusInstaller.LCLCrossActionNeeded:boolean; NothingToBeDone:boolean; begin NothingToBeDone:=true; - if FLCL_Platform<>'' then + if (LCL_Platform<>GetDefaultLCLWidgetType) then begin NothingToBeDone:=false; {$ifdef Darwin} {$ifdef LCLCARBON} - NothingToBeDone:=(FLCL_Platform='carbon'); + NothingToBeDone:=(LCL_Platform=lpCarbon); {$endif} {$ifdef LCLCOCOA} - NothingToBeDone:=(FLCL_Platform='cocoa'); + NothingToBeDone:=(LCL_Platform=lpCocoa); {$endif} {$ifdef CPU64} {$ifndef LCLQT5} - NothingToBeDone:=(FLCL_Platform='cocoa'); + NothingToBeDone:=(LCL_Platform=lpCocoa); {$endif} {$endif} {$endif} {$ifdef LCLQT} - NothingToBeDone:=(FLCL_Platform='qt'); + NothingToBeDone:=(LCL_Platform=lpQT); {$endif} {$ifdef LCLQT5} - NothingToBeDone:=(FLCL_Platform='qt5'); + NothingToBeDone:=(LCL_Platform=lpQt5); + {$endif} + {$ifdef LCLQT6} + NothingToBeDone:=(LCL_Platform=lpQt6); {$endif} end; result:=(NOT NothingToBeDone); diff --git a/sources/installermanager.pas b/sources/installermanager.pas index 2a647c47..1e83cd41 100644 --- a/sources/installermanager.pas +++ b/sources/installermanager.pas @@ -178,7 +178,7 @@ TFPCupManager=class(TObject) FClean: boolean; FConfigFile: string; {$ifndef FPCONLY} - FLCL_Platform: string; //really LCL widgetset + FLCL_Platform: LCL_TYPE; //really LCL widgetset {$endif} FCrossOPT: string; FCrossCPU_Target: TCPU; @@ -306,7 +306,7 @@ TFPCupManager=class(TObject) // Widgetset for which the user wants to compile the LCL (not the IDE). // Empty if default LCL widgetset used for current platform {$ifndef FPCONLY} - property LCL_Platform:string read FLCL_Platform write FLCL_Platform; + property LCL_Platform:LCL_TYPE read FLCL_Platform write FLCL_Platform; {$endif} property CrossOPT:string read FCrossOPT write FCrossOPT; property CrossToolsDirectory:string read FCrossToolsDirectory write SetCrossToolsDirectory; @@ -1033,7 +1033,8 @@ procedure TFPCupManager.SaveSettings; {$ifndef FPCONLY} if ((CrossOS_Target in LCL_OS) AND (Pos(_LCL,OnlyModules)>0)) then begin - if (Length(LCL_Platform)>0) then Write(TxtFile,' --lclplatform='+LCL_Platform); + Write(TxtFile,' --lclplatform='+GetLCLName(LCL_Platform)); + //if (Length(LCL_Platform)>0) then Write(TxtFile,' --lclplatform='+LCL_Platform); end; {$endif} end; @@ -1114,7 +1115,7 @@ procedure TFPCupManager.ResetAll; FPCOPT:=''; {$ifndef FPCONLY} - LCL_Platform:=''; + LCL_Platform:=GetDefaultLCLWidgetType; LazarusOPT:=''; LazarusDesiredRevision:=''; LazarusBranch:=''; @@ -2318,7 +2319,7 @@ LibSource = record result:=DeleteLazarusScript else if FunctionName=_CHECKDEVLIBS then begin - WidgetTypeName:=FParent.LCL_Platform; + WidgetTypeName:=GetLCLName(FParent.LCL_Platform); {$IF DEFINED(FPC_FULLVERSION) AND (FPC_FULLVERSION > 30000)} if (Length(WidgetTypeName)=0) then WidgetTypeName:=GetLCLWidgetTypeName; {$ENDIF} diff --git a/sources/installeruniversal.pas b/sources/installeruniversal.pas index 70c0edec..2a57fab6 100644 --- a/sources/installeruniversal.pas +++ b/sources/installeruniversal.pas @@ -84,7 +84,7 @@ TUniversalInstaller = class(TBaseUniversalInstaller) FLazarusNeedsRebuild:boolean; FLazarusVersion:string; // LCL widget set to be built - FLCL_Platform: string; + FLCL_Platform: LCL_TYPE; function RebuildLazarus:boolean; {$endif} protected @@ -113,7 +113,7 @@ TUniversalInstaller = class(TBaseUniversalInstaller) // Compiler options user chose to compile Lazarus with (coming from fpcup). property LazarusCompilerOptions: string write FLazarusCompilerOptions; // LCL widget set to be built - property LCL_Platform: string write FLCL_Platform; + property LCL_Platform: LCL_TYPE write FLCL_Platform; property LazarusVersion:string read FLazarusVersion; {$endif} // Build module @@ -223,6 +223,9 @@ implementation uses StrUtils, typinfo,inifiles, process, fpjson, FileUtil, //LazFileUtils, + {$ifndef FPCONLY} + InterfaceBase, + {$endif} fpcuputil; Const @@ -331,7 +334,7 @@ function TUniversalInstaller.RebuildLazarus:boolean; //Processor.SetParamNamePathData('INSTALL_BINDIR',FBinPath); {$ENDIF MSWINDOWS} - if FLCL_Platform <> '' then Processor.SetParamData('LCL_PLATFORM=' + FLCL_Platform); + if (FLCL_Platform <> GetDefaultLCLWidgetType) then Processor.SetParamData('LCL_PLATFORM=' + GetLCLName(FLCL_Platform)); //Set options s := FLazarusCompilerOptions; @@ -439,8 +442,8 @@ function TUniversalInstaller.RebuildLazarus:boolean; Processor.SetParamNameData('--cpu',GetSourceCPU); Processor.SetParamNameData('--os',GetSourceOS); - if FLCL_Platform <> '' then - Processor.SetParamNameData('--ws',FLCL_Platform); + if FLCL_Platform <> GetDefaultLCLWidgetType then + Processor.SetParamNameData('--ws',GetLCLName(FLCL_Platform)); s:=FLazarusCompilerOptions; if LinuxLegacy then Processor.SetParamNameData('--compiler',ExtractFilePath(FCompiler)+'fpccompat.sh'); @@ -489,13 +492,13 @@ function TUniversalInstaller.RebuildLazarus:boolean; LazarusConfig.SetVariable(MiscellaneousConfig, 'MiscellaneousOptions/BuildLazarusOptions/Profiles/Profile0/Options/Count', 1); LazarusConfig.SetVariable(MiscellaneousConfig, 'MiscellaneousOptions/BuildLazarusOptions/Profiles/Profile0/Options/Item1/Value', Trim(FLazarusCompilerOptions)); end; - if Length(FLCL_Platform)>0 then + if (FLCL_Platform <> GetDefaultLCLWidgetType) then begin // Change the build modes to reflect the default LCL widget set. for j:=0 to (i-1) do begin - Infoln(infotext+'Changing default LCL_platforms for build-profiles in '+MiscellaneousConfig+' to build for '+FLCL_Platform, etInfo); - LazarusConfig.SetVariable(MiscellaneousConfig, 'MiscellaneousOptions/BuildLazarusOptions/Profiles/Profile'+InttoStr(j)+'/LCLPlatform/Value', FLCL_Platform); + Infoln(infotext+'Changing default LCL_platforms for build-profiles in '+MiscellaneousConfig+' to build for '+GetLCLName(FLCL_Platform), etInfo); + LazarusConfig.SetVariable(MiscellaneousConfig, 'MiscellaneousOptions/BuildLazarusOptions/Profiles/Profile'+InttoStr(j)+'/LCLPlatform/Value', GetLCLName(FLCL_Platform)); end; end; end; @@ -866,8 +869,9 @@ function TUniversalInstaller.InstallPackage(PackagePath, WorkingDir: string; Reg Processor.SetParamData('--pcp=' + DoubleQuoteIfNeeded(FLazarusPrimaryConfigPath)); Processor.SetParamData('--cpu=' + GetSourceCPU); Processor.SetParamData('--os=' + GetSourceOS); - if FLCL_Platform <> '' then - Processor.SetParamData('--ws=' + FLCL_Platform); + if FLCL_Platform <> GetDefaultLCLWidgetType then + Processor.SetParamData('--ws=' + GetLCLName(FLCL_Platform)); + if RegisterPackageFeature then Processor.SetParamData('--add-package-link') else @@ -1360,7 +1364,7 @@ function TUniversalInstaller.RunCommands(Directive: string;sl:TStringList): bool //s:='--quiet'; {$ENDIF} - if FLCL_Platform<>'' then s:=s+' --ws=' + FLCL_Platform; + if FLCL_Platform<>GetDefaultLCLWidgetType then s:=s+' --ws=' + GetLCLName(FLCL_Platform); exec:=StringReplace(exec,LAZBUILDNAME+GetExeExt,LAZBUILDNAME+GetExeExt+' '+s,[rfIgnoreCase]); end; {$endif} diff --git a/sources/m_crossinstaller.pas b/sources/m_crossinstaller.pas index cc13cb91..b8a39095 100644 --- a/sources/m_crossinstaller.pas +++ b/sources/m_crossinstaller.pas @@ -59,7 +59,12 @@ interface uses - Classes, SysUtils; + Classes, + {$ifndef FPCONLY} + InterfaceBase, + LCLPlatformDef, + {$endif} + SysUtils; const ErrorNotFound='An error occurred getting cross compiling binutils/libraries.'+LineEnding+ @@ -105,6 +110,10 @@ interface TSUBARCHS = set of TSUBARCH; TABIS = set of TABI; + {$ifndef FPCONLY} + LCL_TYPE = TLCLPlatform; + {$endif} + const LCL_OS = [TOS.win32,TOS.win64,TOS.linux,TOS.darwin,TOS.freebsd,TOS.openbsd,TOS.aix,TOS.wince,TOS.haiku,TOS.solaris,TOS.dragonfly,TOS.netbsd,TOS.morphos,TOS.aros,TOS.amiga]; WINDOWS_OS = [TOS.win32,TOS.win64]; @@ -213,7 +222,7 @@ TCrossInstaller = class(TObject) {$ifndef FPCONLY} // In your descendent, implement this function when needed: you can download libraries or check for their existence for Lazarus LCL cross compile libs: // Note: the libraries should be presumably under the basepath using the Lazarus naming convention?? - function GetLibsLCL({%H-}LCL_Platform:string; {%H-}Basepath:string):boolean;virtual; + function GetLibsLCL({%H-}LCL_Platform:LCL_TYPE; {%H-}Basepath:string):boolean;virtual; {$endif} procedure AddFPCCFGSnippet(const aSnip: string; const AddToCrossOptions:boolean=true); function AddCrossOption(const aOption: string):boolean; @@ -291,6 +300,10 @@ procedure SetSelectedSubArch(aCPU:TCPU;aOS:TOS;aSUBARCH:TSUBARCH); procedure GetCrossToolsDir(const CrossCPU_Target:TCPU;const CrossOS_Target:TOS; const MUSL,SolarisOI:boolean; out BinPath,LibPath:string); procedure RegisterCrossCompiler(Platform:string;aCrossInstaller:TCrossInstaller); function GetExeExt(const aOS:TOS=TOS.osNone): string; +{$ifndef FPCONLY} +function GetLCLName(LCLType:LCL_TYPE):string; +function GetLCLType(LCLName:string):LCL_TYPE; +{$endif} var //FPCTargetValid:TFPCTargetValid; @@ -601,6 +614,30 @@ function GetExeExt(const aOS:TOS=TOS.osNone): string; end; end; +{$ifndef FPCONLY} +function GetLCLName(LCLType:LCL_TYPE):string; +begin + result:=LCLPlatformDirNames[LCLType]; +end; + + +function GetLCLType(LCLName:string):LCL_TYPE; +var + LCLType:LCL_TYPE; +begin + result:=GetDefaultLCLWidgetType; + for LCLType in TLCLPlatforms do + begin + if (LCLName=GetLCLName(LCLType)) then + begin + result:=LCLType; + break; + end; + end; +end; + +{$endif} + procedure GetCrossToolsDir(const CrossCPU_Target:TCPU;const CrossOS_Target:TOS; const MUSL,SolarisOI:boolean; out BinPath,LibPath:string); begin // Setting the location of libs and bins on our system, so they can be found by fpcupdeluxe @@ -1094,7 +1131,7 @@ function TCrossInstaller.FPCUPToolsSearch(BasePath,DirName: string; LibsOrBins:b end; {$ifndef FPCONLY} -function TCrossInstaller.GetLibsLCL(LCL_Platform:string; Basepath:string):boolean; +function TCrossInstaller.GetLibsLCL(LCL_Platform:LCL_TYPE; Basepath:string):boolean; begin result:=true; end; diff --git a/sources/up/checkoptions.pas b/sources/up/checkoptions.pas index bce3c5c1..033da285 100644 --- a/sources/up/checkoptions.pas +++ b/sources/up/checkoptions.pas @@ -284,7 +284,8 @@ function CheckFPCUPOptions(FManager: TFPCupManager):integer; // handle inclusion of LCL when cross-compiling if (FManager.CrossOS_Target in LCL_OS) then begin - FManager.LCL_Platform:=Options.GetOption('','lclplatform',''); + s:=Options.GetOption('','lclplatform',''); + FManager.LCL_Platform:=GetLCLType(s); end; {$endif} end; diff --git a/sources/updeluxe/fpcupdeluxemainform.pas b/sources/updeluxe/fpcupdeluxemainform.pas index 02304bd0..2c781644 100644 --- a/sources/updeluxe/fpcupdeluxemainform.pas +++ b/sources/updeluxe/fpcupdeluxemainform.pas @@ -351,6 +351,7 @@ implementation InterfaceBase, // for WidgetSet LCLType, // for MessageBox LCLIntf, // for OpenURL + LCLPlatformDef, // for LCL types IniFiles, StrUtils, {$ifdef EnableLanguages} @@ -511,7 +512,7 @@ procedure TForm1.FormCreate(Sender: TObject); {$IF DEFINED(FPC_FULLVERSION) AND (FPC_FULLVERSION > 30000)} aSystemTarget:=GetLCLWidgetTypeName; {$ELSE} - aTarget:=''; + aSystemTarget:=''; {$ENDIF} {$ifdef RemoteLog} @@ -2361,6 +2362,7 @@ procedure TForm1.QuickBtnClick(Sender: TObject); Lazarus 2.2.6 + FPC 3.2.2 Lazarus 3.0 + FPC 3.2.2 Lazarus 3.2 + FPC 3.2.2 + Lazarus 3.4 + FPC 3.2.2 end; } @@ -3170,28 +3172,31 @@ function TForm1.ProcessCrossCompiler(Sender: TObject):boolean; begin FPCupManager.OnlyModules:=FPCupManager.OnlyModules+','+_LCL; if (FPCupManager.CrossOS_Target in WINDOWS_OS) then - FPCupManager.LCL_Platform:='win32' + FPCupManager.LCL_Platform:=lpWin32 else if (FPCupManager.CrossOS_Target=TOS.wince) then - FPCupManager.LCL_Platform:='wince' + FPCupManager.LCL_Platform:=lpWinCE else if (FPCupManager.CrossOS_Target=TOS.darwin) then begin - FPCupManager.LCL_Platform:='cocoa'; + FPCupManager.LCL_Platform:=lpCocoa; {$ifdef LCLQT5} - FPCupManager.LCL_Platform:='qt5'; + FPCupManager.LCL_Platform:=lpQt5; + {$endif} + {$ifdef LCLQT6} + FPCupManager.LCL_Platform:=lpQt6; {$endif} {$ifdef LCLCARBON} - FPCupManager.LCL_Platform:='carbon'; + FPCupManager.LCL_Platform:=lpCarbon; {$endif} end else if (FPCupManager.CrossOS_Target in [TOS.amiga,TOS.aros,TOS.morphos]) then - FPCupManager.LCL_Platform:='mui' + FPCupManager.LCL_Platform:=lpMUI else begin if (FPCupManager.CrossOS_Target<>TOS.osNone) AND (FPCupManager.CrossCPU_Target<>TCPU.cpuNone) then - FPCupManager.LCL_Platform:='gtk2'; + FPCupManager.LCL_Platform:=lpGtk2; end; end else @@ -3265,7 +3270,7 @@ function TForm1.ProcessCrossCompiler(Sender: TObject):boolean; {$ifdef RemoteLog} aDataClient.UpInfo.UpFunction:=ufInstallCross; - if length(FPCupManager.LCL_Platform)>0 then aDataClient.AddExtraData('LCL',FPCupManager.LCL_Platform); + if (FPCupManager.LCL_Platform<>GetDefaultLCLWidgetType) then aDataClient.AddExtraData('LCL',GetLCLName(FPCupManager.LCL_Platform)); if length(FPCupManager.OnlyModules)>0 then aDataClient.AddExtraData('Only',FPCupManager.OnlyModules); if length(FPCupManager.SkipModules)>0 then aDataClient.AddExtraData('Skip',FPCupManager.SkipModules); {$endif} @@ -4073,18 +4078,21 @@ function TForm1.PrepareRun(Sender: TObject):boolean; // Set default Darwin LCL platforms {$ifdef Darwin} - FPCupManager.LCL_Platform:='cocoa'; + FPCupManager.LCL_Platform:=lpCocoa; {$ifdef LCLCARBON} - FPCupManager.LCL_Platform:='carbon'; + FPCupManager.LCL_Platform:=lpCarbon; {$endif} {$endif} // Override default LCL platforms in case of QT[5] {$ifdef LCLQT} - FPCupManager.LCL_Platform:='qt'; + FPCupManager.LCL_Platform:=lpQt; {$endif} {$ifdef LCLQT5} - FPCupManager.LCL_Platform:='qt5'; + FPCupManager.LCL_Platform:=lpQt5; + {$endif} + {$ifdef LCLQT6} + FPCupManager.LCL_Platform:=lpQt6; {$endif} {$ifdef RemoteLog} diff --git a/up.res b/up.res index def3d041..cd89ea98 100644 Binary files a/up.res and b/up.res differ