diff options
| author | rmanfredi <rmanfredi@190e5f8e-a817-0410-acf6-e9863daed9af> | 2008-05-28 11:19:25 +0000 |
|---|---|---|
| committer | rmanfredi <rmanfredi@190e5f8e-a817-0410-acf6-e9863daed9af> | 2008-05-28 11:19:25 +0000 |
| commit | 6ed168ff814db8f9bcaad6f2e218fb2bbacbdb1c (patch) | |
| tree | d714e774455de2d2950794b5b3ebe9c9da43035e /mcon/U | |
| parent | 5de075ee96dc6fc8b18e37a70af93fca66bbfa25 (diff) | |
SVN revision number is now automatically generated in "revision.h".
The old patchlevel information is no longer used, and <PATCHLEVEL> is
deprecated in unit files, replaced by <REVISION>.
git-svn-id: https://dist.svn.sourceforge.net/svnroot/dist/trunk/dist@25 190e5f8e-a817-0410-acf6-e9863daed9af
Diffstat (limited to 'mcon/U')
| -rw-r--r-- | mcon/U/Head.U | 2 | ||||
| -rw-r--r-- | mcon/U/Oldsym.U | 2 | ||||
| -rw-r--r-- | mcon/U/Options.U | 2 | ||||
| -rw-r--r-- | mcon/U/patchlevel.U | 28 |
4 files changed, 28 insertions, 6 deletions
diff --git a/mcon/U/Head.U b/mcon/U/Head.U index bb1464b..7667c8a 100644 --- a/mcon/U/Head.U +++ b/mcon/U/Head.U @@ -88,7 +88,7 @@ # $Id$ # -# Generated on <DATE> [metaconfig <VERSION> PL<PATCHLEVEL>] +# Generated on <DATE> [metaconfig <VERSION>-<REVISION>] cat >c1$$ <<EOF ARGGGHHHH!!!!! diff --git a/mcon/U/Oldsym.U b/mcon/U/Oldsym.U index 8b11133..816a6f9 100644 --- a/mcon/U/Oldsym.U +++ b/mcon/U/Oldsym.U @@ -28,6 +28,8 @@ : add special variables $test -f $src/patchlevel.h && \ awk '/^#define/ {printf "%s=%s\n",$2,$3}' $src/patchlevel.h >>config.sh +$test -f $src/revision.h && \ +awk '/^#define/ {printf "%s=%s\n",$2,$3}' $src/revision.h >>config.sh echo "CONFIG=true" >>config.sh : propagate old symbols diff --git a/mcon/U/Options.U b/mcon/U/Options.U index a38f565..0508d27 100644 --- a/mcon/U/Options.U +++ b/mcon/U/Options.U @@ -275,7 +275,7 @@ while test $# -gt 0; do esac shift ;; - -V) echo "$me generated by metaconfig <VERSION> PL<PATCHLEVEL>." >&2 + -V) echo "$me generated by metaconfig <VERSION>-<REVISION>." >&2 exit 0;; --) break;; -*) echo "$me: unknown option $1" >&2; shift; error=true;; diff --git a/mcon/U/patchlevel.U b/mcon/U/patchlevel.U index 459f87f..18a3f98 100644 --- a/mcon/U/patchlevel.U +++ b/mcon/U/patchlevel.U @@ -15,15 +15,20 @@ ?RCS: Revision 3.0 1993/08/18 12:09:31 ram ?RCS: Baseline for dist 3.0 netwide release. ?RCS: -?MAKE:patchlevel: package baserev test rsrc +?MAKE:patchlevel revision: package baserev test rsrc ?MAKE: -pick add $@ %< ?S:patchlevel: ?S: The patchlevel level of this package. ?S: The value of patchlevel comes from the patchlevel.h file. ?S:. -: get the patchlevel +?S:revision: +?S: The revision / build of this package. +?S: The value is derived from the REVISION define in the revision.h file. +?S: When revision is defined, the patch level should be ignored if 0. +?S:. +: get the patchlevel / revision echo " " -echo "Getting the current patchlevel..." >&4 +echo "Getting the current patchlevel / revision..." >&4 if $test -r $rsrc/patchlevel.h;then patchlevel=`awk \ '/^#[ ]*define[ ][ ]*PATCHLEVEL/ {print $3}' \ @@ -31,5 +36,20 @@ if $test -r $rsrc/patchlevel.h;then else patchlevel=0 fi -echo "(You have $package $baserev PL$patchlevel.)" +if $test -r $rsrc/revision.h;then + revision=`awk \ + '/^#[ ]*define[ ][ ]*REVISION/ {print $3}' \ + < $rsrc/revision.h` +else + revision=0 +fi +case "$revision" in +0) echo "(You have $package $baserev PL$patchlevel.)" ;; +*) + case "$patchlevel" in + 0) echo "(You have $package $baserev-$revision)";; + *) echo "(You have $package $baserev-$revision PL$patchlevel)";; + esac + ;; +esac |