[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[or-cvs] r22361: {torbrowser} update library and path names for osx (torbrowser/trunk/build-scripts)

To: or-cvs@xxxxxxxxxxxxx
Subject: [or-cvs] r22361: {torbrowser} update library and path names for osx (torbrowser/trunk/build-scripts)
From: Erinn Clark <erinn@xxxxxxxxxxxxxx>
Date: Tue, 18 May 2010 22:34:47 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivered-to: or-cvs-outgoing@xxxxxxxx
Delivered-to: or-cvs@xxxxxxxx
Delivery-date: Tue, 18 May 2010 18:35:05 -0400
Reply-to: or-dev@xxxxxxxxxxxxx
Sender: owner-or-cvs@xxxxxxxxxxxxx

Author: erinn
Date: 2010-05-18 22:34:47 +0000 (Tue, 18 May 2010)
New Revision: 22361

Modified:
   torbrowser/trunk/build-scripts/Makefile.osx
Log:
update library and path names for osx

Modified: torbrowser/trunk/build-scripts/Makefile.osx
===================================================================
--- torbrowser/trunk/build-scripts/Makefile.osx	2010-05-18 19:29:03 UTC (rev 22360)
+++ torbrowser/trunk/build-scripts/Makefile.osx	2010-05-18 22:34:47 UTC (rev 22361)
@@ -7,18 +7,18 @@
 ###
 ### You want to do the following currently supported activities:
 # This downloads and compiles everything
-### make -f Makefile.linux build-all-binaries
+### make -f Makefile.osx build-all-binaries
 # This makes a generic bundle
-### make -f Makefile.linux generic-bundle
+### make -f Makefile.osx generic-bundle
 # This makes the English bundle
-### make -f Makefile.linux bundle_en-US
+### make -f Makefile.osx bundle_en-US
 # This makes the German bundle
-### make -f Makefile.linux bundle_de
+### make -f Makefile.osx bundle_de
 # This makes the German compressed bundle
-### make -f Makefile.linux compressed-bundle_de 
+### make -f Makefile.osx compressed-bundle_de 
 # It's possible you may also want to do:
-### make -f Makefile.linux build-all-binaries
-### make -f Makefile.linux all-compressed-bundles
+### make -f Makefile.osx build-all-binaries
+### make -f Makefile.osx all-compressed-bundles
 ### ...
 ### Look in tbbl-dist/ for your files.
 ###
@@ -35,7 +35,7 @@
 ARCH_TYPE=$(shell uname -m)
 
 ## Location of directory for source unpacking
-FETCH_DIR=/build
+FETCH_DIR=/tmp
 ## Location of directory for prefix/destdir/compiles/etc
 BUILT_DIR=$(FETCH_DIR)/built
 TBB_FINAL=$(BUILT_DIR)/TBBL
@@ -44,9 +44,9 @@
 ZLIB_VER=1.2.3
 OPENSSL_VER=0.9.8l
 QT_VER=4.6.2
-VIDALIA_VER=0.2.7
+VIDALIA_VER=0.2.9
 LIBEVENT_VER=1.4.13-stable
-TOR_VER=0.2.2.10-alpha
+TOR_VER=0.2.2.13-alpha
 POLIPO_VER=1.0.4.1
 PIDGIN_VER=2.6.4
 OTR_VER=3.2.0
@@ -72,7 +72,7 @@
 ZLIB_URL=http://www.gzip.org/zlib/$(ZLIB_PACKAGE)
 OPENSSL_URL=http://www.openssl.org/source/$(OPENSSL_PACKAGE)
 QT_URL=ftp://ftp.qt.nokia.com/qt/source/$(QT_PACKAGE)
-VIDALIA_URL=https://www.torproject.org/vidalia/dist/$(VIDALIA_PACKAGE)
+VIDALIA_URL=http://www.torproject.org/vidalia/dist/$(VIDALIA_PACKAGE)
 LIBEVENT_URL=http://www.monkey.org/~provos/$(LIBEVENT_PACKAGE)
 TOR_URL=http://www.torproject.org/dist/$(TOR_PACKAGE)
 POLIPO_URL=http://www.pps.jussieu.fr/~jch/software/files/polipo/$(POLIPO_PACKAGE)
@@ -113,11 +113,7 @@
 	cd $(ZLIB_DIR) && make install
 
 OPENSSL_DIR=$(FETCH_DIR)/openssl-$(OPENSSL_VER)
-ifeq (x86_64,$(ARCH_TYPE))
 OPENSSL_OPTS=-no-idea -no-rc5 -no-md2 shared zlib --prefix=$(BUILT_DIR) --openssldir=$(BUILT_DIR) -I$(BUILT_DIR)/lib
-else
-OPENSSL_OPTS=-no-idea -no-rc5 -no-md2 zlib --prefix=$(BUILT_DIR) --openssldir=$(BUILT_DIR) -I$(BUILT_DIR)/lib
-endif
 build-openssl:
 	cd $(OPENSSL_DIR) && ./config $(OPENSSL_OPTS)
 	cd $(OPENSSL_DIR) && make depend
@@ -156,7 +152,7 @@
 TOR_OPTS=--with-openssl-dir=$(BUILT_DIR) --with-zlib-dir=$(BUILT_DIR) --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) CC="gcc-4.0"
 build-tor:
 	cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) CONFDIR=/Applications/Vidalia.app ./configure $(TOR_OPTS)
