[or-cvs] r20601: {torvm} Win32 build scripts clean up. (in torvm/trunk/build/win32: . files)
coderman at seul.org
coderman at seul.org
Fri Sep 18 07:02:50 UTC 2009
Author: coderman
Date: 2009-09-18 03:02:50 -0400 (Fri, 18 Sep 2009)
New Revision: 20601
Modified:
torvm/trunk/build/win32/Makefile
torvm/trunk/build/win32/files/buildall.sh
Log:
Win32 build scripts clean up.
Modified: torvm/trunk/build/win32/Makefile
===================================================================
--- torvm/trunk/build/win32/Makefile 2009-09-18 05:57:45 UTC (rev 20600)
+++ torvm/trunk/build/win32/Makefile 2009-09-18 07:02:50 UTC (rev 20601)
@@ -122,49 +122,60 @@
PERL_SUM=65dd8765a8f7b22d15193e56ed06c309c29a01b02d877a14e071cff1f46454c8
#perl-5.6.1-MSYS-1.0.11-1-src.tar.bz2
-GNURX_F=mingw-libgnurx-2.5.1-src.tar.gz
+GNURX_VER=2.5.1
+GNURX_F=mingw-libgnurx-$(GNURX_VER)-src.tar.gz
GNURX_URL=http://downloads.sourceforge.net/mingw/$(GNURX_F)?big_mirror=1
GNURX_SUM=7147b7f806ec3d007843b38e19f42a5b7c65894a57ffc297a76b0dcd5f675d76
-ZLIBSRC_F=zlib-1.2.3.tar.gz
-ZLIBSRC_URL=http://www.zlib.net/zlib-1.2.3.tar.gz
+ZLIBSRC_VER=1.2.3
+ZLIBSRC_F=zlib-$(ZLIBSRC_VER).tar.gz
+ZLIBSRC_URL=http://www.zlib.net/$(ZLIBSRC_F)
ZLIBSRC_SUM=1795c7d067a43174113fdf03447532f373e1c6c57c08d61d9e4e9be5e244b05e
-PTHREADS_F=pthreads-w32-2-8-0-release.tar.gz
+PTHREADS_VER=2-8-0
+PTHREADS_F=pthreads-w32-$(PTHREADS_VER)-release.tar.gz
PTHREADS_URL=ftp://sourceware.org/pub/pthreads-win32/$(PTHREADS_F)
PTHREADS_SUM=ff7a2874b04581ed344f7d3bb0548d7798891216eebcee830887b37c85ab48fd
-LIBEVENT_F=libevent-2.0.1-alpha.tar.gz
+LIBEVENT_VER=2.0.1-alpha
+LIBEVENT_F=libevent-$(LIBEVENT_VER).tar.gz
LIBEVENT_URL=http://www.monkey.org/~provos/$(LIBEVENT_F)
LIBEVENT_SUM=7284eddec53bb731fb9c49aa6c6071b03476d98410d25b59810fbcc610d4a469
-GROFF_F=groff-1.19.2.tar.gz
+GROFF_VER=1.19.2
+GROFF_F=groff-$(GROFF_VER).tar.gz
GROFF_URL=http://ftp.gnu.org/gnu/groff/$(GROFF_F)
GROFF_SUM=d864fbd0bf6dea24e4f71736da9902a1cae86d0a1a893b5fe17118927257ec3e
-CMAKE_F=cmake-2.6.2.tar.gz
+CMAKE_VER=2.6.2
+CMAKE_F=cmake-$(CMAKE_VER).tar.gz
CMAKE_URL=http://www.cmake.org/files/v2.6/$(CMAKE_F)
CMAKE_SUM=b3f5a9dfa97fb82cb1b7d78a62d949f93c8d4317af36674f337d27066fa6b7e9
-SSLSRC_F=openssl-0.9.8k.tar.gz
+SSLSRC_VER=0.9.8k
+SSLSRC_F=openssl-$(SSLSRC_VER).tar.gz
SSLSRC_URL=http://www.openssl.org/source/$(SSLSRC_F)
SSLSRC_SUM=7e7cd4f3974199b729e6e3a0af08bd4279fde0370a1120c1a3b351ab090c6101
-PYTHON_F=Python-3.0.1.tar.bz2
+PYTHON_VER=3.0.1
+PYTHON_F=Python-$(PYTHON_VER).tar.bz2
PYTHON_URL=http://www.python.org/ftp/python/3.0.1/$(PYTHON_F)
PYTHON_SUM=91afb6ac16d3d22bc6bfbc80726dc85ede32bf838f660cc67016c7d0a7079add
-PY2EXE_F=py2exe-0.6.9.zip
+PY2EXE_VER=0.6.9
+PY2EXE_F=py2exe-$(PY2EXE_VER).zip
PY2EXE_TGZ=py2exe.tar.gz
PY2EXE_URL=http://downloads.sourceforge.net/py2exe/$(PY2EXE_F)?big_mirror=1
PY2EXE_SUM=6bd383312e7d33eef2e43a5f236f9445e4f3e0f6b16333c6f183ed445c44ddbd
-WIX_F=wix3.0.4805.0-binaries.zip
+WIX_VER=3.0.4805.0
+WIX_F=wix$(WIX_VER)-binaries.zip
WIX_TGZ=wix.tar.gz
WIX_URL=http://downloads.sourceforge.net/wix/$(WIX_F)?big_mirror=1
WIX_SUM=ffbe664c97f5abad8aeb806bc9315ddcfc252696dfaa4847f72efe026eb226c5
-WIXSRC_F=wix3.0.4805.0-sources.zip
+WIXSRC_VER=3.0.4805.0
+WIXSRC_F=wix$(WIXSRC_VER)-sources.zip
WIXSRC_TGZ=wixsrc.tar.gz
WIXSRC_URL=http://downloads.sourceforge.net/wix/$(WIXSRC_F)?big_mirror=1
WIXSRC_SUM=18175aa9265d13b9b3a1c24c8892de34fda5206a519db27007ea001a18034adc
@@ -183,7 +194,8 @@
SEVNZIP_URL=http://downloads.sourceforge.net/sevenzip/$(SEVNZIP_F)?big_mirror=1
SEVNZIP_SUM=1e5b8909ccd3dc09977a1d95a7dfb239d7e30bba6d887d58773f6ddeebba9a05
-SDL_F=SDL-1.2.13.tar.gz
+SDL_VER=1.2.13
+SDL_F=SDL-$(SDL_VER).tar.gz
SDL_URL=http://www.libsdl.org/release/$(SDL_F)
SDL_SUM=94f99df1d60f296b57f4740650a71b6425da654044ca30f8f0ce34934429e132
@@ -202,7 +214,8 @@
KQEMU_URL=http://www.qemu.org/$(KQEMU_F)
KQEMU_SUM=bac3e84eae1c867b06cd06ed2bcf563ba8304bd4e5a900880c2abe61b9aab491
-OVPN_F=openvpn-2.1_rc15.tar.gz
+OVPN_VER=2.1_rc15
+OVPN_F=openvpn-$(OVPN_VER).tar.gz
OVPN_URL=http://openvpn.net/release/$(OVPN_F)
OVPN_SUM=66cfe347da6ab29ae39c80527714079cdb5699fdf453f7e031dd2ec0172d13a5
@@ -215,7 +228,8 @@
QT_URL=ftp://ftp.qtsoftware.com/qt/source/$(QT_F)
QT_SUM=fffd80292a3e5353e2a032167551dd56752624c7fa188df97a2ba19e0e33a295
-POLIPO_F=polipo-20080907.tar.gz
+POLIPO_VER=20080907
+POLIPO_F=polipo-$(POLIPO_VER).tar.gz
POLIPO_URL=http://www.pps.jussieu.fr/~jch/software/files/polipo/$(POLIPO_F)
POLIPO_SUM=c4c8b6f4d32e6d17e71160f2d4683a3ac444c81de321eeb1394a5575d973a200
@@ -278,7 +292,9 @@
CACHE_URL_BASE=http://data.peertech.org/pkgcache
-ALLPKGNAMES=ZLIB GZIP BZIP2 LIBARCH BINUTILS GCCORE GPP MINGWRUN MINGWUTIL MAKE W32API MSYSCORE LIBTOOL MINIRES MSYSZLIB MSYSCRYPT MSYSSSL MSYSSSH ZLIBSRC PTHREADS LIBEVENT AMAKE ACONF PERL GROFF CMAKE QT NSIS SSLSRC PYTHON PY2EXE WIX WIXSRC GNURX POLIPO SDL WPCAPSRC QEMU KQEMU TORBUTTON_XPI OVPN GEOIP BITTORRENT BTPATCH
+TOOLSPKGNAMES=ZLIB GZIP BZIP2 LIBARCH BINUTILS GCCORE GPP MINGWRUN MINGWUTIL MAKE W32API MSYSCORE LIBTOOL MINIRES MSYSZLIB MSYSCRYPT MSYSSSL MSYSSSH AMAKE ACONF PERL GROFF NSIS WIX WIXSRC TORBUTTON_XPI GEOIP
+SRCPKGNAMES=ZLIBSRC PTHREADS LIBEVENT CMAKE QT SSLSRC PYTHON PY2EXE GNURX POLIPO SDL WPCAPSRC QEMU KQEMU OVPN BITTORRENT BTPATCH
+ALLPKGNAMES=$(TOOLSPKGNAMES) $(SRCPKGNAMES)
# adjust if we're dealing with non source, zip or tar archives for a package
SEVNZIP_OPT_DL=
@@ -302,12 +318,10 @@
PKGENVFILE=pkgenv.sh
PKGENVSETUP:=echo
define PKGENV_exp
-_CPKG_F:=$$($(1)_F)
-_CPKG_VER:=$$($(1)_VER)
-PKGENVSETUP:=$(PKGENVSETUP) ; echo $(1)_F=$(_CPKG_F) ; echo $(1)_VER=$(_CPKG_VER)
+PKGENVSETUP:=$(PKGENVSETUP) ; echo export $(1)_F=$$($(1)_F) ; echo export $(1)_VER=$$($(1)_VER)
endef
-$(foreach pkgname,$(ALLPKGNAMES),$(eval $(call PKGENV_exp,$(pkgname))))
+$(foreach pkgname,$(SRCPKGNAMES),$(eval $(call PKGENV_exp,$(pkgname))))
# now for primary targets...
downloads: $(ALLPKGNAMES)
Modified: torvm/trunk/build/win32/files/buildall.sh
===================================================================
--- torvm/trunk/build/win32/files/buildall.sh 2009-09-18 05:57:45 UTC (rev 20600)
+++ torvm/trunk/build/win32/files/buildall.sh 2009-09-18 07:02:50 UTC (rev 20601)
@@ -66,7 +66,8 @@
echo '#!/bin/bash' > $bstatefile
chmod +x $bstatefile
fi
-
+
+ export srcroot="/usr/src"
export bdlibdir="${ddir}/lib"
export bindir="${ddir}/bin"
export statedir="${ddir}/state"
@@ -81,61 +82,24 @@
SEVNZIP_DEF_INSTPATH="/${sysdrive}/Program Files/7-Zip"
export PATH="$PATH:${SEVNZIP_DEF_INSTPATH}"
- export ZLIB_VER="1.2.3"
- export ZLIB_DIR="zlib-${ZLIB_VER}"
- export ZLIB_FILE="zlib-${ZLIB_VER}.tar.gz"
-
- export LIBEVENT_VER=2.0.1-alpha
- export LIBEVENT_FILE="libevent-${LIBEVENT_VER}.tar.gz"
- export LIBEVENT_DIR="libevent-${LIBEVENT_VER}"
-
export TOR_DIR="tor-latest"
export TOR_FILE="tor-latest.tar.gz"
- export PTHREAD_VER=2-8-0
- export PTHREAD_DIR="pthreads-w32-${PTHREAD_VER}-release"
- export PTHREAD_FILE="${PTHREAD_DIR}.tar.gz"
-
- export OPENSSL_VER="0.9.8k"
- export OPENSSL_DIR="openssl-${OPENSSL_VER}"
- export OPENSSL_FILE="openssl-${OPENSSL_VER}.tar.gz"
-
- export GROFF_VER="1.19.2"
- export GROFF_DIR="groff-${GROFF_VER}"
- export GROFF_FILE="groff-${GROFF_VER}.tar.gz"
-
- export SDL_VER=1.2.13
- export SDL_DIR="SDL-${SDL_VER}"
- export SDL_FILE="${SDL_DIR}.tar.gz"
-
- export OPENVPN_VER=2.1_rc15
- export OPENVPN_DIR="openvpn-${OPENVPN_VER}"
- export OPENVPN_FILE="${OPENVPN_DIR}.tar.gz"
-
- export WPCAP_VER=4_1_beta5
- export WPCAP_DIR="WpcapSrc_${WPCAP_VER}"
+ export WPCAP_DIR="WpcapSrc_${WPCAPSRC_VER}"
export WPCAP_FILE="${WPCAP_DIR}.tar.gz"
export WPCAP_INCLUDE="-I/src/${WPCAP_DIR}/wpcap/libpcap -I/src/${WPCAP_DIR}/wpcap/libpcap/Win32/Include"
export WPCAP_LDFLAGS="-L/src/${WPCAP_DIR}/wpcap/PRJ -L/src/${WPCAP_DIR}/packetNtx/Dll/Project"
- export QEMU_VER=0.10.5
- export QEMU_DIR="qemu-${QEMU_VER}"
- export QEMU_FILE="${QEMU_DIR}.tar.gz"
-
- export CMAKE_VER="2.6.2"
export CMAKE_DIR="cmake-${CMAKE_VER}"
- export CMAKE_FILE="cmake-${CMAKE_VER}.tar.gz"
export CMAKEBIN="/$sysdrive/Program Files/CMake/bin"
- export PATH="${PATH}:${CMAKEBIN}:/src/$CMAKE_DIR/bin"
+ export PATH="${PATH}:${CMAKEBIN}:$srcroot/$CMAKE_DIR/bin"
- export QT_VER="4.5.1"
export QT_DIR="qt-all-opensource-src-${QT_VER}"
- export QT_FILE="${QT_DIR}.tar.bz2"
export QT_ROOT="/$sysdrive/Qt/${QT_VER}"
export QT_BIN="${QT_ROOT}/bin"
- export QTDIR="${sysdrive}:\Qt\4.5.1"
+ export QTDIR="${sysdrive}:\\Qt\\${QT_VER}"
export QMAKESPEC=win32-g++
- export PATH="$PATH:$QT_BIN:$QTDIR\bin"
+ export PATH="$PATH:$QT_BIN:$QTDIR\\bin"
export PYTHON_ROOT=/$sysdrive/Python26
export PATH=$PATH:$PYTHON_ROOT
@@ -151,12 +115,6 @@
export VIDALIA_OPTS="-DCMAKE_BUILD_TYPE=release -DUSE_AUTOUPDATE=1"
export VIDALIA_MARBLE_OPTS="-DUSE_MARBLE=1 -DMARBLE_LIBRARY_DIR=/src/${MARBLE_DIR}/src/lib -DMARBLE_DATA_DIR=/src/${MARBLE_DIR}/data -DMARBLE_INCLUDE_DIR=${MARBLE_DEST}/include/marble -DMARBLE_PLUGIN_DIR=/src/${MARBLE_DIR}/src/plugins"
- export GNURX_FILE=mingw-libgnurx-2.5.1-src.tar.gz
- export GNURX_DIR=mingw-libgnurx-2.5.1
-
- export POLIPO_FILE=polipo-20080907.tar.gz
- export POLIPO_DIR=polipo-20080907
-
export TORBUTTON_FILE=torbutton.xpi
export NSIS_DIR=nsis-2.42
@@ -165,8 +123,7 @@
export WIXSRC_DIR=wixsrc
export WIXSRC_FILE=wixsrc.tar.gz
- export BITTORRENT_FILE=bittorrent_3.4.2.orig.tar.gz
- export BITTORRENT_DIR=BitTorrent-3.4.2
+ export BITTORRENT_DIR="BitTorrent-${BITTORRENT_VER}"
export BTPATCH_FILE=bittorrent_3.4.2-11.1.diff
if [ -d "$VS80COMNTOOLS" ]; then
@@ -247,7 +204,7 @@
fi
done
- if [ -d /usr/usr ]; then
+ if [ -d $srcroot ]; then
# ahh, gotta love the msys /usr <-> / equivalence hack.
cd /usr/usr
if [ -d local ]; then
@@ -345,9 +302,10 @@
if [[ "$PTHREADS_BUILT" != "yes" ]]; then
echo "Building pthreads-w32 ..."
- cd /usr/src
- tar zxf $PTHREAD_FILE
- cd $PTHREAD_DIR
+ export PTHREADS_DIR="pthreads-w32-${PTHREADS_VER}-release"
+ cd $srcroot
+ tar zxf $PTHREADS_F
+ cd $PTHREADS_DIR
make GC
if (( $? != 0 )); then
echo "ERROR: pthreads-32 build failed." >&2
@@ -367,9 +325,10 @@
if [[ "$ZLIB_BUILT" != "yes" ]]; then
echo "Building zlib ..."
- cd /usr/src
- tar zxf $ZLIB_FILE
- cd $ZLIB_DIR
+ cd $srcroot
+ export ZLIBSRC_DIR="zlib-${ZLIBSRC_VER}"
+ tar zxf $ZLIBSRC_F
+ cd $ZLIBSRC_DIR
./configure --prefix=/usr --enable-shared
if (( $? != 0 )); then
echo "ERROR: zlib configure failed." >&2
@@ -399,8 +358,9 @@
if [[ "$LIBEVENT_BUILT" != "yes" ]]; then
echo "Building libevent ..."
- cd /usr/src
- tar zxf $LIBEVENT_FILE
+ cd $srcroot
+ export LIBEVENT_DIR="libevent-${LIBEVENT_VER}"
+ tar zxf $LIBEVENT_F
cd $LIBEVENT_DIR
./configure --prefix=/usr --enable-static --disable-shared $DEF_CONF_BUILD
if (( $? != 0 )); then
@@ -421,9 +381,9 @@
if [[ "$SDL_BUILT" != "yes" ]]; then
echo "Building SDL library ..."
- cd /usr/src
- tar zxf $SDL_FILE
- cd $SDL_DIR
+ cd $srcroot
+ tar zxf $SDL_F
+ cd "SDL-${SDL_VER}"
./configure --prefix=/usr $DEF_CONF_BUILD
if (( $? != 0 )); then
echo "ERROR: SDL configure failed." >&2
@@ -444,9 +404,9 @@
if [[ "$OPENVPN_BUILT" != "yes" ]]; then
echo "Building openvpn tap-win32 driver ..."
- cd /usr/src
- tar zxf $OPENVPN_FILE
- cd $OPENVPN_DIR
+ cd $srcroot
+ tar zxf $OVPN_F
+ cd "openvpn-${OVPN_VER}"
if [ -f ../openvpn-tor-tap-win32-driver.patch ]; then
echo "Patching OpenVPN sources ..."
patch -p1 < ../openvpn-tor-tap-win32-driver.patch
@@ -494,7 +454,7 @@
if [[ "$WPCAP_BUILT" != "yes" ]]; then
echo "Building WinPcap ..."
- cd /usr/src
+ cd $srcroot
tar zxf $WPCAP_FILE
cd $WPCAP_DIR
wpbase=`pwd`
@@ -538,9 +498,9 @@
if [[ "$QEMU_BUILT" != "yes" ]]; then
echo "Building qemu ..."
- cd /usr/src
- tar zxf $QEMU_FILE
- cd $QEMU_DIR
+ cd $srcroot
+ tar zxf $QEMU_F
+ cd "qemu-${QEMU_VER}"
if [ -f ../qemu-kernel-cmdline-from-stdin.patch ]; then
echo "Patching Qemu sources ..."
patch -p1 < ../qemu-kernel-cmdline-from-stdin.patch
@@ -584,10 +544,9 @@
if [[ "$KQEMU_BUILT" != "yes" ]]; then
echo "Building kqemu accelerator ..."
- cd /usr/src
- KQEMU_DIR="kqemu-${KQEMU_VER}"
+ cd $srcroot
tar zxf $KQEMU_F
- cd $KQEMU_DIR
+ cd "kqemu-${KQEMU_VER}"
if [ -f ../kqemu-gcc-asm.patch ]; then
echo "Patching KQemu sources ..."
patch -p1 < ../kqemu-gcc-asm.patch
@@ -608,7 +567,7 @@
if [[ "$W32CTL_BUILT" != "yes" ]]; then
echo "Building torvm-w32 controller ..."
- cd /usr/src
+ cd $srcroot
tar zxf torvm-w32.tgz
cd torvm-w32
make
@@ -625,9 +584,9 @@
if [[ "$GROFF_BUILT" != "yes" ]]; then
echo "Building groff ..."
- cd /usr/src
- tar zxf $GROFF_FILE
- cd $GROFF_DIR
+ cd $srcroot
+ tar zxf $GROFF_F
+ cd "groff-${GROFF_VER}"
./configure --prefix=/usr $DEF_CONF_BUILD
if (( $? != 0 )); then
echo "ERROR: groff configure failed." >&2
@@ -652,9 +611,9 @@
if [[ "$OPENSSL_BUILT" != "yes" ]]; then
echo "Building openssl ..."
- cd /usr/src
- tar zxf $OPENSSL_FILE
- cd $OPENSSL_DIR
+ cd $srcroot
+ tar zxf $OPENSSL_F
+ cd "openssl-${OPENSSL_VER}"
# XXX there should be a way to do this without patching despite recursive make invocations.
if [ -f ../openssl-0.9.8-mingw-shared.patch ]; then
echo "Patching openssl for shared mingw builds"
@@ -695,7 +654,7 @@
if [[ "$TOR_BUILT" != "yes" ]]; then
echo "Building Tor stand alone ..."
- cd /usr/src
+ cd $srcroot
tar zxf $TOR_FILE
cd $TOR_DIR
if [ ! -f configure ]; then
@@ -771,7 +730,7 @@
if [[ "$PYCRYPTO_BUILT" != "yes" ]]; then
echo "Building PyCrypto ..."
- cd /usr/src
+ cd $srcroot
tar zxf pycrypto-latest.tar.gz
cd pycrypto-latest
python setup.py build
@@ -813,17 +772,17 @@
if [[ "$THANDY_BUILT" != "yes" ]]; then
echo "Building Thandy ..."
- cd /usr/src
+ cd $srcroot
tar zxf thandy-latest.tar.gz
cd thandy-latest
- if [ -f /usr/src/$BITTORRENT_FILE ]; then
+ if [ -f $srcroot/$BITTORRENT_F ]; then
echo "Creating patched BitTorrent tree for Thandy use ..."
mkdir tmp_extract
(
cd tmp_extract
- tar zxf /usr/src/$BITTORRENT_FILE
+ tar zxf $srcroot/$BITTORRENT_F
cd $BITTORRENT_DIR
- patch -p1 < /usr/src/$BTPATCH_FILE
+ patch -p1 < $srcroot/$BTPATCH_FILE
)
mv tmp_extract/$BITTORRENT_DIR/BitTorrent lib/
rm -rf tmp_extract
@@ -847,8 +806,8 @@
if [[ "$CMAKE_BUILT" != "yes" ]]; then
echo "Building CMake ..."
- cd /usr/src
- tar zxf $CMAKE_FILE
+ cd $srcroot
+ tar zxf $CMAKE_F
cd $CMAKE_DIR
# cmake bootstrap does not detect msys correctly. give it some help...
export SAVE_MSYSTEM="$MSYSTEM"
@@ -877,9 +836,9 @@
if [[ "$QT_BUILT" != "yes" ]]; then
echo "Building Qt ..."
- cd /usr/src
+ cd $srcroot
mkdir /$sysdrive/Qt
- tar jxf $QT_FILE
+ tar jxf $QT_F
mv $QT_DIR /$sysdrive/Qt/$QT_VER
cd /$sysdrive/Qt/$QT_VER
if [ -f /src/qt-mingwssl.patch ]; then
@@ -925,9 +884,9 @@
if [[ "$GNUREGEX_BUILT" != "yes" ]]; then
echo "Building GNU regex ..."
- cd /usr/src
- tar zxf $GNURX_FILE
- cd $GNURX_DIR
+ cd $srcroot
+ tar zxf $GNURX_F
+ cd "mingw-libgnurx-${GNURX_VER}"
./configure --prefix=/usr $DEF_CONF_BUILD
if (( $? != 0 )); then
echo "ERROR: GNU regex configure failed."
@@ -948,9 +907,9 @@
if [[ "$POLIPO_BUILT" != "yes" ]]; then
echo "Building polipo ..."
- cd /usr/src
- tar zxf $POLIPO_FILE
- cd $POLIPO_DIR
+ cd $srcroot
+ tar zxf $POLIPO_F
+ cd "polipo-${POLIPO_VER}"
if [ -f ../polipo-mingw.patch ]; then
echo "Patching polipo sources ..."
patch -p1 < ../polipo-mingw.patch
@@ -967,7 +926,7 @@
if [[ "$MARBLE_BUILT" != "yes" ]]; then
echo "Building Marble widget for Qt ..."
- cd /usr/src
+ cd $srcroot
tar zxf $MARBLE_FILE
cd $MARBLE_DIR
cmake $MARBLE_OPTS -G "MSYS Makefiles" .
@@ -990,7 +949,7 @@
if [[ "$VIDALIA_BUILT" != "yes" ]]; then
echo "Building Vidalia ..."
- cd /usr/src
+ cd $srcroot
tar zxf $VIDALIA_FILE
cd $VIDALIA_DIR
if [ -f ../vidalia-torvm.patch ]; then
@@ -1088,7 +1047,7 @@
echo "Expanding package dir ..."
cd /src
tar zxf pkg.tgz
- if [ -f /usr/src/$VIDALIA_DIR/src/vidalia/vidalia.exe ]; then
+ if [ -f $srcroot/$VIDALIA_DIR/src/vidalia/vidalia.exe ]; then
echo "Creating Vidalia MSI packages ..."
cd /src/$VIDALIA_DIR
for FILE in QtCore4.dll QtGui4.dll QtNetwork4.dll QtXml4.dll QtSvg4.dll; do
More information about the tor-commits
mailing list