diff --git a/build_tarball.sh b/build_tarball.sh
new file mode 100644
index 0000000000000000000000000000000000000000..3a6694ed50032ea2019d2bafcf2cfcee9214c933
--- /dev/null
+++ b/build_tarball.sh
@@ -0,0 +1,96 @@
+#!/bin/bash
+#
+# Script to build the source tarball for distribution on sflphone.org
+#
+# Author: Francois Marier <francois@debian.org>
+
+if [ ! -e sflphone-common/configure.ac ] ; then
+ echo "This script must be run in the root directory of the sflphone repository"
+ exit 1
+fi
+
+if [ "z$1" = "z" ] ; then
+ echo "Usage: $0 VERSION_NUMBER"
+ exit 2
+fi
+
+VERSION=$1
+BUILDDIR=sflphone-$VERSION
+
+if [ -e $BUILDDIR ] ; then
+ echo "The build directory ($BUILDDIR) already exists. Delete it first."
+ exit 3
+fi
+
+mkdir $BUILDDIR
+cp -r * $BUILDDIR/
+
+pushd $BUILDDIR
+rm -rf $BUILDDIR
+rm -f *.tar.gz
+
+rm -rf lang/
+rm -rf tools/build-system/
+rm -f tools/pysflphone/*.pyc
+rm -f tools/build-package.sh tools/bleach.sh tools/autotoolize.sh
+rm -rf sflphone-client-kde/build
+
+find -name .project -type f -exec rm {} \;
+find -name .cproject -type f -exec rm {} \;
+find -name .settings -type d -exec rm -rf {} \;
+
+pushd sflphone-common
+./autogen.sh
+popd
+
+pushd sflphone-common/libs/pjproject
+find -name os-auto.mak -type f -exec rm {} \;
+
+# Remove pre-built binaries
+rm -f pjsip/bin/pjsip-test-x86_64-unknown-linux-gnu
+rm -f pjsip-apps/bin/pjsua-x86_64-unknown-linux-gnu
+rm -f pjlib/bin/pjlib-test-x86_64-unknown-linux-gnu
+rm -f pjnath/bin/pjnath-test-x86_64-unknown-linux-gnu
+rm -f pjnath/bin/pjturn-client-x86_64-unknown-linux-gnu
+rm -f pjlib-util/bin/pjlib-util-test-x86_64-unknown-linux-gnu
+rm -f pjnath/bin/pjturn-srv-x86_64-unknown-linux-gnu
+rm -f pjmedia/bin/pjmedia-test-x86_64-unknown-linux-gnu
+
+# Put actual files in the tarball
+rm -f config.guess config.sub
+cp /usr/share/misc/config.guess .
+cp /usr/share/misc/config.sub .
+
+rm -f config.log config.status build.mak
+rm -f pjlib/include/pj/compat/m_auto.h
+rm -f pjlib/include/pj/compat/os_auto.h
+rm -f pjmedia/include/pjmedia-codec/config_auto.h
+rm -f pjmedia/include/pjmedia/config_auto.h
+rm -f pjsip/include/pjsip/sip_autoconf.h
+
+# Remove non-GPL compatible code
+sed -e 's/ milenage / /' third_party/build/Makefile > third_party/build/Makefile.new
+mv third_party/build/Makefile.new third_party/build/Makefile
+sed -e 's/ -lmilenage-$(TARGET_NAME) / /' build.mak.in > build.mak.in.new
+mv build.mak.in.new build.mak.in
+sed -e 's/ $(PJ_DIR)\/third_party\/lib\/libmilenage-$(LIB_SUFFIX) / /' build.mak.in > build.mak.in.new
+mv build.mak.in.new build.mak.in
+rm -rf third_party/build/ilbc/
+rm -rf third_party/build/milenage/
+rm -rf third_party/ilbc/
+rm -rf third_party/milenage/
+
+aclocal --force
+popd
+
+pushd sflphone-client-gnome
+./autogen.sh
+popd
+
+find -name autom4te.cache -type d -exec rm -rf {} \;
+find -name *.in~ -type f -exec rm {} \;
+popd # builddir
+
+rm -f sflphone-$VERSION.tar.gz
+tar zcf sflphone-$VERSION.tar.gz sflphone-$VERSION
+rm -rf $BUILDDIR
diff --git a/tools/build-system/launch-build-machine-2.sh b/tools/build-system/launch-build-machine-2.sh
index 19245c4725b354b566d48d2719bc9e05107731d2..203fa64be812dc49e2cce8a1f9c65646f1f3fe2f 100755
--- a/tools/build-system/launch-build-machine-2.sh
+++ b/tools/build-system/launch-build-machine-2.sh
@@ -21,6 +21,7 @@ VERSION_INDEX="1"
DO_PUSH=1
DO_LOGGING=1
DO_UPLOAD=1
+SNAPSHOT_TAG=`date +%Y%m%d`
EDITOR=echo
export EDITOR
@@ -30,8 +31,7 @@ REFERENCE_REPOSITORY="${ROOT_DIR}/sflphone-source-repository"
WORKING_DIR="${ROOT_DIR}/sflphone-build-repository/tools/build-system"
LAUNCHPAD_DIR="${WORKING_DIR}/launchpad"
LAUNCHPAD_DISTRIBUTIONS=( "jaunty" "karmic" )
-#LAUNCHPAD_PACKAGES=( "sflphone-client-gnome" "sflphone-common" )
-LAUNCHPAD_PACKAGES=( "sflphone-client-kde" )
+LAUNCHPAD_PACKAGES=( "sflphone-client-gnome" "sflphone-common" )
echo
echo " /***********************\\"
@@ -103,9 +103,9 @@ fi
echo "Update reference sources"
if [ ${IS_RELEASE} ]; then
- cd ${REFERENCE_REPOSITORY} && git checkout origin/release -b release && git pull
+ cd ${REFERENCE_REPOSITORY} && git checkout . && git checkout -f release && git pull
else
- cd ${REFERENCE_REPOSITORY} && git checkout master && git pull
+ cd ${REFERENCE_REPOSITORY} && git checkout . && git checkout -f master && git pull
fi
echo "Retrieve build info"
@@ -125,6 +125,7 @@ cd ${LAUNCHPAD_DIR}
COMMIT_HASH_BEGIN=""
COMMIT_HASH_END=""
SOFTWARE_VERSION=""
+LAUNCHPAD_CONF_PREFIX=""
echo "Clean build directory"
git clean -f -x ${LAUNCHPAD_DIR}/* >/dev/null
@@ -136,10 +137,11 @@ if [ ${IS_RELEASE} ]; then
fi
SOFTWARE_VERSION="${CURRENT_RELEASE_VERSION}${VERSION_APPEND}"
COMMIT_HASH_BEGIN="${PREVIOUS_RELEASE_COMMIT_HASH}"
+ LAUNCHPAD_CONF_PREFIX="sflphone"
else
- SNAPSHOT_TAG=`date +%Y%m%d`
SOFTWARE_VERSION="snapshot${SNAPSHOT_TAG}"
COMMIT_HASH_BEGIN="${CURRENT_RELEASE_COMMIT_HASH}"
+ LAUNCHPAD_CONF_PREFIX="sflphone-nightly"
fi
cd ${LAUNCHPAD_DIR}
@@ -198,24 +200,24 @@ END
cd ${LAUNCHPAD_DIR}/${LAUNCHPAD_PACKAGE}
./autogen.sh
- debuild -S -sa -kCCCC676C
+ debuild -S -sa -kFDFE4451
cd ${LAUNCHPAD_DIR}
if [ ${DO_UPLOAD} ] ; then
- dput -f -c ${LAUNCHPAD_DIR}/dput.conf sflphone-${LAUNCHPAD_DISTRIBUTION} ${LAUNCHPAD_PACKAGE}_${LOCAL_VERSION}_source.changes
+ dput -f -c ${LAUNCHPAD_DIR}/dput.conf ${LAUNCHPAD_CONF_PREFIX}-${LAUNCHPAD_DISTRIBUTION} ${LAUNCHPAD_PACKAGE}_${LOCAL_VERSION}_source.changes
fi
done
done
# if push is activated
-if [[ ${DO_PUSH} && ${IS_RELEASE} ]];then
- echo " Doing commit"
- git commit -m "[#1262] Released ${SOFTWARE_VERSION}" .
-
- echo " Pushing commit"
- git push origin release
-fi
+#if [[ ${DO_PUSH} && ${IS_RELEASE} ]];then
+# echo " Doing commit"
+# git commit -m "[#1262] Released ${SOFTWARE_VERSION}" .
+#
+# echo " Pushing commit"
+# git push origin release
+#fi
# close file descriptor
exec 3>&-
diff --git a/tools/build-system/launchpad/dput.conf b/tools/build-system/launchpad/dput.conf
index 805e951a71fc42767a2395fcd5f0d3293f129f24..2827992d441590a0eaa1e0b5e12ec223fe74f788 100644
--- a/tools/build-system/launchpad/dput.conf
+++ b/tools/build-system/launchpad/dput.conf
@@ -1,14 +1,28 @@
-[sflphone-jaunty]
+#[sflphone-jaunty]
+#fqdn = ppa.launchpad.net
+#method = ftp
+#incoming = ~savoirfairelinux/ppa/ubuntu/jaunty
+#login = anonymous
+#allow_unsigned_uploads = 0
+
+#[sflphone-karmic]
+#fqdn = ppa.launchpad.net
+#method = ftp
+#incoming = ~savoirfairelinux/ppa/ubuntu/karmic
+#login = anonymous
+#allow_unsigned_uploads = 0
+
+[sflphone-nightly-jaunty]
fqdn = ppa.launchpad.net
method = ftp
-incoming = ~julien-bonjean/ppa/ubuntu/jaunty
+incoming = ~savoirfairelinux/sflphone-nightly/ubuntu/jaunty
login = anonymous
allow_unsigned_uploads = 0
-[sflphone-karmic]
+[sflphone-nightly-karmic]
fqdn = ppa.launchpad.net
method = ftp
-incoming = ~julien-bonjean/ppa/ubuntu/karmic
+incoming = ~savoirfairelinux/sflphone-nightly/ubuntu/karmic
login = anonymous
allow_unsigned_uploads = 0