X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=tools%2Flinux_packaging%2Fpackage;h=1fb9fc8adece902711f471658e8363837759be21;hb=50a29f60ffefff9b276fac6e6f508642d29e9760;hp=dcb4e3ada8f297e3052ae2a14bfd77c12a2ba243;hpb=822f11becd144247862f462c4ae4476349b4b451;p=ardour.git

diff --git a/tools/linux_packaging/package b/tools/linux_packaging/package
index dcb4e3ada8..1fb9fc8ade 100755
--- a/tools/linux_packaging/package
+++ b/tools/linux_packaging/package
@@ -9,8 +9,11 @@ BUILDTYPE=""
 SINGLE_ARCH="F"
 X86_BUNDLE_OK="F"
 X86_64_BUNDLE_OK="F"
+GCC5ABI="F"
 MAKESELF=""
+BUILD_ROOT=../../build
 
+MAKESELFOPTS="--bzip2"
 
 if [ $# -eq 0 ] ; then
 	echo ""	 
@@ -35,6 +38,9 @@ while [ $# -gt 0 ] ; do
 	--mixbus)
 		APPNAME=Mixbus ;
 		shift ;;
+	--mixbus32c)
+		APPNAME=Mixbus32C ;
+		shift ;;
 	--public)
 		APPNAME=Ardour ;
 		shift ;;
@@ -45,6 +51,10 @@ while [ $# -gt 0 ] ; do
 
 	--singlearch) SINGLE_ARCH="T" ; shift ;;
 
+	--gcc5abi) GCC5ABI="T" ; shift ;;
+
+	--xz) MAKESELFOPTS="--xz --complevel 9" ; shift ;;
+
 	*)
 		#catch all for unknown arguments
 		echo ""
@@ -69,9 +79,9 @@ if [ ! -z ${BUILDTYPE} ]; then
 	X86_64_BUNDLE="${X86_64_BUNDLE}-${BUILDTYPE}"
 fi 
 
-if [ ! -e ${X86_BUNDLE}.tar.bz2 ] ; then
+if [ ! -e ${X86_BUNDLE}.tar ] ; then
 	echo ""
-	echo "Can't locate x86 bundle file ${X86_BUNDLE}.tar.bz2"
+	echo "Can't locate x86 bundle file ${X86_BUNDLE}.tar"
 	echo ""
 elif [ ! -e ${X86_BUNDLE}.size ] ; then
 	echo ""
@@ -81,9 +91,9 @@ else
 	X86_BUNDLE_OK="T"
 fi
 
-if [ ! -e ${X86_64_BUNDLE}.tar.bz2 ]; then
+if [ ! -e ${X86_64_BUNDLE}.tar ]; then
 	echo ""
-	echo "Can't locate x86_64 bundle file ${X86_64_BUNDLE}.tar.bz2"
+	echo "Can't locate x86_64 bundle file ${X86_64_BUNDLE}.tar"
 	echo ""
 elif [ ! -e ${X86_64_BUNDLE}.size ]; then
 	echo ""
@@ -117,9 +127,9 @@ fi
 if [ -z ${BUILDTYPE} ]; then
 	if [ "${SINGLE_ARCH}" = "T" ]; then
 		if [ "${X86_BUNDLE_OK}" = "T" ]; then
-			PACKAGE="${APPNAME}_32bit-${release_version}"
+			PACKAGE="${APPNAME}-${release_version}-x86"
 		else
-			PACKAGE="${APPNAME}_64bit-${release_version}"
+			PACKAGE="${APPNAME}-${release_version}-x86_64"
 		fi
 	else
 		PACKAGE="${APPNAME}-${release_version}"
@@ -127,19 +137,22 @@ if [ -z ${BUILDTYPE} ]; then
 else
 	if [ "${SINGLE_ARCH}" = "T" ]; then
 		if [ "${X86_BUNDLE_OK}" = "T" ]; then
-			PACKAGE="${APPNAME}_32bit-${release_version}-${BUILDTYPE}"
+			PACKAGE="${APPNAME}-${release_version}-${BUILDTYPE}-x86"
 		else
-			PACKAGE="${APPNAME}_64bit-${release_version}-${BUILDTYPE}"
+			PACKAGE="${APPNAME}-${release_version}-${BUILDTYPE}-x86_64"
 		fi
 	else
 		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.
-rm -f ${PACKAGE}.tar.bz2
+rm -f ${PACKAGE}.tar
 rm -rf ${PACKAGE}
 
 
@@ -147,12 +160,12 @@ echo "Creating new package dir..."
 mkdir ${PACKAGE}
 
 if [ "${X86_BUNDLE_OK}" = "T" ]; then
-	mv ${X86_BUNDLE}.tar.bz2 ${PACKAGE}
+	mv ${X86_BUNDLE}.tar ${PACKAGE}
 	mv ${X86_BUNDLE}.size ${PACKAGE}/.${X86_BUNDLE}.size
 fi
 
 if [ "${X86_64_BUNDLE_OK}" = "T" ]; then
-	mv ${X86_64_BUNDLE}.tar.bz2 ${PACKAGE}
+	mv ${X86_64_BUNDLE}.tar ${PACKAGE}
 	mv ${X86_64_BUNDLE}.size ${PACKAGE}/.${X86_64_BUNDLE}.size
 fi
 
@@ -160,9 +173,19 @@ cp install.sh ${PACKAGE}
 cp stage2.run ${PACKAGE}/.stage2.run
 cp README ${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
+	$MAKESELF ${MAKESELFOPTS} ${PACKAGE}/ ${PACKAGE}.run ${APPNAME} ./install.sh
 else
 	echo "Creating tarball..."
 	tar -cf ${PACKAGE}.tar ${PACKAGE}
@@ -170,6 +193,7 @@ fi
 
 echo "Clean up"
 rm -rf ${PACKAGE}
+rm -f stage2.run
 
 echo ""
 echo "Done"