Add support in iossim for simulating retina devices

testing/iossim/iossim.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import <Foundation/Foundation.h>
 #include <asl.h>
 #include <libgen.h>
 #include <stdarg.h>
 #include <stdio.h>
 
@@ skipping 433 matching lines @@
 // Creates the necessary directory structure under the given user home directory
 // path.
 // Returns YES if successful, NO if unable to create the directories.
 BOOL CreateHomeDirSubDirs(NSString* userHomePath) {
   NSFileManager* fileManager = [NSFileManager defaultManager];
 
   // Create user home and subdirectories.
   NSArray* subDirsToCreate = [NSArray arrayWithObjects:
                               @"Documents",
                               @"Library/Caches",
+                              @"Library/Preferences",
                               nil];
   for (NSString* subDir in subDirsToCreate) {
     NSString* path = [userHomePath stringByAppendingPathComponent:subDir];
     NSError* error;
     if (![fileManager createDirectoryAtPath:path
                 withIntermediateDirectories:YES
                                  attributes:nil
                                       error:&error]) {
       LogError(@"Unable to create directory: %@. Error: %@",
                path, [error localizedDescription]);
       return NO;
     }
   }
 
   return YES;
 }
 
 // Creates the necessary directory structure under the given user home directory
 // path, then sets the path in the appropriate environment variable.
 // Returns YES if successful, NO if unable to create or initialize the given
 // directory.
-BOOL InitializeSimulatorUserHome(NSString* userHomePath) {
+BOOL InitializeSimulatorUserHome(NSString* userHomePath, NSString* deviceName) {
   if (!CreateHomeDirSubDirs(userHomePath))
     return NO;
 
+  NSMutableDictionary* plistDict =

[TVL, 2012/09/25 19:13:23]

might be worth a comment here that the simulator has to not be running for this
to get picked up correctly.  For now i'd say let the wrapping scripts kill the
simulator rather than adding that here.

[lliabraa, 2012/10/04 15:51:39]

Done.

+      [NSMutableDictionary dictionaryWithObject:deviceName
+                                         forKey:@"SimulateDevice"];
+  NSString* plistPath = @"Library/Preferences/com.apple.iphonesimulator.plist";
+  [plistDict writeToFile:[userHomePath stringByAppendingPathComponent:plistPath]
+              atomically:YES];
+
   // Update the environment to use the specified directory as the user home
   // directory.
   // Note: the third param of setenv specifies whether or not to overwrite the
   // variable's value if it has already been set.
   if ((setenv(kUserHomeEnvVariable, [userHomePath UTF8String], YES) == -1) ||
       (setenv(kHomeEnvVariable, [userHomePath UTF8String], YES) == -1)) {
     LogError(@"Unable to set environment variables for home directory.");
     return NO;
   }
 
   return YES;
 }
 
 // Prints the usage information to stderr.
 void PrintUsage() {
   fprintf(stderr, "Usage: iossim [-d device] [-s sdkVersion] [-u homeDir] "
       "[-e envKey=value]* [-t startupTimeout] <appPath> [<appArgs>]\n"
       "  where <appPath> is the path to the .app directory and appArgs are any"
       " arguments to send the simulated app.\n"
       "\n"
       "Options:\n"
-      "  -d  Specifies the device (either 'iPhone' or 'iPad')."
-      " Defaults to 'iPhone'.\n"
+      "  -d  Specifies the device (must be one of the values from the iOS"
+      " Simulator's Hardware -> Device menu. Defaults to 'iPhone'.\n"
       "  -s  Specifies the SDK version to use (e.g '4.3')."
       " Will use system default if not specified.\n"
       "  -u  Specifies a user home directory for the simulator."
       " Will create a new directory if not specified.\n"
       "  -e  Specifies an environment key=value pair that will be"
       " set in the simulated application's environment.\n"
       "  -t  Specifies the session startup timeout (in seconds)."
       " Defaults to %d.\n",
       static_cast<int>(kDefaultSessionStartTimeoutSeconds));
 }
 
 }  // namespace
 
 int main(int argc, char* const argv[]) {
   NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
 
   // basename() may modify the passed in string and it returns a pointer to an
   // internal buffer. Give it a copy to modify, and copy what it returns.
   char* worker = strdup(argv[0]);
   char* toolName = basename(worker);
   if (toolName != NULL) {
     toolName = strdup(toolName);
     if (toolName != NULL)
       gToolName = toolName;
   }
   if (worker != NULL)
     free(worker);
 
+
   NSString* appPath = nil;
   NSString* appName = nil;
   NSString* sdkVersion = nil;
   NSString* deviceName = @"iPhone";
   NSString* simHomePath = nil;
   NSMutableArray* appArgs = [NSMutableArray array];
   NSMutableDictionary* appEnv = [NSMutableDictionary dictionary];
   NSTimeInterval sessionStartTimeout = kDefaultSessionStartTimeoutSeconds;
 
   // Parse the optional arguments
@@ skipping 83 matching lines @@
   if (!systemRoot) {
     LogError(@"Invalid SDK version: %@", sdkVersion);
     exit(EXIT_FAILURE);
   }
 
   // Get the paths for stdout and stderr so the simulated app's output will show
   // up in the caller's stdout/stderr.
   NSString* outputDir = CreateTempDirectory(@"iossim-XXXXXX");
   NSString* stdioPath = [outputDir stringByAppendingPathComponent:@"stdio.txt"];
 
-  // Make sure the device name is legit.
+  // Determine the deviceFamily based on the deviceName
   NSNumber* deviceFamily = nil;
-  if (!deviceName ||
-      [@"iPhone" caseInsensitiveCompare:deviceName] == NSOrderedSame) {
+  if (!deviceName || [deviceName hasPrefix:@"iPhone"]) {
     deviceFamily = [NSNumber numberWithInt:kIPhoneFamily];
-  } else if ([@"iPad" caseInsensitiveCompare:deviceName] == NSOrderedSame) {
+  } else if ([deviceName hasPrefix:@"iPad"]) {
     deviceFamily = [NSNumber numberWithInt:kIPadFamily];
   } else {
-    LogError(@"Invalid device name: %@", deviceName);
+    LogError(@"Invalid device name: %@. Must begin with 'iPhone' or 'iPad'",
+        deviceName);
     exit(EXIT_FAILURE);
   }
 
   // Set up the user home directory for the simulator
   if (!simHomePath) {
     NSString* dirNameTemplate =
         [NSString stringWithFormat:@"iossim-%@-%@-XXXXXX", appName, deviceName];
     simHomePath = CreateTempDirectory(dirNameTemplate);
     if (!simHomePath) {
       LogError(@"Unable to create unique directory for template %@",
                dirNameTemplate);
       exit(EXIT_FAILURE);
     }
   }
-  if (!InitializeSimulatorUserHome(simHomePath)) {
+  if (!InitializeSimulatorUserHome(simHomePath, deviceName)) {
     LogError(@"Unable to initialize home directory for simulator: %@",
              simHomePath);
     exit(EXIT_FAILURE);
   }
 
   // Create the config and simulator session.
   DTiPhoneSimulatorSessionConfig* config = BuildSessionConfig(appSpec,
                                                               systemRoot,
                                                               stdioPath,
                                                               stdioPath,
@@ skipping 20 matching lines @@
              [error localizedDescription],
              [error domain], static_cast<long int>([error code]));
   }
 
   // Note that this code is only executed if the simulator fails to start
   // because once the main run loop is started, only the delegate calling
   // exit() will end the program.
   [pool drain];
   return EXIT_FAILURE;
 }