[or-cvs] r19070: {torbrowser} Update versions in the instructions and Makefile, fix the pa (torbrowser/trunk/build-scripts)
phobos at seul.org
phobos at seul.org
Wed Mar 18 02:36:34 UTC 2009
Author: phobos
Date: 2009-03-17 22:36:34 -0400 (Tue, 17 Mar 2009)
New Revision: 19070
Modified:
torbrowser/trunk/build-scripts/INSTALL
torbrowser/trunk/build-scripts/Makefile
Log:
Update versions in the instructions and Makefile, fix the path to the
LICENSE files in Qt 4.5.0.
Modified: torbrowser/trunk/build-scripts/INSTALL
===================================================================
--- torbrowser/trunk/build-scripts/INSTALL 2009-03-18 01:58:55 UTC (rev 19069)
+++ torbrowser/trunk/build-scripts/INSTALL 2009-03-18 02:36:34 UTC (rev 19070)
@@ -219,15 +219,15 @@
Installing Qt
=============
-Download Qt 4.1 or later, we'll use 4.4.3:
+Download Qt 4.1 or later, we'll use 4.5.0:
http://trolltech.com/developer/downloads/qt/windows
Download and run the installer with Windows Explorer:
- ftp://ftp.trolltech.com/qt/source/qt-win-opensource-4.4.3-mingw.exe
+ ftp://ftp.trolltech.com/qt/source/qt-win-opensource-4.5.0-mingw.exe
-When prompted, install Qt into 'C:\Qt\4.4.3'
+When prompted, install Qt into 'C:\Qt\4.5.0'
You will be prompted for the install path for your MinGW directory, enter 'C:\MinGW'
You may have an error about win32api.h being not found. This is not true. You
have win32api.h and Qt is wrong. This is a result of the Qt installer not
@@ -434,26 +434,26 @@
Download Vidalia:
- http://vidalia-project.net/dist/vidalia-0.1.11.tar.gz
- http://vidalia-project.net/dist/vidalia-0.1.11.tar.gz.asc
+ http://vidalia-project.net/dist/vidalia-0.1.12.tar.gz
+ http://vidalia-project.net/dist/vidalia-0.1.12.tar.gz.asc
Verify the signature.
Unpack Vidalia:
- tar -C /c/build/ -xvzf /c/Documents\ and\ Settings/Administrator/Desktop/vidalia-0.1.11.tar.gz
- mv vidalia-0.1.11/ vidalia
+ tar -C /c/build/ -xvzf /c/Documents\ and\ Settings/Administrator/Desktop/vidalia-0.1.12.tar.gz
+ mv vidalia-0.1.12/ vidalia
Set a proper environment:
cat << 'EOF' >> /etc/profile
- export QTDIR="C:\Qt\4.4.3"
- export PATH=$PATH:/c/Qt/4.4.3/bin
+ export QTDIR="C:\Qt\4.5.0"
+ export PATH=$PATH:/c/Qt/4.5.0/bin
export PATH=$PATH:/c/Program\ Files/CMake\ 2.6/bin/
export QMAKESPEC=win32-g++
EOF
- export PATH=$PATH:/c/Program\ Files/CMake\ 2.6/bin/:/c/MinGW/bin/:/c/Qt/4.4.3/bin/
+ export PATH=$PATH:/c/Program\ Files/CMake\ 2.6/bin/:/c/MinGW/bin/:/c/Qt/4.5.0/bin/
Create the proper MSYS Makefiles and don't forget the '.' at the end!
@@ -481,7 +481,7 @@
and other libraries with known full path:
- C:/Qt/4.4.3/lib/libQtGui4.a
+ C:/Qt/4.5.0/lib/libQtGui4.a
CMake is adding directories in the second list to the linker search path in
@@ -496,24 +496,6 @@
This is OK. You can ignore these errors.
-It appears that for whatever reason, Qt now requires a small patch to compile
-Vidalia. We've created a small patch that will allow the build to function.
-
-Download the patch:
-
- https://svn.torproject.org/svn/torbrowser/trunk/src/current-patches/qt-interlock-fix.patch
-
-Copy the patch to your build directory:
-
- cp /c/Documents\ and\ Settings/Administrator/Desktop/qt-interlock-fix.patch /c/build/
-
-Apply it like so:
-
- cd /c/Qt/4.4.3/src/corelib/arch
- patch -p0 < /c/build/qt-interlock-fix.patch
-
-This patch is very simple and should no longer be required in Qt 4.4.4
-
Now you'll build Vidalia by running MSYS make:
cd /c/build/vidalia/
@@ -646,7 +628,7 @@
An example to change the Qt Lib version:
From: QT=/c/Qt/4.3.4/bin
- To: QT=/c/Qt/4.4.3/bin
+ To: QT=/c/Qt/4.5.0/bin
And then change the Tor version:
Modified: torbrowser/trunk/build-scripts/Makefile
===================================================================
--- torbrowser/trunk/build-scripts/Makefile 2009-03-18 01:58:55 UTC (rev 19069)
+++ torbrowser/trunk/build-scripts/Makefile 2009-03-18 02:36:34 UTC (rev 19070)
@@ -13,10 +13,10 @@
## Location of required libraries
MING=/c/MinGW/bin
-QT=/c/Qt/4.4.3/bin
+QT=/c/Qt/4.5.0/bin
## Location of bundle components
-VIDALIA=/c/build/vidalia-0.1.11
+VIDALIA=/c/build/vidalia-0.1.12
TOR=/c/build/tor-0.2.1.13-alpha
POLIPO=/c/build/polipo-1.0.4
FIREFOX_SRC=/c/build/FirefoxPortable-3.0.7
@@ -170,7 +170,7 @@
mkdir -p $(DOCSDIR)/Polipo
cp $(VIDALIA)/LICENSE* $(VIDALIA)/CREDITS $(DOCSDIR)/Vidalia
cp $(TOR)/LICENSE $(TOR)/AUTHORS $(TOR)/README $(DOCSDIR)/Tor
- cp $(QT)/../LICENSE.GPL* $(QT)/../GPL* $(DOCSDIR)/Qt
+ cp $(QT)/../LICENSE.GPL* $(QT)/../LICENSE.LGPL $(DOCSDIR)/Qt
cp $(MING)/../COPYING $(DOCSDIR)/MinGW
cp $(POLIPO)/COPYING $(POLIPO)/README $(DOCSDIR)/Polipo
More information about the tor-commits
mailing list