[syslinux:master] rosh: begin to add Syslinux version string with DATE
syslinux-bot for Gene Cumm
gene.cumm at gmail.com
Fri Oct 8 13:57:14 PDT 2010
Commit-ID: 1c6c24260741888b401f4aae20f129d1a8db252d
Gitweb: http://syslinux.zytor.com/commit/1c6c24260741888b401f4aae20f129d1a8db252d
Author: Gene Cumm <gene.cumm at gmail.com>
AuthorDate: Wed, 7 Jul 2010 09:52:59 -0400
Committer: Gene Cumm <gene.cumm at gmail.com>
CommitDate: Wed, 7 Jul 2010 09:52:59 -0400
rosh: begin to add Syslinux version string with DATE
Was from commit 226224fdd1dff5cfcac641c1405303932b59aa4f; This is incomplete but will be fixed in the next commit
---
com32/rosh/Makefile | 18 +++++++++++++++++-
com32/rosh/rosh.c | 6 +++---
2 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/com32/rosh/Makefile b/com32/rosh/Makefile
index 7bf5059..5bcb166 100644
--- a/com32/rosh/Makefile
+++ b/com32/rosh/Makefile
@@ -1,6 +1,8 @@
## -----------------------------------------------------------------------
##
## Copyright 2001-2008 H. Peter Anvin - All Rights Reserved
+## Copyright 2010 Intel Corporation; author: H. Peter Anvin
+## Copyright 2008-2010 Gene Cumm - All Rights Reserved
##
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -11,18 +13,32 @@
## -----------------------------------------------------------------------
##
-## samples for syslinux users
+## ROSH Read Only Shell
##
topdir = ../..
include MCONFIG
+# from com32/sysdump/Makefile
+# The DATE is set on the make command line when building binaries for
+# official release. Otherwise, substitute a hex string that is pretty much
+# guaranteed to be unique to be unique from build to build.
+ifndef HEXDATE
+HEXDATE := $(shell $(PERL) $(topdir)/now.pl $(SRCS) $(wildcard *.h))
+endif
+ifndef DATE
+DATE := $(shell sh $(topdir)/gen-id.sh $(VERSION) $(HEXDATE))
+endif
+
+
rosh.o: rosh.h
rosh.lo: rosh.h
all: rosh.c32
+allgrc: rosh.c32 rosh.lnx
+
tidy dist:
rm -f *.o *.lo *.a *.lst *.elf .*.d *.tmp
diff --git a/com32/rosh/rosh.c b/com32/rosh/rosh.c
index bf1176f..4e97e0b 100644
--- a/com32/rosh/rosh.c
+++ b/com32/rosh/rosh.c
@@ -32,17 +32,17 @@
* debugging enabled; Comment to remove.
*/
#include "rosh.h"
+#include "../../version.h"
#define APP_LONGNAME "Read-Only Shell"
#define APP_NAME "rosh"
#define APP_AUTHOR "Gene Cumm"
#define APP_YEAR "2010"
-#define APP_VER "beta-b062"
+#define APP_VER "beta-b063"
void rosh_version(void)
{
- printf("%s v %s; (c) %s %s.\n", APP_LONGNAME, APP_VER, APP_YEAR,
- APP_AUTHOR);
+ printf("%s v %s; (c) %s %s.\n\tFrom Syslinux %s, %s\n", APP_LONGNAME, APP_VER, APP_YEAR, APP_AUTHOR, VERSION_STR, DATE);
}
void print_beta(void)
More information about the Syslinux-commits
mailing list