Removal of intermediate compiler logic.

fpcup.ini

@@ -61,7 +61,7 @@ embedded=https://svn.freepascal.org/svn/fpc/branches/laksen
 mips=https://svn.freepascal.org/svn/fpc/branches/mips_embedded
 
 [ALIASlazURL]
-stable=https://svn.freepascal.org/svn/lazarus/tags/lazarus_2_0_2
+stable=https://svn.freepascal.org/svn/lazarus/tags/lazarus_2_0_4
 trunk=https://svn.freepascal.org/svn/lazarus/trunk
 trunkgit=https://github.com/graemeg/lazarus.git
 embedded=https://github.com/LongDirtyAnimAlf/lazarus.git
@@ -405,16 +405,10 @@ Workingdir=$(lazarusdir)/tools
 InstallExecute1=$(lazarusdir)/lazbuild --primary-config-path=$(LazarusPrimaryConfigPath) $(lazarusdir)/tools/lazres.lpi
 
 [FPCUPModule24]
-Name=rutils
-Description="RUtils offers some general purpose routines on string conversions, parsings, encodings and others."
+Name=lazrestbridge
+Description="Lazarus support for the SQLDB REST Bridge."
 Enabled=0
-Installdir=$(basedir)/ccr/$(name)
-GITURL=https://github.com/silvioprog/rutils
-ArchiveURL=https://github.com/silvioprog/rutils/archive/master.zip
-; package is runtime only
-; AddPackage=$(Installdir)/pkg/rutilspkg.lpk
-InstallExecute1=$(lazarusdir)/lazbuild --primary-config-path=$(LazarusPrimaryConfigPath) $(Installdir)/pkg/rutilspkg.lpk
-UnInstall1=rm -Rf $(Installdir)
+AddPackage=$(lazarusdir)/components/fpweb/lazsqldbrest.lpk
 
 [FPCUPModule25]
 ; Create Lazarus Windows installer
@@ -1844,12 +1838,6 @@ AddPackageLink3=$(Installdir)/ibexpress.lpk
 AddPackage=$(Installdir)/ibcontrols.lpk
 UnInstall=rm -Rf $(Installdir)
 
-[FPCUPModule190]
-Name=lazrestbridge
-Description="Lazarus support for the SQLDB REST Bridge."
-Enabled=0
-AddPackage=$(lazarusdir)/components/fpweb/lazsqldbrest.lpk
-
 [FPCUPModule191]
 Name=mapviewer
 Description="Lazarus mapviewer."
@@ -1898,3 +1886,12 @@ GITURL=https://github.com/eugeneilyin/mORMotBP
 ArchiveURL=https://github.com/eugeneilyin/mORMotBP/archive/master.zip
 UnInstall=rm -Rf $(Installdir)
 
+[FPCUpModule196]
+Name=ezthreads
+Description="Simple to use threading library."
+Installdir=$(basedir)/ccr/$(name)
+Enabled=0
+GITURL=https://github.com/mr-highball/ezthreads
+ArchiveURL=https://github.com/mr-highball/ezthreads/archive/master.zip
+UnInstall=rm -Rf $(Installdir)
+

fpcupdeluxemainform.pas

@@ -338,8 +338,13 @@ procedure TForm1.FormCreate(Sender: TObject);
 
   {$ifdef DARWIN}
   // we could have started from with an .app , so goto the basedir ... not sure if realy needed, but to be sure.
-  SetCurrentDir(ExcludeTrailingPathDelimiter(SafeGetApplicationPath));
+  AddMessage('Setting base directory to: '+ExcludeTrailingPathDelimiter(SafeGetApplicationPath));
+  if (NOT SetCurrentDir(ExcludeTrailingPathDelimiter(SafeGetApplicationPath))) then
+    AddMessage('Setting base directory failure !!')
+  else
+    AddMessage('Current base directory : '+GetCurrentDir);
   {$endif}
+
   // get last used install directory, proxy and visual settings
   with TIniFile.Create(SafeGetApplicationPath+installerUniversal.DELUXEFILENAME) do
   try
@@ -2114,6 +2119,7 @@ function TForm1.InstallCrossCompiler(Sender: TObject):boolean;
         //   http://repo.or.cz/openal-soft/android.git or
         //   https://github.com/michaliskambi/tremolo-android .
         if (FPCupManager.CrossOS_Target='android')
+            //then FPCupManager.CrossOPT:='-Cp'+DEFAULTARMCPU+' '
             then FPCupManager.CrossOPT:='-Cp'+DEFAULTARMCPU+' -CfVFPV3 '
             else
             begin

fpcupdeluxeremote.lpi

@@ -15,15 +15,14 @@
         <DpiAware Value="True/PM"/>
       </XPManifest>
       <Icon Value="0"/>
-      <Resources Count="8">
+      <Resources Count="7">
         <Resource_0 FileName="fpcup.ini" Type="RCDATA" ResourceName="FPCUP_INI"/>
         <Resource_1 FileName="settings.ini" Type="RCDATA" ResourceName="SETTINGS_INI"/>
         <Resource_2 FileName="chimp.png" Type="RCDATA" ResourceName="SPLASH_LOGO"/>
         <Resource_3 FileName="patchlazarus\darwinqt5hack.patch" Type="RCDATA" ResourceName="DARWINQT5HACK_LAZPATCH"/>
         <Resource_4 FileName="languages\fpcupdeluxe.en.po" Type="RCDATA" ResourceName="FPCUPDELUXE.EN"/>
         <Resource_5 FileName="languages\fpcupdeluxe.zh.po" Type="RCDATA" ResourceName="FPCUPDELUXE.ZH"/>
         <Resource_6 FileName="patchlazarus\darwinqt5hacksimple.patch" Type="RCDATA" ResourceName="DARWINQT5HACKSIMPLE_LAZPATCH"/>
-        <Resource_7 FileName="patchfpc\netbsdtrunk.patch" Type="RCDATA" ResourceName="NETBSDTRUNK_FPCPATCH"/>
       </Resources>
     </General>
     <i18n>