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

[torbrowser/maint-2.3] OSX: Add a document describing the setup of macx86.tpo
by erinn＠torproject.org 23 Apr '12

23 Apr '12

commit b30fdcd5c7304cab237754a9e367f4d120e97966 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Apr 17 16:36:49 2012 +0200 OSX: Add a document describing the setup of macx86.tpo --- docs/buildmachine_setups/osx.txt | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/docs/buildmachine_setups/osx.txt b/docs/buildmachine_setups/osx.txt new file mode 100644 index 0000000..7093859 --- /dev/null +++ b/docs/buildmachine_setups/osx.txt @@ -0,0 +1,37 @@ +Documentation for the setup of macx86.torproject.org + +Install Mac OS X Lion 10.7, get all updates. + +Download XCode 4.2.1 from +https://developer.apple.com/downloads/index.action, install. This puts +an Install Xcode.app into your applications, manually run the contained +installer script (don't just run the .app). It is in +Contents/MacOS/Install Xcode. + +Fetch macports from http://www.macports.org/install.php - choose the +Lion installer, install. This will change your PATH variable via your +~/.profile file. Run sudo port selfupdate. + +First off, we need a bit of software, so install it: + + sudo port install git-core wget cmake autoconf213 yasm + +This will probably prompt you to install java stuff, do it. + +Create a new limited (non-admin) "macx86builder" User to do the builds. + +Create a new directory, /builds, and chown it to macx86builder. + +sudo to macx86builder + + "sudo -u macx86builder -i" + +Then run these: + + cd /builds/ + git clone https://git.torproject.org/torbrowser + cd torbrowser + git checkout maint-2.2 + cd build-scripts + make -f osx.mk build-all-binaries copy-firefox bundle +

1 0

[torbrowser/maint-2.3] OSX: Correctly set min version for Vidalia
by erinn＠torproject.org 23 Apr '12

23 Apr '12

commit e513c36dc9d7825d27dd511caee84c846ce01117 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Apr 18 04:01:06 2012 +0200 OSX: Correctly set min version for Vidalia Each line in a make rule gets executed in its own shell, so exporting something in one line means it'll be gone in the next. We only need the MACOSX_DEPLOYMENT_TARGET during cmake, so only set it there. Fixes bug 4263. --- build-scripts/osx.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 493052e..6a4bac5 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -78,9 +78,9 @@ build-qt: build-zlib build-openssl $(QT_DIR) VIDALIA_OPTS=-DCMAKE_OSX_ARCHITECTURES=$(ARCH_TYPE) -DQT_QMAKE_EXECUTABLE=$(BUILT_DIR)/bin/qmake \ -DCMAKE_BUILD_TYPE=debug .. build-vidalia: build-openssl build-qt $(VIDALIA_DIR) - export MACOSX_DEPLOYMENT_TARGET=$(OSX_VERSION) -mkdir $(VIDALIA_DIR)/build - cd $(VIDALIA_DIR)/build && cmake $(VIDALIA_OPTS) \ + cd $(VIDALIA_DIR)/build && \ + MACOSX_DEPLOYMENT_TARGET=$(OSX_VERSION) cmake $(VIDALIA_OPTS) \ && make -j $(NUM_CORES) && make dist-osx-libraries cd $(VIDALIA_DIR)/build && DESTDIR=$(BUILT_DIR) make install cp -r $(QT_DIR)/src/gui/mac/qt_menu.nib $(VIDALIA)/Contents/Resources/

1 0

[torbrowser/maint-2.3] OSX: Add patch to change tbb paths inside vidalia
by erinn＠torproject.org 23 Apr '12

23 Apr '12

