Merge pull request #347 from docker/machine-error-report

Add & remove no-error-report file for machine 0.5.3

osx/installerplugins/installerplugins.xcodeproj/project.pbxproj

@@ -438,6 +438,7 @@
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/../mpkg/Plugins";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -504,6 +505,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				COMBINE_HIDPI_IMAGES = YES;
+				CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/../mpkg/Plugins";
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
@@ -521,6 +523,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				COMBINE_HIDPI_IMAGES = YES;
+				CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/../mpkg/Plugins";
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = managevmplugin/Info.plist;
 				INSTALL_PATH = "$(HOME)/Library/Bundles";

osx/installerplugins/overviewplugin/overviewpluginPane.m

@@ -44,11 +44,15 @@
     
     BOOL enabled = self.checkbox.state == NSOnState;
     [Mixpanel trackEvent:@"Continued from Overview" forPane:self withProperties:[[NSDictionary alloc] initWithObjectsAndKeys:enabled ? @"Yes" : @"No", @"Tracking Enabled", nil]];
-    
+    NSError *error = nil;
+
     if (!enabled) {
         [[[self section] sharedDictionary] setObject:[NSNumber numberWithBool:YES] forKey:@"disableTracking"];
+        [[NSFileManager defaultManager] removeItemAtPath:[NSString stringWithFormat:@"%@/.docker/machine/no-error-report", NSHomeDirectory()] error:&error];
     } else {
         [[[self section] sharedDictionary] removeObjectForKey:@"disableTracking"];
+        [[NSFileManager defaultManager] createDirectoryAtPath:[NSString stringWithFormat:@"%@/.docker/machine", NSHomeDirectory()] withIntermediateDirectories:YES attributes:nil error:&error];
+        [[NSFileManager defaultManager] createFileAtPath:[NSString stringWithFormat:@"%@/.docker/machine/no-error-report", NSHomeDirectory()] contents:[@"" dataUsingEncoding:NSUTF8StringEncoding] attributes:nil];
     }
     
 }

osx/mpkg/Plugins/managevmplugin.bundle/Contents/Info.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>15C27e</string>
+	<string>15C50</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -29,17 +29,17 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>7B91b</string>
+	<string>7C68</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
-	<string>15A278</string>
+	<string>15C43</string>
 	<key>DTSDKName</key>
 	<string>macosx10.11</string>
 	<key>DTXcode</key>
-	<string>0710</string>
+	<string>0720</string>
 	<key>DTXcodeBuild</key>
-	<string>7B91b</string>
+	<string>7C68</string>
 	<key>Installer Version</key>
 	<string>%INSTALLER_VERSION%</string>
 	<key>InstallerSectionTitle</key>

osx/mpkg/Plugins/overviewplugin.bundle/Contents/Info.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>15C27e</string>
+	<string>15C50</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -29,17 +29,17 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>7B91b</string>
+	<string>7C68</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
-	<string>15A278</string>
+	<string>15C43</string>
 	<key>DTSDKName</key>
 	<string>macosx10.11</string>
 	<key>DTXcode</key>
-	<string>0710</string>
+	<string>0720</string>
 	<key>DTXcodeBuild</key>
-	<string>7B91b</string>
+	<string>7C68</string>
 	<key>Installer Version</key>
 	<string>%INSTALLER_VERSION%</string>
 	<key>InstallerSectionTitle</key>

osx/mpkg/Plugins/quickstartplugin.bundle/Contents/Info.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>15C27e</string>
+	<string>15C50</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -29,17 +29,17 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>7B91b</string>
+	<string>7C68</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
-	<string>15A278</string>
+	<string>15C43</string>
 	<key>DTSDKName</key>
 	<string>macosx10.11</string>
 	<key>DTXcode</key>
-	<string>0710</string>
+	<string>0720</string>
 	<key>DTXcodeBuild</key>
-	<string>7B91b</string>
+	<string>7C68</string>
 	<key>Installer Version</key>
 	<string>%INSTALLER_VERSION%</string>
 	<key>InstallerSectionTitle</key>

windows/Toolbox.iss

@@ -238,9 +238,12 @@ begin
 			if TrackingCheckBox.Checked then begin
 				TrackEventWithProperties('Continued from Overview', '"Tracking Enabled": "Yes"');
 				TrackingDisabled := False;
+				DeleteFile(ExpandConstant('{userdocs}\..\.docker\machine\no-error-report'));
 			end else begin
 				TrackEventWithProperties('Continued from Overview', '"Tracking Enabled": "No"');
 				TrackingDisabled := True;
+				CreateDir(ExpandConstant('{userdocs}\..\.docker\machine'));
+				SaveStringToFile(ExpandConstant('{userdocs}\..\.docker\machine\no-error-report'), '', False);
 			end;
   end;
   Result := True