X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=tools%2Flinux_packaging%2Fpackage;h=a4bab829b84a80f3c5d414a24d6740b737c69afe;hb=8fc5b5c06040ad8140ba0122f064e839fd2c611c;hp=ea50ce4b981d6b6c76fa052387801117aa8aa599;hpb=3b20beb8d80e6b0ac12ef17e4f10e1d5dcc9fe55;p=ardour.git

diff --git a/tools/linux_packaging/package b/tools/linux_packaging/package
index ea50ce4b98..a4bab829b8 100755
--- a/tools/linux_packaging/package
+++ b/tools/linux_packaging/package
@@ -9,7 +9,9 @@ BUILDTYPE=""
 SINGLE_ARCH="F"
 X86_BUNDLE_OK="F"
 X86_64_BUNDLE_OK="F"
-
+GCC5ABI="F"
+MAKESELF=""
+BUILD_ROOT=../../build
 
 if [ $# -eq 0 ] ; then
 	echo ""	 
@@ -34,12 +36,21 @@ while [ $# -gt 0 ] ; do
 	--mixbus)
 		APPNAME=Mixbus ;
 		shift ;;
+	--mixbus32c)
+		APPNAME=Mixbus32C ;
+		shift ;;
 	--public)
 		APPNAME=Ardour ;
 		shift ;;
 
+	--makeself)
+		MAKESELF=`which makeself`;
+		shift ;;
+
 	--singlearch) SINGLE_ARCH="T" ; shift ;;
 
+	--gcc5abi) GCC5ABI="T" ; shift ;;
+
 	*)
 		#catch all for unknown arguments
 		echo ""
@@ -50,14 +61,14 @@ while [ $# -gt 0 ] ; do
 	esac
 done
 
-. ./define_versions.sh
+. ../define_versions.sh
 
 if [ x$DEBUG = xT ]; then
 	BUILDTYPE="dbg"
 fi
 
-X86_BUNDLE="${APPNAME}_x86-${version}"
-X86_64_BUNDLE="${APPNAME}_x86_64-${version}"
+X86_BUNDLE="${APPNAME}_x86-${release_version}"
+X86_64_BUNDLE="${APPNAME}_x86_64-${release_version}"
 
 if [ ! -z ${BUILDTYPE} ]; then
 	X86_BUNDLE="${X86_BUNDLE}-${BUILDTYPE}"
@@ -112,25 +123,28 @@ fi
 if [ -z ${BUILDTYPE} ]; then
 	if [ "${SINGLE_ARCH}" = "T" ]; then
 		if [ "${X86_BUNDLE_OK}" = "T" ]; then
-			PACKAGE="${APPNAME}_32bit-${version}"
+			PACKAGE="${APPNAME}_32bit-${release_version}"
 		else
-			PACKAGE="${APPNAME}_64bit-${version}"
+			PACKAGE="${APPNAME}_64bit-${release_version}"
 		fi
 	else
-		PACKAGE="${APPNAME}-${version}"
+		PACKAGE="${APPNAME}-${release_version}"
 	fi
 else
 	if [ "${SINGLE_ARCH}" = "T" ]; then
 		if [ "${X86_BUNDLE_OK}" = "T" ]; then
-			PACKAGE="${APPNAME}_32bit-${version}-${BUILDTYPE}"
+			PACKAGE="${APPNAME}_32bit-${release_version}-${BUILDTYPE}"
 		else
-			PACKAGE="${APPNAME}_64bit-${version}-${BUILDTYPE}"
+			PACKAGE="${APPNAME}_64bit-${release_version}-${BUILDTYPE}"
 		fi
 	else
-		PACKAGE="${APPNAME}-${version}-${BUILDTYPE}"
+		PACKAGE="${APPNAME}-${release_version}-${BUILDTYPE}"
 	fi
 fi 
 
+if [ "$GCC5ABI" = "T" ]; then
+	PACKAGE="${PACKAGE}-gcc5"
+fi
 
 echo "Cleaning up any old package files for this build"
 #Get rid of any old packages of this same name.
@@ -155,11 +169,27 @@ cp install.sh ${PACKAGE}
 cp stage2.run ${PACKAGE}/.stage2.run
 cp README ${PACKAGE}
 
-echo "Creating tarball..."
-tar -cf ${PACKAGE}.tar ${PACKAGE}
+# gcc4/5 ABI test tool
+if [ -e $BUILD_ROOT/tools/gccabicheck/gcc-glibmm-abi-check ]; then
+	cp $BUILD_ROOT/tools/gccabicheck/gcc-glibmm-abi-check ${PACKAGE}/.gcc-glibmm-abi-check
+else
+	echo "!!!ERROR !!! gcc-glibmm-abi-check program is missing. packager will exit without being complete"
+	rm -rf ${PACKAGE}
+	rm -f stage2.run
+	exit 1
+fi
+
+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"