|
Check-in Number:
|
4533 | |
| Date: |
2004-Apr-23 12:25:22 (local)
2004-Apr-23 10:25:22 (UTC) |
| User: | thl |
| Branch: | |
| Comment: |
remove sa relict from cfg-config.in; modify devtool.conf %version to prefix with additional underscores and run it to create a clean cfg_vers.c whose cfg_version does not conflict with cfg_version() in cfg_main |
| Tickets: |
|
| Inspections: |
|
| Files: |
|
ossp-pkg/cfg/cfg-config.in 1.3 -> 1.4
--- cfg-config.in 2003/01/06 11:17:43 1.3
+++ cfg-config.in 2004/04/23 10:25:22 1.4
@@ -82,7 +82,7 @@
exit 0
;;
--version|-v)
- echo "OSSP sa $cfg_version"
+ echo "OSSP cfg $cfg_version"
exit 0
;;
--all)
|
|
ossp-pkg/cfg/cfg_vers.c 1.4 -> 1.5
--- cfg_vers.c 2004/04/23 10:06:09 1.4
+++ cfg_vers.c 2004/04/23 10:25:22 1.5
@@ -8,7 +8,7 @@
#ifndef _CFG_VERS_C_
#define _CFG_VERS_C_
-#define CFG_VERSION 0x009203
+#define __CFG_VERSION 0x009203
typedef struct {
const int v_hex;
@@ -19,9 +19,9 @@
const char *v_web;
const char *v_sccs;
const char *v_rcs;
-} cfg_version_t;
+} __cfg_version_t;
-extern cfg_version_t cfg_version;
+extern __cfg_version_t __cfg_version;
#endif /* _CFG_VERS_C_ */
@@ -31,7 +31,7 @@
#include "cfg_vers.c"
#undef _CFG_VERS_C_AS_HEADER_
-cfg_version_t cfg_version = {
+__cfg_version_t __cfg_version = {
0x009203,
"0.9.3",
"0.9.3 (23-Apr-2004)",
@@ -39,7 +39,7 @@
"OSSP cfg 0.9.3 (23-Apr-2004)",
"OSSP cfg/0.9.3",
"@(#)OSSP cfg 0.9.3 (23-Apr-2004)",
- "$Id: cfg_vers.c,v 1.4 2004/04/23 10:06:09 thl Exp $"
+ "$Id: cfg_vers.c,v 1.5 2004/04/23 10:25:22 thl Exp $"
};
#endif /* _CFG_VERS_C_AS_HEADER_ */
|
|
ossp-pkg/cfg/devtool.conf 1.14 -> 1.15
--- devtool.conf 2004/03/19 15:43:32 1.14
+++ devtool.conf 2004/04/23 10:25:22 1.15
@@ -53,7 +53,7 @@
./devtool upload
%version
- ./shtool version -lc -n "OSSP cfg" -p "cfg_" -e cfg_vers.c
+ ./shtool version -lc -n "OSSP cfg" -p "__cfg_" -e cfg_vers.c
V=`./shtool version -lc -dlong cfg_vers.c`
sed -e "s/Version .*(.*)/Version $V/g" <README >README.n && mv README.n README
|
|
