[tor-commits] [torbrowser/master] Linux: add logic to build standalone Vidalia bundles for TBB

[erinn at torproject.org]

commit 1833f26206df7541c5f14ba5d6cbdc9a7567143a
Author: Erinn Clark <erinn at torproject.org>
Date:   Wed Dec 18 14:49:17 2013 -0200

    Linux: add logic to build standalone Vidalia bundles for TBB
---
 build-scripts/config/vidalia.conf.standalone-linux |    8 ++++++
 build-scripts/linux-alpha.mk                       |   27 ++++++++++++++++++++
 src/RelativeLink/vidalia/start-vidalia.sh          |    4 +++
 3 files changed, 39 insertions(+)

diff --git a/build-scripts/config/vidalia.conf.standalone-linux b/build-scripts/config/vidalia.conf.standalone-linux
new file mode 100644
index 0000000..5a7414c
--- /dev/null
+++ b/build-scripts/config/vidalia.conf.standalone-linux
@@ -0,0 +1,8 @@
+[General]
+InterfaceStyle=Cleanlooks
+LanguageCode=en
+
+[Tor]
+ControlPort=9151
+Torrc=../Data/Tor/torrc
+DataDirectory=../Data/Tor
diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk
index 72d4b0a..3c11f32 100644
--- a/build-scripts/linux-alpha.mk
+++ b/build-scripts/linux-alpha.mk
@@ -148,6 +148,7 @@ IM_COMPRESSED_BASENAME=tor-im-browser-gnu-linux-$(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)-gnu-linux-$(ARCH_TYPE)-
 
 ifeq ($(USE_PIDGIN),1)
 COMPRESSED_NAME=$(IM_COMPRESSED_NAME)
@@ -205,6 +206,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
 ##
@@ -385,6 +402,9 @@ bundle_%:
 	LANGCODE=$* make -f linux-alpha.mk bundle-localized
 compressed-bundle_%:
 	LANGCODE=$* make -f linux-alpha.mk compressed-bundle-localized
+vidalia-standalone-bundle_%:
+	LANGCODE=$* make -f linux-alpha.mk vidalia-standalone-bundle-localized
+
 
 bundle-localized_%.stamp:
 	make -f linux-alpha.mk copy-files_$* install-extensions				\
@@ -400,6 +420,13 @@ compressed-bundle-localized: bundle-localized_$(LANGCODE).stamp
 	tar -cvf - $(NAME)_$(LANGCODE) |tardy -unu 0 -una root -gnu 0 -gna wheel |gzip -c9 >$(DISTDIR)/$(COMPRESSED_NAME)$(LANGCODE).tar.gz
 	rm -f *.zip *.xpi
 
+vidalia-standalone-bundle-localized:
+	mkdir -p vidalia-standalone
+	cp config/vidalia.conf.standalone-linux $(BUNDLE)/Data/Vidalia/vidalia.conf
+	cp ../src/RelativeLink/vidalia/start-vidalia.sh $(BUNDLE)
+	./patch-vidalia-language.sh $(BUNDLE)/Data/Vidalia/vidalia.conf $(LANGCODE) -e
+	cd $(BUNDLE) && tar -cvzf ../vidalia-standalone/$(VIDALIA_COMPRESSED_BASENAME)$(LANGCODE).tar.gz start-vidalia.sh App/vidalia Data/Vidalia Docs/Qt Docs/Vidalia Lib/libQt* Lib/libpng*
+
 copy-files_%: generic-bundle.stamp
 	rm -fr $(NAME)_$*
 	#mkdir $(NAME)_$*
diff --git a/src/RelativeLink/vidalia/start-vidalia.sh b/src/RelativeLink/vidalia/start-vidalia.sh
new file mode 100755
index 0000000..3880e76
--- /dev/null
+++ b/src/RelativeLink/vidalia/start-vidalia.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+LD_LIBRARY_PATH="./Lib"
+./App/vidalia  --datadir Data/Vidalia/ -style Cleanlooks