From 0245c394af1a4a1400f87916bd10c398005f40da Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Tue, 14 Jun 2016 22:52:15 -0400
Subject: step4 some additional work

---
 makefile | 35 +++++++++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

(limited to 'makefile')

diff --git a/makefile b/makefile
index 0814f9f..a6c8b0b 100644
--- a/makefile
+++ b/makefile
@@ -16,7 +16,7 @@ RDMD_FLAGS=--build-only --compiler=
 DUB=dub
 DUB_FLAGS=-v --force --compiler=
 # SET_D_COMPILER=(one of: DMD LDC or GDC):
-SET_D_COMPILER=DMD
+SET_D_COMPILER=LDC
 SET_DC_FLAGS_DEBUG_EXTRA=-debug=dumpdoc
 DC=$($(SET_D_COMPILER))
 DC_FLAGS=$($(shell echo $(SET_D_COMPILER)_FLAGS))
@@ -41,7 +41,7 @@ PRG_SRCDIR=./src
 PRG_BIN=$(PRG_NAME)
 PRG_BINDIR=./bin
 # ORG
-ORG_VERSION=20160411
+ORG_VERSION=20160530
 EMACSLISP=/usr/share/emacs/site-lisp
 EMACSLISP_ORG=~/.emacs.d/elpa/org-$($(shell echo $(ORG_VERSION)))
 EMACSLISP_ORG_CONTRIB=~/.emacs.d/elpa/org-plus-contrib-$($(shell echo $(ORG_VERSION)))
@@ -63,6 +63,31 @@ dub: $(PRG_SRCDIR)/$(PRG_SRC)
 	$(DUB) $(DUB_FLAGS)$(DC)
 debug_dub: $(PRG_SRCDIR)/$(PRG_SRC)
 	$(DUB) $(DUB_FLAGS)$(DC) $(DUB_FLAGS_DEBUG)
+# dmd
+dub_dmd_release: expunge skel tangle
+	$(DUB) $(DUB_FLAGS)dmd --config=sdp-release
+dub_dmd_release_test: tangle
+	$(DUB) $(DUB_FLAGS)dmd --config=sdp-dmd
+dub_dmd_debug: tangle
+	$(DUB) $(DUB_FLAGS)dmd --config=sdp-debug
+dub_dmd_debug_clean: tangle
+	$(DUB) $(DUB_FLAGS)dmd --config=sdp-debug-clean
+dub_dmd_tmp: tangle
+	$(DUB) $(DUB_FLAGS)dmd --config=sdp-tmp
+# ldc2
+dub_ldc_release: expunge skel tangle
+	$(DUB) $(DUB_FLAGS)ldc2 --config=sdp-release
+dub_ldc_release_test: tangle
+	$(DUB) $(DUB_FLAGS)ldc2 --config=sdp-ldc
+dub_ldc_debug: tangle
+	$(DUB) $(DUB_FLAGS)ldc2 --config=sdp-debug
+dub_ldc_debug_clean: tangle
+	$(DUB) $(DUB_FLAGS)ldc2 --config=sdp-debug-clean
+dub_ldc_tmp: tangle
+	$(DUB) $(DUB_FLAGS)ldc2 --config=sdp-tmp
+# test releases
+dub_release_test_dmd: tangle dub_dmd_release_test
+dub_release_test_ldc: tangle dub_ldc_release_test
 rdmd: $(PRG_SRCDIR)/$(PRG_SRC)
 	$(RDMD) $(RDMD_FLAGS)$(DC) $(DC_FLAGS) \
 	$(DC_FLAG_BINOF)$(PRG_BINDIR)/$(PRG_BIN) \
@@ -124,11 +149,13 @@ clean:
 
 expunge:
 	rm -rf $(PRG_BINDIR); \
-	rm -rf $(PRG_SRCDIR);
+	rm -rf $(PRG_SRCDIR)/$(PRG_NAME);
 
 distclean: expunge
 
-distclean_and_init: expunge skel
+distclean_and_init: expunge
+	mkdir -p $(PRG_SRCDIR)/$(PRG_NAME); \
+	mkdir -p $(PRG_BINDIR);
 tangle: skel
 	for f in $(ORGFILELIST); do \
 		ORGFILES="$$ORGFILES \"$$f\""; \
-- 
cgit v1.2.3