[or-cvs] r13494: Improvements to build scripts suggested by Chris (torbrowser/trunk/build-scripts)

[sjm217 at seul.org]

Author: sjm217
Date: 2008-02-13 16:23:55 -0500 (Wed, 13 Feb 2008)
New Revision: 13494

Modified:
   torbrowser/trunk/build-scripts/INSTALL
   torbrowser/trunk/build-scripts/Makefile
Log:
Improvements to build scripts suggested by Chris

Modified: torbrowser/trunk/build-scripts/INSTALL
===================================================================
--- torbrowser/trunk/build-scripts/INSTALL	2008-02-13 16:34:00 UTC (rev 13493)
+++ torbrowser/trunk/build-scripts/INSTALL	2008-02-13 21:23:55 UTC (rev 13494)
@@ -25,7 +25,7 @@
  Tor (in /c/build/tor-<version> by default)
  Polipo (in /c/build/polipo-<version> by default)
 and have uncompressed Firefox Portable
- FirefoxPortable (in ./FirefoxPortable/ by default)
+ FirefoxPortable (in /c/build/FirefoxPortable by default)
 
 Instructions for building Vidalia, Polipo and Tor are included below.
 

Modified: torbrowser/trunk/build-scripts/Makefile
===================================================================
--- torbrowser/trunk/build-scripts/Makefile	2008-02-13 16:34:00 UTC (rev 13493)
+++ torbrowser/trunk/build-scripts/Makefile	2008-02-13 21:23:55 UTC (rev 13494)
@@ -19,11 +19,11 @@
 VIDALIA=/c/build/vidalia
 TOR=/c/build/tor-0.2.0.18-alpha
 POLIPO=/c/build/polipo-1.0.4
-FIREFOX_SRC="FirefoxPortable"
+FIREFOX_SRC=/c/build/FirefoxPortable
 
 ## Location of utility applications
 SEVENZIP="/c/Program Files/7-Zip/7z.exe"
-WGET=/c/Python25/python.exe /c/build/torbrowser/build-scripts/pyget.py
+WGET:=/c/Python25/python.exe $(shell pwd)/pyget.py
 
 ## Location of config files
 CONFIG_SRC=config
@@ -37,6 +37,9 @@
 ## Extensions to install by default
 DEFAULT_EXTENSIONS=torbutton.xpi
 
+## Where to download Torbutton from
+TORBUTTON=http://torbutton.torproject.org/dev/torbutton-current-alpha.xpi
+
 ## Put more extensions here
 EXTENSIONS_DIR=extensions
 
@@ -133,9 +136,8 @@
 ##
 
 ## Torbutton development version
-TORBUTTON=torbutton-1.1.12-alpha.xpi
 torbutton.xpi:
-	$(WGET) -O $@ http://torbutton.torproject.org/dev/releases/$(TORBUTTON)
+	$(WGET) -O $@ $(TORBUTTON)
 
 ## Generic language pack rule
 langpack_%.xpi:
@@ -157,7 +159,7 @@
 
 bundle_%:
 	LANGCODE=$* make bundle
-	
+
 bundle: copy-base install-extensions patch-vidalia-language patch-firefox-config
 
 compress-bundle: