changeset 114:6015c2048c3f

Use friendlier names in packages (e.g. win32 rather than mingw32)

--- a/SCRIPTS/process.sh	Wed Sep 09 10:19:01 2015 +0100
+++ b/SCRIPTS/process.sh	Wed Sep 09 10:24:16 2015 +0100
@@ -64,6 +64,7 @@
 
 platform=
 platform_defines=("UNUSED_=")   # Avoid passing empty arg to make as if target
+pubtag=
 bits=32
 altbits=
 toolprefix=
@@ -78,6 +79,7 @@
 case "$platform_arg" in
     linux32)
 	platform=linux
+	pubtag=linux32
 	if [ "$platform_native" = "linux64" ]; then
 	    toolprefix=x86_64-unknown-linux-gnu-
 	    platform_defines=("CXX=${toolprefix}g++ -m32" "CC=${toolprefix}gcc -m32" "LD=${toolprefix}g++ -m32")
@@ -89,12 +91,14 @@
     linux64)
 	platform=linux
 	bits=64
+	pubtag=linux64
 	pluginext=.so
 	valgrind=valgrind
 	identpattern='ELF 64'
 	;;
     mingw32)
 	platform=mingw
+	pubtag=win32
 	toolprefix=i686-w64-mingw32- 
 	pluginext=.dll
 	hostwrapper=wine
@@ -105,6 +109,7 @@
     mingw64)
 	platform=mingw
 	bits=64
+	pubtag=win64
 	altbits=32 # We can usually use a mingw32 Makefile if toolprefix is OK
 	toolprefix=x86_64-w64-mingw32- 
 	pluginext=.dll
@@ -115,6 +120,7 @@
 	;;
     osx32)
 	platform=osx
+	pubtag=osx32
 	pluginext=.dylib
 	archflags="-arch i386"
 	identpattern='Mach-O .*i386'
@@ -122,6 +128,7 @@
     osx64)
 	platform=osx
 	bits=64
+	pubtag=osx
 	pluginext=.dylib
 	# This is a difficult choice for various reasons... have to ponder
 	archflags="-mmacosx-version-min=10.7 -arch x86_64 -arch i386 -stdlib=libc++"
@@ -137,7 +144,7 @@
 if [ -z "$platform" ]; then
     usage
 else
-    echo "(Platform is $platform, $bits bits)"
+    echo "(Platform is $platform, $bits bits, package platform tag $pubtag)"
 fi
 
 if [ -z "$pluginext" ]; then
@@ -592,7 +599,7 @@
 package() {
     local dir="$1"
     local id=$(vcs_id "$dir")
-    local pstub="$dir-$platform$bits-$id"
+    local pstub="$dir-$pubtag-$id"
     local pdir="$packagedir/$pstub"
     mkdir -p "$pdir"
     ( cd "$dir" ;