Menu
▾
▴
[JVCL-Checkins] SF.net SVN: jvcl: [11497] trunk/jvcl/install/ISS
|
From: <ah...@us...> - 2007-09-01 15:42:21
|
Revision: 11497
http://jvcl.svn.sourceforge.net/jvcl/?rev=11497&view=rev
Author: ahuser
Date: 2007-09-01 08:42:17 -0700 (Sat, 01 Sep 2007)
Log Message:
-----------
Added web package support (requires special InnoSetup version)
Modified Paths:
--------------
trunk/jvcl/install/ISS/ComponentInstallerScript.iss
trunk/jvcl/install/ISS/Install.iss
trunk/jvcl/install/ISS/Skin/isxskin.iss
Removed Paths:
-------------
trunk/jvcl/install/ISS/DownloadScript.iss
trunk/jvcl/install/ISS/isxdl.dll
Modified: trunk/jvcl/install/ISS/ComponentInstallerScript.iss
===================================================================
--- trunk/jvcl/install/ISS/ComponentInstallerScript.iss 2007-08-31 17:50:13 UTC (rev 11496)
+++ trunk/jvcl/install/ISS/ComponentInstallerScript.iss 2007-09-01 15:42:17 UTC (rev 11497)
@@ -419,6 +419,9 @@
begin
Components := TStringList.Create;
try
+ Components.CommaText := WizardSelectedComponents(False);
+ UserUnregisterComponents(Components); // remove a failed installation first
+
ChangeComponentRegistration(True, Components);
UserRegisterComponents(Components);
finally
Deleted: trunk/jvcl/install/ISS/DownloadScript.iss
===================================================================
--- trunk/jvcl/install/ISS/DownloadScript.iss 2007-08-31 17:50:13 UTC (rev 11496)
+++ trunk/jvcl/install/ISS/DownloadScript.iss 2007-09-01 15:42:17 UTC (rev 11497)
@@ -1,71 +0,0 @@
-[Files]
-Source: isxdl.dll; DestDir: {tmp}; Flags: dontcopy
-
-[Code]
-procedure istool_AddFile(URL, Filename: PChar);
- external 'isxdl_AddFile@files:isxdl.dll stdcall';
-function istool_DownloadFiles(hWnd: Integer): Integer;
- external 'isxdl_DownloadFiles@files:isxdl.dll stdcall';
-procedure istool_ClearFiles;
- external 'isxdl_ClearFiles@files:isxdl.dll stdcall';
-
-type
- ISXDL = record
- Source: string;
- DestDir: string;
- DestName: string;
- Tasks: string;
- Components: string;
- Languages: string;
- Flags: Cardinal;
- end;
-
-var
- istool_files: array of ISXDL;
-
-procedure istool_download_init();
-begin
- SetArrayLength(istool_files, 1);
- // Delphi 5
- istool_files[0].Source := 'http://jvcl.sourceforge.net/daily/JVCL3-Latest.zip';
- istool_files[0].DestDir := ExpandConstant('{tmp}');
- istool_files[0].DestName := 'JVCL3-Latest.zip';
- istool_files[0].Tasks := '';
- istool_files[0].Components := 'IDE\Delphi5';
- istool_files[0].Languages := '';
- istool_files[0].Flags := 0;
-end;
-
-function istool_checklanguages(const Languages: String): Boolean;
-begin
- Result := (Languages = '') or (Pos(ActiveLanguage, Languages) > 0);
-end;
-
-function istool_download(CurPage: Integer): boolean;
-var
- i, NumFiles: Integer;
- DestFile, DestDir: string;
-begin
- Result := True;
- if CurPage <> wpReady then
- Exit;
- istool_ClearFiles();
- istool_download_init();
- NumFiles := GetArrayLength(istool_files);
- for i := 0 to NumFiles - 1 do
- begin
- if IsComponentSelected(istool_files[i].Components) and
- IsTaskSelected(istool_files[i].Tasks) and
- istool_checklanguages(istool_files[i].Languages) then
- begin
- DestDir := AddBackslash(istool_files[i].DestDir);
- if istool_files[i].DestName = '' then
- DestFile := DestDir + 'dlfile.' + IntToStr(i)
- else
- DestFile := DestDir + istool_files[i].DestName;
- istool_AddFile(istool_files[i].Source, DestFile);
- end;
- end;
- //Result := 0 <> istool_DownloadFiles(StrToInt(ExpandConstant('{wizardhwnd}')));
- Result := 0 <> istool_DownloadFiles(0);
-end;
Modified: trunk/jvcl/install/ISS/Install.iss
===================================================================
--- trunk/jvcl/install/ISS/Install.iss 2007-08-31 17:50:13 UTC (rev 11496)
+++ trunk/jvcl/install/ISS/Install.iss 2007-09-01 15:42:17 UTC (rev 11497)
@@ -12,7 +12,8 @@
#define MyAppName "Jedi Visual Component Library"
#define MyAppVerName "Jedi Visual Component Library " + JvclVersionStr
#define MyAppPublisher "JVCL Team"
-#define MyAppURL "http://jvcl.sourceforge.net/"
+#define MyAppURL "http://jvcl.sourceforge.net"
+#define downloadurl "http://jvcl.sourceforge.net/websetup/jvcl"
#define Include_Binaries
#define Include_Examples
@@ -83,6 +84,7 @@
#endif
SolidCompression=yes
ShowLanguageDialog=auto
+OptimizedChecks=yes
// for skin
#define MyWizardBottomImageFile "Skin\images\wizardbottom.bmp"
@@ -113,6 +115,19 @@
#endif
#ifdef Include_Binaries
+
+[Packages]
+Name: examples; Description: "JVCL Examples"; Source: "{#downloadurl}/jvclexamples.isz"; Flags: localcopy;
+
+Name: delphi5; Description: "Delphi 5 binary files"; Source: "{#downloadurl}/jvcldelphi5.isz"; Flags: localcopy;
+Name: bcb5; Description: "C++Builder 5 binary files"; Source: "{#downloadurl}/jvclbcb5.isz"; Flags: localcopy;
+Name: delphi6; Description: "Delphi 6 binary files"; Source: "{#downloadurl}/jvcldelphi6.isz"; Flags: localcopy;
+Name: bcb6; Description: "C++Builder 6 binary files"; Source: "{#downloadurl}/jvclbcb6.isz"; Flags: localcopy;
+Name: delphi7; Description: "Delphi 7 binary files"; Source: "{#downloadurl}/jvcldelphi7.isz"; Flags: localcopy;
+Name: delphi9; Description: "Delphi 2005 binary files"; Source: "{#downloadurl}/jvcldelphi9.isz"; Flags: localcopy;
+Name: delphi10; Description: "Delphi/C++Builder 2006 binary files"; Source: "{#downloadurl}/jvcldelphi10.isz"; Flags: localcopy;
+Name: delphi11; Description: "Delphi/C++Builder 2007 binary files"; Source: "{#downloadurl}/jvcldelphi11.isz"; Flags: localcopy;
+
#include "IdeComponents.iss"
[Components]
@@ -202,55 +217,55 @@
#ifdef Include_Examples
; SolidBreak
-Source: {#JvclRoot}\examples\*; DestDir: "{app}\examples"; Excludes: ".svn,__history"; Components: "Examples"; Flags: ignoreversion recursesubdirs sortfilesbyextension solidbreak
+Source: {#JvclRoot}\examples\*; DestDir: "{app}\examples"; Excludes: ".svn,__history"; Components: "Examples"; Package: examples; Flags: ignoreversion recursesubdirs sortfilesbyextension solidbreak
#endif
#ifdef Include_Binaries
#ifdef Include_Delphi5
; SolidBreak; lib\Delphi 5
#ifndef DEBUGGING
-Source: {#JvclRoot}\lib\d5\*; DestDir: "{app}\lib\d5"; Excludes: ".svn,__history,*.txt"; Components: "IDE\Delphi5"; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs solidbreak
+Source: {#JvclRoot}\lib\d5\*; DestDir: "{app}\lib\d5"; Excludes: ".svn,__history,*.txt"; Components: "IDE\Delphi5"; Package: delphi5; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs solidbreak
#endif
-Source: {#Delphi5Bpl}\Jv*.bpl; DestDir: "{code:GetDelphiBplDir|5}"; Components: "IDE\Delphi5"; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs
+Source: {#Delphi5Bpl}\Jv*.bpl; DestDir: "{code:GetDelphiBplDir|5}"; Components: "IDE\Delphi5"; Package: delphi5; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs
#endif
#ifdef Include_BCB5
; SolidBreak; lib\C++Builder 5
-Source: {#JvclRoot}\lib\c5\*; DestDir: "{app}\lib\c5"; Excludes: ".svn,__history,*.txt"; Components: "IDE\BCB5"; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs solidbreak
-Source: {#BCB5Root}\Include\Vcl\Jv*.hpp; DestDir: "{code:GetBCBDir|5}\Include\Vcl"; Components: "IDE\BCB5"; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs
-Source: {#BCB5Bpl}\Jv*.bpl; DestDir: "{code:GetBCBBplDir|5}"; Components: "IDE\BCB5"; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs
+Source: {#JvclRoot}\lib\c5\*; DestDir: "{app}\lib\c5"; Excludes: ".svn,__history,*.txt"; Components: "IDE\BCB5"; Package: bcb5; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs solidbreak
+Source: {#BCB5Root}\Include\Vcl\Jv*.hpp; DestDir: "{code:GetBCBDir|5}\Include\Vcl"; Components: "IDE\BCB5"; Package: bcb5; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs
+Source: {#BCB5Bpl}\Jv*.bpl; DestDir: "{code:GetBCBBplDir|5}"; Components: "IDE\BCB5"; Package: bcb5; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs
#endif
#ifdef Include_Delphi6
; SolidBreak; lib\Delphi 6
-Source: {#JvclRoot}\lib\d6\*; DestDir: "{app}\lib\d6"; Excludes: ".svn,__history,*.txt"; Components: "IDE\Delphi6"; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs solidbreak
-Source: {#Delphi6Bpl}\Jv*.bpl; DestDir: "{code:GetDelphiBplDir|6}"; Components: "IDE\Delphi6"; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs
+Source: {#JvclRoot}\lib\d6\*; DestDir: "{app}\lib\d6"; Excludes: ".svn,__history,*.txt"; Components: "IDE\Delphi6"; Package: delphi6; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs solidbreak
+Source: {#Delphi6Bpl}\Jv*.bpl; DestDir: "{code:GetDelphiBplDir|6}"; Components: "IDE\Delphi6"; Package: delphi6; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs
#endif
#ifdef Include_BCB6
; SolidBreak; lib\C++Builder 6
-Source: {#JvclRoot}\lib\c6\*; DestDir: "{app}\lib\c6"; Excludes: ".svn,__history,*.txt"; Components: "IDE\BCB6"; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs solidbreak
-Source: {#BCB6Root}\Include\Vcl\Jv*.hpp; DestDir: "{code:GetBCBDir|6}\Include\Vcl"; Components: "IDE\BCB6"; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs
-Source: {#BCB6Bpl}\Jv*.bpl; DestDir: "{code:GetBCBBplDir|6}"; Components: "IDE\BCB6"; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs
+Source: {#JvclRoot}\lib\c6\*; DestDir: "{app}\lib\c6"; Excludes: ".svn,__history,*.txt"; Components: "IDE\BCB6"; Package: bcb6; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs solidbreak
+Source: {#BCB6Root}\Include\Vcl\Jv*.hpp; DestDir: "{code:GetBCBDir|6}\Include\Vcl"; Components: "IDE\BCB6"; Package: bcb6; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs
+Source: {#BCB6Bpl}\Jv*.bpl; DestDir: "{code:GetBCBBplDir|6}"; Components: "IDE\BCB6"; Package: bcb6; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs
#endif
#ifdef Include_Delphi7
; SolidBreak; lib\Delphi 7
-Source: {#JvclRoot}\lib\d7\*; DestDir: "{app}\lib\d7"; Excludes: ".svn,__history,*.txt"; Components: "IDE\Delphi7"; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs solidbreak
-Source: {#Delphi7Bpl}\Jv*7?.bpl; DestDir: "{code:GetDelphiBplDir|7}"; Components: "IDE\Delphi7"; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs
+Source: {#JvclRoot}\lib\d7\*; DestDir: "{app}\lib\d7"; Excludes: ".svn,__history,*.txt"; Components: "IDE\Delphi7"; Package: delphi7; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs solidbreak
+Source: {#Delphi7Bpl}\Jv*7?.bpl; DestDir: "{code:GetDelphiBplDir|7}"; Components: "IDE\Delphi7"; Package: delphi7; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs
#endif
#ifdef Include_Delphi9
; SolidBreak; lib\Delphi 2005
-Source: {#JvclRoot}\lib\d9\*; DestDir: "{app}\lib\d9"; Excludes: ".svn,__history,*.txt"; Components: "IDE\Delphi9"; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs solidbreak
-Source: {#Delphi9Bpl}\Jv*9?.bpl; DestDir: "{code:GetDelphiBplDir|9}"; Components: "IDE\Delphi9"; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs
+Source: {#JvclRoot}\lib\d9\*; DestDir: "{app}\lib\d9"; Excludes: ".svn,__history,*.txt"; Components: "IDE\Delphi9"; Package: delphi9; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs solidbreak
+Source: {#Delphi9Bpl}\Jv*9?.bpl; DestDir: "{code:GetDelphiBplDir|9}"; Components: "IDE\Delphi9"; Package: delphi9; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs
#endif
#ifdef Include_Delphi10
; SolidBreak; lib\Delphi 2006
-Source: {#JvclRoot}\lib\d10\*; DestDir: "{app}\lib\d10"; Excludes: ".svn,__history,*.txt"; Components: "IDE\Delphi10"; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs solidbreak
-Source: {#Delphi10Bpl}\Jv*10?.bpl; DestDir: "{code:GetDelphiBplDir|10}"; Components: "IDE\Delphi10"; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs
-Source: {#Delphi10Root}\Include\Vcl\Jv*.hpp; DestDir: "{code:GetDelphiDir|10}\Include\Vcl"; Components: "IDE\Delphi10"; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs
+Source: {#JvclRoot}\lib\d10\*; DestDir: "{app}\lib\d10"; Excludes: ".svn,__history,*.txt"; Components: "IDE\Delphi10"; Package: delphi10; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs solidbreak
+Source: {#Delphi10Bpl}\Jv*10?.bpl; DestDir: "{code:GetDelphiBplDir|10}"; Components: "IDE\Delphi10"; Package: delphi10; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs
+Source: {#Delphi10Root}\Include\Vcl\Jv*.hpp; DestDir: "{code:GetDelphiDir|10}\Include\Vcl"; Package: delphi10; Components: "IDE\Delphi10"; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs
#endif
#ifdef Include_Delphi11
; SolidBreak; lib\Delphi 2007
-Source: {#JvclRoot}\lib\d11\*; DestDir: "{app}\lib\d11"; Excludes: ".svn,__history,*.txt"; Components: "IDE\Delphi11"; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs solidbreak
-Source: {#Delphi11Bpl}\Jv*11?.bpl; DestDir: "{code:GetDelphiBplDir|11}"; Components: "IDE\Delphi11"; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs
-Source: {#Delphi11Root}\Include\Vcl\Jv*.hpp; DestDir: "{code:GetDelphiDir|11}\Include\Vcl"; Components: "IDE\Delphi11"; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs solidbreak
+Source: {#JvclRoot}\lib\d11\*; DestDir: "{app}\lib\d11"; Excludes: ".svn,__history,*.txt"; Components: "IDE\Delphi11"; Package: delphi11; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs solidbreak
+Source: {#Delphi11Bpl}\Jv*11?.bpl; DestDir: "{code:GetDelphiBplDir|11}"; Components: "IDE\Delphi11"; Package: delphi11; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs
+Source: {#Delphi11Root}\Include\Vcl\Jv*.hpp; DestDir: "{code:GetDelphiDir|11}\Include\Vcl"; Components: "IDE\Delphi11"; Package: delphi11; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs solidbreak
#endif
#endif
@@ -305,7 +320,6 @@
#endif
-
[UninstallDelete]
Type: files; Name: "{app}\dcu\*"
Type: files; Name: "{app}\bin\JVCLInstall.*"
@@ -351,11 +365,6 @@
Name: "{group}\{cm:ProgramOnTheWeb,{#MyAppName}}"; Filename: "{#MyAppURL}"
Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
-; Downloading script
-//#ifdef Include_Binaries
-//#include "DownloadScript.iss"
-//#endif
-
#include "ComponentInstallerScript.iss"
[Code]
@@ -494,15 +503,6 @@
UnregisterComponents;
end;
-#ifdef Include_Binaries
-// Function generated by ISTool.
-function NextButtonClick(CurPage: Integer): Boolean;
-begin
- //Result := istool_download(CurPage);
- Result := True;
-end;
-#endif
-
// Skin
procedure CurPageChanged(CurPageID: Integer);
Modified: trunk/jvcl/install/ISS/Skin/isxskin.iss
===================================================================
--- trunk/jvcl/install/ISS/Skin/isxskin.iss 2007-08-31 17:50:13 UTC (rev 11496)
+++ trunk/jvcl/install/ISS/Skin/isxskin.iss 2007-09-01 15:42:17 UTC (rev 11497)
@@ -24,8 +24,8 @@
procedure UpdateButton(AButton: TButton;AButtonIndex: integer);
begin
ButtonLabels[AButtonIndex].Caption:=AButton.Caption;
- ButtonPanels[AButtonIndex].visible:=AButton.Visible;
- ButtonLabels[AButtonIndex].Enabled:=Abutton.Enabled;
+ ButtonPanels[AButtonIndex].Visible:=AButton.Visible;
+ ButtonLabels[AButtonIndex].Enabled:=AButton.Enabled;
end;
procedure ButtonLabelClick(Sender: TObject);
@@ -110,6 +110,8 @@
Left:=0;
Width:=panel.ClientWidth;
Parent:=panel;
+ if AButtonIndex = bidNext then
+ Font.Style := [fsBold];
Font.Color:=clWhite;
Caption:=AButton.Caption;
OnClick:=@ButtonLabelClick;
@@ -484,6 +486,24 @@
Width:=465
Height:=21
end
+ with WebDownloadFilenameLabel do begin
+ Left:=0+10
+ Top:=16+10+80
+ Width:=465
+ Height:=16
+ end
+ with WebDownloadStatusLabel do begin
+ Left:=0+10
+ Top:=0+10+80
+ Width:=465
+ Height:=16
+ end
+ with WebDownloadProgressGauge do begin
+ Left:=0+10
+ Top:=42+10+80
+ Width:=465
+ Height:=21
+ end
end
with InfoAfterPage do begin
with InfoAfterMemo do begin
Deleted: trunk/jvcl/install/ISS/isxdl.dll
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|