diff --git a/MacPorts_Framework/Info.plist b/MacPorts_Framework/Info.plist index d3d2435..7185c2f 100644 --- a/MacPorts_Framework/Info.plist +++ b/MacPorts_Framework/Info.plist @@ -29,5 +29,9 @@ x86_64 10.6.0 + SMAuthorizedClients + + identifier org.macports.framework.macports and certificate leaf = H"6a52be62749c0ff3d3192d010737a433423c0513" + diff --git a/MacPorts_Framework/MPHelperTool.m b/MacPorts_Framework/MPHelperTool.m index 8d637c7..b185125 100644 --- a/MacPorts_Framework/MPHelperTool.m +++ b/MacPorts_Framework/MPHelperTool.m @@ -899,7 +899,7 @@ static OSStatus DoEvaluateTclString //Get the tcl Interpreter pkg path NSString * tclPkgPath = (NSString *) (CFStringRef) CFDictionaryGetValue(request, CFSTR(kTclInterpreterInitPath)); if (tclPkgPath == nil) { - retval == coreFoundationUnknownErr; + retval = coreFoundationUnknownErr; } else CFDictionaryAddValue(response, CFSTR("TclPkgPath"), (CFStringRef)tclPkgPath); @@ -907,7 +907,11 @@ static OSStatus DoEvaluateTclString //Load macports1.0 package NSString * mport_fastload = [[@"source [file join \"" stringByAppendingString:tclPkgPath] stringByAppendingString:@"\" macports1.0 macports_fastload.tcl]"]; + NSLog(@"FOO"); + exit(2); if(Tcl_Eval(interpreter, [mport_fastload UTF8String]) == TCL_ERROR) { + NSLog(@"HERE"); + exit(2); NSLog(@"Error in Tcl_EvalFile macports_fastload.tcl: %s", Tcl_GetStringResult(interpreter)); Tcl_DeleteInterp(interpreter); retval = coreFoundationUnknownErr; diff --git a/MacPorts_Framework/MPHelperToolIPCTester.m b/MacPorts_Framework/MPHelperToolIPCTester.m index 7f55a4f..45a4ed6 100644 --- a/MacPorts_Framework/MPHelperToolIPCTester.m +++ b/MacPorts_Framework/MPHelperToolIPCTester.m @@ -92,7 +92,6 @@ } -(BOOL) installUninstallManipulation:(NSString *)portName { - NSLog(@"FOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO"); BOOL ret = NO; MPRegistry * registry = [MPRegistry sharedRegistry]; @@ -173,6 +172,7 @@ int main(int argc, char const * argv[]) { if([pm installUninstallManipulation:@"pngcrush"]) { NSLog(@"pngcrush INSTALLATION SUCCESSFUL"); } + /* else { NSLog(@"pngcrush INSTALLATION UNSUCCESSFUL"); } @@ -182,7 +182,7 @@ int main(int argc, char const * argv[]) { } else { NSLog(@"SELFUPDATE UNSUCCESSFUL"); - } + }*/ return 0; diff --git a/MacPorts_Framework/MPPort.m b/MacPorts_Framework/MPPort.m index cbb3b98..65f20cc 100644 --- a/MacPorts_Framework/MPPort.m +++ b/MacPorts_Framework/MPPort.m @@ -201,7 +201,7 @@ -(void)sendGlobalExecNotification:(NSString *)target withStatus:(NSString *)status { - NSString * notificationName = [NSString stringWithString:@"MacPorts"]; + NSString * notificationName = @"MacPorts"; notificationName = [notificationName stringByAppendingString:target]; notificationName = [notificationName stringByAppendingString:status]; @@ -221,7 +221,7 @@ NSString *opts, *v; MPInterpreter *interpreter; - opts = [NSString stringWithString:@" "]; + opts = @" "; //v = [NSString stringWithString:[self name]]; interpreter = [MPInterpreter sharedInterpreter]; @@ -429,7 +429,7 @@ fclose(file); unlink("mpfw_default_variants"); - NSLog(@"Default variants count: %i", [defaultVariants count]); + NSLog(@"Default variants count: %lu", (unsigned long)[defaultVariants count]); //Code for fetching default variants [self setObject:[NSString stringWithString:[defaultVariants componentsJoinedByString:@" "]] forKey:@"default_variantsAsString"]; [self setObject:defaultVariants forKey:@"default_variants"]; diff --git a/MacPorts_Framework/MPPortProcess.m b/MacPorts_Framework/MPPortProcess.m index ad260b4..ad41a63 100644 --- a/MacPorts_Framework/MPPortProcess.m +++ b/MacPorts_Framework/MPPortProcess.m @@ -18,6 +18,7 @@ @implementation MPPortProcess - (id)initWithPKGPath:(NSString*)pkgPath { + NSLog(@"Fool"); PKGPath = pkgPath; [self initializeInterpreter]; return self; @@ -80,7 +81,7 @@ int main(int argc, char const * argv[]) { NSConnection *portProcessConnection; portProcessConnection = [NSConnection defaultConnection]; - NSString *PKGPath = [[NSString alloc] initWithCString:argv[1] encoding:NSUTF8StringEncoding]; + NSString *PKGPath = [[NSString alloc] initWithCString:argv[1] encoding:NSASCIIStringEncoding]; MPPortProcess *portProcess = [[MPPortProcess alloc] initWithPKGPath:PKGPath]; diff --git a/MacPorts_Framework/MacPorts.Framework.xcodeproj/xcuserdata/mrappleseed.xcuserdatad/xcschemes/MPPortProcess.xcscheme b/MacPorts_Framework/MacPorts.Framework.xcodeproj/xcuserdata/mrappleseed.xcuserdatad/xcschemes/MPPortProcess.xcscheme index f905d4b..bea49c4 100644 --- a/MacPorts_Framework/MacPorts.Framework.xcodeproj/xcuserdata/mrappleseed.xcuserdatad/xcschemes/MPPortProcess.xcscheme +++ b/MacPorts_Framework/MacPorts.Framework.xcodeproj/xcuserdata/mrappleseed.xcuserdatad/xcschemes/MPPortProcess.xcscheme @@ -57,6 +57,12 @@ ReferencedContainer = "container:MacPorts.Framework.xcodeproj"> + + + + diff --git a/Pallet/MPActionsController.m b/Pallet/MPActionsController.m index 1bc6e64..9c98794 100644 --- a/Pallet/MPActionsController.m +++ b/Pallet/MPActionsController.m @@ -43,7 +43,7 @@ if (![checkboxes[i] isDefault]) { [variants addObject: [[port valueForKey:@"variants"] objectAtIndex:i]]; - [variants addObject: [NSString stringWithString:@"+"]]; + [variants addObject: @"+"]; } [variantsString appendString:@"+"]; @@ -54,7 +54,7 @@ //If the checkbox is unchecked, we need to check if it is a default_variant, and if so, add it in the list with '-' //in the name, to let macports know that we wish to not use it [variants addObject: [[port valueForKey:@"variants"] objectAtIndex:i]]; - [variants addObject: [NSString stringWithString:@"-"]]; + [variants addObject: @"-"]; [variantsString appendString:@"-"]; [variantsString appendString:[[port valueForKey:@"variants"] objectAtIndex:i]]; } @@ -99,7 +99,7 @@ [port checkDefaults]; NSMutableArray *defaultVariants= [port objectForKey:@"default_variants"]; - NSLog(@"Default variants count: %i", [defaultVariants count]); + NSLog(@"Default variants count: %lu", (unsigned long)[defaultVariants count]); for(UInt i=0; i<[[port valueForKey:@"variants"] count];i++) { //If the variant is included in the default_variants, then check it. Otherwise leave it unchecked @@ -355,7 +355,7 @@ NSLog(@"Starting Queue"); NSUInteger index; index = [queueArray count]-1; - NSLog(@"Array Size is: %u", index); + NSLog(@"Array Size is: %lu", (unsigned long)index); NSUInteger i; [queue setSelectionIndex: 0]; queueCounter=0; @@ -376,9 +376,9 @@ NSUInteger index=queueCounter; if([queueArray count]>index) { - NSLog(@"Advancing Queue for %u", index); + NSLog(@"Advancing Queue for %lu", (unsigned long)index); //index = [queue selectionIndex]; - NSLog(@"Index before: %u", index); + NSLog(@"Index before: %lu", (unsigned long)index); //We select each object from the array [queue setSelectionIndex:index]; diff --git a/Pallet/MPQueueTableView.m b/Pallet/MPQueueTableView.m index 75eaab1..fa71f6f 100644 --- a/Pallet/MPQueueTableView.m +++ b/Pallet/MPQueueTableView.m @@ -16,8 +16,8 @@ if ([[theEvent characters] characterAtIndex:0] == NSDeleteCharacter || [[theEvent characters] characterAtIndex:0] == NSBackspaceCharacter) { NSLog(@"Deleting a queue entry"); - NSLog(@"Selection: %i", [queue selectionIndex]); - if([queue selectionIndex]>=0) [queue removeObjectAtArrangedObjectIndex:[queue selectionIndex]]; + NSLog(@"Selection: %lu", (unsigned long)[queue selectionIndex]); + [queue removeObjectAtArrangedObjectIndex:[queue selectionIndex]]; } else { diff --git a/Pallet/Pallet.xcodeproj/project.pbxproj b/Pallet/Pallet.xcodeproj/project.pbxproj index d4234d3..3bf0c11 100644 --- a/Pallet/Pallet.xcodeproj/project.pbxproj +++ b/Pallet/Pallet.xcodeproj/project.pbxproj @@ -669,7 +669,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/bash; - shellScript = "if [ \"$CONFIGURATION\" = \"Debug-InstallMacPorts\" ]; then\n say \"Building MacPorts\"\n PREFIX=$BUILT_PRODUCTS_DIR/macports-1.8\n\n cd $PROJECT_DIR/../base\n\n PATH=/bin:/sbin:/usr/bin:/usr/sbin \\\n ./configure \\\n --prefix=$PREFIX \\\n --with-tclpackage=$PREFIX/Library/Tcl \\\n --with-no-root-privileges\n\n make\n\n make install\n\n make clean\n $PREFIX/bin/port selfupdate\n say \"done\"\n\nfi"; + shellScript = "if [ \"$CONFIGURATION\" = \"Debug-InstallMacPorts\" ]; then\n say \"Building MacPorts\"\n PREFIX=$BUILT_PRODUCTS_DIR/macports-1.8\n\n cd $PROJECT_DIR/../base\n\n PATH=/bin:/sbin:/usr/bin:/usr/sbin \\\n ./configure \\\n --prefix=$PREFIX \\\n --with-tclpackage=$PREFIX/Library/Tcl \\\n --with-no-root-privileges\n\n make\n\n make install\n\n make clean\n $PREFIX/bin/port selfupdate\n say \"done\"\n\nfi"; }; 21900DE31095001700ED79CF /* Create dmg */ = { isa = PBXShellScriptBuildPhase; @@ -810,10 +810,7 @@ CODE_SIGN_IDENTITY = "Self-signed Applications"; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - FRAMEWORK_SEARCH_PATHS = ( - "\"$(SRCROOT)/../MacPorts_Framework/build\"", - "\"$(SRCROOT)/Growl-1.2.1-Framework\"", - ); + FRAMEWORK_SEARCH_PATHS = "\"$(SRCROOT)/../MacPorts_Framework/build\""; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_ENABLE_OBJC_GC = unsupported; @@ -835,10 +832,7 @@ CODE_SIGN_IDENTITY = "Self-signed Applications"; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - FRAMEWORK_SEARCH_PATHS = ( - "\"$(SRCROOT)/../MacPorts_Framework/build\"", - "\"$(SRCROOT)/Growl-1.2.1-Framework\"", - ); + FRAMEWORK_SEARCH_PATHS = "\"$(SRCROOT)/../MacPorts_Framework/build\""; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_ENABLE_OBJC_GC = unsupported; @@ -860,10 +854,7 @@ CODE_SIGN_IDENTITY = "Self-signed Applications"; COMBINE_HIDPI_IMAGES = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - FRAMEWORK_SEARCH_PATHS = ( - "\"$(SRCROOT)/../MacPorts_Framework/build\"", - "\"$(SRCROOT)/Growl-1.2.1-Framework\"", - ); + FRAMEWORK_SEARCH_PATHS = "\"$(SRCROOT)/../MacPorts_Framework/build\""; GCC_ENABLE_OBJC_GC = unsupported; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -944,6 +935,7 @@ GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_ENABLE_OBJC_GC = unsupported; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", "$(inherited)", @@ -992,6 +984,7 @@ GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_ENABLE_OBJC_GC = unsupported; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", "$(inherited)", @@ -1041,6 +1034,7 @@ ENABLE_NS_ASSERTIONS = NO; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_ENABLE_OBJC_GC = unsupported; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNDECLARED_SELECTOR = YES; @@ -1186,6 +1180,7 @@ 56ED2EA31B45A4BE00E19DDF /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "Pallet" */ = { isa = XCConfigurationList; diff --git a/Pallet/Pallet.xcodeproj/project.xcworkspace/xcuserdata/mrappleseed.xcuserdatad/UserInterfaceState.xcuserstate b/Pallet/Pallet.xcodeproj/project.xcworkspace/xcuserdata/mrappleseed.xcuserdatad/UserInterfaceState.xcuserstate index 08ce87f..2f010d3 100644 Binary files a/Pallet/Pallet.xcodeproj/project.xcworkspace/xcuserdata/mrappleseed.xcuserdatad/UserInterfaceState.xcuserstate and b/Pallet/Pallet.xcodeproj/project.xcworkspace/xcuserdata/mrappleseed.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/Pallet/PortsTableController.m b/Pallet/PortsTableController.m index 4682bfe..829d30c 100644 --- a/Pallet/PortsTableController.m +++ b/Pallet/PortsTableController.m @@ -71,7 +71,7 @@ #pragma mark Private Methods - (void)changePredicateEditorSize:(NSInteger) newRowCount { - NSLog(@"ROWS: %d", newRowCount); + NSLog(@"ROWS: %ld", (long)newRowCount); if (newRowCount == rowCount) return; diff --git a/Pallet/SMJobBlessHelper/SMJobBlessHelper-Info.plist b/Pallet/SMJobBlessHelper/SMJobBlessHelper-Info.plist new file mode 100644 index 0000000..f225c6a --- /dev/null +++ b/Pallet/SMJobBlessHelper/SMJobBlessHelper-Info.plist @@ -0,0 +1,18 @@ + + + + + CFBundleIdentifier + org.macports.SMJobBlessHelper + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + SMJobBlessHelper + CFBundleVersion + 5 + SMAuthorizedClients + + identifier org.macports.SMJobBlessHelper and certificate leaf = H"6a52be62749c0ff3d3192d010737a433423c0513" + + + diff --git a/Pallet/SMJobBlessHelper/SMJobBlessHelper-Launchd.plist b/Pallet/SMJobBlessHelper/SMJobBlessHelper-Launchd.plist new file mode 100644 index 0000000..c32de05 --- /dev/null +++ b/Pallet/SMJobBlessHelper/SMJobBlessHelper-Launchd.plist @@ -0,0 +1,28 @@ + + + + + Label + org.macports.SMJobBlessHelper + OnDemand + + Disabled + + ServiceIPC + + Sockets + + MasterSocket + + SockFamily + Unix + SockPathMode + 438 + SockPathName + /var/run/com.stevestreeting.ExamplePrivilegedHelper.socket + SockType + Stream + + + +