esc/win32 coolkey-64.iss,1.2,1.3 build.sh,1.13,1.14

[Jack Magne]

Author: jmagne

Update of /cvs/dirsec/esc/win32
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv14213

Modified Files:
	coolkey-64.iss build.sh 
Log Message:
Bump version on build script and 64 bit installer.



Index: coolkey-64.iss
===================================================================
RCS file: /cvs/dirsec/esc/win32/coolkey-64.iss,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- coolkey-64.iss	8 Oct 2009 23:45:30 -0000	1.2
+++ coolkey-64.iss	22 Jan 2011 04:27:58 -0000	1.3
@@ -4,14 +4,14 @@
 [Setup]
 AppName=Coolkey
 AppId=Coolkey
-AppVerName=Coolkey 1.0.0-1
+AppVerName=Coolkey 1.0.0-2
 AppPublisher=Red Hat
 CreateAppDir=true
 Compression=lzma
 SolidCompression=true
 MinVersion=0,5.0.2195
 ShowLanguageDialog=yes
-OutputBaseFilename=CoolkeySetup-1.0.0-1.win64.x64
+OutputBaseFilename=CoolkeySetup-1.0.0-2.win64.x64
 DefaultDirName={pf}\Red Hat\Coolkey
 DisableProgramGroupPage=false
 DefaultGroupName=Red Hat
@@ -22,16 +22,19 @@
 LicenseFile=esc-license.txt
 InfoBeforeFile=coolkey-64-info-before.txt
 PrivilegesRequired=admin
-VersionInfoVersion=1.0.0.1
+VersionInfoVersion=1.0.0.2
 ArchitecturesAllowed=x64
 ArchitecturesInstallIn64BitMode=x64
 
 [Files]
-Source: BUILD\regcerts.exe; DestDir: {app}
+;Source: BUILD\regcerts.exe; DestDir: {app}
 Source: ..\src\app\xpcom\tray\esc.ico; DestDir: {app}
 Source: BUILD\clkcsp.dll; DestDir: {sys}; Flags: restartreplace
 Source: BUILD\cspres.dll; DestDir: {sys}; Flags: restartreplace
 Source: BUILD\clkcsp.sig; DestDir: {sys}
+Source: BUILD\coolkeypk11.dll; DestDir: {sys}; Flags: restartreplace
+Source: BUILD\zlibwapi.dll; DestDir: {sys}; Flags: restartreplace
+Source: BUILD\libckyapplet-1.dll; DestDir: {sys}; Flags: restartreplace
 Source: BUILD\vcredist_x64.exe; DestDir: "{tmp}"
 
 


Index: build.sh
===================================================================
RCS file: /cvs/dirsec/esc/win32/build.sh,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- build.sh	1 Dec 2010 01:01:35 -0000	1.13
+++ build.sh	22 Jan 2011 04:27:58 -0000	1.14
@@ -70,6 +70,12 @@
 CSP_DIR=CLKCSP
 CSP_ARCHIVE=CLKCSP.zip
 
+if [ X$ON_64 == X1 ];
+then
+export INNO_PATH="C:/Program Files (x86)/Inno Setup 5/ISCC.exe"
+fi
+
+
 if [ X$USE_64 == X1 ];
 then
 CSP_PATH=support/esc/windows/csp/64/latest
@@ -94,9 +100,9 @@
 
 XULRUNNER_DIR=xulrunner
 XULRUNNER_FTP_PATH=http://releases.mozilla.org/pub/mozilla.org/
-XULRUNNER_PATH=xulrunner/releases/1.9.2.12/runtimes/
+XULRUNNER_PATH=xulrunner/releases/1.9.2.13/runtimes/
 
-XULRUNNER_ARCHIVE=xulrunner-1.9.2.12.en-US.win32.zip
+XULRUNNER_ARCHIVE=xulrunner-1.9.2.13.en-US.win32.zip
 
 
 #Base Dirctory calc