From 0e4a6207687966aeada0bd0b7ff27f65ef1a9619 Mon Sep 17 00:00:00 2001 From: mlangkabel Date: Wed, 13 Nov 2019 19:33:40 +0100 Subject: [PATCH] script: updated windows deploy script * add missing copy command for dll to cmake * fix deploy script * remove code signing from deploy script --- CMakeLists.txt | 2 ++ script/deploy_windows.sh | 70 +++++++--------------------------------- 2 files changed, 13 insertions(+), 59 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b5773c1..43660fe2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -237,6 +237,8 @@ if (WIN32) configure_file("${QT_PLUGINS_DIR}/platforms/qwindows${SUFFIX}.dll" "${CMAKE_BINARY_DIR}/${CONFIGURATION}/${TARGET}/platforms/qwindows${SUFFIX}.dll" COPYONLY) + configure_file("${QT_PLUGINS_DIR}/styles/qwindowsvistastyle${SUFFIX}.dll" "${CMAKE_BINARY_DIR}/${CONFIGURATION}/${TARGET}/styles/qwindowsvistastyle${SUFFIX}.dll" COPYONLY) + configure_file("${QT_PLUGINS_DIR}/imageformats/qgif${SUFFIX}.dll" "${CMAKE_BINARY_DIR}/${CONFIGURATION}/${TARGET}/imageformats/qgif${SUFFIX}.dll" COPYONLY) configure_file("${QT_PLUGINS_DIR}/imageformats/qicns${SUFFIX}.dll" "${CMAKE_BINARY_DIR}/${CONFIGURATION}/${TARGET}/imageformats/qicns${SUFFIX}.dll" COPYONLY) configure_file("${QT_PLUGINS_DIR}/imageformats/qico${SUFFIX}.dll" "${CMAKE_BINARY_DIR}/${CONFIGURATION}/${TARGET}/imageformats/qico${SUFFIX}.dll" COPYONLY) diff --git a/script/deploy_windows.sh b/script/deploy_windows.sh index 325db3e0..646d9c49 100644 --- a/script/deploy_windows.sh +++ b/script/deploy_windows.sh @@ -1,7 +1,6 @@ # FLAGS CLEAN_AND_SETUP=true REBUILD=true -RUN_CODE_SIGNING=true UPDATE_DATABASES=true CREATE_INSTALLER_ZIP=true CREATE_PORTABLE_ZIP=true @@ -29,11 +28,6 @@ if [ $REBUILD = false ]; then read -p "Press [Enter] key to continue" fi -if [ $RUN_CODE_SIGNING = false ]; then - echo -e "$INFO RUN_CODE_SIGNING flag is set to false. Do you want to proceed?" - read -p "Press [Enter] key to continue" -fi - if [ $UPDATE_DATABASES = false ]; then echo -e "$INFO UPDATE_DATABASES flag is set to false. Do you want to proceed?" read -p "Press [Enter] key to continue" @@ -50,9 +44,6 @@ if [ $CREATE_PORTABLE_ZIP = false ]; then fi -### TODO: add HKEY_CURRENT_USER\Software\Microsoft\VisualStudio\12.0_Config\MSBuild\EnableOutOfProcBuild - - VERSION_STRING=$(git describe --long) VERSION_STRING="${VERSION_STRING//-/_}" VERSION_STRING="${VERSION_STRING//./_}" @@ -60,22 +51,21 @@ VERSION_STRING="${VERSION_STRING%_*}" DOTTED_VERSION_STRING="${VERSION_STRING//_/.}" -if [ $RUN_CODE_SIGNING = true ]; then - echo -e "$INFO Code signing is enabled. Please enter your password >" - read CODE_SIGNING_PASSWORD -fi - - if [ $CLEAN_AND_SETUP = true ]; then echo -e "$INFO Cleaning the project" script/clean.sh - echo -e "$INFO Setting up the project" - script/setup.sh - if [ $RUN_CODE_SIGNING = true ]; then - echo -e "$INFO Signing the Python indexer" - signtool.exe sign //f "deployment/windows/certificate/coati_software_kg.pfx" //p $CODE_SIGNING_PASSWORD //t "http://timestamp.verisign.com/scripts/timstamp.dll" //d "Sourcetrail Python Indexer" //du "https://github.com/CoatiSoftware/SourcetrailPythonIndexer" //v bin/app/data/python/SourcetrailPythonIndexer.exe - fi + echo -e $INFO "$INFO Running cmake with 32 bit configuration" + mkdir -p build/win32 + cd build/win32 + cmake -G "Visual Studio 14 2015" -DBUILD_CXX_LANGUAGE_PACKAGE=ON -DBUILD_JAVA_LANGUAGE_PACKAGE=ON -DBUILD_PYTHON_LANGUAGE_PACKAGE=ON ../.. + cd ../.. + + echo -e $INFO "$INFO Running cmake with 64 bit configuration" + mkdir -p build/win64 + cd build/win64 + cmake -G "Visual Studio 14 2015 Win64" -DBUILD_CXX_LANGUAGE_PACKAGE=ON -DBUILD_JAVA_LANGUAGE_PACKAGE=ON -DBUILD_PYTHON_LANGUAGE_PACKAGE=ON ../.. + cd ../.. fi @@ -92,14 +82,6 @@ build_executable() # Parameters: bit {32, 64} { echo -e "$INFO Building the app (${1} bit)" "devenv.com" build/win${1}/Sourcetrail.sln //build Release //project build/win${1}/Sourcetrail.vcxproj - - if [ $RUN_CODE_SIGNING = true ]; then - echo -e "$INFO Signing the app (${1} bit)" - signtool.exe sign //f "deployment/windows/certificate/coati_software_kg.pfx" //p $CODE_SIGNING_PASSWORD //t "http://timestamp.verisign.com/scripts/timstamp.dll" //d "Sourcetrail ${DOTTED_VERSION_STRING}" //du "https://www.sourcetrail.com/" //v build/win${1}/Release/app/Sourcetrail.exe - - echo -e "$INFO Signing the indexer (${1} bit)" - signtool.exe sign //f "deployment/windows/certificate/coati_software_kg.pfx" //p $CODE_SIGNING_PASSWORD //t "http://timestamp.verisign.com/scripts/timstamp.dll" //d "Sourcetrail Indexer ${DOTTED_VERSION_STRING}" //du "https://www.sourcetrail.com/" //v build/win${1}/Release/app/sourcetrail_indexer.exe - fi } build_executable "32" build_executable "64" @@ -121,7 +103,6 @@ if [ $UPDATE_DATABASES = true ]; then echo -e "$INFO configuring application" ../build/win32/Release/app/Sourcetrail.exe accept-eula ../build/win32/Release/app/Sourcetrail.exe config -t 8 - ../build/win32/Release/app/Sourcetrail.exe config -M 1024 echo -e "$INFO creating database for tutorial" ../build/win32/Release/app/Sourcetrail.exe index --full --project-file ../bin/app/user/projects/tutorial/tutorial.srctrlprj @@ -147,15 +128,6 @@ sh build_win64.sh cd ../../.. -if [ $RUN_CODE_SIGNING = true ]; then - echo -e "$INFO Signing the 32 bit windows installer" - signtool.exe sign //f "deployment/windows/certificate/coati_software_kg.pfx" //p $CODE_SIGNING_PASSWORD //t "http://timestamp.verisign.com/scripts/timstamp.dll" //d "Sourcetrail ${DOTTED_VERSION_STRING} Installer" //du "https://www.sourcetrail.com/" //v deployment/windows/wixSetup/bin/win32/sourcetrail.msi - - echo -e "$INFO Signing the 64 bit windows installer" - signtool.exe sign //f "deployment/windows/certificate/coati_software_kg.pfx" //p $CODE_SIGNING_PASSWORD //t "http://timestamp.verisign.com/scripts/timstamp.dll" //d "Sourcetrail ${DOTTED_VERSION_STRING} Installer" //du "https://www.sourcetrail.com/" //v deployment/windows/wixSetup/bin/win64/sourcetrail.msi -fi - - # CREATING THE INSTALLER ZIP FILES if [ $CREATE_INSTALLER_ZIP = true ]; then create_installer_zip() # Parameters: bit {32, 64} @@ -313,23 +285,3 @@ fi echo -e "$SUCCESS packaging complete!" - - - - - - - - - - - - - - - - - - - -