commit 1ace63b0a4f9d74206e72f25e389f0f8a82f5416 Author: Georg Koppen <gk@torproject.org> Date: Wed May 28 09:56:37 2014 +0000 Bug 10425: Adding the geoip6 files. --- gitian/descriptors/linux/gitian-tor.yml | 1 + gitian/descriptors/mac/gitian-tor.yml | 8 +++++--- gitian/descriptors/windows/gitian-tor.yml | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index 2b0b9ab..27e242b 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -92,6 +92,7 @@ script: | make $MAKEOPTS make install cp $INSTDIR/share/tor/geoip $INSTDIR/Data/Tor/ + cp $INSTDIR/share/tor/geoip6 $INSTDIR/Data/Tor/ # Strip and generate debuginfo for libs cd $INSTDIR objcopy --only-keep-debug $INSTDIR/bin/tor $INSTDIR/Debug/Tor/tor diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index be4edd2..054e1a8 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -53,7 +53,8 @@ script: | unzip -d $INSTDIR libevent-mac32-utils.zip cp $INSTDIR/libevent/lib/libevent-*.dylib $INSTDIR/TorBrowserBundle.app/Tor/ LIBEVENT_FILE=`basename $INSTDIR/libevent/lib/libevent-*.dylib` - # + + # Building tor # XXX Clean up these flags? export CFLAGS="-I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" export LDFLAGS="-L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" @@ -89,10 +90,11 @@ script: | cd $INSTDIR cp bin/tor TorBrowserBundle.app/Tor/ cp share/tor/geoip TorBrowserBundle.app/Data/Tor/ + cp share/tor/geoip6 TorBrowserBundle.app/Data/Tor/ cd TorBrowserBundle.app/Tor/ i686-apple-darwin11-install_name_tool -change $INSTDIR/libevent/lib/$LIBEVENT_FILE @executable_path/$LIBEVENT_FILE tor - # XXX: Geoip files.. - # + + # Grabbing the result cd $INSTDIR ~/build/dzip.sh tor-mac32-gbuilt.zip TorBrowserBundle.app cp tor-mac32-gbuilt.zip $OUTDIR/ diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index d3f1d4e..aea69b9 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -94,7 +94,7 @@ script: | cd .. install -s $INSTDIR/bin/tor.exe $INSTDIR/Tor/ cp $INSTDIR/share/tor/geoip $INSTDIR/Data/Tor/ - # XXX: Geoip files.. + cp $INSTDIR/share/tor/geoip6 $INSTDIR/Data/Tor/ cp -a /usr/lib/gcc/i686-w64-mingw32/4.6/libgcc_s_sjlj-1.dll $INSTDIR/Tor/ cp -a /usr/lib/gcc/i686-w64-mingw32/4.6/libssp*.dll $INSTDIR/Tor/