updated ubuntu packaging scripts to make executable and plugin packages simulataneously

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

build_scripts/Ubuntu_src/makeSourcePackage.sh

@@ -2,8 +2,9 @@
 
 echo This script is going to build the debian source package for RetroShare, from the svn.
 
-if test -d "RetroShare" ;  then
+workdir=retroshare-0.5
-	echo Please remove the RetroShare/ directory first.
+if test -d "$workdir" ;  then
+	echo Please remove the $workdir directory first.
 	exit
 fi
 
@@ -37,81 +38,93 @@ echo Extracting base archive...
 tar zxvf $packages/BaseRetroShareDirs.tgz 2> /dev/null
 
 echo Checking out latest snapshot in libbitdht...
-cd retroshare-0.5/src/libbitdht/
+cd $workdir/src/libbitdht/
 svn co -r$svn https://retroshare.svn.sourceforge.net/svnroot/retroshare/trunk/libbitdht/src . 2> /dev/null
 cd ../../..
 #  
 echo Checking out latest snapshot in openpgpsdk...
-cd retroshare-0.5/src/openpgpsdk/
+cd $workdir/src/openpgpsdk/
 svn co -r$svn https://retroshare.svn.sourceforge.net/svnroot/retroshare/trunk/openpgpsdk/src . 2> /dev/null
 cd ../../..
 #  
 echo Checking out latest snapshot in libretroshare...
-cd retroshare-0.5/src/libretroshare/
+cd $workdir/src/libretroshare/
 svn co -r$svn 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/
+cd $workdir/src/retroshare-gui/
 svn co -r$svn 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/
+cd $workdir/src/retroshare-nogui/
 svn co -r$svn https://retroshare.svn.sourceforge.net/svnroot/retroshare/trunk/retroshare-nogui/src . 2> /dev/null
 cd ../../..
+#
+echo Checking out latest snapshot in VOIP plugin
+mkdir -p $workdir/src/plugins/VOIP
+cd $workdir/src/plugins/VOIP
+svn co -r$svn https://retroshare.svn.sourceforge.net/svnroot/retroshare/trunk/plugins/VOIP . 2> /dev/null
+cd ..
+mkdir -p Common
+cd Common
+svn co -r$svn https://retroshare.svn.sourceforge.net/svnroot/retroshare/trunk/plugins/Common . 2> /dev/null
+cd ../../../..
+cp $workdir/src/retroshare-gui/gui/chat/PopupChatDialog.ui $workdir/src/plugins/VOIP/gui/PopupChatDialog.ui
 
 echo Copying bdboot.txt file at installation place
-cp retroshare-0.5/src/libbitdht/bitdht/bdboot.txt
+cp $workdir/src/libbitdht/bitdht/bdboot.txt
 echo Setting version numbers...
 
 # setup version numbers
-cat retroshare-0.5/src/libretroshare/util/rsversion.h | grep -v SVN_REVISION | grep -v SVN_REVISION_NUMBER > /tmp/toto2342
+cat $workdir/src/libretroshare/util/rsversion.h | grep -v SVN_REVISION | grep -v SVN_REVISION_NUMBER > /tmp/toto2342
 echo \#define SVN_REVISION \"Revision: "$version"  date : `date`\" >> /tmp/toto2342
 echo \#define SVN_REVISION_NUMBER $svn >> /tmp/toto2342
-cp /tmp/toto2342 retroshare-0.5/src/libretroshare/util/rsversion.h
+cp /tmp/toto2342 $workdir/src/libretroshare/util/rsversion.h
 
-cat retroshare-0.5/src/retroshare-gui/util/rsversion.h | grep -v GUI_REVISION | grep -v SVN_REVISION_NUMBER > /tmp/toto4463
+cat $workdir/src/retroshare-gui/util/rsversion.h | grep -v GUI_REVISION | grep -v SVN_REVISION_NUMBER > /tmp/toto4463
 echo \#define GUI_REVISION \"Revision: "$version"  date : `date`\" >> /tmp/toto4463
 echo \#define SVN_REVISION_NUMBER $svn >> /tmp/toto4463
