[90805] branches/release_2_0/base

[cal at macports.org]

Revision: 90805
          https://trac.macports.org/changeset/90805
Author:   cal at macports.org
Date:     2012-03-14 17:25:48 -0700 (Wed, 14 Mar 2012)
Log Message:
-----------
Cherry-pick warning about developer_dir pointing to non-existing path

This conflicted, because r89996 isn't in release2-0 yet.

Revision Links:
--------------
    https://trac.macports.org/changeset/89996

Modified Paths:
--------------
    branches/release_2_0/base/ChangeLog
    branches/release_2_0/base/src/macports1.0/macports.tcl

Property Changed:
----------------
    branches/release_2_0/base/


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,80248,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,84344-84345,84351,84908-84909,84931,84937,86131,86872,88032,88045,88179,88185,89429,89537-89539,89612,89839,89894,89988,89993-89994,90000,90002,90004,90010,90020,90032,90054,90056,90058,90075,90082-90084,90088,90100,90107,90112,90151,90154,90180,90647,90650-90651,90654,90657,90692,90712
/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,80248,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,84344-84345,84351,84908-84909,84931,84937,86131,86872,88032,88045,88179,88185,89429,89537-89539,89612,89839,89894,89988,89993-89994,90000,90002,90004,90010,90020,90032,90054,90056,90058,90075,90082-90084,90088,90100,90107,90112,90151,90154,90180,90647,90650-90651,90654,90657,90692,90712,90802-90804
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692

Modified: branches/release_2_0/base/ChangeLog
===================================================================
--- branches/release_2_0/base/ChangeLog	2012-03-15 00:06:08 UTC (rev 90804)
+++ branches/release_2_0/base/ChangeLog	2012-03-15 00:25:48 UTC (rev 90805)
@@ -27,6 +27,9 @@
       r90018-r90019,r90024,r90031)
 
 Release 2.0.5 (unreleased)
+    - warn about non-existing developer_dir when it's set in macports.conf
+      (cal in 90802)
+
     - port automatically installs bsdmake when there's no bsdmake in $PATH and a
       port sets build.type bsd (#33355, cal in r90650)
 

Modified: branches/release_2_0/base/src/macports1.0/macports.tcl
===================================================================
--- branches/release_2_0/base/src/macports1.0/macports.tcl	2012-03-15 00:06:08 UTC (rev 90804)
+++ branches/release_2_0/base/src/macports1.0/macports.tcl	2012-03-15 00:25:48 UTC (rev 90805)
@@ -898,6 +898,14 @@
         trace add variable macports::xcodebuildcmd read macports::setxcodeinfo
     }
 
+    if {[info exists developer_dir]} {
+        if {$os_platform == "darwin" && ![file isdirectory $developer_dir]} {
+            ui_warn "Your developer_dir setting in macports.conf points to a non-existing directory.\
+                Since this is known to cause problems, please correct the setting or comment it and let\
+                macports auto-discover the correct path."
+        }
+    }
+
     if {[getuid] == 0 && $os_major >= 11 && $os_platform == "darwin" && [vercmp $xcodeversion 4.3] >= 0} {
         macports::copy_xcode_plist $env(HOME)
     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120314/0eb697f7/attachment.html>