macports/pallet
0
0
Fork 0
mirror of https://github.com/macports/pallet.git synced 2026-07-12 18:18:47 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed 10 more warnings, switched SMJobBlessTest to ARC rather than GC.

Browse Source 
git-svn-id: https://svn.macports.org/repository/macports/branches/gsoc15-pallet@138382 d073be05-634f-4543-b044-5fe20cf6d1d6
This commit is contained in:
Kyle Sammons
2015-07-06 20:45:03 +00:00
parent b94c3ca931
commit 7ea2fc08ff
13 changed files with 85 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MacPorts_Framework/Info.plist
+4
View File
@@ -29,5 +29,9 @@
<key>x86_64</key>
<string>10.6.0</string>
</dict>
<key>SMAuthorizedClients</key>
<array>
<string>identifier org.macports.framework.macports and certificate leaf = H&quot;6a52be62749c0ff3d3192d010737a433423c0513&quot;</string>
</array>
</dict>
</plist>
MacPorts_Framework/MPHelperTool.m
+5 -1
View File
@@ -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;
MacPorts_Framework/MPHelperToolIPCTester.m
+2 -2
View File
@@ -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;
MacPorts_Framework/MPPort.m
+3 -3
View File
@@ -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"];
MacPorts_Framework/MPPortProcess.m
+2 -1
View File
@@ -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];
MacPorts_Framework/MacPorts.Framework.xcodeproj/xcuserdata/mrappleseed.xcuserdatad/xcschemes/MPPortProcess.xcscheme
+6
View File
@@ -57,6 +57,12 @@
ReferencedContainer = "container:MacPorts.Framework.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<CommandLineArguments>
<CommandLineArgument
argument = "test"
isEnabled = "YES">
</CommandLineArgument>
</CommandLineArguments>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
Pallet/MPActionsController.m
+6 -6
View File
@@ -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];
Pallet/MPQueueTableView.m
+2 -2
View File
@@ -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
{
Pallet/Pallet.xcodeproj/project.pbxproj
+8 -13
View File
@@ -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;
Pallet/Pallet.xcodeproj/project.xcworkspace/xcuserdata/mrappleseed.xcuserdatad/UserInterfaceState.xcuserstate
Generated
BIN
View File
Binary file not shown.
Pallet/PortsTableController.m
+1 -1
View File
@@ -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;
Pallet/SMJobBlessHelper/SMJobBlessHelper-Info.plist
+18
View File
@@ -0,0 +1,18 @@
<?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>CFBundleIdentifier</key>
<string>org.macports.SMJobBlessHelper</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>SMJobBlessHelper</string>
<key>CFBundleVersion</key>
<string>5</string>
<key>SMAuthorizedClients</key>
<array>
<string>identifier org.macports.SMJobBlessHelper and certificate leaf = H&quot;6a52be62749c0ff3d3192d010737a433423c0513&quot;</string>
</array>
</dict>
</plist>
Pallet/SMJobBlessHelper/SMJobBlessHelper-Launchd.plist
+28
View File
@@ -0,0 +1,28 @@
<?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>Label</key>
<string>org.macports.SMJobBlessHelper</string>
<key>OnDemand</key>
<true/>
<key>Disabled</key>
<true/>
<key>ServiceIPC</key>
<true/>
<key>Sockets</key>
<dict>
<key>MasterSocket</key>
<dict>
<key>SockFamily</key>
<string>Unix</string>
<key>SockPathMode</key>
<integer>438</integer>
<key>SockPathName</key>
<string>/var/run/com.stevestreeting.ExamplePrivilegedHelper.socket</string>
<key>SockType</key>
<string>Stream</string>
</dict>
</dict>
</dict>
</plist>