-cp /tmp/toto4463 retroshare-0.5/src/retroshare-gui/util/rsversion.h
+cp /tmp/toto4463 $workdir/src/retroshare-gui/util/rsversion.h
 
 # Various cleaning
 
 echo Cleaning...
-find retroshare-0.5 -name ".svn" -exec rm -rf {} \;		# remove all svn repositories
+find $workdir -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
+mv $workdir/src/retroshare-gui/RetroShare.pro $workdir/src/retroshare-gui/retroshare-gui.pro
 
-./cleanProFile.sh retroshare-0.5/src/libretroshare/libretroshare.pro
+./cleanProFile.sh $workdir/src/libretroshare/libretroshare.pro
-./cleanProFile.sh retroshare-0.5/src/retroshare-gui/retroshare-gui.pro
+./cleanProFile.sh $workdir/src/retroshare-gui/retroshare-gui.pro
-./cleanProFile.sh retroshare-0.5/src/retroshare-nogui/retroshare-nogui.pro
+./cleanProFile.sh $workdir/src/retroshare-nogui/retroshare-nogui.pro
+./cleanProFile_voip.sh $workdir/src/plugins/VOIP/VOIP.pro
 
 echo "DESTDIR = ../../libretroshare/src/lib/" > /tmp/toto75299
-cat retroshare-0.5/src/libretroshare/libretroshare.pro /tmp/toto75299 > /tmp/toto752992
+cat $workdir/src/libretroshare/libretroshare.pro /tmp/toto75299 > /tmp/toto752992
-cp /tmp/toto752992 retroshare-0.5/src/libretroshare/libretroshare.pro
+cp /tmp/toto752992 $workdir/src/libretroshare/libretroshare.pro
 
 echo "DESTDIR = ../../libbitdht/src/lib/" > /tmp/toto75299
-cat retroshare-0.5/src/libbitdht/libbitdht.pro /tmp/toto75299 > /tmp/toto752992
+cat $workdir/src/libbitdht/libbitdht.pro /tmp/toto75299 > /tmp/toto752992
-cp /tmp/toto752992 retroshare-0.5/src/libbitdht/libbitdht.pro
+cp /tmp/toto752992 $workdir/src/libbitdht/libbitdht.pro
 
 echo "DESTDIR = ../../openpgpsdk/src/lib/" > /tmp/toto75299
-cat retroshare-0.5/src/openpgpsdk/openpgpsdk.pro /tmp/toto75299 > /tmp/toto752992
+cat $workdir/src/openpgpsdk/openpgpsdk.pro /tmp/toto75299 > /tmp/toto752992
-cp /tmp/toto752992 retroshare-0.5/src/openpgpsdk/openpgpsdk.pro
+cp /tmp/toto752992 $workdir/src/openpgpsdk/openpgpsdk.pro
-#cat retroshare-gui-ext.pro >> retroshare-0.5/src/retroshare-gui/retroshare-gui.pro 
+#cat retroshare-gui-ext.pro >> $workdir/src/retroshare-gui/retroshare-gui.pro 
 
 #echo Building orig directory...
-#mkdir retroshare-0.5.orig
+#mkdir $workdir.orig
-#cp -r retroshare-0.5/src retroshare-0.5.orig
+#cp -r $workdir/src $workdir.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
+cat $workdir/debian/control | sed -e s/XXXXXX/"$version"/g > $workdir/debian/control.tmp
-mv -f retroshare-0.5/debian/control.tmp retroshare-0.5/debian/control
+mv -f $workdir/debian/control.tmp $workdir/debian/control
 
-cd retroshare-0.5
+cd $workdir
 
 #for i in sid; do
 #for i in natty; do

build_scripts/Ubuntu_src/makeSourcePackage_voip_plugin.sh

