Merge pull request dlang#1469 from 9rnsr/vergen

Use VERSION file to generate version string
llucax · Jan 13, 2013 · 73649ea · 73649ea
2 parents 9a04060 + a422654
commit 73649ea
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 3 deletions.
diff --git a/src/mars.c b/src/mars.c
@@ -97,7 +97,10 @@ Global::Global()
     "\nMSIL back-end (alpha release) by Cristian L. Vlasceanu and associates.";
 #endif
     ;
-    version = "v2.062";
+    version = "v"
+#include "verstr.h"
+    ;
+
     global.structalign = STRUCTALIGN_DEFAULT;
 
     memset(&params, 0, sizeof(Param));

diff --git a/src/posix.mak b/src/posix.mak
@@ -212,6 +212,12 @@ impcnvgen : mtype.h impcnvgen.c
 	$(ENVP) $(CC) $(CFLAGS) impcnvgen.c -o impcnvgen
 	./impcnvgen
 
+######### vergen generates some source
+
+verstr.h : vergen.c ../VERSION
+	$(ENVP) $(CC) vergen.c -o vergen
+	cat ../VERSION | ./vergen > verstr.h
+
 #########
 
 $(DMD_OBJS) : $(idgen_output) $(optabgen_output) $(impcnvgen_output)
@@ -489,7 +495,7 @@ man.o: $(ROOT)/man.c
 mangle.o: mangle.c
 	$(CC) -c $(CFLAGS) $<
 
-mars.o: mars.c
+mars.o: mars.c verstr.h
 	$(CC) -c $(CFLAGS) $<
 
 rmem.o: $(ROOT)/rmem.c

diff --git a/src/vergen.c b/src/vergen.c
@@ -0,0 +1,17 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+
+int main() {
+    int c;
+
+    printf("\"", c);
+    while ((c = fgetc(stdin)) != EOF) {
+        if (c == '\n') break;
+        printf("%c", c);
+    }
+    printf("\"");
+
+    return EXIT_SUCCESS;
+}
diff --git a/src/win32.mak b/src/win32.mak
@@ -386,6 +386,10 @@ id.h id.c : idgen.c
 	$(CC) -cpp -DDM_TARGET_CPU_X86=1 idgen
 	idgen
 
+verstr.h : vergen.c ..\VERSION
+	$(CC) -cpp -DDM_TARGET_CPU_X86=1 vergen
+	type ..\VERSION | vergen > verstr.h
+
 ############################# Intermediate Rules ############################
 
 # Default rules
@@ -524,7 +528,7 @@ glue.obj : $(CH) $(TOTALH) $C\rtlsym.h mars.h module.h glue.c
 imphint.obj : imphint.c
 	$(CC) -c $(CFLAGS) $*
 
-mars.obj : $(TOTALH) module.h mars.h mars.c
+mars.obj : $(TOTALH) module.h mars.h mars.c verstr.h
 	$(CC) -c $(CFLAGS) $(PREC) $* -Ae
 
 md5.obj : $C\md5.h $C\md5.c