diff --git a/launchers/darwin/cmake/macros/SetPackagingParameters.cmake b/launchers/darwin/cmake/macros/SetPackagingParameters.cmake index f66f34678f..ed24b3bd6b 100644 --- a/launchers/darwin/cmake/macros/SetPackagingParameters.cmake +++ b/launchers/darwin/cmake/macros/SetPackagingParameters.cmake @@ -15,10 +15,7 @@ macro(SET_PACKAGING_PARAMETERS) set(PR_BUILD 0) set(PRODUCTION_BUILD 0) set(DEV_BUILD 0) - set(BUILD_GLOBAL_SERVICES "DEVELOPMENT") - set(USE_STABLE_GLOBAL_SERVICES 0) set(BUILD_NUMBER 0) - set(APP_USER_MODEL_ID "com.highfidelity.console-dev") set_from_env(RELEASE_TYPE RELEASE_TYPE "DEV") set_from_env(RELEASE_NUMBER RELEASE_NUMBER "") @@ -28,36 +25,21 @@ macro(SET_PACKAGING_PARAMETERS) set(BUILD_NUMBER ${RELEASE_NUMBER}) if (RELEASE_TYPE STREQUAL "PRODUCTION") - set(DEPLOY_PACKAGE TRUE) set(PRODUCTION_BUILD 1) set(BUILD_VERSION ${RELEASE_NUMBER}) - set(BUILD_ORGANIZATION "High Fidelity") # add definition for this release type add_definitions(-DPRODUCTION_BUILD) elseif (RELEASE_TYPE STREQUAL "PR") - set(DEPLOY_PACKAGE TRUE) set(PR_BUILD 1) set(BUILD_VERSION "PR${RELEASE_NUMBER}") - set(BUILD_ORGANIZATION "High Fidelity - PR${RELEASE_NUMBER}") # add definition for this release type add_definitions(-DPR_BUILD) else () set(DEV_BUILD 1) set(BUILD_VERSION "dev") - set(BUILD_ORGANIZATION "High Fidelity - ${BUILD_VERSION}") - - # add definition for this release type - add_definitions(-DDEV_BUILD) endif () - - - # create a header file our targets can use to find out the application version - #file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/includes") - #configure_file("${HF_CMAKE_DIR}/templates/BuildInfo.h.in" "${CMAKE_BINARY_DIR}/includes/BuildInfo.h") - #include_directories("${CMAKE_BINARY_DIR}/includes") - endmacro(SET_PACKAGING_PARAMETERS) diff --git a/launchers/darwin/nib/DisplayNameScreen.xib b/launchers/darwin/nib/DisplayNameScreen.xib index 1115d2c55e..9862c3773b 100644 --- a/launchers/darwin/nib/DisplayNameScreen.xib +++ b/launchers/darwin/nib/DisplayNameScreen.xib @@ -103,10 +103,10 @@ - + - - + + diff --git a/launchers/darwin/nib/ErrorScreen.xib b/launchers/darwin/nib/ErrorScreen.xib index 8a55039034..267c9b2f29 100644 --- a/launchers/darwin/nib/ErrorScreen.xib +++ b/launchers/darwin/nib/ErrorScreen.xib @@ -70,10 +70,10 @@ - + - - + + diff --git a/launchers/darwin/nib/LoginScreen.xib b/launchers/darwin/nib/LoginScreen.xib index 60bf69cd61..3ae91632c2 100644 --- a/launchers/darwin/nib/LoginScreen.xib +++ b/launchers/darwin/nib/LoginScreen.xib @@ -120,10 +120,10 @@ - + - - + + diff --git a/launchers/darwin/nib/ProcessScreen.xib b/launchers/darwin/nib/ProcessScreen.xib index 6413d523b8..c32abb5f9d 100644 --- a/launchers/darwin/nib/ProcessScreen.xib +++ b/launchers/darwin/nib/ProcessScreen.xib @@ -54,10 +54,10 @@ - + - - + + diff --git a/launchers/darwin/nib/SplashScreen.xib b/launchers/darwin/nib/SplashScreen.xib index 2fdc19ad69..988de78399 100644 --- a/launchers/darwin/nib/SplashScreen.xib +++ b/launchers/darwin/nib/SplashScreen.xib @@ -27,9 +27,9 @@ - + - +