updated build script for ubuntu packaging with bitdht

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3331 b45a01b8-16f6-495d-af2f-9b41ad6348cc

build_scripts/Ubuntu_src/make.sh

@@ -15,3 +15,4 @@ rm -rf ./retroshare-0.5
 
 sudo pbuilder build *.dsc
 
+cp /var/cache/pbuilder/result/retroshare_0.5-1_i386.deb .

build_scripts/Ubuntu_src/makeSourcePackage.sh

@@ -1,45 +1,98 @@
 #!/bin/sh
 
+echo This script is going to build the debian source package for RetroShare, from the svn.
+
 if test -d "RetroShare" ;  then
 	echo Please remove the RetroShare/ directory first.
 	exit
 fi
 
+svn update
+
+###################### PARAMETERS ####################
+version="0.5.1"
+######################################################
+
+echo attempting to get svn revision number...
+svn=`svn info | grep 'Revision:' | cut -d\  -f2`
+echo done.
+version="$version"."$svn"
+echo got version number $version. Hit ENTER is this is this correct. Otherwise hit Ctrl+C 
+read tmp
+
 packages="."
 
-tar zxvf $packages/BaseRetroShareDirs.tgz
+echo SVN number is $svnnumber
+echo version is $version
 
-# Ultimately, use the following, but 
+echo Extracting base archive...
-cd retroshare-0.5/src/libretroshare/
+tar zxvf $packages/BaseRetroShareDirs.tgz 2> /dev/null
-#tar zxvf ../../../libretroshare.tgz
+
-svn co https://retroshare.svn.sourceforge.net/svnroot/retroshare/trunk/libretroshare/src .
+echo Checking out latest snapshot in libbitdht...
+cd retroshare-0.5/src/libbitdht/
+svn co https://retroshare.svn.sourceforge.net/svnroot/retroshare/trunk/libbitdht/src . 2> /dev/null
 cd ../../..
 #  
-cd retroshare-0.5/src/retroshare-gui/
+echo Checking out latest snapshot in libretroshare...
-svn co https://retroshare.svn.sourceforge.net/svnroot/retroshare/trunk/retroshare-gui/src . 
+cd retroshare-0.5/src/libretroshare/
-#tar zxvf ../../../retroshare-gui.tgz
+svn co https://retroshare.svn.sourceforge.net/svnroot/retroshare/trunk/libretroshare/src . 2> /dev/null
 cd ../../..
+#  
+echo Checking out latest snapshot in retroshare-gui...
+cd retroshare-0.5/src/retroshare-gui/
+svn co https://retroshare.svn.sourceforge.net/svnroot/retroshare/trunk/retroshare-gui/src . 2> /dev/null
+cd ../../..
+#
+echo Checking out latest snapshot in retroshare-nogui...
+cd retroshare-0.5/src/retroshare-nogui/
+svn co https://retroshare.svn.sourceforge.net/svnroot/retroshare/trunk/retroshare-nogui/src . 2> /dev/null
+cd ../../..
+
+echo Setting version numbers...
+
+# setup version numbers
+cat retroshare-0.5/src/libretroshare/util/rsversion.h | grep -v SVN_REVISION > /tmp/toto2342
+echo \#define SVN_REVISION \"Revision: "$svnnumber"  date : `date`\" >> /tmp/toto2342
+cp /tmp/toto2342 retroshare-0.5/src/libretroshare/util/rsversion.h
+
+cat retroshare-0.5/src/retroshare-gui/util/rsversion.h | grep -v GUI_REVISION > /tmp/toto4463
+echo \#define GUI_REVISION \"Revision: "$svnnumber"  date : `date`\" >> /tmp/toto4463
+cp /tmp/toto4463 retroshare-0.5/src/retroshare-gui/util/rsversion.h
 
 # Various cleaning
 
+echo Cleaning...
 find retroshare-0.5 -name ".svn" -exec rm -rf {} \;		# remove all svn repositories
 
+echo Preparing package
 mv retroshare-0.5/src/retroshare-gui/RetroShare.pro retroshare-0.5/src/retroshare-gui/retroshare-gui.pro
 
 ./cleanProFile.sh retroshare-0.5/src/libretroshare/libretroshare.pro
 ./cleanProFile.sh retroshare-0.5/src/retroshare-gui/retroshare-gui.pro
+./cleanProFile.sh retroshare-0.5/src/retroshare-nogui/retroshare-nogui.pro
 
 echo "DESTDIR = ../../libretroshare/src/lib/" > /tmp/toto75299
 cat retroshare-0.5/src/libretroshare/libretroshare.pro /tmp/toto75299 > /tmp/toto752992
 cp /tmp/toto752992 retroshare-0.5/src/libretroshare/libretroshare.pro
 
+echo "DESTDIR = ../../libbitdht/src/lib/" > /tmp/toto75299
+cat retroshare-0.5/src/libbitdht/libbitdht.pro /tmp/toto75299 > /tmp/toto752992
+cp /tmp/toto752992 retroshare-0.5/src/libbitdht/libbitdht.pro
+
 #cat retroshare-gui-ext.pro >> retroshare-0.5/src/retroshare-gui/retroshare-gui.pro 
 
+echo Building orig directory...
 mkdir retroshare-0.5.orig
 cp -r retroshare-0.5/src retroshare-0.5.orig
 
 # Call debuild to make the source debian package
 
+echo Calling debuild...
+cat retroshare-0.5/debian/control | sed -e s/XXXXXX/"$version"/g > retroshare-0.5/debian/control.tmp
+mv -f retroshare-0.5/debian/control.tmp retroshare-0.5/debian/control
+
 cd retroshare-0.5
+
+# This is the key for "Cyril Soler <csoler@sourceforge.net>"
 debuild -S -kC737CA98
 

build_scripts/Ubuntu_src/make_tgz.sh

@@ -2,10 +2,17 @@
 
 rm BaseRetroShareDirs.tgz 
 
+rm -rf retroshare-0.5/libbitdht/
+rm -rf retroshare-0.5/libretroshare/
+
+rm -rf retroshare-0.5/src/libbitdht/*
+rm -rf retroshare-0.5/src/libbitdht/.svn/
 rm -rf retroshare-0.5/src/libretroshare/*
 rm -rf retroshare-0.5/src/libretroshare/.svn/
 rm -rf retroshare-0.5/src/retroshare-gui/*
 rm -rf retroshare-0.5/src/retroshare-gui/.svn/
+rm -rf retroshare-0.5/src/retroshare-nogui/*
+rm -rf retroshare-0.5/src/retroshare-nogui/.svn/
 
 find retroshare-0.5 -name "*~" -exec \rm {} \;