March 2012 - tor-commits - lists.torproject.org

[torbrowser/maint-2.3] W32/Lin: Speed up firefox compile
by erinn＠torproject.org 08 Mar '12

08 Mar '12

commit a09e18edec196e9cac154a9dbd282ca9b1ffea54 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Feb 9 03:52:07 2012 +0100 W32/Lin: Speed up firefox compile Making make silent is a big win on Windows, and parallel compiles are good everywhere --- build-scripts/config/dot_mozconfig | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/build-scripts/config/dot_mozconfig b/build-scripts/config/dot_mozconfig index 9333a6f..66196ae 100755 --- a/build-scripts/config/dot_mozconfig +++ b/build-scripts/config/dot_mozconfig @@ -2,6 +2,7 @@ mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ mk_add_options MOZ_APP_DISPLAYNAME=TorBrowser +mk_add_options MOZ_MAKE_FLAGS="-s --no-print-directory -j2" ac_add_options --enable-optimize ac_add_options --enable-strip

1 0

[torbrowser/maint-2.3] Remove blank lines from Makefiles
by erinn＠torproject.org 08 Mar '12

08 Mar '12

commit 1e64745577def96f42c5ac7952ed6ff6cdd6c947 Author: Patrick Mézard <patrick(a)mezard.eu> Date: Sun Feb 12 12:04:33 2012 +0100 Remove blank lines from Makefiles Unnecessary and make emacs warn and prompt before saving. --- build-scripts/windows.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index d58203d..423b88c 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -324,7 +324,7 @@ configure-apps: ## Set up alternate launcher mv $(DEST)/FirefoxPortable/App/Firefox/firefox.exe $(DEST)/FirefoxPortable/App/Firefox/tbb-firefox.exe - + ## Configure FirefoxPortable cp config/FirefoxPortable.ini $(DEST)/FirefoxPortable cp config/FirefoxPortableSettings.ini $(DEST)/FirefoxPortable/Data/settings

1 0

[torbrowser/maint-2.3] Remove obsolete prefs.js files
by erinn＠torproject.org 08 Mar '12

08 Mar '12

commit 8303d2a8299ccffad63fb71da668dbafe387386c Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Feb 15 16:22:42 2012 +0100 Remove obsolete prefs.js files These aren't used currently, now we use no-polipo-4.0.js and windows-4.0.js. We should unify them (ticket 5000) and once that is done rename them to prefs.js. --- build-scripts/config/linux-prefs.js | 157 ------------------------------ build-scripts/config/no-polipo.js | 178 ----------------------------------- build-scripts/config/prefs.js | 176 ---------------------------------- 3 files changed, 0 insertions(+), 511 deletions(-) diff --git a/build-scripts/config/linux-prefs.js b/build-scripts/config/linux-prefs.js deleted file mode 100644 index 81132d3..0000000 --- a/build-scripts/config/linux-prefs.js +++ /dev/null @@ -1,157 +0,0 @@ -# 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", 1269569516); -user_pref("app.update.lastUpdateTime.background-update-timer", 1269569516); -user_pref("app.update.lastUpdateTime.blocklist-background-update-timer", 1269569516); -user_pref("app.update.lastUpdateTime.microsummary-generator-update-timer", 1269569516); -user_pref("app.update.lastUpdateTime.places-maintenance-timer", 1269568932); -user_pref("app.update.lastUpdateTime.search-engine-update-timer", 1269569516); -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.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", 0); -user_pref("browser.history_expire_days.mirror", 0); -user_pref("browser.microsummary.updateGenerators", false); -user_pref("browser.migration.version", 1); -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", 1); -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.shell.checkDefaultBrowser", false); -user_pref("browser.startup.homepage", "https://check.torproject.org/?lang=BUNDLELOCALE&small=1"); -user_pref("browser.startup.homepage_override.mstone", "rv:1.9.1.8"); -user_pref("browser.urlbar.autocomplete.enabled", false); -user_pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -user_pref("capability.policy.maonoscript.sites", "addons.mozilla.org about: about:blank about:blocked about:certerror about:config about:credits 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.checkCompatibility", false); -user_pref("extensions.checkUpdateSecurity", false); -user_pref("extensions.enabledItems", "SHPONKA,{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.lastAppVersion", "3.5.8"); -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.noncrashed", 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.settings_applied", true); -user_pref("extensions.torbutton.socks_host", "127.0.0.1"); -user_pref("extensions.torbutton.socks_port", 9050); -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", false); -user_pref("extensions.update.notifyUser", false); -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 5.1"); -user_pref("general.platform.override", "Win32"); -user_pref("general.productSub.override", "2009021910"); -user_pref("general.useragent.locale", "BUNDLELOCALE"); -user_pref("general.useragent.override", "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.0.7) Gecko/2009021910 Firefox/3.0.7"); -user_pref("general.useragent.vendor", ""); -user_pref("general.useragent.vendorSub", ""); -user_pref("greasemonkey.version", "0.8.20100211.5"); -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.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.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.global", true); -user_pref("noscript.gtemp", ""); -user_pref("noscript.httpsForced", "*twitter.com *facebook.com blog.torproject.org www.torproject.org docs.google.com addons.mozilla.org www.stumbleupon.com"); -user_pref("noscript.httpsForcedExceptions", "www.google.com images.google.com safebrowsing*.google.com maps.google.com code.google.com sorry.google.com news.google.com gitweb.torproject.org metrics.torproject.org exitlist.torproject.org deb.torproject.org"); -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.secureCookiesForced", "*torproject.org *github.com *facebook.com *twitter.com"); -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", -1723345640); -user_pref("noscript.temp", ""); -user_pref("noscript.untrusted", ""); -user_pref("noscript.version", "1.9.9.57"); -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"); diff --git a/build-scripts/config/no-polipo.js b/build-scripts/config/no-polipo.js deleted file mode 100644 index 1abd77d..0000000 --- a/build-scripts/config/no-polipo.js +++ /dev/null @@ -1,178 +0,0 @@ -# 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.offline.enable", false); -user_pref("browser.download.manager.retention", 0); -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.history_expire_days", 0); -user_pref("browser.history_expire_days.mirror", 0); -user_pref("browser.microsummary.updateGenerators", false); -user_pref("browser.download.useDownloadDir", false); -user_pref("browser.formfill.enable", false); -user_pref("browser.migration.version", 1); -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.urlbar.autocomplete.enabled", 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("browser.shell.checkDefaultBrowser", false); -user_pref("browser.startup.homepage", "https://check.torproject.org/?lang=BUNDLELOCALE&small=1"); -user_pref("browser.startup.homepage_override.mstone", "rv:1.9.1.11"); -user_pref("dom.storage.enabled", false); -user_pref("extensions.enabledItems", "SHPONKA,{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", 5); -user_pref("extensions.bprivacy.donotaskforfolder", true); -user_pref("extensions.bprivacy.donotaskonexit", true); -user_pref("extensions.bprivacy.initiated", true); -user_pref("extensions.checkCompatibility", false); -user_pref("extensions.checkUpdateSecurity", false); -user_pref("extensions.lastAppVersion", "3.5.11"); -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.noncrashed", 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.settings_applied", true); -user_pref("extensions.torbutton.socks_host", "127.0.0.1"); -user_pref("extensions.torbutton.socks_port", 9050); -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", false); -user_pref("extensions.update.notifyUser", false); -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.useragent.locale", "BUNDLELOCALE"); -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.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", ""); -user_pref("network.proxy.http_port", 0); -user_pref("network.proxy.ssl", ""); -user_pref("network.proxy.ssl_port", 0); -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.type", 1); -user_pref("network.security.ports.banned", "8118,8123,9050,9051"); -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.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("plugin.scan.4xPluginFolder", false); -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("browser.microsummary.updateGenerators", false); -user_pref("network.hosts.pop_server", ""); -user_pref("browser.sessionstore.privacy_level", 2); -user_pref("browser.chrome.site_icons", false); -user_pref("browser.chrome.favicons", false); -user_pref("browser.chrome.image_icons.max_size", 0); -user_pref("browser.download.manager.retention", 1); -user_pref("browser.send_pings", false); -user_pref("dom.event.contextmenu.enabled", false); -user_pref("browser.urlbar.autocomplete.enabled", false); -user_pref("plugin.expose_full_path", true); -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("browser.history_expire_days", 0); -user_pref("browser.history_expire_days.mirror", 0); -user_pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -user_pref("capability.policy.maonoscript.sites", "addons.mozilla.org about: about:blank about:blocked about:certerror about:config about:credits about:neterror about:plugins about:privatebrowsing about:sessionrestore chrome: resource:"); -user_pref("noscript.ABE.enabled", false); -user_pref("noscript.ABE.notify", 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.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", -1723345640); -user_pref("noscript.temp", ""); -user_pref("noscript.untrusted", ""); -user_pref("noscript.ABE.wanIpAsLocal", false); -user_pref("noscript.version", "2.0.7"); -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("security.ssl.enable_false_start", true); diff --git a/build-scripts/config/prefs.js b/build-scripts/config/prefs.js deleted file mode 100644 index 9ab32b3..0000000 --- a/build-scripts/config/prefs.js +++ /dev/null @@ -1,176 +0,0 @@ -# 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.offline.enable", false); -user_pref("browser.download.manager.retention", 0); -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.history_expire_days", 0); -user_pref("browser.history_expire_days.mirror", 0); -user_pref("browser.microsummary.updateGenerators", false); -user_pref("browser.download.useDownloadDir", false); -user_pref("browser.formfill.enable", false); -user_pref("browser.migration.version", 1); -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.urlbar.autocomplete.enabled", 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("browser.shell.checkDefaultBrowser", false); -user_pref("browser.startup.homepage", "https://check.torproject.org/?lang=BUNDLELOCALE&small=1"); -user_pref("browser.startup.homepage_override.mstone", "rv:1.9.1.11"); -user_pref("dom.storage.enabled", false); -user_pref("extensions.enabledItems", "SHPONKA,{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.bprivacy.donotaskforfolder", true); -user_pref("extensions.bprivacy.donotaskonexit", true); -user_pref("extensions.bprivacy.initiated", true); -user_pref("extensions.checkCompatibility", false); -user_pref("extensions.checkUpdateSecurity", false); -user_pref("extensions.lastAppVersion", "3.5.11"); -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.noncrashed", 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.settings_applied", true); -user_pref("extensions.torbutton.socks_host", "127.0.0.1"); -user_pref("extensions.torbutton.socks_port", 9050); -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", false); -user_pref("extensions.update.notifyUser", false); -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.useragent.locale", "BUNDLELOCALE"); -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.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.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("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.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("plugin.scan.4xPluginFolder", false); -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("browser.microsummary.updateGenerators", false); -user_pref("network.hosts.pop_server", ""); -user_pref("browser.sessionstore.privacy_level", 2); -user_pref("browser.chrome.site_icons", false); -user_pref("browser.chrome.favicons", false); -user_pref("browser.chrome.image_icons.max_size", 0); -user_pref("browser.download.manager.retention", 1); -user_pref("browser.send_pings", false); -user_pref("dom.event.contextmenu.enabled", false); -user_pref("browser.urlbar.autocomplete.enabled", false); -user_pref("plugin.expose_full_path", true); -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("browser.history_expire_days", 0); -user_pref("browser.history_expire_days.mirror", 0); -user_pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -user_pref("capability.policy.maonoscript.sites", "addons.mozilla.org about: about:blank about:blocked about:certerror about:config about:credits about:neterror about:plugins about:privatebrowsing about:sessionrestore chrome: resource:"); -user_pref("noscript.ABE.enabled", false); -user_pref("noscript.ABE.notify", 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.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", -1723345640); -user_pref("noscript.temp", ""); -user_pref("noscript.untrusted", ""); -user_pref("noscript.ABE.wanIpAsLocal", false); -user_pref("noscript.version", "2.0.7"); -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);

