diff options
| author | Todd Naugle <toddn@glw.com> | 2011-02-25 22:05:15 +0000 |
|---|---|---|
| committer | Todd Naugle <toddn@glw.com> | 2011-02-25 22:05:15 +0000 |
| commit | e18cebd6d716d5a24960eb0c834db6a22cc2d67f (patch) | |
| tree | 575f5d126f2f3ee168e8570bc89830d65398ebb6 /tools/linux_packaging/package | |
| parent | 5d86418fd2294f7b573eb8e41dca2bbb6ef37a3a (diff) | |
merge in changes from 2.0 ongoing. Includes the build type in the package name and other fixes from 2.0
git-svn-id: svn://localhost/ardour2/branches/3.0@8962 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'tools/linux_packaging/package')
| -rwxr-xr-x | tools/linux_packaging/package | 42 |
1 files changed, 37 insertions, 5 deletions
diff --git a/tools/linux_packaging/package b/tools/linux_packaging/package index f405ad386b..be4ad86418 100755 --- a/tools/linux_packaging/package +++ b/tools/linux_packaging/package @@ -1,6 +1,12 @@ #!/bin/bash -# bundle +# package + +# This will collect up the x86 and x86_64 bundles created by build +# and package them together with an installer script. + +STRIP=1 +BUILDTYPE="" if [ $# -eq 0 ] ; then echo "" @@ -29,6 +35,8 @@ while [ $# -gt 0 ] ; do APPNAME=Ardour ; shift ;; + --nostrip) STRIP= ; shift ;; + *) #catch all for unknown arguments echo "" @@ -42,9 +50,32 @@ done 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_BUILD="${APPNAME}_x86-${release_version}_${svn_version}.tar.bz2" -X86_64_BUILD="${APPNAME}_x86_64-${release_version}_${svn_version}.tar.bz2" -PACKAGE="${APPNAME}-${release_version}_${svn_version}" +# Figure out the Build Type +if grep -q "DEBUG = True" ../../build/c4che/default.cache.py; then + DEBUG="T" +else + DEBUG="F" +fi + +if [ x$DEBUG != x ]; then + if [ x$STRIP != x ]; then + BUILDTYPE="strip" + else + BUILDTYPE="dbg" + fi +fi + + +if [ -z ${BUILDTYPE} ]; then + X86_BUILD="${APPNAME}_x86-${release_version}_${svn_version}.tar.bz2" + X86_64_BUILD="${APPNAME}_x86_64-${release_version}_${svn_version}.tar.bz2" + PACKAGE="${APPNAME}-${release_version}_${svn_version}" +else + X86_BUILD="${APPNAME}_x86-${release_version}_${svn_version}-${BUILDTYPE}.tar.bz2" + X86_64_BUILD="${APPNAME}_x86_64-${release_version}_${svn_version}-${BUILDTYPE}.tar.bz2" + PACKAGE="${APPNAME}-${release_version}_${svn_version}-${BUILDTYPE}" +fi + if [ ! -e ${X86_BUILD} ]; then echo "" @@ -71,7 +102,8 @@ mkdir ${PACKAGE} mv ${X86_BUILD} ${PACKAGE} mv ${X86_64_BUILD} ${PACKAGE} cp install.sh ${PACKAGE} -cp stage2.run ${PACKAGE} +cp stage2.run ${PACKAGE}/.stage2.run +cp README ${PACKAGE} echo "Creating tarball..." tar -czf ${PACKAGE}.tar.gz ${PACKAGE} |