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

build: structure of windows deploy project

Browse Source 
* moved installer dlls to lib folder
* updated .gitignore to be more specific
* added notes on cleaning the installer project to readme
* made rebuilding of databases optional in windows deploy script
* removed local paths for devenv.com from windows deploy script
This commit is contained in:
malte_langkabel
2016-10-27 11:38:36 +02:00
parent 38d0cb36aa
commit 9f847f7897
11 changed files with 55 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+6 -23
View File
@@ -49,26 +49,9 @@ compile_commands.json
Makefile
/__pycache__/
/deployment/windows/CoatiAppSetup/CoatiSetup/Debug
/deployment/windows/CoatiAppSetup/CoatiSetup/Release
/deployment/windows/CoatiAppSetup/SetupApplicationSettingsLib/bin/
/deployment/windows/CoatiAppSetup/SetupApplicationSettingsLib/obj/
/deployment/windows/CoatiAppSetup/SetupCreateDesktopShortcutLib/bin/
/deployment/windows/CoatiAppSetup/SetupCreateDesktopShortcutLib/obj/
/deployment/windows/CoatiAppSetup/SetupCreateStartMenuShortcutLib/bin/
/deployment/windows/CoatiAppSetup/SetupCreateStartMenuShortcutLib/obj/
/deployment/windows/CoatiAppSetup/SetupRemoveCacheFiles/bin/
/deployment/windows/CoatiAppSetup/SetupRemoveCacheFiles/obj/
/deployment/windows/CoatiTrialSetup/CoatiSetup/Debug
/deployment/windows/CoatiTrialSetup/CoatiSetup/Release
/deployment/windows/CoatiTrialSetup/SetupApplicationSettingsLib/bin/
/deployment/windows/CoatiTrialSetup/SetupApplicationSettingsLib/obj/
/deployment/windows/CoatiTrialSetup/SetupCreateDesktopShortcutLib/bin/
/deployment/windows/CoatiTrialSetup/SetupCreateDesktopShortcutLib/obj/
/deployment/windows/CoatiTrialSetup/SetupCreateStartMenuShortcutLib/bin/
/deployment/windows/CoatiTrialSetup/SetupCreateStartMenuShortcutLib/obj/
/deployment/windows/CoatiTrialSetup/SetupRemoveCacheFiles/bin/
/deployment/windows/CoatiTrialSetup/SetupRemoveCacheFiles/obj/
/deployment/windows/wixSetup/
/deployment/windows/wixSetup/bin
/deployment/windows/wixSetup/build
/deployment/windows/wixSetup/CustomActions/SetupAppSettings/obj/x86/Release
/deployment/windows/wixSetup/CustomActions/UninstallRemoveLogFolder/obj/x86/Release
/deployment/windows/wixSetup/Setup/build/Setup/Release
/deployment/windows/wixSetup/Setup/build/Setup.VC.db
deployment/windows/wixSetup/build.bat
+7
View File
@@ -12,3 +12,10 @@ light.exe -ext WixUIExtension build/coati.wixobj build/customActions.wixobj buil
cp -u -r build/coati.msi bin
cp -u -r build/Setup.exe bin
cp -u -r lib/api-ms-win-crt-heap-l1-1-0.dll bin
cp -u -r lib/api-ms-win-crt-locale-l1-1-0.dll bin
cp -u -r lib/api-ms-win-crt-math-l1-1-0.dll bin
cp -u -r lib/api-ms-win-crt-runtime-l1-1-0.dll bin
cp -u -r lib/api-ms-win-crt-stdio-l1-1-0.dll bin
cp -u -r lib/msvcp140.dll bin
cp -u -r lib/vcruntime140.dll bin
deployment/windows/wixSetup/build/api-ms-win-crt-heap-l1-1-0.dll → deployment/windows/wixSetup/lib/api-ms-win-crt-heap-l1-1-0.dll
View File
deployment/windows/wixSetup/build/api-ms-win-crt-locale-l1-1-0.dll → deployment/windows/wixSetup/lib/api-ms-win-crt-locale-l1-1-0.dll
View File
deployment/windows/wixSetup/build/api-ms-win-crt-math-l1-1-0.dll → deployment/windows/wixSetup/lib/api-ms-win-crt-math-l1-1-0.dll
View File
deployment/windows/wixSetup/build/api-ms-win-crt-runtime-l1-1-0.dll → deployment/windows/wixSetup/lib/api-ms-win-crt-runtime-l1-1-0.dll
View File
deployment/windows/wixSetup/build/api-ms-win-crt-stdio-l1-1-0.dll → deployment/windows/wixSetup/lib/api-ms-win-crt-stdio-l1-1-0.dll
View File
deployment/windows/wixSetup/build/msvcp140.dll → deployment/windows/wixSetup/lib/msvcp140.dll
View File
deployment/windows/wixSetup/build/vcruntime140.dll → deployment/windows/wixSetup/lib/vcruntime140.dll
View File
deployment/windows/wixSetup/readme.txt
+6
View File
@@ -18,6 +18,12 @@ Build the installer
-setup.exe checks whether coati is installed and will either start the initial installation or the upgrade installation
---------------------
Clean the project
---------------------
-Just delete the "bin" and "build" folders
---------------------
Update Version Number
---------------------
script/deploy_windows.sh
+36 -21
View File
@@ -1,6 +1,7 @@
# FLAGS
REBUILD=true
OBFUSCATE=true
UPDATE_DATABASES=true
# USEFUL VARIABLES
@@ -26,6 +27,11 @@ if [ $OBFUSCATE = false ]; then
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"
fi
echo -e "$INFO Did you set the correct version number for the installers?"
read -p "Press [Enter] key to continue"
@@ -49,40 +55,42 @@ echo "#define DEPLOY" >src/lib_gui/platform_includes/deploy.h
# CLEANING THE PROJECT
if [ $REBUILD = true ]; then
echo -e "$INFO cleaning the project"
"D:/programme/Microsoft Visual Studio14/Common7/IDE/devenv.com" build/Coati.sln //clean Release
"devenv.com" build/Coati.sln //clean Release
fi
# BUILDING THE EXECUTABLE
echo -e "$INFO building the executable (app)"
"D:/programme/Microsoft Visual Studio14/Common7/IDE/devenv.com" build/Coati.sln //build Release //project build/Coati.vcxproj
"devenv.com" build/Coati.sln //build Release //project build/Coati.vcxproj
# CREATING TRAIL DATABASES´
echo -e "$INFO creating databases"
# CREATING DATABASES
if [ $UPDATE_DATABASES = true ]; then
echo -e "$INFO creating databases"
rm bin/app/data/projects/tictactoe/tictactoe.coatidb
rm bin/app/data/projects/tutorial/tutorial.coatidb
rm bin/app/data/projects/javaparser/javaparser.coatidb
rm -rf temp
rm bin/app/data/projects/tictactoe/tictactoe.coatidb
rm bin/app/data/projects/tutorial/tutorial.coatidb
rm bin/app/data/projects/javaparser/javaparser.coatidb
rm -rf temp
mkdir -p temp
cd temp
mkdir -p temp
cd temp
echo -e "$INFO saving license key"
../bin/app/Release/Coati.exe -z ../script/license.txt
echo -e "$INFO saving license key"
../bin/app/Release/Coati.exe -z ../script/license.txt
echo -e "$INFO creating database for tictactie"
../bin/app/Release/Coati.exe -p ../bin/app/data/projects/tictactoe/tictactoe.coatiproject -d
echo -e "$INFO creating database for tictactie"
../bin/app/Release/Coati.exe -p ../bin/app/data/projects/tictactoe/tictactoe.coatiproject -d
echo -e "$INFO creating database for tutorial"
../bin/app/Release/Coati.exe -p ../bin/app/data/projects/tutorial/tutorial.coatiproject -d
echo -e "$INFO creating database for tutorial"
../bin/app/Release/Coati.exe -p ../bin/app/data/projects/tutorial/tutorial.coatiproject -d
echo -e "$INFO creating database for javaparser"
../bin/app/Release/Coati.exe -p ../bin/app/data/projects/javaparser/javaparser.coatiproject -d
echo -e "$INFO creating database for javaparser"
../bin/app/Release/Coati.exe -p ../bin/app/data/projects/javaparser/javaparser.coatiproject -d
cd ..
rm -rf temp
cd ..
rm -rf temp
fi
# OBFUSCATING THE EXECUTABLE
@@ -117,6 +125,13 @@ mkdir -p $APP_PACKAGE_DIR
cp -u -r deployment/windows/wixSetup/bin/Coati.msi $APP_PACKAGE_DIR/
cp -u -r deployment/windows/wixSetup/bin/setup.exe $APP_PACKAGE_DIR/
cp -u -r deployment/windows/wixSetup/bin/api-ms-win-crt-heap-l1-1-0.dll $APP_PACKAGE_DIR/
cp -u -r deployment/windows/wixSetup/bin/api-ms-win-crt-locale-l1-1-0.dll $APP_PACKAGE_DIR/
cp -u -r deployment/windows/wixSetup/bin/api-ms-win-crt-math-l1-1-0.dll $APP_PACKAGE_DIR/
cp -u -r deployment/windows/wixSetup/bin/api-ms-win-crt-runtime-l1-1-0.dll $APP_PACKAGE_DIR/
cp -u -r deployment/windows/wixSetup/bin/api-ms-win-crt-stdio-l1-1-0.dll $APP_PACKAGE_DIR/
cp -u -r deployment/windows/wixSetup/bin/msvcp140.dll $APP_PACKAGE_DIR/
cp -u -r deployment/windows/wixSetup/bin/vcruntime140.dll $APP_PACKAGE_DIR/
mkdir -p $APP_PACKAGE_DIR/plugins/atom/
cp -u -r ide_plugins/atom/* $APP_PACKAGE_DIR/plugins/atom/
@@ -148,7 +163,7 @@ rm -rf $APP_PACKAGE_DIR
# UNSETTING THE DEPLOY FLAG
rm -rf src/lib_gui/platform_includes/deploy.h
echo "// #define DEPLOY" >src/lib_gui/platform_includes/deploy.h
echo $'// #define DEPLOY' >src/lib_gui/platform_includes/deploy.h
echo -e "$SUCCESS packaging complete!"