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

build: merge Coati app and Trial to single executable

Browse Source 
* removed trial target
* updated deploy scripts to exclude trial
* cleanup CMakeLists
* removed Eigen dependencies
* split parser lib into lib_cxx and lib_java
* added ProjectFactory and ProjectFactoryModules
* removed old installer projects
* updated wix installer
  * updated readme for wix setup
  * updated to use obfuscated exe
  * added qt.conf
  * added indexing dialog images
  * added jars
  * added coatidb files of sample projects
  * added source code of javaparser sample
  * removed auto-refresh image
  * intermediate files of windows installer are created in build folder
  * preselected desktop shortcut
  * build bat is executed from deploy_windows script
This commit is contained in:
malte_langkabel
2016-09-16 12:45:00 +02:00
parent 8fcb35611d
commit 3b7baba24b
140 changed files with 869 additions and 22250 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/build.sh
-6
View File
@@ -20,9 +20,6 @@ then
then
#echo "release test"
cd bin/test && Release/Coati_test
elif [ "$2" = "trial" ]
then
cd bin/app && Release/Coati_trial
elif [ "$2" = "keygen" ]
then
#echo "release keygen"
@@ -37,9 +34,6 @@ then
then
#echo "debug test"
cd bin/test && Debug/Coati_test
elif [ "$2" = "trial" ]
then
cd bin/app && Debug/Coati_trial
elif [ "$2" = "keygen" ]
then
#echo "debug keygen"
script/buildonly.sh
+1 -7
View File
@@ -7,15 +7,12 @@ cd $MY_PATH/..
# Build target
if [ "$1" = "release" ] || [ "$1" = "r" ]
if [ "$1" = "release" ] || [ "$1" = "r" ] || [ "$1" = "" ]
then
if [ "$2" = "test" ]
then
#echo "release test"
cmake --build build/Release --target Coati_test
elif [ "$2" = "trial" ]
then
cmake --build build/Release --target Coati_trial
elif [ "$2" = "keygen" ]
then
#echo "release keygen"
@@ -30,9 +27,6 @@ then
then
#echo "debug test"
cmake --build build/Debug --target Coati_test
elif [ "$2" = "trial" ]
then
cmake --build build/Debug --target Coati_trial
elif [ "$2" = "keygen" ]
then
#echo "debug keygen"
script/deploy_windows.sh
+16 -76
View File
@@ -29,9 +29,6 @@ fi
echo -e "$INFO Did you set the correct version number for the installers?"
read -p "Press [Enter] key to continue"
echo -e "$INFO Did you change the Product-IDs in the uninstall scripts?"
read -p "Press [Enter] key to continue"
echo -e "$INFO Did you set the correct version number for the Visual Studio plugin?"
read -p "Press [Enter] key to continue"
@@ -56,16 +53,13 @@ if [ $REBUILD = true ]; then
fi
# BUILDING THE EXECUTABLES
# 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
echo -e "$INFO building the executable (trail)"
"D:/programme/Microsoft Visual Studio14/Common7/IDE/devenv.com" build/Coati.sln //build Release //project build/Coati_trial.vcxproj
# CREATING TRAIL DATABASES´
echo -e "$INFO creating databases for trail"
# CREATING TRAIL DATABASES´
echo -e "$INFO creating databases"
rm bin/app/data/projects/tictactoe/tictactoe.coatidb
rm bin/app/data/projects/tutorial/tutorial.coatidb
@@ -91,37 +85,23 @@ cd ..
rm -rf temp
# OBFUSCATING THE EXECUTABLES
# OBFUSCATING THE EXECUTABLE
if [ $OBFUSCATE = true ]; then
echo -e "$INFO obfuscating the executables"
rm bin/app/Release/Coati_obfuscated.exe
rm bin/app/Release/Coati_trial_obfuscated.exe
upx --brute -o bin/app/Release/Coati_obfuscated.exe bin/app/Release/Coati.exe
upx --brute -o bin/app/Release/Coati_trial_obfuscated.exe bin/app/Release/Coati_trial.exe
else
cp bin/app/Release/Coati.exe bin/app/Release/Coati_obfuscated.exe
cp bin/app/Release/Coati_trial.exe bin/app/Release/Coati_trial_obfuscated.exe
fi
# BUILDING THE INSTALLERS
echo -e "$INFO building the installer (app)"
"D:/programme/Microsoft Visual Studio14/Common7/IDE/devenv.com" deployment/windows/CoatiAppSetup/CoatiAppSetup.sln //build Release //project deployment/windows/CoatiAppSetup/CoatiSetup/CoatiSetup.vdproj
echo -e "$INFO building the installer (trail)"
"D:/programme/Microsoft Visual Studio14/Common7/IDE/devenv.com" deployment/windows/CoatiTrialSetup/CoatiTrialSetup.sln //build Release //project deployment/windows/CoatiTrialSetup/CoatiSetup/CoatiSetup.vdproj
# BUILDING THE INSTALLER
cd deployment/windows/wixSetup
build.bat
cd ../../..
# BUILDING WIX INSTALLERS
# call deployment/windows/wixSetup/build.bat
# EDIT THE INSTALLERS
"C:/Program Files (x86)/Microsoft SDKs/Windows/v7.1A/Bin/MsiTran.Exe" -a "deployment/windows/transform.mst" "deployment/windows/CoatiAppSetup/CoatiSetup/Release/Coati.msi"
"C:/Program Files (x86)/Microsoft SDKs/Windows/v7.1A/Bin/MsiTran.Exe" -a "deployment/windows/transform.mst" "deployment/windows/CoatiTrialSetup/CoatiSetup/Release/CoatiTrial.msi"
# CREATING PACKAGE FOLDERS (APP)
# CREATING PACKAGE FOLDER
VERSION_STRING=$(git describe --long)
VERSION_STRING="${VERSION_STRING//-/_}"
VERSION_STRING="${VERSION_STRING//./_}"
@@ -131,12 +111,12 @@ APP_PACKAGE_NAME=Coati_${VERSION_STRING}
APP_PACKAGE_DIR=release/$APP_PACKAGE_NAME
echo -e "$INFO creating package folders for app"
echo -e "$INFO creating package folder"
rm -rf $APP_PACKAGE_DIR
mkdir -p $APP_PACKAGE_DIR
cp -u -r deployment/windows/CoatiAppSetup/CoatiSetup/Release/Coati.msi $APP_PACKAGE_DIR/
cp -u -r deployment/windows/CoatiAppSetup/CoatiSetup/Release/setup.exe $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/
mkdir -p $APP_PACKAGE_DIR/plugins/atom/
cp -u -r ide_plugins/atom/* $APP_PACKAGE_DIR/plugins/atom/
@@ -154,58 +134,18 @@ mkdir -p $APP_PACKAGE_DIR/plugins/visual_studio/
cp -u -r ide_plugins/vs/coati_plugin_vs.vsix $APP_PACKAGE_DIR/plugins/visual_studio/
# PACKAGING COATI (APP)
echo -e "$INFO packaging coati app"
# PACKAGING COATI
echo -e "$INFO packaging coati"
cd ./release/
winrar a -afzip ${APP_PACKAGE_NAME}_Windows.zip $APP_PACKAGE_NAME
cd ../
# CLEANING UP (APP)
echo -e "$INFO Cleaning up app"
# CLEANING UP
echo -e "$INFO Cleaning"
rm -rf $APP_PACKAGE_DIR
# CREATING PACKAGE FOLDERS (TRIAL)
TRIAL_PACKAGE_NAME=Coati_Trial_${VERSION_STRING}
TRIAL_PACKAGE_DIR=release/$TRIAL_PACKAGE_NAME
echo -e "$INFO creating package folders for trail"
rm -rf $TRIAL_PACKAGE_DIR
mkdir -p $TRIAL_PACKAGE_DIR
cp -u -r deployment/windows/CoatiTrialSetup/CoatiSetup/Release/CoatiTrial.msi $TRIAL_PACKAGE_DIR/
cp -u -r deployment/windows/CoatiTrialSetup/CoatiSetup/Release/setup.exe $TRIAL_PACKAGE_DIR/
mkdir -p $TRIAL_PACKAGE_DIR/plugins/atom/
cp -u -r ide_plugins/atom/* $TRIAL_PACKAGE_DIR/plugins/atom/
mkdir -p $TRIAL_PACKAGE_DIR/plugins/eclipse/
cp -u -r ide_plugins/eclipse/* $TRIAL_PACKAGE_DIR/plugins/eclipse/
mkdir -p $TRIAL_PACKAGE_DIR/plugins/emacs/
cp -u -r ide_plugins/emacs/* $TRIAL_PACKAGE_DIR/plugins/emacs/
mkdir -p $TRIAL_PACKAGE_DIR/plugins/idea/
cp -u -r ide_plugins/idea/* $TRIAL_PACKAGE_DIR/plugins/idea/
mkdir -p $TRIAL_PACKAGE_DIR/plugins/sublime_text/
cp -u -r ide_plugins/sublime_text/* $TRIAL_PACKAGE_DIR/plugins/sublime_text/
mkdir -p $TRIAL_PACKAGE_DIR/plugins/vim/
cp -u -r ide_plugins/vim/* $TRIAL_PACKAGE_DIR/plugins/vim/
mkdir -p $TRIAL_PACKAGE_DIR/plugins/visual_studio/
cp -u -r ide_plugins/vs/coati_plugin_vs.vsix $TRIAL_PACKAGE_DIR/plugins/visual_studio/
# PACKAGING COATI (TRIAL)
echo -e "$INFO packaging coati trail"
cd ./release/
winrar a -afzip ${TRIAL_PACKAGE_NAME}_Windows.zip $TRIAL_PACKAGE_NAME
cd ../
# CLEANING UP (TRIAL)
echo -e "$INFO Cleaning up trail"
rm -rf $TRIAL_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