Author: jmagne
Update of /cvs/dirsec/esc/win32
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14651
Modified Files:
setup.iss build.sh
Log Message:
Latest rhel fixes.
Index: setup.iss
===================================================================
RCS file: /cvs/dirsec/esc/win32/setup.iss,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- setup.iss 6 Mar 2008 00:11:07 -0000 1.3
+++ setup.iss 4 Feb 2009 01:30:27 -0000 1.4
@@ -1,34 +1,17 @@
; Script generated by the Inno Setup Script Wizard.
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
-; BEGIN COPYRIGHT BLOCK
-; This Program is free software; you can redistribute it and/or modify it under
-; the terms of the GNU General Public License as published by the Free Software
-; Foundation; version 2 of the License.
-;
-; This Program is distributed in the hope that it will be useful, but WITHOUT
-; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-; FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-;
-; You should have received a copy of the GNU General Public License along with
-; this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-; Place, Suite 330, Boston, MA 02111-1307 USA.
-;
-; Copyright (C) 2005 Red Hat, Inc.
-; All rights reserved.
-; END COPYRIGHT BLOCK
-
[Setup]
AppName=Smart Card Manager
AppMutex=ESCMutex
-AppVerName=Smart Card Manager 1.0.1-6
-AppPublisher=Fedora
+AppVerName=Smart Card Manager 1.1.0-1
+AppPublisher=Fedora.
CreateAppDir=true
Compression=lzma
SolidCompression=true
MinVersion=0,5.0.2195
ShowLanguageDialog=yes
-OutputBaseFilename=SmartCardManagerSetup-1.0.1-6.win32.i386
+OutputBaseFilename=SmartCardManagerSetup-1.1.0-1.win32.i386
DefaultDirName={pf}\Fedora\ESC
DisableProgramGroupPage=false
DefaultGroupName=Fedora
@@ -42,7 +25,7 @@
InfoBeforeFile=info-before.txt
InfoAfterFile=info-after.txt
PrivilegesRequired=admin
-VersionInfoVersion=1.0.1.6
+VersionInfoVersion=1.1.0.1
[Files]
@@ -75,8 +58,8 @@
Source: BUILD\mfc71.dll; DestDir: {sys}; Flags: uninsneveruninstall onlyifdoesntexist
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
-Source: BUILD\ESC\components\rhTray.xpt; DestDir: {app}\components
-Source: BUILD\ESC\components\rhCoolKey.xpt; DestDir: {app}\components
+;Source: BUILD\ESC\components\rhTray.xpt; DestDir: {app}\components
+;Source: BUILD\ESC\components\rhCoolKey.xpt; DestDir: {app}\components
Source: BUILD\ESC\components\rhICoolKey.xpt; DestDir: {app}\components
Source: BUILD\ESC\components\rhIKeyNotify.xpt; DestDir: {app}\components
Source: BUILD\ESC\components\rhITray.xpt; DestDir: {app}\components
@@ -86,7 +69,7 @@
Source: BUILD\ESC\components\rhCoolKey.dll; DestDir: {app}\components
Source: BUILD\coolkeypk11.dll; DestDir: {sys}; Flags: restartreplace
Source: BUILD\libckyapplet-1.dll; DestDir: {sys}; Flags: restartreplace
-Source: BUILD\zlib1.dll;DestDir: {sys}; Flags: restartreplace
+Source: BUILD\zlib1.dll; DestDir: {sys}; Flags: restartreplace
;Source: BUILD\coolkeypk11.dll; DestDir: {app}\PKCS11
Source: BUILD\ESC\esc.exe; DestDir: {app}
;Source: BUILD\ESC\esc.bat; Destdir: {app}
@@ -120,7 +103,6 @@
Source: BUILD\ESC\xulrunner\chrome\pippki.jar; DestDir: {app}\xulrunner\chrome
Source: BUILD\ESC\xulrunner\chrome\pippki.manifest; DestDir: {app}\xulrunner\chrome
Source: BUILD\ESC\xulrunner\chrome\toolkit.jar; DestDir: {app}\xulrunner\chrome
-Source: BUILD\ESC\xulrunner\chrome\chromelist.txt; DestDir: {app}\xulrunner\chrome
Source: BUILD\ESC\xulrunner\xulrunner-stub.exe; DestDir: {app}\xulrunner
Source: BUILD\ESC\xulrunner\dependentlibs.list; DestDir: {app}\xulrunner
;Source: BUILD\ESC\xulrunner\GenerateJavaInterfaces.exe; DestDir: {app}\xulrunner
@@ -147,18 +129,14 @@
Source: BUILD\ESC\xulrunner\ssl3.dll; DestDir: {app}\xulrunner
Source: BUILD\ESC\xulrunner\updater.exe; DestDir: {app}\xulrunner
Source: BUILD\ESC\xulrunner\xpcom.dll; DestDir: {app}\xulrunner
-Source: BUILD\ESC\xulrunner\xpicleanup.exe; DestDir: {app}\xulrunner
Source: BUILD\ESC\xulrunner\xul.dll; DestDir: {app}\xulrunner
Source: BUILD\ESC\xulrunner\xulrunner.exe; DestDir: {app}\xulrunner
Source: BUILD\ESC\xulrunner\AccessibleMarshal.dll; DestDir: {app}\xulrunner
-Source: BUILD\ESC\xulrunner\components\xulutil.dll; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\accessibility-msaa.xpt; DestDir:
{app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\alerts.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\appshell.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\appstartup.xpt; DestDir:
{app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\auth.dll; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\autocomplete.xpt; DestDir:
{app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\autoconfig.dll; DestDir:
{app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\autoconfig.xpt; DestDir:
{app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\caps.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\chardet.xpt; DestDir: {app}\xulrunner\components
@@ -166,7 +144,7 @@
Source: BUILD\ESC\xulrunner\components\commandhandler.xpt; DestDir:
{app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\commandlines.xpt; DestDir:
{app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\composer.xpt; DestDir: {app}\xulrunner\components
-;Source: BUILD\ESC\xulrunner\components\compreg.dat; DestDir: {app}\xulrunner\components
+Source: BUILD\ESC\xulrunner\components\compreg.dat; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\content_base.xpt; DestDir:
{app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\content_html.xpt; DestDir:
{app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\content_htmldoc.xpt; DestDir:
{app}\xulrunner\components
@@ -200,14 +178,11 @@
Source: BUILD\ESC\xulrunner\components\find.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\gfx.xpt; DestDir: {app}\xulrunner\components
;Source: BUILD\ESC\xulrunner\components\gksvgrenderer.xpt; DestDir:
{app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\history.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\htmlparser.xpt; DestDir:
{app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\imgicon.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\imglib2.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\intl.xpt; DestDir: {app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\intlcmpt.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\jar.xpt; DestDir: {app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\jsconsole.xpt; DestDir:
{app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\jsconsole-clhandler.js; DestDir:
{app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\jsdservice.xpt; DestDir:
{app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\layout_base.xpt; DestDir:
{app}\xulrunner\components
@@ -223,7 +198,6 @@
Source: BUILD\ESC\xulrunner\components\necko_about.xpt; DestDir:
{app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\necko_cache.xpt; DestDir:
{app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\necko_cookie.xpt; DestDir:
{app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\necko_data.xpt; DestDir:
{app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\necko_dns.xpt; DestDir:
{app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\necko_file.xpt; DestDir:
{app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\necko_ftp.xpt; DestDir:
{app}\xulrunner\components
@@ -232,13 +206,10 @@
Source: BUILD\ESC\xulrunner\components\necko_socket.xpt; DestDir:
{app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\necko_strconv.xpt; DestDir:
{app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\necko_viewsource.xpt; DestDir:
{app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\nsCloseAllWindows.js; DestDir:
{app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\nsDefaultCLH.js; DestDir:
{app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\nsDictionary.js; DestDir:
{app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\nsExtensionManager.js; DestDir:
{app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\nsHelperAppDlg.js; DestDir:
{app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\nsInterfaceInfoToIDL.js; DestDir:
{app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\nsKillAll.js; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\nsPostUpdateWin.js; DestDir:
{app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\nsProgressDialog.js; DestDir:
{app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\nsProxyAutoConfig.js; DestDir:
{app}\xulrunner\components
@@ -247,47 +218,35 @@
Source: BUILD\ESC\xulrunner\components\nsXmlRpcClient.js; DestDir:
{app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\nsXULAppInstall.js; DestDir:
{app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\oji.xpt; DestDir: {app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\passwordmgr.xpt; DestDir:
{app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\pipboot.dll; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\pipboot.xpt; DestDir: {app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\pipnss.dll; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\pipnss.xpt; DestDir: {app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\pippki.dll; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\pippki.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\plugin.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\pref.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\prefetch.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\profile.xpt; DestDir: {app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\progressDlg.xpt; DestDir:
{app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\proxyObject.xpt; DestDir:
{app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\rdf.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\satchel.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\shistory.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\toolkitprofile.xpt; DestDir:
{app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\transformiix.dll; DestDir:
{app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\txmgr.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\txtsvc.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\uconv.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\unicharutil.xpt; DestDir:
{app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\universalchardet.dll; DestDir:
{app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\update.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\uriloader.xpt; DestDir:
{app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\webBrowser_core.xpt; DestDir:
{app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\webbrowserpersist.xpt; DestDir:
{app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\webshell_idls.xpt; DestDir:
{app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\websrvcs.dll; DestDir: {app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\websrvcs.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\widget.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\windowds.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\windowwatcher.xpt; DestDir:
{app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\xmlextras.dll; DestDir:
{app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\xmlextras.xpt; DestDir:
{app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\xml-rpc.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\xpcom_base.xpt; DestDir:
{app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\xpcom_components.xpt; DestDir:
{app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\xpcom_ds.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\xpcom_io.xpt; DestDir: {app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\xpcom_obsolete.xpt; DestDir:
{app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\xpcom_thread.xpt; DestDir:
{app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\xpcom_xpti.xpt; DestDir:
{app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\xpconnect.xpt; DestDir:
{app}\xulrunner\components
@@ -296,7 +255,6 @@
Source: BUILD\ESC\xulrunner\components\xulapp.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\xulapp_setup.xpt; DestDir:
{app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\xuldoc.xpt; DestDir: {app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\xulrunner.xpt; DestDir:
{app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\xultmpl.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\accessibility.xpt; DestDir:
{app}\xulrunner\components
Source: BUILD\ESC\xulrunner\defaults\autoconfig\prefcalls.js; DestDir:
{app}\xulrunner\defaults\autoconfig
@@ -304,8 +262,6 @@
Source: BUILD\ESC\xulrunner\defaults\pref\xulrunner.js; DestDir:
{app}\xulrunner\defaults\pref
Source: BUILD\ESC\xulrunner\defaults\profile\chrome\userContent-example.css; DestDir:
{app}\xulrunner\defaults\profile\chrome
Source: BUILD\ESC\xulrunner\defaults\profile\chrome\userChrome-example.css; DestDir:
{app}\xulrunner\defaults\profile\chrome
-Source: BUILD\ESC\xulrunner\defaults\profile\extensions\installed-extensions.txt;
DestDir: {app}\xulrunner\defaults\profile\extensions
-Source: BUILD\ESC\xulrunner\defaults\profile\extensions\Extensions.rdf; DestDir:
{app}\xulrunner\defaults\profile\extensions
Source: BUILD\ESC\xulrunner\defaults\profile\US\localstore.rdf; DestDir:
{app}\xulrunner\defaults\profile\US
Source: BUILD\ESC\xulrunner\defaults\profile\US\chrome\userContent-example.css; DestDir:
{app}\xulrunner\defaults\profile\US\chrome
Source: BUILD\ESC\xulrunner\defaults\profile\US\chrome\userChrome-example.css; DestDir:
{app}\xulrunner\defaults\profile\US\chrome
@@ -322,36 +278,15 @@
Source: BUILD\ESC\xulrunner\res\entityTables\mathml20.properties; DestDir:
{app}\xulrunner\res\entityTables
Source: BUILD\ESC\xulrunner\res\entityTables\html40Latin1.properties; DestDir:
{app}\xulrunner\res\entityTables
Source: BUILD\ESC\xulrunner\res\fonts\mathfontSymbol.properties; DestDir:
{app}\xulrunner\res\fonts
-Source: BUILD\ESC\xulrunner\res\fonts\fontNameMap.properties; DestDir:
{app}\xulrunner\res\fonts
Source: BUILD\ESC\xulrunner\res\fonts\mathfont.properties; DestDir:
{app}\xulrunner\res\fonts
-Source: BUILD\ESC\xulrunner\res\fonts\mathfontCMEX10.properties; DestDir:
{app}\xulrunner\res\fonts
-Source: BUILD\ESC\xulrunner\res\fonts\mathfontCMSY10.properties; DestDir:
{app}\xulrunner\res\fonts
-Source: BUILD\ESC\xulrunner\res\fonts\mathfontMath1.properties; DestDir:
{app}\xulrunner\res\fonts
-Source: BUILD\ESC\xulrunner\res\fonts\mathfontMath2.properties; DestDir:
{app}\xulrunner\res\fonts
-Source: BUILD\ESC\xulrunner\res\fonts\mathfontMath4.properties; DestDir:
{app}\xulrunner\res\fonts
-Source: BUILD\ESC\xulrunner\res\fonts\mathfontMTExtra.properties; DestDir:
{app}\xulrunner\res\fonts
-Source: BUILD\ESC\xulrunner\res\fonts\mathfontPUA.properties; DestDir:
{app}\xulrunner\res\fonts
-Source: BUILD\ESC\xulrunner\res\fonts\fontEncoding.properties; DestDir:
{app}\xulrunner\res\fonts
-Source: BUILD\ESC\xulrunner\res\html\gopher-unknown.gif; DestDir:
{app}\xulrunner\res\html
-Source: BUILD\ESC\xulrunner\res\html\gopher-binary.gif; DestDir:
{app}\xulrunner\res\html
-Source: BUILD\ESC\xulrunner\res\html\gopher-find.gif; DestDir: {app}\xulrunner\res\html
-Source: BUILD\ESC\xulrunner\res\html\gopher-image.gif; DestDir: {app}\xulrunner\res\html
-Source: BUILD\ESC\xulrunner\res\html\gopher-menu.gif; DestDir: {app}\xulrunner\res\html
-Source: BUILD\ESC\xulrunner\res\html\gopher-movie.gif; DestDir: {app}\xulrunner\res\html
-Source: BUILD\ESC\xulrunner\res\html\gopher-sound.gif; DestDir: {app}\xulrunner\res\html
-Source: BUILD\ESC\xulrunner\res\html\gopher-telnet.gif; DestDir:
{app}\xulrunner\res\html
-Source: BUILD\ESC\xulrunner\res\html\gopher-text.gif; DestDir: {app}\xulrunner\res\html
-Source: BUILD\ESC\xulrunner\res\html\gopher-audio.gif; DestDir: {app}\xulrunner\res\html
;Source: BUILD\ESC\xulrunner\sdk\lib\MozillaInterfaces-src.jar; DestDir:
{app}\xulrunner\sdk\lib
;Source: BUILD\ESC\xulrunner\sdk\lib\MozillaInterfaces.jar; DestDir:
{app}\xulrunner\sdk\lib
Source: BUILD\ESC\defaults\preferences\esc-prefs.js; DestDir: {app}\defaults\preferences
Source: BUILD\ESC\xulrunner\res\wincharset.properties; DestDir: {app}\xulrunner\res
Source: BUILD\ESC\xulrunner\res\arrowd.gif; DestDir: {app}\xulrunner\res
-Source: BUILD\ESC\xulrunner\res\bloatcycle.html; DestDir: {app}\xulrunner\res
Source: BUILD\ESC\xulrunner\res\broken-image.gif; DestDir: {app}\xulrunner\res
Source: BUILD\ESC\xulrunner\res\charsetalias.properties; DestDir: {app}\xulrunner\res
Source: BUILD\ESC\xulrunner\res\charsetData.properties; DestDir: {app}\xulrunner\res
-Source: BUILD\ESC\xulrunner\res\cmessage.txt; DestDir: {app}\xulrunner\res
Source: BUILD\ESC\xulrunner\res\EditorOverride.css; DestDir: {app}\xulrunner\res
Source: BUILD\ESC\xulrunner\res\forms.css; DestDir: {app}\xulrunner\res
Source: BUILD\ESC\xulrunner\res\grabber.gif; DestDir: {app}\xulrunner\res
@@ -382,7 +317,6 @@
Source: BUILD\ESC\xulrunner\res\table-remove-row-active.gif; DestDir:
{app}\xulrunner\res
Source: BUILD\ESC\xulrunner\res\table-remove-row-hover.gif; DestDir: {app}\xulrunner\res
Source: BUILD\ESC\xulrunner\res\ua.css; DestDir: {app}\xulrunner\res
-Source: BUILD\ESC\xulrunner\res\viewer.properties; DestDir: {app}\xulrunner\res
Source: BUILD\ESC\xulrunner\res\viewsource.css; DestDir: {app}\xulrunner\res
Source: BUILD\ESC\xulrunner\res\arrow.gif; DestDir: {app}\xulrunner\res
Source: BUILD\ESC\chrome\icons\default\esc-window.ico; DestDir:
{app}\chrome\icons\default
@@ -418,13 +352,93 @@
Source: BUILD\ESC\chrome\content\esc\MineOverlay.xul; DestDir: {app}\chrome\content\esc
Source: BUILD\ESC\chrome\content\esc\password.js; DestDir: {app}\chrome\content\esc
Source: BUILD\ESC\chrome\content\esc\certManager.xul; DestDir: {app}\chrome\content\esc
+Source: BUILD\ESC\xulrunner\IA2Marshal.dll; DestDir: {app}\xulrunner
+Source: BUILD\ESC\xulrunner\freebl3.chk; DestDir: {app}\xulrunner
+Source: BUILD\ESC\xulrunner\crashreporter.exe; DestDir: {app}\xulrunner
+Source: BUILD\ESC\xulrunner\crashreporter.ini; DestDir: {app}\xulrunner
+Source: BUILD\ESC\xulrunner\freebl3.dll; DestDir: {app}\xulrunner
+Source: BUILD\ESC\xulrunner\javaxpcom.jar; DestDir: {app}\xulrunner
+Source: BUILD\ESC\xulrunner\javaxpcomglue.dll; DestDir: {app}\xulrunner
+Source: BUILD\ESC\xulrunner\mozcrt19.dll; DestDir: {app}\xulrunner
+Source: BUILD\ESC\xulrunner\xpt_link.exe; DestDir: {app}\xulrunner
+Source: BUILD\ESC\xulrunner\nssdbm3.dll; DestDir: {app}\xulrunner
+Source: BUILD\ESC\xulrunner\nssutil3.dll; DestDir: {app}\xulrunner
+Source: BUILD\ESC\xulrunner\platform.ini; DestDir: {app}\xulrunner
+Source: BUILD\ESC\xulrunner\sqlite3.dll; DestDir: {app}\xulrunner
+Source: BUILD\ESC\xulrunner\xpcshell.exe; DestDir: {app}\xulrunner
+Source: BUILD\ESC\xulrunner\xpidl.exe; DestDir: {app}\xulrunner
+Source: BUILD\ESC\xulrunner\xpt_dump.exe; DestDir: {app}\xulrunner
+Source: BUILD\ESC\xulrunner\components\contentprefs.xpt; DestDir:
{app}\xulrunner\components
+Source: BUILD\ESC\xulrunner\components\cookie.xpt; DestDir: {app}\xulrunner\components
+Source: BUILD\ESC\xulrunner\components\dom_json.xpt; DestDir: {app}\xulrunner\components
+Source: BUILD\ESC\xulrunner\components\dom_offline.xpt; DestDir:
{app}\xulrunner\components
+Source: BUILD\ESC\xulrunner\components\dom_sidebar.xpt; DestDir:
{app}\xulrunner\components
+Source: BUILD\ESC\xulrunner\components\dom_storage.xpt; DestDir:
{app}\xulrunner\components
+Source: BUILD\ESC\xulrunner\components\dom_svg.xpt; DestDir: {app}\xulrunner\components
+Source: BUILD\ESC\xulrunner\components\exthelper.xpt; DestDir:
{app}\xulrunner\components
+Source: BUILD\ESC\xulrunner\components\FeedProcessor.js; DestDir:
{app}\xulrunner\components
+Source: BUILD\ESC\xulrunner\components\feeds.xpt; DestDir: {app}\xulrunner\components
+Source: BUILD\ESC\xulrunner\components\inspector.xpt; DestDir:
{app}\xulrunner\components
+Source: BUILD\ESC\xulrunner\components\loginmgr.xpt; DestDir: {app}\xulrunner\components
+Source: BUILD\ESC\xulrunner\components\nsAddonRepository.js; DestDir:
{app}\xulrunner\components
+Source: BUILD\ESC\xulrunner\components\nsBadCertHandler.js; DestDir:
{app}\xulrunner\components
+Source: BUILD\ESC\xulrunner\components\nsBlocklistService.js; DestDir:
{app}\xulrunner\components
+Source: BUILD\ESC\xulrunner\components\nsContentDispatchChooser.js; DestDir:
{app}\xulrunner\components
+Source: BUILD\ESC\xulrunner\components\nsContentPrefService.js; DestDir:
{app}\xulrunner\components
+Source: BUILD\ESC\xulrunner\components\nsDownloadManagerUI.js; DestDir:
{app}\xulrunner\components
+Source: BUILD\ESC\xulrunner\components\nsHandlerService.js; DestDir:
{app}\xulrunner\components
+Source: BUILD\ESC\xulrunner\components\nsLivemarkService.js; DestDir:
{app}\xulrunner\components
+Source: BUILD\ESC\xulrunner\components\nsLoginInfo.js; DestDir:
{app}\xulrunner\components
+Source: BUILD\ESC\xulrunner\components\nsLoginManager.js; DestDir:
{app}\xulrunner\components
+Source: BUILD\ESC\xulrunner\components\nsLoginManagerPrompter.js; DestDir:
{app}\xulrunner\components
+Source: BUILD\ESC\xulrunner\components\nsTaggingService.js; DestDir:
{app}\xulrunner\components
+Source: BUILD\ESC\xulrunner\components\nsTryToClose.js; DestDir:
{app}\xulrunner\components
+Source: BUILD\ESC\xulrunner\components\nsURLFormatter.js; DestDir:
{app}\xulrunner\components
+Source: BUILD\ESC\xulrunner\components\nsWebHandlerApp.js; DestDir:
{app}\xulrunner\components
+Source: BUILD\ESC\xulrunner\components\parentalcontrols.xpt; DestDir:
{app}\xulrunner\components
+Source: BUILD\ESC\xulrunner\components\places.xpt; DestDir: {app}\xulrunner\components
+Source: BUILD\ESC\xulrunner\components\pluginGlue.js; DestDir:
{app}\xulrunner\components
+Source: BUILD\ESC\xulrunner\components\saxparser.xpt; DestDir:
{app}\xulrunner\components
+Source: BUILD\ESC\xulrunner\components\spellchecker.xpt; DestDir:
{app}\xulrunner\components
+Source: BUILD\ESC\xulrunner\components\storage.xpt; DestDir: {app}\xulrunner\components
+Source: BUILD\ESC\xulrunner\components\storage-Legacy.js; DestDir:
{app}\xulrunner\components
+Source: BUILD\ESC\xulrunner\components\txEXSLTRegExFunctions.js; DestDir:
{app}\xulrunner\components
+Source: BUILD\ESC\xulrunner\components\urlformatter.xpt; DestDir:
{app}\xulrunner\components
+Source: BUILD\ESC\xulrunner\components\xpcom_system.xpt; DestDir:
{app}\xulrunner\components
+Source: BUILD\ESC\xulrunner\components\xpti.dat; DestDir: {app}\xulrunner\components
+Source: BUILD\ESC\xulrunner\components\zipwriter.xpt; DestDir:
{app}\xulrunner\components
+Source: BUILD\ESC\xulrunner\res\svg.css; DestDir: {app}\xulrunner\res
+Source: BUILD\ESC\xulrunner\res\contenteditable.css; DestDir: {app}\xulrunner\res
+Source: BUILD\ESC\xulrunner\res\designmode.css; DestDir: {app}\xulrunner\res
+Source: BUILD\ESC\xulrunner\res\fonts\mathfontUnicode.properties; DestDir:
{app}\xulrunner\res\fonts
+Source: BUILD\ESC\xulrunner\res\fonts\mathfontStandardSymbolsL.properties; DestDir:
{app}\xulrunner\res\fonts
+Source: BUILD\ESC\xulrunner\res\fonts\mathfontSTIXNonUnicode.properties; DestDir:
{app}\xulrunner\res\fonts
+Source: BUILD\ESC\xulrunner\res\fonts\mathfontSTIXSize1.properties; DestDir:
{app}\xulrunner\res\fonts
+Source: BUILD\ESC\xulrunner\res\html\folder.png; DestDir: {app}\xulrunner\res\html
+Source: BUILD\ESC\xulrunner\defaults\profile\localstore.rdf; DestDir:
{app}\xulrunner\defaults\profile
+Source: BUILD\ESC\xulrunner\sqlite3.dll; DestDir: {app}\PKCS11
+Source: BUILD\ESC\xulrunner\mozcrt19.dll; DestDir: {app}\PKCS11
+Source: BUILD\ESC\xulrunner\nssutil3.dll; DestDir: {app}\PKCS11
+Source: BUILD\ESC\xulrunner\dictionaries\en-US.aff; DestDir: {app}\dictionaries
+Source: BUILD\ESC\xulrunner\dictionaries\en-US.dic; DestDir: {app}\dictionaries
+Source: BUILD\ESC\xulrunner\modules\XPCOMUtils.jsm; DestDir: {app}\modules
+Source: BUILD\ESC\xulrunner\modules\debug.js; DestDir: {app}\modules
+Source: BUILD\ESC\xulrunner\modules\DownloadUtils.jsm; DestDir: {app}\modules
+Source: BUILD\ESC\xulrunner\modules\ISO8601DateUtils.jsm; DestDir: {app}\modules
+Source: BUILD\ESC\xulrunner\modules\JSON.jsm; DestDir: {app}\modules
+Source: BUILD\ESC\xulrunner\modules\Microformats.js; DestDir: {app}\modules
+Source: BUILD\ESC\xulrunner\modules\PluralForm.jsm; DestDir: {app}\modules
+Source: BUILD\ESC\xulrunner\modules\utils.js; DestDir: {app}\modules
[Run]
Filename: {win}\egate2.4\eginstall.exe; Parameters: -f -l eginstall.txt; WorkingDir:
{win}\egate2.4; Flags: waituntilterminated; StatusMsg: Installing smart card drivers....
Filename: {app}\PKCS11\pk11install.exe; Parameters: "-v
""name='CoolKey Module' library=coolkeypk11.dll
NSS=""slotParams={{0x1=[slotFlags=PublicCerts]}""""";
WorkingDir: {sys}; StatusMsg: Configuring System for smart cards...
-Filename: {app}\esc.exe; WorkingDir: {app}; StatusMsg: {code:GetEscStatusMsg} Flags:
nowait
+Filename: {app}\xulrunner\xulrunner.exe; Parameters:
"""--register-global"""
+Filename: {app}\esc.exe; WorkingDir: {app}; StatusMsg: {code:GetEscStatusMsg}; Flags:
nowait
+[UninstallRun]
+Filename: {app}\xulrunner\xulrunner.exe; Parameters:
"""--unregister-global"""
[UninstallDelete]
Type: filesandordirs; Name: {app}
[_ISTool]
@@ -433,12 +447,22 @@
LogFile=inst.log
LogFileAppend=false
[Registry]
+
;The following lines register the CSP. Comment out if not available
-Root: HKLM; Subkey: Software\Microsoft\Cryptography\Defaults\Provider\CoolKey PKCS#11
CSP; ValueType: string; ValueName: PKCS11Module; ValueData: coolkeypk11.dll; Flags:
uninsdeletekey
+Root: HKLM; Subkey: Software\Microsoft\Cryptography\Defaults\Provider\CoolKey PKCS #11
CSP; ValueType: string; ValueName: PKCS11Module; ValueData: coolkeypk11.dll; Flags:
uninsdeletekey
+
Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Axalto Developer;
ValueType: binary; ValueName: ATRMask; ValueData: ff ff ff ff ff ff ff ff 00 00; Flags:
uninsdeletekey
-Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Axalto Developer;
ValueType: string; ValueName: Crypto Provider; ValueData: CoolKey PKCS#11 CSP
+Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Axalto Developer;
ValueType: string; ValueName: Crypto Provider; ValueData: CoolKey PKCS #11 CSP
Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Axalto Developer;
ValueType: binary; ValueName: ATR; ValueData: 3b 75 94 00 00 62 02 02 00 00
-;End CSP registration
+
+; Now register the Gemalto 64K V2
+Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Gemalto 64K V2;
ValueType: binary; ValueName: ATRMask: ValueData: ff ff ff ff ff ff ff ff ff ff; Flags:
uninsdeletekey
+
+Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Gemalto 64 V2:
ValueType: string; ValueName: Crypto Provider; ValueData: CoolKey PKCS #11 CSP
+
+Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Gemalto 64 V2:
ValueType: binary; ValueName: ATR; ValueData: 3b 95 95 40 ff ae 01 03 00 00
+
+
Root: HKLM; Subkey: Software\
; Turn off the "pick a cert" dialog box
Root: HKCU; Subkey: Software\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\3;
ValueType: dword; ValueName: 1A04; ValueData: 0
@@ -484,6 +508,8 @@
Name: {app}\xulrunner\updates
Name: {app}\xulrunner\updates\0
Name: {app}\defaults\preferences
+Name: {app}\dictionaries
+Name: {app}\modules; Flags: uninsalwaysuninstall
[Code]
Index: build.sh
===================================================================
RCS file: /cvs/dirsec/esc/win32/build.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.sh 6 Mar 2008 00:10:14 -0000 1.5
+++ build.sh 4 Feb 2009 01:30:27 -0000 1.6
@@ -43,7 +43,7 @@
#Egate driver values
-EGATE_DRIVER_URL=http://www.reflexreaders.com/Support/Downloads
+EGATE_DRIVER_URL=http://www.it-secure.com/Downloads
EGATE_DRIVER_NAME=e-gate_W2k_XP_24.zip
#Zlib values
@@ -110,6 +110,10 @@
cd $BASE_DIR
+ if [ -d $NSS_NAME ];
+ then
+ echo "NSS already checked out."
+ else
wget --no-check-certificate $NSS_SOURCE_URL
if [ ! -f ./$NSS_ARCHIVE.tar.gz ];
@@ -125,6 +129,7 @@
echo "Can't untar NSS."
return 1
fi
+ fi
cd $NSS_NAME/mozilla/security/nss
make BUILD_OPT=1 nss_build_all
@@ -154,7 +159,7 @@
if [ -d coolkey ];
then
- cvs -d $FEDORA_CVS_ROOT update -r $COOLKEY_TAG coolkey
+ echo "Echo CoolKey already checked out."
else
cvs -d $FEDORA_CVS_ROOT co -r $COOLKEY_TAG coolkey
fi
@@ -276,7 +281,7 @@
if [ -d esc ];
then
- cvs -d $FEDORA_CVS_ROOT update esc
+ echo "ESC already checked out.."
else
cvs -d $FEDORA_CVS_ROOT co esc
fi
@@ -296,16 +301,6 @@
cd dist/src
- if [ ! -d mozilla ];
- then
-
- echo "Obtaining XULRUNNER src..."
- wget $XULRUNNER_SRC_URL
- tar -xjvf $XULRUNNER_ARCHIVE_NAME
- else
- echo "Already have XULRUNNER src..."
-
- fi
ZLIB_INC_PATH=${BASE_DIR}/zlib/include
ZLIB_INC_PATH=`cygpath -m $ZLIB_INC_PATH`
@@ -316,7 +311,7 @@
cd ../..
make BUILD_OPT=1 import
- make BUILD_OPT=1 CKY_INCLUDE="-I$ZLIB_INC_PATH -I$CKY_INCLUDE_PATH"
CKY_LIB_LDD=$CKY_INCLUDE_PATH/.libs ESC_VERSION=$ESC_VERSION_NO
+ make BUILD_OPT=1 CKY_INCLUDE="-I$ZLIB_INC_PATH -I$CKY_INCLUDE_PATH"
CKY_LIB_LDD=$CKY_INCLUDE_PATH/.libs USE_XUL_SDK=1 ESC_VERSION=$ESC_VERSION_NO
if [ $? != 0 ];
then