diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2012-03-24 11:42:53 -0400 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2012-03-24 11:42:53 -0400 |
| commit | 980b45ab3ef67cfb3ae2aa9eef85a1a3660028c9 (patch) | |
| tree | ac2e1b3f1708af8e40e36f37014f178c37105bc6 /Makefile | |
| parent | c7be281b3be0f2013aa4b5d5f400981a1adb6e63 (diff) | |
| download | seabios-980b45ab3ef67cfb3ae2aa9eef85a1a3660028c9.tar.gz | |
Use "git describe" in the build generated version description.
Move the build version generation to a script in tools/ and enhance
the system to call "git describe" when it appears the user has a git
repo. Also, allow the version to be extracted from a ".version" file
for use in official tar releases.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 11 |
1 files changed, 4 insertions, 7 deletions
@@ -4,9 +4,6 @@ # # This file may be distributed under the terms of the GNU LGPLv3 license. -# Program version -VERSION=pre-1.6.4-$(shell date +"%Y%m%d_%H%M%S")-$(shell hostname) - # Output directory OUT=out/ @@ -150,8 +147,8 @@ $(OUT)romlayout.o: romlayout.S $(OUT)asm-offsets.h $(Q)$(CC) $(CFLAGS16) -c -D__ASSEMBLY__ $< -o $@ $(OUT)romlayout16.lds: $(OUT)ccode32flat.o $(OUT)code32seg.o $(OUT)ccode16.o $(OUT)romlayout.o tools/layoutrom.py - @echo " Building ld scripts (version \"$(VERSION)\")" - $(Q)echo 'const char VERSION[] = "$(VERSION)";' > $(OUT)version.c + @echo " Building ld scripts" + $(Q)./tools/buildversion.sh $(OUT)version.c $(Q)$(CC) $(CFLAGS32FLAT) -c $(OUT)version.c -o $(OUT)version.o $(Q)$(LD) -melf_i386 -r $(OUT)ccode32flat.o $(OUT)version.o -o $(OUT)code32flat.o $(Q)$(LD) -melf_i386 -r $(OUT)ccode16.o $(OUT)romlayout.o -o $(OUT)code16.o @@ -206,8 +203,8 @@ $(OUT)vgaentry.o: vgaentry.S $(OUT)autoconf.h $(Q)$(CC) $(CFLAGS16VGA) -c -D__ASSEMBLY__ $< -o $@ $(OUT)vgarom.o: $(OUT)vgaccode16.o $(OUT)vgaentry.o $(OUT)vgalayout.lds - @echo " Linking $@ (version \"$(VERSION)\")" - $(Q)printf '#include "types.h"\nchar VERSION[] VAR16 = "$(VERSION)";' > $(OUT)vgaversion.c + @echo " Linking $@" + $(Q)./tools/buildversion.sh $(OUT)vgaversion.c VAR16 $(Q)$(CC) $(CFLAGS16VGA) -c $(OUT)vgaversion.c -o $(OUT)vgaversion.o $(Q)$(LD) --gc-sections -T $(OUT)vgalayout.lds $(OUT)vgaccode16.o $(OUT)vgaentry.o $(OUT)vgaversion.o -o $@ |