November 2011 - tor-commits - lists.torproject.org

[torbrowser/master] add all of the necessary files for putting firefox in the correct directory structure in the windows tbb
by erinn＠torproject.org 10 Nov '11

10 Nov '11

commit 54b924995aa38defa1b111a78e56145fd2c7282d Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Nov 10 03:44:53 2011 +0000 add all of the necessary files for putting firefox in the correct directory structure in the windows tbb --- .../App/AppInfo/Launcher/FirefoxPortable.ini | 32 ++++ .../firefox-portable/App/AppInfo/appinfo.ini | 25 +++ .../firefox-portable/App/AppInfo/installer.ini | 3 + .../App/DefaultData/plugins/plugins_readme.txt | 1 + .../App/DefaultData/profile/bookmarks.html | 17 ++ .../App/DefaultData/profile/prefs.js | 174 ++++++++++++++++++++ .../settings/FirefoxPortableSettings.ini | 2 + .../App/Firefox/Microsoft.VC90.CRT.Manifest | 13 ++ .../Data/plugins/plugins_readme.txt | 1 + .../firefox-portable/Data/profile/bookmarks.html | 24 +++ .../config/firefox-portable/Data/profile/prefs.js | 174 ++++++++++++++++++++ .../Data/settings/FirefoxPortableSettings.ini | 5 + .../config/firefox-portable/FirefoxPortable.ini | 18 ++ build-scripts/config/firefox-portable/readme.txt | 1 + 14 files changed, 490 insertions(+), 0 deletions(-) diff --git a/build-scripts/config/firefox-portable/App/AppInfo/Launcher/FirefoxPortable.ini b/build-scripts/config/firefox-portable/App/AppInfo/Launcher/FirefoxPortable.ini new file mode 100644 index 0000000..63005e4 --- /dev/null +++ b/build-scripts/config/firefox-portable/App/AppInfo/Launcher/FirefoxPortable.ini @@ -0,0 +1,32 @@ +[Format] +Type=PortableApps.comFormat +Version=2.0 + +[Details] +Name=Mozilla Firefox, Portable Edition +AppID=FirefoxPortable +Publisher=Mozilla & The Tor Project +Homepage=https://www.torproject.org/torbrowser +Category=Internet +Description=Mozilla Firefox with patches from the Tor Project +Language=English + +[License] +Shareable=true +OpenSource=true +Freeware=true +CommercialUse=true + +[Version] +PackageVersion=5.0.0.1 +DisplayVersion=5.0.1 + +[SpecialPaths] +Plugins=App\Firefox\plugins + +[Control] +Icons=1 +Start=FirefoxPortable.exe + +[Launch] +ProgramExecutable=Firefox\firefox.exe diff --git a/build-scripts/config/firefox-portable/App/AppInfo/appinfo.ini b/build-scripts/config/firefox-portable/App/AppInfo/appinfo.ini new file mode 100644 index 0000000..ea2f832 --- /dev/null +++ b/build-scripts/config/firefox-portable/App/AppInfo/appinfo.ini @@ -0,0 +1,25 @@ +[Format] +Type=PortableApps.comFormat +Version=2.0 + +[Details] +Name=Tor Browser +AppID=FirefoxPortable +Publisher=Mozilla & The Tor Project +Homepage=https://www.torproject.org/torbrowser +Category=Internet +Description=Mozilla Firefox with patches from the Tor Project +Language=English + +[License] +Shareable=true +OpenSource=true +Freeware=true +CommercialUse=true + +[Version] +PackageVersion=8.0.0.0 +DisplayVersion=8.0 + +[SpecialPaths] +Plugins=App\Firefox\plugins diff --git a/build-scripts/config/firefox-portable/App/AppInfo/installer.ini b/build-scripts/config/firefox-portable/App/AppInfo/installer.ini new file mode 100644 index 0000000..06ab359 --- /dev/null +++ b/build-scripts/config/firefox-portable/App/AppInfo/installer.ini @@ -0,0 +1,3 @@ +[DirectoriesToPreserve] +PreserveDirectory1=App\Firefox\plugins +PreserveDirectory2=App\Firefox\searchplugins diff --git a/build-scripts/config/firefox-portable/App/DefaultData/plugins/plugins_readme.txt b/build-scripts/config/firefox-portable/App/DefaultData/plugins/plugins_readme.txt new file mode 100644 index 0000000..7192340 --- /dev/null +++ b/build-scripts/config/firefox-portable/App/DefaultData/plugins/plugins_readme.txt @@ -0,0 +1 @@ +Place Firefox plugins in this directory (Flash, Shockwave, etc) \ No newline at end of file diff --git a/build-scripts/config/firefox-portable/App/DefaultData/profile/bookmarks.html b/build-scripts/config/firefox-portable/App/DefaultData/profile/bookmarks.html new file mode 100644 index 0000000..8207433 --- /dev/null +++ b/build-scripts/config/firefox-portable/App/DefaultData/profile/bookmarks.html @@ -0,0 +1,17 @@ +<!DOCTYPE NETSCAPE-Bookmark-file-1> + +<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8"> +<TITLE>Bookmarks</TITLE> +<H1>Bookmarks</H1> + +<DL><p> + <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">Bookmarks Toolbar Folder</H3> +<DD>Add bookmarks to this folder to see them displayed on the Bookmarks Toolbar + <DL><p> + <DT><A HREF="https://www.torproject.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8AOwAUDSQAD2QRAA2ZDQAFyw4ABssjAAuQKAAPZAAcAAn///8A////AP///wD///8A////AP///wD///8AIwAMFmtcZP89NDr/TkRJ/ykhJ/8kIij/KAUV/yoAD/9CHy3/EwAMKf///wD///8A////AP///wD///8AHAAACUw4Qf98cnn//Pz8/9TM1/9dPl3/IBYg/y0fKf9bCzT/NQAX/zoeKP8AAAAE////AP///wD///8A////ACgADSYvJSv/2d/h/+Hd4v9sP17/xsHN/1A3Tf8lGSD/YxM9/2sVRP80DB7/Ty44bv///wD///8A////AP///wAwAAUwSERJ/+jx8v/Xx9P/YDVS/7y+zP9BKEH/LiUs/2ceRf91JFT/Ngke/yYACVj///8A////AP///wD///8ANwAJHFNNUv/h6+z/9PD0/31Zev+GeJL/Rj5X/zAjK/9zL1f/ezFd/y0NGv8mAA42////AP///wD///8A////AFUAAAMVAAqge4GF//v8/P/x7/L/hHCN/1NVbf87KDP/g0Fq/14pSP9PLz3/AAAABP///wD///8A////AP///wD///8AOQAcCQcACpWcoqX/+/39/7PJ0v9oeYn/Ry89/5BVff8+IC//IAANKP///wD///8A////AP///wD///8A////AP///wBGABcLCgAHmXFucv/G4eb/SUhS/109UP9WOkf/WEJIhf///wD///8A////AP///wD///8A////AP///wD///8A////AFUAKgYZAAiGRkNJ/0IyO/9XQkj/KQAI HzMAAAX///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AMwANFFxMU/9WQEr/PgAMKf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AD4AFyFWUln/OW5Y/wCobmQAqnEJ////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCZAGYFQpF3hQteOv8AiVGpGb2BbP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AAD//wMAjF2oB35N8gClYpcAuHEk////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AANOEHQCvdn8ArGipALJshwC4ezb///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wAA/78IANmXNgDFgyMAv4AM////AP///wD///8A//8AAPAPAADgBwAA4AcAAOAHAADgBwAA8AcAAPgPAAD8HwAA/j8AAP5/AAD+fwAA/38AAP//AAD//wAA//8AAA==" LAST_CHARSET="ISO-8859-1" ID="rdf:#$0gnTO1">Learn more about Tor</A> + <DT><A HREF="https://blog.torproject.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8AOwAUDSQAD2QRAA2ZDQAFyw4ABssjAAuQKAAPZAAcAAn///8A////AP///wD///8A////AP///wD///8AIwAMFmtcZP89NDr/TkRJ/ykhJ/8kIij/KAUV/yoAD/9CHy3/EwAMKf///wD///8A////AP///wD///8AHAAACUw4Qf98cnn//Pz8/9TM1/9dPl3/IBYg/y0fKf9bCzT/NQAX/zoeKP8AAAAE////AP///wD///8A////ACgADSYvJSv/2d/h/+Hd4v9sP17/xsHN/1A3Tf8lGSD/YxM9/2sVRP80DB7/Ty44bv///wD///8A////AP///wAwAAUwSERJ/+jx8v/Xx9P/YDVS/7y+zP9BKEH/LiUs/2ceRf91JFT/Ngke/yYACVj///8A////AP///wD///8ANwAJHFNNUv/h6+z/9PD0/31Zev+GeJL/Rj5X/zAjK/9zL1f/ezFd/y0NGv8mAA42////AP///wD///8A////AFUAAAMVAAqge4GF//v8/P/x7/L/hHCN/1NVbf87KDP/g0Fq/14pSP9PLz3/AAAABP///wD///8A////AP///wD///8AOQAcCQcACpWcoqX/+/39/7PJ0v9oeYn/Ry89/5BVff8+IC//IAANKP///wD///8A////AP///wD///8A////AP///wBGABcLCgAHmXFucv/G4eb/SUhS/109UP9WOkf/WEJIhf///wD///8A////AP///wD///8A////AP///wD///8A////AFUAKgYZAAiGRkNJ/0IyO/9XQkj/KQA IHzMAAAX///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AMwANFFxMU/9WQEr/PgAMKf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AD4AFyFWUln/OW5Y/wCobmQAqnEJ////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCZAGYFQpF3hQteOv8AiVGpGb2BbP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AAD//wMAjF2oB35N8gClYpcAuHEk////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AANOEHQCvdn8ArGipALJshwC4ezb///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wAA/78IANmXNgDFgyMAv4AM////AP///wD///8A//8AAPAPAADgBwAA4AcAAOAHAADgBwAA8AcAAPgPAAD8HwAA/j8AAP5/AAD+fwAA/38AAP//AAD//wAA//8AAA==" LAST_CHARSET="ISO-8859-1" ID="rdf:#$0gnTO1">The Tor Blog</A> + </DL><p> + <HR> +</DL><p> diff --git a/build-scripts/config/firefox-portable/App/DefaultData/profile/prefs.js b/build-scripts/config/firefox-portable/App/DefaultData/profile/prefs.js new file mode 100644 index 0000000..13fda1f --- /dev/null +++ b/build-scripts/config/firefox-portable/App/DefaultData/profile/prefs.js @@ -0,0 +1,174 @@ +# Mozilla User Preferences + +/* Do not edit this file. + * + * If you make changes to this file while the application is running, + * the changes will be overwritten when the application exits. + * + * To make a manual change to preferences, you can visit the URL about:config + * For more information, see http://www.mozilla.org/unix/customizing.html#prefs + */ + +user_pref("app.update.auto", false); +user_pref("app.update.enabled", false); +user_pref("app.update.lastUpdateTime.addon-background-update-timer", 1216566538); +user_pref("app.update.lastUpdateTime.background-update-timer", 1216566535); +user_pref("app.update.lastUpdateTime.blocklist-background-update-timer", 1216566538); +user_pref("app.update.lastUpdateTime.microsummary-generator-update-timer", 1232574822); +user_pref("app.update.lastUpdateTime.search-engine-update-timer", 1216566539); +user_pref("browser.bookmarks.livemark_refresh_seconds", 31536000); +user_pref("browser.cache.disk.capacity", 0); +user_pref("browser.cache.disk.enable", false); +user_pref("browser.cache.disk.smart_size.enabled", false); +user_pref("browser.cache.disk.smart_size.first_run", false); +user_pref("browser.cache.offline.enable", false); +user_pref("browser.chrome.favicons", false); +user_pref("browser.chrome.image_icons.max_size", 0); +user_pref("browser.chrome.site_icons", false); +user_pref("browser.download.manager.retention", 1); +user_pref("browser.download.useDownloadDir", false); +user_pref("browser.formfill.enable", false); +user_pref("browser.history_expire_days.mirror", 0); +user_pref("browser.microsummary.updateGenerators", false); +user_pref("browser.migration.version", 5); +user_pref("browser.places.importBookmarksHTML", false); +user_pref("browser.places.importDefaults", false); +user_pref("browser.places.leftPaneFolderId", -1); +user_pref("browser.places.migratePostDataAnnotations", false); +user_pref("browser.places.smartBookmarksVersion", 2); +user_pref("browser.places.updateRecentTagsUri", false); +user_pref("browser.preferences.advanced.selectedTabIndex", 0); +user_pref("browser.privatebrowsing.autostart", true); +user_pref("browser.rights.3.shown", true); +user_pref("browser.safebrowsing.enabled", false); +user_pref("browser.safebrowsing.malware.enabled", false); +user_pref("browser.search.suggest.enabled", false); +user_pref("browser.search.update", false); +user_pref("browser.sessionstore.privacy_level", 2); +user_pref("browser.sessionstore.resume_session_once", true); +user_pref("browser.shell.checkDefaultBrowser", false); +user_pref("browser.startup.homepage", "https://check.torproject.org/?lang=en-US&small=1"); +user_pref("browser.startup.homepage_override.buildID", "20110325121920"); +user_pref("browser.startup.homepage_override.mstone", "rv:2.0"); +user_pref("browser.urlbar.autocomplete.enabled", false); +user_pref("browser.zoom.siteSpecific", false); +user_pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); +user_pref("capability.policy.maonoscript.sites", "addons.mozilla.org about: about:addons about:blank about:blocked about:certerror about:config about:crashes about:credits about:home about:neterror about:plugins about:privatebrowsing about:sessionrestore chrome: resource:"); +user_pref("dom.event.contextmenu.enabled", false); +user_pref("dom.storage.enabled", false); +user_pref("extensions.bootstrappedAddons", "{}"); +user_pref("extensions.bprivacy.DataDir", "/Users/erinn/Library/Preferences/Macromedia"); +user_pref("extensions.bprivacy.donotaskforfolder", true); +user_pref("extensions.bprivacy.donotaskonexit", true); +user_pref("extensions.bprivacy.initiated", true); +user_pref("extensions.checkCompatibility.4.*", false); +user_pref("extensions.checkUpdateSecurity", true); +user_pref("extensions.databaseSchema", 3); +user_pref("extensions.enabledAddons", "https-everywhere@eff.org:0.9.9.development.4,{73a6fe31-595d-460b-a920-fcc0f8843232}:2.1.0.3,{d40f5e7b-d2cf-4856-b441-cc613eeffbe3}:1.50,{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}:1.3.3-alpha"); +user_pref("extensions.enabledItems", "langpack-en-US@firefox.mozilla.org:,{73a6fe31-595d-460b-a920-fcc0f8843232}:1.9.9.57,{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}:1.2.4,{972ce4c6-7e08-4474-a285-3208198ce6fd}:3.5.8"); +user_pref("extensions.enabledScopes", 1); +user_pref("extensions.pendingOperations", false); +user_pref("extensions.torbutton.fresh_install", false); +user_pref("extensions.torbutton.http_port", 8118); +user_pref("extensions.torbutton.http_proxy", "127.0.0.1"); +user_pref("extensions.torbutton.https_port", 8118); +user_pref("extensions.torbutton.https_proxy", "127.0.0.1"); +user_pref("extensions.torbutton.locked_mode", true); +user_pref("extensions.torbutton.normal_exit", true); +user_pref("extensions.torbutton.proxies_applied", true); +user_pref("extensions.torbutton.restore_tor", true); +user_pref("extensions.torbutton.saved.auto_update", false); +user_pref("extensions.torbutton.saved.share_proxy_settings", false); +user_pref("extensions.torbutton.saved.socks_version", 5); +user_pref("extensions.torbutton.saved.type", 1); +user_pref("extensions.torbutton.settings_applied", true); +user_pref("extensions.torbutton.socks_host", "127.0.0.1"); +user_pref("extensions.torbutton.socks_port", 9050); +user_pref("extensions.torbutton.startup", true); +user_pref("extensions.torbutton.tor_enabled", true); +user_pref("extensions.torbutton.tor_memory_jar", true); +user_pref("extensions.torbutton.tz_string", "UTC+00:00"); +user_pref("extensions.update.enabled", true); +user_pref("extensions.update.notifyUser", true); +user_pref("general.appname.override", "Netscape"); +user_pref("general.appversion.override", "5.0 (Windows; en-US)"); +user_pref("general.buildID.override", "0"); +user_pref("general.oscpu.override", "Windows NT 6.1"); +user_pref("general.platform.override", "Win32"); +user_pref("general.productSub.override", "20100401"); +user_pref("general.useragent.override", "Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.2.3) Gecko/20100401 Firefox/3.6.3"); +user_pref("general.useragent.vendor", ""); +user_pref("general.useragent.vendorSub", ""); +user_pref("geo.enabled", false); +user_pref("geo.wifi.uri", ""); +user_pref("intl.accept_languages", "en-us, en"); +user_pref("intl.charsetmenu.browser.cache", "UTF-8"); +user_pref("network.cookie.cookieBehavior", 1); +user_pref("network.cookie.lifetimePolicy", 2); +user_pref("network.cookie.prefsMigrated", true); +user_pref("network.hosts.pop_server", ""); +user_pref("network.protocol-handler.external-default", false); +user_pref("network.protocol-handler.external.mailto", false); +user_pref("network.protocol-handler.external.news", false); +user_pref("network.protocol-handler.external.nntp", false); +user_pref("network.protocol-handler.external.snews", false); +user_pref("network.protocol-handler.warn-external.mailto", true); +user_pref("network.protocol-handler.warn-external.news", true); +user_pref("network.protocol-handler.warn-external.nntp", true); +user_pref("network.protocol-handler.warn-external.snews", true); +user_pref("network.proxy.http", "127.0.0.1"); +user_pref("network.proxy.http_port", 8118); +user_pref("network.proxy.no_proxies_on", "127.0.0.1"); +user_pref("network.proxy.socks", "127.0.0.1"); +user_pref("network.proxy.socks_port", 9050); +user_pref("network.proxy.socks_remote_dns", true); +user_pref("network.proxy.ssl", "127.0.0.1"); +user_pref("network.proxy.ssl_port", 8118); +user_pref("network.proxy.type", 1); +user_pref("network.security.ports.banned", "8118,8123,9050,9051"); +user_pref("noscript.ABE.enabled", false); +user_pref("noscript.ABE.notify", false); +user_pref("noscript.ABE.wanIpAsLocal", false); +user_pref("noscript.autoReload", false); +user_pref("noscript.contentBlocker", true); +user_pref("noscript.default", "about:blank about:credits addons.mozilla.org flashgot.net google.com gstatic.com googlesyndication.com informaction.com yahoo.com yimg.com maone.net noscript.net hotmail.com msn.com passport.com passport.net passportimages.com live.com"); +user_pref("noscript.firstRunRedirection", false); +user_pref("noscript.forbidWebGL", true); +user_pref("noscript.global", true); +user_pref("noscript.gtemp", ""); +user_pref("noscript.opacizeObject", 3); +user_pref("noscript.options.tabSelectedIndexes", "5,0,0"); +user_pref("noscript.policynames", ""); +user_pref("noscript.secureCookies", true); +user_pref("noscript.showAllowPage", false); +user_pref("noscript.showBaseDomain", false); +user_pref("noscript.showDistrust", false); +user_pref("noscript.showRecentlyBlocked", false); +user_pref("noscript.showRevokeTemp", false); +user_pref("noscript.showTemp", false); +user_pref("noscript.showTempAllowPage", false); +user_pref("noscript.showTempToPerm", false); +user_pref("noscript.showUntrusted", false); +user_pref("noscript.subscription.lastCheck", -142148139); +user_pref("noscript.temp", ""); +user_pref("noscript.untrusted", ""); +user_pref("places.history.enabled", false); +user_pref("places.history.expiration.transient_current_max_pages", 120795); +user_pref("plugin.disable_full_page_plugin_for_types", "application/asx,video/x-ms-asf-plugin,application/x-mplayer2,video/x-ms-asf,video/x-ms-wm,audio/x-ms-wma,audio/x-ms-wax,video/x-ms-wmv,video/x-ms-wvx,application/x-drm-v2,application/x-drm"); +user_pref("plugin.expose_full_path", true); +user_pref("plugin.scan.4xPluginFolder", false); +user_pref("plugin.scan.Acrobat", "99.0"); +user_pref("plugin.scan.Quicktime", "99.0"); +user_pref("plugin.scan.SunJRE", "99.0"); +user_pref("plugin.scan.WindowsMediaPlayer", "99.0"); +user_pref("plugin.scan.plid.all", false); +user_pref("privacy.sanitize.migrateFx3Prefs", true); +user_pref("security.enable_java", false); +user_pref("signon.rememberSignons", false); +user_pref("urlclassifier.keyupdatetime.https://sb-ssl.google.com/safebrowsing/newkey", 1235166825); +user_pref("urlclassifier.tableversion.goog-black-enchash", "1.55536"); +user_pref("urlclassifier.tableversion.goog-black-url", "1.23256"); +user_pref("urlclassifier.tableversion.goog-white-domain", "1.481"); +user_pref("urlclassifier.tableversion.goog-white-url", "1.371"); +user_pref("xpinstall.whitelist.add", ""); +user_pref("xpinstall.whitelist.add.36", ""); diff --git a/build-scripts/config/firefox-portable/App/DefaultData/settings/FirefoxPortableSettings.ini b/build-scripts/config/firefox-portable/App/DefaultData/settings/FirefoxPortableSettings.ini new file mode 100644 index 0000000..ae1e71c --- /dev/null +++ b/build-scripts/config/firefox-portable/App/DefaultData/settings/FirefoxPortableSettings.ini @@ -0,0 +1,2 @@ +[FirefoxPortableSettings] +LastProfileDirectory=NONE \ No newline at end of file diff --git a/build-scripts/config/firefox-portable/App/Firefox/Microsoft.VC90.CRT.Manifest b/build-scripts/config/firefox-portable/App/Firefox/Microsoft.VC90.CRT.Manifest new file mode 100644 index 0000000..41623b1 --- /dev/null +++ b/build-scripts/config/firefox-portable/App/Firefox/Microsoft.VC90.CRT.Manifest @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> + +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <noInheritable/> + <assemblyIdentity + type="win32" + name="Microsoft.VC90.CRT" + version="9.0.21022.8" + processorArchitecture="x86" + publicKeyToken="1fc8b3b9a1e18e3b" + /> + <file name="msvcr90.dll" /> <file name="msvcp90.dll" /> <file name="msvcm90.dll" /> +</assembly> diff --git a/build-scripts/config/firefox-portable/Data/plugins/plugins_readme.txt b/build-scripts/config/firefox-portable/Data/plugins/plugins_readme.txt new file mode 100644 index 0000000..7192340 --- /dev/null +++ b/build-scripts/config/firefox-portable/Data/plugins/plugins_readme.txt @@ -0,0 +1 @@ +Place Firefox plugins in this directory (Flash, Shockwave, etc) \ No newline at end of file diff --git a/build-scripts/config/firefox-portable/Data/profile/bookmarks.html b/build-scripts/config/firefox-portable/Data/profile/bookmarks.html new file mode 100644 index 0000000..d85bcf5 --- /dev/null +++ b/build-scripts/config/firefox-portable/Data/profile/bookmarks.html @@ -0,0 +1,24 @@ +<!DOCTYPE NETSCAPE-Bookmark-file-1> + +<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8"> +<TITLE>Bookmarks</TITLE> +<H1>Bookmarks</H1> + +<DL><p> + <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">Bookmarks Toolbar Folder</H3> +<DD>Add bookmarks to this folder to see them displayed on the Bookmarks Toolbar + <DL><p> + <DT><A HREF="http://www.mozilla.com/en-US/firefox/central/" ID="rdf:#$GvPhC3">Getting Started</A> + <DT><A HREF="http://fxfeeds.mozilla.com/en-US/firefox/livebookmarks/" FEEDURL="http://fxfeeds.mozilla.com/en-US/firefox/headlines.xml" ID="rdf:#$HvPhC3">Latest Headlines</A> + </DL><p> + <DT><H3 ID="rdf:#$ZvPhC3">Mozilla Firefox</H3> + <DL><p> + <DT><A HREF="http://www.mozilla.com/en-US/firefox/help/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$22iCK1">Help and Tutorials</A> + <DT><A HREF="http://www.mozilla.com/en-US/firefox/customize/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$32iCK1">Customize Firefox</A> + <DT><A HREF="http://www.mozilla.com/en-US/firefox/community/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$42iCK1">Get Involved</A> + <DT><A HREF="http://www.mozilla.com/en-US/about/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$52iCK1">About Us</A> + </DL><p> + <DT><A HREF="http://portableapps.com/" ADD_DATE="1133305361" LAST_VISIT="1152158207" LAST_MODIFIED="1134124795" ICON="data:image/x-icon;base64,AAABAAIAEBAAAAEACABoBQAAJgAAABAQAAABACAAaAQAAI4FAAAoAAAAEAAAACAAAAABAAgAAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGFcMAB4dVEAm5h/AKajjACloo0AnJiAAHp1UwBgWy0AX18fAHVyTQCzr54A39zXAOTh3QDm5OAA5+ThAOXi3gDh3tkAtbGgAHdyUABMTBkAfHhXAMnGvQDV0cwA1dLMAMrHvgB+elkATEwzAHl2UwDEwbcAxMC4AMG9swC4tKcAuraqAHBsSABfWi8AwsCxAMO/tgC2saYAtbClAKynmAC3s6YAx8S4ANXTygDm5d8A/f38AM/MxQCYk34AYl0xAGxnQgDo5uIAubWpAKijlACnopMAoJuHAN3c0wD///8A1dPMAKeikgBtaEMAeXRVAOrp5QCblYMAjIduAO3t6ADg3tgAenVWAHhzUwDh39oAx8S5AI+IcwCYk3wA/v7+AO7t6gB6dFUAd3JSAMvJvwDu7ekAhX9mAIN9ZAB/eF0A2NfNAMXCtgDz8vAAiIJrAHlzVAB2cVEApaKSAMbEuAB9d10Ae3VaAHdxUwC4taMA09HJAH54YACNiHQAiINvAHl0UwBuaUMAfnlgAOjn4wDk494AwsCzAN3c1ACAemMAeHJZAH54XwBvbEUAYFszAHt2VgCNiXEA+fn4AOzr5wCBfGIAb2pMAH55WQBhXDMAb2pEAHhzUQCMiG0A7u7qAM/NwQB0bk0AZ2E9AHVxSwB6dVEAaGI8AJGOcgCcmX8AfHdWAGNdNQB7d1MAd3NMAFxcLgBwbUcAg39bAHl0TgBiXDMAYVsxA Hl0TwCFgV4Acm5IAFVVKgBdWDEAc29IAIiEYACFgV0AiIRhAHRwSQBcWDMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAkJGSjJOUAAAAAAAAAACGh4iJioqJi4yNAAAAAAB8fX5/gIGCgoKCg4QAAAB1dnd4ODhIeXp7e3sHawAAbW5vODg4ODhwcXJycnMAYmNkOGVmZzg4OD1oaWlqa1ZXOFhZWltcODg4XV5fYGFLTE1OT09PUFE4OEhSU1RVQ0RFRkZGRkZHSDg4OElGSjw9ID4+Pj4+P0A4ODhBPkIxMjM0NDQ1Njc4ODg4OTo7ACQlJiYmJygpKissLS4vAAAcHR4eHh4eHh4eHyAhIgAAABUWFxgYGBgYGBcZGgAAAAAACgsMDQ4PEBESEwAAAAAAAAAAAgMEBQYHAAAAAAD4HwAA4AcAAMADAACAAQAAgA EAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIABAACAAQAAwAMAAOAHAAD4HwAAKAAAABAAAAAgAAAAAQAgAAAAAABABAAAIi4AACIuAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABdWDE0c29Im4iEYN2FgV38hYFe/IiEYd90cEmdXFgzNwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAExMMwpwbUeeg39b/nl0Tv9iXDP/YVsx/2FbMf9iXDP/eXRP/4WBXv5ybkiiVVUqDAAAAAAAAAAAAAAAAExMGQp1cUvDenVR/2hiPP+RjnL/nJl//3x3Vv9jXTX/Y101/2NdNf9jXTX/e3dT/3dzTMdcXC4LAAAAAAAAAABvakSceHNR/4yIbf/u7ur////////////+/v7/z83B/3RuTf9nYT3/Z2E9/2dhPf96dVP/b2xFogAAAABgWzMye3ZW/Y2Jcf/5+fj////////////////////////////s6+f/gXxi/29qTP9vakz/b2pM/355Wf5hXDM3bmlDmH55YP/o5+P//////+Tj3v/CwLP/3dzU/////////////////+rp5f+AemP/eHJZ/3hyWf9+eF//b2xFnnZxUdmlopL//////8bEuP99d13/e3Va/3dxU/+4taP/////////////////09HJ/354YP+NiHT/iINv/3l0U993clL5y8m//+7t6f+Ff2b/g31k/4N9ZP+DfWT/f3hd/9jXzf////////////7+/v/Fwrb/8/Lw/4iCa/95c1T9eHNT+eHf2v/HxLn/j4hz/4+Ic/+PiHP/j4hz/4+Ic/+Yk3z//v7+/////////////////+7t6v+PiHP/enRV/Hl0Vdjq6eX/uLSn/5uVg/+blYP/m5WD/5uVg/+blYP/jIdu/+3t6P/////////////////g3tj/m5WD/3p1Vt5sZ0KW6Obi/7m1qf+oo5T /qKOU/6ijlP+nopP/oJuH/93c0///////////////////////1dPM/6eikv9taEOcX1ovMMLAsf3Dv7b/trGm/7axpv+2sab/tbCl/6ynmP+3s6b/x8S4/9XTyv/m5d///f38/8/Mxf+Yk37+Yl0xNAAAAAB5dlOZxMG3/8TAuP/EwLj/xMC4/8TAuP/EwLj/xMC4/8TAuP/EwLj/wb2z/7i0p/+6tqr/cGxIngAAAAAAAAAAX18fCHx4V8DJxr3/1dHM/9XSzP/V0sz/1dLM/9XSzP/V0sz/1dLM/9XRzP/Kx77/fnpZxExMMwoAAAAAAAAAAAAAAABfXx8IdXJNmLOvnv3f3Nf/5OHd/+bk4P/n5OH/5eLe/+He2f+1saD9d3JQnExMGQoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABhXDAveHVRlpuYf9imo4z4paKN+ZyYgNl6dVOYYFstMgAAAAAAAAAAAAAAAAAAAADwDwAAwAMAAIABAACAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAQAAgAH//8AD///wD///" LAST_CHARSET="UTF-8" ID="rdf:#$fzAgJ">PortableApps.com</A> +</DL><p> diff --git a/build-scripts/config/firefox-portable/Data/profile/prefs.js b/build-scripts/config/firefox-portable/Data/profile/prefs.js new file mode 100644 index 0000000..13fda1f --- /dev/null +++ b/build-scripts/config/firefox-portable/Data/profile/prefs.js @@ -0,0 +1,174 @@ +# Mozilla User Preferences + +/* Do not edit this file. + * + * If you make changes to this file while the application is running, + * the changes will be overwritten when the application exits. + * + * To make a manual change to preferences, you can visit the URL about:config + * For more information, see http://www.mozilla.org/unix/customizing.html#prefs + */ + +user_pref("app.update.auto", false); +user_pref("app.update.enabled", false); +user_pref("app.update.lastUpdateTime.addon-background-update-timer", 1216566538); +user_pref("app.update.lastUpdateTime.background-update-timer", 1216566535); +user_pref("app.update.lastUpdateTime.blocklist-background-update-timer", 1216566538); +user_pref("app.update.lastUpdateTime.microsummary-generator-update-timer", 1232574822); +user_pref("app.update.lastUpdateTime.search-engine-update-timer", 1216566539); +user_pref("browser.bookmarks.livemark_refresh_seconds", 31536000); +user_pref("browser.cache.disk.capacity", 0); +user_pref("browser.cache.disk.enable", false); +user_pref("browser.cache.disk.smart_size.enabled", false); +user_pref("browser.cache.disk.smart_size.first_run", false); +user_pref("browser.cache.offline.enable", false); +user_pref("browser.chrome.favicons", false); +user_pref("browser.chrome.image_icons.max_size", 0); +user_pref("browser.chrome.site_icons", false); +user_pref("browser.download.manager.retention", 1); +user_pref("browser.download.useDownloadDir", false); +user_pref("browser.formfill.enable", false); +user_pref("browser.history_expire_days.mirror", 0); +user_pref("browser.microsummary.updateGenerators", false); +user_pref("browser.migration.version", 5); +user_pref("browser.places.importBookmarksHTML", false); +user_pref("browser.places.importDefaults", false); +user_pref("browser.places.leftPaneFolderId", -1); +user_pref("browser.places.migratePostDataAnnotations", false); +user_pref("browser.places.smartBookmarksVersion", 2); +user_pref("browser.places.updateRecentTagsUri", false); +user_pref("browser.preferences.advanced.selectedTabIndex", 0); +user_pref("browser.privatebrowsing.autostart", true); +user_pref("browser.rights.3.shown", true); +user_pref("browser.safebrowsing.enabled", false); +user_pref("browser.safebrowsing.malware.enabled", false); +user_pref("browser.search.suggest.enabled", false); +user_pref("browser.search.update", false); +user_pref("browser.sessionstore.privacy_level", 2); +user_pref("browser.sessionstore.resume_session_once", true); +user_pref("browser.shell.checkDefaultBrowser", false); +user_pref("browser.startup.homepage", "https://check.torproject.org/?lang=en-US&small=1"); +user_pref("browser.startup.homepage_override.buildID", "20110325121920"); +user_pref("browser.startup.homepage_override.mstone", "rv:2.0"); +user_pref("browser.urlbar.autocomplete.enabled", false); +user_pref("browser.zoom.siteSpecific", false); +user_pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); +user_pref("capability.policy.maonoscript.sites", "addons.mozilla.org about: about:addons about:blank about:blocked about:certerror about:config about:crashes about:credits about:home about:neterror about:plugins about:privatebrowsing about:sessionrestore chrome: resource:"); +user_pref("dom.event.contextmenu.enabled", false); +user_pref("dom.storage.enabled", false); +user_pref("extensions.bootstrappedAddons", "{}"); +user_pref("extensions.bprivacy.DataDir", "/Users/erinn/Library/Preferences/Macromedia"); +user_pref("extensions.bprivacy.donotaskforfolder", true); +user_pref("extensions.bprivacy.donotaskonexit", true); +user_pref("extensions.bprivacy.initiated", true); +user_pref("extensions.checkCompatibility.4.*", false); +user_pref("extensions.checkUpdateSecurity", true); +user_pref("extensions.databaseSchema", 3); +user_pref("extensions.enabledAddons", "https-everywhere@eff.org:0.9.9.development.4,{73a6fe31-595d-460b-a920-fcc0f8843232}:2.1.0.3,{d40f5e7b-d2cf-4856-b441-cc613eeffbe3}:1.50,{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}:1.3.3-alpha"); +user_pref("extensions.enabledItems", "langpack-en-US@firefox.mozilla.org:,{73a6fe31-595d-460b-a920-fcc0f8843232}:1.9.9.57,{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}:1.2.4,{972ce4c6-7e08-4474-a285-3208198ce6fd}:3.5.8"); +user_pref("extensions.enabledScopes", 1); +user_pref("extensions.pendingOperations", false); +user_pref("extensions.torbutton.fresh_install", false); +user_pref("extensions.torbutton.http_port", 8118); +user_pref("extensions.torbutton.http_proxy", "127.0.0.1"); +user_pref("extensions.torbutton.https_port", 8118); +user_pref("extensions.torbutton.https_proxy", "127.0.0.1"); +user_pref("extensions.torbutton.locked_mode", true); +user_pref("extensions.torbutton.normal_exit", true); +user_pref("extensions.torbutton.proxies_applied", true); +user_pref("extensions.torbutton.restore_tor", true); +user_pref("extensions.torbutton.saved.auto_update", false); +user_pref("extensions.torbutton.saved.share_proxy_settings", false); +user_pref("extensions.torbutton.saved.socks_version", 5); +user_pref("extensions.torbutton.saved.type", 1); +user_pref("extensions.torbutton.settings_applied", true); +user_pref("extensions.torbutton.socks_host", "127.0.0.1"); +user_pref("extensions.torbutton.socks_port", 9050); +user_pref("extensions.torbutton.startup", true); +user_pref("extensions.torbutton.tor_enabled", true); +user_pref("extensions.torbutton.tor_memory_jar", true); +user_pref("extensions.torbutton.tz_string", "UTC+00:00"); +user_pref("extensions.update.enabled", true); +user_pref("extensions.update.notifyUser", true); +user_pref("general.appname.override", "Netscape"); +user_pref("general.appversion.override", "5.0 (Windows; en-US)"); +user_pref("general.buildID.override", "0"); +user_pref("general.oscpu.override", "Windows NT 6.1"); +user_pref("general.platform.override", "Win32"); +user_pref("general.productSub.override", "20100401"); +user_pref("general.useragent.override", "Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.2.3) Gecko/20100401 Firefox/3.6.3"); +user_pref("general.useragent.vendor", ""); +user_pref("general.useragent.vendorSub", ""); +user_pref("geo.enabled", false); +user_pref("geo.wifi.uri", ""); +user_pref("intl.accept_languages", "en-us, en"); +user_pref("intl.charsetmenu.browser.cache", "UTF-8"); +user_pref("network.cookie.cookieBehavior", 1); +user_pref("network.cookie.lifetimePolicy", 2); +user_pref("network.cookie.prefsMigrated", true); +user_pref("network.hosts.pop_server", ""); +user_pref("network.protocol-handler.external-default", false); +user_pref("network.protocol-handler.external.mailto", false); +user_pref("network.protocol-handler.external.news", false); +user_pref("network.protocol-handler.external.nntp", false); +user_pref("network.protocol-handler.external.snews", false); +user_pref("network.protocol-handler.warn-external.mailto", true); +user_pref("network.protocol-handler.warn-external.news", true); +user_pref("network.protocol-handler.warn-external.nntp", true); +user_pref("network.protocol-handler.warn-external.snews", true); +user_pref("network.proxy.http", "127.0.0.1"); +user_pref("network.proxy.http_port", 8118); +user_pref("network.proxy.no_proxies_on", "127.0.0.1"); +user_pref("network.proxy.socks", "127.0.0.1"); +user_pref("network.proxy.socks_port", 9050); +user_pref("network.proxy.socks_remote_dns", true); +user_pref("network.proxy.ssl", "127.0.0.1"); +user_pref("network.proxy.ssl_port", 8118); +user_pref("network.proxy.type", 1); +user_pref("network.security.ports.banned", "8118,8123,9050,9051"); +user_pref("noscript.ABE.enabled", false); +user_pref("noscript.ABE.notify", false); +user_pref("noscript.ABE.wanIpAsLocal", false); +user_pref("noscript.autoReload", false); +user_pref("noscript.contentBlocker", true); +user_pref("noscript.default", "about:blank about:credits addons.mozilla.org flashgot.net google.com gstatic.com googlesyndication.com informaction.com yahoo.com yimg.com maone.net noscript.net hotmail.com msn.com passport.com passport.net passportimages.com live.com"); +user_pref("noscript.firstRunRedirection", false); +user_pref("noscript.forbidWebGL", true); +user_pref("noscript.global", true); +user_pref("noscript.gtemp", ""); +user_pref("noscript.opacizeObject", 3); +user_pref("noscript.options.tabSelectedIndexes", "5,0,0"); +user_pref("noscript.policynames", ""); +user_pref("noscript.secureCookies", true); +user_pref("noscript.showAllowPage", false); +user_pref("noscript.showBaseDomain", false); +user_pref("noscript.showDistrust", false); +user_pref("noscript.showRecentlyBlocked", false); +user_pref("noscript.showRevokeTemp", false); +user_pref("noscript.showTemp", false); +user_pref("noscript.showTempAllowPage", false); +user_pref("noscript.showTempToPerm", false); +user_pref("noscript.showUntrusted", false); +user_pref("noscript.subscription.lastCheck", -142148139); +user_pref("noscript.temp", ""); +user_pref("noscript.untrusted", ""); +user_pref("places.history.enabled", false); +user_pref("places.history.expiration.transient_current_max_pages", 120795); +user_pref("plugin.disable_full_page_plugin_for_types", "application/asx,video/x-ms-asf-plugin,application/x-mplayer2,video/x-ms-asf,video/x-ms-wm,audio/x-ms-wma,audio/x-ms-wax,video/x-ms-wmv,video/x-ms-wvx,application/x-drm-v2,application/x-drm"); +user_pref("plugin.expose_full_path", true); +user_pref("plugin.scan.4xPluginFolder", false); +user_pref("plugin.scan.Acrobat", "99.0"); +user_pref("plugin.scan.Quicktime", "99.0"); +user_pref("plugin.scan.SunJRE", "99.0"); +user_pref("plugin.scan.WindowsMediaPlayer", "99.0"); +user_pref("plugin.scan.plid.all", false); +user_pref("privacy.sanitize.migrateFx3Prefs", true); +user_pref("security.enable_java", false); +user_pref("signon.rememberSignons", false); +user_pref("urlclassifier.keyupdatetime.https://sb-ssl.google.com/safebrowsing/newkey", 1235166825); +user_pref("urlclassifier.tableversion.goog-black-enchash", "1.55536"); +user_pref("urlclassifier.tableversion.goog-black-url", "1.23256"); +user_pref("urlclassifier.tableversion.goog-white-domain", "1.481"); +user_pref("urlclassifier.tableversion.goog-white-url", "1.371"); +user_pref("xpinstall.whitelist.add", ""); +user_pref("xpinstall.whitelist.add.36", ""); diff --git a/build-scripts/config/firefox-portable/Data/settings/FirefoxPortableSettings.ini b/build-scripts/config/firefox-portable/Data/settings/FirefoxPortableSettings.ini new file mode 100644 index 0000000..6c5a4a2 --- /dev/null +++ b/build-scripts/config/firefox-portable/Data/settings/FirefoxPortableSettings.ini @@ -0,0 +1,5 @@ +[FirefoxPortableSettings] +AgreedToLicense=3 +EnableSessionStore=false +LastDrive=C: +LastDirectory=\Users\erinn\tbb-master.git\build-scripts\build-alpha-windows\FirefoxPortable-6.0.1 diff --git a/build-scripts/config/firefox-portable/FirefoxPortable.ini b/build-scripts/config/firefox-portable/FirefoxPortable.ini new file mode 100644 index 0000000..753c88d --- /dev/null +++ b/build-scripts/config/firefox-portable/FirefoxPortable.ini @@ -0,0 +1,18 @@ +[FirefoxPortable] +FirefoxDirectory=App\firefox +ProfileDirectory=Data\profile +SettingsDirectory=Data\settings +PluginsDirectory=Data\plugins +FirefoxExecutable=firefox.exe +AdditionalParameters= +LocalHomepage= +DisableSplashScreen=true +AllowMultipleInstances=false +DisableIntelligentStart=false +SkipChromeFix=false +SkipCompregFix=false +RunLocally=false +WaitForFirefox=true + +# The above options are explained in the included readme.txt +# This INI file is an example only and is not used unless it is placed as described in the included readme.txt diff --git a/build-scripts/config/firefox-portable/readme.txt b/build-scripts/config/firefox-portable/readme.txt new file mode 100644 index 0000000..14d4ece --- /dev/null +++ b/build-scripts/config/firefox-portable/readme.txt @@ -0,0 +1 @@ +The files in this directory are necessary for Firefox Portable to function. There is normally no need to directly access or alter any of the files within these directories. \ No newline at end of file

