From 8d8134c7f69ef0c3e680699b19320165c791d75b Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Wed, 31 Aug 2016 11:34:22 -0400
Subject: 0.6.6 resolves dmd frame pointer access issue (ldc was ok)

* output struct hub nests output structs such as html, resolves issue
  with dmd frame pointer access
---
 maker.org | 36 ++++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 12 deletions(-)

(limited to 'maker.org')

diff --git a/maker.org b/maker.org
index 1975570..aa7db86 100644
--- a/maker.org
+++ b/maker.org
@@ -28,7 +28,7 @@ http://dlang.org/
 #+BEGIN_SRC makefile :tangle makefile
 DMD=dmd
 DMD_FLAGS=-de -w -J./views -I./src/sdp -linker=ld.gold
-DMD_FLAGS_RELEASE=-O -release
+DMD_FLAGS_RELEASE=-O -inline -release
 DMD_FLAG_BINOF=-of
 #+END_SRC
 
@@ -39,7 +39,7 @@ https://github.com/ldc-developers/ldc
 #+BEGIN_SRC makefile :tangle makefile
 LDC=ldc2
 LDC_FLAGS=-w -J=views -I=src/sdp -linker=ld.gold
-LDC_FLAGS_RELEASE=-O4 -release
+LDC_FLAGS_RELEASE=-O4 -inline -release
 LDC_FLAG_BINOF=-of=
 #+END_SRC
 
@@ -235,17 +235,22 @@ makefile_new:
 
 ***** TODO _dub_ build rebuild [#A]                                       :dub:
 
+****** generic
 #+BEGIN_SRC makefile :tangle makefile
 dub: $(PRG_SRCDIR)/$(PRG_SRC)
 	$(DUB) $(DUB_FLAGS)$(DC)
 debug_dub: $(PRG_SRCDIR)/$(PRG_SRC)
 	$(DUB) $(DUB_FLAGS)$(DC) $(DUB_FLAGS_DEBUG)
+#+END_SRC
+
+****** dmd
+#+BEGIN_SRC makefile :tangle makefile
 # dmd
 dub_dmd_release: expunge skel tangle
 	$(DUB) $(DUB_FLAGS)dmd --config=sdp-release
-dub_dmd_stamp: tangle
+dub_dmd_release_stamp: clean_src skel tangle
 	$(DUB) $(DUB_FLAGS)dmd --config=sdp-dmd
-dub_dmd_release_test: tangle
+dub_dmd_test_release: tangle
 	$(DUB) $(DUB_FLAGS)dmd --config=sdp-dmd
 dub_dmd_debug: tangle
 	$(DUB) $(DUB_FLAGS)dmd --config=sdp-debug-dmd
@@ -255,12 +260,16 @@ dub_dmd_tmp: tangle
 	$(DUB) $(DUB_FLAGS)dmd --config=sdp-tmp
 dub_dmd_debug_src:
 	$(DUB) $(DUB_FLAGS)dmd --config=sdp-debug
+#+END_SRC
+
+****** ldc
+#+BEGIN_SRC makefile :tangle makefile
 # ldc2
 dub_ldc_release: expunge skel tangle
 	$(DUB) $(DUB_FLAGS)ldc2 --config=sdp-release
-dub_ldc_stamp: tangle
+dub_ldc_release_stamp: clean_src skel tangle
 	$(DUB) $(DUB_FLAGS)ldc2 --config=sdp-ldc
-dub_ldc_release_test: tangle
+dub_ldc_test_release: tangle
 	$(DUB) $(DUB_FLAGS)ldc2 --config=sdp-ldc
 dub_ldc_debug: tangle
 	$(DUB) $(DUB_FLAGS)ldc2 --config=sdp-debug-ldc
@@ -285,7 +294,6 @@ rdmd: $(PRG_SRCDIR)/$(PRG_SRC)
 #+END_SRC
 
 **** debug                                                            :debug:
-
 ***** debug
 
 #+BEGIN_SRC makefile :tangle makefile
@@ -363,9 +371,13 @@ skel:
 
 init: skel
 
-clean:
+clean_bin:
 	rm $(PRG_BINDIR)/*
 
+clean_src:
+	rm -f $(PRG_SRCDIR)/*; \
+	rm -rf $(PRG_SRCDIR)/$(PRG_NAME); \
+
 expunge:
 	rm -f $(PRG_SRCDIR)/*; \
 	rm -rf $(PRG_SRCDIR)/$(PRG_NAME); \
@@ -430,11 +442,11 @@ gitsnapshot: distclean tangle
 	git commit -a
 #+END_SRC
 
-** phony                                                              :phony:
+** phony                                                             :phony:
 
 #+BEGIN_SRC makefile :tangle makefile
 .PHONY : all build rebuild debug release \
-	clean distclean init \
+	distclean init \
 	tangle gitsnapshot
 #+END_SRC
 
@@ -459,7 +471,7 @@ stringImportPaths "./views"
 buildRequirements "allowWarnings"
 #+END_SRC
 
-**** configuration generic                                              :generic:
+**** configuration generic                                           :generic:
 #+BEGIN_SRC sh  :tangle dub.sdl
 configuration     "sdp-release" {
   name            "release"
@@ -625,7 +637,7 @@ dflags        platform="dmd" "-v --force -de -w -J./views -I./src/sdp -of./bin/s
 dflags        platform="dmd" "-O -release"
 #buildOptions      "-O -release"
 
-*** +dub.json+                                                          :json:
+*** +dub.json+                                                       :json:
 
 **** +sdp+
 #+BEGIN_SRC json  :tangle no
-- 
cgit v1.2.3