1 0

[torbrowser/maint-2.3] OSX: Fix startup message (no, we're not on linux)
by erinn＠torproject.org 08 Mar '12

08 Mar '12

commit 900f968ae38e52ad5741934f285de6e1c7a9197e Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Feb 15 14:45:45 2012 +0100 OSX: Fix startup message (no, we're not on linux) Spotted by pmezard --- src/RelativeLink/RelativeLinkOSX.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/RelativeLink/RelativeLinkOSX.sh b/src/RelativeLink/RelativeLinkOSX.sh index 94f4ed0..e301483 100755 --- a/src/RelativeLink/RelativeLinkOSX.sh +++ b/src/RelativeLink/RelativeLinkOSX.sh @@ -42,6 +42,6 @@ if [ "$DEBUG_TBB" -eq 1 ]; then fi # not in debug mode, run proceed normally -printf "\nLaunching Tor Browser Bundle for Linux in ${HOME}\n" +printf "\nLaunching Tor Browser Bundle for OS X in ${HOME}\n" cd "${HOME}" open "$HOME/Contents/MacOS/Vidalia.app"

1 0

[torbrowser/maint-2.3] Lin: Properly exit after --debug test run
by erinn＠torproject.org 08 Mar '12

08 Mar '12

commit 1a65e8ee1f64afc6fe3f016184160b464bde1f3f Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Feb 15 16:27:11 2012 +0100 Lin: Properly exit after --debug test run --- src/RelativeLink/RelativeLink.sh | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index 692885c..029c30a 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -195,6 +195,7 @@ if [ "${debug}" ]; then ./App/vidalia --loglevel debug --logfile vidalia-debug-log \ --datadir Data/Vidalia/ -style Cleanlooks printf "\nVidalia exited with the following return code: $?\n" + exit fi # not in debug mode, run proceed normally

1 0

[torbrowser/maint-2.3] Put empty targets in an arch-dependent location
by erinn＠torproject.org 08 Mar '12

08 Mar '12

commit ad1322dcc7ff17d3cb5f8b4d2a54dfaf4ae4eb6e Author: Patrick Mézard <patrick(a)mezard.eu> Date: Wed Feb 15 00:11:51 2012 +0100 Put empty targets in an arch-dependent location Otherwise make is confused when ARCH_TYPE is changed with existing empty targets. STAMP_DIR is added for clarity but no target is added as it would probably create a cycle with FETCH_DIR. It could easily be added afterwards. vpath directives are picked over VPATH because there are many build products and it is better to risk rebuilding than selecting targets by mistake. --- build-scripts/linux.mk | 20 ++++++++++---------- build-scripts/osx.mk | 18 +++++++++--------- build-scripts/versions.mk | 11 +++++++++++ build-scripts/windows.mk | 18 +++++++++--------- 4 files changed, 39 insertions(+), 28 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 8d2febd..338a8c0 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -57,14 +57,14 @@ build-zlib: $(ZLIB_DIR) cd $(ZLIB_DIR) && ./configure $(ZLIB_OPTS) cd $(ZLIB_DIR) && make -j $(NUM_CORES) cd $(ZLIB_DIR) && make install - touch build-zlib + touch $(STAMP_DIR)/build-zlib LIBPNG_OPTS=--prefix=$(BUILT_DIR) build-libpng: $(LIBPNG_DIR) cd $(LIBPNG_DIR) && ./configure $(LIBPNG_OPTS) cd $(LIBPNG_DIR) && make cd $(LIBPNG_DIR) && make install - touch build-libpng + touch $(STAMP_DIR)/build-libpng OPENSSL_OPTS=-no-idea -no-rc5 -no-md2 shared zlib --prefix=$(BUILT_DIR) --openssldir=$(BUILT_DIR) -I$(BUILT_DIR)/include -L$(BUILT_DIR)/lib build-openssl: build-zlib $(OPENSSL_DIR) @@ -72,7 +72,7 @@ build-openssl: build-zlib $(OPENSSL_DIR) cd $(OPENSSL_DIR) && make depend cd $(OPENSSL_DIR) && make cd $(OPENSSL_DIR) && make install_sw - touch build-openssl + touch $(STAMP_DIR)/build-openssl QT_BUILD_PREFS=-system-zlib -confirm-license -opensource -openssl-linked -no-qt3support -fast -release -nomake demos -nomake examples QT_OPTS=$(QT_BUILD_PREFS) -prefix $(BUILT_DIR) -I $(BUILT_DIR)/include -I $(BUILT_DIR)/include/openssl/ -L$(BUILT_DIR)/lib @@ -80,28 +80,28 @@ build-qt: build-zlib build-openssl $(QT_DIR) cd $(QT_DIR) && ./configure $(QT_OPTS) cd $(QT_DIR) && make -j $(NUM_CORES) cd $(QT_DIR) && make install - touch build-qt + touch $(STAMP_DIR)/build-qt VIDALIA_OPTS=-DOPENSSL_LIBCRYPTO=$(BUILT_DIR)/lib/libcrypto.so.1.0.0 -DOPENSSL_LIBSSL=$(BUILT_DIR)/lib/libssl.so.1.0.0 -DCMAKE_BUILD_TYPE=debug -DQT_QMAKE_EXECUTABLE=$(BUILT_DIR)/bin/qmake .. build-vidalia: build-openssl build-qt $(VIDALIA_DIR) -mkdir $(VIDALIA_DIR)/build cd $(VIDALIA_DIR)/build && cmake $(VIDALIA_OPTS) && make -j $(NUM_CORES) cd $(VIDALIA_DIR)/build && DESTDIR=$(BUILT_DIR) make install - touch build-vidalia + touch $(STAMP_DIR)/build-vidalia LIBEVENT_OPTS=--prefix=$(BUILT_DIR) build-libevent: build-zlib build-openssl $(LIBEVENT_DIR) cd $(LIBEVENT_DIR) && ./configure $(LIBEVENT_OPTS) cd $(LIBEVENT_DIR) && make -j $(NUM_CORES) cd $(LIBEVENT_DIR) && make install - touch build-libevent + touch $(STAMP_DIR)/build-libevent TOR_OPTS=--enable-gcc-warnings --with-openssl-dir=$(BUILT_DIR) --with-zlib-dir=$(BUILT_DIR) --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) build-tor: build-zlib build-openssl build-libevent $(TOR_DIR) cd $(TOR_DIR) && ./configure $(TOR_OPTS) cd $(TOR_DIR) && make -j $(NUM_CORES) cd $(TOR_DIR) && make install - touch build-tor + touch $(STAMP_DIR)/build-tor build-pidgin: echo "We're not building pidgin yet!" @@ -109,7 +109,7 @@ build-pidgin: build-firefox: config/dot_mozconfig $(FIREFOX_DIR) cp config/dot_mozconfig $(FIREFOX_DIR)/mozconfig cd $(FIREFOX_DIR) && make -f client.mk build - touch build-firefox + touch $(STAMP_DIR)/build-firefox copy-firefox: -rm -rf $(FETCH_DIR)/Firefox @@ -242,7 +242,7 @@ generic-bundle: directory-structure \ launcher \ strip-it-stripper \ remove-bundle-shared-lib-symlinks - touch generic-bundle.stamp + touch $(STAMP_DIR)/generic-bundle.stamp APPDIR=$(DEST)/App LIBSDIR=$(DEST)/Lib @@ -363,7 +363,7 @@ compressed-bundle_%: bundle-localized_%.stamp: make -f linux.mk copy-files_$* install-extensions install-lang-extensions patch-vidalia-language patch-firefox-language \ patch-pidgin-language update-extension-pref write-tbb-version - touch bundle-localized_$*.stamp + touch $(STAMP_DIR)/bundle-localized_$*.stamp bundle-localized: bundle-localized_$(LANGCODE).stamp diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 6e5ae1d..62abe18 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -70,7 +70,7 @@ build-zlib: $(ZLIB_DIR) cd $(ZLIB_DIR) && CFLAGS=$(ZLIB_CFLAGS) ./configure $(ZLIB_OPTS) cd $(ZLIB_DIR) && make -j $(NUM_CORES) cd $(ZLIB_DIR) && make install - touch build-zlib + touch $(STAMP_DIR)/build-zlib OPENSSL_OPTS=-no-rc5 -no-md2 -no-man shared zlib $(BACKWARDS_COMPAT) --prefix=$(BUILT_DIR) --openssldir=$(BUILT_DIR) -L$(BUILT_DIR)/lib -I$(BUILT_DIR)/include build-openssl: build-zlib $(OPENSSL_DIR) @@ -86,7 +86,7 @@ endif # Do not use -j for the following make call, random build errors might happen. cd $(OPENSSL_DIR) && make cd $(OPENSSL_DIR) && make install_sw - touch build-openssl + touch $(STAMP_DIR)/build-openssl QT_BUILD_PREFS=-system-zlib -confirm-license -opensource -openssl-linked -no-qt3support \ @@ -96,7 +96,7 @@ build-qt: build-zlib build-openssl $(QT_DIR) cd $(QT_DIR) && ./configure $(QT_OPTS) cd $(QT_DIR) && make -j $(NUM_CORES) cd $(QT_DIR) && make install - touch build-qt + touch $(STAMP_DIR)/build-qt VIDALIA_OPTS=-DCMAKE_OSX_ARCHITECTURES=$(ARCH_TYPE) -DQT_QMAKE_EXECUTABLE=$(BUILT_DIR)/bin/qmake \ -DCMAKE_BUILD_TYPE=debug .. @@ -106,7 +106,7 @@ build-vidalia: build-openssl build-qt $(VIDALIA_DIR) cd $(VIDALIA_DIR)/build && cmake $(VIDALIA_OPTS) \ && make -j $(NUM_CORES) && make dist-osx-libraries cd $(VIDALIA_DIR)/build && DESTDIR=$(BUILT_DIR) make install - touch build-vidalia + touch $(STAMP_DIR)/build-vidalia LIBEVENT_CFLAGS="-O -g -arch $(ARCH_TYPE) $(MIN_VERSION) $(CF_MIN_VERSION) -arch $(ARCH_TYPE)" LIBEVENT_LDFLAGS="-L$(BUILT_DIR)/lib $(LD_MIN_VERSION)" @@ -115,7 +115,7 @@ build-libevent: build-zlib build-openssl $(LIBEVENT_DIR) cd $(LIBEVENT_DIR) && CFLAGS=$(LIBEVENT_CFLAGS) LDFLAGS=$(LIBEVENT_LDFLAGS) ./configure $(LIBEVENT_OPTS) cd $(LIBEVENT_DIR) && make -j $(NUM_CORES) cd $(LIBEVENT_DIR) && make install - touch build-libevent + touch $(STAMP_DIR)/build-libevent TOR_CFLAGS="-O -g -arch $(ARCH_TYPE) -I$(BUILT_DIR)/include $(MIN_VERSION) $(CF_MIN_VERSION)" TOR_LDFLAGS="-L$(BUILT_DIR)/lib $(LD_MIN_VERSION)" @@ -124,12 +124,12 @@ build-tor: build-zlib build-openssl build-libevent $(TOR_DIR) cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) ./configure $(TOR_OPTS) cd $(TOR_DIR) && make -j $(NUM_CORES) cd $(TOR_DIR) && make install - touch build-tor + touch $(STAMP_DIR)/build-tor build-firefox: $(FIREFOX_DIR) config/mozconfig-osx-$(ARCH_TYPE) cp config/mozconfig-osx-$(ARCH_TYPE) $(FIREFOX_DIR)/mozconfig cd $(FIREFOX_DIR) && make -f client.mk build - touch build-firefox + touch $(STAMP_DIR)/build-firefox copy-firefox: -rm -rf $(FETCH_DIR)/Firefox.app @@ -251,7 +251,7 @@ clean: generic-bundle.stamp: make -f osx.mk generic-bundle generic-bundle: directory-structure install-binaries install-docs install-firefox configure-apps launcher strip-it-stripper - touch generic-bundle.stamp + touch $(STAMP_DIR)/generic-bundle.stamp APPDIR=$(DEST)/Contents/MacOS DOCSDIR=$(DEST)/Contents/Resources/Docs @@ -338,7 +338,7 @@ compressed-bundle_%: LANGCODE=$* make -f osx.mk compressed-bundle-localized bundle-localized_%.stamp: make -f osx.mk copy-files_$* install-extensions install-httpseverywhere install-noscript install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref write-tbb-version final - touch bundle-localized_$*.stamp + touch $(STAMP_DIR)/bundle-localized_$*.stamp bundle-localized: bundle-localized_$(LANGCODE).stamp diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 58d2df7..92f7acf 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -81,6 +81,17 @@ FIREFOX_DIR=$(FETCH_DIR)/firefox-$(FIREFOX_VER) MOZBUILD_DIR=$(FETCH_DIR)/mozilla-build PYMAKE_DIR=$(FETCH_DIR)/pymake-$(PYMAKE_VER) +# Empty targets are written in arch-dependent $(FETCH_DIR). Usual +# VPATH issues documented below should be avoided as the paths of +# these targes are never used in dependents recipes. We only make use +# of targets existence. +# +# http://mad-scientist.net/make/vpath.html +# +STAMP_DIR=$(FETCH_DIR) +vpath build-% $(STAMP_DIR) +vpath patch-% $(STAMP_DIR) +vpath %.stamp $(STAMP_DIR) fetch-source: $(FETCH_DIR)/$(ZLIB_PACKAGE) $(FETCH_DIR)/$(LIBPNG_PACKAGE) $(FETCH_DIR)/$(QT_PACKAGE) $(FETCH_DIR)/$(OPENSSL_PACKAGE) $(FETCH_DIR)/$(VIDALIA_PACKAGE) $(FETCH_DIR)/$(LIBEVENT_PACKAGE) $(FETCH_DIR)/$(TOR_PACKAGE) $(FETCH_DIR)/$(FIREFOX_PACKAGE) | $(FETCH_DIR) ; diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 524bb66..90282fd 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -76,7 +76,7 @@ build-zlib: $(ZLIB_DIR) cd $(ZLIB_DIR) && sed -i -e "s%prefix = /usr/local%prefix = ${BUILT_DIR}%" win32/Makefile.gcc cd $(ZLIB_DIR) && LDFLAGS="-Wl,--nxcompat -Wl,--dynamicbase" make -f win32/Makefile.gcc -j $(NUM_CORES) cd $(ZLIB_DIR) && BINARY_PATH="$(BUILT_DIR)/bin" INCLUDE_PATH="$(BUILT_DIR)/include" LIBRARY_PATH="$(BUILT_DIR)/lib" make -f win32/Makefile.gcc install - touch build-zlib + touch $(STAMP_DIR)/build-zlib OPENSSL_OPTS=-no-idea -no-rc5 -no-md2 shared zlib --prefix=$(BUILT_DIR) --openssldir=$(BUILT_DIR) -L$(BUILT_DIR)/lib -Wl,--nxcompat -Wl,--dynamicbase -I$(BUILT_DIR)/include build-openssl: build-zlib $(OPENSSL_DIR) @@ -84,7 +84,7 @@ build-openssl: build-zlib $(OPENSSL_DIR) cd $(OPENSSL_DIR) && make depend cd $(OPENSSL_DIR) && make cd $(OPENSSL_DIR) && make install_sw - touch build-openssl + touch $(STAMP_DIR)/build-openssl QT_BUILD_PREFS=-system-zlib -confirm-license -opensource -openssl-linked -no-qt3support -fast -release -nomake demos -nomake examples QT_OPTS=$(QT_BUILD_PREFS) -prefix $(BUILT_DIR) -I $(BUILT_DIR)/include -I $(BUILT_DIR)/include/openssl/ -L$(BUILT_DIR)/lib @@ -92,7 +92,7 @@ build-qt: build-zlib build-openssl $(QT_DIR) cd $(QT_DIR) && ./configure $(QT_OPTS) cd $(QT_DIR) && make -j $(NUM_CORES) cd $(QT_DIR) && make install - touch build-qt + touch $(STAMP_DIR)/build-qt VIDALIA_OPTS=-DCMAKE_EXE_LINKER_FLAGS="-static-libstdc++ -Wl,--nxcompat -Wl,--dynamicbase" -DWIN2K=1 -DQT_MAKE_EXECUTABLE=/c/Qt/$(QT_VER)/bin/qmake -DCMAKE_BUILD_TYPE=minsizerel -DMINGW_BINARY_DIR=$(MING) -DOPENSSL_BINARY_DIR=$(OPENSSL) -DWIX_BINARY_DIR=$(WIX_LIB) # XXX Once we build qt on windows, we'll want to add build-qt here @@ -100,7 +100,7 @@ build-vidalia: build-openssl $(VIDALIA_DIR) -mkdir $(VIDALIA_DIR)/build cd $(VIDALIA_DIR)/build && cmake -G "MSYS Makefiles" $(VIDALIA_OPTS) .. cd $(VIDALIA_DIR)/build && make -j $(NUM_CORES) - touch build-vidalia + touch $(STAMP_DIR)/build-vidalia LIBEVENT_CFLAGS="-I$(BUILT_DIR)/include -O -g" LIBEVENT_LDFLAGS="-L$(BUILT_DIR)/lib -L$(BUILT_DIR)/bin -Wl,--nxcompat -Wl,--dynamicbase" @@ -109,7 +109,7 @@ build-libevent: build-zlib build-openssl $(LIBEVENT_DIR) cd $(LIBEVENT_DIR) && CFLAGS=$(LIBEVENT_CFLAGS) LDFLAGS=$(LIBEVENT_LDFLAGS) ./configure $(LIBEVENT_OPTS) cd $(LIBEVENT_DIR) && make -j $(NUM_CORES) cd $(LIBEVENT_DIR) && make install - touch build-libevent + touch $(STAMP_DIR)/build-libevent TOR_CFLAGS="-O -g -I$(BUILT_DIR)/include" TOR_LDFLAGS="-L$(BUILT_DIR)/lib -L$(BUILT_DIR)/bin" @@ -119,12 +119,12 @@ build-tor: build-zlib build-openssl build-libevent $(TOR_DIR) cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) ./configure $(TOR_OPTS) cd $(TOR_DIR) && make -j $(NUM_CORES) cd $(TOR_DIR) && make install - touch build-tor + touch $(STAMP_DIR)/build-tor build-firefox: $(FIREFOX_DIR) config/dot_mozconfig $(MOZBUILD_DIR) $(MOZBUILD_DIR)/start-msvc$(MSVC_VER).bat | $(PYTHON) $(PYMAKE_DIR) cp config/dot_mozconfig $(FIREFOX_DIR)/mozconfig cd $(MOZBUILD_DIR) && cmd.exe /c "start-msvc$(MSVC_VER).bat $(FIREFOX_DIR) $(PYTHON) $(PYMAKE)" - touch build-firefox + touch $(STAMP_DIR)/build-firefox copy-firefox: -rm -rf $(FIREFOX) @@ -266,7 +266,7 @@ virus-scan: | $(PYTHON) generic-bundle.stamp: make -f windows.mk generic-bundle generic-bundle: directory-structure install-binaries install-docs install-firefoxportable install-pidginportable configure-apps launcher - touch generic-bundle.stamp + touch $(STAMP_DIR)/generic-bundle.stamp APPDIR=$(DEST)/App DOCSDIR=$(DEST)/Docs @@ -364,7 +364,7 @@ split-bundle_%: bundle-localized_%.stamp: make -f windows.mk copy-files_$* install-extensions install-torbutton install-httpseverywhere install-noscript \ patch-vidalia-language patch-firefox-language patch-pidgin-language write-tbb-version - touch bundle-localized_$*.stamp + touch $(STAMP_DIR)/bundle-localized_$*.stamp bundle-localized: bundle-localized_$(LANGCODE).stamp

1 0

[torbrowser/maint-2.3] W32: adjust Makefile header
by erinn＠torproject.org 08 Mar '12

08 Mar '12

commit 28935353655b4b44e27ef343595ca51308c866bf Author: Patrick Mézard <patrick(a)mezard.eu> Date: Sun Feb 12 12:09:22 2012 +0100 W32: adjust Makefile header --- build-scripts/windows.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 423b88c..524bb66 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -1,5 +1,5 @@ ### -### Makefile for building Tor USB bundle on Mac OS X +### Makefile for building Tor USB bundle on Windows ### ### Copyright 2007 Steven J. Murdoch <http://www.cl.cam.ac.uk/users/sjm217/> ### Copyright 2009, 2010 Jacob Appelbaum <jacob(a)appelbaum.net>

1 0

[torbrowser/maint-2.3] Remove instruction headers from os-specific makefiles
by erinn＠torproject.org 08 Mar '12

08 Mar '12

commit 4e4fd2943a05ee2aacb68b3518ca63e30a56af63 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Feb 16 04:33:23 2012 +0100 Remove instruction headers from os-specific makefiles These would be much better explained in a general readme of sorts. More of that later. --- build-scripts/linux.mk | 18 ------------------ build-scripts/osx.mk | 19 ------------------- build-scripts/windows.mk | 18 +----------------- 3 files changed, 1 insertions(+), 54 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 338a8c0..9a11164 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -5,27 +5,9 @@ ### Copyright 2009 Jacob Appelbaum <jacob(a)appelbaum.net> ### Copyright 2010 Erinn Clark <erinn(a)torproject.org> ### -### You want to do the following currently supported activities: -# This downloads and compiles everything -### make -f linux.mk build-all-binaries -# This makes a generic bundle -### make -f linux.mk generic-bundle -# This makes the English bundle -### make -f linux.mk bundle_en-US -# This makes the German bundle -### make -f linux.mk bundle_de -# This makes the German compressed bundle -### make -f linux.mk compressed-bundle_de -# It's possible you may also want to do: -### make -f linux.mk build-all-binaries -### make -f linux.mk all-compressed-bundles -### ... -### Look in tbbl-dist/ for your files. ### ### See LICENSE for licensing information ### -### $Id: Makefile 19973 2009-07-12 02:26:03Z phobos $ -### ##################### ### Configuration ### diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 62abe18..2310826 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -5,27 +5,8 @@ ### Copyright 2009, 2010 Jacob Appelbaum <jacob(a)appelbaum.net> ### Copyright 2010 Erinn Clark <erinn(a)torproject.org> ### -### You want to do the following currently supported activities: -# This downloads and compiles everything -### make -f osx.mk build-all-binaries -# This makes a generic bundle -### make -f osx.mk generic-bundle -# This makes the English bundle -### make -f osx.mk bundle_en-US -# This makes the German bundle -### make -f osx.mk bundle_de -# This makes the German compressed bundle -### make -f osx.mk compressed-bundle_de -# It's possible you may also want to do: -### make -f osx.mk build-all-binaries -### make -f osx.mk all-compressed-bundles -### ... -### Look in tbbosx-dist/ for your files. -### ### See LICENSE for licensing information ### -### $Id: Makefile 19973 2009-07-12 02:26:03Z phobos $ -### ##################### ### Configuration ### diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 90282fd..8eddc2a 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -5,26 +5,10 @@ ### Copyright 2009, 2010 Jacob Appelbaum <jacob(a)appelbaum.net> ### Copyright 2010 Erinn Clark <erinn(a)torproject.org> ### -### You want to do the following currently supported activities: -# This downloads and compiles everything -### make -f windows.mk build-all-binaries -# This makes a generic bundle -### make -f windows.mk generic-bundle -# This makes the English bundle -### make -f windows.mk bundle_en-US -# This makes the German bundle -### make -f windows.mk bundle_de -# This makes the German compressed bundle -### make -f windows.mk compressed-bundle_de -# It's possible you may also want to do: -### make -f windows.mk build-all-binaries -### make -f windows.mk all-compressed-bundles -### ... -### Look in tbbwin-alpha-dist/ for your files. -### ### See LICENSE for licensing information ### + ##################### ### Configuration ### #####################

1 0

[torbrowser/maint-2.3] Source files don't depend on arch, give them their own dir
by erinn＠torproject.org 08 Mar '12

08 Mar '12

commit eccdc690cf76fada62b5bb9ee316c5acfdecb90d Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Feb 16 04:28:50 2012 +0100 Source files don't depend on arch, give them their own dir --- build-scripts/linux.mk | 16 ++++++---- build-scripts/osx.mk | 14 +++++---- build-scripts/versions.mk | 68 +++++++++++++++++++++++---------------------- build-scripts/windows.mk | 13 +++++--- 4 files changed, 60 insertions(+), 51 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 9a11164..a66ae77 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -22,10 +22,12 @@ PLATFORM=Linux # Number of cpu cores used to build in parallel NUM_CORES=2 -## Location of directory for source unpacking -FETCH_DIR=/srv/build-trees/build-alpha-$(ARCH_TYPE) +## Location of directory for source downloading +FETCH_DIR=/srv/build-trees/build-alpha +## Location of directory for source unpacking/building +BUILD_DIR=$(FETCH_DIR)/$(ARCH_TYPE) ## Location of directory for prefix/destdir/compiles/etc -BUILT_DIR=$(FETCH_DIR)/built +BUILT_DIR=$(BUILD_DIR)/built TBB_FINAL=$(BUILT_DIR)/TBBL ## Include versions (must happen after variable definitions above @@ -94,11 +96,11 @@ build-firefox: config/dot_mozconfig $(FIREFOX_DIR) touch $(STAMP_DIR)/build-firefox copy-firefox: - -rm -rf $(FETCH_DIR)/Firefox + -rm -rf $(BUILD_DIR)/Firefox ## This is so ugly. Update it to use cool tar --transform soon. cd $(FIREFOX_DIR) && make -C obj-$(ARCH_TYPE)-*/ package - cp $(FIREFOX_DIR)/obj-$(ARCH_TYPE)-*/dist/*bz2 $(FETCH_DIR) - cd $(FETCH_DIR) && tar -xvjf firefox-$(FIREFOX_VER).en-US.linux-$(ARCH_TYPE).tar.bz2 && mv firefox Firefox + cp $(FIREFOX_DIR)/obj-$(ARCH_TYPE)-*/dist/*bz2 $(BUILD_DIR) + cd $(BUILD_DIR) && tar -xvjf firefox-$(FIREFOX_VER).en-US.linux-$(ARCH_TYPE).tar.bz2 && mv firefox Firefox # source-dance unpack-source build-all-binaries: source-dance build-zlib build-openssl build-libpng build-qt build-vidalia build-libevent build-tor build-firefox @@ -120,7 +122,7 @@ ZLIB=$(COMPILED_LIBS) TOR=$(COMPILED_BINS)/tor VIDALIA=$(BUILT_DIR)/usr/local/bin/vidalia ## Someday, this will be our custom Firefox -FIREFOX=$(FETCH_DIR)/Firefox +FIREFOX=$(BUILD_DIR)/Firefox PIDGIN=$(COMPILED_BINS)/pidgin ## Location of utility applications diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 2310826..160c9dd 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -33,10 +33,12 @@ BACKWARDS_COMPAT=$(MIN_VERSION) $(CF_MIN_VERSION) $(LD_MIN_VERSION) # Number of cpu cores used to build in parallel NUM_CORES=2 -## Location of directory for source unpacking -FETCH_DIR=$(PWD)/build-$(ARCH_TYPE) +## Location of directory for source fetching +FETCH_DIR=$(PWD)/build +## Location of directory for source unpacking/building +BUILD_DIR=$(FETCH_DIR)/$(ARCH_TYPE) ## Location of directory for prefix/destdir/compiles/etc -BUILT_DIR=$(FETCH_DIR)/built +BUILT_DIR=$(BUILD_DIR)/built TBB_FINAL=$(BUILT_DIR)/tbbosx-dist ## Include versions (must happen after variable definitions above @@ -113,8 +115,8 @@ build-firefox: $(FIREFOX_DIR) config/mozconfig-osx-$(ARCH_TYPE) touch $(STAMP_DIR)/build-firefox copy-firefox: - -rm -rf $(FETCH_DIR)/Firefox.app - cp -r $(FIREFOX_DIR)/obj*/dist/*.app $(FETCH_DIR)/Firefox.app + -rm -rf $(BUILD_DIR)/Firefox.app + cp -r $(FIREFOX_DIR)/obj*/dist/*.app $(BUILD_DIR)/Firefox.app build-all-binaries: build-zlib build-openssl build-vidalia build-libevent build-tor build-firefox echo "If we're here, we've done something right." @@ -134,7 +136,7 @@ LIBEVENT=$(COMPILED_LIBS) VIDALIA=$(BUILT_DIR)/usr/local/bin/Vidalia.app/ TOR=$(COMPILED_BINS)/tor ## Someday, this will be our custom Firefox -FIREFOX=$(FETCH_DIR)/Firefox.app +FIREFOX=$(BUILD_DIR)/Firefox.app PIDGIN=$(COMPILED_BINS)/pidgin ## Location of utility applications diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 92f7acf..984cf58 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -70,18 +70,18 @@ mozbuild=MOZBUILD pymake=PYMAKE # The locations of the unpacked tarballs -ZLIB_DIR=$(FETCH_DIR)/zlib-$(ZLIB_VER) -LIBPNG_DIR=$(FETCH_DIR)/libpng-$(LIBPNG_VER) -QT_DIR=$(FETCH_DIR)/qt-$(QT_VER) -OPENSSL_DIR=$(FETCH_DIR)/openssl-$(OPENSSL_VER) -VIDALIA_DIR=$(FETCH_DIR)/vidalia-$(VIDALIA_VER) -LIBEVENT_DIR=$(FETCH_DIR)/libevent-$(LIBEVENT_VER) -TOR_DIR=$(FETCH_DIR)/tor-$(TOR_VER) -FIREFOX_DIR=$(FETCH_DIR)/firefox-$(FIREFOX_VER) -MOZBUILD_DIR=$(FETCH_DIR)/mozilla-build -PYMAKE_DIR=$(FETCH_DIR)/pymake-$(PYMAKE_VER) - -# Empty targets are written in arch-dependent $(FETCH_DIR). Usual +ZLIB_DIR=$(BUILD_DIR)/zlib-$(ZLIB_VER) +LIBPNG_DIR=$(BUILD_DIR)/libpng-$(LIBPNG_VER) +QT_DIR=$(BUILD_DIR)/qt-$(QT_VER) +OPENSSL_DIR=$(BUILD_DIR)/openssl-$(OPENSSL_VER) +VIDALIA_DIR=$(BUILD_DIR)/vidalia-$(VIDALIA_VER) +LIBEVENT_DIR=$(BUILD_DIR)/libevent-$(LIBEVENT_VER) +TOR_DIR=$(BUILD_DIR)/tor-$(TOR_VER) +FIREFOX_DIR=$(BUILD_DIR)/firefox-$(FIREFOX_VER) +MOZBUILD_DIR=$(BUILD_DIR)/mozilla-build +PYMAKE_DIR=$(BUILD_DIR)/pymake-$(PYMAKE_VER) + +# Empty targets are written in arch-dependent $(BUILD_DIR). Usual # VPATH issues documented below should be avoided as the paths of # these targes are never used in dependents recipes. We only make use # of targets existence. @@ -98,6 +98,9 @@ fetch-source: $(FETCH_DIR)/$(ZLIB_PACKAGE) $(FETCH_DIR)/$(LIBPNG_PACKAGE) $(FETC $(FETCH_DIR): mkdir -p $(FETCH_DIR) +$(BUILD_DIR): + mkdir -p $(BUILD_DIR) + # XXX # If we can, we should definitely add some stuff here to check signatures - # at least for those packages that support it. @@ -152,45 +155,44 @@ langpack_en-US.xpi: unpack-source: $(ZLIB_DIR) $(OPENSSL_DIR) $(LIBPNG_DIR $(QT_DIR) $(VIDALIA_DIR) $(LIBEVENT_DIR) $(TOR_DIR) $(FIREFOX_DIR) -$(ZLIB_DIR): $(FETCH_DIR)/$(ZLIB_PACKAGE) +$(ZLIB_DIR): $(FETCH_DIR)/$(ZLIB_PACKAGE) | $(BUILD_DIR) rm -rf $(ZLIB_DIR) - cd $(FETCH_DIR) && tar -xmf $(ZLIB_PACKAGE) + cd $(FETCH_DIR) && tar -xmf $(ZLIB_PACKAGE) -C $(BUILD_DIR)/ $(LIBPNG_DIR): $(FETCH_DIR)/$(LIBPNG_PACKAGE) rm -rf $(LIBPNG_DIR) - cd $(FETCH_DIR) && tar -xmf $(LIBPNG_PACKAGE) - + cd $(FETCH_DIR) && tar -xmf $(LIBPNG_PACKAGE) -C $(BUILD_DIR)/ -$(QT_DIR): $(FETCH_DIR)/$(QT_PACKAGE) +$(QT_DIR): $(FETCH_DIR)/$(QT_PACKAGE) | $(BUILD_DIR) rm -rf $(QT_DIR) $(FETCH_DIR)/qt-everywhere-opensource-src-$(QT_VER) - cd $(FETCH_DIR) && tar -xmf $(QT_PACKAGE) - mv $(FETCH_DIR)/qt-everywhere-opensource-src-$(QT_VER) $(QT_DIR) + cd $(FETCH_DIR) && tar -xmf $(QT_PACKAGE) -C $(BUILD_DIR)/ + mv $(BUILD_DIR)/qt-everywhere-opensource-src-$(QT_VER) $(QT_DIR) -$(OPENSSL_DIR): $(FETCH_DIR)/$(OPENSSL_PACKAGE) +$(OPENSSL_DIR): $(FETCH_DIR)/$(OPENSSL_PACKAGE) | $(BUILD_DIR) rm -rf $(OPENSSL_DIR) - cd $(FETCH_DIR) && tar -xmf $(OPENSSL_PACKAGE) + cd $(FETCH_DIR) && tar -xmf $(OPENSSL_PACKAGE) -C $(BUILD_DIR)/ -$(VIDALIA_DIR): $(FETCH_DIR)/$(VIDALIA_PACKAGE) +$(VIDALIA_DIR): $(FETCH_DIR)/$(VIDALIA_PACKAGE) | $(BUILD_DIR) rm -rf $(VIDALIA_DIR) - cd $(FETCH_DIR) && tar -xmf $(VIDALIA_PACKAGE) + cd $(FETCH_DIR) && tar -xmf $(VIDALIA_PACKAGE) -C $(BUILD_DIR)/ -$(LIBEVENT_DIR): $(FETCH_DIR)/$(LIBEVENT_PACKAGE) +$(LIBEVENT_DIR): $(FETCH_DIR)/$(LIBEVENT_PACKAGE) | $(BUILD_DIR) rm -rf $(LIBEVENT_DIR) - cd $(FETCH_DIR) && tar -xmf $(LIBEVENT_PACKAGE) + cd $(FETCH_DIR) && tar -xmf $(LIBEVENT_PACKAGE) -C $(BUILD_DIR)/ -$(TOR_DIR): $(FETCH_DIR)/$(TOR_PACKAGE) +$(TOR_DIR): $(FETCH_DIR)/$(TOR_PACKAGE) | $(BUILD_DIR) rm -rf $(TOR_DIR) - cd $(FETCH_DIR) && tar -xmf $(TOR_PACKAGE) + cd $(FETCH_DIR) && tar -xmf $(TOR_PACKAGE) -C $(BUILD_DIR)/ -$(FIREFOX_DIR): $(FETCH_DIR)/$(FIREFOX_PACKAGE) ../src/current-patches/firefox/* +$(FIREFOX_DIR): $(FETCH_DIR)/$(FIREFOX_PACKAGE) ../src/current-patches/firefox/* | $(BUILD_DIR) rm -rf $(FIREFOX_DIR) $(FETCH_DIR)/mozilla-release - cd $(FETCH_DIR) && tar -xmf $(FIREFOX_PACKAGE) - mv $(FETCH_DIR)/mozilla-release $(FIREFOX_DIR) + cd $(FETCH_DIR) && tar -xmf $(FIREFOX_PACKAGE) -C $(BUILD_DIR)/ + mv $(BUILD_DIR)/mozilla-release $(FIREFOX_DIR) cp ../src/current-patches/firefox/* $(FIREFOX_DIR) cp patch-any-src.sh $(FIREFOX_DIR) cd $(FIREFOX_DIR) && ./patch-any-src.sh -$(MOZBUILD_DIR): $(FETCH_DIR)/$(MOZBUILD_PACKAGE) ../src/current-patches/mozilla-build/start-msvc.patch ../src/current-patches/mozilla-build/guess-msvc-x64.bat patch-mozilla-build.sh +$(MOZBUILD_DIR): $(FETCH_DIR)/$(MOZBUILD_PACKAGE) ../src/current-patches/mozilla-build/start-msvc.patch ../src/current-patches/mozilla-build/guess-msvc-x64.bat patch-mozilla-build.sh | $(BUILD_DIR) rm -rf $(MOZBUILD_DIR) /c/mozilla-build # We could try passing a /D argument here, but then we'd need to convert # mingw paths into windows paths. We'll just go with the default here. @@ -202,9 +204,9 @@ $(MOZBUILD_DIR): $(FETCH_DIR)/$(MOZBUILD_PACKAGE) ../src/current-patches/mozilla cp patch-mozilla-build.sh $(MOZBUILD_DIR) cd $(MOZBUILD_DIR) && ./patch-mozilla-build.sh $(MSVC_VER) -$(PYMAKE_DIR): $(FETCH_DIR)/$(PYMAKE_PACKAGE) +$(PYMAKE_DIR): $(FETCH_DIR)/$(PYMAKE_PACKAGE) | $(BUILD_DIR) rm -rf $(PYMAKE_DIR) - cd $(FETCH_DIR) && tar -xmf $(PYMAKE_PACKAGE) + cd $(FETCH_DIR) && tar -xmf $(PYMAKE_PACKAGE) -C $(BUILD_DIR)/ clean-fetch-%: diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 8eddc2a..b1b511a 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -23,10 +23,10 @@ OPENSSL_LIB=$(COMPILED_BINS) WIX_LIB="/c/Program Files (x86)/Windows Installer XML v3.5/bin" ## Location of bundle components -VIDALIA=$(FETCH_DIR)/vidalia-$(VIDALIA_VER) -TOR=$(FETCH_DIR)/tor-$(TOR_VER) -FIREFOX=$(FETCH_DIR)/FirefoxPortable-$(FIREFOX_VER) -PIDGIN=$(FETCH_DIR)/PidginPortable-$(PIDGIN_VER) +VIDALIA=$(BUILD_DIR)/vidalia-$(VIDALIA_VER) +TOR=$(BUILD_DIR)/tor-$(TOR_VER) +FIREFOX=$(BUILD_DIR)/FirefoxPortable-$(FIREFOX_VER) +PIDGIN=$(BUILD_DIR)/PidginPortable-$(PIDGIN_VER) ## Location of utility applications PWD:=$(shell pwd) @@ -46,8 +46,11 @@ NUM_CORES=2 ## Location of directory for source unpacking FETCH_DIR=$(PWD)/build-alpha-windows +## Location of directory for source unpacking/building +## This must be different from FETCH_DIR +BUILD_DIR=$(FETCH_DIR)/build ## Location of directory for prefix/destdir/compiles/etc -BUILT_DIR=$(FETCH_DIR)/built +BUILT_DIR=$(BUILD_DIR)/built TBB_FINAL=$(BUILT_DIR)/tbbwin-alpha-dist ## Include versions (must happen after variable definitions above

1 0

[torbrowser/maint-2.3] Remove all svn $Id leftovers
by erinn＠torproject.org 08 Mar '12

08 Mar '12

commit fb8282ca9bce57f9019dac4dcff7493ce56cdef8 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Feb 16 04:50:19 2012 +0100 Remove all svn $Id leftovers --- build-scripts/DEPLOYMENT | 2 -- build-scripts/INSTALL | 2 -- build-scripts/patch-firefox-language.sh | 2 -- build-scripts/patch-pidgin-language.sh | 2 -- build-scripts/patch-vidalia-language.sh | 2 -- docs/traces.txt | 2 -- src/FindTraces/dumpreg.py | 2 -- src/FindTraces/registrydict.py | 1 - src/processtest/README | 1 - src/processtest/browserprocess.cpp | 1 - src/processtest/browserprocess.h | 1 - src/processtest/main.cpp | 1 - src/processtest/processtest.cpp | 1 - src/processtest/processtest.h | 1 - src/processtest/processtest.pro | 1 - 15 files changed, 0 insertions(+), 22 deletions(-) diff --git a/build-scripts/DEPLOYMENT b/build-scripts/DEPLOYMENT index 6ea8e14..b1727f1 100644 --- a/build-scripts/DEPLOYMENT +++ b/build-scripts/DEPLOYMENT @@ -4,8 +4,6 @@ ### Copyright 2008 Steven J. Murdoch <http://www.cl.cam.ac.uk/users/sjm217/> ### See LICENSE for licensing information ### -### $Id: INSTALL 14826 2008-05-29 14:03:31Z sjm217 $ -### This document describes how the official Tor Browser Bundle is deployed. It is probably not of interest outside of the Tor Project. diff --git a/build-scripts/INSTALL b/build-scripts/INSTALL index d85a051..34cd085 100644 --- a/build-scripts/INSTALL +++ b/build-scripts/INSTALL @@ -5,8 +5,6 @@ ### Copyright 2008 The Tor Project <https://www.torproject.org/> ### See LICENSE for licensing information ### -### $Id$ -### Contents ======== diff --git a/build-scripts/patch-firefox-language.sh b/build-scripts/patch-firefox-language.sh index 9e36335..0eb643a 100755 --- a/build-scripts/patch-firefox-language.sh +++ b/build-scripts/patch-firefox-language.sh @@ -6,8 +6,6 @@ ### Copyright 2007-2008 Steven J. Murdoch <http://www.cl.cam.ac.uk/users/sjm217/> ### See LICENSE for licensing information ### -### $Id$ -### ## Parse command line FILENAME=$1 diff --git a/build-scripts/patch-pidgin-language.sh b/build-scripts/patch-pidgin-language.sh index 3ff4756..9d3a390 100755 --- a/build-scripts/patch-pidgin-language.sh +++ b/build-scripts/patch-pidgin-language.sh @@ -6,8 +6,6 @@ ### Copyright 2008 Steven J. Murdoch <http://www.cl.cam.ac.uk/users/sjm217/> ### See LICENSE for licensing information ### -### $Id: patch-vidalia-language.sh 13521 2008-02-15 12:37:49Z sjm217 $ -### ## Parse command line FILENAME=$1 diff --git a/build-scripts/patch-vidalia-language.sh b/build-scripts/patch-vidalia-language.sh index 75cf02c..84984e2 100755 --- a/build-scripts/patch-vidalia-language.sh +++ b/build-scripts/patch-vidalia-language.sh @@ -6,8 +6,6 @@ ### Copyright 2007 Steven J. Murdoch <http://www.cl.cam.ac.uk/users/sjm217/> ### See LICENSE for licensing information ### -### $Id$ -### ## Parse command line FILENAME=$1 diff --git a/docs/traces.txt b/docs/traces.txt index f81c0cf..ce35a96 100644 --- a/docs/traces.txt +++ b/docs/traces.txt @@ -3,8 +3,6 @@ ### ### Steven J. Murdoch <http://www.cl.cam.ac.uk/users/sjm217/> ### -### $Id$ -### Filesystem modifications ======================== diff --git a/src/FindTraces/dumpreg.py b/src/FindTraces/dumpreg.py index 5c7035d..5b1b2f8 100644 --- a/src/FindTraces/dumpreg.py +++ b/src/FindTraces/dumpreg.py @@ -7,8 +7,6 @@ ### Copyright 2007 Steven J. Murdoch <http://www.cl.cam.ac.uk/users/sjm217/> ### See LICENSE for licensing information ### -### $Id$ -### import win32con from registrydict import RegistryDict diff --git a/src/FindTraces/registrydict.py b/src/FindTraces/registrydict.py index 626b5db..e1882ec 100644 --- a/src/FindTraces/registrydict.py +++ b/src/FindTraces/registrydict.py @@ -3,7 +3,6 @@ ### Last Updated: 2008/03/11 ### Version no: 1.0 ### URL: http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/551761 -### $Id$ ### ### Requires pywin32 (http://python.net/crew/mhammond/win32/Downloads.html) diff --git a/src/processtest/README b/src/processtest/README index 1d399cc..c4c8dfb 100644 --- a/src/processtest/README +++ b/src/processtest/README @@ -1,7 +1,6 @@ ### ### Test invoking Firefox from Qt ### Steven J. Murdoch <http://www.cl.cam.ac.uk/users/sjm217/> -### $Id$ ### Build instructions diff --git a/src/processtest/browserprocess.cpp b/src/processtest/browserprocess.cpp index ec0c112..b2f974b 100644 --- a/src/processtest/browserprocess.cpp +++ b/src/processtest/browserprocess.cpp @@ -24,7 +24,6 @@ /** ** Test invoking Firefox from Qt ** Steven J. Murdoch <http://www.cl.cam.ac.uk/users/sjm217/> - ** $Id$ **/ #include <QString> diff --git a/src/processtest/browserprocess.h b/src/processtest/browserprocess.h index 85a1ca5..e449e4c 100644 --- a/src/processtest/browserprocess.h +++ b/src/processtest/browserprocess.h @@ -24,7 +24,6 @@ /** ** Test invoking Firefox from Qt ** Steven J. Murdoch <http://www.cl.cam.ac.uk/users/sjm217/> - ** $Id$ **/ #ifndef _BROWSERPROCESS_H diff --git a/src/processtest/main.cpp b/src/processtest/main.cpp index 67e774f..c69f461 100644 --- a/src/processtest/main.cpp +++ b/src/processtest/main.cpp @@ -23,7 +23,6 @@ /** ** Test invoking Firefox from Qt ** Steven J. Murdoch <http://www.cl.cam.ac.uk/users/sjm217/> - ** $Id$ **/ #include <QApplication> diff --git a/src/processtest/processtest.cpp b/src/processtest/processtest.cpp index 48cb361..625a14e 100644 --- a/src/processtest/processtest.cpp +++ b/src/processtest/processtest.cpp @@ -23,7 +23,6 @@ /** ** Test invoking Firefox from Qt ** Steven J. Murdoch <http://www.cl.cam.ac.uk/users/sjm217/> - ** $Id$ **/ #include <QPushButton> diff --git a/src/processtest/processtest.h b/src/processtest/processtest.h index ef3209c..31b9a5e 100644 --- a/src/processtest/processtest.h +++ b/src/processtest/processtest.h @@ -23,7 +23,6 @@ /** ** Test invoking Firefox from Qt ** Steven J. Murdoch <http://www.cl.cam.ac.uk/users/sjm217/> - ** $Id$ **/ #ifndef PROCESSTEST_H diff --git a/src/processtest/processtest.pro b/src/processtest/processtest.pro index d884c17..6d75d7f 100644 --- a/src/processtest/processtest.pro +++ b/src/processtest/processtest.pro @@ -1,7 +1,6 @@ ### ### Test invoking Firefox from Qt ### Steven J. Murdoch <http://www.cl.cam.ac.uk/users/sjm217/> -### $Id$ ### TEMPLATE = app

1 0