[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [torbrowser/master] update osx makefile with Sebastian's stable TBB changes

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [torbrowser/master] update osx makefile with Sebastian's stable TBB changes
From: erinn@xxxxxxxxxxxxxx
Date: Sun, 15 Jul 2012 20:05:58 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Sun, 15 Jul 2012 16:06:14 -0400
List-archive: <http://lists.torproject.org/pipermail/tor-commits>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: "auto: code repository commits" <tor-commits.lists.torproject.org>
List-post: <mailto:tor-commits@lists.torproject.org>
List-subscribe: <https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=subscribe>
List-unsubscribe: <https://lists.torproject.org/cgi-bin/mailman/options/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=unsubscribe>
Patch-author: Erinn Clark <erinn@xxxxxxxxxxxxxx>
Sender: tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx
commit d5cc045c14042224137a120db4a91f2ad211b18b
Author: Erinn Clark <erinn@xxxxxxxxxxxxxx>
Date:   Sun Jul 15 21:54:45 2012 +0200

    update osx makefile with Sebastian's stable TBB changes
---
 build-scripts/osx-alpha.mk |  269 +++++++++++++++++++-------------------------
 1 files changed, 117 insertions(+), 152 deletions(-)

diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk
index ddc796e..fc6479b 100644
--- a/build-scripts/osx-alpha.mk
+++ b/build-scripts/osx-alpha.mk
@@ -5,134 +5,129 @@
 ### Copyright 2009, 2010 Jacob Appelbaum <jacob@xxxxxxxxxxxxx>
 ### Copyright 2010 Erinn Clark <erinn@xxxxxxxxxxxxxx>
 ###
-### You want to do the following currently supported activities:
-# This downloads and compiles everything
-### make -f osx-alpha.mk build-all-binaries
-# This makes a generic bundle
-### make -f osx-alpha.mk generic-bundle
-# This makes the English bundle
-### make -f osx-alpha.mk bundle_en-US
-# This makes the German bundle
-### make -f osx-alpha.mk bundle_de
-# This makes the German compressed bundle
-### make -f osx-alpha.mk compressed-bundle_de
-# It's possible you may also want to do:
-### make -f osx-alpha.mk build-all-binaries
-### make -f osx-alpha.mk all-compressed-bundles
-### ...
-### Look in tbbosx-alpha-dist/ for your files.
-###
 ### See LICENSE for licensing information
 ###
-### $Id: Makefile 19973 2009-07-12 02:26:03Z phobos $
-###
 
 #####################
 ### Configuration ###
 #####################
 
-## Include versions
-include $(PWD)/versions-alpha.mk
 
 ## Architecture
 ARCH_TYPE=i386
-BUILD_NUM=2
+BUILD_NUM=1
 PLATFORM=MacOS
 
-## Location of directory for source unpacking
-FETCH_DIR=$(PWD)/build-alpha-$(ARCH_TYPE)
+## Set OSX-specific backwards compatibility options
+OSX_VERSION=10.5
+CC=
+# These can probably be left alone for OSX_VERSION 10.5 and up
+SDK_PATH=/Developer/SDKs/MacOSX10.6.sdk
+SDK=-sdk $(SDK_PATH)
+MIN_VERSION=-mmacosx-version-min=$(OSX_VERSION)
+CF_MIN_VERSION=-isysroot $(SDK_PATH)
+LD_MIN_VERSION=-Wl,-syslibroot,$(SDK_PATH)
+BACKWARDS_COMPAT=$(MIN_VERSION) $(CF_MIN_VERSION) $(LD_MIN_VERSION)
+
+## Build machine specific settings
+# Number of cpu cores used to build in parallel
+NUM_CORES=4
+
+## 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-alpha-dist
 
-source-dance: fetch-source unpack-source
-	echo "We're ready for building now."
+## Include versions (must happen after variable definitions above
+include $(PWD)/versions-alpha.mk
 
-ZLIB_DIR=$(FETCH_DIR)/zlib-$(ZLIB_VER)
 ZLIB_OPTS=--prefix=$(BUILT_DIR)
 ZLIB_CFLAGS="-arch $(ARCH_TYPE)"
-build-zlib:
+build-zlib: $(ZLIB_DIR)
 	cd $(ZLIB_DIR) && CFLAGS=$(ZLIB_CFLAGS) ./configure $(ZLIB_OPTS)
-	cd $(ZLIB_DIR) && make
+	cd $(ZLIB_DIR) && make -j $(NUM_CORES)
 	cd $(ZLIB_DIR) && make install
+	touch $(STAMP_DIR)/build-zlib
 
-OPENSSL_DIR=$(FETCH_DIR)/openssl-$(OPENSSL_VER)
-OPENSSL_OPTS=-no-rc5 -no-md2 -no-man shared zlib -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk -Wl,-syslibroot,/Developer/SDKs/MacOSX10.5.sdk --prefix=$(BUILT_DIR) --openssldir=$(BUILT_DIR) -L$(BUILT_DIR)/lib -I$(BUILT_DIR)/include
-build-openssl:
-	cp ../src/current-patches/openssl/000* $(OPENSSL_DIR)
-	cp patch-any-src.sh $(OPENSSL_DIR)
-	cd $(OPENSSL_DIR) && ./patch-any-src.sh
+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)
 ifeq (x86_64,$(ARCH_TYPE))
 	cd $(OPENSSL_DIR) && ./Configure darwin64-x86_64-cc $(OPENSSL_OPTS)
 else
 	cd $(OPENSSL_DIR) && ./Configure darwin-i386-cc $(OPENSSL_OPTS)
 endif
 	cd $(OPENSSL_DIR) && make depend
