From eff0b92c255435c3828ca806bf1c295c22155795 Mon Sep 17 00:00:00 2001 From: "Yutaka Ishikawa ishikawa@is.s.u-tokyo.ac.jp" Date: Mon, 18 Nov 2013 08:09:28 +0900 Subject: [PATCH] 1) DATA --> DATE 2) version and date variables are visible in makefile and documents AC_SUBST --- arch/x86/tools/mcreboot.1in | 2 +- configure | 22 ++++++++++++++++++---- configure.ac | 20 ++++++++++++++------ 3 files changed, 33 insertions(+), 11 deletions(-) diff --git a/arch/x86/tools/mcreboot.1in b/arch/x86/tools/mcreboot.1in index 9cc91b19..679b7ea9 100644 --- a/arch/x86/tools/mcreboot.1in +++ b/arch/x86/tools/mcreboot.1in @@ -4,7 +4,7 @@ .\" Copyright (C) 2013 The University of Tokyo, Japan .\" Written by Yutaka Ishikawa .\" -.TH MCREBOOT 1 "@MCKERNEL_RELEASEDATE@" "Version @MCKERNEL_VERSION@" MCKERNEL @MCKERNEL_VERSION@" +.TH MCREBOOT 1 "@MCKERNEL_RELEASE_DATE@" "Version @MCKERNEL_VERSION@" MCKERNEL @MCKERNEL_VERSION@" .SH NAME mcreboot \- a script to boot/reboot the McKernel environment .\" diff --git a/configure b/configure index e48d92e5..a4ea79a3 100755 --- a/configure +++ b/configure @@ -584,6 +584,12 @@ PACKAGE_URL='' ac_default_prefix=/opt/ppos ac_subst_vars='LTLIBOBJS LIBOBJS +DCFA_RESEASE_DATE +MCKERNEL_RELEASE_DATE +IHK_RELEASE_DATE +DCFA_VERSION +MCKERNEL_VERSION +IHK_VERSION KERNDIR KMODDIR SBINDIR @@ -1753,9 +1759,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu IHK_VERSION=0.9.0 MCKERNEL_VERSION=0.9.0 DCFA_VERSION=0.9.0 -IHK_RELEASE_DATA=2013-11-18 -MCKERNEL_RELEASE_DATA=2013-11-18 -DCFA_RELEASE_DATA=2013-11-18 +IHK_RELEASE_DATE=2013-11-18 +MCKERNEL_RELEASE_DATE=2013-11-18 +DCFA_RELEASE_DATE=2013-11-18 @@ -3234,7 +3240,14 @@ TARGET="$WITH_TARGET" -ac_config_files="$ac_config_files Makefile executer/user/Makefile executer/kernel/Makefile kernel/Makefile arch/x86/tools/mcreboot-attached-mic.sh" + + + + + + + +ac_config_files="$ac_config_files Makefile executer/user/Makefile executer/kernel/Makefile kernel/Makefile arch/x86/tools/mcreboot-attached-mic.sh mcreboot.1:mcreboot.1in" if test "x$enable_dcfa" = xyes; then : @@ -3953,6 +3966,7 @@ do "executer/kernel/Makefile") CONFIG_FILES="$CONFIG_FILES executer/kernel/Makefile" ;; "kernel/Makefile") CONFIG_FILES="$CONFIG_FILES kernel/Makefile" ;; "arch/x86/tools/mcreboot-attached-mic.sh") CONFIG_FILES="$CONFIG_FILES arch/x86/tools/mcreboot-attached-mic.sh" ;; + "mcreboot.1") CONFIG_FILES="$CONFIG_FILES mcreboot.1:mcreboot.1in" ;; "kernel/Makefile.dcfa") CONFIG_FILES="$CONFIG_FILES kernel/Makefile.dcfa" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; diff --git a/configure.ac b/configure.ac index 2b1c9cf9..f16be5c3 100644 --- a/configure.ac +++ b/configure.ac @@ -2,18 +2,18 @@ AC_PREREQ(2.63) m4_define([IHK_VERSION_m4],[0.9.0])dnl m4_define([MCKERNEL_VERSION_m4],[0.9.0])dnl m4_define([DCFA_VERSION_m4],[0.9.0])dnl -m4_define([IHK_RELEASE_DATA_m4],[2013-11-18])dnl -m4_define([MCKERNEL_RELEASE_DATA_m4],[2013-11-18])dnl -m4_define([DCFA_RELEASE_DATA_m4],[2013-11-18])dnl +m4_define([IHK_RELEASE_DATE_m4],[2013-11-18])dnl +m4_define([MCKERNEL_RELEASE_DATE_m4],[2013-11-18])dnl +m4_define([DCFA_RELEASE_DATE_m4],[2013-11-18])dnl AC_INIT([mckernel], MCKERNEL_VERSION_m4) IHK_VERSION=IHK_VERSION_m4 MCKERNEL_VERSION=MCKERNEL_VERSION_m4 DCFA_VERSION=DCFA_VERSION_m4 -IHK_RELEASE_DATA=IHK_RELEASE_DATA_m4 -MCKERNEL_RELEASE_DATA=MCKERNEL_RELEASE_DATA_m4 -DCFA_RELEASE_DATA=DCFA_RELEASE_DATA_m4 +IHK_RELEASE_DATE=IHK_RELEASE_DATE_m4 +MCKERNEL_RELEASE_DATE=MCKERNEL_RELEASE_DATE_m4 +DCFA_RELEASE_DATE=DCFA_RELEASE_DATE_m4 AC_PREFIX_DEFAULT([/opt/ppos]) @@ -120,12 +120,20 @@ AC_SUBST(SBINDIR) AC_SUBST(KMODDIR) AC_SUBST(KERNDIR) +AC_SUBST(IHK_VERSION) +AC_SUBST(MCKERNEL_VERSION) +AC_SUBST(DCFA_VERSION) +AC_SUBST(IHK_RELEASE_DATE) +AC_SUBST(MCKERNEL_RELEASE_DATE) +AC_SUBST(DCFA_RESEASE_DATE) + AC_CONFIG_FILES([ Makefile executer/user/Makefile executer/kernel/Makefile kernel/Makefile arch/x86/tools/mcreboot-attached-mic.sh + mcreboot.1:mcreboot.1in ]) AS_IF([test "x$enable_dcfa" = xyes], [