From: <ah...@us...> - 2011-02-05 15:46:40
|
Revision: 3491 http://jcl.svn.sourceforge.net/jcl/?rev=3491&view=rev Author: ahuser Date: 2011-02-05 15:46:34 +0000 (Sat, 05 Feb 2011) Log Message: ----------- * Added setup build script * Updated installer helper (C++ LibraryPath) Modified Paths: -------------- trunk/thirdparty/InnoSetup/CompInstall/CompInst.pas trunk/thirdparty/InnoSetup/CompInstall.dll trunk/thirdparty/InnoSetup/Install.iss trunk/thirdparty/InnoSetup/Settings.iss Added Paths: ----------- trunk/thirdparty/InnoSetup/BuildSetup.bat trunk/thirdparty/InnoSetup/CompInstall/build.bat Removed Paths: ------------- trunk/thirdparty/InnoSetup/SourceDirectories.iss Property Changed: ---------------- trunk/thirdparty/InnoSetup/ Property changes on: trunk/thirdparty/InnoSetup ___________________________________________________________________ Added: svn:ignore + Output setupbuild Added: trunk/thirdparty/InnoSetup/BuildSetup.bat =================================================================== --- trunk/thirdparty/InnoSetup/BuildSetup.bat (rev 0) +++ trunk/thirdparty/InnoSetup/BuildSetup.bat 2011-02-05 15:46:34 UTC (rev 3491) @@ -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 \ No newline at end of file Modified: trunk/thirdparty/InnoSetup/CompInstall/CompInst.pas =================================================================== --- trunk/thirdparty/InnoSetup/CompInstall/CompInst.pas 2011-02-05 15:42:43 UTC (rev 3490) +++ trunk/thirdparty/InnoSetup/CompInstall/CompInst.pas 2011-02-05 15:46:34 UTC (rev 3491) @@ -103,7 +103,7 @@ 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 @@ begin TJclBDSInstallation(Inst).AddToCppBrowsingPath(BrowsePaths); TJclBDSInstallation(Inst).AddToCppIncludePath(IncludePaths); + TJclBDSInstallation(Inst).AddToCppLibraryPath(SearchPaths); // for .lib and .bpi end; end else @@ -280,6 +281,7 @@ begin TJclBDSInstallation(Inst).RemoveFromCppBrowsingPath(BrowsePaths); TJclBDSInstallation(Inst).RemoveFromCppIncludePath(IncludePaths); + TJclBDSInstallation(Inst).RemoveFromCppLibraryPath(SearchPaths); // for .lib and .bpi end; end; Result := 1; Added: trunk/thirdparty/InnoSetup/CompInstall/build.bat =================================================================== --- trunk/thirdparty/InnoSetup/CompInstall/build.bat (rev 0) +++ trunk/thirdparty/InnoSetup/CompInstall/build.bat 2011-02-05 15:46:34 UTC (rev 3491) @@ -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 \ No newline at end of file Modified: trunk/thirdparty/InnoSetup/CompInstall.dll =================================================================== (Binary files differ) Modified: trunk/thirdparty/InnoSetup/Install.iss =================================================================== --- trunk/thirdparty/InnoSetup/Install.iss 2011-02-05 15:42:43 UTC (rev 3490) +++ trunk/thirdparty/InnoSetup/Install.iss 2011-02-05 15:46:34 UTC (rev 3491) @@ -3,49 +3,55 @@ ; CONDITIONAL COMPILATION ; Include_Binaries Create an installer that can install a precompiled JCL ; Include_Examples Add the Examples directory to the installer (user can then select the component) -; DEBUGGING Development. Will only use Delphi 5 BPLs as files with a fast compression (script debugging) +; DEBUGGING Development. Uses fast compression (script debugging) ; Include_DelphiX Include the binaries for Delphi X (X in 6..15) -; Include_BCBX Include the binaries for C++Builder 6 +#ifndef CmdLineBuild +#define JclRoot "..\Jcl" +#define JclLib "setupbuild\lib" +#define JclBpl "setupbuild\bpl" +#define JclHpp "setupbuild\hpp" +#define DEBUGGING +#endif + #define Include_SingleIDE #define Include_Binaries #define Include_Examples -;#define DEBUGGING #include "Settings.iss" -#ifdef Include_SingleIDE -#endif #define MyAppName "Jedi Code Library" #define MyAppVerName "Jedi Code Library " + JclVersionStr #define MyAppPublisher "JCL Team" #define MyAppURL "http://jcl.sourceforge.net/" -#define downloadurl "http://jcl.sourceforge.net/websetup/jcl" -#ifdef DEBUGGING - #define Include_SingleIDE - #define Include_Delphi15 - #undef Include_Examples +;--------------------------------------------------- +; Setup the preprocessor defines for the binary files +#ifdef Include_SingleIDE +#define JclLib6 JclLib +#define JclBpl6 JclBpl +#define JclLib7 JclLib +#define JclBpl7 JclBpl +#define JclLib9 JclLib +#define JclBpl9 JclBpl +#define JclLib10 JclLib +#define JclBpl10 JclBpl +#define JclHpp10 JclHpp +#define JclLib11 JclLib +#define JclBpl11 JclBpl +#define JclHpp11 JclHpp +#define JclLib12 JclLib +#define JclBpl12 JclBpl +#define JclHpp12 JclHpp +#define JclLib14 JclLib +#define JclBpl14 JclBpl +#define JclHpp14 JclHpp +#define JclLib15 JclLib +#define JclBpl15 JclBpl +#define JclHpp15 JclHpp #endif -#ifdef Include_Binaries - #ifndef Include_SingleIDE - #define Include_Delphi6 - #define Include_Delphi7 - #define Include_Delphi9 - #define Include_Delphi10 - #define Include_Delphi11 - #define Include_Delphi12 - #define Include_Delphi14 - #define Include_Delphi15 - #endif -#endif - - ;--------------------------------------------------- -#ifndef SourceDirectoriesDefines -#include "SourceDirectories.iss" -#endif [Setup] AppName={#MyAppName} @@ -69,7 +75,6 @@ SolidCompression=yes ShowLanguageDialog=auto OptimizedChecks=yes -;WebSetupUpdateURL={#downloadurl} // for skin @@ -101,16 +106,6 @@ #ifdef Include_Binaries -[Packages] -Name: delphi6; Description: "Delphi 6 binary files"; Source: "{#downloadurl}/jcldelphi6.isz"; Flags: localcopy; -Name: delphi7; Description: "Delphi 7 binary files"; Source: "{#downloadurl}/jcldelphi7.isz"; Flags: localcopy; -Name: delphi9; Description: "Delphi 2005 binary files"; Source: "{#downloadurl}/jcldelphi9.isz"; Flags: localcopy; -Name: delphi10; Description: "Delphi/C++Builder 2006 binary files"; Source: "{#downloadurl}/jcldelphi10.isz"; Flags: localcopy; -Name: delphi11; Description: "Delphi/C++Builder 2007 binary files"; Source: "{#downloadurl}/jcldelphi11.isz"; Flags: localcopy; -Name: delphi12; Description: "Delphi/C++Builder 2009 binary files"; Source: "{#downloadurl}/jcldelphi12.isz"; Flags: localcopy; -Name: delphi14; Description: "Delphi/C++Builder 2010 binary files"; Source: "{#downloadurl}/jcldelphi14.isz"; Flags: localcopy; -Name: delphi15; Description: "Delphi/C++Builder XE binary files"; Source: "{#downloadurl}/jcldelphi15.isz"; Flags: localcopy; - #include "IdeComponents.iss" [Components] @@ -144,84 +139,54 @@ Source: {#JclRoot}\source\*; DestDir: "{app}\source"; Excludes: ".svn,__history,*.~*,*.hpp,*.txt"; Flags: ignoreversion sortfilesbyextension recursesubdirs #ifdef Include_Examples ; SolidBreak -Source: {#JclRoot}\examples\*; DestDir: "{app}\examples"; Excludes: ".svn,__history,*.dcu,*.obj,*.exe,*.bpl,*.dcp,*.~*"; Components: "Examples"; Flags: ignoreversion recursesubdirs sortfilesbyextension solidbreak +Source: {#JclRoot}\examples\*; DestDir: "{app}\examples"; Excludes: ".svn,__history,*.dcu,*.obj,*.exe,*.map,*.bpl,*.dcp,*.~*,*.drc,*.local"; Components: "Examples"; Flags: ignoreversion recursesubdirs sortfilesbyextension solidbreak #endif #ifdef Include_Binaries #ifdef Include_Delphi6 ; SolidBreak; -Source: {#JclRoot}\lib\d6\*; DestDir: "{app}\lib\d6"; Excludes: ".svn,__history,*.txt,*.hpp"; Components: "IDE\Delphi6"; Package: delphi6; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs solidbreak -Source: {#Delphi6Bpl}\Jcl*.*; DestDir: "{code:GetDelphiBplDir|6}"; Components: "IDE\Delphi6"; Package: delphi6; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs +Source: {#JclLib6}\*; DestDir: "{app}\lib\d6"; Excludes: ".svn,__history,*.txt,*.hpp"; Components: "IDE\Delphi6"; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs solidbreak +Source: {#JclBpl6}\*; DestDir: "{code:GetDelphiBplDir|6}"; Components: "IDE\Delphi6"; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs #endif #ifdef Include_Delphi7 ; SolidBreak; -Source: {#JclRoot}\lib\d7\*; DestDir: "{app}\lib\d7"; Excludes: ".svn,__history,*.txt"; Components: "IDE\Delphi7"; Package: delphi7; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs solidbreak -Source: {#Delphi7Bpl}\Jcl*.*; DestDir: "{code:GetDelphiBplDir|7}"; Components: "IDE\Delphi7"; Package: delphi7; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs +Source: {#JclLib7}\*; DestDir: "{app}\lib\d7"; Excludes: ".svn,__history,*.txt"; Components: "IDE\Delphi7"; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs solidbreak +Source: {#JclBpl7}\*; DestDir: "{code:GetDelphiBplDir|7}"; Components: "IDE\Delphi7"; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs #endif #ifdef Include_Delphi9 ; SolidBreak; -Source: {#JclRoot}\lib\d9\*; DestDir: "{app}\lib\d9"; Excludes: ".svn,__history,*.txt,*.hpp"; Components: "IDE\Delphi9"; Package: delphi9; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs solidbreak -Source: {#Delphi9Bpl}\Jcl*9*.*; DestDir: "{code:GetDelphiBplDir|9}"; Components: "IDE\Delphi9"; Package: delphi9; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs +Source: {#JclLib9}\*; DestDir: "{app}\lib\d9"; Excludes: ".svn,__history,*.txt,*.hpp"; Components: "IDE\Delphi9"; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs solidbreak +Source: {#JclBpl9}\*; DestDir: "{code:GetDelphiBplDir|9}"; Components: "IDE\Delphi9"; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs #endif #ifdef Include_Delphi10 ; SolidBreak; - #ifdef JclHpp -Source: {#JclLib}\*.*; DestDir: "{app}\lib\d10"; Excludes: ".svn,__history,*.txt,*.hpp"; Components: "IDE\Delphi10"; Package: delphi10; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs solidbreak -Source: {#JclBpl}\*.*; DestDir: "{code:GetDelphiBplDir|10}"; Components: "IDE\Delphi10"; Package: delphi10; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs -Source: {#JclHpp}\*.*; DestDir: "{code:GetHPPDir|10}"; Components: "IDE\Delphi10"; Package: delphi10; Flags: ignoreversion sortfilesbyextension - #else -Source: {#JclRoot}\lib\d10\*; DestDir: "{app}\lib\d10"; Excludes: ".svn,__history,*.txt,*.hpp"; Components: "IDE\Delphi10"; Package: delphi10; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs solidbreak -Source: {#Delphi10Bpl}\Jcl*10*.*; DestDir: "{code:GetDelphiBplDir|10}"; Components: "IDE\Delphi10"; Package: delphi10; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs -Source: {#Delphi10Hpp}\Jcl*.hpp; DestDir: "{code:GetHPPDir|10}"; Components: "IDE\Delphi10"; Package: delphi10; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs - #endif +Source: {#JclLib10}\*; DestDir: "{app}\lib\d10"; Excludes: ".svn,__history,*.txt,*.hpp"; Components: "IDE\Delphi10"; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs solidbreak +Source: {#JclBpl10}\*; DestDir: "{code:GetDelphiBplDir|10}"; Components: "IDE\Delphi10"; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs +Source: {#JclHpp10}\*; DestDir: "{code:GetHPPDir|10}"; Components: "IDE\Delphi10"; Flags: ignoreversion sortfilesbyextension #endif #ifdef Include_Delphi11 ; SolidBreak; - #ifdef JclHpp -Source: {#JclLib}\*.*; DestDir: "{app}\lib\d11"; Excludes: ".svn,__history,*.txt,*.hpp"; Components: "IDE\Delphi11"; Package: delphi11; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs solidbreak -Source: {#JclBpl}\*.*; DestDir: "{code:GetDelphiBplDir|11}"; Components: "IDE\Delphi11"; Package: delphi11; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs -Source: {#JclHpp}\*.*; DestDir: "{code:GetHPPDir|11}"; Components: "IDE\Delphi11"; Package: delphi11; Flags: ignoreversion sortfilesbyextension - #else -Source: {#JclRoot}\lib\d11\*; DestDir: "{app}\lib\d11"; Excludes: ".svn,__history,*.txt,*.hpp"; Components: "IDE\Delphi11"; Package: delphi11; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs solidbreak -Source: {#Delphi11Bpl}\Jcl*.*; DestDir: "{code:GetDelphiBplDir|11}"; Components: "IDE\Delphi11"; Package: delphi11; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs -Source: {#Delphi11Hpp}\Jcl*.hpp; DestDir: "{code:GetHPPDir|11}"; Components: "IDE\Delphi11"; Package: delphi11; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs - #endif +Source: {#JclLib11}\*; DestDir: "{app}\lib\d11"; Excludes: ".svn,__history,*.txt,*.hpp"; Components: "IDE\Delphi11"; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs solidbreak +Source: {#JclBpl11}\*; DestDir: "{code:GetDelphiBplDir|11}"; Components: "IDE\Delphi11"; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs +Source: {#JclHpp11}\*; DestDir: ""{app}\include\d11"; Components: "IDE\Delphi11"; Flags: ignoreversion sortfilesbyextension #endif #ifdef Include_Delphi12 ; SolidBreak; - #ifdef JclHpp -Source: {#JclLib}\*.*; DestDir: "{app}\lib\d12"; Excludes: ".svn,__history,*.txt,*.hpp"; Components: "IDE\Delphi12"; Package: delphi12; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs solidbreak -Source: {#JclBpl}\*.*; DestDir: "{code:GetDelphiBplDir|12}"; Components: "IDE\Delphi12"; Package: delphi12; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs -Source: {#JclHpp}\*.*; DestDir: "{code:GetHPPDir|12}"; Components: "IDE\Delphi12"; Package: delphi12; Flags: ignoreversion sortfilesbyextension - #else -Source: {#JclRoot}\lib\d12\*; DestDir: "{app}\lib\d12"; Excludes: ".svn,__history,*.txt,*.hpp"; Components: "IDE\Delphi12"; Package: delphi12; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs solidbreak -Source: {#Delphi12Bpl}\Jcl*.*; DestDir: "{code:GetDelphiBplDir|12}"; Components: "IDE\Delphi12"; Package: delphi12; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs -Source: {#Delphi12Hpp}\Jcl*.hpp; DestDir: "{code:GetHPPDir|12}"; Components: "IDE\Delphi12"; Package: delphi12; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs - #endif +Source: {#JclLib12}\*; DestDir: "{app}\lib\d12"; Excludes: ".svn,__history,*.txt,*.hpp"; Components: "IDE\Delphi12"; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs solidbreak +Source: {#JclBpl12}\*; DestDir: "{code:GetDelphiBplDir|12}"; Components: "IDE\Delphi12"; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs +Source: {#JclHpp12}\*; DestDir: ""{app}\include\d12"; Components: "IDE\Delphi12"; Flags: ignoreversion sortfilesbyextension #endif #ifdef Include_Delphi14 ; SolidBreak; - #ifdef JclHpp -Source: {#JclJcl}\*.*; DestDir: "{app}\lib\d14"; Excludes: ".svn,__history,*.txt,*.hpp"; Components: "IDE\Delphi14"; Package: delphi14; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs solidbreak -Source: {#JclBpl}\*.*; DestDir: "{code:GetDelphiBplDir|14}"; Components: "IDE\Delphi14"; Package: delphi14; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs -Source: {#JclHpp}\*.*; DestDir: "{code:GetHPPDir|14}"; Components: "IDE\Delphi14"; Package: delphi14; Flags: ignoreversion sortfilesbyextension - #else -Source: {#JclRoot}\lib\d14\*; DestDir: "{app}\lib\d14"; Excludes: ".svn,__history,*.txt,*.hpp"; Components: "IDE\Delphi14"; Package: delphi14; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs solidbreak -Source: {#Delphi14Bpl}\Jcl*.*; DestDir: "{code:GetDelphiBplDir|14}"; Components: "IDE\Delphi14"; Package: delphi14; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs -Source: {#Delphi14Hpp}\Jcl*.hpp; DestDir: "{code:GetHPPDir|14}"; Components: "IDE\Delphi14"; Package: delphi14; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs - #endif +Source: {#JclJcl14}\*; DestDir: "{app}\lib\d14"; Excludes: ".svn,__history,*.txt,*.hpp"; Components: "IDE\Delphi14"; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs solidbreak +Source: {#JclBpl14}\*; DestDir: "{code:GetDelphiBplDir|14}"; Components: "IDE\Delphi14"; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs +Source: {#JclHpp14}\*; DestDir: ""{app}\include\d14"; Components: "IDE\Delphi14"; Flags: ignoreversion sortfilesbyextension #endif #ifdef Include_Delphi15 ; SolidBreak; - #ifdef JclHpp -Source: {#JclLib}\*.*; DestDir: "{app}\lib\d15"; Excludes: ".svn,__history,*.txt,*.hpp"; Components: "IDE\Delphi15"; Package: delphi15; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs solidbreak -Source: {#JclBpl}\*.*; DestDir: "{code:GetDelphiBplDir|15}"; Components: "IDE\Delphi15"; Package: delphi15; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs -Source: {#JclHpp}\*.*; DestDir: "{code:GetHPPDir|15}"; Components: "IDE\Delphi15"; Package: delphi15; Flags: ignoreversion sortfilesbyextension - #else -Source: {#JclRoot}\lib\d15\*; DestDir: "{app}\lib\d15"; Excludes: ".svn,__history,*.txt,*.hpp"; Components: "IDE\Delphi15"; Package: delphi15; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs solidbreak -Source: {#Delphi15Bpl}\Jcl*.*; DestDir: "{code:GetDelphiBplDir|15}"; Components: "IDE\Delphi15"; Package: delphi15; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs -Source: {#Delphi15Hpp}\Jcl*.hpp; DestDir: "{code:GetHPPDir|15}"; Components: "IDE\Delphi15"; Package: delphi15; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs - #endif +Source: {#JclLib15}\*; DestDir: "{app}\lib\d15"; Excludes: ".svn,__history,*.txt,*.hpp"; Components: "IDE\Delphi15"; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs solidbreak +Source: {#JclBpl15}\*; DestDir: "{code:GetDelphiBplDir|15}"; Components: "IDE\Delphi15"; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs +Source: {#JclHpp15}\*; DestDir: "{app}\include\d15"; Components: "IDE\Delphi15"; Flags: ignoreversion sortfilesbyextension #endif #endif @@ -301,6 +266,7 @@ Type: files; Name: "{app}\bin\JCL-install.ini" Type: files; Name: "{app}\bin\*.log" Type: files; Name: "{app}\source\*.hpp" +Type: files; Name: "{app}\source\*.~*" Type: files; Name: "{app}\source\common\*.hpp" Type: files; Name: "{app}\source\vcl\*.hpp" Type: files; Name: "{app}\source\windows\*.hpp" @@ -326,18 +292,22 @@ ; lib\Delphi/C++Builder 2007 Type: files; Name: "{app}\lib\d11\*" Type: files; Name: "{app}\lib\d11\debug\*" +Type: files; Name: "{app}\include\d11\*" Type: files; Name: "{code:GetDelphiBplDir|11}\Jcl*.~bpl"; ; lib\Delphi/C++Builder 2009 Type: files; Name: "{app}\lib\d12\*" Type: files; Name: "{app}\lib\d12\debug\*" +Type: files; Name: "{app}\include\d12\*" Type: files; Name: "{code:GetDelphiBplDir|12}\Jcl*.~bpl"; ; lib\Delphi/C++Builder 2010 Type: files; Name: "{app}\lib\d14\*" Type: files; Name: "{app}\lib\d14\debug\*" +Type: files; Name: "{app}\include\d14\*" Type: files; Name: "{code:GetDelphiBplDir|14}\Jcl*.~bpl"; ; lib\Delphi/C++Builder XE Type: files; Name: "{app}\lib\d15\*" Type: files; Name: "{app}\lib\d15\debug\*" +Type: files; Name: "{app}\include\d15\*" Type: files; Name: "{code:GetDelphiBplDir|15}\Jcl*.~bpl"; [Icons] @@ -426,8 +396,10 @@ SearchPaths := LibDir + ';' + AppDir + '\source\Include'; DebugPaths := LibDir + '\debug'; - BrowsePaths := AppDir + '\source\Include;' + AppDir + '\source\common;' + AppDir + '\source\vcl;' + AppDir + '\source\windows'; - if Version >= 10 then + BrowsePaths := AppDir + '\source\common;' + AppDir + '\source\vcl;' + AppDir + '\source\windows'; + if Version >= 11 then + IncludePaths := ExpandConstant('{app}') + '\include\d' + IntToStr(Version) + else if Version = 10 then IncludePaths := GetHPPDir(IntToStr(Version)); end; Modified: trunk/thirdparty/InnoSetup/Settings.iss =================================================================== --- trunk/thirdparty/InnoSetup/Settings.iss 2011-02-05 15:42:43 UTC (rev 3490) +++ trunk/thirdparty/InnoSetup/Settings.iss 2011-02-05 15:46:34 UTC (rev 3491) @@ -1,2 +1,2 @@ #define Include_Delphi15 -#define JclVersionStr "2.0.1.3449" +#define JclVersionStr "2.3.0.374" Deleted: trunk/thirdparty/InnoSetup/SourceDirectories.iss =================================================================== --- trunk/thirdparty/InnoSetup/SourceDirectories.iss 2011-02-05 15:42:43 UTC (rev 3490) +++ trunk/thirdparty/InnoSetup/SourceDirectories.iss 2011-02-05 15:46:34 UTC (rev 3491) @@ -1,20 +0,0 @@ -#define JclRoot "Z:\JEDI\JCL" - -#define Delphi6Bpl "C:\Borland\Delphi6\Projects\Bpl" -#define Delphi7Bpl "C:\Borland\Delphi7\Projects\Bpl" -#define Delphi9Bpl "C:\Users\Andreas\Documents\Borland Studio Projekte\Bpl" - -#define Delphi10Bpl "C:\Users\Andreas\Documents\Borland Studio Projekte\Bpl" -#define Delphi10Bpl "C:\Users\Andreas\Documents\Borland Studio Projekte\Hpp" - -#define Delphi11Bpl "C:\Users\Public\Documents\RAD Studio\5.0\Bpl" -#define Delphi11Hpp "C:\Users\Public\Documents\RAD Studio\5.0\Hpp" - -#define Delphi12Bpl "C:\Users\Public\Documents\RAD Studio\6.0\Bpl" -#define Delphi12Hpp "C:\Users\Public\Documents\RAD Studio\6.0\Hpp" - -#define Delphi14Bpl "C:\Users\Public\Documents\RAD Studio\7.0\Bpl" -#define Delphi14Hpp "C:\Users\Public\Documents\RAD Studio\7.0\Hpp" - -#define Delphi15Bpl "C:\Users\Public\Documents\RAD Studio\8.0\Bpl" -#define Delphi15Hpp "C:\Users\Public\Documents\RAD Studio\8.0\Hpp" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |