[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [torbrowser/maint-2.2] Remove all occurences of CONFIG_SRC

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [torbrowser/maint-2.2] Remove all occurences of CONFIG_SRC
From: erinn@xxxxxxxxxxxxxx
Date: Thu, 8 Mar 2012 20:43:00 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Thu, 08 Mar 2012 15:45:04 -0500
List-archive: <http://lists.torproject.org/pipermail/tor-commits>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: code repository commits <tor-commits.lists.torproject.org>
List-post: <mailto:tor-commits@lists.torproject.org>
List-subscribe: <https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=subscribe>
List-unsubscribe: <https://lists.torproject.org/cgi-bin/mailman/options/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=unsubscribe>
Patch-author: Sebastian Hahn <sebastian@xxxxxxxxxxxxxx>
Sender: tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx

commit 21e3c22670f0ceb1760b3403ff1a217301112e9d
Author: Sebastian Hahn <sebastian@xxxxxxxxxxxxxx>
Date:   Thu Feb 23 17:49:50 2012 +0100

    Remove all occurences of CONFIG_SRC
    
    We don't need the variable, as this is a hardcoded path inside the TBB
    directory structure. By getting rid of it we make our lives easier down
    the road when we add dependencies
---
 build-scripts/linux.mk   |   33 +++++++++++++++------------------
 build-scripts/osx.mk     |   31 ++++++++++++++-----------------
 build-scripts/windows.mk |   31 ++++++++++++++-----------------
 3 files changed, 43 insertions(+), 52 deletions(-)

diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk
index 8f25015..fb5c7c2 100644
--- a/build-scripts/linux.mk
+++ b/build-scripts/linux.mk
@@ -106,7 +106,7 @@ build-tor: build-zlib build-openssl build-libevent $(TOR_DIR)
 ## Polipo doesn't use autoconf, so we just have to hack their Makefile
 ## This probably needs to be updated if Polipo ever updates their Makefile
 POLIPO_DIR=$(FETCH_DIR)/polipo-$(POLIPO_VER)
-POLIPO_MAKEFILE=$(CONFIG_SRC)/polipo-Makefile
+POLIPO_MAKEFILE=config/polipo-Makefile
 build-polipo:
 	cp $(POLIPO_MAKEFILE) $(POLIPO_DIR)/Makefile
 	cd $(POLIPO_DIR) && make && PREFIX=$(FETCH_DIR)/built/ make install.binary
@@ -114,8 +114,8 @@ build-polipo:
 build-pidgin:
 	echo "We're not building pidgin yet!"
 
-build-firefox: $(CONFIG_SRC)/dot_mozconfig $(FIREFOX_DIR)
-	cp $(CONFIG_SRC)/dot_mozconfig $(FIREFOX_DIR)/mozconfig
+build-firefox: config/dot_mozconfig $(FIREFOX_DIR)
+	cp config/dot_mozconfig $(FIREFOX_DIR)/mozconfig
 	cd $(FIREFOX_DIR) && make -f client.mk build
 	touch build-firefox
 
@@ -156,9 +156,6 @@ WGET:=$(shell which wget)
 ## Size of split archive volumes for WinRAR
 SPLITSIZE=1440k
 
-## Location of config files
-CONFIG_SRC=config
-
 ## Destination for the generic bundle
 DEST=generic-bundle
 
@@ -329,24 +326,24 @@ endif
 configure-apps:
 	## Configure Firefox preferences
 	mkdir -p $(DEST)/Data/profile/extensions
-	cp -R $(CONFIG_SRC)/firefox-profiles.ini $(DEST)/Data/profiles.ini
-	cp $(CONFIG_SRC)/bookmarks.html $(DEST)/Data/profile
-	cp $(CONFIG_SRC)/no-polipo-4.0.js $(DEST)/Data/profile/prefs.js
+	cp -R config/firefox-profiles.ini $(DEST)/Data/profiles.ini
+	cp config/bookmarks.html $(DEST)/Data/profile
+	cp config/no-polipo-4.0.js $(DEST)/Data/profile/prefs.js
 	## Configure Pidgin
 ifeq ($(USE_PIDGIN),1)
 	mkdir -p $(DEST)/PidginPortable/Data/settings/.purple
-	cp $(CONFIG_SRC)/prefs.xml $(DEST)/PidginPortable/Data/settings/.purple
+	cp config/prefs.xml $(DEST)/PidginPortable/Data/settings/.purple
 endif
 	## Configure Vidalia
 ifeq ($(USE_PIDGIN),1)
-	cp $(CONFIG_SRC)/vidalia.conf.ff+pidgin-linux $(DEST)/Data/Vidalia/vidalia.conf
+	cp config/vidalia.conf.ff+pidgin-linux $(DEST)/Data/Vidalia/vidalia.conf
 else
-	cp $(CONFIG_SRC)/vidalia.conf.ff-linux $(DEST)/Data/Vidalia/vidalia.conf
+	cp config/vidalia.conf.ff-linux $(DEST)/Data/Vidalia/vidalia.conf
 endif
 	## Configure Polipo
-	#cp $(CONFIG_SRC)/polipo.conf $(DEST)/Data/Polipo/polipo.conf
+	#cp config/polipo.conf $(DEST)/Data/Polipo/polipo.conf
 	## Configure Tor
-	cp $(CONFIG_SRC)/torrc-linux $(DEST)/Data/Tor/torrc
+	cp config/torrc-linux $(DEST)/Data/Tor/torrc
 	cp $(TOR_DIR)/src/config/geoip $(DEST)/Data/Tor/geoip
 	chmod 700 $(DEST)/Data/Tor
 
@@ -433,10 +430,10 @@ patch-firefox-language:
 	## Patch the default Firefox prefs.js
 	## Don't use {} because they aren't always interpreted correctly. Thanks, sh. 
 	mkdir -p $(BUNDLE)/App/Firefox/defaults/profile/
-	cp $(CONFIG_SRC)/bookmarks.html $(BUNDLE)/App/Firefox/defaults/profile/
-	cp $(CONFIG_SRC)/no-polipo-4.0.js $(BUNDLE)/App/Firefox/defaults/profile/prefs.js
-	cp $(CONFIG_SRC)/bookmarks.html $(BUNDLE)/Data/profile
-	cp $(CONFIG_SRC)/no-polipo-4.0.js $(BUNDLE)/Data/profile/prefs.js
+	cp config/bookmarks.html $(BUNDLE)/App/Firefox/defaults/profile/
+	cp config/no-polipo-4.0.js $(BUNDLE)/App/Firefox/defaults/profile/prefs.js
+	cp config/bookmarks.html $(BUNDLE)/Data/profile
+	cp config/no-polipo-4.0.js $(BUNDLE)/Data/profile/prefs.js
 	./patch-firefox-language.sh $(BUNDLE)/App/Firefox/defaults/profile/prefs.js $(LANGCODE) -e
 	./patch-firefox-language.sh $(BUNDLE)/Data/profile/prefs.js $(LANGCODE) -e
 
diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk
index 947c04e..8050092 100644
--- a/build-scripts/osx.mk
+++ b/build-scripts/osx.mk
@@ -126,8 +126,8 @@ build-tor: build-zlib build-openssl build-libevent $(TOR_DIR)
 	cd $(TOR_DIR) && make install
 	touch build-tor
 
-build-firefox: $(FIREFOX_DIR) $(CONFIG_SRC)/mozconfig-osx-$(ARCH_TYPE)
-	cp $(CONFIG_SRC)/mozconfig-osx-$(ARCH_TYPE) $(FIREFOX_DIR)/mozconfig
+build-firefox: $(FIREFOX_DIR) config/mozconfig-osx-$(ARCH_TYPE)
+	cp config/mozconfig-osx-$(ARCH_TYPE) $(FIREFOX_DIR)/mozconfig
 	cd $(FIREFOX_DIR) && make -f client.mk build
 	touch build-firefox
 
@@ -162,9 +162,6 @@ WGET:=$(shell which wget)
 ## Size of split archive volumes for WinRAR
 SPLITSIZE=1440k
 
-## Location of config files
-CONFIG_SRC=config
-
 ## Destination for the generic bundle
 DEST=generic-bundle
 
@@ -301,24 +298,24 @@ install-firefox:
 configure-apps:
 	## Configure Firefox preferences
 	#mkdir -p $(DEST)/.mozilla/Firefox/firefox.default
-	cp -R $(CONFIG_SRC)/firefox-profiles.ini $(DEST)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profiles.ini
-	cp $(CONFIG_SRC)/bookmarks.html $(DEST)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profile
-	cp $(CONFIG_SRC)/no-polipo-4.0.js $(DEST)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profile/prefs.js
-	cp $(CONFIG_SRC)/Info.plist $(DEST)/Contents
-	cp $(CONFIG_SRC)/PkgInfo $(DEST)/Contents
-	cp $(CONFIG_SRC)/qt.conf $(DEST)/Contents/MacOS/Vidalia.app/Contents/Resources
-	cp $(CONFIG_SRC)/vidalia.icns $(DEST)/Contents/Resources
+	cp -R config/firefox-profiles.ini $(DEST)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profiles.ini
+	cp config/bookmarks.html $(DEST)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profile
+	cp config/no-polipo-4.0.js $(DEST)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profile/prefs.js
+	cp config/Info.plist $(DEST)/Contents
+	cp config/PkgInfo $(DEST)/Contents
+	cp config/qt.conf $(DEST)/Contents/MacOS/Vidalia.app/Contents/Resources
+	cp config/vidalia.icns $(DEST)/Contents/Resources
 
 	## Configure Vidalia
 	mkdir -p $(DEST)/Library/Vidalia
 ifeq ($(USE_SANDBOX),1)
-	cp $(CONFIG_SRC)/vidalia.conf.ff-osx-sandbox $(DEST)/Library/Vidalia/vidalia.conf
+	cp config/vidalia.conf.ff-osx-sandbox $(DEST)/Library/Vidalia/vidalia.conf
 else
-	cp $(CONFIG_SRC)/vidalia.conf.ff-osx $(DEST)/Library/Vidalia/vidalia.conf
+	cp config/vidalia.conf.ff-osx $(DEST)/Library/Vidalia/vidalia.conf
 endif
 
 	## Configure Tor
-	cp $(CONFIG_SRC)/torrc-osx $(DEST)/Library/Vidalia/torrc
+	cp config/torrc-osx $(DEST)/Library/Vidalia/torrc
 	cp $(TOR_DIR)/src/config/geoip $(DEST)/Contents/Resources/Data/Tor/geoip
 	chmod 700 $(DATADIR)/Tor
 
@@ -407,8 +404,8 @@ endif
 patch-firefox-language:
 	## Patch the default Firefox prefs.js
 	## Don't use {} because they aren't always interpreted correctly. Thanks, sh. 
-	cp $(CONFIG_SRC)/no-polipo-4.0.js $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js
-	cp $(CONFIG_SRC)/bookmarks.html $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile
+	cp config/no-polipo-4.0.js $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js
+	cp config/bookmarks.html $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile
 	./patch-firefox-language.sh $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js $(LANGCODE) -e
 
 ## Fix prefs.js since extensions.checkCompatibility, false doesn't work
diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk
index 046baa4..ccb7354 100644
--- a/build-scripts/windows.mk
+++ b/build-scripts/windows.mk
@@ -120,8 +120,8 @@ patch-mozbuild:
 	cp patch-mozilla-build.sh $(MOZ_BUILD)
 	cd $(MOZ_BUILD) && ./patch-mozilla-build.sh $(MSVC_VER)
 
-build-firefox: $(FIREFOX_DIR) $(CONFIG_SRC)/dot_mozconfig $(MOZ_BUILD) $(MOZ_BUILD)/start-msvc$(MSVC_VER).bat
-	cp $(CONFIG_SRC)/dot_mozconfig $(FIREFOX_DIR)/mozconfig
+build-firefox: $(FIREFOX_DIR) config/dot_mozconfig $(MOZBUILD) $(MOZ_BUILD)/start-msvc$(MSVC_VER).bat
+	cp config/dot_mozconfig $(FIREFOX_DIR)/mozconfig
 	cd $(MOZ_BUILD) && cmd.exe /c "start-msvc$(MSVC_VER).bat $(FIREFOX_DIR)"
 	touch build-firefox
 
@@ -150,9 +150,6 @@ LIBEVENT=$(COMPILED_LIBS)
 ## Size of split archive volumes for WinRAR
 SPLITSIZE=1440k
 
-## Location of config files
-CONFIG_SRC=config
-
 ## Destination for the generic bundle
 DEST="Generic Bundle"
 
@@ -321,32 +318,32 @@ configure-apps:
 
 	mkdir -p $(DEST)/FirefoxPortable/Data/profile
 	## Configure Firefox preferences
-	cp $(CONFIG_SRC)/windows-4.0.js $(DEST)/FirefoxPortable/App/DefaultData/profile/prefs.js
-	cp $(CONFIG_SRC)/windows-4.0.js $(DEST)/FirefoxPortable/Data/profile/prefs.js
-	cp $(CONFIG_SRC)/bookmarks.html $(DEST)/FirefoxPortable/App/DefaultData/profile/
+	cp config/windows-4.0.js $(DEST)/FirefoxPortable/App/DefaultData/profile/prefs.js
+	cp config/windows-4.0.js $(DEST)/FirefoxPortable/Data/profile/prefs.js
+	cp config/bookmarks.html $(DEST)/FirefoxPortable/App/DefaultData/profile/
 
 	## Set up alternate launcher
 	mv $(DEST)/FirefoxPortable/App/Firefox/firefox.exe $(DEST)/FirefoxPortable/App/Firefox/tbb-firefox.exe
 	
 	## Configure FirefoxPortable
-	cp $(CONFIG_SRC)/FirefoxPortable.ini $(DEST)/FirefoxPortable
-	cp $(CONFIG_SRC)/FirefoxPortableSettings.ini $(DEST)/FirefoxPortable/Data/settings
+	cp config/FirefoxPortable.ini $(DEST)/FirefoxPortable
+	cp config/FirefoxPortableSettings.ini $(DEST)/FirefoxPortable/Data/settings
 	
 	## Configure PidginPortable
 ifeq ($(USE_PIDGIN),1)
-	cp $(CONFIG_SRC)/PidginPortable.ini $(DEST)/PidginPortable
+	cp config/PidginPortable.ini $(DEST)/PidginPortable
 	mkdir -p $(DEST)/PidginPortable/Data/settings/.purple
-	cp $(CONFIG_SRC)/prefs.xml $(DEST)/PidginPortable/Data/settings/.purple
-	cp $(CONFIG_SRC)/PidginPortableSettings.ini $(DEST)/PidginPortable/Data/settings
+	cp config/prefs.xml $(DEST)/PidginPortable/Data/settings/.purple
+	cp config/PidginPortableSettings.ini $(DEST)/PidginPortable/Data/settings
 endif
 	## Configure Vidalia
 ifeq ($(USE_PIDGIN),1)
-	cp $(CONFIG_SRC)/vidalia.conf.ff+pidgin $(DEST)/Data/Vidalia/vidalia.conf
+	cp config/vidalia.conf.ff+pidgin $(DEST)/Data/Vidalia/vidalia.conf
 else
-	cp $(CONFIG_SRC)/vidalia.conf.ff $(DEST)/Data/Vidalia/vidalia.conf
+	cp config/vidalia.conf.ff $(DEST)/Data/Vidalia/vidalia.conf
 endif
 	## Configure Tor
-	cp $(CONFIG_SRC)/torrc $(DEST)/Data/Tor
+	cp config/torrc $(DEST)/Data/Tor
 	cp $(TOR)/src/config/geoip $(DEST)/Data/Tor
 
 launcher:
@@ -440,7 +437,7 @@ patch-firefox-language:
 
 ## Copy Firefox preferences from a run of FirefoxPortable to be the default
 apply-prefs:
-	cp $(DEST)/FirefoxPortable/Data/profile/prefs.js $(CONFIG_SRC)
+	cp $(DEST)/FirefoxPortable/Data/profile/prefs.js config
 
 print-version:
 	@echo $(RELEASE_VER)-$(BUILD_NUM)



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

Prev by Author: [tor-commits] [torbrowser/maint-2.2] Make windows-4.0.js more like no-polipo-4.0.js
Next by Author: [tor-commits] [torbrowser/maint-2.2] OSX: Use self-built Qt to build Vidalia
Previous by thread: [tor-commits] [torbrowser/maint-2.2] Make windows-4.0.js more like no-polipo-4.0.js
Next by thread: [tor-commits] [torbrowser/maint-2.2] OSX: Use self-built Qt to build Vidalia
Index(es):
- Author
- Thread