projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
initialize uninitialized variable
[ardour.git]
/
tools
/
linux_packaging
/
package
diff --git
a/tools/linux_packaging/package
b/tools/linux_packaging/package
index a32de23048a3e3ba206d3e4851d5418a56f7f38b..9ec75024438dd7716fff52eb64c3523e36102989 100755
(executable)
--- a/
tools/linux_packaging/package
+++ b/
tools/linux_packaging/package
@@
-9,9
+9,12
@@
BUILDTYPE=""
SINGLE_ARCH="F"
X86_BUNDLE_OK="F"
X86_64_BUNDLE_OK="F"
SINGLE_ARCH="F"
X86_BUNDLE_OK="F"
X86_64_BUNDLE_OK="F"
+GCC5ABI="F"
MAKESELF=""
BUILD_ROOT=../../build
MAKESELF=""
BUILD_ROOT=../../build
+MAKESELFOPTS="--bzip2"
+
if [ $# -eq 0 ] ; then
echo ""
echo "ERROR - Please specify build type"
if [ $# -eq 0 ] ; then
echo ""
echo "ERROR - Please specify build type"
@@
-35,6
+38,9
@@
while [ $# -gt 0 ] ; do
--mixbus)
APPNAME=Mixbus ;
shift ;;
--mixbus)
APPNAME=Mixbus ;
shift ;;
+ --mixbus32c)
+ APPNAME=Mixbus32C ;
+ shift ;;
--public)
APPNAME=Ardour ;
shift ;;
--public)
APPNAME=Ardour ;
shift ;;
@@
-45,7
+51,9
@@
while [ $# -gt 0 ] ; do
--singlearch) SINGLE_ARCH="T" ; shift ;;
--singlearch) SINGLE_ARCH="T" ; shift ;;
- --gcc5abi) shift ;;
+ --gcc5abi) GCC5ABI="T" ; shift ;;
+
+ --xz) MAKESELFOPTS="--xz --complevel 9" ; shift ;;
*)
#catch all for unknown arguments
*)
#catch all for unknown arguments
@@
-71,9
+79,9
@@
if [ ! -z ${BUILDTYPE} ]; then
X86_64_BUNDLE="${X86_64_BUNDLE}-${BUILDTYPE}"
fi
X86_64_BUNDLE="${X86_64_BUNDLE}-${BUILDTYPE}"
fi
-if [ ! -e ${X86_BUNDLE}.tar
.bz2
] ; then
+if [ ! -e ${X86_BUNDLE}.tar ] ; then
echo ""
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 ""
echo ""
elif [ ! -e ${X86_BUNDLE}.size ] ; then
echo ""
@@
-83,9
+91,9
@@
else
X86_BUNDLE_OK="T"
fi
X86_BUNDLE_OK="T"
fi
-if [ ! -e ${X86_64_BUNDLE}.tar
.bz2
]; then
+if [ ! -e ${X86_64_BUNDLE}.tar ]; then
echo ""
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 ""
echo ""
elif [ ! -e ${X86_64_BUNDLE}.size ]; then
echo ""
@@
-138,10
+146,13
@@
else
fi
fi
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.
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}
rm -rf ${PACKAGE}
@@
-149,12
+160,12
@@
echo "Creating new package dir..."
mkdir ${PACKAGE}
if [ "${X86_BUNDLE_OK}" = "T" ]; then
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_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
mv ${X86_64_BUNDLE}.size ${PACKAGE}/.${X86_64_BUNDLE}.size
fi
@@
-174,7
+185,7
@@
fi
if test -n "$MAKESELF"; then
echo "Creating self-extracting installer"
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}
else
echo "Creating tarball..."
tar -cf ${PACKAGE}.tar ${PACKAGE}