[37453] trunk/base/src

[jmr at macports.org]

Revision: 37453
          http://trac.macosforge.org/projects/macports/changeset/37453
Author:   jmr at macports.org
Date:     2008-06-08 05:39:45 -0700 (Sun, 08 Jun 2008)

Log Message:
-----------
Check depends_build before configure phase, and check dependencies before
alll packaging targets. This is a step towards fixing #15161.

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	2008-06-08 12:02:52 UTC (rev 37452)
+++ trunk/base/src/macports1.0/macports.tcl	2008-06-08 12:39:45 UTC (rev 37453)
@@ -1236,8 +1236,10 @@
         || $target == "test"
         || $target == "destroot" || $target == "install"
         || $target == "archive"
+        || $target == "dmg" || $target == "mdmg"
         || $target == "pkg" || $target == "mpkg"
-        || $target == "rpm" || $target == "dpkg" } {
+        || $target == "rpm" || $target == "dpkg" 
+        || $target == "srpm" } {
 
         if {[mportdepends $mport $target] != 0} {
             return 1
@@ -1676,17 +1678,19 @@
         
     # Determine deptypes to look for based on target
     switch $target {
-        configure   { set deptypes "depends_lib" }
-        
+        configure   -
         build       { set deptypes "depends_lib depends_build" }
         
         test        -
         destroot    -
         install     -
         archive     -
+        dmg         -
         pkg         -
+        mdmg        -
         mpkg        -
         rpm         -
+        srpm        -
         dpkg        -
         ""          { set deptypes "depends_lib depends_build depends_run" }
     }

Modified: trunk/base/src/port1.0/portutil.tcl
===================================================================
--- trunk/base/src/port1.0/portutil.tcl	2008-06-08 12:02:52 UTC (rev 37452)
+++ trunk/base/src/port1.0/portutil.tcl	2008-06-08 12:39:45 UTC (rev 37453)
@@ -1188,19 +1188,20 @@
                     
                         # Determine deptypes to look for based on target
                         switch $target {
-                            configure   { set deptypes "depends_lib depends_build" }
-                            
+                            configure   -
                             build       { set deptypes "depends_lib depends_build" }
                         
                             test        -
                             destroot    -
                             install     -
                             archive     -
+                            dmg         -
                             pkg         -
                             mpkg        -
                             rpm         -
                             srpm        -
                             dpkg        -
+                            mdmg        -
                             activate    -
                             ""          { set deptypes "depends_lib depends_build depends_run" }
                         }

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080608/343db8a6/attachment.htm