Fixed an issue with starting the application without 3Dconnexion driv…

…ers installed
mifki · Aug 23, 2015 · a907294 · a907294
1 parent c0c56b1
commit a907294
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 67 deletions.
diff --git a/Planito.xcodeproj/project.pbxproj b/Planito.xcodeproj/project.pbxproj
@@ -45,7 +45,7 @@
 		5841890F1A0300FD001946B6 /* INWindowBackgroundView+CoreUIRendering.m in Sources */ = {isa = PBXBuildFile; fileRef = 584189021A0300BE001946B6 /* INWindowBackgroundView+CoreUIRendering.m */; };
 		584189111A030121001946B6 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 584189101A030121001946B6 /* Carbon.framework */; };
 		584189121A03012E001946B6 /* INAppStoreWindowSwizzling.c in Sources */ = {isa = PBXBuildFile; fileRef = 584188FF1A0300BE001946B6 /* INAppStoreWindowSwizzling.c */; };
-		5841891C1A03036B001946B6 /* 3DconnexionClient.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5841891B1A03036B001946B6 /* 3DconnexionClient.framework */; };
+		5841891C1A03036B001946B6 /* 3DconnexionClient.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5841891B1A03036B001946B6 /* 3DconnexionClient.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
 		5849F37B14254AB600261B69 /* PlanitoAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 58B6490313E3522800801805 /* PlanitoAppDelegate.m */; };
 		5849F385142550B500261B69 /* BookmarkManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 5849F384142550B500261B69 /* BookmarkManager.m */; };
 		5849F38814266BD300261B69 /* PlanitoWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5849F38714266BD100261B69 /* PlanitoWindowController.m */; };
@@ -1098,12 +1098,15 @@
 		58B648E313E3522400801805 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0610;
+				LastUpgradeCheck = 0640;
 				ORGANIZATIONNAME = mifki;
 				TargetAttributes = {
 					584189131A0302B7001946B6 = {
 						CreatedOnToolsVersion = 6.1;
 					};
+					58B648EB13E3522700801805 = {
+						DevelopmentTeam = 7NL467Q9V9;
+					};
 				};
 			};
 			buildConfigurationList = 58B648E613E3522400801805 /* Build configuration list for PBXProject "Planito" */;
@@ -1202,7 +1205,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "cd \"${PROJECT_DIR}\"\n\nmkdir dmg\n\ncp -R \"${TARGET_BUILD_DIR}/Planito.app\" \"dmg\"\ncp *.webloc \"dmg\"\nSetFile -a E dmg/*.webloc\n                 \nstrip \"dmg/Planito.app/Contents/MacOS/Planito\"\n                 \nVER=`/usr/libexec/PlistBuddy -c \"Print :CFBundleShortVersionString\" \"dmg/Planito.app/Contents/Info.plist\"`\n                 \n#Now build DMG\n                 \nhdiutil detach \"/Volumes/Planito\"\nrm -f \"Planito-$VER.dmg\"\nhdiutil create \"Planito-$VER.dmg\" -ov -volname \"Planito\" -fs HFS+ -srcfolder \"dmg\"\nhdiutil attach \"Planito-$VER.dmg\"\nbless \"/Volumes/Planito\" --openfolder \"/Volumes/Planito\"\nhdiutil detach \"/Volumes/Planito\"\n                 \nrm -rf \"dmg\"\n";
+			shellScript = "cd \"${PROJECT_DIR}\"\n\nmkdir dmg\n\ncp -R \"${TARGET_BUILD_DIR}/Planito.app\" \"dmg\"\ncp *.webloc \"dmg\"\nSetFile -a E dmg/*.webloc\n                                  \nVER=`/usr/libexec/PlistBuddy -c \"Print :CFBundleShortVersionString\" \"dmg/Planito.app/Contents/Info.plist\"`\n                 \n#Now build DMG\n                 \nhdiutil detach \"/Volumes/Planito\"\nrm -f \"Planito-$VER.dmg\"\nhdiutil create \"Planito-$VER.dmg\" -ov -volname \"Planito\" -fs HFS+ -srcfolder \"dmg\"\nhdiutil attach \"Planito-$VER.dmg\"\nbless \"/Volumes/Planito\" --openfolder \"/Volumes/Planito\"\nhdiutil detach \"/Volumes/Planito\"\n                 \nrm -rf \"dmg\"\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -1466,13 +1469,6 @@
 			};
 			name = Development;
 		};
-		584189161A0302B7001946B6 /* Demo */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				PRODUCT_NAME = "$(TARGET_NAME)";
-			};
-			name = Demo;
-		};
 		584189171A0302B7001946B6 /* Distribution */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -1484,7 +1480,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD)";
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEPLOYMENT_POSTPROCESSING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -1506,6 +1501,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = YES;
+				CODE_SIGN_IDENTITY = "Developer ID Application";
 				COMBINE_HIDPI_IMAGES = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1519,58 +1515,15 @@
 				PLANITO_DATASOURCE = "http://ds.planitoapp.com/_datasource-{LANG}.xml.gz";
 				PLIST_FILE_OUTPUT_FORMAT = binary;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE = "";
 				WRAPPER_EXTENSION = app;
 			};
 			name = Distribution;
 		};
