diff packaging/create-dist-package.sh.in @ 885:1cc85fd3daa5

(issue70) Handle i386 and amd64 packages
author Andre Heinecke <andre.heinecke@intevation.de>
date Fri, 08 Aug 2014 10:56:24 +0200
parents 08065bb5de7c
children accda55ae053
line wrap: on
line diff
--- a/packaging/create-dist-package.sh.in	Fri Aug 08 10:49:16 2014 +0200
+++ b/packaging/create-dist-package.sh.in	Fri Aug 08 10:56:24 2014 +0200
@@ -9,13 +9,34 @@
     exit 1
 fi
 
+if [ ! -f @CMAKE_SOURCE_DIR@/build-windows/Makefile ]; then
+    echo "Could not find a windows build in: @CMAKE_SOURCE_DIR@/build-windows "
+    exit 1
+fi
+
+if [ ! -f @CMAKE_SOURCE_DIR@/build-i386/Makefile ]; then
+    echo "Could not find a i386 build in: @CMAKE_SOURCE_DIR@/build-i386 "
+    exit 1
+fi
+
 TMPD=$(mktemp -d)
 TMPDIR=$TMPD/TrustBridge-@PROJECT_VERSION@
+cd @CMAKE_SOURCE_DIR@/build-windows
+echo "Updating windows build"
+make
+cd @CMAKE_SOURCE_DIR@/build-i386
+echo "Building x86 package"
+make
+/bin/bash packaging/linux-createpackage.sh
 cd @CMAKE_BINARY_DIR@
+echo "Building amd64 package"
 /bin/bash packaging/linux-createpackage.sh
 mkdir -p $TMPDIR/linux
 mkdir -p $TMPDIR/windows
-mv @CMAKE_BINARY_DIR@/TrustBridge-@PROJECT_VERSION@.sh $TMPDIR/linux
+mv @CMAKE_BINARY_DIR@/TrustBridge-@PROJECT_VERSION@.sh \
+    $TMPDIR/linux/TrustBridge-@PROJECT_VERSION@-amd64.sh
+mv @CMAKE_SOURCE_DIR@/build-i386/TrustBridge-@PROJECT_VERSION@.sh \
+    $TMPDIR/linux/TrustBridge-@PROJECT_VERSION@-i386.sh
 cp @CMAKE_SOURCE_DIR@/build-windows/ui/trustbridge.exe $TMPDIR/windows
 cp @CMAKE_SOURCE_DIR@/build-windows/cinst/cinst.exe $TMPDIR/windows
 cp @CMAKE_SOURCE_DIR@/build-windows/cinst/mozilla.exe $TMPDIR/windows

http://wald.intevation.org/projects/trustbridge/