+# Do not use -j for the following make call, random build errors might happen.
 	cd $(OPENSSL_DIR) && make
-	cd $(OPENSSL_DIR) && make install
+	cd $(OPENSSL_DIR) && make install_sw
+	touch $(STAMP_DIR)/build-openssl
 
-QT_DIR=$(FETCH_DIR)/qt-everywhere-opensource-src-$(QT_VER)
-QT_BUILD_PREFS=-qt-zlib -universal -confirm-license -opensource -openssl-linked -no-qt3support \
-	-fast -release -no-framework -nomake demos -nomake examples -sdk /Developer/SDKs/MacOSX10.5.sdk/
+
+QT_BUILD_PREFS=-system-zlib -confirm-license -opensource -openssl-linked -no-qt3support \
+	-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-qt: build-zlib build-openssl $(QT_DIR)
 	cd $(QT_DIR) && ./configure $(QT_OPTS)
-	cd $(QT_DIR) && make -j2
+	cd $(QT_DIR) && make -j $(NUM_CORES)
 	cd $(QT_DIR) && make install
+	touch $(STAMP_DIR)/build-qt
 
-QTSCRIPT_DIR=$(FETCH_DIR)/qtscriptgenerator
-QTSCRIPT_OPTS=
+QTSCRIPT_DIR=$(BUILD_DIR)/qtscriptgenerator
 build-qtscript:
-	cd $(QTSCRIPT_DIR)/generator && qmake -spec macx-g++
+	cd $(QTSCRIPT_DIR)/generator && $(BUILT_DIR)/bin/qmake -spec macx-g++
 	cd $(QTSCRIPT_DIR)/generator && make -j4
-	cd $(QTSCRIPT_DIR)/generator && ./generator --include-paths=/usr/include/
+
+build-qtscript2:
+	cd $(QTSCRIPT_DIR)/generator && ./generator --include-paths=$(BUILT_DIR)/include
 	cp ../src/current-patches/qt/000* $(QTSCRIPT_DIR)/qtbindings/qtscript_uitools
 	cp patch-any-src.sh $(QTSCRIPT_DIR)/qtbindings/qtscript_uitools
 	cd $(QTSCRIPT_DIR)/qtbindings/qtscript_uitools && ./patch-any-src.sh
-	cd $(QTSCRIPT_DIR)/generator && qmake -spec macx-g++
+	cd $(QTSCRIPT_DIR)/generator && $(BUILT_DIR)/bin/qmake -spec macx-g++
 	cd $(QTSCRIPT_DIR)/generator && make -j4
-	cd $(QTSCRIPT_DIR)/qtbindings && qmake  -spec macx-g++ -recursive CONFIG+="release"
+
+build-qtscript3:
+	cd $(QTSCRIPT_DIR)/qtbindings && $(BUILT_DIR)/bin/qmake -spec macx-g++ -recursive CONFIG+="release"
 build-qtfoo:
 	cd $(QTSCRIPT_DIR)/qtbindings && for i in $(ls -d qtscript_*); do make -C $i release; done
 
-VIDALIA_DIR=$(FETCH_DIR)/vidalia-$(VIDALIA_VER)
-VIDALIA_OPTS=-DQT_QMAKE_EXECUTABLE=/usr/bin/qmake -DSCRIPT_DIR=$(QTSCRIPT_DIR)/plugins/script -DTOR_SOURCE_DIR=$(TOR_DIR) ..
-build-vidalia:
-	export MACOSX_DEPLOYMENT_TARGET=10.5
+
+
+VIDALIA_OPTS=-DCMAKE_OSX_ARCHITECTURES=$(ARCH_TYPE) -DQT_QMAKE_EXECUTABLE=$(BUILT_DIR)/bin/qmake \
+	-DSCRIPT_DIR=$(QTSCRIPT_DIR)/plugins/script -DTOR_SOURCE_DIR=$(TOR_DIR) ..
+build-vidalia: build-openssl build-qt $(VIDALIA_DIR)
 	-mkdir $(VIDALIA_DIR)/build
-	cd $(VIDALIA_DIR)/build && cmake $(VIDALIA_OPTS) \
-	&& make && make dist-osx-bundle
+	cd $(VIDALIA_DIR)/build && \
+	MACOSX_DEPLOYMENT_TARGET=$(OSX_VERSION) cmake $(VIDALIA_OPTS) \
+	&& make -j $(NUM_CORES) && make dist-osx
 	cd $(VIDALIA_DIR)/build && DESTDIR=$(BUILT_DIR) make install
+	cp -r $(QT_DIR)/src/gui/mac/qt_menu.nib $(VIDALIA)/Contents/Resources/
+	touch $(STAMP_DIR)/build-vidalia
 
-LIBEVENT_DIR=$(FETCH_DIR)/libevent-$(LIBEVENT_VER)
-LIBEVENT_CFLAGS="-O -g -arch $(ARCH_TYPE) -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk -arch $(ARCH_TYPE)"
-LIBEVENT_LDFLAGS="-L$(BUILT_DIR)/lib -Wl,-syslibroot,/Developer/SDKs/MacOSX10.5.sdk"
-LIBEVENT_OPTS=--prefix=$(BUILT_DIR) --enable-static --disable-shared --disable-dependency-tracking CC="gcc-4.0"
-build-libevent:
+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)
 	cd $(LIBEVENT_DIR) && CFLAGS=$(LIBEVENT_CFLAGS) LDFLAGS=$(LIBEVENT_LDFLAGS) ./configure $(LIBEVENT_OPTS)
