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

[erinn at torproject.org]

commit 525d46b359e9def47b6caf1a7fcda84d541e8a99
Author: Erinn Clark <erinn at torproject.org>
Date:   Tue Dec 17 01:09:50 2013 -0200

    Windows: add logic to build standalone Vidalia bundles for TBB
---
 build-scripts/config/vidalia.conf.standalone |    7 +++++++
 build-scripts/windows-alpha.mk               |   29 ++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/build-scripts/config/vidalia.conf.standalone b/build-scripts/config/vidalia.conf.standalone
new file mode 100644
index 0000000..eed1095
--- /dev/null
+++ b/build-scripts/config/vidalia.conf.standalone
@@ -0,0 +1,7 @@
+[General]
+LanguageCode=en
+
+[Tor]
+ControlPort=9151
+Torrc=..\\Data\\Tor\\torrc
+DataDirectory=..\\Data\\Tor
diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk
index d087ac2..a0109b7 100644
--- a/build-scripts/windows-alpha.mk
+++ b/build-scripts/windows-alpha.mk
@@ -159,6 +159,7 @@ IM_COMPRESSED_BASENAME=tor-im-browser-$(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)-win32
 
 ifeq ($(USE_PIDGIN),1)
 COMPRESSED_NAME=$(IM_COMPRESSED_NAME)
@@ -215,6 +216,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
 ##
@@ -388,6 +405,9 @@ bundle_%:
 	LANGCODE=$* make -f windows-alpha.mk bundle-localized
 compressed-bundle_%:
 	LANGCODE=$* make -f windows-alpha.mk compressed-bundle-localized
+vidalia-standalone-bundle_%:
+	LANGCODE=$* make -f windows-alpha.mk vidalia-standalone-bundle-localized
+
 
 bundle-localized_%.stamp:
 	make -f windows-alpha.mk copy-files_$* install-extensions				\
@@ -402,6 +422,15 @@ compressed-bundle-localized: $(SEVENZIP) bundle-localized_$(LANGCODE).stamp
 	rm -f $(COMPRESSED_NAME)_$(LANGCODE).exe
 	cd $(NAME)_$(LANGCODE); $(SEVENZIP) a -mx9 -sfx7z.sfx ../$(COMPRESSED_NAME)_$(LANGCODE).exe $(NAME)
 
+vidalia-standalone-bundle-localized: $(SEVENZIP) bundle-localized_$(LANGCODE).stamp
+	rm -f $(VIDALIA_COMPRESSED_BASENAME)_$(LANGCODE).exe
+	rm -rf vidalia-standalone
+	mkdir -p vidalia-standalone
+	cp config/vidalia.conf.standalone $(BUNDLE)/Data/Vidalia/vidalia.conf
+	./patch-vidalia-language.sh $(BUNDLE)/Data/Vidalia/vidalia.conf $(LANGCODE)
+	cp ../src/RelativeLink/StartTorBrowserBundle.exe Start\ Vidalia.exe
+	cd $(NAME)_$(LANGCODE)/$(NAME); $(SEVENZIP) a -mx9 -sfx7z.sfx ../../vidalia-standalone/$(VIDALIA_COMPRESSED_BASENAME)_$(LANGCODE).exe ../../Start\ Vidalia.exe App/vidalia.exe App/Qt* Data/Vidalia Docs/Vidalia Docs/Qt
+
 copy-files_%: generic-bundle.stamp
 	rm -fr $(NAME)_$*
 	mkdir $(NAME)_$*