[or-cvs] r14954: Make Pidgin optional (in torbrowser/branches/pidgin/build-scripts: . config)

[sjm217@xxxxxxxx]

Author: sjm217
Date: 2008-06-04 14:46:11 -0400 (Wed, 04 Jun 2008)
New Revision: 14954

Added:
   torbrowser/branches/pidgin/build-scripts/config/vidalia.conf.ff+pidgin
Removed:
   torbrowser/branches/pidgin/build-scripts/config/vidalia.conf
Modified:
   torbrowser/branches/pidgin/build-scripts/Makefile
Log:
Make Pidgin optional

Modified: torbrowser/branches/pidgin/build-scripts/Makefile
===================================================================
--- torbrowser/branches/pidgin/build-scripts/Makefile	2008-06-04 18:42:39 UTC (rev 14953)
+++ torbrowser/branches/pidgin/build-scripts/Makefile	2008-06-04 18:46:11 UTC (rev 14954)
@@ -22,6 +22,9 @@
 FIREFOX_SRC=/c/build/FirefoxPortable
 PIDGIN_SRC=/c/build/PidginPortable
 
+## Do we install Pidgin?
+USE_PIDGIN=1
+
 ## Location of utility applications
 SEVENZIP="/c/Program Files/7-Zip/7z.exe"
 WGET:=/c/Python25/python.exe $(shell pwd)/pyget.py
@@ -138,7 +141,9 @@
 
 ## Copy over PidginPortable
 install-pidginportable:
-	cp -R $(PIDGIN_SRC) $(DEST)/PidginPortable
+	ifeq ($(USE_PIDGIN),1)
+		cp -R $(PIDGIN_SRC) $(DEST)/PidginPortable
+	endif
 
 ## Configure Firefox, FirefoxPortable, Vidalia, Polipo and Tor
 configure-apps:
@@ -149,11 +154,17 @@
 	## Configure FirefoxPortable
 	cp $(CONFIG_SRC)/FirefoxPortable.ini $(DEST)/FirefoxPortable
 	## Configure PidginPortable
-	cp $(CONFIG_SRC)/PidginPortable.ini $(DEST)/PidginPortable
-	mkdir -p $(DEST)/PidginPortable/Data/settings/.purple
-	cp $(CONFIG_SRC)/prefs.xml $(DEST)/PidginPortable/Data/settings/.purple
+	ifeq ($(USE_PIDGIN),1)
+		cp $(CONFIG_SRC)/PidginPortable.ini $(DEST)/PidginPortable
+		mkdir -p $(DEST)/PidginPortable/Data/settings/.purple
+		cp $(CONFIG_SRC)/prefs.xml $(DEST)/PidginPortable/Data/settings/.purple
+	endif
 	## Configure Vidalia
-	cp $(CONFIG_SRC)/vidalia.conf $(DEST)/Data/Vidalia
+	ifeq ($(USE_PIDGIN),1)
+		cp $(CONFIG_SRC)/vidalia.conf.ff+pidgin $(DEST)/Data/Vidalia/vidalia.conf
+	else
+		cp $(CONFIG_SRC)/vidalia.conf.ff $(DEST)/Data/Vidalia/vidalia.conf
+	endif
 	## Configure Polipo
 	cp $(CONFIG_SRC)/polipo.conf $(DEST)/Data/Polipo
 	## Configure Tor

Deleted: torbrowser/branches/pidgin/build-scripts/config/vidalia.conf
===================================================================
--- torbrowser/branches/pidgin/build-scripts/config/vidalia.conf	2008-06-04 18:42:39 UTC (rev 14953)
+++ torbrowser/branches/pidgin/build-scripts/config/vidalia.conf	2008-06-04 18:46:11 UTC (rev 14954)
@@ -1,12 +0,0 @@
-[General]
-BrowserExecutable=FirefoxPortable\\FirefoxPortable.exe
-IMExecutable=PidginPortable\\PidginPortable.exe
-LanguageCode=en
-ProxyExecutable=App\\polipo.exe
-ProxyExecutableArguments=-c, Data\\Polipo\\polipo.conf
-RunProxyAtStart=true
-
-[Tor]
-ControlPort=9051
-TorExecutable=.\\App\\tor.exe
-Torrc=.\\Data\\Tor\\torrc

Copied: torbrowser/branches/pidgin/build-scripts/config/vidalia.conf.ff+pidgin (from rev 14948, torbrowser/branches/pidgin/build-scripts/config/vidalia.conf)
===================================================================
--- torbrowser/branches/pidgin/build-scripts/config/vidalia.conf.ff+pidgin	                        (rev 0)
+++ torbrowser/branches/pidgin/build-scripts/config/vidalia.conf.ff+pidgin	2008-06-04 18:46:11 UTC (rev 14954)
@@ -0,0 +1,12 @@
+[General]
+BrowserExecutable=FirefoxPortable\\FirefoxPortable.exe
+IMExecutable=PidginPortable\\PidginPortable.exe
+LanguageCode=en
+ProxyExecutable=App\\polipo.exe
+ProxyExecutableArguments=-c, Data\\Polipo\\polipo.conf
+RunProxyAtStart=true
+
+[Tor]
+ControlPort=9051
+TorExecutable=.\\App\\tor.exe
+Torrc=.\\Data\\Tor\\torrc