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

build: deploy changes

Browse Source 
* moved sample projects from data to user folder
* added fallback files for app and window settings
* implemented copying app and window settings to user folder when not found on app startup
* fixed upgrading for windows installer
This commit is contained in:
malte_langkabel
2016-12-14 13:33:17 +01:00
parent 68a2cb08bc
commit 5482e56e82
191 changed files with 279 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/LinuxPackage.cmake
+13 -20
View File
@@ -48,22 +48,14 @@ function(AddSharedToComponent componentName)
DESTINATION Coati
COMPONENT ${componentName}
PATTERN "log/*" EXCLUDE
PATTERN "data/projects"
PATTERN "data/src" EXCLUDE
PATTERN "data/gui/installer" EXCLUDE
PATTERN "projects" EXCLUDE
PATTERN "data/install" EXCLUDE
PATTERN "ApplicationSettings.xml" EXCLUDE
PATTERN "ApplicationSettings_for_package.xml" EXCLUDE
PATTERN "ProjectSettings_template.xml" EXCLUDE
PATTERN "ApplicationSettings_template.xml" EXCLUDE
)
INSTALL(FILES ${CMAKE_SOURCE_DIR}/bin/app/user/ApplicationSettings_for_package.xml
DESTINATION Coati/user
COMPONENT ${componentName}
RENAME ApplicationSettings.xml
)
INSTALL(FILES
${CMAKE_SOURCE_DIR}/bin/app/data/gui/installer/EULA.txt
COMPONENT ${componentName}
@@ -111,6 +103,18 @@ function(AddSharedToComponent componentName)
COMPONENT ${componentName}
)
INSTALL(FILES
${CMAKE_SOURCE_DIR}/bin/app/data/fallback/ApplicationSettings.xml
COMPONENT ${componentName}
DESTINATION Coati/user
)
INSTALL(FILES
${CMAKE_SOURCE_DIR}/bin/app/data/fallback/window_settings.ini
COMPONENT ${componentName}
DESTINATION Coati/user
)
INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/bin/app/user
DESTINATION Coati
COMPONENT ${componentName}
@@ -121,11 +125,6 @@ function(AddSharedToComponent componentName)
PATTERN "window_settings_for_package.ini" EXCLUDE
)
INSTALL(FILES ${CMAKE_SOURCE_DIR}/bin/app/user/window_settings_for_package.ini
DESTINATION Coati/user
COMPONENT ${componentName}
RENAME window_settings.ini
)
endfunction(AddSharedToComponent)
# Add shared files to full and trial version
@@ -138,12 +137,6 @@ INSTALL(DIRECTORY
PATTERN "vs" EXCLUDE
)
INSTALL(DIRECTORY
${CMAKE_SOURCE_DIR}/bin/app/data/projects
DESTINATION Coati/user
COMPONENT FULL
)
INSTALL(FILES
${CMAKE_SOURCE_DIR}/setup/Linux/coati.desktop
${CMAKE_SOURCE_DIR}/setup/Linux/coati-mime.xml
cmake/pre_install_linux.cmake
+5 -5
View File
@@ -19,16 +19,16 @@ endfunction()
)
execute_process(
COMMAND ${upxPath}/Coati -f -d ${upxPath}/../data/projects/tictactoe/tictactoe.coatiproject
COMMAND ${upxPath}/Coati -f -d ${upxPath}/../user/projects/tictactoe/tictactoe.coatiproject
)
execute_process(
COMMAND ${upxPath}/Coati -f -d ${upxPath}/../data/projects/tutorial/tutorial.coatiproject
COMMAND ${upxPath}/Coati -f -d ${upxPath}/../user/projects/tutorial/tutorial.coatiproject
)
#execute_process(
#COMMAND ${upxPath}/Coati -f -d ${upxPath}/../data/projects/javaparser/javaparser.coatiproject
#)
execute_process(
COMMAND ${upxPath}/Coati -f -d ${upxPath}/../user/projects/javaparser/javaparser.coatiproject
)
SET (NO_UPX 1)
if (NO_UPX)