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

[torbrowser/master] fix torbutton install target so that it gets installed properly
by erinn＠torproject.org 07 Jun '12

07 Jun '12

commit 20683a0434db1923e15c2a1b1f37e56e19e986d7 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Jun 6 22:02:14 2012 -0300 fix torbutton install target so that it gets installed properly --- build-scripts/osx.mk | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 06ad594..fd0e797 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -313,7 +313,7 @@ bundle_%: 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 + make -f osx.mk copy-files_$* install-torbutton install-httpseverywhere install-noscript install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref write-tbb-version final touch $(STAMP_DIR)/bundle-localized_$*.stamp bundle-localized: bundle-localized_$(LANGCODE).stamp @@ -353,6 +353,9 @@ ifneq ($(LANGCODE), en-US) cp langpack_$(LANGCODE).xpi $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/langpack-$(LANGCODE)(a)firefox.mozilla.org.xpi endif +install-torbutton: torbutton.xpi + cp torbutton.xpi $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.xpi + install-httpseverywhere: httpseverywhere.xpi mkdir -p $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/https-everywhere(a)eff.org cp httpseverywhere.xpi $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/https-everywhere(a)eff.org/httpseverywhere.zip

1 0

[torbrowser/master] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 07 Jun '12

07 Jun '12

commit bd9992349beca70bcded8b60c63bbc211741f049 Merge: 203c742 ef26306 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Jun 6 22:02:52 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/config/vidalia.conf.ff-osx | 14 +++++++------- build-scripts/osx.mk | 5 ++++- build-scripts/windows.mk | 2 +- 3 files changed, 12 insertions(+), 9 deletions(-)

1 0

[torbrowser/maint-2.2] disable asciidoc on Windows when building tor
by erinn＠torproject.org 07 Jun '12

07 Jun '12

commit ef26306ce17cefdfa51cc7d672e2fb538aeabaad Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Jun 6 22:02:33 2012 -0300 disable asciidoc on Windows when building tor --- 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 e3afbc0..0efc5f0 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -97,7 +97,7 @@ build-libevent: build-zlib build-openssl $(LIBEVENT_DIR) TOR_CFLAGS="-I$(BUILT_DIR)/include" TOR_LDFLAGS="-L$(BUILT_DIR)/lib -L$(BUILT_DIR)/bin" -TOR_OPTS=--enable-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib +TOR_OPTS=--enable-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib --disable-asciidoc build-tor:PATH+=:$(BUILT_DIR)/bin build-firefox: $(FIREFOX_DIR) config/dot_mozconfig $(MOZBUILD_DIR) $(MOZBUILD_DIR)/start-msvc$(MSVC_VER).bat | $(PYTHON) $(PYMAKE_DIR)

1 0

[torbrowser/maint-2.2] fix torbutton install target so that it gets installed properly
by erinn＠torproject.org 07 Jun '12

07 Jun '12

commit 20683a0434db1923e15c2a1b1f37e56e19e986d7 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Jun 6 22:02:14 2012 -0300 fix torbutton install target so that it gets installed properly --- build-scripts/osx.mk | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 06ad594..fd0e797 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -313,7 +313,7 @@ bundle_%: 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 + make -f osx.mk copy-files_$* install-torbutton install-httpseverywhere install-noscript install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref write-tbb-version final touch $(STAMP_DIR)/bundle-localized_$*.stamp bundle-localized: bundle-localized_$(LANGCODE).stamp @@ -353,6 +353,9 @@ ifneq ($(LANGCODE), en-US) cp langpack_$(LANGCODE).xpi $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/langpack-$(LANGCODE)(a)firefox.mozilla.org.xpi endif +install-torbutton: torbutton.xpi + cp torbutton.xpi $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.xpi + install-httpseverywhere: httpseverywhere.xpi mkdir -p $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/https-everywhere(a)eff.org cp httpseverywhere.xpi $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/https-everywhere(a)eff.org/httpseverywhere.zip

1 0

[torbrowser/maint-2.2] update vidalia.conf for OS X with proper paths
by erinn＠torproject.org 07 Jun '12

07 Jun '12

commit c5306b0e545f7fe3cd65e7a0947b5f60701e4612 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Jun 6 22:00:49 2012 -0300 update vidalia.conf for OS X with proper paths --- build-scripts/config/vidalia.conf.ff-osx | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build-scripts/config/vidalia.conf.ff-osx b/build-scripts/config/vidalia.conf.ff-osx index 35b0d01..f698d2b 100644 --- a/build-scripts/config/vidalia.conf.ff-osx +++ b/build-scripts/config/vidalia.conf.ff-osx @@ -1,15 +1,15 @@ [General] -BrowserDirectory=../../../TorBrowser.app/Contents/MacOS -BrowserExecutable=firefox-bin +BrowserDirectory=../../../ +BrowserExecutable=TorBrowser.app/Contents/MacOS/firefox-bin +ProfileDirectory=../../Library/Application Support/Firefox/Profiles/profile +DefaultProfileDirectory=TorBrowser.app/Contents/MacOS/defaults/profile +PluginsDirectory=../../MacOS/Data/plugins +DefaultPluginsDirectory=../../MacOS/Data/plugins LanguageCode=en -ProfileDirectory=../../../../../Library/Application Support/Firefox/Profiles/profile -DefaultProfileDirectory=./defaults/profile -PluginsDirectory=../../../../../Library/Application Support/Firefox/Profiles/profile/extensions -DefaultPluginsDirectory=./extensions [Tor] ControlPort=9051 TorExecutable=../../../tor Torrc=../../../../../Library/Vidalia/torrc AutoControl=true -DataDirectory=../../../../Resources/Data/Tor +DataDirectory=../../../../Resources/Data/Tor/

