From: <ah...@us...> - 2012-09-05 22:08:06
|
Revision: 13410 http://jvcl.svn.sourceforge.net/jvcl/?rev=13410&view=rev Author: ahuser Date: 2012-09-05 22:07:59 +0000 (Wed, 05 Sep 2012) Log Message: ----------- InnoSetup installer support for XE3 Modified Paths: -------------- trunk/jvcl/install/ISS/CompInstall.dll trunk/jvcl/install/ISS/ComponentInstallerScript.iss trunk/jvcl/install/ISS/IdeComponents.iss trunk/jvcl/install/ISS/Install.iss trunk/jvcl/install/ISS/Settings.iss Modified: trunk/jvcl/install/ISS/CompInstall.dll =================================================================== (Binary files differ) Modified: trunk/jvcl/install/ISS/ComponentInstallerScript.iss =================================================================== --- trunk/jvcl/install/ISS/ComponentInstallerScript.iss 2012-09-04 11:38:24 UTC (rev 13409) +++ trunk/jvcl/install/ISS/ComponentInstallerScript.iss 2012-09-05 22:07:59 UTC (rev 13410) @@ -452,7 +452,7 @@ // Check if there is any Delphi IDE installed Result := False; - for Version := 6 to 15 do + for Version := 6 to 17 do if IsDelphiInstalled(Version) then Result := True; Modified: trunk/jvcl/install/ISS/IdeComponents.iss =================================================================== --- trunk/jvcl/install/ISS/IdeComponents.iss 2012-09-04 11:38:24 UTC (rev 13409) +++ trunk/jvcl/install/ISS/IdeComponents.iss 2012-09-05 22:07:59 UTC (rev 13410) @@ -1,6 +1,6 @@ [Components] ; IDE selection -Name: "IDE"; Description: "Install for Professional/Enterprise/Architect IDE" +Name: "IDE"; Description: "Install for IDE" #ifdef Include_Delphi6 Name: "IDE\Delphi6"; Description: "Install for Delphi 6"; Types: full prefered; Check: IsDelphiInstalled(6) #endif @@ -31,3 +31,6 @@ #ifdef Include_Delphi16 Name: "IDE\Delphi16"; Description: "Install for RAD Studio XE2"; Types: full prefered; Check: IsDelphiInstalled(16) #endif +#ifdef Include_Delphi17 +Name: "IDE\Delphi17"; Description: "Install for RAD Studio XE3"; Types: full prefered; Check: IsDelphiInstalled(17) +#endif Modified: trunk/jvcl/install/ISS/Install.iss =================================================================== --- trunk/jvcl/install/ISS/Install.iss 2012-09-04 11:38:24 UTC (rev 13409) +++ trunk/jvcl/install/ISS/Install.iss 2012-09-05 22:07:59 UTC (rev 13410) @@ -31,6 +31,7 @@ ;--------------------------------------------------- ; Setup the preprocessor defines for the binary files #ifdef Include_SingleIDE + #define JvclLib6 JvclLib #define JvclBpl6 JvclBpl #define JvclLib7 JvclLib @@ -55,6 +56,10 @@ #define JvclLib16 JvclLib #define JvclBpl16 JvclBpl #define JvclHpp16 JvclHpp +#define JvclLib17 JvclLib +#define JvclBpl17 JvclBpl +#define JvclHpp17 JvclHpp + #endif ;--------------------------------------------------- @@ -183,6 +188,10 @@ Name: "{app}\lib\d16\win32\debug" Name: "{app}\lib\d16\win64" Name: "{app}\lib\d16\win64\debug" +Name: "{app}\lib\d17\win32" +Name: "{app}\lib\d17\win32\debug" +Name: "{app}\lib\d17\win64" +Name: "{app}\lib\d17\win64\debug" [Files] Source: {#JvclRoot}\*; DestDir: "{app}"; Flags: ignoreversion @@ -260,14 +269,22 @@ Source: {#JvclHpp15}\*; DestDir: "{app}\include\d15"; Components: "IDE\Delphi15"; Flags: ignoreversion sortfilesbyextension #endif #ifdef Include_Delphi16 -; SolidBreak; lib\Delphi XE +; SolidBreak; lib\Delphi XE2 Source: {#JvclLib16}\*; DestDir: "{app}\lib\d16"; Excludes: ".svn,__history,*.txt"; Components: "IDE\Delphi16"; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs solidbreak Source: {#JvclBpl16}\*; DestDir: "{code:GetDelphiBplDir|16}"; Components: "IDE\Delphi16"; Flags: ignoreversion sortfilesbyextension Source: {#JvclBpl16}\Win64\*; DestDir: "{code:GetDelphiBplDir|16}\Win64"; Components: "IDE\Delphi16"; Flags: ignoreversion sortfilesbyextension Source: {#JvclHpp16}\*; DestDir: "{app}\include\d16"; Components: "IDE\Delphi16"; Flags: ignoreversion sortfilesbyextension #endif +#ifdef Include_Delphi17 +; SolidBreak; lib\Delphi XE3 +Source: {#JvclLib17}\*; DestDir: "{app}\lib\d17"; Excludes: ".svn,__history,*.txt"; Components: "IDE\Delphi17"; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs solidbreak +Source: {#JvclBpl17}\*; DestDir: "{code:GetDelphiBplDir|17}"; Components: "IDE\Delphi17"; Flags: ignoreversion sortfilesbyextension +Source: {#JvclBpl17}\Win64\*; DestDir: "{code:GetDelphiBplDir|17}\Win64"; Components: "IDE\Delphi17"; Flags: ignoreversion sortfilesbyextension +Source: {#JvclHpp17}\*; DestDir: "{app}\include\d17"; Components: "IDE\Delphi17"; Flags: ignoreversion sortfilesbyextension #endif +#endif + ; only source code => execute JVCL Installer [Run] Filename: {app}\install.bat; Description: "Execute JVCL Installer"; Flags: postinstall shellexec; Check: IsSourceInstall; @@ -351,9 +368,19 @@ Root: HKCU; Subkey: "{code:GetDelphiRegKey|16}\Jedi\JVCL\IDE"; ValueType: dword; ValueName: "RegisterGlobalDesignEditors"; ValueData: 1; Components: "Options\RegisterGlobalDesignEditors"; Flags: uninsdeletevalue; Root: HKCU; Subkey: "{code:GetDelphiRegKey|16}\Globals"; ValueType: string; ValueName: "ForceEnvOptionsUpdate"; ValueData: "1"; Components: "IDE\Delphi16"; #endif +#ifdef Include_Delphi17 +; Delphi XE3 +Root: HKCU; Subkey: "{code:GetDelphiRegKey|17}\Jedi\JVCL"; ValueType: string; ValueName: "BplDir"; ValueData: {code:GetDelphiBplDir|17}; Components: "IDE\Delphi17"; Flags: uninsdeletevalue; +Root: HKCU; Subkey: "{code:GetDelphiRegKey|17}\Jedi\JVCL"; ValueType: string; ValueName: "DcpDir"; ValueData: {app}\lib\d17; Components: "IDE\Delphi17"; Flags: uninsdeletevalue; +Root: HKCU; Subkey: "{code:GetDelphiRegKey|17}\Jedi\JVCL"; ValueType: string; ValueName: "RootDir"; ValueData: {app}; Components: "IDE\Delphi17"; Flags: uninsdeletevalue; +Root: HKCU; Subkey: "{code:GetDelphiRegKey|17}\Jedi\JVCL"; ValueType: string; ValueName: "Version"; ValueData: {#JvclVersionStr}; Components: "IDE\Delphi17"; Flags: uninsdeletevalue; +Root: HKCU; Subkey: "{code:GetDelphiRegKey|17}\Jedi\JVCL\IDE"; ValueType: dword; ValueName: "RegisterGlobalDesignEditors"; ValueData: 1; Components: "Options\RegisterGlobalDesignEditors"; Flags: uninsdeletevalue; +Root: HKCU; Subkey: "{code:GetDelphiRegKey|17}\Globals"; ValueType: string; ValueName: "ForceEnvOptionsUpdate"; ValueData: "1"; Components: "IDE\Delphi17"; #endif +#endif + [UninstallDelete] Type: files; Name: "{app}\dcu\*" Type: files; Name: "{app}\bin\JVCLInstall.*" @@ -409,7 +436,14 @@ Type: files; Name: "{app}\include\d16\*" Type: files; Name: "{code:GetDelphiBplDir|16}\Jv*.*" Type: files; Name: "{code:GetDelphiBplDir|16}\Win64\Jv*.*" - +; lib\Delphi/C++Builder XE3 +Type: files; Name: "{app}\lib\d17\win32\*" +Type: files; Name: "{app}\lib\d17\win32\debug\*" +Type: files; Name: "{app}\lib\d17\win64\*" +Type: files; Name: "{app}\lib\d17\win64\debug\*" +Type: files; Name: "{app}\include\d17\*" +Type: files; Name: "{code:GetDelphiBplDir|17}\Jv*.*" +Type: files; Name: "{code:GetDelphiBplDir|17}\Win64\Jv*.*" [Icons] Name: "{group}\{cm:ProgramOnTheWeb,{#MyAppName}}"; Filename: "{#MyAppURL}" Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}" @@ -434,7 +468,7 @@ Version: Integer; begin { // Uninstall from all IDEs ? - for Version := 6 to 16 do + for Version := 6 to 17 do UninstallDesignPackagesPrefixed(ikDelphi, Version, 'Jv'); for Version := 6 to 6 do UninstallDesignPackagesPrefixed(ikBCB, Version, 'Jv');} @@ -529,7 +563,7 @@ if Result then begin Result := False; - for Version := 6 to 16 do + for Version := 6 to 17 do begin if IsDelphiJclInstalled(Version) then begin Modified: trunk/jvcl/install/ISS/Settings.iss =================================================================== --- trunk/jvcl/install/ISS/Settings.iss 2012-09-04 11:38:24 UTC (rev 13409) +++ trunk/jvcl/install/ISS/Settings.iss 2012-09-05 22:07:59 UTC (rev 13410) @@ -1,2 +1,2 @@ -#define Include_Delphi16 +#define Include_Delphi17 #define JvclVersionStr "3.45" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |