diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-05-08 13:16:50 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-05-08 13:16:50 -0400 |
| commit | cadfc2aee13e14af341dd68f33308a421820c855 (patch) | |
| tree | ac7692aefe2968a1bd113bd310b01e3f2a5e287c /tools/linux_packaging | |
| parent | 4cd27e47336c566d10ec88e80541097059b3c732 (diff) | |
various miscellany related to versions, gtk2 build and packaging
Diffstat (limited to 'tools/linux_packaging')
| -rwxr-xr-x | tools/linux_packaging/build | 2 | ||||
| -rw-r--r-- | tools/linux_packaging/define_versions.sh | 23 | ||||
| -rwxr-xr-x | tools/linux_packaging/package | 2 |
3 files changed, 2 insertions, 25 deletions
diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build index 9f70f95eb2..26c509a1dc 100755 --- a/tools/linux_packaging/build +++ b/tools/linux_packaging/build @@ -89,7 +89,7 @@ if test x$STRIP != xall -a x$STRIP != xnone -a x$STRIP != xsome ; then exit 1 fi -. ./define_versions.sh +. ../define_versions.sh echo "Version is $version / $commit" info_string="$version ($commit) built on `hostname` by `whoami` on `date`" diff --git a/tools/linux_packaging/define_versions.sh b/tools/linux_packaging/define_versions.sh deleted file mode 100644 index def50ec079..0000000000 --- a/tools/linux_packaging/define_versions.sh +++ /dev/null @@ -1,23 +0,0 @@ -# -# this is sourced by build and package, and executed from within build/linux_packaging -# - -release_version=`grep -m 1 '[^A-Za-z_]LINUX_VERSION = ' ../../wscript | awk '{print $3}' | sed "s/'//g"` -r=`cut -d'"' -f2 < ../../libs/ardour/revision.cc | sed -e 1d -e "s/$release_version-//"` -if echo $r | grep -q -e - ; then - revcount=`echo $r | cut -d- -f1` -fi -commit=`echo $r | cut -d- -f2` -version=${release_version}${revcount:+.$revcount} - -# -# Figure out the Build Type -# -# Note that the name of the cache file may vary from to time -# - -if grep -q "DEBUG = True" ../../build/c4che/_cache.py; then - DEBUG="T" -else - DEBUG="F" -fi diff --git a/tools/linux_packaging/package b/tools/linux_packaging/package index ea50ce4b98..259a2a22da 100755 --- a/tools/linux_packaging/package +++ b/tools/linux_packaging/package @@ -50,7 +50,7 @@ while [ $# -gt 0 ] ; do esac done -. ./define_versions.sh +. ../define_versions.sh if [ x$DEBUG = xT ]; then BUILDTYPE="dbg" |