* Added setup build script

* Updated installer helper (C++ LibraryPath)

Author: ahuser

thirdparty/InnoSetup/BuildSetup.bat

@@ -0,0 +1,65 @@
+@echo off
+SETLOCAL
+SET SETUPDIR=%CD%
+
+:: ==========================================================
+:: rsvars.bat check
+:: ==========================================================
+if not "-%BDS%" == "-" goto RsVarsCalled
+call rsvars.bat
+if "-%BDS%" == "-" goto Leave
+
+:RsVarsCalled
+SET JCLROOT=%SETUPDIR%\..\jcl
+SET JCLBUILTDIR=%SETUPDIR%\setupbuild
+SET InnoSetupDir=%SETUPDIR%\InnoSetup
+
+:: == Sanity checks ==
+if not exist "%JCLROOT%\source\common\JclBase.pas" goto NoRootDirFound
+if not exist "%SETUPDIR%\Install.iss" goto NoInstallDir
+
+
+:: ==========================================================
+:: Compile JCL
+:: ==========================================================
+
+:: == Create output directories ==
+md "%SETUPDIR%\setupbuild" 2>NUL >NUL
+md "%JCLBUILTDIR%" 2>NUL >NUL
+md "%JCLBUILTDIR%\hpp" 2>NUL >NUL
+md "%JCLBUILTDIR%\lib" 2>NUL >NUL
+md "%JCLBUILTDIR%\bpl" 2>NUL >NUL
+
+:: == Delete all files in the output directories, we always want to rebuild them ==
+del /Q /S "%JCLBUILTDIR%\*.*" 2>NUL >NUL
+
+:: == Compile the files
+cd %JCLROOT%
+msbuild make.proj "/p:HppOutDir=%JCLBUILTDIR%\hpp" "/p:DcuOutDir=%JCLBUILTDIR%\lib" "/p:BplOutDir=%JCLBUILTDIR%\bpl"
+if ERRORLEVEL 1 goto Failed
+cd %SETUPDIR%
+
+:: ==========================================================
+:: Compile Setup
+:: ==========================================================
+:Setup
+"%InnoSetupDir%\ISCC.exe" Install.iss /dCmdLineBuild "/dJclRoot=%JCLROOT%" "/dJclLib=%JCLBUILTDIR%\lib" "/dJclBpl=%JCLBUILTDIR%\bpl" "/dJclHpp="%JCLBUILTDIR%\hpp"
+if ERRORLEVEL 1 goto Failed
+
+
+goto Leave
+
+:NoInstalLDirFound
+echo You must start BuildSetup.bat from the JclInnoSetup directory.
+goto Failed
+
+:NoRootDirFound
+echo "%JCLROOT%" is not the JCL root directory.
+
+:Failed
+echo.
+pause
+
+:Leave
+cd %SETUPDIR%
+ENDLOCAL

thirdparty/InnoSetup/CompInstall.dll

@@ -103,7 +103,7 @@ function compinst_init: Integer; stdcall;
 
     ConfigDataLocation := Inst.ConfigDataLocation;
     if (ConfigDataLocation <> '') and (ConfigDataLocation[1] = PathDelim) then
-      ConfigDataLocation := Copy(ConfigDataLocation, 2, MaxInt); // there is no such thing as am absolute "\Software" registry key
+      ConfigDataLocation := Copy(ConfigDataLocation, 2, MaxInt); // there is no such thing as an absolute "\Software" registry key
 
     case Inst.RadToolKind of
       brDelphi:
@@ -269,6 +269,7 @@ function ChangeSearchPaths(Inst: TJclBorRADToolInstallation; Installing: Boolean
       begin
         TJclBDSInstallation(Inst).AddToCppBrowsingPath(BrowsePaths);
         TJclBDSInstallation(Inst).AddToCppIncludePath(IncludePaths);
+        TJclBDSInstallation(Inst).AddToCppLibraryPath(SearchPaths); // for .lib and .bpi
       end;
     end
     else
@@ -280,6 +281,7 @@ function ChangeSearchPaths(Inst: TJclBorRADToolInstallation; Installing: Boolean
       begin
         TJclBDSInstallation(Inst).RemoveFromCppBrowsingPath(BrowsePaths);
         TJclBDSInstallation(Inst).RemoveFromCppIncludePath(IncludePaths);
+        TJclBDSInstallation(Inst).RemoveFromCppLibraryPath(SearchPaths); // for .lib and .bpi
       end;
     end;
     Result := 1;

thirdparty/InnoSetup/CompInstall/CompInst.pas

@@ -0,0 +1,7 @@
+@echo off
+
+SET PATH=E:\Borland\Delphi7\Bin
+
+dcc32 -U..\..\JCL\source\Common;..\..\JCL\source\Windows -I..\..\JCL\source\Include -Q -$D- -E.. CompInstall.dpr
+
+pause