1 0

[torbrowser/maint-2.2] Revert "Linux: Update the Firefox package sequence to a sane variant."
by erinn＠torproject.org 06 Jun '12

06 Jun '12

commit 44f116bda052295d26250101f861b08ef4e75edf Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Jun 6 19:44:29 2012 -0300 Revert "Linux: Update the Firefox package sequence to a sane variant." This reverts commit 05d3f1baffd6fd17fa47d847f90b9d60f0eca1ef. --- build-scripts/linux.mk | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index c06e763..3ebb024 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -85,12 +85,15 @@ build-pidgin: build-firefox: config/dot_mozconfig $(FIREFOX_DIR) cp config/dot_mozconfig $(FIREFOX_DIR)/mozconfig cp branding/* $(FIREFOX_DIR)/browser/branding/official - cd $(FIREFOX_DIR) && make -f client.mk build package INNER_MAKE_PACKAGE=true + cd $(FIREFOX_DIR) && make -f client.mk build touch $(STAMP_DIR)/build-firefox copy-firefox: -rm -rf $(BUILD_DIR)/Firefox - cp -r $(FIREFOX_DIR)/obj-$(ARCH_TYPE)-*/dist/firefox/* $(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 $(BUILD_DIR) + cd $(BUILD_DIR) && tar -xvjf firefox-$(FIREFOX_VER).en-US.linux-$(ARCH_TYPE).tar.bz2 && mv firefox Firefox build-all-binaries: source-dance build-zlib build-openssl build-libpng build-qt build-vidalia build-libevent build-tor build-firefox echo "If we're here, we've done something right."

1 0

[torbrowser/maint-2.3] Revert "Linux: Update the Firefox package sequence to a sane variant."
by erinn＠torproject.org 06 Jun '12

06 Jun '12

commit 44f116bda052295d26250101f861b08ef4e75edf Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Jun 6 19:44:29 2012 -0300 Revert "Linux: Update the Firefox package sequence to a sane variant." This reverts commit 05d3f1baffd6fd17fa47d847f90b9d60f0eca1ef. --- build-scripts/linux.mk | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index c06e763..3ebb024 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -85,12 +85,15 @@ build-pidgin: build-firefox: config/dot_mozconfig $(FIREFOX_DIR) cp config/dot_mozconfig $(FIREFOX_DIR)/mozconfig cp branding/* $(FIREFOX_DIR)/browser/branding/official - cd $(FIREFOX_DIR) && make -f client.mk build package INNER_MAKE_PACKAGE=true + cd $(FIREFOX_DIR) && make -f client.mk build touch $(STAMP_DIR)/build-firefox copy-firefox: -rm -rf $(BUILD_DIR)/Firefox - cp -r $(FIREFOX_DIR)/obj-$(ARCH_TYPE)-*/dist/firefox/* $(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 $(BUILD_DIR) + cd $(BUILD_DIR) && tar -xvjf firefox-$(FIREFOX_VER).en-US.linux-$(ARCH_TYPE).tar.bz2 && mv firefox Firefox build-all-binaries: source-dance build-zlib build-openssl build-libpng build-qt build-vidalia build-libevent build-tor build-firefox echo "If we're here, we've done something right."

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 06 Jun '12

06 Jun '12

commit 203c7427a203db62ec8db7787e8468e7322065db Merge: 127a3cd 44f116b Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Jun 6 19:44:48 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/linux.mk | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)

1 0

[torbrowser/master] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 06 Jun '12

06 Jun '12

commit 203c7427a203db62ec8db7787e8468e7322065db Merge: 127a3cd 44f116b Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Jun 6 19:44:48 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/linux.mk | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)

1 0

[torbrowser/master] Revert "Linux: Update the Firefox package sequence to a sane variant."
by erinn＠torproject.org 06 Jun '12

06 Jun '12

commit 44f116bda052295d26250101f861b08ef4e75edf Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Jun 6 19:44:29 2012 -0300 Revert "Linux: Update the Firefox package sequence to a sane variant." This reverts commit 05d3f1baffd6fd17fa47d847f90b9d60f0eca1ef. --- build-scripts/linux.mk | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index c06e763..3ebb024 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -85,12 +85,15 @@ build-pidgin: build-firefox: config/dot_mozconfig $(FIREFOX_DIR) cp config/dot_mozconfig $(FIREFOX_DIR)/mozconfig cp branding/* $(FIREFOX_DIR)/browser/branding/official - cd $(FIREFOX_DIR) && make -f client.mk build package INNER_MAKE_PACKAGE=true + cd $(FIREFOX_DIR) && make -f client.mk build touch $(STAMP_DIR)/build-firefox copy-firefox: -rm -rf $(BUILD_DIR)/Firefox - cp -r $(FIREFOX_DIR)/obj-$(ARCH_TYPE)-*/dist/firefox/* $(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 $(BUILD_DIR) + cd $(BUILD_DIR) && tar -xvjf firefox-$(FIREFOX_VER).en-US.linux-$(ARCH_TYPE).tar.bz2 && mv firefox Firefox build-all-binaries: source-dance build-zlib build-openssl build-libpng build-qt build-vidalia build-libevent build-tor build-firefox echo "If we're here, we've done something right."

1 0