commit 83572fcf2697daa55a2067d814cf6e761a1b94b1 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Apr 18 02:09:08 2012 +0200 OSX: Add patch to change tbb paths inside vidalia Once the next Vidalia release is out, we'll want to just revert this patch. --- build-scripts/versions.mk | 5 ++ .../0001-Adapt-paths-etc-for-OS-X-TBB.patch | 61 ++++++++++++++++++++ 2 files changed, 66 insertions(+), 0 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index ee29c6b..1710582 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -187,6 +187,11 @@ $(OPENSSL_DIR): $(FETCH_DIR)/$(OPENSSL_PACKAGE) ../src/current-patches/openssl/* $(VIDALIA_DIR): $(FETCH_DIR)/$(VIDALIA_PACKAGE) | $(BUILD_DIR) rm -rf $(VIDALIA_DIR) cd $(FETCH_DIR) && tar -xmf $(VIDALIA_PACKAGE) -C $(BUILD_DIR)/ +ifeq (MacOS,$(PLATFORM)) + cp ../src/current-patches/vidalia/*patch $(VIDALIA_DIR) + cp patch-any-src.sh $(VIDALIA_DIR) + cd $(VIDALIA_DIR) && ./patch-any-src.sh +endif $(LIBEVENT_DIR): $(FETCH_DIR)/$(LIBEVENT_PACKAGE) | $(BUILD_DIR) rm -rf $(LIBEVENT_DIR) diff --git a/src/current-patches/vidalia/0001-Adapt-paths-etc-for-OS-X-TBB.patch b/src/current-patches/vidalia/0001-Adapt-paths-etc-for-OS-X-TBB.patch new file mode 100644 index 0000000..d546ae1 --- /dev/null +++ b/src/current-patches/vidalia/0001-Adapt-paths-etc-for-OS-X-TBB.patch @@ -0,0 +1,61 @@ +From c06d989faabadfa643dfd4a34abae549f4eef213 Mon Sep 17 00:00:00 2001 +From: Sebastian Hahn <sebastian(a)torproject.org> +Date: Wed, 18 Apr 2012 02:01:36 +0200 +Subject: [PATCH] Adapt paths etc for OS X TBB + +--- + src/vidalia/MainWindow.cpp | 21 ++++++++++++--------- + 1 file changed, 12 insertions(+), 9 deletions(-) + +diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp +index d170d47..6835b1e 100644 +--- a/src/vidalia/MainWindow.cpp ++++ b/src/vidalia/MainWindow.cpp +@@ -619,24 +619,27 @@ MainWindow::launchBrowserFromDirectory() + + /* The browser is in <browserDirectory>/App/Firefox/<browserDirectoryFilename> */ + QString browserExecutable = +- QDir::toNativeSeparators(browserDirectory + "/App/Firefox/" + browserDirectoryFilename); ++ QDir::toNativeSeparators(browserDirectory + "/Contents/MacOS/Firefox.app/Contents/MacOS/" + browserDirectoryFilename); + /* The profile is in <browserDirectory>/Data/profile */ + QString profileDir = +- QDir::toNativeSeparators(browserDirectory + "/Data/profile"); ++ QDir::toNativeSeparators(browserDirectory + "/Library/Application Support/Firefox/Profiles/profile"); + + /* Copy the profile directory if it's not already there */ + QDir browserDirObj = QDir(browserDirectory); + + /* Copy the profile directory if it's not already there */ +- if (!browserDirObj.exists("Data/profile")) { +- browserDirObj.mkdir("Data/profile"); +- copy_dir(browserDirectory + "/App/DefaultData/profile", browserDirectory + "/Data/profile"); ++ if (!browserDirObj.exists("Library/Application Support/Firefox/Profiles/profile")) { ++ browserDirObj.mkdir("Library/Application Support/Firefox/Profiles/profile"); ++ QString src = browserDirectory + "/Contents/MacOS/Firefox.app/Contents/MacOS/defaults/profile"; ++ QString dst = profileDir; ++ vNotice("Copying '%1' to '%2'").arg(src).arg(dst); ++ copy_dir(src, dst); + } + + /* Copy the plugins directory if it's not already there */ +- if (!browserDirObj.exists("Data/plugins")) { +- browserDirObj.mkdir("Data/plugins"); +- copy_dir(browserDirectory + "/App/DefaultData/plugins", browserDirectory + "/Data/plugins"); ++ if (!browserDirObj.exists("MacOS/Data/plugins")) { ++ browserDirObj.mkdir("MacOS/Data/plugins"); ++ copy_dir(browserDirectory + "/MacOS/Data/plugins", browserDirectory + "/MacOS/Data/plugins"); + } + + /* Build the command line arguments */ +@@ -644,7 +647,7 @@ MainWindow::launchBrowserFromDirectory() + // Is this better or worse than MOZ_NO_REMOTE? + commandLine << "-no-remote"; + commandLine << "-profile"; +- commandLine << profileDir; ++ commandLine << QDir::currentPath () + "/" + profileDir; + + /* Launch the browser */ + if(!_browserProcess->state() != QProcess::NotRunning) +-- +1.7.9.6 +

1 0

[torbrowser/maint-2.3] Update libpng to 1.5.10
by erinn＠torproject.org 23 Apr '12

23 Apr '12

commit 6581709f4d1e4dc77f7b81076e02b3c7da110a9b Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sat Apr 21 12:29:57 2012 +0200 Update libpng to 1.5.10 --- build-scripts/versions.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 1710582..937b451 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -4,7 +4,7 @@ RELEASE_VER=2.2.35 ZLIB_VER=1.2.6 OPENSSL_VER=1.0.0h -LIBPNG_VER=1.5.9 +LIBPNG_VER=1.5.10 QT_VER=4.8.1 VIDALIA_VER=0.2.17 LIBEVENT_VER=2.0.17-stable

1 0

[torbrowser/maint-2.3] OSX: work around dist-osx-libraries target breakage
by erinn＠torproject.org 23 Apr '12

23 Apr '12

commit 5c1a8e1c1bca49158c6dd82faac7229dc97c5d89 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Apr 18 03:21:03 2012 +0200 OSX: work around dist-osx-libraries target breakage Vidalia's make dist-osx-libraries target is broken for some reason. We'll just call macdeployqt manually for now --- 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 83e008a..493052e 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -249,7 +249,10 @@ directory-structure: ## Package up all the Vidalia and Tor pre-requisites ## Firefox and Pidgin are installed in their own targets -install-binaries: +install-binaries: + chmod 644 $(BUILT_DIR)/lib/libssl.* + chmod 644 $(BUILT_DIR)/lib/libcrypto.* + $(BUILT_DIR)/bin/macdeployqt $(VIDALIA) -no-plugins # Vidalia cp -R $(VIDALIA) $(APPDIR)/Vidalia.app cp $(TOR) $(APPDIR)

1 0

[torbrowser/maint-2.3] Bump openssl to 1.0.1a
by erinn＠torproject.org 23 Apr '12

23 Apr '12

commit 300c2ef5d5d69ccc12d674c1c7d59ece4ee4b78d Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon Apr 23 08:46:16 2012 +0200 Bump openssl to 1.0.1a --- build-scripts/versions.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 937b451..6b82bde 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -3,7 +3,7 @@ RELEASE_VER=2.2.35 ZLIB_VER=1.2.6 -OPENSSL_VER=1.0.0h +OPENSSL_VER=1.0.1a LIBPNG_VER=1.5.10 QT_VER=4.8.1 VIDALIA_VER=0.2.17

1 0

[torbrowser/maint-2.3] Don't build webkit when building Qt, we don't need it
by erinn＠torproject.org 23 Apr '12

23 Apr '12

commit 6044774ed216c68d9c3fb38f7583a72668375e33 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sat Apr 21 17:38:49 2012 +0200 Don't build webkit when building Qt, we don't need it --- build-scripts/osx.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 6a4bac5..a9c1b81 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -67,7 +67,7 @@ endif QT_BUILD_PREFS=-system-zlib -confirm-license -opensource -openssl-linked -no-qt3support \ - -fast -release -no-framework -nomake demos -nomake examples $(SDK) -arch $(ARCH_TYPE) + -fast -release -no-webkit -no-framework -nomake demos -nomake examples $(SDK) -arch $(ARCH_TYPE) QT_OPTS=$(QT_BUILD_PREFS) -prefix $(BUILT_DIR) -I $(BUILT_DIR)/include -I $(BUILT_DIR)/include/openssl/ -L $(BUILT_DIR)/lib build-qt: build-zlib build-openssl $(QT_DIR) cd $(QT_DIR) && ./configure $(QT_OPTS)

1 0

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

23 Apr '12

commit a7d1ca21fba87b8f3d1091e803972899531294bd Merge: 3cd7c2c 300c2ef Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Apr 23 14:20:32 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/config/mozconfig-osx-i386 | 11 ++-- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 26 +++++---- build-scripts/versions.mk | 34 ++++++++--- build-scripts/windows.mk | 6 +- docs/buildmachine_setups/osx.txt | 37 ++++++++++++ .../0001-Adapt-paths-etc-for-OS-X-TBB.patch | 61 ++++++++++++++++++++ 7 files changed, 148 insertions(+), 29 deletions(-)

1 0

[torbrowser/master] Win/OSX: Remove -O -g from libevent, tor cflags
by erinn＠torproject.org 23 Apr '12

23 Apr '12

commit 6fdf347054540320c9e624b21cd34ca4392ac4b1 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Apr 11 17:58:51 2012 +0200 Win/OSX: Remove -O -g from libevent, tor cflags --- build-scripts/osx.mk | 4 ++-- build-scripts/windows.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 68e13fe..a39eb94 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -85,7 +85,7 @@ build-vidalia: build-openssl build-qt $(VIDALIA_DIR) cd $(VIDALIA_DIR)/build && DESTDIR=$(BUILT_DIR) make install touch $(STAMP_DIR)/build-vidalia -LIBEVENT_CFLAGS="-O -g -arch $(ARCH_TYPE) $(MIN_VERSION) $(CF_MIN_VERSION) -arch $(ARCH_TYPE)" +LIBEVENT_CFLAGS="-arch $(ARCH_TYPE) $(MIN_VERSION) $(CF_MIN_VERSION) -arch $(ARCH_TYPE)" LIBEVENT_LDFLAGS="-L$(BUILT_DIR)/lib $(LD_MIN_VERSION)" LIBEVENT_OPTS=--prefix=$(BUILT_DIR) --enable-static --disable-shared --disable-dependency-tracking $(CC) build-libevent: build-zlib build-openssl $(LIBEVENT_DIR) @@ -94,7 +94,7 @@ build-libevent: build-zlib build-openssl $(LIBEVENT_DIR) cd $(LIBEVENT_DIR) && make install touch $(STAMP_DIR)/build-libevent -TOR_CFLAGS="-O -g -arch $(ARCH_TYPE) -I$(BUILT_DIR)/include $(MIN_VERSION) $(CF_MIN_VERSION)" +TOR_CFLAGS="-arch $(ARCH_TYPE) -I$(BUILT_DIR)/include $(MIN_VERSION) $(CF_MIN_VERSION)" TOR_LDFLAGS="-L$(BUILT_DIR)/lib $(LD_MIN_VERSION)" TOR_OPTS=--enable-gcc-warnings-advisory --enable-static-openssl --enable-static-libevent --with-openssl-dir=$(BUILT_DIR)/lib --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) --disable-dependency-tracking $(CC) build-tor: build-zlib build-openssl build-libevent $(TOR_DIR) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index dc8de89..505e5b6 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -86,7 +86,7 @@ build-vidalia: build-openssl $(VIDALIA_DIR) cd $(VIDALIA_DIR)/build && make -j $(NUM_CORES) touch $(STAMP_DIR)/build-vidalia -LIBEVENT_CFLAGS="-I$(BUILT_DIR)/include -O -g" +LIBEVENT_CFLAGS="-I$(BUILT_DIR)/include" LIBEVENT_LDFLAGS="-L$(BUILT_DIR)/lib -L$(BUILT_DIR)/bin -Wl,--nxcompat -Wl,--dynamicbase" LIBEVENT_OPTS=--prefix=$(BUILT_DIR) --enable-static --disable-shared --disable-dependency-tracking build-libevent: build-zlib build-openssl $(LIBEVENT_DIR) @@ -95,7 +95,7 @@ build-libevent: build-zlib build-openssl $(LIBEVENT_DIR) cd $(LIBEVENT_DIR) && make install touch $(STAMP_DIR)/build-libevent -TOR_CFLAGS="-O -g -I$(BUILT_DIR)/include" +TOR_CFLAGS="-I$(BUILT_DIR)/include" TOR_LDFLAGS="-L$(BUILT_DIR)/lib -L$(BUILT_DIR)/bin" TOR_OPTS=--enable-gcc-warnings --enable-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) build-tor:PATH+=:$(BUILT_DIR)/bin