@@ -1,169 +0,0 @@
-#!/bin/sh
-
-echo This script is going to build the debian source package for RetroShare VOIP plugin, from the svn.
-#nosvn=true
-workdir=retroshare-voip-plugin-0.5.4
-
-if test -d "$workdir" ;  then
-	echo Please remove the $workdir directory first.
-	exit
-fi
-
-if test -d "retroshare-0.5" ;  then
-	echo Please remove the retroshare-0.5/ directory first.
-	exit
-fi
-
-svn update
-
-###################### PARAMETERS ####################
-version="0.5.4"
-######################################################
-
-if test "$1" = "" ; then
-	echo attempting to get svn revision number...
-	svn=`svn info | grep 'Revision:' | cut -d\  -f2`
-else
-	echo svn number has been provided. Forcing update.
-	svn="$1"
-fi
-
-echo done.
-version="$version"."$svn"
-echo got version number $version. 
-echo Please check that the changelog is up to date. 
-echo Hit ENTER is this is this correct. Otherwise hit Ctrl+C 
-read tmp
-
-packages="."
-
-echo SVN number is $svn
-echo version is $version
-
-echo Extracting base archive...
-tar zxvf $packages/BaseRetroShareDirs.tgz 2> /dev/null
-mv retroshare-0.5 $workdir
-
-#  echo Checking out latest snapshot in libbitdht...
-#  cd $workdir/src/libbitdht/
-#  svn co -r$svn https://retroshare.svn.sourceforge.net/svnroot/retroshare/trunk/libbitdht/src . 2> /dev/null
-#  cd ../../..
-#  #  
-#  echo Checking out latest snapshot in openpgpsdk...
-#  cd $workdir/src/openpgpsdk/
-#  svn co -r$svn https://retroshare.svn.sourceforge.net/svnroot/retroshare/trunk/openpgpsdk/src . 2> /dev/null
-#  cd ../../..
-#  
-echo Checking out latest snapshot in libretroshare...
-cd $workdir/src/libretroshare/
-if test "$nosvn" = "true"; then
-	cp -r ../../../svn_image/libretroshare/src/* .
-else
-	svn co -r$svn https://retroshare.svn.sourceforge.net/svnroot/retroshare/trunk/libretroshare/src . 2> /dev/null
-fi
-cd ../../..
-#  
-echo Checking out latest snapshot in retroshare-gui...
-cd $workdir/src/retroshare-gui/
-if test "$nosvn" = "true"; then
-	cp -r ../../../svn_image/retroshare-gui/src/* .
-else
-	svn co -r$svn https://retroshare.svn.sourceforge.net/svnroot/retroshare/trunk/retroshare-gui/src . 2> /dev/null
-fi
-cd ../../..
-#
-echo Checking out latest snapshot in VOIP plugin
-mkdir -p $workdir/src/plugins/VOIP
-if test "$nosvn" = "true"; then
-	cd $workdir/src/plugins/
-	cp -r ../../../svn_image/plugins/VOIP .
-	cp -r ../../../svn_image/plugins/Common .
-else
-	cd $workdir/src/plugins/VOIP
-	svn co -r$svn https://retroshare.svn.sourceforge.net/svnroot/retroshare/trunk/plugins/VOIP . 2> /dev/null
-	cd ..
-	mkdir -p Common
-	cd Common
-	svn co -r$svn https://retroshare.svn.sourceforge.net/svnroot/retroshare/trunk/plugins/Common . 2> /dev/null
-	cd ..
-fi
-cd ../../..
-#
-#  echo Checking out latest snapshot in retroshare-nogui...
-#  cd $workdir/src/retroshare-nogui/
-#  svn co -r$svn https://retroshare.svn.sourceforge.net/svnroot/retroshare/trunk/retroshare-nogui/src . 2> /dev/null
-#  cd ../../..
-
-#  echo Copying bdboot.txt file at installation place
-#  cp $workdir/src/libbitdht/bitdht/bdboot.txt
-
-echo Setting version numbers...
-#  
-# setup version numbers
-cat $workdir/src/libretroshare/util/rsversion.h | grep -v SVN_REVISION > /tmp/toto2342
-echo \#define SVN_REVISION \"Revision: "$version"  date : `date`\" >> /tmp/toto2342
-cp /tmp/toto2342 $workdir/src/libretroshare/util/rsversion.h
-
-cat $workdir/src/retroshare-gui/util/rsversion.h | grep -v GUI_REVISION > /tmp/toto4463
-echo \#define GUI_REVISION \"Revision: "$version"  date : `date`\" >> /tmp/toto4463
-cp /tmp/toto4463 $workdir/src/retroshare-gui/util/rsversion.h
-
-# Various cleaning
-
-echo Cleaning...
-find $workdir -name ".svn" -exec rm -rf {} \;		# remove all svn repositories
-
-if test "$nosvn" = "true"; then
-	find $workdir -name ".o" -exec rm -rf {} \;		# remove all svn repositories
-	find $workdir -name ".a" -exec rm -rf {} \;		# remove all svn repositories
-fi
-
-echo Preparing package
-#mv $workdir/src/retroshare-gui/RetroShare.pro $workdir/src/retroshare-gui/retroshare-gui.pro
-
-#./cleanProFile.sh $workdir/src/libretroshare/libretroshare.pro
-#./cleanProFile.sh $workdir/src/retroshare-gui/retroshare-gui.pro
-
-mv $workdir/retroshare-0.5.pro $workdir/$workdir.pro
-cp voip-plugin/src.pro $workdir/src/src.pro
-cp voip-plugin/plugins.pro $workdir/src/plugins/plugins.pro
-cp $workdir/src/retroshare-gui/gui/chat/PopupChatDialog.ui $workdir/src/plugins/VOIP/gui/PopupChatDialog.ui
-./voip-plugin/cleanProFile.sh $workdir/src/plugins/VOIP/VOIP.pro
-
-#echo "DESTDIR = ../../voip-plugin/src/lib/" > /tmp/toto75299
-#cat $workdir/src/libretroshare/libretroshare.pro /tmp/toto75299 > /tmp/toto752992
-#cp /tmp/toto752992 $workdir/src/libretroshare/libretroshare.pro
-
-#echo "DESTDIR = ../../libbitdht/src/lib/" > /tmp/toto75299
-#cat $workdir/src/libbitdht/libbitdht.pro /tmp/toto75299 > /tmp/toto752992
-#cp /tmp/toto752992 $workdir/src/libbitdht/libbitdht.pro
-#
-#echo "DESTDIR = ../../openpgpsdk/src/lib/" > /tmp/toto75299
-#cat $workdir/src/openpgpsdk/openpgpsdk.pro /tmp/toto75299 > /tmp/toto752992
-#cp /tmp/toto752992 $workdir/src/openpgpsdk/openpgpsdk.pro
-#cat retroshare-gui-ext.pro >> $workdir/src/retroshare-gui/retroshare-gui.pro 
-
-#echo Building orig directory...
-#mkdir $workdir.orig
-#cp -r $workdir/src $workdir.orig
-
-# Call debuild to make the source debian package
-
-echo Calling debuild...
-cp voip-plugin/debian_dirs $workdir/debian/dirs
-cp voip-plugin/debian_rules $workdir/debian/rules
-cat voip-plugin/debian_control | sed -e s/XXXXXX/"$version"/g > $workdir/debian/control.tmp
-mv -f $workdir/debian/control.tmp $workdir/debian/control
-
-cd $workdir
-
-#for i in natty; do
-for i in precise squeeze oneiric karmic lucid maverick natty; do
-	echo copying changelog for $i
-	cat ../voip-plugin/changelog | sed -e s/XXXXXX/"$svn"/g | sed -e s/YYYYYY/"$i"/g > debian/changelog
-
-	# This is the key for "Cyril Soler <csoler@sourceforge.net>"
-	debuild -S -kC737CA98
-done
-
-

build_scripts/Ubuntu_src/make_voip_plugin_tgz.sh

@@ -1,30 +0,0 @@
-#!/bin/sh
-
-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/openpgpsdk/*
-rm -rf retroshare-0.5/src/openpgpsdk/.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 {} \;
-
-tar zcvf BaseRetroShareDirs.tgz retroshare-0.5/
-
-if ! test -f BaseRetroShareDirs.tgz;  then
-	echo BaseRetroShareDirs.tgz could not be created
-	exit;
-fi
-
-rm -rf retroshare-0.5/
-
-

build_scripts/Ubuntu_src/voip-plugin/changelog

@@ -1,25 +0,0 @@
-retroshare-voip-plugin (0.5.4-0.XXXXXX~YYYYYY) YYYYYY; urgency=low
-
-  * Improvements
-     - Added Spanish translation file for the VOIP plugin
-     - Removed html code on some QLabels
-     - Update french translation
-     - Enable Translations for Voip plugin
-     - Fixed small code issues
-
-  * Bugs
-     - Fixed crash and memory leak in the AudioWizard of the VOIP plugin.
-     - Please use at least Qt 4.6.4 when compiling RetrosShare with the VOIP plugin because of the fix 
-       of the bug QTBUG-11883.
-
- -- Cyril Soler <csoler@users.sourceforge.net>  Wed, 26 sept 2012 22:30:00 +0100
- 
-retroshare-voip-plugin (0.5.4-0.5584~natty) natty; urgency=low
-
-  * Improvements
-     - Functional version of VOIP plugin.
-     - Fixed compile of VOIP on Windows with Qt >4.7
-     - Fixed linking of the VOIP plugin on Windows (Exports all symbols from RetroShare.exe and import it in the plugins.
-        Removed the direct linking of the libretroshare and libbitdht from the plugins.)
-     
- -- Cyril Soler <csoler@users.sourceforge.net>  Sat, 15 sept 2012 14:30:00 +0100

build_scripts/Ubuntu_src/voip-plugin/debian_control

@@ -1,15 +0,0 @@
-Source: retroshare-voip-plugin
-Section: devel
-Priority: standard
-Maintainer: Cyril Soler <csoler@users.sourceforge.net>
-Build-Depends: debhelper (>= 7), qt4-dev-tools, libqt4-opengl-dev, libqtmultimediakit1, qtmobility-dev, libspeex-dev, libspeexdsp-dev, libqt4-dev, libssl-dev, libbz2-dev
-Standards-Version: 3.9.1
-Homepage: http://retroshare.sourceforge.net
-
-Package: retroshare-voip-plugin
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare, libspeex1, libspeexdsp1, libqtmultimediakit1
-Description: RetroShare VOIP plugin
-	This package provides a plugin for RetroShare, a secured Friend-to-Friend communication 
-	plateform. The plugin adds voice-over-IP functionality to the private chat window. Both
-	friends chatting together need the plugin installed to be able to talk together.

build_scripts/Ubuntu_src/voip-plugin/debian_dirs

@@ -1,2 +0,0 @@
-usr/lib/retroshare/extensions/
-usr/sbin

build_scripts/Ubuntu_src/voip-plugin/debian_rules

@@ -1,58 +0,0 @@
-#!/usr/bin/make -f
-
-APPNAME := retroshare-voip-plugin-0.5.4
-builddir:
-	mkdir -p builddir
-
-builddir/Makefile: builddir
-	cd builddir && qmake-qt4 CONFIG=release PREFIX=/usr ../$(APPNAME).pro
-
-build: build-stamp
-
-build-stamp: builddir/Makefile
-	dh_testdir
-	# Add here commands to compile the package.
-	cd builddir && $(MAKE)
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-	# Add here commands to clean up after the build process.
-	rm -rf builddir
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	install -D -m 644 builddir/src/plugins/VOIP/libVOIP.so.1.0.0 $(CURDIR)/debian/retroshare-voip-plugin/usr/lib/retroshare/extensions/libVOIP.so
-
-# Add here commands to install the package into debian/your_appname
-#    cd builddir && $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/$(APPNAME) install
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	dh_installexamples
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
-

build_scripts/Ubuntu_src/voip-plugin/plugins.pro

@@ -1,2 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS += VOIP

build_scripts/Ubuntu_src/voip-plugin/src.pro

@@ -1,9 +0,0 @@
-QMAKEVERSION = $$[QMAKE_VERSION]
-ISQT4 = $$find(QMAKEVERSION, ^[2-9])
-isEmpty( ISQT4 ) {
-error("Use the qmake include with Qt4.4 or greater, on Debian that is qmake-qt4");
-}
-
-TEMPLATE = subdirs
-SUBDIRS = plugins
-