Changeset 3013 for cel/trunk/mk/jam/swig.jam

Timestamp:

2007-10-03 00:12:09 (4 years ago)

Author:

caedesv

Message:

synced swig.jam file from cs, and adapted configure check to
account for libcrystalspace-python not existing any more.

Files:

• cel/trunk/mk/jam/swig.jam (modified) (4 diffs)

cel/trunk/mk/jam/swig.jam

@@ -135 +135 @@
     SWIG.FLAGS on $(target) +=
       $(SWIG.FLAGS) -$(language) $(swigflags) -I$(swigincdirs)
-      -outdir [ ConcatDirs $(outdir) ] ;
+      -outdir [ ConcatDirs $(outdir) ] -o $(target:G=:D=$(LOCATE_TARGET)) ;
 
     # Allow Swig input file to reside at location other than $(SEARCH_SOURCE).
@@ -149 +149 @@
     # Scan for special Swig includes.
     HDRGRIST on $(swigfile) = $(HDRGRIST) ;
-    HDRSEARCH on $(swigfile) =
+    HDRSEARCH on $(swigfile) = [ on $(swigfile) GetVar SEARCH ]
       $(SEARCH_SOURCE:E) $(SUBDIRHDRS) $(HDRS) $(STDHDRS) ;
     HDRRULE on $(swigfile) = HeaderRule ;
@@ -184 +184 @@
     }
   }
+  
+  ##  SwigExternalRuntime target : language [ : swigflags [: frozendirs [: tag ]]]
+  rule SwigExternalRuntime
+  {
+    local target = $(1) ;
+    local language = $(2) ;
+    local swigflags = $(3) ;
+    local frozentargetdir = $(4[1]) ;
+    local frozenotherdir = $(4[2-]) ;
+    local tag = $(5) ;
+
+    if ! $(frozenotherdir) { frozenotherdir = $(frozentargetdir) ; }
+    if ! $(tag) { tag = $(language) ; }
+
+    MakeLocate $(target) : $(LOCATE_TARGET) ;
+
+    SWIG.FLAGS on $(target) +=
+      $(SWIG.FLAGS) -$(language) $(swigflags) -external-runtime [ ConcatDirs $(LOCATE_TARGET) $(target) ] ;
+
+    RunSwig $(target) ;
+    Depends $(tag)swig : $(target) ;
+    NotFile $(tag)swig ;
+    Always $(tag)swig ;
+    Help $(tag)swig : "Generate Swig files for $(tag)" ;
+
+    Clean $(tag)swigclean : $(target) $(othertargets) ;
+    Depends clean : $(tag)swigclean ;
+
+    if $(frozentargetdir)
+    {
+      local frozen_target = $(target:G=$(tag)freeze) ;
+      MakeLocate $(frozen_target) : $(frozentargetdir) ;
+      Depends $(frozen_target) : $(target) ;
+      Copy $(frozen_target) : $(target) ;
+      Depends $(tag)freeze : $(frozen_target) ;
+
+      if $(othertargets)
+      {
+        local frozen_other = $(othertargets:G=$(tag)freeze) ;
+        MakeLocate $(frozen_other) : $(frozenotherdir) ;
+        Depends $(frozen_other) : $(othertargets) ;
+        Copy $(frozen_other) : $(othertargets) ;
+        Depends $(tag)freeze : $(frozen_other) ;
+      }
+
+      NotFile $(tag)freeze ;
+      Help $(tag)freeze : "Copy generated Swig files to source directory" ;
+    }
+  }
 
   actions RunSwig
   {
-    $(CMD.SWIG) $(SWIG.FLAGS) -o $(<) $(>)
+    $(CMD.SWIG) $(SWIG.FLAGS) $(>)
     $(SED) $(SWIG.SED_SCRIPT) < $(<) > $(<).sed
     $(RM) $(<)
@@ -220 +269 @@
   {
     SWIG.HDRPATTERN =
-      "^[       ]*[%#][         ]*include[      ]*[<\"]([^\">]*)[\">].*$" ;
+      "^[       ]*[%#][         ]*i[nm][cp][lo][ur][dt]e?[      ]*[<\"]([^\">]*)[\">].*$" ;
     RegisterHeaderRule HeaderRule : $(SWIG.HDRPATTERN) : .i ;
   }