ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build: remove unused windows 32 bit deployment

Browse Source
This commit is contained in:
Malte Langkabel
2020-06-08 16:35:31 +02:00
committed by GitHub
parent 9a8fa94905
commit a76a19041f
5 changed files with 138 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deployment/windows/wixSetup/build.sh
+1 -1
View File
@@ -39,7 +39,7 @@ echo $"%windir%\system32\msiexec.exe /x {$PRODUCT_GUID}" >$ROOT_DIR/bin/app/data
"devenv.com" CustomActions/CustomActions.sln //build "Release|$X_ARCH"
OUTPUT_DIR=bin/$WIN_ARCH
OUTPUT_DIR=bin
rm -rf $OUTPUT_DIR
mkdir -p $OUTPUT_DIR
deployment/windows/wixSetup/build_win32.sh
-1
View File
@@ -1 +0,0 @@
sh build.sh -win32
deployment/windows/wixSetup/build_win64.sh
-1
View File
@@ -1 +0,0 @@
sh build.sh -win64
deployment/windows/wixSetup/installDir.wxs
+1 -5
View File
@@ -1,11 +1,7 @@
<?xml version='1.0'?>
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
<?if $(sys.BUILDARCH) = x64 ?>
<?define PlatformSourceFolder = "./../../../build/win64/Release/app" ?>
<?else ?>
<?define PlatformSourceFolder = "./../../../build/win32/Release/app" ?>
<?endif ?>
<?define PlatformSourceFolder = "./../../../build/Release/app" ?>
<Fragment>
<DirectoryRef Id='INSTALLDIR'>
script/deploy_windows.sh
+45 -141
View File
@@ -6,9 +6,6 @@ UPDATE_DATABASES=true
CREATE_WIX_INSTALLER=true
CREATE_PORTABLE_PACKAGE=true
RUN_32_BIT_PIPELINE=false
RUN_64_BIT_PIPELINE=true
# USEFUL VARIABLES
ABORT="\033[31mAbort:\033[00m"
@@ -53,16 +50,6 @@ if [ $CREATE_PORTABLE_PACKAGE = false ]; then
read -p "Press [Enter] key to continue"
fi
if [ $RUN_32_BIT_PIPELINE = false ]; then
echo -e "$INFO RUN_32_BIT_PIPELINE flag is set to false. Do you want to proceed?"
read -p "Press [Enter] key to continue"
fi
if [ $RUN_64_BIT_PIPELINE = false ]; then
echo -e "$INFO RUN_64_BIT_PIPELINE flag is set to false. Do you want to proceed?"
read -p "Press [Enter] key to continue"
fi
VERSION_STRING=$(git describe --long)
VERSION_STRING="${VERSION_STRING//-/_}"
@@ -86,60 +73,32 @@ if [ $CLEAN_AND_SETUP = true ]; then
echo -e "$INFO Cleaning the project"
script/clean.sh
if [ $RUN_32_BIT_PIPELINE = true ]; then
echo -e $INFO "$INFO Running cmake with 32 bit configuration"
mkdir -p build/win32
cd build/win32
cmake -G "Visual Studio 15 2017" -DBOOST_ROOT=${BOOST_ROOT} -DQt5_DIR=${Qt5_DIR} -DClang_DIR=${Clang_DIR} -DBUILD_CXX_LANGUAGE_PACKAGE=ON -DBUILD_JAVA_LANGUAGE_PACKAGE=ON -DBUILD_PYTHON_LANGUAGE_PACKAGE=ON ../..
cd ../..
fi
if [ $RUN_64_BIT_PIPELINE = true ]; then
echo -e $INFO "$INFO Running cmake with 64 bit configuration"
mkdir -p build/win64
cd build/win64
cmake -G "Visual Studio 15 2017 Win64" -DBOOST_ROOT=${BOOST_ROOT} -DQt5_DIR=${Qt5_64_DIR} -DClang_DIR=${Clang_64_DIR} -DBUILD_CXX_LANGUAGE_PACKAGE=ON -DBUILD_JAVA_LANGUAGE_PACKAGE=ON -DBUILD_PYTHON_LANGUAGE_PACKAGE=ON ../..
cd ../..
fi
mkdir -p build
cd build
cmake -G "Visual Studio 15 2017 Win64" -DBOOST_ROOT=${BOOST_ROOT} -DQt5_DIR=${Qt5_64_DIR} -DClang_DIR=${Clang_64_DIR} -DBUILD_CXX_LANGUAGE_PACKAGE=ON -DBUILD_JAVA_LANGUAGE_PACKAGE=ON -DBUILD_PYTHON_LANGUAGE_PACKAGE=ON ..
cd ..
fi
# CLEANING THE SOLUTIONS
if [ $REBUILD = true ]; then
echo -e "$INFO Cleaning the solution"
if [ $RUN_32_BIT_PIPELINE = true ]; then
"devenv.com" build/win32/Sourcetrail.sln //clean Release
fi
if [ $RUN_64_BIT_PIPELINE = true ]; then
"devenv.com" build/win64/Sourcetrail.sln //clean Release
fi
"devenv.com" build/Sourcetrail.sln //clean Release
fi
# BUILDING THE EXECUTABLES
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
echo -e "$INFO Building the project"
"devenv.com" build/Sourcetrail.sln //build Release //project build/Sourcetrail.vcxproj
if [ $RUN_CODE_SIGNING = true ]; then
echo -e "$INFO Signing the app (${1} bit)"
signtool.exe sign //f $CODE_SIGNING_KEY_FILE //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 app"
signtool.exe sign //f $CODE_SIGNING_KEY_FILE //p $CODE_SIGNING_PASSWORD //t "http://timestamp.verisign.com/scripts/timstamp.dll" //d "Sourcetrail ${DOTTED_VERSION_STRING}" //du "https://www.sourcetrail.com/" //v build/Release/app/Sourcetrail.exe
echo -e "$INFO Signing the indexer (${1} bit)"
signtool.exe sign //f $CODE_SIGNING_KEY_FILE //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
}
echo -e "$INFO Signing the indexer"
signtool.exe sign //f $CODE_SIGNING_KEY_FILE //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/Release/app/sourcetrail_indexer.exe
if [ $RUN_32_BIT_PIPELINE = true ]; then
build_executable "32"
fi
if [ $RUN_64_BIT_PIPELINE = true ]; then
build_executable "64"
fi
if [ $RUN_CODE_SIGNING = true ]; then
echo -e "$INFO Signing the Python indexer"
signtool.exe sign //f $CODE_SIGNING_KEY_FILE //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
@@ -148,34 +107,11 @@ fi
rm -rf ./$OUTPUT_FOLDER
mkdir ./$OUTPUT_FOLDER
# STORING PDB FILES
store_pdb() # Parameters: bit {32, 64}
{
echo -e "$INFO storing pdb file for win$1"
mkdir ./$OUTPUT_FOLDER/PDB_${1}bit
cp -u -r ./build/win$1/Release/app/Sourcetrail.pdb ./$OUTPUT_FOLDER/PDB_${1}bit/
}
if [ $RUN_32_BIT_PIPELINE = true ]; then
store_pdb "32"
fi
if [ $RUN_64_BIT_PIPELINE = true ]; then
store_pdb "64"
fi
# FIXME: we should do this right at the start
BIT=""
if [ $RUN_64_BIT_PIPELINE = true ]; then
BIT="64"
elif [ $RUN_32_BIT_PIPELINE = true ]; then
BIT="32"
fi
if [ $BIT == "" ]; then
echo -e "$INFO No configuration has been built, aborting now."
exit
fi
echo -e "$INFO storing pdb file"
mkdir ./$OUTPUT_FOLDER/PDB
cp -u -r ./build/Release/app/Sourcetrail.pdb ./$OUTPUT_FOLDER/PDB/
# CREATING DATABASES
@@ -192,19 +128,19 @@ if [ $UPDATE_DATABASES = true ]; then
cd temp
echo -e "$INFO configuring application"
../build/win$BIT/Release/app/Sourcetrail.exe config -t 8
../build/Release/app/Sourcetrail.exe config -t 8
echo -e "$INFO creating database for tutorial"
../build/win$BIT/Release/app/Sourcetrail.exe index --full --project-file ../bin/app/user/projects/tutorial/tutorial.srctrlprj
../build/Release/app/Sourcetrail.exe index --full --project-file ../bin/app/user/projects/tutorial/tutorial.srctrlprj
echo -e "$INFO creating database for tictactoe_cpp"
../build/win$BIT/Release/app/Sourcetrail.exe index --full --project-file ../bin/app/user/projects/tictactoe_cpp/tictactoe_cpp.srctrlprj
../build/Release/app/Sourcetrail.exe index --full --project-file ../bin/app/user/projects/tictactoe_cpp/tictactoe_cpp.srctrlprj
echo -e "$INFO creating database for tictactoe_py"
../build/win$BIT/Release/app/Sourcetrail.exe index --full --project-file ../bin/app/user/projects/tictactoe_py/tictactoe_py.srctrlprj
../build/Release/app/Sourcetrail.exe index --full --project-file ../bin/app/user/projects/tictactoe_py/tictactoe_py.srctrlprj
echo -e "$INFO creating database for javaparser"
../build/win$BIT/Release/app/Sourcetrail.exe index --full --project-file ../bin/app/user/projects/javaparser/javaparser.srctrlprj
../build/Release/app/Sourcetrail.exe index --full --project-file ../bin/app/user/projects/javaparser/javaparser.srctrlprj
cd ..
rm -rf temp
@@ -213,43 +149,29 @@ fi
# BUILDING THE INSTALLER
cd deployment/windows/wixSetup
if [ $RUN_32_BIT_PIPELINE = true ]; then
sh build_win32.sh
sh build.sh -win64
[ $? -eq 0 ] || exit 1
fi
if [ $RUN_64_BIT_PIPELINE = true ]; then
sh build_win64.sh
[ $? -eq 0 ] || exit 1
fi
cd ../../..
if [ $RUN_CODE_SIGNING = true ]; then
if [ $RUN_32_BIT_PIPELINE = true ]; then
echo -e "$INFO Signing the 32 bit windows installer"
signtool.exe sign //f $CODE_SIGNING_KEY_FILE //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
fi
if [ $RUN_64_BIT_PIPELINE = true ]; then
echo -e "$INFO Signing the 64 bit windows installer"
signtool.exe sign //f $CODE_SIGNING_KEY_FILE //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
signtool.exe sign //f $CODE_SIGNING_KEY_FILE //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/sourcetrail.msi
fi
# CREATING THE INSTALLER ZIP FILES
if [ $CREATE_WIX_INSTALLER = true ]; then
create_installer_zip() # Parameters: bit {32, 64}
{
# CREATING INSTALLER PACKAGE FOLDER
echo -e "$INFO creating installer package folder for win$1"
local INSTALLER_PACKAGE_NAME=Sourcetrail_${VERSION_STRING}_${1}bit_Installer
local INSTALLER_PACKAGE_DIR=$OUTPUT_FOLDER/$INSTALLER_PACKAGE_NAME
local INSTALLER_PACKAGE_PLUGINS_DIR=$INSTALLER_PACKAGE_DIR/plugins
echo -e "$INFO creating installer package folder"
INSTALLER_PACKAGE_NAME=Sourcetrail_${VERSION_STRING}_64bit_Installer
INSTALLER_PACKAGE_DIR=$OUTPUT_FOLDER/$INSTALLER_PACKAGE_NAME
INSTALLER_PACKAGE_PLUGINS_DIR=$INSTALLER_PACKAGE_DIR/plugins
rm -rf $INSTALLER_PACKAGE_DIR
mkdir -p $INSTALLER_PACKAGE_DIR
cp -u -r deployment/windows/wixSetup/bin/win${1}/* $INSTALLER_PACKAGE_DIR/
cp -u -r deployment/windows/wixSetup/bin/* $INSTALLER_PACKAGE_DIR/
# COPYING PLUGINS DATA
mkdir -p $INSTALLER_PACKAGE_PLUGINS_DIR/atom/
@@ -274,35 +196,25 @@ if [ $CREATE_WIX_INSTALLER = true ]; then
cd ./$OUTPUT_FOLDER/
# PACKAGING SOURCETRAIL
echo -e "$INFO packaging sourcetrail installer for win$1"
winrar a -afzip Sourcetrail_${VERSION_STRING}_Windows_${1}bit_Installer.zip $INSTALLER_PACKAGE_NAME
echo -e "$INFO packaging sourcetrail installer"
winrar a -afzip Sourcetrail_${VERSION_STRING}_Windows_64bit_Installer.zip $INSTALLER_PACKAGE_NAME
cd ../
# CLEANING UP
echo -e "$INFO Cleaning installer package folders for win$1"
echo -e "$INFO Cleaning installer package folders"
rm -rf $INSTALLER_PACKAGE_DIR
}
if [ $RUN_32_BIT_PIPELINE = true ]; then
create_installer_zip "32"
fi
if [ $RUN_64_BIT_PIPELINE = true ]; then
create_installer_zip "64"
fi
fi
# CREATING THE PORTABLE ZIP FILES
if [ $CREATE_PORTABLE_PACKAGE = true ]; then
create_portable_zip() # Parameters: bit {32, 64}
{
# CREATING PORTABLE PACKAGE FOLDER
echo -e "$INFO creating portable package folder for win$1"
local PORTABLE_PACKAGE_NAME=Sourcetrail_${VERSION_STRING}_${1}bit_Portable
local PORTABLE_PACKAGE_DIR=$OUTPUT_FOLDER/$PORTABLE_PACKAGE_NAME
local PORTABLE_PACKAGE_APP_DIR=$PORTABLE_PACKAGE_DIR/Sourcetrail_${VERSION_STRING}_${1}bit
local PORTABLE_PACKAGE_PLUGINS_DIR=$PORTABLE_PACKAGE_DIR/plugins
echo -e "$INFO creating portable package folder"
PORTABLE_PACKAGE_NAME=Sourcetrail_${VERSION_STRING}_64bit_Portable
PORTABLE_PACKAGE_DIR=$OUTPUT_FOLDER/$PORTABLE_PACKAGE_NAME
PORTABLE_PACKAGE_APP_DIR=$PORTABLE_PACKAGE_DIR/Sourcetrail_${VERSION_STRING}_64bit
PORTABLE_PACKAGE_PLUGINS_DIR=$PORTABLE_PACKAGE_DIR/plugins
rm -rf $PORTABLE_PACKAGE_DIR
mkdir -p $PORTABLE_PACKAGE_DIR
@@ -340,16 +252,16 @@ if [ $CREATE_PORTABLE_PACKAGE = true ]; then
cp -u -r bin/app/user/projects/tutorial/* $PORTABLE_PACKAGE_APP_DIR/user/projects/tutorial/
mkdir -p $PORTABLE_PACKAGE_APP_DIR/imageformats/
cp -u -r build/win$1/Release/app/imageformats/*.dll $PORTABLE_PACKAGE_APP_DIR/imageformats/
cp -u -r build/Release/app/imageformats/*.dll $PORTABLE_PACKAGE_APP_DIR/imageformats/
mkdir -p $PORTABLE_PACKAGE_APP_DIR/platforms/
cp -u -r build/win$1/Release/app/platforms/*.dll $PORTABLE_PACKAGE_APP_DIR/platforms/
cp -u -r build/Release/app/platforms/*.dll $PORTABLE_PACKAGE_APP_DIR/platforms/
mkdir -p $PORTABLE_PACKAGE_APP_DIR/styles/
cp -u -r build/win$1/Release/app/styles/*.dll $PORTABLE_PACKAGE_APP_DIR/styles/
cp -u -r build/Release/app/styles/*.dll $PORTABLE_PACKAGE_APP_DIR/styles/
cp -u -r build/win$1/Release/app/*.dll $PORTABLE_PACKAGE_APP_DIR/
cp -u -r build/win$1/Release/app/qt.conf $PORTABLE_PACKAGE_APP_DIR/
cp -u -r build/win$1/Release/app/Sourcetrail.exe $PORTABLE_PACKAGE_APP_DIR/
cp -u -r build/win$1/Release/app/sourcetrail_indexer.exe $PORTABLE_PACKAGE_APP_DIR/
cp -u -r build/Release/app/*.dll $PORTABLE_PACKAGE_APP_DIR/
cp -u -r build/Release/app/qt.conf $PORTABLE_PACKAGE_APP_DIR/
cp -u -r build/Release/app/Sourcetrail.exe $PORTABLE_PACKAGE_APP_DIR/
cp -u -r build/Release/app/sourcetrail_indexer.exe $PORTABLE_PACKAGE_APP_DIR/
# COPYING PLUGINS DATA
@@ -375,22 +287,14 @@ if [ $CREATE_PORTABLE_PACKAGE = true ]; then
cd ./$OUTPUT_FOLDER/
# PACKAGING SOURCETRAIL
echo -e "$INFO packaging sourcetrail portable for win$1"
winrar a -afzip Sourcetrail_${VERSION_STRING}_Windows_${1}bit_Portable.zip $PORTABLE_PACKAGE_NAME
echo -e "$INFO packaging sourcetrail portable"
winrar a -afzip Sourcetrail_${VERSION_STRING}_Windows_64bit_Portable.zip $PORTABLE_PACKAGE_NAME
cd ../
# CLEANING UP
echo -e "$INFO Cleaning portable package folders for win$1"
echo -e "$INFO Cleaning portable package folders"
rm -rf $PORTABLE_PACKAGE_DIR
}
if [ $RUN_32_BIT_PIPELINE = true ]; then
create_portable_zip "32"
fi
if [ $RUN_64_BIT_PIPELINE = true ]; then
create_portable_zip "64"
fi
fi