1 0

[torbrowser/master] Add targets to fetch and extract obfsproxy
by erinn＠torproject.org 23 Apr '12

23 Apr '12

commit cab58ff1b6e46305eeb75fbfce56df145b2f20ee Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon Apr 2 11:41:28 2012 +0200 Add targets to fetch and extract obfsproxy --- build-scripts/versions.mk | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 395be17..818d1d4 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -17,6 +17,7 @@ TORBUTTON_VER=1.4.5.1 NOSCRIPT_VER=2.3.4 HTTPSEVERYWHERE_VER=2.0.1 OTR_VER=3.2.0 +OBFSPROXY_VER=0.1.1 ## Extension IDs FF_VENDOR_ID:=\{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} @@ -36,7 +37,7 @@ PYMAKE_PACKAGE=$(PYMAKE_VER).tar.bz2 TORBUTTON_PACKAGE=torbutton-$(TORBUTTON_VER).xpi NOSCRIPT_PACKAGE=addon-722-latest.xpi HTTPSEVERYWHERE_PACKAGE=https-everywhere-$(HTTPSEVERYWHERE_VER).xpi - +OBFSPROXY_PACKAGE=obfsproxy-$(OBFSPROXY_VER).tar.gz ## Location of files for download ZLIB_URL=http://www.zlib.net/$(ZLIB_PACKAGE) @@ -53,6 +54,7 @@ PYMAKE_URL=https://hg.mozilla.org/users/bsmedberg_mozilla.com/pymake/archiv… TORBUTTON_URL=https://www.torproject.org/dist/torbutton/$(TORBUTTON_PACKAGE) NOSCRIPT_URL=https://addons.mozilla.org/firefox/downloads/latest/722/$(NOSC… HTTPSEVERYWHERE_URL=https://eff.org/files/$(HTTPSEVERYWHERE_PACKAGE) +OBFSPROXY_URL=https://www.torproject.org/dist/obfsproxy/$(OBFSPROXY_PACKAGE) # Provide some mappings between lower and upper case, which means we don't need # to rely on shell shenanigans when we need the upper case version. This is @@ -68,6 +70,7 @@ firefox=FIREFOX pidgin=PIDGIN mozbuild=MOZBUILD pymake=PYMAKE +obfsproxy=OBFSPROXY # The locations of the unpacked tarballs ZLIB_DIR=$(BUILD_DIR)/zlib-$(ZLIB_VER) @@ -80,6 +83,7 @@ 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) +OBFSPROXY_DIR=$(BUILD_DIR)/obfsproxy-$(OBFSPROXY_VER) # Empty targets are written in arch-dependent $(BUILD_DIR). Usual # VPATH issues documented below should be avoided as the paths of @@ -93,7 +97,7 @@ 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) ; +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)/$(OBFSPROXY_PACKAGE) | $(FETCH_DIR) ; source-dance: fetch-source unpack-source ; @@ -154,7 +158,10 @@ langpack_%.xpi: langpack_en-US.xpi: touch $@ -unpack-source: $(ZLIB_DIR) $(OPENSSL_DIR) $(LIBPNG_DIR $(QT_DIR) $(VIDALIA_DIR) $(LIBEVENT_DIR) $(TOR_DIR) $(FIREFOX_DIR) +$(FETCH_DIR)/$(OBFSPROXY_PACKAGE): | $(FETCH_DIR) + $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(OBFSPROXY_URL) + +unpack-source: $(ZLIB_DIR) $(OPENSSL_DIR) $(LIBPNG_DIR $(QT_DIR) $(VIDALIA_DIR) $(LIBEVENT_DIR) $(TOR_DIR) $(FIREFOX_DIR) $(OBFSPROXY_DIR) $(ZLIB_DIR): $(FETCH_DIR)/$(ZLIB_PACKAGE) | $(BUILD_DIR) @@ -213,22 +220,26 @@ $(PYMAKE_DIR): $(FETCH_DIR)/$(PYMAKE_PACKAGE) | $(BUILD_DIR) rm -rf $(PYMAKE_DIR) cd $(FETCH_DIR) && tar -xmf $(PYMAKE_PACKAGE) -C $(BUILD_DIR)/ +$(OBFSPROXY_DIR): $(FETCH_DIR)/$(OBFSPROXY_PACKAGE) | $(BUILD_DIR) + rm -rf $(OBFSPROXY_DIR) + cd $(FETCH_DIR) && tar -xmf $(OBFSPROXY_PACKAGE) -C $(BUILD_DIR)/ + clean-fetch-%: rm -rf $(FETCH_DIR)/$($($*)_PACKAGE) -clean-fetch: clean-fetch-zlib clean-fetch-libpng clean-fetch-qt clean-fetch-openssl clean-fetch-vidalia clean-fetch-libevent clean-fetch-tor clean-fetch-firefox +clean-fetch: clean-fetch-zlib clean-fetch-libpng clean-fetch-qt clean-fetch-openssl clean-fetch-vidalia clean-fetch-libevent clean-fetch-tor clean-fetch-firefox clean-fetch-obfsproxy clean-unpack-%: rm -rf $($($*)_DIR) -clean-unpack: clean-unpack-zlib clean-unpack-libpng clean-unpack-qt clean-unpack-openssl clean-unpack-vidalia clean-unpack-libevent clean-unpack-tor clean-unpack-firefox +clean-unpack: clean-unpack-zlib clean-unpack-libpng clean-unpack-qt clean-unpack-openssl clean-unpack-vidalia clean-unpack-libevent clean-unpack-tor clean-unpack-firefox clean-unpack-obfsproxy clean-build-%: rm -rf $($($*)_DIR) rm -rf build-$* -clean-build: clean-build-zlib clean-build-libpng clean-build-qt clean-build-openssl clean-build-vidalia clean-build-libevent clean-build-tor clean-build-firefox +clean-build: clean-build-zlib clean-build-libpng clean-build-qt clean-build-openssl clean-build-vidalia clean-build-libevent clean-build-tor clean-build-firefox clean-build-obfsproxy .PHONY: clean-fetch clean-unpack clean-build

1 0