commit 630ef178b42b835f74ba7d543e679e07e8b03df4 Author: Erinn Clark <erinn@torproject.org> Date: Tue Jan 18 06:15:04 2011 +0100 update changelog, comment out old dylib stuff in makefile 'til we're sure statically built tor works --- README | 3 --- README.OSX | 4 ++++ build-scripts/osx.mk | 16 ++++++++-------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/README b/README index 9730ead..7085c52 100644 --- a/README +++ b/README @@ -320,6 +320,3 @@ Changelog 1.3.17: Released 2011-01-16 Update Tor to 0.2.1.29 - -1.3.18: Released 2011-??-?? - Update the OS X makefile to make sure that tor links zlib, libevent and openssl statically. Fixes bug #2406. diff --git a/README.OSX b/README.OSX index 38c1333..d643844 100644 --- a/README.OSX +++ b/README.OSX @@ -24,6 +24,10 @@ To exit, close Firefox and Vidalia. Changelog --------- +1.0.11: Released 2011-01-17 + Update the OS X Makefile to make sure that tor links zlib, libevent and openssl + statically. Fixes bug #2406. + 1.0.10: Released 2011-01-16 Update Tor to 0.2.2.21-alpha Update NoScript to 2.0.9.3 diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index d880226..32a0a31 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -208,7 +208,7 @@ NAME=TorBrowser DISTDIR=tbbosx-dist ## Version and name of the compressed bundle (also used for source) -VERSION=1.0.10-dev +VERSION=1.0.11-dev DEFAULT_COMPRESSED_BASENAME=TorBrowser-$(VERSION)-osx-$(ARCH_TYPE)- IM_COMPRESSED_BASENAME=TorBrowser-IM-$(VERSION)- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME) @@ -297,7 +297,7 @@ generic-bundle: directory-structure install-binaries install-docs install-firefo touch generic-bundle.stamp APPDIR=$(DEST)/Contents/MacOS -LIBSDIR=$(DEST)/Contents/Frameworks +#LIBSDIR=$(DEST)/Contents/Frameworks DOCSDIR=$(DEST)/Contents/Resources/Docs DATADIR=$(DEST)/Contents/Resources/Data TB_TMPDIR=$(DEST)/Contents/SharedSupport @@ -308,7 +308,7 @@ directory-structure: mkdir -p $(APPDIR) mkdir -p $(APPDIR)/Firefox.app/Contents/MacOS/Data/profile mkdir -p $(APPDIR)/Firefox.app/Contents/MacOS/Data/plugins - mkdir -p $(LIBSDIR) + #mkdir -p $(LIBSDIR) mkdir -p $(DATADIR)/Tor mkdir -p $(DATADIR)/Vidalia mkdir -p $(DATADIR)/Polipo @@ -319,13 +319,13 @@ directory-structure: ## Firefox and Pidgin are installed in their own targets install-binaries: # zlib - cp -R $(ZLIB)/libz.1.2.3.dylib $(ZLIB)/libz.1.dylib $(ZLIB)/libz.dylib $(LIBSDIR) + #cp -R $(ZLIB)/libz.1.2.3.dylib $(ZLIB)/libz.1.dylib $(ZLIB)/libz.dylib $(LIBSDIR) # Libevent - cp -R $(LIBEVENT)/libevent.a $(LIBEVENT)/libevent_core.a $(LIBEVENT)/libevent_extra.a \ - $(LIBEVENT)/libevent.la $(LIBEVENT)/libevent_core.la $(LIBEVENT)/libevent_extra.la $(LIBSDIR) + #cp -R $(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 -R $(OPENSSL)/libcrypto.dylib $(OPENSSL)/libcrypto.0.9.8.dylib $(OPENSSL)/libssl.dylib \ - $(OPENSSL)/libssl.0.9.8.dylib $(LIBSDIR) + #cp -R $(OPENSSL)/libcrypto.dylib $(OPENSSL)/libcrypto.0.9.8.dylib $(OPENSSL)/libssl.dylib \ + # $(OPENSSL)/libssl.0.9.8.dylib $(LIBSDIR) #cp -R $(OPENSSL)/libcrypto* $(OPENSSL)/libssl* $(LIBSDIR) # Vidalia cp -R $(VIDALIA) $(APPDIR)/Vidalia.app