build: offer windows 64 bit build (issue #300)

* update to clang/llvm to 3.9
* update to qt 5.8
* fixed windows javapathdetector for 64 bit java.
* added LibGui as dependency to tests
* fixed legacy Java 6 install necessary on MacOS
* fixed setting of user path for 64 bit build
* added missing pngs to windows installer
* renamed graph zoom button images
* reverted moving of setupLogging call to fix crash on deployed exe

fortune cookie message = An old acquaintance will enter your life.
This commit is contained in:
malte_langkabel
2017-02-03 14:31:43 +01:00
parent 8c0f9f2de4
commit 7f2db69995
250 changed files with 1173 additions and 1075 deletions
+41
View File
@@ -0,0 +1,41 @@
WIN_ARCH=win32
X_ARCH=x86
if [ "$1" == "-win64" ]; then
WIN_ARCH=win64
X_ARCH=x64
fi
VERSION_STRING=$(git describe --long)
VERSION_STRING="${VERSION_STRING//-/_}"
VERSION_STRING="${VERSION_STRING//./_}"
VERSION_STRING="${VERSION_STRING%_*}"
VERSION_STRING="${VERSION_STRING//_/.}"
echo "installer version is $VERSION_STRING"
PRODUCT_GUID=$(cmd.exe /c "VsDevCmd.bat & uuidgen")
echo "$WIN_ARCH product guid is $PRODUCT_GUID"
rm -rf build
mkdir build
rm -rf ../../../bin/app/data/install/uninstall_wix_$WIN_ARCH.bat
echo $"%windir%\system32\msiexec.exe /x {$PRODUCT_GUID}" >../../../bin/app/data/install/uninstall_wix_$WIN_ARCH.bat
"devenv.com" Setup/build/Setup.sln //build "Release|$X_ARCH"
"devenv.com" CustomActions/CustomActions.sln //build "Release|$X_ARCH"
OUTPUT_DIR=bin/$WIN_ARCH
rm -rf $OUTPUT_DIR
mkdir $OUTPUT_DIR
candle.exe -dProductVersion="$VERSION_STRING" -dProductGuid="$PRODUCT_GUID" -arch $X_ARCH coati.wxs customActions.wxs dialogShortcuts.wxs installDir.wxs appDataDir.wxs -out build/ > build/compileLog.txt
light.exe -ext WixUIExtension build/coati.wixobj build/customActions.wixobj build/dialogShortcuts.wixobj build/installDir.wixobj build/appDataDir.wixobj -out build/coati.msi > build/linkLog.txt
cp -u -r build/coati.msi $OUTPUT_DIR
cp -u -r build/Setup.exe $OUTPUT_DIR
cp -u -r lib/$WIN_ARCH/* $OUTPUT_DIR
cp -u -r readme.txt $OUTPUT_DIR