Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 12:54:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

add console handling to installer component consolidation

Browse source
This commit is contained in:
Stephen Birarda 2016-01-04 10:47:25 -08:00
parent b3e46d1ed8
commit 90cf69b9b5
4 changed files with 25 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
cmake/macros/ConsolidateInstallerComponents.cmake
View file

@ -1,21 +1,24 @@
macro(CONSOLIDATE_INSTALLER_COMPONENTS) macro(CONSOLIDATE_INSTALLER_COMPONENTS)
if (DEFINED DEPLOY_PACKAGE AND DEPLOY_PACKAGE AND WIN32) if (DEPLOY_PACKAGE AND WIN32)
# Copy icon files for interface and stack manager # Copy icon files for interface and stack manager
if (TARGET_NAME STREQUAL "interface" OR TARGET_NAME STREQUAL "package-console") if (TARGET_NAME STREQUAL "interface")
if (TARGET_NAME STREQUAL "interface") set (ICON_FILE_PATH "${PROJECT_SOURCE_DIR}/icon/${INTERFACE_ICON}")
set (ICON_FILE_PATH "${PROJECT_SOURCE_DIR}/icon/${INTERFACE_ICON}") set (ICON_DESTINATION_NAME "interface.ico")
set (ICON_DESTINATION_NAME "interface.ico")
else ()
set (ICON_FILE_PATH "${PROJECT_SOURCE_DIR}/assets/${STACK_MANAGER_ICON}")
set (ICON_DESTINATION_NAME "stack-manager.ico")
endif ()
add_custom_command( add_custom_command(
TARGET ${TARGET_NAME} POST_BUILD TARGET ${TARGET_NAME} POST_BUILD
COMMAND "${CMAKE_COMMAND}" -E copy ${ICON_FILE_PATH} ${CMAKE_BINARY_DIR}/package-bundle/${ICON_DESTINATION_NAME} COMMAND "${CMAKE_COMMAND}" -E copy ${ICON_FILE_PATH} ${CMAKE_BINARY_DIR}/package-bundle/${ICON_DESTINATION_NAME}
COMMAND "${CMAKE_COMMAND}" -E copy_directory $<TARGET_FILE_DIR:${TARGET_NAME}> ${CMAKE_BINARY_DIR}/package-bundle COMMAND "${CMAKE_COMMAND}" -E copy_directory $<TARGET_FILE_DIR:${TARGET_NAME}> ${CMAKE_BINARY_DIR}/package-bundle
) )
elseif (TARGET_NAME STREQUAL "package-console")
# add a command to copy the folder produced by electron-packager to package-bundle
add_custom_command(
TARGET ${TARGET_NAME} POST_BUILD
COMMAND "${CMAKE_COMMAND}" -E copy_directory ${CMAKE_CURRENT_BINARY_DIR}/High\ Fidelity-* ${CMAKE_BINARY_DIR}/package-bundle
)
else () else ()
# add a command to copy the fixed up binary and libraries to package-bundle
add_custom_command( add_custom_command(
TARGET ${TARGET_NAME} POST_BUILD TARGET ${TARGET_NAME} POST_BUILD
COMMAND "${CMAKE_COMMAND}" -E copy_directory $<TARGET_FILE_DIR:${TARGET_NAME}> ${CMAKE_BINARY_DIR}/package-bundle COMMAND "${CMAKE_COMMAND}" -E copy_directory $<TARGET_FILE_DIR:${TARGET_NAME}> ${CMAKE_BINARY_DIR}/package-bundle

8
cmake/macros/GenerateInstallers.cmake
View file

@ -1,4 +1,4 @@
# #
# GenerateInstallers.cmake # GenerateInstallers.cmake
# cmake/macros # cmake/macros
# #
@ -7,10 +7,10 @@
# #
# Distributed under the Apache License, Version 2.0. # Distributed under the Apache License, Version 2.0.
# See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html # See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
# #
macro(GENERATE_INSTALLERS) macro(GENERATE_INSTALLERS)
if (DEFINED DEPLOY_PACKAGE AND DEPLOY_PACKAGE AND WIN32) if (DEPLOY_PACKAGE AND WIN32)
file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/package-bundle") file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/package-bundle")
find_program(MAKENSIS_COMMAND makensis PATHS [HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\NSIS]) find_program(MAKENSIS_COMMAND makensis PATHS [HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\NSIS])
if (NOT MAKENSIS_COMMAND) if (NOT MAKENSIS_COMMAND)
@ -27,4 +27,4 @@ macro(GENERATE_INSTALLERS)
COMMAND CMD /C "\"${MAKENSIS_COMMAND}\" ${CMAKE_SOURCE_DIR}/tools/nsis/release.nsi" COMMAND CMD /C "\"${MAKENSIS_COMMAND}\" ${CMAKE_SOURCE_DIR}/tools/nsis/release.nsi"
) )
endif () endif ()
endmacro() endmacro()

9
console/CMakeLists.txt
View file

@ -1,4 +1,4 @@
set(PACKAGING_TARGET_NAME package-console) set(TARGET_NAME package-console)
# add a target that when built will produce an executable of console for this platform # add a target that when built will produce an executable of console for this platform
if (APPLE) if (APPLE)
@ -9,7 +9,10 @@ elseif (UNIX)
set(PACKAGE_COMMAND package-linux) set(PACKAGE_COMMAND package-linux)
endif () endif ()
add_custom_target(${PACKAGING_TARGET_NAME} # add a target that will package the console
COMMAND npm run-script ${PACKAGE_COMMAND} add_custom_target(${TARGET_NAME}
COMMAND npm run-script ${PACKAGE_COMMAND} -- --out ${CMAKE_CURRENT_BINARY_DIR}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
) )
consolidate_installer_components()

6
console/package.json
View file

@ -20,9 +20,9 @@
"scripts": { "scripts": {
"start": "electron . --local-debug-builds --debug", "start": "electron . --local-debug-builds --debug",
"local-release": "electron . --local-release-builds --debug", "local-release": "electron . --local-release-builds --debug",
"package-darwin": "electron-packager . High\\ Fidelity --overwrite --platform=darwin --arch=x64 --version=0.35.4 --icon=resources/console.icns", "package-darwin": "electron-packager . High\\ Fidelity --overwrite --prune --platform=darwin --arch=x64 --version=0.35.4 --icon=resources/console.icns",
"package-win": "electron-packager . High\\ Fidelity --overwrite --platform=win32 --arch=x64 --version=0.35.4 --icon=resources/console.ico", "package-win": "electron-packager . High\\ Fidelity --overwrite --prune --platform=win32 --arch=x64 --version=0.35.4 --icon=resources/console.ico",
"package-linux": "electron-packager . High\\ Fidelity --overwrite --platform=linux --arch=x64 --version=0.35.4" "package-linux": "electron-packager . High\\ Fidelity --overwrite --prune --platform=linux --arch=x64 --version=0.35.4"
}, },
"dependencies": { "dependencies": {
"extend": "^3.0.0", "extend": "^3.0.0",