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

handle beta icon usage while packaging console

Browse source
This commit is contained in:
Stephen Birarda 2016-01-05 10:27:46 -08:00
parent 3f3ded09df
commit 5832884b58
4 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cmake/macros/SetPackagingParameters.cmake
View file

@ -16,6 +16,7 @@ macro(SET_PACKAGING_PARAMETERS)
if (DEFINED ENV{JOB_ID}) if (DEFINED ENV{JOB_ID})
set(DEPLOY_PACKAGE 1) set(DEPLOY_PACKAGE 1)
set(BUILD_SEQ $ENV{JOB_ID}) set(BUILD_SEQ $ENV{JOB_ID})
set(BUILD_TAGGED_BETA FALSE)
set(INSTALLER_COMPANY "High Fidelity") set(INSTALLER_COMPANY "High Fidelity")
set(INSTALLER_DIRECTORY "${INSTALLER_COMPANY}") set(INSTALLER_DIRECTORY "${INSTALLER_COMPANY}")
set(INSTALLER_NAME "interface-win64-${BUILD_SEQ}.exe") set(INSTALLER_NAME "interface-win64-${BUILD_SEQ}.exe")
@ -23,19 +24,21 @@ macro(SET_PACKAGING_PARAMETERS)
set(CONSOLE_ICON "console.ico") set(CONSOLE_ICON "console.ico")
elseif (DEFINED ENV{ghprbPullId}) elseif (DEFINED ENV{ghprbPullId})
set(DEPLOY_PACKAGE 1) set(DEPLOY_PACKAGE 1)
set(BUILD_TAGGED_BETA TRUE)
set(BUILD_SEQ "PR-$ENV{ghprbPullId}") set(BUILD_SEQ "PR-$ENV{ghprbPullId}")
set(INSTALLER_COMPANY "High Fidelity - PR") set(INSTALLER_COMPANY "High Fidelity - PR")
set(INSTALLER_DIRECTORY "${INSTALLER_COMPANY}\\${BUILD_SEQ}") set(INSTALLER_DIRECTORY "${INSTALLER_COMPANY}\\${BUILD_SEQ}")
set(INSTALLER_NAME "pr-interface-win64-${BUILD_SEQ}.exe") set(INSTALLER_NAME "pr-interface-win64-${BUILD_SEQ}.exe")
set(INTERFACE_ICON "interface-beta.ico") set(INTERFACE_ICON "interface-beta.ico")
set(CONSOLE_ICON "console.ico") set(CONSOLE_ICON "console-beta.ico")
else () else ()
set(BUILD_SEQ "dev") set(BUILD_SEQ "dev")
set(BUILD_TAGGED_BETA TRUE)
set(INSTALLER_COMPANY "High Fidelity - Dev") set(INSTALLER_COMPANY "High Fidelity - Dev")
set(INSTALLER_DIRECTORY "${INSTALLER_COMPANY}") set(INSTALLER_DIRECTORY "${INSTALLER_COMPANY}")
set(INSTALLER_NAME "dev-interface-win64.exe") set(INSTALLER_NAME "dev-interface-win64.exe")
set(INTERFACE_ICON "interface-beta.ico") set(INTERFACE_ICON "interface-beta.ico")
set(CONSOLE_ICON "console.ico") set(CONSOLE_ICON "console-beta.ico")
endif () endif ()
# create a header file our targets can use to find out the application version # create a header file our targets can use to find out the application version

6
console/CMakeLists.txt
View file

@ -1,8 +1,12 @@
set(TARGET_NAME package-console) set(TARGET_NAME package-console)
if (BUILD_TAGGED_BETA)
set(BETA_OPTION "--beta")
endif()
# add a target that will package the console # add a target that will package the console
add_custom_target(${TARGET_NAME} add_custom_target(${TARGET_NAME}
COMMAND npm run packager -- --out ${CMAKE_CURRENT_BINARY_DIR} COMMAND npm run packager -- --out ${CMAKE_CURRENT_BINARY_DIR} ${BETA_OPTION}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
) )

8
console/packager.js
View file

@ -8,6 +8,11 @@ if (osType == "Darwin" || osType == "Linux") {
platform = "win32" platform = "win32"
} }
var argv = require('yargs').argv;
// check which icon we should use, beta or regular
var iconName = argv.beta ? "console-beta" : "console"
// setup the common options for the packager // setup the common options for the packager
var options = { var options = {
dir: __dirname, dir: __dirname,
@ -17,7 +22,7 @@ var options = {
prune: true, prune: true,
arch: "x64", arch: "x64",
platform: platform, platform: platform,
icon: "resources/console" icon: "resources/" + iconName
} }
const EXEC_NAME = "server-console"; const EXEC_NAME = "server-console";
@ -37,7 +42,6 @@ if (osType == "Darwin") {
} }
// check if we were passed a custom out directory, pass it along if so // check if we were passed a custom out directory, pass it along if so
var argv = require('yargs').argv;
if (argv.out) { if (argv.out) {
options.out = argv.out options.out = argv.out
} }

1
console/src/main.js
View file

@ -25,7 +25,6 @@ var path = require('path');
const TRAY_FILENAME = (osType == "Darwin" ? "console-tray-Template.png" : "console-tray.png"); const TRAY_FILENAME = (osType == "Darwin" ? "console-tray-Template.png" : "console-tray.png");
const TRAY_ICON = path.join(__dirname, '../resources/' + TRAY_FILENAME); const TRAY_ICON = path.join(__dirname, '../resources/' + TRAY_FILENAME);
const APP_ICON = path.join(__dirname, '../resources/console.png');
// print out uncaught exceptions in the console // print out uncaught exceptions in the console
process.on('uncaughtException', console.log.bind(console)); process.on('uncaughtException', console.log.bind(console));