[tor-commits] [torbrowser/master] update filenames, paths, remove tons of whitespace, etc in makefiles for alpha bundles
erinn at torproject.org
erinn at torproject.org
Fri Mar 2 16:05:00 UTC 2012
commit 1df97630416db9655cc21b7c69d7ec521a5219a9
Author: Erinn Clark <erinn at torproject.org>
Date: Thu Mar 1 14:00:46 2012 -0300
update filenames, paths, remove tons of whitespace, etc in makefiles for alpha bundles
---
README.LINUX-2.3 | 29 ++++++++++++++++++++
README.OSX-2.3 | 23 +++++++++++++++
README.WIN-2.3 | 27 ++++++++++++++++++
build-scripts/linux-alpha.mk | 24 ++++++++--------
build-scripts/osx-alpha.mk | 18 ++++++------
build-scripts/versions-alpha.mk | 12 ++++----
build-scripts/windows-alpha.mk | 22 +++++++-------
changelog.linux-2.3 | 5 +++
changelog.osx-2.3 | 5 +++
changelog.windows-2.3 | 5 +++
...for-uitools-so-that-it-builds-correct-lib.patch | 2 +-
11 files changed, 133 insertions(+), 39 deletions(-)
diff --git a/README.LINUX-2.3 b/README.LINUX-2.3
new file mode 100644
index 0000000..760e6c8
--- /dev/null
+++ b/README.LINUX-2.3
@@ -0,0 +1,29 @@
+Tor Browser Bundle for GNU/Linux (alpha)
+===============
+
+Included applications
+---------------------
+
+Vidalia 0.3.1-alpha (with Qt 4.7.4)
+Tor 0.2.3.12-alpha (with libevent-2.0.17-stable, zlib-1.2.6 and openssl-1.0.1-beta1)
+Firefox 10.0.1
+ \_ Torbutton 1.4.5.1
+ |_ NoScript 2.3
+ |_ HTTPS-Everywhere 2.0development.4
+
+Usage
+-----
+
+Extract the bundle with:
+
+tar -xvzf tor-browser-gnu-linux*.tar.gz
+
+This will create a directory named tor-browser_LANG. Click on this directory or
+cd into it and execute the 'start-tor-browser' script. This will start Vidalia.
+Once Tor has successfully opened a circuit, Firefox will automatically be
+opened.
+
+To exit, close Firefox. Vidalia will automatically clean up and exit.
+
+For more information about bugfixes and other package changes, see the
+changelog in tor-browser_LANG/Docs/changelog.
diff --git a/README.OSX-2.3 b/README.OSX-2.3
new file mode 100644
index 0000000..3f54336
--- /dev/null
+++ b/README.OSX-2.3
@@ -0,0 +1,23 @@
+Tor Browser Bundle for Mac OS X (alpha)
+===============
+
+Included applications
+---------------------
+
+Vidalia 0.3.1-alpha (with Qt 4.7.4)
+Tor 0.2.3.12-alpha (with libevent-2.0.17-stable, zlib-1.2.6 and openssl-1.0.1-beta1)
+Firefox 10.0.1
+ \_ Torbutton 1.4.5.1
+ |_ NoScript 2.3
+ |_ HTTPS-Everywhere 2.0development.4
+
+Usage
+-----
+
+Unzip the TorBrowser zip file that you downloaded. Click on the
+TorBrowser_LANG.app which will launch Vidalia and then Firefox.
+
+To exit, close Firefox and Vidalia.
+
+For more information about bugfixes and other package changes, see the
+changelog in TorBrowser_LANG.app/Contents/Resources/changelog.
diff --git a/README.WIN-2.3 b/README.WIN-2.3
new file mode 100644
index 0000000..90c8c83
--- /dev/null
+++ b/README.WIN-2.3
@@ -0,0 +1,27 @@
+Tor Browser Bundle for Windows (alpha)
+===============
+
+Included applications
+---------------------
+
+Vidalia 0.3.1-alpha (with Qt 4.7.4)
+Tor 0.2.3.12-alpha (with libevent-2.0.17-stable, zlib-1.2.6 and openssl-1.0.1-beta1)
+Firefox 10.0.1
+ \_ Torbutton 1.4.5.1
+ |_ NoScript 2.3
+ |_ HTTPS-Everywhere 2.0development.4
+
+Usage
+-----
+
+Tor Browser.exe is a 7zip self extracting archive. To extract the bundle, run
+this and point it to the install location. It will create a folder called "Tor
+Browser". This may be the hard disk, but is more likely the currently mounted
+USB drive. The install process needs only be performed once.
+
+Once the bundle is extracted, open the newly created folder and click
+"Start Tor Browser.bat" (may appear as simply "Start Tor Browser").
+This will start Vidalia. Once Tor has successfully opened a circuit,
+Firefox will automatically be opened.
+
+To exit, close Firefox. Vidalia will automatically clean up and exit.
diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk
index 409db51..04c1608 100644
--- a/build-scripts/linux-alpha.mk
+++ b/build-scripts/linux-alpha.mk
@@ -15,7 +15,7 @@
# This makes the German bundle
### make -f linux-alpha.mk bundle_de
# This makes the German compressed bundle
-### make -f linux-alpha.mk compressed-bundle_de
+### make -f linux-alpha.mk compressed-bundle_de
# It's possible you may also want to do:
### make -f linux-alpha.mk build-all-binaries
### make -f linux-alpha.mk all-compressed-bundles
@@ -36,7 +36,7 @@ include $(PWD)/versions-alpha.mk
## Architecture
ARCH_TYPE=$(shell uname -m)
-BUILD_NUM=4
+BUILD_NUM=1
PLATFORM=Linux
## Location of directory for source unpacking
@@ -281,7 +281,7 @@ DATADIR=$(DEST)/Data
TB_TMPDIR=$(DEST)/tmp
## Build directory structure
-directory-structure:
+directory-structure:
rm -fr $(DEST)
mkdir -p $(APPDIR)
mkdir -p $(LIBSDIR)
@@ -303,14 +303,14 @@ install-binaries:
cp -d $(QT)/libQtScript.so* $(LIBSDIR)
#rm $(LIBSDIR)/libQt*.so*.debug
# zlib
- cp -d $(ZLIB)/libz.so $(ZLIB)/libz.so.1 $(ZLIB)/libz.so.1.2.5 $(LIBSDIR)/libz
+ cp -d $(ZLIB)/libz.so $(ZLIB)/libz.so.1 $(ZLIB)/libz.so.1.2.6 $(LIBSDIR)/libz
# Libevent
- cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.1.4 $(LIBEVENT)/libevent_core.so \
- $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.1.4 \
- $(LIBEVENT)/libevent_extra-2.0.so.5 $(LIBEVENT)/libevent_extra-2.0.so.5.1.4 \
+ cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.1.5 $(LIBEVENT)/libevent_core.so \
+ $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.1.5 \
+ $(LIBEVENT)/libevent_extra-2.0.so.5 $(LIBEVENT)/libevent_extra-2.0.so.5.1.5 \
$(LIBEVENT)/libevent_extra.so $(LIBEVENT)/libevent.so $(LIBSDIR)
# libpng
- cp -d $(LIBPNG)/libpng14.so* $(LIBSDIR)
+ cp -d $(LIBPNG)/libpng15.so* $(LIBSDIR)
# OpenSSL
cp -d $(OPENSSL)/libssl.so* $(OPENSSL)/libcrypto.so* $(LIBSDIR)
# Vidalia
@@ -326,9 +326,9 @@ install-docs:
cp $(VIDALIA_DIR)/LICENSE* $(VIDALIA_DIR)/CREDITS $(DOCSDIR)/Vidalia
cp $(TOR_DIR)/LICENSE $(TOR_DIR)/README $(DOCSDIR)/Tor
cp $(QT_DIR)/LICENSE.GPL* $(QT_DIR)/LICENSE.LGPL $(DOCSDIR)/Qt
- cp ../changelog.linux-2.2 $(DOCSDIR)/changelog
+ cp ../changelog.linux-2.3 $(DOCSDIR)/changelog
# This should be updated to be more generic (version-wise) and more Linux specific
- cp ../README.LINUX-2.2 $(DOCSDIR)/README-TorBrowserBundle
+ cp ../README.LINUX-2.3 $(DOCSDIR)/README-TorBrowserBundle
## Copy over Firefox
install-firefox:
@@ -398,7 +398,7 @@ torbutton.xpi:
$(WGET) -O $@ $(TORBUTTON)
## NoScript development version
-noscript.xpi:
+noscript.xpi:
$(WGET) -O $@ $(NOSCRIPT)
## BetterPrivacy
@@ -495,7 +495,7 @@ endif
patch-firefox-language:
## Patch the default Firefox prefs.js
- ## Don't use {} because they aren't always interpreted correctly. Thanks, sh.
+ ## 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
diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk
index b52a3f5..e4f04d6 100644
--- a/build-scripts/osx-alpha.mk
+++ b/build-scripts/osx-alpha.mk
@@ -15,7 +15,7 @@
# This makes the German bundle
### make -f osx-alpha.mk bundle_de
# This makes the German compressed bundle
-### make -f osx-alpha.mk compressed-bundle_de
+### make -f osx-alpha.mk compressed-bundle_de
# It's possible you may also want to do:
### make -f osx-alpha.mk build-all-binaries
### make -f osx-alpha.mk all-compressed-bundles
@@ -261,7 +261,7 @@ DATADIR=$(DEST)/Contents/Resources/Data
TB_TMPDIR=$(DEST)/Contents/SharedSupport
## Build directory structure
-directory-structure:
+directory-structure:
rm -fr $(DEST)
mkdir -p $(APPDIR)
mkdir -p $(APPDIR)/Firefox.app/Contents/MacOS/Data/profile
@@ -273,7 +273,7 @@ directory-structure:
## Package up all the Vidalia and Tor pre-requisites
## Firefox and Pidgin are installed in their own targets
-install-binaries:
+install-binaries:
# Vidalia
cp -R $(VIDALIA) $(APPDIR)/Vidalia.app
# Tor (perhaps we want tor-resolve too?)
@@ -288,9 +288,9 @@ install-docs:
cp $(VIDALIA_DIR)/LICENSE* $(VIDALIA_DIR)/CREDITS $(DOCSDIR)/Vidalia
cp $(TOR_DIR)/LICENSE $(TOR_DIR)/README $(DOCSDIR)/Tor
#cp $(QT_DIR)/LICENSE.GPL* $(QT_DIR)/LICENSE.LGPL $(DOCSDIR)/Qt
- cp ../changelog.osx-2.2 $(DOCSDIR)/changelog
+ cp ../changelog.osx-2.3 $(DOCSDIR)/changelog
cp ../LICENSE $(DEST)
- cp ../README.OSX-2.2 $(DEST)/README-TorBrowserBundle
+ cp ../README.OSX-2.3 $(DEST)/README-TorBrowserBundle
## Copy over Firefox
install-firefox:
@@ -344,7 +344,7 @@ betterprivacy.xpi:
$(WGET) --no-check-certificate -O $@ $(BETTERPRIVACY)
## NoScript development version
-noscript.xpi:
+noscript.xpi:
$(WGET) --no-check-certificate -O $@ $(NOSCRIPT)
## HTTPS Everywhere
@@ -419,12 +419,12 @@ install-betterprivacy: betterprivacy.xpi
mkdir -p $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/\{d40f5e7b-d2cf-4856-b441-cc613eeffbe3\}
cp betterprivacy.xpi $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/\{d40f5e7b-d2cf-4856-b441-cc613eeffbe3\}/betterprivacy.zip
(cd $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/\{d40f5e7b-d2cf-4856-b441-cc613eeffbe3\} && unzip *.zip && rm *.zip)
-
+
install-httpseverywhere: httpseverywhere.xpi
mkdir -p $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/https-everywhere at eff.org
cp httpseverywhere.xpi $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/https-everywhere at eff.org/httpseverywhere.zip
(cd $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/https-everywhere at eff.org && unzip *.zip && rm *.zip)
-
+
install-noscript: noscript.xpi
mkdir -p $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/\{73a6fe31-595d-460b-a920-fcc0f8843232\}
cp noscript.xpi $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/\{73a6fe31-595d-460b-a920-fcc0f8843232\}/noscript.zip
@@ -462,5 +462,5 @@ print-version:
write-tbb-version:
printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)-$(ARCH_TYPE)" >> $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js
-final:
+final:
mv $(BUNDLE) $(BUNDLE).app
diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk
index 04cc071..8320b44 100644
--- a/build-scripts/versions-alpha.mk
+++ b/build-scripts/versions-alpha.mk
@@ -1,20 +1,20 @@
#!/usr/bin/make
-RELEASE_VER=2.3.11-alpha
+RELEASE_VER=2.3.12-alpha
HTTPSEVERY_VER=2.0development.4
-FIREFOX_VER=9.0.1
-LIBEVENT_VER=2.0.16-stable
+FIREFOX_VER=10.0.2
+LIBEVENT_VER=2.0.17-stable
LIBPNG_VER=1.5.7
-NOSCRIPT_VER=2.2.5
+NOSCRIPT_VER=2.3
OPENSSL_VER=1.0.1-beta1
OTR_VER=3.2.0
PIDGIN_VER=2.6.4
QT_VER=4.7.4
-TOR_VER=0.2.3.11-alpha
+TOR_VER=0.2.3.12-alpha
TORBUTTON_VER=1.4.5.1
VIDALIA_VER=0.3.1-alpha
-ZLIB_VER=1.2.5
+ZLIB_VER=1.2.6
## Extension IDs
FF_VENDOR_ID:=\{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk
index ee73944..fb5f6d9 100644
--- a/build-scripts/windows-alpha.mk
+++ b/build-scripts/windows-alpha.mk
@@ -15,7 +15,7 @@
# This makes the German bundle
### make -f windows-alpha.mk bundle_de
# This makes the German compressed bundle
-### make -f windows-alpha.mk compressed-bundle_de
+### make -f windows-alpha.mk compressed-bundle_de
# It's possible you may also want to do:
### make -f windows-alpha.mk build-all-binaries
### make -f windows-alpha.mk all-compressed-bundles
@@ -31,7 +31,7 @@
## Include versions
include $(PWD)/versions-alpha.mk
-BUILD_NUM=4
+BUILD_NUM=1
PLATFORM=Windows
## Location of required libraries
@@ -263,7 +263,7 @@ clean:
## Also remove the output files
reallyclean: clean
rm -fr $(IM_COMPRESSED_BASENAME)*_*.exe
- rm -fr $(IM_COMPRESSED_BASENAME)*_*.rar
+ rm -fr $(IM_COMPRESSED_BASENAME)*_*.rar
rm -fr $(IM_COMPRESSED_BASENAME)*_*_split
rm -fr $(DEFAULT_COMPRESSED_BASENAME)*_*.exe
rm -fr $(DEFAULT_COMPRESSED_BASENAME)*_*.rar
@@ -275,7 +275,7 @@ reallyclean: clean
virus-scan:
$(VIRUSSCAN) $(VIDALIA)/build/src/vidalia/vidalia.exe
- $(VIRUSSCAN) $(TOR)/src/or/tor.exe
+ $(VIRUSSCAN) $(TOR)/src/or/tor.exe
$(VIRUSSCAN) $(TOR)/src/tools/tor-resolve.exe
##
@@ -292,7 +292,7 @@ APPDIR=$(DEST)/App
DOCSDIR=$(DEST)/Docs
DATADIR=$(DEST)/Data
-directory-structure:
+directory-structure:
rm -fr $(DEST)
mkdir -p $(APPDIR)
mkdir -p $(DATADIR)/Tor
@@ -301,7 +301,7 @@ directory-structure:
## Package up all the Vidalia and Tor pre-requisites
## Filenames extracted using Dependency Walker <http://www.dependencywalker.com/>
-install-binaries:
+install-binaries:
cp $(MING)/mingwm10.dll $(APPDIR)
cp $(MING)/libgnurx-0.dll $(APPDIR)
cp $(QT_LIB)/QtScript4.dll $(QT_LIB)/QtCore4.dll $(QT_LIB)/QtGui4.dll $(QT_LIB)/QtNetwork4.dll $(QT_LIB)/QtXml4.dll $(QT_LIB)/libgcc_s_dw2-1.dll $(APPDIR)
@@ -321,8 +321,8 @@ install-docs:
cp $(TOR)/LICENSE $(TOR)/README $(DOCSDIR)/Tor
cp $(QT_LIB)/../LICENSE.GPL* $(QT_LIB)/../LICENSE.LGPL $(DOCSDIR)/Qt
cp $(MING)/../msys/1.0/share/doc/MSYS/COPYING $(DOCSDIR)/MinGW
- cp ../changelog.windows-2.2 $(DOCSDIR)/changelog
- cp ../README.WIN-2.2 $(DOCSDIR)/README-TorBrowserBundle
+ cp ../changelog.windows-2.3 $(DOCSDIR)/changelog
+ cp ../README.WIN-2.3 $(DOCSDIR)/README-TorBrowserBundle
## Copy over FirefoxPortable
install-firefoxportable:
@@ -345,11 +345,11 @@ configure-apps:
## 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
-
+
## Configure PidginPortable
ifeq ($(USE_PIDGIN),1)
cp $(CONFIG_SRC)/PidginPortable.ini $(DEST)/PidginPortable
@@ -392,7 +392,7 @@ betterprivacy.xpi:
$(PYGET) -O $@ $(BETTERPRIVACY)
## NoScript development version
-noscript.xpi:
+noscript.xpi:
$(PYGET) -O $@ $(NOSCRIPT)
## HTTPS Everywhere
diff --git a/changelog.linux-2.3 b/changelog.linux-2.3
new file mode 100644
index 0000000..8090ce7
--- /dev/null
+++ b/changelog.linux-2.3
@@ -0,0 +1,5 @@
+Tor Browser Bundle (2.3.12-alpha-1); suite=osx
+
+ * Initial release
+
+ -- Erinn Clark <erinn at torproject.org> Thu Mar 1 14:04:56 BRT 2012
diff --git a/changelog.osx-2.3 b/changelog.osx-2.3
new file mode 100644
index 0000000..8090ce7
--- /dev/null
+++ b/changelog.osx-2.3
@@ -0,0 +1,5 @@
+Tor Browser Bundle (2.3.12-alpha-1); suite=osx
+
+ * Initial release
+
+ -- Erinn Clark <erinn at torproject.org> Thu Mar 1 14:04:56 BRT 2012
diff --git a/changelog.windows-2.3 b/changelog.windows-2.3
new file mode 100644
index 0000000..8090ce7
--- /dev/null
+++ b/changelog.windows-2.3
@@ -0,0 +1,5 @@
+Tor Browser Bundle (2.3.12-alpha-1); suite=osx
+
+ * Initial release
+
+ -- Erinn Clark <erinn at torproject.org> Thu Mar 1 14:04:56 BRT 2012
diff --git a/src/current-patches/qt/0001-Add-config-options-for-uitools-so-that-it-builds-correct-lib.patch b/src/current-patches/qt/0001-Add-config-options-for-uitools-so-that-it-builds-correct-lib.patch
index d0fb5ca..cb65ea8 100644
--- a/src/current-patches/qt/0001-Add-config-options-for-uitools-so-that-it-builds-correct-lib.patch
+++ b/src/current-patches/qt/0001-Add-config-options-for-uitools-so-that-it-builds-correct-lib.patch
@@ -19,6 +19,6 @@ index 2f48778..84e4893 100644
+CONFIG += uitools plugin link_prl
SOURCES += $$GENERATEDCPP/com_trolltech_qt_uitools/plugin.cpp
include($$GENERATEDCPP/com_trolltech_qt_uitools/com_trolltech_qt_uitools.pri)
---
+--
1.7.7.4
More information about the tor-commits
mailing list