[Gd-chatter] r11543 - in trunk/fundev/sources/lib: build-system run-time/pentium-linux

[andreas at gwydiondylan.org]

Author: andreas
Date: Fri Dec 14 01:39:12 2007
New Revision: 11543

Modified:
   trunk/fundev/sources/lib/build-system/jam-build.dylan
   trunk/fundev/sources/lib/run-time/pentium-linux/x86-linux-build.jam
Log:
job: fd

Actually perform inclusion of jam files on Linux. Needs to be first rule, too.


Modified: trunk/fundev/sources/lib/build-system/jam-build.dylan
==============================================================================
--- trunk/fundev/sources/lib/build-system/jam-build.dylan	(original)
+++ trunk/fundev/sources/lib/build-system/jam-build.dylan	Fri Dec 14 01:39:12 2007
@@ -28,15 +28,15 @@
   // DylanLibraryRCFiles image : rcfiles ;
   // DylanLibraryJamIncludes image : includes ;
   let rule-specs
-    = #[#["DylanLibraryFiles", #"files", #f],
+    = #[#["DylanLibraryJamIncludes", #"jam-includes", #f],
+	#["DylanLibraryFiles", #"files", #f],
         #["DylanLibraryBaseAddress", #"base-address", #f],
         #["DylanLibraryLinkerOptions", #"linker-options", #t],
         #["DylanLibraryCLibraries", #"c-libraries", #t],
         #["DylanLibraryCObjects", #"c-objects", #f],
         #["DylanLibraryCSources", #"c-source-files", #f],
         #["DylanLibraryCHeaders", #"c-header-files", #f],
-        #["DylanLibraryRCFiles", #"rc-files", #f],
-        #["DylanLibraryJamIncludes", #"jam-includes", #f]];
+        #["DylanLibraryRCFiles", #"rc-files", #f]];
   for(spec in rule-specs)
     let value = element(variables, spec[1], default: #());
     let expanded = if (spec[2]) jam-expand-list(jam, value) else value end;

Modified: trunk/fundev/sources/lib/run-time/pentium-linux/x86-linux-build.jam
==============================================================================
--- trunk/fundev/sources/lib/run-time/pentium-linux/x86-linux-build.jam	(original)
+++ trunk/fundev/sources/lib/run-time/pentium-linux/x86-linux-build.jam	Fri Dec 14 01:39:12 2007
@@ -255,7 +255,11 @@
 rule DylanLibraryJamIncludes image : includes {
   # DylanLibraryJamIncludes image : includes ;
   
-  Echo Ignoring Jam include file(s) $(includes) ;
+  local _i ;
+  for _i in [ FGristFiles $(includes) ] {
+    SEARCH on $(_i) = $(SEARCH_SOURCE) ;
+    include $(_i) ;
+  }
 }
 
 rule DylanLibraryUses image : library : dir {