1 0

[torbrowser/master] add makefile target for copying a built firefox into the right place
by erinn＠torproject.org 10 Nov '11

10 Nov '11

commit ee1c9c6c89fe22f779c70539e799f483b91987e6 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Nov 10 03:45:33 2011 +0000 add makefile target for copying a built firefox into the right place --- build-scripts/windows.mk | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 50efe76..7d70227 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -124,7 +124,14 @@ build-firefox: cd $(FIREFOX_DIR) && ./patch-any-src.sh cd $(MOZ_BUILD) && cmd.exe /c "start-msvc$(MSVC_VER).bat $(FIREFOX_DIR)" -build-all-binaries: build-zlib build-openssl build-vidalia build-libevent build-tor +copy-firefox: + -rm -rf $(FIREFOX) + -mkdir -p $(FIREFOX) + cp -r config/firefox-portable/* $(FIREFOX) + cp "/c/Program Files (x86)/Microsoft Visual Studio 9.0/VC/redist/x86/Microsoft.VC90.CRT/"msvc*90.dll $(FIREFOX)/App/Firefox + cp -r $(FIREFOX_DIR)/obj-*/dist/bin/* $(FIREFOX)/App/Firefox + +build-all-binaries: build-zlib build-openssl build-vidalia build-libevent build-tor build-firefox copy-firefox echo "If we're here, we've done something right." ## Location of compiled libraries

1 0

[torbrowser/maint-2.2] Added new target to patch mozilla-build as needed. Added support for mozilla-build in the build-firefox target
by erinn＠torproject.org 10 Nov '11

10 Nov '11

commit 2b9f333f55a32e46dc520c03b0ab94a6fa1bceda Author: Shondoit Walker <shondoit(a)gmail.com> Date: Wed Nov 9 22:39:57 2011 +0100 Added new target to patch mozilla-build as needed. Added support for mozilla-build in the build-firefox target --- build-scripts/windows.mk | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index cdfd754..b79d2e4 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -56,6 +56,9 @@ VIRUSSCAN=$(PYTHON) $(PWD)/virus-scan.py WINRAR="/c/Program Files (x86)/WinRAR/WinRAR.exe" CC=gcc +MSVC_VER=9 +FIREFOX_DIR=/c/mozilla-build/mozilla-release +MOZ_BUILD=/c/mozilla-build ## Location of directory for source unpacking FETCH_DIR=$(PWD)/build-alpha-windows @@ -108,13 +111,18 @@ build-tor: cd $(TOR_DIR) && make cd $(TOR_DIR) && make install -FIREFOX_DIR=/c/mozilla-build/mozilla-release +patch-mozbuild: + cp ../src/current-patches/mozilla-build/start-msvc.patch $(MOZ_BUILD) + cp ../src/current-patches/mozilla-build/guess-msvc-x64.bat $(MOZ_BUILD) + cp patch-mozilla-build.sh $(MOZ_BUILD) + cd $(MOZ_BUILD) && ./patch-mozilla-build.sh $(MSVC_VER) + build-firefox: cp ../src/current-patches/firefox/* $(FIREFOX_DIR) cp patch-any-src.sh $(FIREFOX_DIR) cp $(CONFIG_SRC)/dot_mozconfig $(FIREFOX_DIR)/mozconfig cd $(FIREFOX_DIR) && ./patch-any-src.sh -# cmd /c C:/mozilla-build/start-msvc9 + cd $(MOZ_BUILD) && cmd.exe /c "start-msvc$(MSVC_VER).bat $(FIREFOX_DIR)" build-all-binaries: build-zlib build-openssl build-vidalia build-libevent build-tor echo "If we're here, we've done something right."

1 0

[torbrowser/maint-2.2] Added cleaning before retrieving source packages.
by erinn＠torproject.org 10 Nov '11

10 Nov '11

commit aff263156531d6ff39fd0db3affe3cfc2bf1cf2d Author: Shondoit Walker <shondoit(a)gmail.com> Date: Fri Nov 4 16:34:13 2011 +0100 Added cleaning before retrieving source packages. --- build-scripts/versions.mk | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 38fc45b..cbcca64 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -52,28 +52,35 @@ fetch-source-osx: fetch-zlib fetch-openssl fetch-vidalia fetch-libevent fetch-to -mkdir $(FETCH_DIR) fetch-zlib: + -rm -f $(FETCH_DIR)/$(ZLIB_PACKAGE) $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(ZLIB_URL) fetch-libpng: + -rm -f $(FETCH_DIR)/$(LIBPNG_PACKAGE) $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(LIBPNG_URL) fetch-qt: + -rm -f $(FETCH_DIR)/$(QT_PACKAGE) $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(QT_URL) fetch-openssl: + -rm -f $(FETCH_DIR)/$(OPENSSL_PACKAGE) $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(OPENSSL_URL) fetch-vidalia: + -rm -f $(FETCH_DIR)/$(VIDALIA_PACKAGE) $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(VIDALIA_URL) fetch-libevent: + -rm -f $(FETCH_DIR)/$(LIBEVENT_PACKAGE) $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(LIBEVENT_URL) fetch-tor: + -rm -f $(FETCH_DIR)/$(TOR_PACKAGE) $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(TOR_URL) fetch-firefox: - -rm -rf $(FETCH_DIR)/mozilla-release + -rm -f $(FETCH_DIR)/$(FIREFOX_PACKAGE) $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(FIREFOX_URL) unpack-source: unpack-zlib unpack-openssl unpack-libpng unpack-qt unpack-vidalia unpack-libevent unpack-tor unpack-firefox

1 0

[torbrowser/maint-2.2] Patching for mozilla-build. start-msvc.patch will change mozilla-build to use our altered guess-msvc.bat and perform 'make -f client.mk' if a folder is given. guess-msvc-x64.bat is the standard guess-msvc.bat changed to be 64-bit aware. It redirects the registry queries to the required view of the registry.
by erinn＠torproject.org 10 Nov '11

10 Nov '11

commit aec6689de7305d025a38fe0af7caa357b5096b96 Author: Shondoit Walker <shondoit(a)gmail.com> Date: Wed Nov 9 22:49:02 2011 +0100 Patching for mozilla-build. start-msvc.patch will change mozilla-build to use our altered guess-msvc.bat and perform 'make -f client.mk' if a folder is given. guess-msvc-x64.bat is the standard guess-msvc.bat changed to be 64-bit aware. It redirects the registry queries to the required view of the registry. --- build-scripts/patch-mozilla-build.sh | 6 + .../mozilla-build/guess-msvc-x64.bat | 215 ++++++++++++++++++++ src/current-patches/mozilla-build/start-msvc.patch | 21 ++ 3 files changed, 242 insertions(+), 0 deletions(-) diff --git a/build-scripts/patch-mozilla-build.sh b/build-scripts/patch-mozilla-build.sh new file mode 100644 index 0000000..ba64629 --- /dev/null +++ b/build-scripts/patch-mozilla-build.sh @@ -0,0 +1,6 @@ +#!/bin/sh +#Patch the start file for the specified version. + +MSVC_VER=$1 + +patch start-msvc$MSVC_VER.bat -t < start-msvc.patch || exit 1 diff --git a/src/current-patches/mozilla-build/guess-msvc-x64.bat b/src/current-patches/mozilla-build/guess-msvc-x64.bat new file mode 100644 index 0000000..71a1f60 --- /dev/null +++ b/src/current-patches/mozilla-build/guess-msvc-x64.bat @@ -0,0 +1,215 @@ +REM -*- Mode: fundamental; tab-width: 8; indent-tabs-mode: 1 -*- +@ECHO OFF + +set CYGWIN= +if not defined MOZ_NO_RESET_PATH ( + set PATH=%SystemRoot%\System32;%SystemRoot%;%SystemRoot%\System32\Wbem +) + +REM if DISPLAY is set, rxvt attempts to load libX11.dll and fails to start +REM (see mozilla bug 376828) +SET DISPLAY= + +SET INCLUDE= +SET LIB= + +IF EXIST %WINDIR%\SysNative\reg.exe ( + SET REGNATIVE=%WINDIR%\SysNative\reg.Exe + SET REG32=%WINDIR%\System32\reg.exe +) ELSE ( + SET REGNATIVE=%WINDIR%\System32\reg.exe + IF EXIST %WINDIR%\SysWOW64\reg.exe ( + SET REG32=%WINDIR%\SysWOW64\reg.exe + ) ELSE ( + SET REG32=%WINDIR%\System32\reg.exe + ) +) + +SET MSVCROOTKEY=HKLM\SOFTWARE\Microsoft\VisualStudio +SET MSVCEXPROOTKEY=HKLM\SOFTWARE\Microsoft\VCExpress + +SET MSVC6KEY=%MSVCROOTKEY%\6.0\Setup\Microsoft Visual C++ +SET MSVC71KEY=%MSVCROOTKEY%\7.1\Setup\VC +SET MSVC8KEY=%MSVCROOTKEY%\8.0\Setup\VC +SET MSVC8EXPRESSKEY=%MSVCEXPROOTKEY%\8.0\Setup\VC +SET MSVC9KEY=%MSVCROOTKEY%\9.0\Setup\VC +SET MSVC9EXPRESSKEY=%MSVCEXPROOTKEY%\9.0\Setup\VC +SET MSVC10KEY=%MSVCROOTKEY%\10.0\Setup\VC +SET MSVC10EXPRESSKEY=%MSVCEXPROOTKEY%\10.0\Setup\VC + +REM First see if we can find MSVC, then set the variable +REM NOTE: delims=<tab><space> +REM NOTE: run the initial REQ QUERY outside of the if() to set ERRORLEVEL correctly + +%REG32% QUERY "%MSVC6KEY%" /v ProductDir >nul 2>nul +if "%VC6DIR%"=="" ( + IF %ERRORLEVEL% EQU 0 ( + FOR /F "tokens=2* delims= " %%A IN ('%REG32% QUERY "%MSVC6KEY%" /v ProductDir') DO SET VC6DIR=%%B + ) +) + +%REG32% QUERY "%MSVC71KEY%" /v ProductDir >nul 2>nul +if "%VC71DIR%"=="" ( + IF %ERRORLEVEL% EQU 0 ( + FOR /F "tokens=2* delims= " %%A IN ('%REG32% QUERY "%MSVC71KEY%" /v ProductDir') DO SET VC71DIR=%%B + ) +) + +%REG32% QUERY "%MSVC8KEY%" /v ProductDir >nul 2>nul +if "%VC8DIR%"=="" ( + IF %ERRORLEVEL% EQU 0 ( + FOR /F "tokens=2* delims= " %%A IN ('%REG32% QUERY "%MSVC8KEY%" /v ProductDir') DO SET VC8DIR=%%B + ) +) + +%REG32% QUERY "%MSVC8EXPRESSKEY%" /v ProductDir >nul 2>nul +if "%VC8EXPRESSDIR%"=="" ( + IF %ERRORLEVEL% EQU 0 ( + FOR /F "tokens=2* delims= " %%A IN ('%REG32% QUERY "%MSVC8EXPRESSKEY%" /v ProductDir') DO SET VC8EXPRESSDIR=%%B + ) +) + +%REG32% QUERY "%MSVC9KEY%" /v ProductDir >nul 2>nul +if "%VC9DIR%"=="" ( + REM Newer SDKs (6.1, 7.0) install the VC9 compilers and set this key, + REM but they're functionally equivalent to the VC9 Express compilers. + IF %ERRORLEVEL% EQU 0 ( + FOR /F "tokens=2* delims= " %%A IN ('%REG32% QUERY "%MSVC9KEY%" /v ProductDir') DO SET TEMPVC9DIR=%%B + ) +) + +REM We'll double-check for a VC9 Pro install here per the comment above. +%REG32% QUERY "%MSVCROOTKEY%\9.0\InstalledProducts\Microsoft Visual C++" >nul 2>nul +if NOT "%TEMPVC9DIR%"=="" ( + IF %ERRORLEVEL% EQU 0 ( + SET "VC9DIR=%TEMPVC9DIR%" + ) ELSE ( + SET "VC9EXPRESSDIR=%TEMPVC9DIR%" + ) +) + +%REG32% QUERY "%MSVC9EXPRESSKEY%" /v ProductDir >nul 2>nul +if "%VC9EXPRESSDIR%"=="" ( + IF %ERRORLEVEL% EQU 0 ( + FOR /F "tokens=2* delims= " %%A IN ('%REG32% QUERY "%MSVC9EXPRESSKEY%" /v ProductDir') DO SET VC9EXPRESSDIR=%%B + ) +) + +%REG32% QUERY "%MSVC10KEY%" /v ProductDir >nul 2>nul +if "%VC10DIR%"=="" ( + IF %ERRORLEVEL% EQU 0 ( + FOR /F "tokens=2* delims= " %%A IN ('%REG32% QUERY "%MSVC10KEY%" /v ProductDir') DO SET VC10DIR=%%B + ) +) + +%REG32% QUERY "%MSVC10EXPRESSKEY%" /v ProductDir >nul 2>nul +if "%VC8EXPRESSDIR%"=="" ( + IF %ERRORLEVEL% EQU 0 ( + FOR /F "tokens=2* delims= " %%A IN ('%REG32% QUERY "%MSVC10EXPRESSKEY%" /v ProductDir') DO SET VC10EXPRESSDIR=%%B + ) +) + +REM Look for Installed SDKs: +SET SDKROOTKEY=HKLM\SOFTWARE\Microsoft\MicrosoftSDK\InstalledSDKs +SET SDK2003SP1KEY=%SDKROOTKEY%\8F9E5EF3-A9A5-491B-A889-C58EFFECE8B3 +SET SDK2003SP2KEY=%SDKROOTKEY%\D2FF9F89-8AA2-4373-8A31-C838BF4DBBE1 +SET SDK6KEY=HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v6.0 +REM 6.0A comes with Visual C++ 2008. If you have 6.0 installed, even +REM the express edition will update you to 6.0A +SET SDK6AKEY=HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v6.0A +SET SDK61KEY=HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v6.1 +SET SDK7KEY=HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0 + +REM Just a base value to compare against +SET SDKVER=0 +SET SDKMINORVER=0 + +REM Support a maximum version of the Windows SDK to use, to support older +REM branches and older compilers. (Note that this is unrelated to the configure +REM option on which version of Windows to support.) +IF NOT DEFINED MOZ_MAXWINSDK ( + REM Maximum WinSDK version to use; 2 digits for major, 2 for minor, 2 for revision + REM Revivsion is A = 01, B = 02, etc. + SET MOZ_MAXWINSDK=999999 +) + + +%REGNATIVE% QUERY "%SDK7KEY%" /v InstallationFolder >nul 2>nul +if "%SDKDIR%"=="" IF %MOZ_MAXWINSDK% GEQ 70000 ( + IF %ERRORLEVEL% EQU 0 ( + FOR /F "tokens=2* usebackq delims= " %%A IN (`%REGNATIVE% QUERY "%SDK7KEY%" /v InstallationFolder`) DO SET SDKDIR=%%B + SET SDKVER=7 + ) +) + +%REGNATIVE% QUERY "%SDK61KEY%" /v InstallationFolder >nul 2>nul +if "%SDKDIR%"=="" IF %MOZ_MAXWINSDK% GEQ 60100 ( + IF %ERRORLEVEL% EQU 0 ( + FOR /F "tokens=2* usebackq delims= " %%A IN (`%REGNATIVE% QUERY "%SDK61KEY%" /v InstallationFolder`) DO SET SDKDIR=%%B + SET SDKVER=6 + SET SDKMINORVER=1 + ) +) + +%REGNATIVE% QUERY "%SDK6AKEY%" /v InstallationFolder >nul 2>nul +if "%SDKDIR%"=="" IF %MOZ_MAXWINSDK% GEQ 60001 ( + IF %ERRORLEVEL% EQU 0 ( + FOR /F "tokens=2* usebackq delims= " %%A IN (`%REGNATIVE% QUERY "%SDK6AKEY%" /v InstallationFolder`) DO SET SDKDIR=%%B + SET SDKVER=6 + REM insane, I know! + SET SDKMINORVER=0A + ) +) + +%REGNATIVE% QUERY "%SDK6KEY%" /v InstallationFolder >nul 2>nul +if "%SDKDIR%"=="" IF %MOZ_MAXWINSDK% GEQ 60000 ( + IF %ERRORLEVEL% EQU 0 ( + FOR /F "tokens=2* usebackq delims= " %%A IN (`%REGNATIVE% QUERY "%SDK6KEY%" /v InstallationFolder`) DO SET SDKDIR=%%B + SET SDKVER=6 + ) +) + +REM The Vista SDK (6.0 and 6.0A) ships with a VC8 Express install + +if "%SDKVER%"=="6" ( + if "%VC8EXPRESSDIR%"=="" ( + SET VC8EXPRESSDIR=%SDKDIR%VC\ + ) +) + +%REGNATIVE% QUERY "%SDK2003SP2KEY%" /v "Install Dir" >nul 2>nul +if "%PSDKDIR%"=="" IF %MOZ_MAXWINSDK% GEQ 50000 ( + IF %ERRORLEVEL% EQU 0 ( + FOR /F "tokens=3* delims= " %%A IN ('%REGNATIVE% QUERY "%SDK2003SP2KEY%" /v "Install Dir"') DO SET PSDKDIR=%%B + REM arbitrary, but works for me + SET PSDKVER=5 + ) +) + +%REGNATIVE% QUERY "%SDK2003SP1KEY%" /v "Install Dir" >nul 2>nul +if "%PSDKDIR%"=="" IF %MOZ_MAXWINSDK% GEQ 40000 ( + IF %ERRORLEVEL% EQU 0 ( + FOR /F "tokens=3* delims= " %%A IN ('%REGNATIVE% QUERY "%SDK2003SP1KEY%" /v "Install Dir"') DO SET PSDKDIR=%%B + SET PSDKVER=4 + ) +) + +if defined %VC6DIR% (ECHO Visual C++ 6 directory: %VC6DIR%) +if defined %VC71DIR% (ECHO Visual C++ 7.1 directory: %VC71DIR%) +if defined %VC8DIR% (ECHO Visual C++ 8 directory: %VC8DIR%) +if defined %VC8EXPRESSDIR% (ECHO Visual C++ 8 Express directory: %VC8EXPRESSDIR%) +if defined %VC9DIR% (ECHO Visual C++ 9 directory: %VC9DIR%) +if defined %VC9EXPRESSDIR% (ECHO Visual C++ 9 Express directory: %VC9EXPRESSDIR%) +if defined %VC10DIR% (ECHO Visual C++ 10 directory: %VC10DIR%) +if defined %VC10EXPRESSDIR% (ECHO Visual C++ 10 Express directory: %VC10EXPRESSDIR%) +if "%SDKDIR%"=="" ( + SET SDKDIR=%PSDKDIR% + SET SDKVER=%PSDKVER% +) else ( + ECHO Windows SDK directory: %SDKDIR% + ECHO Windows SDK version: %SDKVER%.%SDKMINORVER% +) +if not "%PSDKDIR%"=="" ( + ECHO Platform SDK directory: %PSDKDIR% + ECHO Platform SDK version: %PSDKVER% +) diff --git a/src/current-patches/mozilla-build/start-msvc.patch b/src/current-patches/mozilla-build/start-msvc.patch new file mode 100644 index 0000000..6d70b86 --- /dev/null +++ b/src/current-patches/mozilla-build/start-msvc.patch @@ -0,0 +1,21 @@ +--- start-msvcx.bat.org 2010-08-17 23:01:48 +0200 ++++ start-msvcx.bat 2011-11-04 15:28:02 +0100 +@@ -7,7 +7,7 @@ + echo "Mozilla tools directory: %MOZBUILDDIR%" + + REM Get MSVC paths +-call "%MOZBUILDDIR%guess-msvc.bat" ++call "%MOZBUILDDIR%guess-msvc-x64.bat" + + REM Use the "new" moztools-static + set MOZ_TOOLS=%MOZBUILDDIR%moztools +@@ -84,4 +84,8 @@ + ) + ) + +-start /d "%USERPROFILE%" "" "%MOZILLABUILD%"\msys\bin\bash --login -i ++if "%1"=="" ( ++ start /d "%USERPROFILE%" "" "%MOZILLABUILD%"\msys\bin\bash --login -i" ++) else ( ++ cd "%USERPROFILE%" && "%MOZILLABUILD%"\msys\bin\bash --login -i -c "cd "%1" && make -f client.mk" ++)

1 0

[torbrowser/maint-2.2] Merge branch 'clean-versions' into maint-2.2
by erinn＠torproject.org 10 Nov '11

10 Nov '11

commit 872c450fcf862f803ca36f624226246d5d8b87a1 Merge: aec6689 aff2631 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Nov 10 02:58:56 2011 +0000 Merge branch 'clean-versions' into maint-2.2 build-scripts/versions.mk | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-)

1 0

[torbrowser/maint-2.2] update windows mozilla-build directory to new location
by erinn＠torproject.org 10 Nov '11

10 Nov '11

commit 0e96ca2e08f5604a876fd7e65be7b5072b21ff5d Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Nov 10 02:59:12 2011 +0000 update windows mozilla-build directory to new location --- build-scripts/windows.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index b79d2e4..50efe76 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -57,8 +57,8 @@ WINRAR="/c/Program Files (x86)/WinRAR/WinRAR.exe" CC=gcc MSVC_VER=9 -FIREFOX_DIR=/c/mozilla-build/mozilla-release -MOZ_BUILD=/c/mozilla-build +FIREFOX_DIR=/c/build/mozilla-build/mozilla-release +MOZ_BUILD=/c/build/mozilla-build ## Location of directory for source unpacking FETCH_DIR=$(PWD)/build-alpha-windows

1 0

[torbrowser/maint-2.3] update windows mozilla-build directory to new location
by erinn＠torproject.org 10 Nov '11

10 Nov '11

commit 0e96ca2e08f5604a876fd7e65be7b5072b21ff5d Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Nov 10 02:59:12 2011 +0000 update windows mozilla-build directory to new location --- build-scripts/windows.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index b79d2e4..50efe76 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -57,8 +57,8 @@ WINRAR="/c/Program Files (x86)/WinRAR/WinRAR.exe" CC=gcc MSVC_VER=9 -FIREFOX_DIR=/c/mozilla-build/mozilla-release -MOZ_BUILD=/c/mozilla-build +FIREFOX_DIR=/c/build/mozilla-build/mozilla-release +MOZ_BUILD=/c/build/mozilla-build ## Location of directory for source unpacking FETCH_DIR=$(PWD)/build-alpha-windows

1 0

[torbrowser/maint-2.3] Added new target to patch mozilla-build as needed. Added support for mozilla-build in the build-firefox target
by erinn＠torproject.org 10 Nov '11

10 Nov '11

commit 2b9f333f55a32e46dc520c03b0ab94a6fa1bceda Author: Shondoit Walker <shondoit(a)gmail.com> Date: Wed Nov 9 22:39:57 2011 +0100 Added new target to patch mozilla-build as needed. Added support for mozilla-build in the build-firefox target --- build-scripts/windows.mk | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index cdfd754..b79d2e4 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -56,6 +56,9 @@ VIRUSSCAN=$(PYTHON) $(PWD)/virus-scan.py WINRAR="/c/Program Files (x86)/WinRAR/WinRAR.exe" CC=gcc +MSVC_VER=9 +FIREFOX_DIR=/c/mozilla-build/mozilla-release +MOZ_BUILD=/c/mozilla-build ## Location of directory for source unpacking FETCH_DIR=$(PWD)/build-alpha-windows @@ -108,13 +111,18 @@ build-tor: cd $(TOR_DIR) && make cd $(TOR_DIR) && make install -FIREFOX_DIR=/c/mozilla-build/mozilla-release +patch-mozbuild: + cp ../src/current-patches/mozilla-build/start-msvc.patch $(MOZ_BUILD) + cp ../src/current-patches/mozilla-build/guess-msvc-x64.bat $(MOZ_BUILD) + cp patch-mozilla-build.sh $(MOZ_BUILD) + cd $(MOZ_BUILD) && ./patch-mozilla-build.sh $(MSVC_VER) + build-firefox: cp ../src/current-patches/firefox/* $(FIREFOX_DIR) cp patch-any-src.sh $(FIREFOX_DIR) cp $(CONFIG_SRC)/dot_mozconfig $(FIREFOX_DIR)/mozconfig cd $(FIREFOX_DIR) && ./patch-any-src.sh -# cmd /c C:/mozilla-build/start-msvc9 + cd $(MOZ_BUILD) && cmd.exe /c "start-msvc$(MSVC_VER).bat $(FIREFOX_DIR)" build-all-binaries: build-zlib build-openssl build-vidalia build-libevent build-tor echo "If we're here, we've done something right."

1 0

[torbrowser/maint-2.3] Merge branch 'clean-versions' into maint-2.2
by erinn＠torproject.org 10 Nov '11

10 Nov '11

commit 872c450fcf862f803ca36f624226246d5d8b87a1 Merge: aec6689 aff2631 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Nov 10 02:58:56 2011 +0000 Merge branch 'clean-versions' into maint-2.2 build-scripts/versions.mk | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-)

1 0