[or-cvs] r23373: {torbrowser} Add compression (.zip) and fix launch script (in torbrowser/trunk: build-scripts src/RelativeLink)

[Erinn Clark]

Author: erinn
Date: 2010-10-01 02:16:18 +0000 (Fri, 01 Oct 2010)
New Revision: 23373

Modified:
   torbrowser/trunk/build-scripts/Makefile.osx
   torbrowser/trunk/src/RelativeLink/RelativeLinkOSX.sh
Log:
Add compression (.zip) and fix launch script

Modified: torbrowser/trunk/build-scripts/Makefile.osx
===================================================================
--- torbrowser/trunk/build-scripts/Makefile.osx	2010-10-01 02:16:13 UTC (rev 23372)
+++ torbrowser/trunk/build-scripts/Makefile.osx	2010-10-01 02:16:18 UTC (rev 23373)
@@ -433,15 +433,16 @@
 compressed-bundle_%:
 	LANGCODE=$* make -f Makefile.osx compressed-bundle-localized
 bundle-localized_%.stamp:
-	make -f Makefile.osx copy-files_$* install-extensions install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref final
+	make -f Makefile.osx copy-files_$* install-extensions install-httpseverywhere install-noscript install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref final
 	touch bundle-localized_$*.stamp
 
 bundle-localized: bundle-localized_$(LANGCODE).stamp
 
 compressed-bundle-localized: bundle-localized_$(LANGCODE).stamp
-	-rm -f $(DISTDIR)/$(COMPRESSED_NAME)_$(LANGCODE).tar.gz
+	-rm -f $(DISTDIR)/$(COMPRESSED_NAME)_$(LANGCODE).zip
 	-mkdir $(DISTDIR)
-	tar -cvzf $(DISTDIR)/$(DEFAULT_COMPRESSED_BASENAME)$(LANGCODE).tar.gz $(NAME)_$(LANGCODE);
+	#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
 
 copy-files_%: generic-bundle.stamp

Modified: torbrowser/trunk/src/RelativeLink/RelativeLinkOSX.sh
===================================================================
--- torbrowser/trunk/src/RelativeLink/RelativeLinkOSX.sh	2010-10-01 02:16:13 UTC (rev 23372)
+++ torbrowser/trunk/src/RelativeLink/RelativeLinkOSX.sh	2010-10-01 02:16:18 UTC (rev 23373)
@@ -35,4 +35,4 @@
 # not in debug mode, run proceed normally
 printf "\nLaunching Tor Browser Bundle for Linux in ${HOME}\n"
 cd "${HOME}"
-$HOME/Contents/MacOS/Vidalia --datadir $HOME/Contents/Resources/Data/Vidalia/
+open $HOME/Contents/MacOS/Vidalia.app