[39471] branches/gsoc08-framework/MacPorts_Framework_Release

[armahg at macports.org]

Revision: 39471
          http://trac.macosforge.org/projects/macports/changeset/39471
Author:   armahg at macports.org
Date:     2008-08-21 09:01:22 -0700 (Thu, 21 Aug 2008)
Log Message:
-----------
Undoing changes committed after r39374 (when everything was working nicely)

Modified Paths:
--------------
    branches/gsoc08-framework/MacPorts_Framework_Release/MPPort.m
    branches/gsoc08-framework/MacPorts_Framework_Release/MacPorts.Framework.xcodeproj/project.pbxproj
    branches/gsoc08-framework/MacPorts_Framework_Release/ToDo.txt
    branches/gsoc08-framework/MacPorts_Framework_Release/init.tcl
    branches/gsoc08-framework/MacPorts_Framework_Release/interpInit.tcl

Modified: branches/gsoc08-framework/MacPorts_Framework_Release/MPPort.m
===================================================================
--- branches/gsoc08-framework/MacPorts_Framework_Release/MPPort.m	2008-08-21 14:47:58 UTC (rev 39470)
+++ branches/gsoc08-framework/MacPorts_Framework_Release/MPPort.m	2008-08-21 16:01:22 UTC (rev 39471)
@@ -184,7 +184,7 @@
 	
 	[interpreter evaluateStringWithPossiblePrivileges:
 	 [NSString stringWithFormat:
-	  @"[%@ %@ %@ %@]" ,
+	  @"%@ %@ %@ %@" ,
 	  procedure, [self name], v, opts]
 								  error:execError];
 	

Modified: branches/gsoc08-framework/MacPorts_Framework_Release/MacPorts.Framework.xcodeproj/project.pbxproj
===================================================================
--- branches/gsoc08-framework/MacPorts_Framework_Release/MacPorts.Framework.xcodeproj/project.pbxproj	2008-08-21 14:47:58 UTC (rev 39470)
+++ branches/gsoc08-framework/MacPorts_Framework_Release/MacPorts.Framework.xcodeproj/project.pbxproj	2008-08-21 16:01:22 UTC (rev 39471)
@@ -636,8 +636,6 @@
 		1DEB91AE08733DA50010E9CD /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
-				ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "ppc i386 ppc64 x86_64";
 				COPY_PHASE_STRIP = NO;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -721,8 +719,7 @@
 		489DD8F70C94366000595506 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
-				ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "ppc i386 ppc64 x86_64";
+				ARCHS = "$(NATIVE_ARCH)";
 				COPY_PHASE_STRIP = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(value)",

Modified: branches/gsoc08-framework/MacPorts_Framework_Release/ToDo.txt
===================================================================
--- branches/gsoc08-framework/MacPorts_Framework_Release/ToDo.txt	2008-08-21 14:47:58 UTC (rev 39470)
+++ branches/gsoc08-framework/MacPorts_Framework_Release/ToDo.txt	2008-08-21 16:01:22 UTC (rev 39471)
@@ -29,5 +29,3 @@
 yet ...
 
 Fix bug in uninstall
-
-objc_exception_throw - for break points to always be added to!

Modified: branches/gsoc08-framework/MacPorts_Framework_Release/init.tcl
===================================================================
--- branches/gsoc08-framework/MacPorts_Framework_Release/init.tcl	2008-08-21 14:47:58 UTC (rev 39470)
+++ branches/gsoc08-framework/MacPorts_Framework_Release/init.tcl	2008-08-21 16:01:22 UTC (rev 39471)
@@ -149,9 +149,9 @@
 
 #Wrapping the following API routines to catch errors
 #and log error Information in a similar fashion to code
-#in macports.tcl. Note optionslist is not being used for now
-proc mportuninstall {portname {v ""} {optionslist ""} } {
-	if {[catch {portuninstall::uninstall $portname $v [array get options]} result]} {
+#in macports.tcl.
+proc mportuninstall {portname {v ""} optionslist} {
+	if {[catch {portuninstall::uninstall $portname $v $optionslist} result]} {
 		
 			global errorInfo
 			ui_debug "$errorInfo"
@@ -160,8 +160,8 @@
 	}
 }
 
-proc mportactivate {portname {v ""} {optionslist ""}} {
-	if {[catch {portimage::activate $portname $v [array get options]} result]} {
+proc mportactivate {portname v optionslist} {
+	if {[catch {portimage::activate $portname $v $optionslist} result]} {
 			
 			global errorInfo
 			ui_debug "$errorInfo"
@@ -170,8 +170,8 @@
 	}
 }
 
-proc mportdeactivate {portname {v ""} {optionslist ""} } {
-	if {[catch {portimage::deactivate $portname $v [array get options]} result]} {
+proc mportdeactivate {portname v optionslist} {
+	if {[catch {portimage::deactivate $portname $v $optionslist} result]} {
 			
 			global errorInfo
 			ui_debug "$errorInfo"

Modified: branches/gsoc08-framework/MacPorts_Framework_Release/interpInit.tcl
===================================================================
--- branches/gsoc08-framework/MacPorts_Framework_Release/interpInit.tcl	2008-08-21 14:47:58 UTC (rev 39470)
+++ branches/gsoc08-framework/MacPorts_Framework_Release/interpInit.tcl	2008-08-21 16:01:22 UTC (rev 39471)
@@ -153,6 +153,7 @@
 #Wrapping the following API routines to catch errors
 #and log error Information in a similar fashion to code
 #in macports.tcl. Note optionslist is not being used for now
+set mp_empty_list [list]
 proc mportuninstall {portname {v ""} {optionslist ""} } {
 	if {[catch {portuninstall::uninstall $portname $v [array get options]} result]} {
 		
@@ -164,7 +165,7 @@
 }
 
 proc mportactivate {portname {v ""} {optionslist ""}} {
-	if {[catch {portimage::activate $portname $v [array get options]} result]} {
+	if {[catch {portimage::activate $portname $v $optionslist} result]} {
 			
 			global errorInfo
 			ui_debug "$errorInfo"
@@ -174,7 +175,7 @@
 }
 
 proc mportdeactivate {portname {v ""} {optionslist ""} } {
-	if {[catch {portimage::deactivate $portname $v [array get options]} result]} {
+	if {[catch {portimage::deactivate $portname $v $optionslist} result]} {
 			
 			global errorInfo
 			ui_debug "$errorInfo"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080821/100dc4d2/attachment.html