-		58AB7BF514CCF12100EAE9B7 /* Demo */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD)";
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				DEPLOYMENT_POSTPROCESSING = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_ENABLE_SSE3_EXTENSIONS = YES;
-				GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS = YES;
-				GCC_OPTIMIZATION_LEVEL = 3;
-				GCC_VERSION = "";
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.7;
-				SDKROOT = macosx;
-				SEPARATE_STRIP = YES;
-			};
-			name = Demo;
-		};
-		58AB7BF614CCF12100EAE9B7 /* Demo */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = YES;
-				COMBINE_HIDPI_IMAGES = YES;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(PROJECT_DIR)",
-					"$(PROJECT_DIR)/Planito",
-				);
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "Planito/Planito-Prefix.pch";
-				INFOPLIST_FILE = "Planito/Planito-Info.plist";
-				MACOSX_DEPLOYMENT_TARGET = 10.7;
-				PLANITO_DATASOURCE = "http://ds.planitoapp.com/_datasource_demo-{LANG}.xml.gz";
-				PLIST_FILE_OUTPUT_FORMAT = binary;
-				PRODUCT_NAME = "$(TARGET_NAME) Demo";
-				WRAPPER_EXTENSION = app;
-			};
-			name = Demo;
-		};
 		58B6490913E3522900801805 /* Development */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD)";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -1592,6 +1545,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = YES;
+				CODE_SIGN_IDENTITY = "Developer ID Application";
 				COMBINE_HIDPI_IMAGES = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1605,6 +1559,7 @@
 				PLANITO_DATASOURCE = "http://ds.planitoapp.com/_datasource-{LANG}.xml";
 				PLIST_FILE_OUTPUT_FORMAT = binary;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE = "";
 				WRAPPER_EXTENSION = app;
 			};
 			name = Development;
@@ -1616,16 +1571,15 @@
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				584189151A0302B7001946B6 /* Development */,
-				584189161A0302B7001946B6 /* Demo */,
 				584189171A0302B7001946B6 /* Distribution */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Development;
 		};
 		58B648E613E3522400801805 /* Build configuration list for PBXProject "Planito" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				58B6490913E3522900801805 /* Development */,
-				58AB7BF514CCF12100EAE9B7 /* Demo */,
 				58AB7BF214CCF10F00EAE9B7 /* Distribution */,
 			);
 			defaultConfigurationIsVisible = 0;
@@ -1635,7 +1589,6 @@
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				58B6490C13E3522900801805 /* Development */,
-				58AB7BF614CCF12100EAE9B7 /* Demo */,
 				58AB7BF314CCF10F00EAE9B7 /* Distribution */,
 			);
 			defaultConfigurationIsVisible = 0;

diff --git a/Planito.xcodeproj/project.xcworkspace/xcshareddata/Planito.xccheckout b/Planito.xcodeproj/project.xcworkspace/xcshareddata/Planito.xccheckout
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDESourceControlProjectFavoriteDictionaryKey</key>
+	<false/>
+	<key>IDESourceControlProjectIdentifier</key>
+	<string>05A62AC8-F793-4815-B855-3F7DAD7C7586</string>
+	<key>IDESourceControlProjectName</key>
+	<string>Planito</string>
+	<key>IDESourceControlProjectOriginsDictionary</key>
+	<dict>
+		<key>2EA8D4A3753606AE725E39BFCD3D23418A8BEF0C</key>
+		<string>https://github.com/mifki/planito.git</string>
+	</dict>
+	<key>IDESourceControlProjectPath</key>
+	<string>Planito.xcodeproj</string>
+	<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
+	<dict>
+		<key>2EA8D4A3753606AE725E39BFCD3D23418A8BEF0C</key>
+		<string>../..</string>
+	</dict>
+	<key>IDESourceControlProjectURL</key>
+	<string>https://github.com/mifki/planito.git</string>
+	<key>IDESourceControlProjectVersion</key>
+	<integer>111</integer>
+	<key>IDESourceControlProjectWCCIdentifier</key>
+	<string>2EA8D4A3753606AE725E39BFCD3D23418A8BEF0C</string>
+	<key>IDESourceControlProjectWCConfigurations</key>
+	<array>
+		<dict>
+			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
+			<string>public.vcs.git</string>
+			<key>IDESourceControlWCCIdentifierKey</key>
+			<string>2EA8D4A3753606AE725E39BFCD3D23418A8BEF0C</string>
+			<key>IDESourceControlWCCName</key>
+			<string>planito</string>
+		</dict>
+	</array>
+</dict>
+</plist>
diff --git a/Planito.xcodeproj/xcshareddata/xcschemes/Planito.xcscheme b/Planito.xcodeproj/xcshareddata/xcschemes/Planito.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0610"
+   LastUpgradeVersion = "0640"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -48,7 +48,8 @@
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       allowLocationSimulation = "YES">
-      <BuildableProductRunnable>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "58B648EB13E3522700801805"
@@ -66,7 +67,8 @@
       useCustomWorkingDirectory = "NO"
       buildConfiguration = "Development"
       debugDocumentVersioning = "YES">
-      <BuildableProductRunnable>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "58B648EB13E3522700801805"

diff --git a/Planito/Planito-Info.plist b/Planito/Planito-Info.plist
@@ -6,6 +6,10 @@
 	<string>en</string>
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleHelpBookFolder</key>
+	<string>Planito.help</string>
+	<key>CFBundleHelpBookName</key>
+	<string>com.mifki.Planito.help</string>
 	<key>CFBundleIconFile</key>
 	<string>Planito.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -17,7 +21,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.21</string>
+	<string>1.22</string>
 	<key>CFBundleSignature</key>
 	<string>PltO</string>
 	<key>CFBundleURLTypes</key>
@@ -34,15 +38,11 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>23</string>
+	<string>24</string>
 	<key>DataSource</key>
 	<string>http://ds.planitoapp.com/_datasource-{LANG}.xml.gz</string>
-	<key>CFBundleHelpBookFolder</key>
-	<string>Planito.help</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.travel</string>
-	<key>CFBundleHelpBookName</key>
-	<string>com.mifki.Planito.help</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>NSAppleScriptEnabled</key>