From 1eae39b78cbdf30dc2d4828557674f3697b7e430 Mon Sep 17 00:00:00 2001 From: dante ruiz Date: Fri, 19 Jul 2019 18:07:55 -0700 Subject: [PATCH 1/4] starting cleanup work --- launchers/darwin/CMakeLists.txt | 18 +++--- .../cmake/macros/SetPackagingParameters.cmake | 63 +++++++++++++++++++ launchers/darwin/src/Launcher.h | 4 ++ launchers/darwin/src/Launcher.m | 12 ++++ launchers/darwin/src/LauncherParams.h | 8 +++ 5 files changed, 98 insertions(+), 7 deletions(-) create mode 100644 launchers/darwin/cmake/macros/SetPackagingParameters.cmake create mode 100644 launchers/darwin/src/LauncherParams.h diff --git a/launchers/darwin/CMakeLists.txt b/launchers/darwin/CMakeLists.txt index 0a7ef70461..ae451ee73d 100644 --- a/launchers/darwin/CMakeLists.txt +++ b/launchers/darwin/CMakeLists.txt @@ -1,7 +1,8 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.2) set(ENV{MACOSX_DEPLOYMENT_TARGET} 10.9) project(HQLauncher) set (CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/") +include("cmake/macros/SetPackagingParameters.cmake") set(src_files src/Launcher.h src/Launcher.m @@ -38,6 +39,7 @@ set(src_files src/LaunchInterface.h src/CustomUI.h src/CustomUI.m + src/LauncherParams.h src/main.mm nib/Window.xib nib/SplashScreen.xib @@ -59,15 +61,17 @@ set_target_properties(${this_target} PROPERTIES set(MACOSX_BUNDLE_ICON_FILE "interface.icns") function(set_from_env _RESULT_NAME _ENV_VAR_NAME _DEFAULT_VALUE) - if (NOT DEFINED ${_RESULT_NAME}) - if ("$ENV{${_ENV_VAR_NAME}}" STREQUAL "") - set (${_RESULT_NAME} ${_DEFAULT_VALUE} PARENT_SCOPE) - else() - set (${_RESULT_NAME} $ENV{${_ENV_VAR_NAME}} PARENT_SCOPE) - endif() + if (NOT DEFINED ${_RESULT_NAME}) + if ("$ENV{${_ENV_VAR_NAME}}" STREQUAL "") + set (${_RESULT_NAME} ${_DEFAULT_VALUE} PARENT_SCOPE) + else() + set (${_RESULT_NAME} $ENV{${_ENV_VAR_NAME}} PARENT_SCOPE) endif() + endif() endfunction() + set_packaging_parameters() + add_executable(${PROJECT_NAME} MACOSX_BUNDLE ${src_files}) set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME ${APP_NAME} MACOSX_BUNDLE_BUNDLE_NAME ${APP_NAME}) diff --git a/launchers/darwin/cmake/macros/SetPackagingParameters.cmake b/launchers/darwin/cmake/macros/SetPackagingParameters.cmake new file mode 100644 index 0000000000..f66f34678f --- /dev/null +++ b/launchers/darwin/cmake/macros/SetPackagingParameters.cmake @@ -0,0 +1,63 @@ +# +# SetPackagingParameters.cmake +# cmake/macros +# +# Created by Leonardo Murillo on 07/14/2015. +# Copyright 2015 High Fidelity, Inc. +# +# Distributed under the Apache License, Version 2.0. +# See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html + +# This macro checks some Jenkins defined environment variables to determine the origin of this build +# and decides how targets should be packaged. + +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 "") + set_from_env(STABLE_BUILD STABLE_BUILD 0) + + message(STATUS "The RELEASE_TYPE variable is: ${RELEASE_TYPE}") + 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/src/Launcher.h b/launchers/darwin/src/Launcher.h index de67850bfe..cfeb66e008 100644 --- a/launchers/darwin/src/Launcher.h +++ b/launchers/darwin/src/Launcher.h @@ -5,6 +5,7 @@ #import "LatestBuildRequest.h" #import "OrganizationRequest.h" #import "DownloadScripts.h" +#import "LauncherParams.h"; typedef enum processStateTypes { @@ -59,7 +60,10 @@ struct LatestBuildInfo { @property (nonatomic, assign) NSProgressIndicator* progressIndicator; @property (nonatomic) double progressTarget; @property (nonatomic) struct LatestBuildInfo buildInfo; +@property (nonatomic) struct LauncherParams params; +- (struct LauncherParams) getLauncherParams; +- (void) setLuancherParams:(struct LauncherParams) aParams; - (NSProgressIndicator*) getProgressView; - (void) setProgressView:(NSProgressIndicator*) aProgressIndicator; - (void) displayNameEntered:(NSString*)aDisplayName; diff --git a/launchers/darwin/src/Launcher.m b/launchers/darwin/src/Launcher.m index 1a84e9143d..c24af01b71 100644 --- a/launchers/darwin/src/Launcher.m +++ b/launchers/darwin/src/Launcher.m @@ -41,6 +41,8 @@ static BOOL const DELETE_ZIP_FILES = TRUE; latestBuildInfo.shouldDownload = FALSE; latestBuildInfo.requestBuildFinished = FALSE; self.buildInfo = latestBuildInfo; + struct LauncherParams launcherParams; + self.params = launcherParams; self.credentialsAccepted = TRUE; self.gotCredentialResponse = FALSE; self.waitingForCredentialReponse = FALSE; @@ -110,6 +112,16 @@ static BOOL const DELETE_ZIP_FILES = TRUE; return lerpValue; } +- (struct LauncherParams) getLauncherParams +{ + return self.params; +} + +- (void) setLauncherParams:(struct LauncherParams) aParams +{ + self.params = aParams; +} + - (BOOL) extractZipFileAtDestination:(NSString *)destination :(NSString*)file { NSTask* task = [[NSTask alloc] init]; diff --git a/launchers/darwin/src/LauncherParams.h b/launchers/darwin/src/LauncherParams.h new file mode 100644 index 0000000000..10a5a57541 --- /dev/null +++ b/launchers/darwin/src/LauncherParams.h @@ -0,0 +1,8 @@ +struct LauncherParams +{ + NSString* domainContentUrl; + NSString* interfaceUrl; + NSString* orginizationName; + NSString* displayName; + NSString* domainUrl; +} From 78d877a0b67e04a3d46aa8d78fc44f0fe4e1ef3b Mon Sep 17 00:00:00 2001 From: dante ruiz Date: Mon, 22 Jul 2019 10:01:48 -0700 Subject: [PATCH 2/4] finish versioning --- launchers/darwin/CMakeLists.txt | 2 +- launchers/darwin/nib/DisplayNameScreen.xib | 10 ++++++++++ launchers/darwin/nib/ErrorScreen.xib | 10 ++++++++++ launchers/darwin/nib/LoginScreen.xib | 10 ++++++++++ launchers/darwin/nib/ProcessScreen.xib | 10 ++++++++++ launchers/darwin/nib/SplashScreen.xib | 10 ++++++++++ launchers/darwin/src/DisplayNameScreen.m | 4 ++-- launchers/darwin/src/ErrorViewController.m | 2 ++ launchers/darwin/src/Launcher.h | 4 ---- launchers/darwin/src/Launcher.m | 12 ------------ launchers/darwin/src/LauncherParams.h | 8 -------- launchers/darwin/src/LoginScreen.m | 2 ++ launchers/darwin/src/ProcessScreen.m | 2 ++ launchers/darwin/src/SplashScreen.m | 2 ++ 14 files changed, 61 insertions(+), 27 deletions(-) delete mode 100644 launchers/darwin/src/LauncherParams.h diff --git a/launchers/darwin/CMakeLists.txt b/launchers/darwin/CMakeLists.txt index ae451ee73d..e286e0d177 100644 --- a/launchers/darwin/CMakeLists.txt +++ b/launchers/darwin/CMakeLists.txt @@ -39,7 +39,6 @@ set(src_files src/LaunchInterface.h src/CustomUI.h src/CustomUI.m - src/LauncherParams.h src/main.mm nib/Window.xib nib/SplashScreen.xib @@ -81,6 +80,7 @@ if ("${LAUNCHER_HMAC_SECRET}" STREQUAL "") endif() target_compile_definitions(${PROJECT_NAME} PRIVATE LAUNCHER_HMAC_SECRET="${LAUNCHER_HMAC_SECRET}") +target_compile_definitions(${PROJECT_NAME} PRIVATE LAUNCHER_BUILD_VERSION="${BUILD_VERSION}") file(GLOB NIB_FILES "nib/*.xib") diff --git a/launchers/darwin/nib/DisplayNameScreen.xib b/launchers/darwin/nib/DisplayNameScreen.xib index 94fa739f8e..1115d2c55e 100644 --- a/launchers/darwin/nib/DisplayNameScreen.xib +++ b/launchers/darwin/nib/DisplayNameScreen.xib @@ -102,12 +102,22 @@ + + + + + + + + + + diff --git a/launchers/darwin/nib/ErrorScreen.xib b/launchers/darwin/nib/ErrorScreen.xib index 26abe80b29..8a55039034 100644 --- a/launchers/darwin/nib/ErrorScreen.xib +++ b/launchers/darwin/nib/ErrorScreen.xib @@ -69,12 +69,22 @@ + + + + + + + + + + diff --git a/launchers/darwin/nib/LoginScreen.xib b/launchers/darwin/nib/LoginScreen.xib index fc1ccfcc90..60bf69cd61 100644 --- a/launchers/darwin/nib/LoginScreen.xib +++ b/launchers/darwin/nib/LoginScreen.xib @@ -119,12 +119,22 @@ + + + + + + + + + + diff --git a/launchers/darwin/nib/ProcessScreen.xib b/launchers/darwin/nib/ProcessScreen.xib index d16d71e5fa..6413d523b8 100644 --- a/launchers/darwin/nib/ProcessScreen.xib +++ b/launchers/darwin/nib/ProcessScreen.xib @@ -53,6 +53,15 @@ + + + + + + + + + @@ -60,6 +69,7 @@ + diff --git a/launchers/darwin/nib/SplashScreen.xib b/launchers/darwin/nib/SplashScreen.xib index 3bbed22a59..2fdc19ad69 100644 --- a/launchers/darwin/nib/SplashScreen.xib +++ b/launchers/darwin/nib/SplashScreen.xib @@ -26,11 +26,21 @@ + + + + + + + + + + diff --git a/launchers/darwin/src/DisplayNameScreen.m b/launchers/darwin/src/DisplayNameScreen.m index 581eabc4ee..ecb619dc01 100644 --- a/launchers/darwin/src/DisplayNameScreen.m +++ b/launchers/darwin/src/DisplayNameScreen.m @@ -6,6 +6,7 @@ @property (nonatomic, assign) IBOutlet NSImageView* backgroundImage; @property (nonatomic, assign) IBOutlet NSImageView* smallLogo; @property (nonatomic, assign) IBOutlet NSTextField* displayName; +@property (nonatomic, assign) IBOutlet NSTextField* buildVersion; @end @implementation DisplayNameScreen @@ -13,10 +14,9 @@ [self.backgroundImage setImage: [NSImage imageNamed:hifiBackgroundFilename]]; [self.smallLogo setImage: [NSImage imageNamed:hifiSmallLogoFilename]]; NSMutableAttributedString* displayNameString = [[NSMutableAttributedString alloc] initWithString:@"Display Name"]; - + [self.buildVersion setStringValue: [@"V." stringByAppendingString:@LAUNCHER_BUILD_VERSION]]; [displayNameString addAttribute:NSForegroundColorAttributeName value:[NSColor grayColor] range:NSMakeRange(0, displayNameString.length)]; [displayNameString addAttribute:NSFontAttributeName value:[NSFont systemFontOfSize:18] range:NSMakeRange(0,displayNameString.length)]; - [self.displayName setPlaceholderAttributedString:displayNameString]; [self.displayName setTarget:self]; [self.displayName setAction:@selector(login:)]; diff --git a/launchers/darwin/src/ErrorViewController.m b/launchers/darwin/src/ErrorViewController.m index 84dee95678..af45175254 100644 --- a/launchers/darwin/src/ErrorViewController.m +++ b/launchers/darwin/src/ErrorViewController.m @@ -6,6 +6,7 @@ @property (nonatomic, assign) IBOutlet NSImageView* backgroundImage; @property (nonatomic, assign) IBOutlet NSImageView* smallLogo; @property (nonatomic, assign) IBOutlet NSImageView* voxelImage; +@property (nonatomic, assign) IBOutlet NSTextField* buildVersion; @end @@ -16,6 +17,7 @@ [self.backgroundImage setImage:[NSImage imageNamed:hifiBackgroundFilename]]; [self.smallLogo setImage:[NSImage imageNamed:hifiSmallLogoFilename]]; [self.voxelImage setImage:[NSImage imageNamed:hifiVoxelFilename]]; + [self.buildVersion setStringValue: [@"V." stringByAppendingString:@LAUNCHER_BUILD_VERSION]]; } -(IBAction)resartLauncher:(id)sender diff --git a/launchers/darwin/src/Launcher.h b/launchers/darwin/src/Launcher.h index cfeb66e008..de67850bfe 100644 --- a/launchers/darwin/src/Launcher.h +++ b/launchers/darwin/src/Launcher.h @@ -5,7 +5,6 @@ #import "LatestBuildRequest.h" #import "OrganizationRequest.h" #import "DownloadScripts.h" -#import "LauncherParams.h"; typedef enum processStateTypes { @@ -60,10 +59,7 @@ struct LatestBuildInfo { @property (nonatomic, assign) NSProgressIndicator* progressIndicator; @property (nonatomic) double progressTarget; @property (nonatomic) struct LatestBuildInfo buildInfo; -@property (nonatomic) struct LauncherParams params; -- (struct LauncherParams) getLauncherParams; -- (void) setLuancherParams:(struct LauncherParams) aParams; - (NSProgressIndicator*) getProgressView; - (void) setProgressView:(NSProgressIndicator*) aProgressIndicator; - (void) displayNameEntered:(NSString*)aDisplayName; diff --git a/launchers/darwin/src/Launcher.m b/launchers/darwin/src/Launcher.m index c24af01b71..1a84e9143d 100644 --- a/launchers/darwin/src/Launcher.m +++ b/launchers/darwin/src/Launcher.m @@ -41,8 +41,6 @@ static BOOL const DELETE_ZIP_FILES = TRUE; latestBuildInfo.shouldDownload = FALSE; latestBuildInfo.requestBuildFinished = FALSE; self.buildInfo = latestBuildInfo; - struct LauncherParams launcherParams; - self.params = launcherParams; self.credentialsAccepted = TRUE; self.gotCredentialResponse = FALSE; self.waitingForCredentialReponse = FALSE; @@ -112,16 +110,6 @@ static BOOL const DELETE_ZIP_FILES = TRUE; return lerpValue; } -- (struct LauncherParams) getLauncherParams -{ - return self.params; -} - -- (void) setLauncherParams:(struct LauncherParams) aParams -{ - self.params = aParams; -} - - (BOOL) extractZipFileAtDestination:(NSString *)destination :(NSString*)file { NSTask* task = [[NSTask alloc] init]; diff --git a/launchers/darwin/src/LauncherParams.h b/launchers/darwin/src/LauncherParams.h deleted file mode 100644 index 10a5a57541..0000000000 --- a/launchers/darwin/src/LauncherParams.h +++ /dev/null @@ -1,8 +0,0 @@ -struct LauncherParams -{ - NSString* domainContentUrl; - NSString* interfaceUrl; - NSString* orginizationName; - NSString* displayName; - NSString* domainUrl; -} diff --git a/launchers/darwin/src/LoginScreen.m b/launchers/darwin/src/LoginScreen.m index d654a14f1b..5b8cab2db6 100644 --- a/launchers/darwin/src/LoginScreen.m +++ b/launchers/darwin/src/LoginScreen.m @@ -12,6 +12,7 @@ @property (nonatomic, assign) IBOutlet NSTextField* smallHeader; @property (nonatomic, assign) IBOutlet NSTextField* trouble; @property (nonatomic, assign) IBOutlet NSButton* button; +@property (nonatomic, assign) IBOutlet NSTextField* buildVersion; @end @implementation LoginScreen @@ -36,6 +37,7 @@ [self.button setTitle:@"TRY AGAIN"]; } + [self.buildVersion setStringValue: [@"V." stringByAppendingString:@LAUNCHER_BUILD_VERSION]]; [self.backgroundImage setImage:[NSImage imageNamed:hifiBackgroundFilename]]; [self.smallLogo setImage:[NSImage imageNamed:hifiSmallLogoFilename]]; diff --git a/launchers/darwin/src/ProcessScreen.m b/launchers/darwin/src/ProcessScreen.m index 85ec5c8d5b..876be3fea3 100644 --- a/launchers/darwin/src/ProcessScreen.m +++ b/launchers/darwin/src/ProcessScreen.m @@ -9,6 +9,7 @@ @property (nonatomic, assign) IBOutlet NSTextField* boldStatus; @property (nonatomic, assign) IBOutlet NSTextField* smallStatus; @property (nonatomic, assign) IBOutlet NSProgressIndicator* progressView; +@property (nonatomic, assign) IBOutlet NSTextField* buildVersion; @end @implementation ProcessScreen @@ -37,6 +38,7 @@ default: break; } + [self.buildVersion setStringValue: [@"V." stringByAppendingString:@LAUNCHER_BUILD_VERSION]]; [self.background setImage: [NSImage imageNamed:hifiBackgroundFilename]]; [self.smallLogo setImage: [NSImage imageNamed:hifiSmallLogoFilename]]; [self.voxelImage setImage: [NSImage imageNamed:hifiVoxelFilename]]; diff --git a/launchers/darwin/src/SplashScreen.m b/launchers/darwin/src/SplashScreen.m index a1f726c1df..87d8681629 100644 --- a/launchers/darwin/src/SplashScreen.m +++ b/launchers/darwin/src/SplashScreen.m @@ -6,6 +6,7 @@ @property (nonatomic, assign) IBOutlet NSImageView* imageView; @property (nonatomic, assign) IBOutlet NSImageView* logoImage; @property (nonatomic, assign) IBOutlet NSButton* button; +@property (nonatomic, assign) IBOutlet NSTextField* buildVersion; @end @implementation SplashScreen @@ -15,5 +16,6 @@ -(void)awakeFromNib { [self.imageView setImage:[NSImage imageNamed:hifiBackgroundFilename]]; [self.logoImage setImage:[NSImage imageNamed:hifiLargeLogoFilename]]; + [self.buildVersion setStringValue: [@"V." stringByAppendingString:@LAUNCHER_BUILD_VERSION]]; } @end From 1d1b1a93d9eca07884806df26c6eaaa66284bfa3 Mon Sep 17 00:00:00 2001 From: dante ruiz Date: Mon, 22 Jul 2019 10:06:24 -0700 Subject: [PATCH 3/4] revert --- launchers/darwin/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/launchers/darwin/CMakeLists.txt b/launchers/darwin/CMakeLists.txt index e286e0d177..177a7722e5 100644 --- a/launchers/darwin/CMakeLists.txt +++ b/launchers/darwin/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.2) +cmake_minimum_required(VERSION 3.0) set(ENV{MACOSX_DEPLOYMENT_TARGET} 10.9) project(HQLauncher) set (CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/") From 08bfe00ac4076c49d0a8943c5c84c9619cc59df6 Mon Sep 17 00:00:00 2001 From: dante ruiz Date: Tue, 23 Jul 2019 14:09:46 -0700 Subject: [PATCH 4/4] making requested changes --- .../cmake/macros/SetPackagingParameters.cmake | 18 ------------------ launchers/darwin/nib/DisplayNameScreen.xib | 6 +++--- launchers/darwin/nib/ErrorScreen.xib | 6 +++--- launchers/darwin/nib/LoginScreen.xib | 6 +++--- launchers/darwin/nib/ProcessScreen.xib | 6 +++--- launchers/darwin/nib/SplashScreen.xib | 4 ++-- 6 files changed, 14 insertions(+), 32 deletions(-) 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 @@ - + - +