Changeset 8260 for code/branches/mac_osx

Timestamp:

Apr 18, 2011, 9:33:05 PM (14 years ago)

Author:

youngk

Message:

Made the crash reporter work. More or less…

Location:

code/branches/mac_osx

Files:

• data/mac/Orxonox-Info.plist (modified) (2 diffs)
• src/CMakeLists.txt (modified) (1 diff)
• src/Orxonox.cc (modified) (1 diff)
• src/external/cmcrashreporter/CMCrashReporter.m (modified) (1 diff)
• src/external/cmcrashreporter/CMCrashReporterWindow.nib (added)
• src/external/cmcrashreporter/CMCrashReporterWindow.nib/designable.nib (added)
• src/external/cmcrashreporter/CMCrashReporterWindow.nib/keyedobjects.nib (added)
• src/external/cmcrashreporter/CMakeLists.txt (modified) (2 diffs)

code/branches/mac_osx/data/mac/Orxonox-Info.plist

@@ -7 +7 @@
         <key>CFBundleExecutable</key>
         <string>${EXECUTABLE_NAME}</string>
+        <key>CFBundleGetInfoString</key>
+        <string>Orxonox: The hottest space shooter ever to exist!</string>
         <key>CFBundleIconFile</key>
         <string>Icon.icns</string>
@@ -15 +17 @@
         <key>CFBundleName</key>
         <string>${PROJECT_NAME}</string>
+        <key>CFBundlePackageType</key>
+        <string>APPL</string>
+        <key>CFBundleShortVersionString</key>
+        <string>${ORXONOX_VERSION}, ${ORXONOX_VERSION_NAME}</string>
         <key>CFBundleVersion</key>
         <string>${ORXONOX_VERSION}</string>
-        <key>CFBundleShortVersionString</key>
-        <string>${ORXONOX_VERSION}, ${ORXONOX_VERSION_NAME}</string>
-        <key>CFBundleGetInfoString</key>
-        <string>Orxonox: The hottest space shooter ever to exist!</string>
+        <key>LSMinimumSystemVersion</key>
+        <string>10.5</string>
         <key>NSHumanReadableCopyright</key>
         <string>GPL version 2 or higher, and CC-BY-SA</string>
-        <key>CFBundlePackageType</key>
-        <string>APPL</string>
-        <key>LSMinimumSystemVersion</key>
-        <string>10.5</string>
         <key>NSMainNibFile</key>
         <string>MainMenu</string>
         <key>NSPrincipalClass</key>
         <string>NSApplication</string>
+        <key>CMSubmitURL</key>
+        <string></string>
+        <key>CMMaxReports</key>
+        <integer>100</integer>
 </dict>
 </plist>

code/branches/mac_osx/src/CMakeLists.txt

@@ -175 +175 @@
   # On Apple we need to link to AppKit, Foundation frameworks
   TARGET_LINK_LIBRARIES(orxonox-main 
+    cmcrashreporter_orxonox
     "-framework AppKit"
     "-framework Foundation"

code/branches/mac_osx/src/Orxonox.cc

@@ -75 +75 @@
             strCmdLine = strCmdLine + argv[i] + ' ';
 #endif
-
+        
+        // Use these statements to make Orxonox go crashycrash
+        //int* crashInt = NULL;
+        //COUT(0) << *crashInt << std::endl;
+             
         return orxonox::main(strCmdLine);
     }

code/branches/mac_osx/src/external/cmcrashreporter/CMCrashReporter.m

@@ -40 +40 @@
                 return array;
         } else {
-                // Tiger Formet is AppName.crash.log
+                // Tiger Format is AppName.crash.log
                 NSString *path = [[NSString stringWithFormat:@"~/Library/Logs/CrashReporter/%@.crash.log",[CMCrashReporterGlobal appName]] stringByExpandingTildeInPath];
                 if ([fileManager fileExistsAtPath:path]) return [NSArray arrayWithObject:path];

code/branches/mac_osx/src/external/cmcrashreporter/CMakeLists.txt

@@ -53 +53 @@
   SET(DEVBUNDLE_CURRENT_RESOURCES "${DEVBUNDLE_CURRENT_DIR}/Resources")
   SET(DEVBUNDLE_DEFAULT_LANGFILE "English.lproj")
-  SET(DEVBUNDLE_NIB_FILE "MainMenu.nib")
+  SET(DEVBUNDLE_NIB_FILE "CMCrashReporterWindow.nib")
 
   # Create bundle folder structure
@@ -62 +62 @@
   
   # Populate app with additional NIB file.
-  CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/CMCrashReporterWindow.xib" "${DEVBUNDLE_CURRENT_RESOURCES}/${DEVBUNDLE_DEFAULT_LANGFILE}/CMCrashReporterWindow.xib" COPYONLY)
+  CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/${DEVBUNDLE_NIB_FILE}/keyedobjects.nib" "${DEVBUNDLE_CURRENT_RESOURCES}/${DEVBUNDLE_DEFAULT_LANGFILE}/${DEVBUNDLE_NIB_FILE}/keyedobjects.nib" COPYONLY)
+  CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/${DEVBUNDLE_NIB_FILE}/designable.nib" "${DEVBUNDLE_CURRENT_RESOURCES}/${DEVBUNDLE_DEFAULT_LANGFILE}/${DEVBUNDLE_NIB_FILE}/designable.nib" COPYONLY)
+
 
 ENDFOREACH(_subdir)