Small bugfixes due to users feedback (fpcupdeluxe sync)

fpclazup.lpi

@@ -355,7 +355,7 @@ end;"/>
           <Version Value="11"/>
           <PathDelim Value="\"/>
           <Target>
-            <Filename Value="bin\$NameOnly($(ProjFile))-$(TargetCPU)-$(TargetOS)"/>
+            <Filename Value="bin\$NameOnly($(ProjFile))-$(TargetCPU)le-$(TargetOS)"/>
           </Target>
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir)"/>

fpcup.ini

@@ -19,7 +19,7 @@
 ; ... and you can define your own, like below:
 
 [fpcupinfo]
-inifileversion=1.1.1.5
+inifileversion=1.1.1.6
 
 [ALIASfpcURL]
 stable=https://svn.freepascal.org/svn/fpc/tags/release_3_0_4
@@ -39,9 +39,9 @@ llvm=https://svn.freepascal.org/svn/fpc/branches/llvm
 ios=https://svn.freepascal.org/svn/fpc/branches/fixes_3_0_ios
 embedded=https://svn.freepascal.org/svn/fpc/branches/laksen
 mips=https://svn.freepascal.org/svn/fpc/branches/mips_embedded
-; Previous stable:
+; Previous:
+fixes2.6=https://svn.freepascal.org/svn/fpc/branches/fixes_2_6
 2.6.4=https://svn.freepascal.org/svn/fpc/tags/release_2_6_4
-; Older versions for compatibility with existing scripts
 2.6.2=https://svn.freepascal.org/svn/fpc/tags/release_2_6_2
 2.6.0=https://svn.freepascal.org/svn/fpc/tags/release_2_6_0
 2.4.4=https://svn.freepascal.org/svn/fpc/tags/release_2_4_4
@@ -109,7 +109,6 @@ freesparta=https://svn.freepascal.org/svn/lazarus/branches/free-sparta
 Name=suggestedpackages
 Description="Selection of various IDE packages that can be handy when developing"
 Enabled=1
-
 ; Modules can be installed depending on OS and CPU
 ; windows only
 ; OS_OK="windows"

fpcup.lpi

@@ -362,7 +362,7 @@ end;"/>
           <Version Value="11"/>
           <PathDelim Value="\"/>
           <Target>
-            <Filename Value="bin\$NameOnly($(ProjFile))-$(TargetCPU)-$(TargetOS)"/>
+            <Filename Value="bin\$NameOnly($(ProjFile))-$(TargetCPU)le-$(TargetOS)"/>
           </Target>
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir)"/>

installercore.pas

@@ -885,6 +885,7 @@ procedure TInstaller.CreateBinutilsList(aVersion:string);
   AddNewUtil('windres' + GetExeExt,aSourceURL,'',ucBinutil);
   AddNewUtil('windres.h',aSourceURL,'',ucBinutil);
   AddNewUtil('zip' + GetExeExt,aSourceURL,'',ucBinutil);
+  AddNewUtil('nm' + GetExeExt,aSourceURL,'',ucBinutil);
 
   // add win32/64 gdb from lazarus
   AddNewUtil('gdb' + GetExeExt,SourceURL_gdb,'',ucDebugger32);
@@ -1259,7 +1260,12 @@ function TInstaller.DownloadFromSVN(ModuleName: string; var BeforeRevision, Afte
       // We used to do a check for the revision, but that does not check the integrity
       // or existence of all files in the svn repo.
 
-      if FExportOnly then AfterRevision := FDesiredRevision else
+      if FExportOnly then
+      begin
+        AfterRevision := FDesiredRevision;
+        if Trim(AfterRevision)='' then AfterRevision := FSVNClient.LocalRevisionWholeRepo;
+      end
+      else
       begin
       if FSVNClient.LocalRevision=FSVNClient.LocalRevisionWholeRepo then
           AfterRevision := FSVNClient.LocalRevisionWholeRepo
@@ -1815,6 +1821,7 @@ function TInstaller.ConfigModule(ModuleName: string): boolean;
   infotext:=Copy(Self.ClassName,2,MaxInt)+' (ConfigModule: '+ModuleName+'): ';
   infoln(infotext+'Entering ...',etDebug);
 end;
+
 function TInstaller.GetModule(ModuleName: string): boolean;
 begin
   result:=false;

installerfpc.pas

@@ -1024,7 +1024,7 @@ function TFPCNativeInstaller.BuildModuleCustom(ModuleName: string): boolean;
   s:='-Sg '+s;
   {$ENDIF}
 
-  s:=s+' -dREVINC';
+  //s:=s+' -dREVINC';
 
   {$if (NOT defined(FPC_HAS_TYPE_EXTENDED)) AND (defined (CPUX86_64))}
   // soft 80 bit float if available
@@ -1333,6 +1333,7 @@ function TFPCInstaller.GetBootstrapCompilerVersionFromVersion(aVersion: string):
   else if ((s='3.0.5') OR (s='3.0.4')) then result:='3.0.2'
   else if ((s='3.0.3') OR (s='3.0.2') OR (s='3.0.1')) then result:='3.0.0'
   else if s='3.0.0' then result:='2.6.4'
+  else if s='2.6.5' then result:='2.6.2'
   else if s='2.6.4' then result:='2.6.2'
   else if s='2.6.2' then result:='2.6.0'
   else if s='2.6.0' then result:='2.4.4'
@@ -2185,7 +2186,13 @@ function TFPCInstaller.BuildModule(ModuleName: string): boolean;
     begin
       infoln(infotext+'Could not determine required bootstrap compiler version. Should not happen. Aborting.',etError);
       exit(false);
-      end else infoln(infotext+'To compile this FPC, we use a compiler with version : '+RequiredBootstrapVersionLow,etInfo);
+      end
+      else
+      begin
+        infoln(infotext+'To compile this FPC, we use a compiler with version : '+RequiredBootstrapVersionLow,etInfo);
+        // we always build with the highest bootstrapper, so, in this case, make high = low !!
+        RequiredBootstrapVersionHigh:=RequiredBootstrapVersionLow;
+      end;
   end else infoln(infotext+'To compile this FPC, we need (required) a compiler with version '+RequiredBootstrapVersionLow+' or '+RequiredBootstrapVersionHigh,etInfo);
 
   OperationSucceeded:=false;
@@ -2750,6 +2757,7 @@ function TFPCInstaller.CleanModule(ModuleName: string): boolean;
 begin
   result := inherited;
   result:=InitModule;
+
   if not result then exit;
 
   if not DirectoryExistsUTF8(FSourceDirectory) then exit;

revision.inc

@@ -1,4 +1,4 @@
 const
   {%H-}DELUXEVERSION='1.6.0n';
-  {%H-}RevisionStr='045';
-  {%H-}versiondate='20171219';
+  {%H-}RevisionStr='046';
+  {%H-}versiondate='20180127';