[tor-commits] [torbrowser/maint-2.4] OSX: add logic to build standalone Vidalia bundles for TBB

[erinn at torproject.org]

commit f6780158f0f151735d85d11ef45a07cb1292d5e5
Author: Erinn Clark <erinn at torproject.org>
Date:   Wed Dec 18 14:50:02 2013 -0200

    OSX: add logic to build standalone Vidalia bundles for TBB
---
 build-scripts/config/vidalia.conf.standalone-osx |    7 ++++++
 build-scripts/osx-alpha.mk                       |   29 ++++++++++++++++++++++
 src/RelativeLink/vidalia/start-vidalia-osx.sh    |    3 +++
 3 files changed, 39 insertions(+)

diff --git a/build-scripts/config/vidalia.conf.standalone-osx b/build-scripts/config/vidalia.conf.standalone-osx
new file mode 100644
index 0000000..7e687c4
--- /dev/null
+++ b/build-scripts/config/vidalia.conf.standalone-osx
@@ -0,0 +1,7 @@
+[General]
+LanguageCode=en
+
+[Tor]
+ControlPort=9151
+Torrc=../../../../../Library/Vidalia/torrc
+DataDirectory=../../../../Resources/Data/Tor/
diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk
index b9d2cce..ac770b2 100644
--- a/build-scripts/osx-alpha.mk
+++ b/build-scripts/osx-alpha.mk
@@ -182,6 +182,7 @@ IM_COMPRESSED_BASENAME=TorBrowser-IM-$(VERSION)-
 OBFS_COMPRESSED_NAME=$(OBFS_COMPRESSED_BASENAME)
 DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)
 IM_COMPRESSED_NAME=$(IM_COMPRESSED_BASENAME)$(VERSION)
+VIDALIA_COMPRESSED_BASENAME=vidalia-standalone-$(VIDALIA_VER)-osx-$(ARCH_TYPE)-
 
 ifeq ($(USE_PIDGIN),1)
 COMPRESSED_NAME=$(IM_COMPRESSED_NAME)
@@ -242,6 +243,22 @@ all-compressed-bundles: compressed-bundle_ar \
 	compressed-bundle_vi \
 	compressed-bundle_zh-CN
 
+vidalia-standalone-bundles: vidalia-standalone-bundle_ar \
+	vidalia-standalone-bundle_de \
+	vidalia-standalone-bundle_en-US \
+	vidalia-standalone-bundle_es-ES \
+	vidalia-standalone-bundle_fa \
+	vidalia-standalone-bundle_fr \
+	vidalia-standalone-bundle_it \
+	vidalia-standalone-bundle_ko \
+	vidalia-standalone-bundle_nl \
+	vidalia-standalone-bundle_pl \
+	vidalia-standalone-bundle_pt-PT \
+	vidalia-standalone-bundle_ru \
+	vidalia-standalone-bundle_vi \
+	vidalia-standalone-bundle_zh-CN
+
+
 ##
 ## Cleanup
 ##
@@ -390,6 +407,9 @@ bundle_%:
 	LANGCODE=$* make -f osx-alpha.mk bundle-localized
 compressed-bundle_%:
 	LANGCODE=$* make -f osx-alpha.mk compressed-bundle-localized
+vidalia-standalone-bundle_%:
+	LANGCODE=$* make -f osx-alpha.mk vidalia-standalone-bundle-localized
+
 bundle-localized_%.stamp:
 	make -f osx-alpha.mk copy-files_$* install-torbutton					\
 		install-httpseverywhere install-noscript \
@@ -406,6 +426,15 @@ compressed-bundle-localized: bundle-localized_$(LANGCODE).stamp
 	zip -r $(DISTDIR)/$(COMPRESSED_NAME)$(LANGCODE).zip $(NAME)_$(LANGCODE).app
 	-rm -f *.zip *.xpi
 
+vidalia-standalone-bundle-localized: bundle-localized_$(LANGCODE).stamp
+	rm -rf vidalia-standalone
+	mkdir -p vidalia-standalone
+	cp config/vidalia.conf.standalone-osx $(BUNDLE).app/Library/Vidalia/vidalia.conf
+	cp ../src/RelativeLink/vidalia/start-vidalia-osx.sh $(BUNDLE).app/start-vidalia.sh
+	./patch-vidalia-language.sh $(BUNDLE).app/Library/Vidalia/vidalia.conf $(LANGCODE) -e
+	cd $(BUNDLE).app && zip -r ../vidalia-standalone/$(VIDALIA_COMPRESSED_BASENAME)$(LANGCODE).zip start-vidalia.sh Contents/MacOS/Vidalia.app Library/Vidalia/vidalia.conf Contents/Resources/vidalia.icns Contents/Resources/Docs/Qt Contents/Resources/Docs/Vidalia
+
+
 copy-files_%: generic-bundle.stamp
 	rm -fr $(NAME)_$*
 	#mkdir $(NAME)_$*
diff --git a/src/RelativeLink/vidalia/start-vidalia-osx.sh b/src/RelativeLink/vidalia/start-vidalia-osx.sh
new file mode 100755
index 0000000..a06af38
--- /dev/null
+++ b/src/RelativeLink/vidalia/start-vidalia-osx.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+open "Contents/MacOS/Vidalia.app"