Merge pull request #4891 from yebblies/verstr

Use generated verstr.h in DDMD to include the generated git tag
dlang · Aug 16, 2015 · 8c1b147 · 8c1b147
2 parents 0275a30 + 38fc307
commit 8c1b147
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/magicport/dprinter.d b/src/magicport/dprinter.d
@@ -153,7 +153,7 @@ class DPrinter : Visitor
         switch(s)
         {
         case "NULL": print("null"); return;
-        case "__IMPORT__": print("\"v\" ~ import(\"VERSION\")[0 .. $ - 1]"); return;
+        case "__IMPORT__": print("\"v\" ~ import(\"verstr.h\")[1 .. 6]"); return;
         case "operator ==": print("opEquals"); return;
         case "import", "module", "version", "ref", "scope",
             "body", "alias", "is",

diff --git a/src/posix.mak b/src/posix.mak
@@ -642,8 +642,8 @@ mars.d : $(SRC) $(ROOT_SRC) magicport.json $(MAGICPORT)
 
 DSRC= $(GENSRC) $(MANUALSRC)
 
-ddmd: mars.d $(MANUALSRC) newdelete.o glue.a backend.a $(HOST_DC)
-	CC=$(HOST_CC) $(HOST_DC_RUN) $(MODEL_FLAG) $(DSRC) -ofddmd newdelete.o glue.a backend.a -vtls -J.. -d $(DFLAGS)
+ddmd: mars.d $(MANUALSRC) newdelete.o glue.a backend.a $(HOST_DC) verstr.h
+	CC=$(HOST_CC) $(HOST_DC_RUN) $(MODEL_FLAG) $(DSRC) -ofddmd newdelete.o glue.a backend.a -vtls -J. -d $(DFLAGS)
 
 #############################
 

diff --git a/src/win32.mak b/src/win32.mak
@@ -361,8 +361,8 @@ $(GENSRC) : $(SRCS) $(ROOTSRC) magicport.json $(MAGICPORT)
 
 DSRC= $(GENSRC) $(MANUALSRC)
 
-ddmd.exe: $(DSRC) newdelete.obj glue.lib backend.lib
-	$(HOST_DC) $(DSRC) -ofddmd.exe newdelete.obj glue.lib backend.lib -vtls -J.. -d -L/STACK:8388608 $(DFLAGS)
+ddmd.exe: $(DSRC) newdelete.obj glue.lib backend.lib verstr.h
+	$(HOST_DC) $(DSRC) -ofddmd.exe newdelete.obj glue.lib backend.lib -vtls -J. -d -L/STACK:8388608 $(DFLAGS)
 
 ############################ Maintenance Targets #############################