-	cd $(LIBEVENT_DIR) && make -j2
-	cd $(LIBEVENT_DIR) && sudo make install
-
-TOR_DIR=$(FETCH_DIR)/tor-$(TOR_VER)
-TOR_CFLAGS="-O -g -arch $(ARCH_TYPE) -I$(BUILT_DIR)/include -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk"
-TOR_LDFLAGS="-L$(BUILT_DIR)/lib -Wl,-syslibroot,/Developer/SDKs/MacOSX10.5.sdk"
-TOR_OPTS=--enable-gcc-warnings --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="gcc-4.0"
-build-tor:
-	cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) ./configure $(TOR_OPTS)
-	cd $(TOR_DIR) && make
-	cd $(TOR_DIR) && make install
-
-FIREFOX_DIR=$(FETCH_DIR)/mozilla-release
-build-firefox:
-	cp ../src/current-patches/firefox/* $(FIREFOX_DIR)
-	cp patch-any-src.sh $(FIREFOX_DIR)
-	cp $(CONFIG_SRC)/mozconfig-osx-$(ARCH_TYPE) $(FIREFOX_DIR)/mozconfig
-	cd $(FIREFOX_DIR) && ./patch-any-src.sh
+	cd $(LIBEVENT_DIR) && make -j $(NUM_CORES)
+	cd $(LIBEVENT_DIR) && make install
+	touch $(STAMP_DIR)/build-libevent
+
+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-static-openssl --enable-static-libevent --with-openssl-dir=$(BUILT_DIR)/lib --with-libevent-dir=$(BUILT_DIR)/lib --disable-dependency-tracking $(CC)
+
+build-firefox: $(FIREFOX_DIR) config/mozconfig-osx-$(ARCH_TYPE)
+	cp config/mozconfig-osx-$(ARCH_TYPE) $(FIREFOX_DIR)/mozconfig
+	cp branding/* $(FIREFOX_DIR)/browser/branding/official
 	cd $(FIREFOX_DIR) && make -f client.mk build
+	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)/TorBrowser.app
+	cp -r $(FIREFOX_DIR)/obj*/dist/*.app $(BUILD_DIR)/TorBrowser.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."
@@ -152,18 +147,12 @@ 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)/TorBrowser.app
 PIDGIN=$(COMPILED_BINS)/pidgin
 
 ## Location of utility applications
 WGET:=$(shell which wget)
 
-## Size of split archive volumes for WinRAR
-SPLITSIZE=1440k
-
-## Location of config files
-CONFIG_SRC=config
-
 ## Destination for the generic bundle
 DEST=generic-bundle
 
@@ -226,12 +215,14 @@ all-compressed-bundles: compressed-bundle_ar \
 	compressed-bundle_es-ES \
 	compressed-bundle_fa \
 	compressed-bundle_fr \
+	compressed-bundle_it \
+	compressed-bundle_ko \
 	compressed-bundle_nl \
 	compressed-bundle_pl \
 	compressed-bundle_pt-PT \
 	compressed-bundle_ru \
-	compressed-bundle_zh-CN \
-	compressed-bundle_it
+	compressed-bundle_vi \
+	compressed-bundle_zh-CN
 
 ##
 ## Cleanup
@@ -243,6 +234,7 @@ clean:
 	rm -f *~
 	rm -fr *.xpi *.jar *.zip
 	rm -fr $(NAME)_*
+	rm -f $(STAMP_DIR)/*.stamp
 	cd ../src/RelativeLink/ && $(MAKE) clean
 
 ##
@@ -253,7 +245,7 @@ clean:
 generic-bundle.stamp:
 	make -f osx-alpha.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
@@ -264,8 +256,8 @@ TB_TMPDIR=$(DEST)/Contents/SharedSupport
 directory-structure:
 	rm -fr $(DEST)
 	mkdir -p $(APPDIR)
-	mkdir -p $(APPDIR)/Firefox.app/Contents/MacOS/Data/profile
-	mkdir -p $(APPDIR)/Firefox.app/Contents/MacOS/Data/plugins
+	mkdir -p $(APPDIR)/TorBrowser.app/Contents/MacOS/Data/profile
+	mkdir -p $(APPDIR)/TorBrowser.app/Contents/MacOS/Data/plugins
 	mkdir -p $(DATADIR)/Tor
 	mkdir -p $(DATADIR)/Vidalia
 	mkdir -p $(DOCSDIR)
@@ -274,11 +266,19 @@ directory-structure:
 ## Package up all the Vidalia and Tor pre-requisites
 ## Firefox and Pidgin are installed in their own targets
 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
-	# Tor (perhaps we want tor-resolve too?)
 	cp $(TOR) $(APPDIR)
 
+VIDALIA_PLUGINS=$(BUILD_DIR)/vidalia-plugins
+install-plugins:
+	mkdir -p $(DATADIR)/Vidalia/plugins
+	cp -r $(VIDALIA_PLUGINS)/tbb $(DATADIR)/Vidalia/plugins
+	cp -r $(BUILD_DIR)/qtscriptgenerator/plugins/script $(APPDIR)/Vidalia.app/Contents/MacOS/
+
 ## Fixup
 ## Collect up license files
 install-docs:
@@ -287,7 +287,7 @@ install-docs:
 	mkdir -p $(DOCSDIR)/Qt
 	cp $(VIDALIA_DIR)/LICENSE* $(VIDALIA_DIR)/CREDITS $(DOCSDIR)/Vidalia
 	cp $(TOR_DIR)/LICENSE $(TOR_DIR)/README $(DOCSDIR)/Tor
-	#cp $(QT_DIR)/LICENSE.GPL* $(QT_DIR)/LICENSE.LGPL $(DOCSDIR)/Qt
+	cp $(QT_DIR)/LICENSE.GPL* $(QT_DIR)/LICENSE.LGPL $(DOCSDIR)/Qt
 	cp ../changelog.osx-2.3 $(DOCSDIR)/changelog
 	cp ../LICENSE $(DEST)
 	cp ../README.OSX-2.3 $(DEST)/README-TorBrowserBundle
@@ -296,29 +296,30 @@ install-docs:
 install-firefox:
 	cp -R $(FIREFOX) $(APPDIR)
 
-## Configure Firefox, Vidalia, Polipo and Tor
+## Configure Firefox, Vidalia, and Tor
 configure-apps:
 	## Configure Firefox preferences
 	#mkdir -p $(DEST)/.mozilla/Firefox/firefox.default
-	cp -R $(CONFIG_SRC)/firefox-profiles.ini $(DEST)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profiles.ini
-	cp $(CONFIG_SRC)/bookmarks.html $(DEST)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profile
-	cp $(CONFIG_SRC)/no-polipo-4.0.js $(DEST)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profile/prefs.js
-	cp $(CONFIG_SRC)/Info.plist $(DEST)/Contents
-	cp $(CONFIG_SRC)/PkgInfo $(DEST)/Contents
-	cp $(CONFIG_SRC)/qt.conf $(DEST)/Contents/Resources
-	cp $(CONFIG_SRC)/vidalia.icns $(DEST)/Contents/Resources
+	cp -R config/firefox-profiles.ini $(DEST)/Contents/MacOS/TorBrowser.app/Contents/MacOS/Data/profiles.ini
+	cp config/bookmarks.html $(DEST)/Contents/MacOS/TorBrowser.app/Contents/MacOS/Data/profile
+	cp config/prefs.js $(DEST)/Contents/MacOS/TorBrowser.app/Contents/MacOS/Data/profile/prefs.js
+	cp config/Info.plist $(DEST)/Contents
+	cp config/PkgInfo $(DEST)/Contents
+	cp config/qt.conf $(DEST)/Contents/MacOS/Vidalia.app/Contents/Resources
+	cp config/vidalia.icns $(DEST)/Contents/Resources
 
 	## Configure Vidalia
 	mkdir -p $(DEST)/Library/Vidalia/plugins
-	cp -r $(FETCH_DIR)/vidalia-plugins/tbb $(DEST)/Library/Vidalia/plugins
+	cp -r $(BUILD_DIR)/vidalia-plugins/tbb $(DEST)/Library/Vidalia/plugins
+	mkdir -p $(DEST)/Library/Vidalia
 ifeq ($(USE_SANDBOX),1)
-	cp $(CONFIG_SRC)/alpha/vidalia.conf.ff-osx-sandbox $(DEST)/Library/Vidalia/vidalia.conf
+	cp config/vidalia.conf.ff-osx-sandbox $(DEST)/Library/Vidalia/vidalia.conf
 else
-	cp $(CONFIG_SRC)/alpha/vidalia.conf.ff-osx $(DEST)/Library/Vidalia/vidalia.conf
+	cp config/alpha/vidalia.conf.ff-osx $(DEST)/Library/Vidalia/vidalia.conf
 endif
 
 	## Configure Tor
-	cp $(CONFIG_SRC)/torrc-osx $(DEST)/Library/Vidalia/torrc
+	cp config/alpha/torrc-osx $(DEST)/Library/Vidalia/torrc
 	cp $(TOR_DIR)/src/config/geoip $(DEST)/Contents/Resources/Data/Tor/geoip
 	chmod 700 $(DATADIR)/Tor
 
@@ -332,34 +333,6 @@ strip-it-stripper:
 	strip $(APPDIR)/Vidalia.app/Contents/MacOS/Vidalia
 
 ##
-## How to create required extensions
-##
-
-## Torbutton development version
-torbutton.xpi:
-	$(WGET) --no-check-certificate -O $@ $(TORBUTTON)
-
-## BetterPrivacy
-betterprivacy.xpi:
-	$(WGET) --no-check-certificate -O $@ $(BETTERPRIVACY)
-
-## NoScript development version
-noscript.xpi:
-	$(WGET) --no-check-certificate -O $@ $(NOSCRIPT)
-
-## HTTPS Everywhere
-httpseverywhere.xpi:
-	$(WGET) --no-check-certificate -O $@ $(HTTPSEVERYWHERE)
-
-## Generic language pack rule
-langpack_%.xpi:
-	$(WGET) --no-check-certificate -O $@ $(MOZILLA_LANGUAGE)/$*.xpi
-
-## English comes as default
-#langpack_en-US.xpi:
-#	touch $@
-
-##
 ## Customize the bundle
 ##
 
@@ -368,8 +341,8 @@ bundle_%:
 compressed-bundle_%:
 	LANGCODE=$* make -f osx-alpha.mk compressed-bundle-localized
 bundle-localized_%.stamp:
-	make -f osx-alpha.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
+	make -f osx-alpha.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
 
@@ -378,7 +351,7 @@ compressed-bundle-localized: bundle-localized_$(LANGCODE).stamp
 	-mkdir $(DISTDIR)
 	#hdiutil create -volname "Tor Browser Bundle for OS X" -format UDBZ -imagekey zlib-level=9 -srcfolder $(DISTDIR)/tmp/ $(DISTDIR)/$(DEFAULT_COMPRESSED_BASENAME)$(LANGCODE).dmg
 	zip -r $(DISTDIR)/$(DEFAULT_COMPRESSED_BASENAME)$(LANGCODE).zip $(NAME)_$(LANGCODE).app
-	rm *.zip *.xpi
+	-rm -f *.zip *.xpi
 
 copy-files_%: generic-bundle.stamp
 	rm -fr $(NAME)_$*
@@ -402,23 +375,15 @@ install-extensions: $(DEFAULT_EXTENSIONS)
 
 ## Language extensions need to be handled differently from other extensions
 
-fix-install-rdf: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi)
-ifneq ($(LANGCODE), en-US)
-	rm -fr xx
-	mkdir xx
-	(cd xx && unzip ../langpack_$(LANGCODE).xpi && sed -i -e "s/em:maxVersion>6.0.1/em:maxVersion>6.0.*/" install.rdf && zip  -r ../langpack_$(LANGCODE).xpi .)
-endif
-
 install-lang-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi)
 ifneq ($(LANGCODE), en-US)
 	mkdir -p $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/
 	cp langpack_$(LANGCODE).xpi $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/langpack-$(LANGCODE)@firefox.mozilla.org.xpi
 endif
 