-	cd $(TOR_DIR) && make -j2
+	cd $(TOR_DIR) && make $(MAKEFLAGS)
 	cd $(TOR_DIR) && make install
 
 ## Polipo doesn't use autoconf, so we just have to hack their Makefile
@@ -188,7 +184,7 @@
 LIBEVENT=$(COMPILED_LIBS)
 
 ## Location of binary bundle components
-VIDALIA=$(BUILT_DIR)/usr/local/bin/vidalia
+VIDALIA=$(BUILT_DIR)/usr/local/bin/Vidalia.app/Contents/MacOS/Vidalia
 TOR=$(COMPILED_BINS)/tor
 POLIPO=$(COMPILED_BINS)/polipo
 ## Someday, this will be our custom Firefox
@@ -215,8 +211,8 @@
 
 ## Version and name of the compressed bundle (also used for source)
 VERSION=1.0.0-dev
-DEFAULT_COMPRESSED_BASENAME=tor-browser-gnu-linux-$(VERSION)-
-IM_COMPRESSED_BASENAME=tor-im-browser-gnu-linux-$(VERSION)-
+DEFAULT_COMPRESSED_BASENAME=tor-browser-osx-$(VERSION)-
+IM_COMPRESSED_BASENAME=tor-im-browser-osx-$(VERSION)-
 DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION)
 IM_COMPRESSED_NAME=$(IM_COMPRESSED_BASENAME)$(VERSION)
 
@@ -231,9 +227,9 @@
 
 ## Where to download Torbutton from
 #TORBUTTON=https://addons.mozilla.org/en-US/firefox/downloads/latest/2275/addon-2275-latest.xpi?src=addondetail
-TORBUTTON=https://www.torproject.org/torbutton/releases/torbutton-$(TORBUTTON_VER).xpi
-NOSCRIPT=https://secure.informaction.com/download/releases/noscript-$(NOSCRIPT_VER).xpi
-BETTERPRIVACY=https://addons.mozilla.org/en-US/firefox/downloads/latest/6623/addon-6623-latest.xpi
+TORBUTTON=http://www.torproject.org/torbutton/releases/torbutton-$(TORBUTTON_VER).xpi
+NOSCRIPT=http://secure.informaction.com/download/releases/noscript-$(NOSCRIPT_VER).xpi
+BETTERPRIVACY=http://addons.mozilla.org/en-US/firefox/downloads/latest/6623/addon-6623-latest.xpi
 ## Where to download Mozilla language packs
 MOZILLA_LANGUAGE=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(FIREFOX_VER)/linux-i686/xpi
 
@@ -255,10 +251,10 @@
 bundle: bundle_en-US
 
 all-bundles-both:
-	USE_PIDGIN=1 make -f Makefile.linux all-bundles
-	make -f Makefile.linux clean
-	USE_PIDGIN=0 make -f Makefile.linux all-bundles
-	make -f Makefile.linux clean
+	USE_PIDGIN=1 make -f Makefile.osx all-bundles
+	make -f Makefile.osx clean
+	USE_PIDGIN=0 make -f Makefile.osx all-bundles
+	make -f Makefile.osx clean
 
 all-bundles: all-compressed-bundles
 
@@ -293,7 +289,7 @@
 
 ## Install binaries, documentation, FirefoxPortable, PidginPortable, and launcher into $(DEST)
 generic-bundle.stamp:
-	make -f Makefile.linux generic-bundle
+	make -f Makefile.osx generic-bundle
 generic-bundle: directory-structure install-binaries install-docs install-firefox install-pidgin configure-apps launcher strip-it-stripper
 	touch generic-bundle.stamp
 
@@ -319,20 +315,14 @@
 ## Firefox and Pidgin are installed in their own targets
 install-binaries:
 	# A minimal set of Qt libs and the proper symlinks
-	cp -d $(QT)/libQtCore.so $(QT)/libQtCore.so.4 $(QT)/libQtCore.so.4.5 $(QT)/libQtCore.so.4.5.3 $(LIBSDIR)
-	cp -d $(QT)/libQtGui.so $(QT)/libQtGui.so.4 $(QT)/libQtGui.so.4.5 $(QT)/libQtGui.so.4.5.3 $(LIBSDIR)
-	cp -d $(QT)/libQtNetwork.so $(QT)/libQtNetwork.so.4 $(QT)/libQtNetwork.so.4.5 \
-           $(QT)/libQtNetwork.so.4.5.3 $(LIBSDIR)
-	cp -d $(QT)/libQtXml.so $(QT)/libQtXml.so.4 $(QT)/libQtXml.so.4.5 $(QT)/libQtXml.so.4.5.3 $(LIBSDIR)
 	# zlib
