Revision: 90059 http://trac.macports.org/changeset/90059 Author: jmr@macports.org Date: 2012-02-20 02:40:37 -0800 (Mon, 20 Feb 2012) Log Message: ----------- merge r90058 from trunk: add packagemaker_path to macports.conf, use in pkg target, default to /Applications with Xcode 4.3 Revision Links: -------------- http://trac.macports.org/changeset/90058 Modified Paths: -------------- branches/release_2_0/base/doc/macports.conf.in branches/release_2_0/base/src/macports1.0/macports.tcl branches/release_2_0/base/src/package1.0/portpkg.tcl Property Changed: ---------------- branches/release_2_0/ branches/release_2_0/base/ Property changes on: branches/release_2_0 ___________________________________________________________________ Modified: svn:mergeinfo - /trunk:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79787,79864,79943,80069,80088,80178,80220,80222,80224,80226,80229,80245,80287,80335,80443,80581,80583,80586,80779,80797-80798,80894,80928,80932,80934,80969,80971,81119,81146,81234,81361,81371,81414-81415,81454,81464,81467,81522,81557-81558,81562,81565,81567,81577,81630,81657,81830-81832,82111,82767,82921,82924,82947,83136,83149,83267,83270-83271,83391,83395,83443,84351,88045,89988,89993-89994,90000,90002,90004,90010,90020,90054,90056 + /trunk:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79787,79864,79943,80069,80088,80178,80220,80222,80224,80226,80229,80245,80287,80335,80443,80581,80583,80586,80779,80797-80798,80894,80928,80932,80934,80969,80971,81119,81146,81234,81361,81371,81414-81415,81454,81464,81467,81522,81557-81558,81562,81565,81567,81577,81630,81657,81830-81832,82111,82767,82921,82924,82947,83136,83149,83267,83270-83271,83391,83395,83443,84351,88045,89988,89993-89994,90000,90002,90004,90010,90020,90054,90056,90058 Property changes on: branches/release_2_0/base ___________________________________________________________________ Modified: svn:mergeinfo - /branches/gsoc08-privileges/base:37343-46937 /branches/gsoc09-logging/base:51231-60371 /branches/universal-sanity/base:51872-52323 /branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79771-79774,79782,79787,79864,79943,80069,80088,80178,80220,80222,80224,80226,80229,80245,80287,80335,80443,80581,80583,80586,80779,80797-80798,80894,80928,80932,80934,80969,80971,81005,81119,81146,81171,81234,81269,81361,81371,81414-81415,81454,81464,81467,81475,81522,81556-81558,81562,81565,81567,81577,81630,81657,81830-81832,82111,82135,82767,82921,82924,82947,83136,83149,83267,83270-83271,83391,83395,83443,83471,83537,84351,88045,88179,88185,89988,89993-89994,90000,90002,90004,90010,90020,90032,90054,90056 /users/perry/base-bugs_and_notes:45682-46060 /users/perry/base-select:44044-44692 + /branches/gsoc08-privileges/base:37343-46937 /branches/gsoc09-logging/base:51231-60371 /branches/universal-sanity/base:51872-52323 /branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79771-79774,79782,79787,79864,79943,80069,80088,80178,80220,80222,80224,80226,80229,80245,80287,80335,80443,80581,80583,80586,80779,80797-80798,80894,80928,80932,80934,80969,80971,81005,81119,81146,81171,81234,81269,81361,81371,81414-81415,81454,81464,81467,81475,81522,81556-81558,81562,81565,81567,81577,81630,81657,81830-81832,82111,82135,82767,82921,82924,82947,83136,83149,83267,83270-83271,83391,83395,83443,83471,83537,84351,88045,88179,88185,89988,89993-89994,90000,90002,90004,90010,90020,90032,90054,90056,90058 /users/perry/base-bugs_and_notes:45682-46060 /users/perry/base-select:44044-44692 Modified: branches/release_2_0/base/doc/macports.conf.in =================================================================== --- branches/release_2_0/base/doc/macports.conf.in 2012-02-20 10:34:14 UTC (rev 90058) +++ branches/release_2_0/base/doc/macports.conf.in 2012-02-20 10:40:37 UTC (rev 90059) @@ -17,6 +17,14 @@ # Directory containing Xcode Tools (default is to ask xcode-select) #developer_dir @DEVELOPER_DIR@ +# Path to PackageMaker.app +# It may be necessary to set this with Xcode >= 4.3, as that version +# requires PackageMaker to be installed manually from the Auxiliary Tools for +# Xcode disk image. The default is /Applications/PackageMaker.app with Xcode +# 4.3 and ${developer_dir}/Applications/Utilities/PackageMaker.app with older +# versions. +#packagemaker_path /Applications/PackageMaker.app + # Directory containing Applications from ports. applications_dir @MPAPPLICATIONSDIR@ Modified: branches/release_2_0/base/src/macports1.0/macports.tcl =================================================================== --- branches/release_2_0/base/src/macports1.0/macports.tcl 2012-02-20 10:34:14 UTC (rev 90058) +++ branches/release_2_0/base/src/macports1.0/macports.tcl 2012-02-20 10:40:37 UTC (rev 90059) @@ -48,7 +48,7 @@ mp_remote_url mp_remote_submit_url configureccache ccache_dir ccache_size configuredistcc configurepipe buildnicevalue buildmakejobs \ applications_dir frameworks_dir developer_dir universal_archs build_arch macosx_deployment_target \ macportsuser proxy_override_env proxy_http proxy_https proxy_ftp proxy_rsync proxy_skip \ - master_site_local patch_site_local archive_site_local" + master_site_local patch_site_local archive_site_local packagemaker_path" variable user_options "submitter_name submitter_email submitter_key" variable portinterp_options "\ portdbpath porturl portpath portbuildpath auto_path prefix prefix_frozen portsharepath \ @@ -57,7 +57,8 @@ rsync_server rsync_options rsync_dir startupitem_type place_worksymlink macportsuser \ mp_remote_url mp_remote_submit_url configureccache ccache_dir ccache_size configuredistcc configurepipe buildnicevalue buildmakejobs \ applications_dir current_phase frameworks_dir developer_dir universal_archs build_arch \ - os_arch os_endian os_version os_major os_platform macosx_version macosx_deployment_target $user_options" + os_arch os_endian os_version os_major os_platform macosx_version macosx_deployment_target \ + packagemaker_path $user_options" # deferred options are only computed when needed. # they are not exported to the trace thread. Modified: branches/release_2_0/base/src/package1.0/portpkg.tcl =================================================================== --- branches/release_2_0/base/src/package1.0/portpkg.tcl 2012-02-20 10:34:14 UTC (rev 90058) +++ branches/release_2_0/base/src/package1.0/portpkg.tcl 2012-02-20 10:40:37 UTC (rev 90059) @@ -64,8 +64,9 @@ } proc portpkg::package_pkg {portname portversion portrevision} { - global UI_PREFIX portdbpath destpath workpath prefix description package.destpath package.flat long_description homepage portpath porturl - global os.version os.major + global UI_PREFIX portdbpath destpath workpath prefix description \ + package.destpath package.flat long_description homepage portpath porturl \ + os.version os.major xcodeversion packagemaker_path set pkgpath ${package.destpath}/${portname}-${portversion}.pkg @@ -74,7 +75,17 @@ return 0 } - set packagemaker "[option developer_dir]/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker" + if {![info exists packagemaker_path]} { + if {[vercmp $xcodeversion 4.3] >= 0} { + set packagemaker_path /Applications/PackageMaker.app + if {![file exists $packagemaker_path]} { + ui_warn "PackageMaker.app not found; you may need to install it or set packagemaker_path in macports.conf" + } + } else { + set packagemaker_path "[option developer_dir]/Applications/Utilities/PackageMaker.app" + } + } + set packagemaker "${packagemaker_path}/Contents/MacOS/PackageMaker" if ([file exists "$packagemaker"]) { set resourcepath ${workpath}/pkg_resources } else {