7:01 p.m.
Author: jmagne
Update of /cvs/dirsec/esc/win32
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv4534
Modified Files:
setup.iss build.sh
Log Message:
Fix Bugzilla Bug 531089 - Feature: ESC on WinXP 64 bit throws dialog 'Please enter
pin' at the end of enrollment.
Index: setup.iss
===================================================================
RCS file: /cvs/dirsec/esc/win32/setup.iss,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- setup.iss 20 Aug 2010 23:03:17 -0000 1.16
+++ setup.iss 1 Dec 2010 01:01:35 -0000 1.17
@@ -31,6 +31,15 @@
Source: BUILD\clkcsp.dll; DestDir: {sys}; Flags: regserver restartreplace
Source: BUILD\cspres.dll; DestDir: {sys}; Flags: restartreplace
Source: BUILD\pk11install.exe; DestDir: {app}\PKCS11
+
+Source: BUILD\libnspr4.dll; DestDir: {app}\PKCS11
+Source: BUILD\libplc4.dll; DestDir: {app}\PKCS11
+Source: BUILD\libplds4.dll; DestDir: {app}\PKCS11
+Source: BUILD\softokn3.dll; DestDir: {app}\PKCS11
+Source: BUILD\nssutil3.dll; DestDir: {app}\PKCS11
+Source: BUILD\sqlite3.dll; DestDir: {app}\PKCS11
+
+
Source: BUILD\clkcsp.sig; DestDir: {sys}
Source: BUILD\atl71.dll; DestDir: {sys}; Flags: uninsneveruninstall onlyifdoesntexist
@@ -76,231 +85,6 @@
Source: BUILD\ESC\chrome\content\esc\settings.xul; DestDir: {app}\chrome\content\esc
;Source: BUILD\ESC\chrome\content\esc\style.css; DestDir: {app}\chrome\content\esc
Source: BUILD\ESC\chrome\content\esc\bg.jpg; DestDir: {app}\chrome\content\esc
-Source: BUILD\ESC\xulrunner\chrome\toolkit.manifest; DestDir: {app}\xulrunner\chrome
-Source: BUILD\ESC\xulrunner\chrome\classic.jar; DestDir: {app}\xulrunner\chrome
-Source: BUILD\ESC\xulrunner\chrome\classic.manifest; DestDir: {app}\xulrunner\chrome
-Source: BUILD\ESC\xulrunner\chrome\comm.jar; DestDir: {app}\xulrunner\chrome
-Source: BUILD\ESC\xulrunner\chrome\comm.manifest; DestDir: {app}\xulrunner\chrome
-Source: BUILD\ESC\xulrunner\chrome\en-US.jar; DestDir: {app}\xulrunner\chrome
-Source: BUILD\ESC\xulrunner\chrome\en-US.manifest; DestDir: {app}\xulrunner\chrome
-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\xulrunner-stub.exe; DestDir: {app}\xulrunner
-Source: BUILD\ESC\xulrunner\dependentlibs.list; DestDir: {app}\xulrunner
-;Source: BUILD\ESC\xulrunner\GenerateJavaInterfaces.exe; 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\js3250.dll; DestDir: {app}\xulrunner
-Source: BUILD\ESC\xulrunner\LICENSE; DestDir: {app}\xulrunner
-Source: BUILD\ESC\xulrunner\mozctl.dll; DestDir: {app}\xulrunner
-Source: BUILD\ESC\xulrunner\mozctlx.dll; DestDir: {app}\xulrunner
-Source: BUILD\ESC\xulrunner\nspr4.dll; DestDir: {app}\xulrunner
-Source: BUILD\libnspr4.dll; DestDir: {app}\PKCS11
-Source: BUILD\ESC\xulrunner\nss3.dll; DestDir: {app}\xulrunner
-Source: BUILD\ESC\xulrunner\nssckbi.dll; DestDir: {app}\xulrunner
-Source: BUILD\ESC\xulrunner\plc4.dll; DestDir: {app}\xulrunner
-Source: BUILD\libplc4.dll; DestDir: {app}\PKCS11
-Source: BUILD\ESC\xulrunner\plds4.dll; DestDir: {app}\xulrunner
-Source: BUILD\libplds4.dll; DestDir: {app}\PKCS11
-Source: BUILD\ESC\xulrunner\README.txt; DestDir: {app}\xulrunner
-Source: BUILD\ESC\xulrunner\smime3.dll; DestDir: {app}\xulrunner
-Source: BUILD\ESC\xulrunner\softokn3.chk; DestDir: {app}\xulrunner
-Source: BUILD\ESC\xulrunner\softokn3.dll; DestDir: {app}\xulrunner
-Source: BUILD\softokn3.dll; DestDir: {app}\PKCS11
-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\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\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\autocomplete.xpt; 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
-Source: BUILD\ESC\xulrunner\components\chrome.xpt; DestDir: {app}\xulrunner\components
-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\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
-Source: BUILD\ESC\xulrunner\components\content_xmldoc.xpt; DestDir:
{app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\content_xslt.xpt; DestDir:
{app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\content_xtf.xpt; DestDir:
{app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\directory.xpt; DestDir:
{app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\docshell_base.xpt; DestDir:
{app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\dom.xpt; DestDir: {app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\dom_base.xpt; DestDir: {app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\dom_canvas.xpt; DestDir:
{app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\dom_core.xpt; DestDir: {app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\dom_css.xpt; DestDir: {app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\dom_events.xpt; DestDir:
{app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\dom_html.xpt; DestDir: {app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\dom_loadsave.xpt; DestDir:
{app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\dom_range.xpt; DestDir:
{app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\dom_stylesheets.xpt; DestDir:
{app}\xulrunner\components
-;Source: BUILD\ESC\xulrunner\components\dom_svg.xpt; DestDir: {app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\dom_traversal.xpt; DestDir:
{app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\dom_views.xpt; DestDir:
{app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\dom_xbl.xpt; DestDir: {app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\dom_xpath.xpt; DestDir:
{app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\dom_xul.xpt; DestDir: {app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\downloads.xpt; DestDir:
{app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\editor.xpt; DestDir: {app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\embed_base.xpt; DestDir:
{app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\extensions.xpt; DestDir:
{app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\exthandler.xpt; DestDir:
{app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\fastfind.xpt; DestDir: {app}\xulrunner\components
-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\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\jar.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
-Source: BUILD\ESC\xulrunner\components\layout_printing.xpt; DestDir:
{app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\layout_xul.xpt; DestDir:
{app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\layout_xul_tree.xpt; DestDir:
{app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\locale.xpt; DestDir: {app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\lwbrk.xpt; DestDir: {app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\mimetype.xpt; DestDir: {app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\mozbrwsr.xpt; DestDir: {app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\mozfind.xpt; DestDir: {app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\necko.xpt; DestDir: {app}\xulrunner\components
-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_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
-Source: BUILD\ESC\xulrunner\components\necko_http.xpt; DestDir:
{app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\necko_res.xpt; DestDir:
{app}\xulrunner\components
-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\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\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
-Source: BUILD\ESC\xulrunner\components\nsResetPref.js; DestDir:
{app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\nsUpdateService.js; DestDir:
{app}\xulrunner\components
-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\pipboot.xpt; DestDir: {app}\xulrunner\components
-Source: BUILD\ESC\xulrunner\components\pipnss.xpt; 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\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\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\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\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\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_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
-Source: BUILD\ESC\xulrunner\components\xpinstall.xpt; DestDir:
{app}\xulrunner\components
-;Source: BUILD\ESC\xulrunner\components\xpti.dat; DestDir: {app}\xulrunner\components
-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\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
-Source: BUILD\ESC\xulrunner\defaults\autoconfig\platform.js; DestDir:
{app}\xulrunner\defaults\autoconfig
-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\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
-Source: BUILD\ESC\xulrunner\greprefs\xpinstall.js; DestDir: {app}\xulrunner\greprefs
-Source: BUILD\ESC\xulrunner\greprefs\security-prefs.js; DestDir:
{app}\xulrunner\greprefs
-Source: BUILD\ESC\xulrunner\greprefs\all.js; DestDir: {app}\xulrunner\greprefs
-Source: BUILD\ESC\xulrunner\plugins\npnul32.dll; DestDir: {app}\xulrunner\plugins
-Source: BUILD\ESC\xulrunner\res\dtd\xhtml11.dtd; DestDir: {app}\xulrunner\res\dtd
-Source: BUILD\ESC\xulrunner\res\dtd\mathml.dtd; DestDir: {app}\xulrunner\res\dtd
-Source: BUILD\ESC\xulrunner\res\entityTables\transliterate.properties; DestDir:
{app}\xulrunner\res\entityTables
-Source: BUILD\ESC\xulrunner\res\entityTables\html40Special.properties; DestDir:
{app}\xulrunner\res\entityTables
-Source: BUILD\ESC\xulrunner\res\entityTables\html40Symbols.properties; DestDir:
{app}\xulrunner\res\entityTables
-Source: BUILD\ESC\xulrunner\res\entityTables\htmlEntityVersions.properties; DestDir:
{app}\xulrunner\res\entityTables
-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\mathfont.properties; DestDir:
{app}\xulrunner\res\fonts
-;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\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\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
-Source: BUILD\ESC\xulrunner\res\hiddenWindow.html; DestDir: {app}\xulrunner\res
-Source: BUILD\ESC\xulrunner\res\html.css; DestDir: {app}\xulrunner\res
-Source: BUILD\ESC\xulrunner\res\langGroups.properties; DestDir: {app}\xulrunner\res
-Source: BUILD\ESC\xulrunner\res\language.properties; DestDir: {app}\xulrunner\res
-Source: BUILD\ESC\xulrunner\res\loading-image.gif; DestDir: {app}\xulrunner\res
-Source: BUILD\ESC\xulrunner\res\mathml.css; DestDir: {app}\xulrunner\res
-Source: BUILD\ESC\xulrunner\res\quirk.css; DestDir: {app}\xulrunner\res
-;Source: BUILD\ESC\xulrunner\res\svg.css; DestDir: {app}\xulrunner\res
-Source: BUILD\ESC\xulrunner\res\table-add-column-after.gif; DestDir: {app}\xulrunner\res
-Source: BUILD\ESC\xulrunner\res\table-add-column-after-active.gif; DestDir:
{app}\xulrunner\res
-Source: BUILD\ESC\xulrunner\res\table-add-column-after-hover.gif; DestDir:
{app}\xulrunner\res
-Source: BUILD\ESC\xulrunner\res\table-add-column-before.gif; DestDir:
{app}\xulrunner\res
-Source: BUILD\ESC\xulrunner\res\table-add-column-before-active.gif; DestDir:
{app}\xulrunner\res
-Source: BUILD\ESC\xulrunner\res\table-add-column-before-hover.gif; DestDir:
{app}\xulrunner\res
-Source: BUILD\ESC\xulrunner\res\table-add-row-after.gif; DestDir: {app}\xulrunner\res
-Source: BUILD\ESC\xulrunner\res\table-add-row-after-active.gif; DestDir:
{app}\xulrunner\res
-Source: BUILD\ESC\xulrunner\res\table-add-row-after-hover.gif; DestDir:
{app}\xulrunner\res
-Source: BUILD\ESC\xulrunner\res\table-add-row-before.gif; DestDir: {app}\xulrunner\res
-Source: BUILD\ESC\xulrunner\res\table-add-row-before-active.gif; DestDir:
{app}\xulrunner\res
-Source: BUILD\ESC\xulrunner\res\table-add-row-before-hover.gif; DestDir:
{app}\xulrunner\res
-Source: BUILD\ESC\xulrunner\res\table-remove-column.gif; DestDir: {app}\xulrunner\res
-Source: BUILD\ESC\xulrunner\res\table-remove-column-active.gif; DestDir:
{app}\xulrunner\res
-Source: BUILD\ESC\xulrunner\res\table-remove-column-hover.gif; DestDir:
{app}\xulrunner\res
-Source: BUILD\ESC\xulrunner\res\table-remove-row.gif; DestDir: {app}\xulrunner\res
-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\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
Source: BUILD\ESC\chrome\icons\default\settings-window.ico; DestDir:
{app}\chrome\icons\default
Source: BUILD\ESC\chrome\locale\en-US\esc.properties; DestDir: {app}\chrome\locale\en-US
@@ -334,80 +118,10 @@
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\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
+Source: BUILD\ESC\defaults\preferences\esc-prefs.js; DestDir: {app}\defaults\preferences
+; Xulrunner
+
+Source: BUILD\ESC\xulrunner\*; DestDir: {app}\xulrunner; Flags: ignoreversion
recursesubdirs createallsubdirs
[Run]
Index: build.sh
===================================================================
RCS file: /cvs/dirsec/esc/win32/build.sh,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- build.sh 8 Oct 2009 23:45:30 -0000 1.12
+++ build.sh 1 Dec 2010 01:01:35 -0000 1.13
@@ -24,8 +24,6 @@
### INNO_PATH - Path name of Inno installer executable
-### CSP_PATH - Path to the directory containing the CSP if desired
-
### USE_64 - Are we trying to build the 64 bit version
NUM_ARGS=0
@@ -35,20 +33,19 @@
# NSS values
# NSS needed just to help coolkey build
-NSS_NAME=nss-3.11.4
-NSS_ARCHIVE=$NSS_NAME-with-nspr-4.6.4
-NSS_SOURCE_URL=https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_11_4_RTM/src/$NSS_ARCHIVE.tar.gz
+NSS_NAME=nss-3.12.5
+NSPR_NAME=nspr-4.8.2
+NSS_PATH_NAME=NSS_3_12_5_RTM
+NSS_ARCHIVE=$NSS_NAME-with-$NSPR_NAME
+NSS_SOURCE_URL=https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/$NSS_PATH_NAME/src/$NSS_ARCHIVE.tar.gz
+NSS_NAME=$NSS_ARCHIVE
NSS_LIB_PATH=$NSS_NAME/mozilla/dist/WIN*/lib
#Inno installer values
#INNO_PATH="C:/Program Files/Inno Setup 5/ISCC.exe"
-#Egate driver values
-
-EGATE_DRIVER_URL=http://www.it-secure.com/Downloads
-EGATE_DRIVER_NAME=e-gate_W2k_XP_24.zip
#Zlib values
@@ -58,7 +55,7 @@
ZLIB_DLL_64=zlibwapi
ZLIB_ARCHIVE=zlib123-dll
-ZLIB_BIN_URL=http://www.zlib.net
+ZLIB_BIN_URL=http://sourceforge.net/projects/libpng/files/zlib/1.2.3
ZLIB_ARCHIVE_64=zlib123dllx64
ZLIB_BIN_URL_64=http://winimage.com/zLibDll
@@ -68,24 +65,49 @@
COOLKEY_NAME=coolkey
COOLKEY_TAG=HEAD
+PKI_PATH=http://pki.fedoraproject.org/pki
+CSP_PATH=support/esc/windows/csp/32/latest
+CSP_DIR=CLKCSP
+CSP_ARCHIVE=CLKCSP.zip
+
+if [ X$USE_64 == X1 ];
+then
+CSP_PATH=support/esc/windows/csp/64/latest
+fi
+
+
#Fedora repo for CoolKey and ESC
-FEDORA_CVS_ROOT=:pserver:anonymous@cvs.fedora.redhat.com:/cvs/dirsec
+FEDORA_CVS_ROOT=:pserver:anonymous@cvs.fedoraproject.org:/cvs/dirsec
#Xulrunner values
-XULRUNNER_ARCHIVE_NAME=xulrunner-1.8.0.4-source.tar.bz2
-XULRUNNER_SRC_URL=http://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/1.8.0.4/source/$XULRUNNER_ARCHIVE_NAME
+#Xulrunner SDK
+MOZILLA_FTP_PATH=ftp://ftp.mozilla.org/pub/mozilla.org
+XULRUNNER_SDK_PATH=xulrunner/releases/1.9.0.17/sdk/
+XULRUNNER_SDK_ARCHIVE=xulrunner-1.9.0.17.en-US.win32.sdk.zip
+
+XUL_SDK_DIR=xulrunner-sdk
+
+#Xlrunner runtime
+
+XULRUNNER_DIR=xulrunner
+XULRUNNER_FTP_PATH=http://releases.mozilla.org/pub/mozilla.org/
+XULRUNNER_PATH=xulrunner/releases/1.9.2.12/runtimes/
+
+XULRUNNER_ARCHIVE=xulrunner-1.9.2.12.en-US.win32.zip
+
#Base Dirctory calc
BASE_DIR=${PWD}
+
#ESC values
ESC_NAME=esc
-ESC_VERSION_NO=1.1.0-8
+ESC_VERSION_NO=1.1.0-12
#Cygwin values
@@ -104,13 +126,14 @@
export PATH=${ORIG_PATH}
+GECKO_SDK_PATH=${BASE_DIR}/${XUL_SDK_DIR}
function buildNSS {
echo "BUILDING NSS..."
- if [ $NUM_ARGS -ne 0 ] && [ $THE_ARG != -doNSS ] || [ $USE_64 == 1 ];
+ if [ $NUM_ARGS -ne 0 ] && [ $THE_ARG != -doNSS ] || [ X$USE_64 == X1 ];
then
echo "Do not build NSS."
return 0
@@ -131,14 +154,14 @@
return 1
fi
-
tar -xzvf $NSS_ARCHIVE.tar.gz
+ fi
+
if [ $? != 0 ];
then
echo "Can't untar NSS."
return 1
fi
- fi
cd $NSS_NAME/mozilla/security/nss
make BUILD_OPT=1 nss_build_all
@@ -149,8 +172,6 @@
fi
- return 0
-
}
function buildCOOLKEY {
@@ -189,7 +210,7 @@
ZLIB_LIB_PATH=${BASE_DIR}/zlib/lib
- if [ $USE_64 == 1 ];
+ if [ X$USE_64 == X1 ];
then
ZLIB_LIB_PATH=${BASE_DIR}/zlib/dll_x64
ZLIB_LIB_FLAGS=${BASE_DIR}/zlib/dll_x64/$ZLIB_DLL_64.dll
@@ -212,7 +233,7 @@
export ZLIB_LIB=$ZLIB_LIB_PATH
export ZLIB_INCLUDE=$ZLIB_INC_PATH
- if [ $USE_64 == 1 ];
+ if [ X$USE_64 == X1 ];
then
PK11=
else
@@ -245,7 +266,7 @@
cp -f coolkey/src/coolkey/.libs/libcoolkeypk11.dll BUILD/coolkeypk11.dll
cp -f coolkey/src/libckyapplet/.libs/libckyapplet-1.dll BUILD
- if [ $USE_64 == 1 ];
+ if [ X$USE_64 == X1 ];
then
cp -f zlib/dll_x64/zlibwapi.dll BUILD
else
@@ -255,7 +276,7 @@
# Grab pk11install
- if [ $USE_64 != 1 ];
+ if [ X$USE_64 != X1 ];
then
cp -f coolkey/src/install/pk11install.exe BUILD
fi
@@ -264,6 +285,68 @@
return 0
}
+function obtainXULSDK {
+
+ if [ -d ${XUL_SDK_DIR} ];
+ then
+ echo "XUL SDK already obtained."
+ return 0
+ fi
+
+
+ wget ${MOZILLA_FTP_PATH}/${XULRUNNER_SDK_PATH}/${XULRUNNER_SDK_ARCHIVE}
+
+ if [ $? != 0 ];
+ then
+ echo "Can't download the XUL SDK."
+ return 1
+ fi
+
+ unzip ${XULRUNNER_SDK_ARCHIVE}
+
+ if [ $? != 0 ];
+ then
+ echo "Can't unzip XUL SDK."
+ return 1
+ fi
+
+ chmod -R 755 ${XUL_SDK_DIR}/bin/*.exe
+ chmod -R 755 ${XUL_SDK_DIR}/bin/*.dll
+
+
+ rm -f ${XULRUNNER_SDK_ARCHIVE}
+
+
+ if [ -d ${XULRUNNER_DIR} ];
+ then
+ echo "XULRUNNER already obtained."
+ fi
+
+ wget ${XULRUNNER_FTP_PATH}/${XULRUNNER_PATH}/${XULRUNNER_ARCHIVE}
+
+ if [ $? != 0 ];
+ then
+ echo "Can't download Xulrunner Runtime."
+ return 1
+ fi
+
+ unzip ${XULRUNNER_ARCHIVE}
+
+ if [ $? != 0 ];
+ then
+ echo "Can't unzip Xulrunner Runtime."
+ return 1
+ fi
+
+ rm -f ${XULRUNNER_ARCHIVE}
+
+ chmod -R 755 ${XULRUNNER_DIR}/*.exe
+ chmod -R 755 ${XULRUNNER_DIR}/*.dll
+
+ return 0
+
+}
+
function obtainZLIB {
echo "OBTAINING ZLIB..."
@@ -280,7 +363,7 @@
cd $ZLIB_NAME
- if [ $USE_64 == 1 ]
+ if [ X$USE_64 == X1 ]
then
wget $ZLIB_BIN_URL_64/$ZLIB_ARCHIVE_64.zip
@@ -328,27 +411,17 @@
echo "BUILDING ESC"
cd $BASE_DIR
- if [ $NUM_ARGS -ne 0 ] && [ $THE_ARG != -doEsc ] || [ $USE_64 == 1 ];
+ if [ $NUM_ARGS -ne 0 ] && [ $THE_ARG != -doEsc ] || [ X$USE_64 == X1 ];
then
echo "Do not build ESC."
return 0
fi
- if [ -d esc ];
- then
- echo "ESC already checked out.."
- else
- cvs -d $FEDORA_CVS_ROOT co esc
- fi
+ export GECKO_SDK_PATH=`cygpath -m $GECKO_SDK_PATH`
- if [ $? != 0 ];
- then
- echo "Can't check out ESC..."
- return 1
+ echo "GECKO_SDK_PATH ${GECKO_SDK_PATH}"
- fi
-
- cd $ESC_NAME
+ cd ../
mkdir -p dist/src
@@ -381,21 +454,11 @@
make BUILD_OPT=1 install
cd ../../..
- cp dist/WIN*/coolkey_drivers/egate/eginstall.exe ../BUILD/egate
-
- if [ $? != 0 ];
- then
- echo "Can't copy egate installer!"
- return 1
- fi
-
-
# hoist the build into the installer staging area
- cd ..
- cp -rf esc/dist/WIN*/esc_build/ESC BUILD
+ cp -rf dist/WIN*/esc_build/ESC win32/BUILD
if [ $? != 0 ];
then
@@ -405,7 +468,6 @@
return 0
-
}
function obtainCAPI {
@@ -414,44 +476,39 @@
echo "OBTAINING the CAPI driver... CSP_PATH $CSP_PATH"
-
- if [ -z $CSP_PATH ];
+ if [ -d ${CSP_DIR} ];
then
- echo "No CSP path specified."
- echo "Set environ var: CSP_PATH if desired . "
- return 0
- fi
-
- cp $CSP_PATH/* BUILD
-
- return 0
-}
+ echo "CSP already obtained."
+ return 0
+ fi
-function obtainEGATE {
+ wget ${PKI_PATH}/${CSP_PATH}/${CSP_ARCHIVE}
- echo "OBTAINING EGINSTALL"
+ if [ $? != 0 ];
+ then
+ echo "Can't download the CSP."
+ return 1
+ fi
- cd $BASE_DIR
+ unzip ${CSP_ARCHIVE}
+ rm -f ${CSP_ARCHIVE}
- if [ -d BUILD/egate ];
+ if [ $? != 0 ];
then
- echo "Egate already obtained!"
- return 0
+ echo "Can't unzip the CSP."
+ return 1
fi
-
- wget $EGATE_DRIVER_URL/$EGATE_DRIVER_NAME
+ cp $CSP_DIR/* BUILD
+
if [ $? != 0 ];
then
- echo "Can't obtain egate driver!"
- return 1
+ echo "Unable to obtain CSP driver!"
+ return 1
fi
- mkdir -p BUILD/egate
- unzip $EGATE_DRIVER_NAME -d BUILD/egate
return 0
-
}
function initializeBUILD {
@@ -514,9 +571,9 @@
fi
- #Move over extra files we don't keep in the open source world
+ #Move over extra files
- if [ $USE_64 == 1 ];
+ if [ X$USE_64 == X1 ];
then
INNO_SCRIPT=coolkey-64.iss
else
@@ -529,6 +586,8 @@
cp $NSS_LIB_PATH/libplc4.dll BUILD
cp $NSS_LIB_PATH/libnspr4.dll BUILD
cp $NSS_LIB_PATH/libplds4.dll BUILD
+ cp $NSS_LIB_PATH/nssutil3.dll BUILD
+ cp $NSS_LIB_PATH/sqlite3.dll BUILD
INNO_SCRIPT=setup.iss
fi
@@ -590,18 +649,25 @@
THE_ARG=$1
-
processARGS
-
initializeBUILD
+
if [ $? != 0 ];
then
exit 1
fi
+obtainXULSDK
+
+if [ $? != 0 ];
+then
+ exit 1
+fi
+
+
obtainCAPI
if [ $? != 0 ];
@@ -609,8 +675,6 @@
exit 1
fi
-#obtainEGATE
-
if [ $? != 0 ];
then
exit 1
@@ -620,7 +684,8 @@
if [ $? != 0 ];
then
-echo "Issue building NSS."
+ echo "Issue building NSS."
+ exit 1
fi
obtainZLIB
@@ -630,7 +695,7 @@
exit 1
fi
-#buildCOOLKEY
+buildCOOLKEY
if [ $? != 0 ];
then
4887
days inactive
4887
days old
389-commits@lists.fedoraproject.org
0 comments
1 participants
participants (1)
-
Jack Magne