aboutsummaryrefslogtreecommitdiffhomepage
path: root/org
diff options
context:
space:
mode:
Diffstat (limited to 'org')
-rw-r--r--org/dr_build_scaffold.org17
1 files changed, 9 insertions, 8 deletions
diff --git a/org/dr_build_scaffold.org b/org/dr_build_scaffold.org
index ca6b224..0b6d901 100644
--- a/org/dr_build_scaffold.org
+++ b/org/dr_build_scaffold.org
@@ -22,7 +22,8 @@
*** git version stamp :git:version:
#+BEGIN_SRC makefile :tangle ../makefile
-PROJECT_VERSION :=$(shell echo `git describe --long --tags | sed -e "s/^[ a-z_-]\+\([0-9.]\+\)/\1/;s/\([^-]*-g\)/r\1/;s/-/./g"`)
+PROG_VER_GIT :=$(shell echo `git describe --long --tags | sed -e "s/^[ a-z_-]\+\([0-9.]\+\)/\1/;s/\([^-]*-g\)/r\1/;s/-/./g"`)
+PROG_VER_DECLARED :=$(shell echo `cat ./views/version.txt | grep --color=never "enum" | sed 's/.\+(\([0-9]\+\),[ \t]\+\([0-9]\+\),[ \t]\+\([0-9]\+\)[ \t]*).\+/\1.\2.\3/g'`)
#+END_SRC
*** dub (build tool) :dub:
@@ -253,8 +254,8 @@ dmd_debug:
#+BEGIN_SRC makefile :tangle ../makefile
dmd_ver:
$(DUB) --compiler=dmd --config=dmd-version
- mv bin/doc-reform-dmd-ver bin-archive/doc-reform-$(PROJECT_VERSION)-dmd
- notify-send -t 0 'D dmd compiled test release executable ready' 'doc-reform-$(PROJECT_VERSION)-dmd'
+ mv bin/doc-reform-dmd-ver bin-archive/doc-reform-$(PROG_VER_DECLARED)-tag-$(PROG_VER_GIT)-dmd
+ notify-send -t 0 'D dmd compiled test release executable ready' 'doc-reform-$(PROG_VER_DECLARED)-tag-$(PROG_VER_GIT)-dmd'
dmd_clean_ver: clean tangle dmd_ver
#+END_SRC
@@ -293,8 +294,8 @@ gdc_debug:
#+BEGIN_SRC makefile :tangle ../makefile
gdc_ver:
$(DUB) --compiler=gdc --config=gdc-version
- mv bin/doc-reform-gdc-ver bin-archive/doc-reform-$(PROJECT_VERSION)-gdc
- notify-send -t 0 'D gdc compiled test release executable ready' 'doc-reform-$(PROJECT_VERSION)-gdc'
+ mv bin/doc-reform-gdc-ver bin-archive/doc-reform-$(PROG_VER_DECLARED)-tag-$(PROG_VER_GIT)-gdc
+ notify-send -t 0 'D gdc compiled test release executable ready' 'doc-reform-$(PROG_VER_DECLARED)-tag-$(PROG_VER_GIT)-gdc'
gdc_clean_ver: clean tangle gdc_ver
#+END_SRC
@@ -333,8 +334,8 @@ ldc_debug:
#+BEGIN_SRC makefile :tangle ../makefile
ldc_ver:
$(DUB) --compiler=ldc2 --config=ldc-version
- mv bin/doc-reform-ldc-ver bin-archive/doc-reform-$(PROJECT_VERSION)-ldc
- notify-send -t 0 'D ldc2 compiled test release executable ready' 'doc-reform-$(PROJECT_VERSION)-ldc'
+ mv bin/doc-reform-ldc-ver bin-archive/doc-reform-$(PROG_VER_DECLARED)-tag-$(PROG_VER_GIT)-ldc
+ notify-send -t 0 'D ldc2 compiled test release executable ready' 'doc-reform-$(PROG_VER_DECLARED)-tag-$(PROG_VER_GIT)-ldc'
ldc_clean_ver: clean tangle ldc_ver
#+END_SRC
@@ -401,7 +402,7 @@ distclean_and_init: expunge
#+BEGIN_SRC makefile :tangle ../makefile
ver:
- echo doc-reform-$(PROJECT_VERSION)
+ echo doc-reform-$(PROG_VER_DECLARED)-tag-$(PROG_VER_GIT)
#+END_SRC
****** tangle build rebuild :clean:tangle:build: