clarification/bugfix in d.aap

Lars Ivar Igesund <[email protected]> Wed, 25 Feb 2004 10:10:03 +0100

Newsgroups	gmane.comp.tools.aap.devel
Message-ID	<[email protected]>

Hi

Here's another patch for the D support. This time to
d.aap. The changes reflect a change in dmd.py made
a long time ago...

Lars Ivar Igesund

d.diff (text/plain, 1.8 KB)

Index: d.aap
===================================================================
RCS file: /cvsroot/a-a-p/Exec/modules/d.aap,v
retrieving revision 1.10
diff -u -r1.10 d.aap
--- d.aap	14 Nov 2003 14:54:49 -0000	1.10
+++ d.aap	25 Feb 2004 08:55:07 -0000
@@ -75,7 +75,7 @@
 
 # :do depend
 #
-    
+
 :action depend {recursive} 
         {buildcheck = $DMD $?DFLAGS $?DVERSION $?DDEBUG $?DIMPORT } d
     :sys $_top.DDEPCHECK -m $?DIMPORT $source > $target
@@ -96,7 +96,7 @@
         :sys $DMD $?DFLAGS $?DVERSION $opt $dbg $?DDEBUG $?DIMPORT 
                 -of$target -c $source
 
-:action compile object,libobject,default d
+:action compile object,default d
     @if not _no.get("target"):
         target = `src2obj(fname)`
     # Use the d_build action for building and also for :lib.
@@ -113,6 +113,12 @@
     @else:
         :print Dynamic link libraries aren't supported on non-win32 platforms.
 
+:action compile libobject d
+    @if not _no.get("target"):
+        target = `src2obj(fname)`
+    :attr {buildaction = d_buildlib} $target
+    :do d_compile {target = $target} $source
+
 :rule {global}{default} %$OBJSUF : {buildcheck = $DMD $?DFLAGS $?DVERSION $?DDEBUG $?DIMPORT } %.d
     :do compile {target = $target} $source
 
@@ -130,6 +136,10 @@
     @else:
         :print No default action for building dll's from D.
 
+:action d_buildlib default
+    @if _no.get("D_BUILDLIB_ACTION"):
+        :do $D_BUILDLIB_ACTION {target = $target} $source
+
 # :do buildonestep to build targets directly from "d" source
 
 :action d_buildonestep default d
@@ -161,8 +171,6 @@
 :action buildlibonestep default d
     @if _no.get("D_BUILDLIBONESTEP_ACTION"):
         :do $D_BUILDLIBONESTEP_ACTION {target = $target} $source
-    @else:
-        :do d_buildonestep {target = $target} $source
 
 # default route