Merge branch 'main' into files-extractarchive

Projects/Bin/.gitignore

@@ -4,8 +4,5 @@
 *.issig
 Setup-*.bin
 Setup.log
-Default.isl
-ISPPBuiltins.iss
-whatsnew.htm
 *.chm
 *.chw

Projects/Bin/synch-isfiles.bat

@@ -4,8 +4,6 @@ cd /d %~dp0
 
 echo - Synching files from Files to Projects\Bin
 
-copy ..\..\Files\Default.isl
-copy ..\..\Files\ISPPBuiltins.iss
 copy ..\..\Files\is7z*.dll
 copy ..\..\Files\is7z*.dll.issig
 copy ..\..\Files\is*zip.dll
@@ -21,12 +19,15 @@ copy ..\..\Files\islzma*.exe.issig
 copy ..\..\Files\ISetup.chm
 copy ..\..\Files\ISetup-dark.chm
 copy ..\..\Files\WizClassicSmallImage.bmp
-copy ..\..\whatsnew.htm
 
-del *.exp
-del *.lib
-del *.pdb
-del *.bsc
+if exist Default.isl (del Default.isl)
+if exist ISPPBuiltins.iss (del ISPPBuiltins.iss)
+if exist whatsnew.htm (del whatsnew.htm)
+
+if exist *.exp (del *.exp)
+if exist *.lib (del *.lib)
+if exist *.pdb (del *.pdb)
+if exist *.bsc (del *.bsc)
 
 echo - Synching files done
 

Projects/Src/Compiler.SetupCompiler.pas

@@ -6116,12 +6116,16 @@ begin
   end;
 end;
 
+
+const
+  DefaultIsl = {$IFDEF DEBUG} 'compiler:..\..\Files\Default.isl' {$ELSE} 'Default.isl' {$ENDIF};
+
 procedure TSetupCompiler.ReadDefaultMessages;
 var
   J: TSetupMessageID;
 begin
   { Read messages from Default.isl into DefaultLangData }
-  EnumIniSection(EnumMessagesProc, 'Messages', -2, False, True, 'compiler:Default.isl', True, False);
+  EnumIniSection(EnumMessagesProc, 'Messages', -2, False, True, DefaultIsl, True, False);
   CallIdleProc;
 
   { Check for missing messages in Default.isl }
@@ -6149,7 +6153,7 @@ procedure TSetupCompiler.ReadMessagesFromScriptPre;
     end;
     PreLangDataList.Add(NewPreLangData);
 
-    ReadMessagesFromFilesPre('compiler:Default.isl', PreLangDataList.Count-1);
+    ReadMessagesFromFilesPre(DefaultIsl, PreLangDataList.Count-1);
   end;
 
 begin
@@ -6188,7 +6192,7 @@ procedure TSetupCompiler.ReadMessagesFromScript;
     LanguageEntries.Add(NewLanguageEntry);
     LangDataList.Add(NewLangData);
 
-    ReadMessagesFromFiles('compiler:Default.isl', LanguageEntries.Count-1);
+    ReadMessagesFromFiles(DefaultIsl, LanguageEntries.Count-1);
   end;
 
   function IsOptional(const MessageID: TSetupMessageID): Boolean;

Projects/Src/IDE.MainForm.pas

@@ -3504,7 +3504,7 @@ end;
 
 procedure TMainForm.HWhatsNewClick(Sender: TObject);
 begin
-  LaunchFileOrURL(PathExtractPath(NewParamStr(0)) + 'whatsnew.htm');
+  LaunchFileOrURL(PathExtractPath(NewParamStr(0)) + {$IFDEF DEBUG} '..\..\' + {$ENDIF} 'whatsnew.htm');
 end;
 
 procedure TMainForm.HWebsiteClick(Sender: TObject);

Projects/Src/ISPP.Preprocess.pas

@@ -191,7 +191,7 @@ var
     end;
 
   const
-    SBuiltins = 'ISPPBuiltins.iss';
+    SBuiltins = {$IFDEF DEBUG} '..\..\Files\ISPPBuiltins.iss' {$ELSE} 'ISPPBuiltins.iss' {$ENDIF};
   var
     DelimPos: PChar;
     N: Integer;