-	cp -d $(ZLIB)/libz.so $(ZLIB)/libz.so.1 $(ZLIB)/libz.so.1.2.3 $(LIBSDIR)
+	cp $(ZLIB)/libz.1.2.3.dylib $(ZLIB)/libz.1.dylib $(ZLIB)/libz.dylib $(LIBSDIR)
 	# Libevent
-	cp -d $(LIBEVENT)/libevent-1.4.so.2 $(LIBEVENT)/libevent-1.4.so.2.1.3 $(LIBEVENT)/libevent_core.so \
-           $(LIBEVENT)/libevent_core-1.4.so.2 $(LIBEVENT)/libevent_core-1.4.so.2.1.3 \
-           $(LIBEVENT)/libevent_extra-1.4.so.2 $(LIBEVENT)/libevent_extra-1.4.so.2.1.3 \
-           $(LIBEVENT)/libevent_extra.so $(LIBEVENT)/libevent.so $(LIBSDIR)
+	cp $(LIBEVENT)/libevent.a  $(LIBEVENT)/libevent_core.a $(LIBEVENT)/libevent_extra.a \
+	   $(LIBEVENT)/libevent.la $(LIBEVENT)/libevent_core.la $(LIBEVENT)/libevent_extra.la $(LIBSDIR)
 	# OpenSSL
-	cp $(OPENSSL)/libcrypto.a $(OPENSSL)/libssl.a $(LIBSDIR)
+	cp $(OPENSSL)/libcrypto.dylib $(OPENSSL)/libcrypto.0.9.8.dylib $(OPENSSL)/libssl.dylib \
+	   $(OPENSSL)/libssl.0.9.8.dylib $(LIBSDIR)
 	# Vidalia
 	cp $(VIDALIA) $(APPDIR)
 	# Polipo
@@ -400,8 +390,8 @@
 strip-it-stripper:
 	strip $(APPDIR)/tor
 	strip $(APPDIR)/polipo
-	strip $(APPDIR)/vidalia
-	strip $(LIBSDIR)/*
+	strip $(APPDIR)/Vidalia
+	#strip $(LIBSDIR)/*
 
 ##
 ## How to create required extensions
@@ -409,19 +399,19 @@
 
 ## Torbutton development version
 torbutton.xpi:
-	$(WGET) -O $@ $(TORBUTTON)
+	$(WGET) --no-check-certificate -O $@ $(TORBUTTON)
 
 ## NoScript development version
 noscript.xpi: 
-	$(WGET) -O $@ $(NOSCRIPT)
+	$(WGET) --no-check-certificate -O $@ $(NOSCRIPT)
 
 ## BetterPrivacy
 betterprivacy.xpi:
-	$(WGET) -O $@ $(BETTERPRIVACY)
+	$(WGET) --no-check-certificate -O $@ $(BETTERPRIVACY)
 
 ## Generic language pack rule
 langpack_%.xpi:
-	$(WGET) -O $@ $(MOZILLA_LANGUAGE)/$*.xpi
+	$(WGET) --no-check-certificate -O $@ $(MOZILLA_LANGUAGE)/$*.xpi
 
 ## English comes as default
 #langpack_en-US.xpi:
@@ -432,12 +422,12 @@
 ##
 
 bundle_%:
-	LANGCODE=$* make -f Makefile.linux bundle-localized
+	LANGCODE=$* make -f Makefile.osx bundle-localized
 compressed-bundle_%:
-	LANGCODE=$* make -f Makefile.linux compressed-bundle-localized
+	LANGCODE=$* make -f Makefile.osx compressed-bundle-localized
 
 bundle-localized_%.stamp:
-	make -f Makefile.linux copy-files_$* install-extensions install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref
+	make -f Makefile.osx copy-files_$* install-extensions install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref
 	touch bundle-localized_$*.stamp
 
 bundle-localized: bundle-localized_$(LANGCODE).stamp

Prev by Author: [or-cvs] r22346: {torbrowser} fix fetch dir (torbrowser/trunk/build-scripts)
Next by Author: [or-cvs] r22369: {projects} bump versions to orbot 0.0.6 and tor 0.2.2.13 (in projects/android/trunk/Orbot: . res/layout res/values)
Previous by thread: [or-cvs] r22360: {website} rewrite the links to the wiki. (website/trunk/en)
Next by thread: [or-cvs] r22362: {torbrowser} quick rename for mac os x (torbrowser/trunk/build-scripts)
Index(es):
- Author
- Thread