[21762] trunk/base/src/port1.0/resources/group/xcode-1.0.tcl

[source_changes at macosforge.org]

Revision: 21762
          http://trac.macosforge.org/projects/macports/changeset/21762
Author:   eridius at macports.org
Date:     2007-02-05 15:20:58 -0800 (Mon, 05 Feb 2007)

Log Message:
-----------
Add OBJROOT and SYMROOT args to xcodebuild to ensure it builds within the work dir.
Redefine destroot.destdir instead of passing DSTROOT manually to avoid the useless DESTDIR arg to xcodebuild; also, it's cleaner this way

Modified Paths:
--------------
    trunk/base/src/port1.0/resources/group/xcode-1.0.tcl

Modified: trunk/base/src/port1.0/resources/group/xcode-1.0.tcl
===================================================================
--- trunk/base/src/port1.0/resources/group/xcode-1.0.tcl	2007-02-05 23:12:49 UTC (rev 21761)
+++ trunk/base/src/port1.0/resources/group/xcode-1.0.tcl	2007-02-05 23:20:58 UTC (rev 21762)
@@ -95,6 +95,7 @@
 default destroot.args		install
 default destroot.pre_args	{}
 default destroot.target		""
+default destroot.destdir	{DSTROOT="${destroot}"}
 
 # Default values for parameters.
 options xcode.project
@@ -254,17 +255,18 @@
 	# set some arguments.
 	set xcode_configuration_arg [xcode::get_configuration_arg ${xcode.configuration}]
 	set xcode_project_arg [xcode::get_project_arg ${xcode.project}]
+	set xcode_build_args "OBJROOT=build/ SYMROOT=build/"
 	
 	# iterate on targets if there is any, do -alltargets otherwise.
 	if {"$xcode_targets" == ""} {
 		xcode::build_one_target \
 			"$xcode_project_arg -alltargets $xcode_configuration_arg" \
-			"${xcode.build.settings}"
+			"$xcode_build_args ${xcode.build.settings}"
 	} else {
 		foreach target $xcode_targets {
 			xcode::build_one_target \
 				"$xcode_project_arg -target \"$target\" $xcode_configuration_arg" \
-				"${xcode.build.settings}"
+				"$xcode_build_args ${xcode.build.settings}"
 		}
 	}
 }
@@ -286,17 +288,18 @@
 	set xcode_project_arg [xcode::get_project_arg ${xcode.project}]
 	set xcode_install_path_setting [xcode::get_install_path_setting \
 		${xcode.destroot.path} ${xcode.destroot.type}]
+	set xcode_build_args "OBJROOT=build/ SYMROOT=build/"
 	
 	# iterate on targets if there is any, do -alltargets otherwise.
 	if {"$xcode_targets" == ""} {
 		xcode::destroot_one_target \
 			"$xcode_project_arg -alltargets $xcode_configuration_arg" \
-			"$xcode_install_path_setting DSTROOT=$destroot ${xcode.destroot.settings}"
+			"$xcode_install_path_setting $xcode_build_args ${xcode.destroot.settings}"
 	} else {
 		foreach target $xcode_targets {
 			xcode::destroot_one_target \
 				"$xcode_project_arg -target \"$target\" $xcode_configuration_arg" \
-				"$xcode_install_path_setting DSTROOT=$destroot ${xcode.destroot.settings}"
+				"$xcode_install_path_setting $xcode_build_args ${xcode.destroot.settings}"
 		}
 	}
 }

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070205/035b3ad6/attachment.html