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

build: offer windows 64 bit build (issue #300)

Browse Source 
* update to clang/llvm to 3.9
* update to qt 5.8
* fixed windows javapathdetector for 64 bit java.
* added LibGui as dependency to tests
* fixed legacy Java 6 install necessary on MacOS
* fixed setting of user path for 64 bit build
* added missing pngs to windows installer
* renamed graph zoom button images
* reverted moving of setupLogging call to fix crash on deployed exe

fortune cookie message = An old acquaintance will enter your life.
This commit is contained in:
malte_langkabel
2017-02-03 14:31:43 +01:00
parent 8c0f9f2de4
commit 7f2db69995
250 changed files with 1173 additions and 1075 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/pre_install_linux.cmake
+4 -21
View File
@@ -12,38 +12,21 @@ function(Run)
endfunction()
# upx
set(upxPath ${CMAKE_CURRENT_LIST_DIR}/../bin/app/Release)
set(upxPath ${CMAKE_CURRENT_LIST_DIR}/../build/Release/app)
execute_process(
COMMAND ${upxPath}/Coati -z ${CMAKE_CURRENT_LIST_DIR}/../setup/license.txt
)
execute_process(
COMMAND ${upxPath}/Coati -f -d ${upxPath}/../user/projects/tictactoe/tictactoe.coatiproject
COMMAND ${upxPath}/Coati -f -d ${CMAKE_CURRENT_LIST_DIR}/../bin/app/user/projects/tictactoe/tictactoe.coatiproject
)
execute_process(
COMMAND ${upxPath}/Coati -f -d ${upxPath}/../user/projects/tutorial/tutorial.coatiproject
COMMAND ${upxPath}/Coati -f -d ${CMAKE_CURRENT_LIST_DIR}/../bin/app/user/projects/tutorial/tutorial.coatiproject
)
execute_process(
COMMAND ${upxPath}/Coati -f -d ${upxPath}/../user/projects/javaparser/javaparser.coatiproject
)
SET (NO_UPX 1)
if (NO_UPX)
execute_process(
COMMAND echo "UPX"
COMMAND ${upxPath}/Coati -f -d ${CMAKE_CURRENT_LIST_DIR}/../bin/app/user/projects/javaparser/javaparser.coatiproject
)
execute_process(
COMMAND rm ${upxPath}/Coati_upx
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${upxPath}/Coati ${upxPath}/Coati_upx
)
else()
Print("Remove old Coati_upx")
Run(rm ${upxPath}/Coati_upx)
Print("upx Coati")
Run(upx --brute ${upxPath}/Coati -o ${upxPath}/Coati_upx)
endif()