diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-15 20:30:56 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-16 10:05:00 +0200 |
| commit | 989385390a65cc71f342e6814d86f19ef3d56458 (patch) | |
| tree | e45a9ea97321df59fd554a01c0c550f73cf4b78b | |
| parent | 70b2ee7554663bbcad3fb160f9d29719093f2b1e (diff) | |
remove version information, we use rolling development model
| -rw-r--r-- | BSDmakefile | 3 | ||||
| -rw-r--r-- | Config.in | 4 | ||||
| -rw-r--r-- | GNUmakefile | 3 | ||||
| -rw-r--r-- | adk/config/confdata.c | 15 | ||||
| -rw-r--r-- | adk/config/mconf.c | 7 |
5 files changed, 7 insertions, 25 deletions
diff --git a/BSDmakefile b/BSDmakefile index 9afeaa3af..1720ba495 100644 --- a/BSDmakefile +++ b/BSDmakefile @@ -1,14 +1,11 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -ADKVERSION= 0.1.0 TOPDIR= ${.CURDIR} PWD= ${.CURDIR} .include "${.CURDIR}/Makefile.inc" -GMAKE_ENV+= ADKVERSION=${ADKVERSION:Q} - .if defined(package) && !empty(package) subdir:= package/${package} . if !make(clean) @@ -1,10 +1,6 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -config ADKVERSION - string - option env="ADKVERSION" - config MODULES bool default y diff --git a/GNUmakefile b/GNUmakefile index a5c07a331..b5dd3eea3 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -6,9 +6,6 @@ PWD:= ${TOPDIR} include Makefile.inc -ADKVERSION= 0.1.0 -export ADKVERSION - ifneq (${package},) subdir:= package/${package} _subdir_dep:= ${TOPDIR}/.config diff --git a/adk/config/confdata.c b/adk/config/confdata.c index 4a79c72bb..9c83d4138 100644 --- a/adk/config/confdata.c +++ b/adk/config/confdata.c @@ -434,8 +434,6 @@ int conf_write(const char *name) if (!out) return 1; - sym = sym_lookup("ADKVERSION", 0); - sym_calc_value(sym); time(&now); env = getenv("KCONFIG_NOTIMESTAMP"); if (env && *env) @@ -443,10 +441,9 @@ int conf_write(const char *name) fprintf(out, _("#\n" "# Automatically generated make config: don't edit\n" - "# OpenADK version: %s\n" + "# OpenADK\n" "%s%s" "#\n"), - sym_get_string_value(sym), use_timestamp ? "# " : "", use_timestamp ? ctime(&now) : ""); @@ -689,22 +686,20 @@ int conf_write_autoconf(void) return 1; } - sym = sym_lookup("ADKVERSION", 0); - sym_calc_value(sym); time(&now); fprintf(out, "#\n" "# Automatically generated make config: don't edit\n" - "# OpenADK version: %s\n" + "# OpenADK\n" "# %s" "#\n", - sym_get_string_value(sym), ctime(&now)); + ctime(&now)); fprintf(out_h, "/*\n" " * Automatically generated C config: don't edit\n" - " * OpenADK version: %s\n" + " * OpenADK\n" " * %s" " */\n" "#define AUTOCONF_INCLUDED\n", - sym_get_string_value(sym), ctime(&now)); + ctime(&now)); for_all_symbols(i, sym) { sym_calc_value(sym); diff --git a/adk/config/mconf.c b/adk/config/mconf.c index 6aa2c0d88..8a491e3bb 100644 --- a/adk/config/mconf.c +++ b/adk/config/mconf.c @@ -362,13 +362,10 @@ static void set_config_filename(const char *config_filename) { static char menu_backtitle[PATH_MAX+128]; int size; - struct symbol *sym; - sym = sym_lookup("ADKVERSION", 0); - sym_calc_value(sym); size = snprintf(menu_backtitle, sizeof(menu_backtitle), - _("%s - OpenADK v%s Configuration"), - config_filename, sym_get_string_value(sym)); + _("%s - OpenADK Configuration"), + config_filename); if (size >= sizeof(menu_backtitle)) menu_backtitle[sizeof(menu_backtitle)-1] = '\0'; set_dialog_backtitle(menu_backtitle); |