[84909] trunk/base/src

[jmr at macports.org]

Revision: 84909
          http://trac.macports.org/changeset/84909
Author:   jmr at macports.org
Date:     2011-10-04 08:20:59 -0700 (Tue, 04 Oct 2011)
Log Message:
-----------
only check for xcode installer when we know it's relevant

Modified Paths:
--------------
    trunk/base/src/macports1.0/macports.tcl
    trunk/base/src/port1.0/portutil.tcl

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2011-10-04 15:00:36 UTC (rev 84908)
+++ trunk/base/src/macports1.0/macports.tcl	2011-10-04 15:20:59 UTC (rev 84909)
@@ -44,7 +44,7 @@
         portdbpath libpath binpath auto_path extra_env sources_conf prefix portdbformat \
         portarchivetype portautoclean \
         porttrace portverbose keeplogs destroot_umask variants_conf rsync_server rsync_options \
-        rsync_dir startupitem_type place_worksymlink xcodeversion xcodebuildcmd xcodeinstaller \
+        rsync_dir startupitem_type place_worksymlink xcodeversion xcodebuildcmd \
         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 \
@@ -358,14 +358,12 @@
 proc macports::setxcodeinfo {name1 name2 op} {
     global macports::xcodeversion
     global macports::xcodebuildcmd
-    global macports::xcodeinstaller
 
     trace remove variable macports::xcodeversion read macports::setxcodeinfo
     trace remove variable macports::xcodebuildcmd read macports::setxcodeinfo
 
     if {[catch {set xcodebuild [binaryInPath "xcodebuild"]}] == 0} {
         if {![info exists xcodeversion]} {
-            set macports::xcodeinstaller [file exists "/Applications/Install\ XCode.app"]
             # Determine xcode version
             set macports::xcodeversion "2.0orlower"
             if {[catch {set xcodebuildversion [exec -- $xcodebuild -version 2> /dev/null]}] == 0} {

Modified: trunk/base/src/port1.0/portutil.tcl
===================================================================
--- trunk/base/src/port1.0/portutil.tcl	2011-10-04 15:00:36 UTC (rev 84908)
+++ trunk/base/src/port1.0/portutil.tcl	2011-10-04 15:20:59 UTC (rev 84909)
@@ -2726,7 +2726,7 @@
 
 # check if the installed xcode version is new enough
 proc _check_xcode_version {} {
-    global os.subplatform macosx_version xcodeversion xcodeinstaller
+    global os.subplatform macosx_version xcodeversion
 
     if {${os.subplatform} == "macosx"} {
         switch $macosx_version {
@@ -2753,8 +2753,8 @@
         }
         if {$xcodeversion == "none"} {
             ui_warn "Xcode does not appear to be installed; most ports will likely fail to build."
-            if {$xcodeinstaller} {
-                ui_warn "If you downloaded Xcode through the AppStore you must run \"Install Xcode\" in your /Applications folder."
+            if {[file exists "/Applications/Install\ XCode.app"]} {
+                ui_warn "If you downloaded Xcode from the Mac App Store you must run \"Install Xcode\" in your /Applications folder."
             }
         } elseif {[vercmp $xcodeversion $min] < 0} {
             ui_error "The installed version of Xcode (${xcodeversion}) is too old to use on the installed OS version. Version $rec or later is recommended on Mac OS X ${macosx_version}."
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111004/9d638343/attachment.html>