[Jcl-checkins-diff] SF.net SVN: jcl:[3869] trunk/thirdparty/InnoSetup

[<ah...@us...>]

Revision: 3869
          http://jcl.svn.sourceforge.net/jcl/?rev=3869&view=rev
Author:   ahuser
Date:     2012-09-05 22:01:26 +0000 (Wed, 05 Sep 2012)
Log Message:
-----------
RAD Studio XE3

Modified Paths:
--------------
    trunk/thirdparty/InnoSetup/CompInstall.dll
    trunk/thirdparty/InnoSetup/ComponentInstallerScript.iss
    trunk/thirdparty/InnoSetup/IdeComponents.iss
    trunk/thirdparty/InnoSetup/Install.iss
    trunk/thirdparty/InnoSetup/Settings.iss

Modified: trunk/thirdparty/InnoSetup/CompInstall.dll
===================================================================
(Binary files differ)

Modified: trunk/thirdparty/InnoSetup/ComponentInstallerScript.iss
===================================================================
--- trunk/thirdparty/InnoSetup/ComponentInstallerScript.iss	2012-09-05 18:10:33 UTC (rev 3868)
+++ trunk/thirdparty/InnoSetup/ComponentInstallerScript.iss	2012-09-05 22:01:26 UTC (rev 3869)
@@ -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/thirdparty/InnoSetup/IdeComponents.iss
===================================================================
--- trunk/thirdparty/InnoSetup/IdeComponents.iss	2012-09-05 18:10:33 UTC (rev 3868)
+++ trunk/thirdparty/InnoSetup/IdeComponents.iss	2012-09-05 22:01:26 UTC (rev 3869)
@@ -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/thirdparty/InnoSetup/Install.iss
===================================================================
--- trunk/thirdparty/InnoSetup/Install.iss	2012-09-05 18:10:33 UTC (rev 3868)
+++ trunk/thirdparty/InnoSetup/Install.iss	2012-09-05 22:01:26 UTC (rev 3869)
@@ -52,6 +52,9 @@
 #define JclLib16    JclLib
 #define   JclBpl16  JclBpl
 #define   JclHpp16  JclHpp
+#define JclLib17    JclLib
+#define   JclBpl17  JclBpl
+#define   JclHpp17  JclHpp
 #endif
 
 ;---------------------------------------------------
@@ -198,6 +201,13 @@
 Source: {#JclBpl16}\Win64\*; DestDir: "{code:GetDelphiBplDir|16}\Win64"; Components: "IDE\Delphi16"; Flags: ignoreversion sortfilesbyextension
 Source: {#JclHpp16}\*; DestDir: "{app}\include\d16"; Components: "IDE\Delphi16"; Flags: ignoreversion sortfilesbyextension
 #endif
+#ifdef Include_Delphi17
+; SolidBreak;
+Source: {#JclLib17}\*; DestDir: "{app}\lib\d17"; Excludes: ".svn,__history,*.txt,*.hpp"; Components: "IDE\Delphi17"; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs solidbreak
+Source: {#JclBpl17}\*; DestDir: "{code:GetDelphiBplDir|17}"; Components: "IDE\Delphi17"; Flags: ignoreversion sortfilesbyextension
+Source: {#JclBpl17}\Win64\*; DestDir: "{code:GetDelphiBplDir|17}\Win64"; Components: "IDE\Delphi17"; Flags: ignoreversion sortfilesbyextension
+Source: {#JclHpp17}\*; DestDir: "{app}\include\d17"; Components: "IDE\Delphi17"; Flags: ignoreversion sortfilesbyextension
+#endif
 
 #endif
 
@@ -268,17 +278,26 @@
 Root: HKCU; Subkey: "{code:GetDelphiRegKey|15}\Globals"; ValueType: string; ValueName: "ForceEnvOptionsUpdate"; ValueData: "1"; Components: "IDE\Delphi15";
 #endif
 #ifdef Include_Delphi16
-; Delphi XE
+; Delphi XE2
 Root: HKCU; Subkey: "{code:GetDelphiRegKey|16}\Jedi\JCL"; ValueType: string; ValueName: "BplDir"; ValueData: {code:GetDelphiBplDir|16}; Components: "IDE\Delphi16"; Flags: uninsdeletevalue;
 Root: HKCU; Subkey: "{code:GetDelphiRegKey|16}\Jedi\JCL"; ValueType: string; ValueName: "DcpDir"; ValueData: {app}\lib\d16; Components: "IDE\Delphi16"; Flags: uninsdeletevalue;
 Root: HKCU; Subkey: "{code:GetDelphiRegKey|16}\Jedi\JCL"; ValueType: string; ValueName: "RootDir"; ValueData: {app}; Components: "IDE\Delphi16"; Flags: uninsdeletevalue;
 Root: HKCU; Subkey: "{code:GetDelphiRegKey|16}\Jedi\JCL"; ValueType: string; ValueName: "Version"; ValueData: {#JclVersionStr}; Components: "IDE\Delphi16"; 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\JCL"; ValueType: string; ValueName: "BplDir"; ValueData: {code:GetDelphiBplDir|17}; Components: "IDE\Delphi17"; Flags: uninsdeletevalue;
+Root: HKCU; Subkey: "{code:GetDelphiRegKey|17}\Jedi\JCL"; ValueType: string; ValueName: "DcpDir"; ValueData: {app}\lib\d17; Components: "IDE\Delphi17"; Flags: uninsdeletevalue;
+Root: HKCU; Subkey: "{code:GetDelphiRegKey|17}\Jedi\JCL"; ValueType: string; ValueName: "RootDir"; ValueData: {app}; Components: "IDE\Delphi17"; Flags: uninsdeletevalue;
+Root: HKCU; Subkey: "{code:GetDelphiRegKey|17}\Jedi\JCL"; ValueType: string; ValueName: "Version"; ValueData: {#JclVersionStr}; Components: "IDE\Delphi17"; 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}\bin\JediInstaller.exe"
 Type: files; Name: "{app}\bin\JCL-install.ini"
@@ -334,7 +353,13 @@
 Type: files; Name: "{app}\lib\d16\win64\debug\*"
 Type: files; Name: "{app}\include\d16\*"
 Type: files; Name: "{code:GetDelphiBplDir|16}\Jcl*.~bpl";
-
+; 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}\Jcl*.~bpl";
 [Icons]
 Name: "{group}\{cm:ProgramOnTheWeb,{#MyAppName}}"; Filename: "{#MyAppURL}"
 Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
@@ -359,7 +384,7 @@
   Version: Integer;
 begin
 {  // Uninstall from all IDEs ?
-  for Version := 6 to 16 do
+  for Version := 6 to 17 do
     UninstallExpertsPrefixed(ikDelphi, Version, 'Jcl');
   for Version := 6 to 6 do
     UninstallExpertsPrefixed(ikBCB, Version, 'Jcl');}

Modified: trunk/thirdparty/InnoSetup/Settings.iss
===================================================================
--- trunk/thirdparty/InnoSetup/Settings.iss	2012-09-05 18:10:33 UTC (rev 3868)
+++ trunk/thirdparty/InnoSetup/Settings.iss	2012-09-05 22:01:26 UTC (rev 3869)
@@ -1,2 +1,2 @@
-#define Include_Delphi16
-#define JclVersionStr "2.4.0.4198"
+#define Include_Delphi17
+#define JclVersionStr "2.4.1.4571"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.