[68209] branches/release_1_9/base

raimue at macports.org raimue at macports.org
Fri May 28 18:20:17 PDT 2010


Revision: 68209
          http://trac.macports.org/changeset/68209
Author:   raimue at macports.org
Date:     2010-05-28 18:20:14 -0700 (Fri, 28 May 2010)
Log Message:
-----------
merge r68206 and r68207 from trunk: Remove support for include statements

Revision Links:
--------------
    http://trac.macports.org/changeset/68206
    http://trac.macports.org/changeset/68207

Modified Paths:
--------------
    branches/release_1_9/base/ChangeLog
    branches/release_1_9/base/src/port1.0/portutil.tcl

Modified: branches/release_1_9/base/ChangeLog
===================================================================
--- branches/release_1_9/base/ChangeLog	2010-05-29 01:16:39 UTC (rev 68208)
+++ branches/release_1_9/base/ChangeLog	2010-05-29 01:20:14 UTC (rev 68209)
@@ -5,6 +5,9 @@
 
 Release 1.9.0 (unreleased):
 
+    - It is no longer possible to use include statements in Portfiles
+      (raimue in r68206)
+
     - Command line options can be abbreviated if unambiguous
       (raimue in r66837)
 

Modified: branches/release_1_9/base/src/port1.0/portutil.tcl
===================================================================
--- branches/release_1_9/base/src/port1.0/portutil.tcl	2010-05-29 01:16:39 UTC (rev 68208)
+++ branches/release_1_9/base/src/port1.0/portutil.tcl	2010-05-29 01:20:14 UTC (rev 68209)
@@ -1134,32 +1134,6 @@
     return
 }
 
-# filefindbypath
-# Provides searching of the standard path for included files
-proc filefindbypath {fname} {
-    global distpath filesdir worksrcdir portpath
-
-    if {[file readable $portpath/$fname]} {
-        return $portpath/$fname
-    } elseif {[file readable $portpath/$filesdir/$fname]} {
-        return $portpath/$filesdir/$fname
-    } elseif {[file readable $distpath/$fname]} {
-        return $distpath/$fname
-    }
-    return ""
-}
-
-# include
-# Source a file, looking for it along a standard search path.
-proc include {fname} {
-    set tgt [filefindbypath $fname]
-    if {[string length $tgt]} {
-        uplevel "source $tgt"
-    } else {
-        return -code error "Unable to find include file $fname"
-    }
-}
-
 # makeuserproc
 # This procedure re-writes the user-defined custom target to include
 # all the globals in its scope.  This is undeniably ugly, but I haven't
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100528/82ca375c/attachment.html>


More information about the macports-changes mailing list