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

repairs to path finding and naming on OS X

Browse source
This commit is contained in:
Stephen Birarda 2016-01-20 10:25:44 -08:00
parent d1421137e5
commit 57639672cf
3 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cmake/macros/SetPackagingParameters.cmake
View file

@ -43,8 +43,11 @@ macro(SET_PACKAGING_PARAMETERS)
endif () endif ()
if (APPLE) if (APPLE)
set(DMG_SUBFOLDER_NAME "High Fidelity") set(DMG_SUBFOLDER_NAME "${BUILD_ORGANIZATION}")
set(ESCAPED_DMG_SUBFOLDER_NAME "High\\ Fidelity")
set(ESCAPED_DMG_SUBFOLDER_NAME "")
string(REPLACE " " "\\ " ESCAPED_DMG_SUBFOLDER_NAME ${DMG_SUBFOLDER_NAME})
set(DMG_SUBFOLDER_ICON "${HF_CMAKE_DIR}/installer/install-folder.rsrc") set(DMG_SUBFOLDER_ICON "${HF_CMAKE_DIR}/installer/install-folder.rsrc")
set(CONSOLE_INSTALL_DIR ${DMG_SUBFOLDER_NAME}) set(CONSOLE_INSTALL_DIR ${DMG_SUBFOLDER_NAME})

6
server-console/src/main.js
View file

@ -184,9 +184,9 @@ var debug = argv.debug;
var binaryType = argv.binaryType; var binaryType = argv.binaryType;
interfacePath = pathFinder.discoveredPath("Interface", binaryType); interfacePath = pathFinder.discoveredPath("Interface", binaryType, buildInfo.releaseType);
dsPath = pathFinder.discoveredPath("domain-server", binaryType); dsPath = pathFinder.discoveredPath("domain-server", binaryType, buildInfo.releaseType);
acPath = pathFinder.discoveredPath("assignment-client", binaryType); acPath = pathFinder.discoveredPath("assignment-client", binaryType, buildInfo.releaseType);
function binaryMissingMessage(displayName, executableName, required) { function binaryMissingMessage(displayName, executableName, required) {
var message = "The " + displayName + " executable was not found.\n"; var message = "The " + displayName + " executable was not found.\n";

20
server-console/src/modules/path-finder.js
View file

@ -1,9 +1,9 @@
var fs = require('fs'); var fs = require('fs');
var path = require('path'); var path = require('path');
exports.searchPaths = function(name, binaryType) { exports.searchPaths = function(name, binaryType, releaseType) {
function platformExtension(name) { function platformExtension(name) {
if (name == "Interface") { if (name == "Interface" || name == "High Fidelity") {
if (process.platform == "darwin") { if (process.platform == "darwin") {
return ".app/Contents/MacOS/" + name return ".app/Contents/MacOS/" + name
} else if (process.platform == "win32") { } else if (process.platform == "win32") {
@ -21,7 +21,7 @@ exports.searchPaths = function(name, binaryType) {
var paths = []; var paths = [];
if (binaryType == "local-release" || binaryType == "local-debug") { if (!releaseType) {
// check in the developer build tree for binaries // check in the developer build tree for binaries
paths = [ paths = [
devBasePath + name + extension, devBasePath + name + extension,
@ -35,11 +35,6 @@ exports.searchPaths = function(name, binaryType) {
// assume we're inside an app bundle on OS X // assume we're inside an app bundle on OS X
if (process.platform == "darwin") { if (process.platform == "darwin") {
// this is a production build - on OS X Interface will be called High Fidelity
if (name == "Interface") {
name = "High Fidelity";
}
var contentPath = ".app/Contents/"; var contentPath = ".app/Contents/";
var contentEndIndex = __dirname.indexOf(contentPath); var contentEndIndex = __dirname.indexOf(contentPath);
@ -60,7 +55,7 @@ exports.searchPaths = function(name, binaryType) {
return paths; return paths;
} }
exports.discoveredPath = function (name, binaryType) { exports.discoveredPath = function (name, binaryType, releaseType) {
function binaryFromPaths(name, paths) { function binaryFromPaths(name, paths) {
for (var i = 0; i < paths.length; i++) { for (var i = 0; i < paths.length; i++) {
var testPath = paths[i]; var testPath = paths[i];
@ -80,6 +75,11 @@ exports.discoveredPath = function (name, binaryType) {
return null; return null;
} }
// for a released server console on OS X, assume the name of the interface executable is "High Fidelity"
if (releaseType && name == "Interface") {
name = "High Fidelity";
}
// attempt to find a binary at the usual paths, return null if it doesn't exist // attempt to find a binary at the usual paths, return null if it doesn't exist
return binaryFromPaths(name, this.searchPaths(name, binaryType)); return binaryFromPaths(name, this.searchPaths(name, binaryType, releaseType));
} }