X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=tools%2Flinux_packaging%2Fpackage;h=cf11346eb8f2399476508f825478c9744429d90a;hb=b951448750e1e5f9023467aea26eb631a19e8363;hp=8a8b111c3440eddb2083f65a421eb826b952edd3;hpb=72b0911421fbbdcfe4ce5937c9b7758ae085de42;p=ardour.git

diff --git a/tools/linux_packaging/package b/tools/linux_packaging/package
index 8a8b111c34..cf11346eb8 100755
--- a/tools/linux_packaging/package
+++ b/tools/linux_packaging/package
@@ -5,11 +5,11 @@
 # This will collect up the x86 and x86_64 bundles created by build
 # and package them together with an installer script.
 
-STRIP=1
 BUILDTYPE=""
 SINGLE_ARCH="F"
 X86_BUNDLE_OK="F"
 X86_64_BUNDLE_OK="F"
+MAKESELF=""
 
 
 if [ $# -eq 0 ] ; then
@@ -39,7 +39,10 @@ while [ $# -gt 0 ] ; do
 		APPNAME=Ardour ;
 		shift ;;
 
-	--nostrip) STRIP= ; shift ;;
+	--makeself)
+		MAKESELF=`which makeself`;
+		shift ;;
+
 	--singlearch) SINGLE_ARCH="T" ; shift ;;
 
 	*)
@@ -52,34 +55,20 @@ while [ $# -gt 0 ] ; do
 	esac
 done
 
+. ../define_versions.sh
 
-# Figure out the Build Type
-if grep -q "DEBUG = True" ../../build/c4che/default.cache.py; then
-	DEBUG="T"
-else
-	DEBUG="F"
+if [ x$DEBUG = xT ]; then
+	BUILDTYPE="dbg"
 fi
 
-if [ x$DEBUG != x ]; then
-	if [ x$STRIP != x ]; then
-		BUILDTYPE="strip"
-	else
-		BUILDTYPE="dbg"
-	fi
-fi
-
-release_version=`grep -m 1 '^VERSION' ../../wscript | awk '{print $3}' | sed "s/'//g"`
-svn_version=`grep -m 1 'svn_revision =' ../../libs/ardour/svn_revision.cc | cut -d"'" -f 2`
-
-X86_BUNDLE="${APPNAME}_x86-${release_version}_${svn_version}"
-X86_64_BUNDLE="${APPNAME}_x86_64-${release_version}_${svn_version}"
+X86_BUNDLE="${APPNAME}_x86-${release_version}"
+X86_64_BUNDLE="${APPNAME}_x86_64-${release_version}"
 
 if [ ! -z ${BUILDTYPE} ]; then
 	X86_BUNDLE="${X86_BUNDLE}-${BUILDTYPE}"
 	X86_64_BUNDLE="${X86_64_BUNDLE}-${BUILDTYPE}"
 fi 
 
-
 if [ ! -e ${X86_BUNDLE}.tar.bz2 ] ; then
 	echo ""
 	echo "Can't locate x86 bundle file ${X86_BUNDLE}.tar.bz2"
@@ -128,22 +117,22 @@ fi
 if [ -z ${BUILDTYPE} ]; then
 	if [ "${SINGLE_ARCH}" = "T" ]; then
 		if [ "${X86_BUNDLE_OK}" = "T" ]; then
-			PACKAGE="${APPNAME}_32bit-${release_version}_${svn_version}"
+			PACKAGE="${APPNAME}_32bit-${release_version}"
 		else
-			PACKAGE="${APPNAME}_64bit-${release_version}_${svn_version}"
+			PACKAGE="${APPNAME}_64bit-${release_version}"
 		fi
 	else
-		PACKAGE="${APPNAME}-${release_version}_${svn_version}"
+		PACKAGE="${APPNAME}-${release_version}"
 	fi
 else
 	if [ "${SINGLE_ARCH}" = "T" ]; then
 		if [ "${X86_BUNDLE_OK}" = "T" ]; then
-			PACKAGE="${APPNAME}_32bit-${release_version}_${svn_version}-${BUILDTYPE}"
+			PACKAGE="${APPNAME}_32bit-${release_version}-${BUILDTYPE}"
 		else
-			PACKAGE="${APPNAME}_64bit-${release_version}_${svn_version}-${BUILDTYPE}"
+			PACKAGE="${APPNAME}_64bit-${release_version}-${BUILDTYPE}"
 		fi
 	else
-		PACKAGE="${APPNAME}-${release_version}_${svn_version}-${BUILDTYPE}"
+		PACKAGE="${APPNAME}-${release_version}-${BUILDTYPE}"
 	fi
 fi 
 
@@ -171,11 +160,17 @@ cp install.sh ${PACKAGE}
 cp stage2.run ${PACKAGE}/.stage2.run
 cp README ${PACKAGE}
 
-echo "Creating tarball..."
-tar -cf ${PACKAGE}.tar ${PACKAGE}
+if test -n "$MAKESELF"; then
+	echo "Creating self-extracting installer"
+	$MAKESELF --nocomp ${PACKAGE}/ ${PACKAGE}.run ${APPNAME} ./install.sh
+else
+	echo "Creating tarball..."
+	tar -cf ${PACKAGE}.tar ${PACKAGE}
+fi
 
 echo "Clean up"
 rm -rf ${PACKAGE}
+rm -f stage2.run
 
 echo ""
 echo "Done"