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

default to beta/dev build for server console

Browse source
This commit is contained in:
Stephen Birarda 2016-01-05 17:21:30 -08:00
parent 6eb96c27e5
commit 386d3a950f
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
console/CMakeLists.txt
View file

@ -1,12 +1,12 @@
set(TARGET_NAME package-console)
if (BUILD_TAGGED_BETA)
set(BETA_OPTION "--beta")
if (PRODUCTION_BUILD)
set(PRODUCTION_OPTION "--production")
endif()
# add a target that will package the console
add_custom_target(${TARGET_NAME} ALL
COMMAND npm run packager -- --out ${CMAKE_CURRENT_BINARY_DIR} ${BETA_OPTION}
COMMAND npm run packager -- --out ${CMAKE_CURRENT_BINARY_DIR} ${PRODUCTION_OPTION}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
)
@ -22,7 +22,11 @@ elseif (UNIX)
set(PACKAGED_CONSOLE_FOLDER "server-console-linux-x64")
endif ()
# install the packaged Server Console
install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/${PACKAGED_CONSOLE_FOLDER}/Server Console.app" DESTINATION bin COMPONENT ${SERVER_COMPONENT})
# install the packaged Server Console
install(
PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/${PACKAGED_CONSOLE_FOLDER}/Server Console.app"
DESTINATION "Applications/High Fidelity"
COMPONENT ${SERVER_COMPONENT}
)
consolidate_installer_components()

3
console/packager.js
View file

@ -11,7 +11,7 @@ if (osType == "Darwin" || osType == "Linux") {
var argv = require('yargs').argv;
// check which icon we should use, beta or regular
var iconName = argv.beta ? "console-beta" : "console"
var iconName = argv.production ? "console" : "console-beta";
// setup the common options for the packager
var options = {
@ -32,6 +32,7 @@ const FULL_NAME = "High Fidelity Server Console";
// setup per OS options
if (osType == "Darwin") {
options["app-bundle-id"] = "com.highfidelity.server-console" + (argv.production ? "" : "-dev")
options["name"] = SHORT_NAME
} else if (osType == "Windows_NT") {
options["version-string"] = {