-install-betterprivacy: betterprivacy.xpi
-	mkdir -p $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/\{d40f5e7b-d2cf-4856-b441-cc613eeffbe3\}
-	cp betterprivacy.xpi $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/\{d40f5e7b-d2cf-4856-b441-cc613eeffbe3\}/betterprivacy.zip
-	(cd $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/\{d40f5e7b-d2cf-4856-b441-cc613eeffbe3\} && unzip *.zip && rm *.zip)
+install-torbutton: torbutton.xpi
+	mkdir -p $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/
+	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@xxxxxxx
@@ -440,21 +405,21 @@ patch-pidgin-language:
 	## Patch Pidgin
 ifeq ($(USE_PIDGIN),1)
 	./patch-pidgin-language.sh $(BUNDLE)/PidginPortable/Data/settings/PidginPortableSettings.ini $(LANGCODE) \
-                                   $(BUNDLE)/PidginPortable/App/Pidgin/locale \
-                                   $(BUNDLE)/PidginPortable/App/GTK/share/locale
+	$(BUNDLE)/PidginPortable/App/Pidgin/locale \
+	$(BUNDLE)/PidginPortable/App/GTK/share/locale
 endif
 
 patch-firefox-language:
 	## Patch the default Firefox prefs.js
 	## Don't use {} because they aren't always interpreted correctly. Thanks, sh. 
