diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-10-02 19:25:17 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-10-02 19:25:17 +0200 |
| commit | c2ca7be5a751879159f3cb591a64bb9568b79762 (patch) | |
| tree | 04e38d4f4a2aad4d789bda0a65b7abb80a3439a2 /makepackagebin.sh | |
| parent | 45c152c326d87478fbf41714b4b8e2f7b57a282b (diff) | |
| parent | 3db384424bd7398ffbb7a355cab8f15f3add009f (diff) | |
Updated version 1.9.1+repack from 'upstream/1.9.1+repack'
with Debian dir 98a996367aa69ae41accf9c6d369f600bc94de80
Diffstat (limited to 'makepackagebin.sh')
| -rw-r--r-- | makepackagebin.sh | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/makepackagebin.sh b/makepackagebin.sh index 2b846ba..0b88664 100644 --- a/makepackagebin.sh +++ b/makepackagebin.sh @@ -3,6 +3,9 @@ echo "Script to invoke Jam and then package the binary release." # Must use this rather than "jam -q" to ensure builtin libraries are used. +# Set the environment string VERSION from the #define, ie 1.0.0 +VERSION=`grep ARGYLL_VERSION_STR h/aconfig.h | head -1 | sed 's/# define ARGYLL_VERSION_STR //' | sed 's/"//g'` + # Typical environment variables: # (NOTE some systems don't export these ENV vars. by default !!!) # @@ -33,10 +36,7 @@ echo "Script to invoke Jam and then package the binary release." # FreeBSD 9.1 64 bit [bash] freebsd9.1 amd64-portbld-freebsd9.1 amd64 # -# Set the environment string VERSION from the #define, ie 1.0.0 -VERSION=`grep ARGYLL_VERSION_STR h/aconfig.h | sed 's/#define ARGYLL_VERSION_STR //' | sed 's/"//g'` - -echo "About to make Argyll binary distribution" +echo "About to make Argyll binary distribution $VERSION" TOPDIR=Argyll_V$VERSION @@ -47,6 +47,7 @@ fi # Make sure that some environment variable are visible to Jam: export OSTYPE MACHTYPE HOSTTYPE +unset USETARPREFIX # .sp come from profile, .cht from scanin and .ti3 from spectro rm -f bin/*.exe bin/*.dll @@ -104,6 +105,7 @@ else if [ X$OSTYPE = "Xdarwin10.0" \ USBDIRS="usb" USBBINFILES="binfiles.osx" USETAR=true + USETARPREFIX=true else if [ X$OSTYPE = "Xlinux-gnu" ] ; then if [[ "$MACHTYPE" = x86_64-*-linux-gnu ]] ; then echo "We're on Linux x86_64!" @@ -160,7 +162,12 @@ done # Create the package rm -f $PACKAGE if [ X$USETAR = "Xtrue" ] ; then - tar -czvf $PACKAGE $TOPDIR + if [ X$USETARPREFIX = "Xtrue" ] ; then + # Don't save ._* files... + COPYFILE_DISABLE=1 tar -czvf $PACKAGE $TOPDIR + else + tar -czvf $PACKAGE $TOPDIR + fi # tar -xzf to extract # tar -tzf to list # Should we use "COPYFILE_DISABLE=1 tar .." on OS X ?? |