From 04160676503960223aaa9179884fe69cf23e8b20 Mon Sep 17 00:00:00 2001
From: ketmar <ketmar@ketmar.no-ip.org>
Date: Tue, 25 Mar 2014 04:02:51 +0200
Subject: [PATCH] some D additions

---
 defaults/Jambase.locs    |  6 ++++++
 defaults/Jambase.profile | 17 +++++++++++++++++
 doc/ChangeLog            |  5 +++++
 3 files changed, 28 insertions(+)

diff --git a/defaults/Jambase.locs b/defaults/Jambase.locs
index 0fa1970..c06310f 100644
--- a/defaults/Jambase.locs
+++ b/defaults/Jambase.locs
@@ -30,8 +30,14 @@ rule set-default-subdir-locates {
     if $(VALGRIND) { bdir = "$(bdir)$(PATH_SEPARATOR)_VALGRIND" ; }
     if $(DIET) { bdir = "$(bdir)$(PATH_SEPARATOR)_DIET" ; }
     if $(OPT_PROFILE) { bdir = "$(bdir)$(PATH_SEPARATOR)_$(OPT_PROFILE)" ; }
+    # D
+    if $(UNITTEST) || $(UNITTESTS) { bdir = "$(bdir)$(PATH_SEPARATOR)_d_unittest" ; }
+    if $(RELEASE) { bdir = "$(bdir)$(PATH_SEPARATOR)_d_release" ; }
+    if $(NODEBUG) || $(NO_DEBUG) { bdir = "$(bdir)$(PATH_SEPARATOR)_d_nodebug" ; }
   }
 
+  if [ HaveRule user-set-subdir-locates ] { bdir = [ user-set-subdir-locates "$(bdir)" ] ; }
+
   ALL_LOCATE_BIN = $(d) ;
   ALL_LOCATE_LIBSO = $(d) ;
   ALL_LOCATE_TARGET = "$(d)$(PATH_SEPARATOR)$(bdir)" ;
diff --git a/defaults/Jambase.profile b/defaults/Jambase.profile
index fcbb419..6273c52 100644
--- a/defaults/Jambase.profile
+++ b/defaults/Jambase.profile
@@ -171,5 +171,22 @@ rule set-profile {
   if $(MAEMO47) && $(Fpic) { CFLAGS.all += -fpic ; }
   if $(MAEMO47) && $(FPIC) { CFLAGS.all += -fPIC ; }
 
+  # d
+  if $(UNITTEST) || $(UNITTESTS) {
+    GDCFLAGS.all += -funittest ;
+  }
+  if $(RELEASE) {
+    GDCFLAGS.all += -frelease ;
+    GDCFLAGS.all += -fno-debug ;
+    GDCFLAGS.all += -fno-in ;
+    GDCFLAGS.all += -fno-out ;
+    GDCFLAGS.all += -fno-invariants ;
+  } else {
+    if ! $(NODEBUG) && ! $(NO_DEBUG) { GDCFLAGS.all += -fdebug ; }
+    GDCFLAGS.all += -fin ;
+    GDCFLAGS.all += -fout ;
+    GDCFLAGS.all += -finvariants ;
+  }
+
   gcc-suggest-attrs ;
 }
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 4a1d32f..88f884e 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -457,3 +457,8 @@
   [+] k8jam will try to load ~/.jam.rc before main Jamfile. you can use it to disable
       idiotic 'diagnostic caret' in gcc 4.8+. just put this to ~/.jam.rc:
         CFLAGS.all += -fno-diagnostics-show-caret ;
+
+  [+] if user-set-subdir-locates rule is present, it will be called from set-target-locations
+      after jam locations processed, with built dir as arg. rule MUST return dir
+
+  [+] added UNITTEST, RELEASE and NODEBUG flags for D
-- 
2.11.4.GIT