-	cp $(CONFIG_SRC)/no-polipo-4.0.js $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js
-	cp $(CONFIG_SRC)/bookmarks.html $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile
+	cp config/prefs.js $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js
+	cp config/bookmarks.html $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile
 	./patch-firefox-language.sh $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js $(LANGCODE) -e
 
 ## Fix prefs.js since extensions.checkCompatibility, false doesn't work
 update-extension-pref:
 	sed -i -e "s/SHPONKA/$(LANGCODE)/g" $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js
-	sed -i -e "s/SHPONKA/$(LANGCODE)/g" $(BUNDLE)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profile/prefs.js
+	sed -i -e "s/SHPONKA/$(LANGCODE)/g" $(BUNDLE)/Contents/MacOS/TorBrowser.app/Contents/MacOS/Data/profile/prefs.js
 
 print-version:
 	@echo $(RELEASE_VER)-$(BUILD_NUM)



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
Prev by Author: [tor-commits] [torbrowser/master] update noscript and bundle version number
Next by Author: [tor-commits] [torbrowser/maint-2.3] alpha: bump firefox to 14.0.1
Previous by thread: [tor-commits] [torbrowser/master] update noscript and bundle version number
Next by thread: [tor-commits] r25713: {website} genericize skypemorph for now (website/trunk/docs/en)
Index(es):
- Author
- Thread