Browse Source

remove version information, we use rolling development model

Waldemar Brodkorb 10 years ago
parent
commit
989385390a
5 changed files with 7 additions and 25 deletions
  1. 0 3
      BSDmakefile
  2. 0 4
      Config.in
  3. 0 3
      GNUmakefile
  4. 5 10
      adk/config/confdata.c
  5. 2 5
      adk/config/mconf.c

+ 0 - 3
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)

+ 0 - 4
Config.in

@@ -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

+ 0 - 3
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

+ 5 - 10
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);

+ 2 - 5
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);