Changeset 69c4fe8 in freewrt

Timestamp:

May 23, 2007, 3:57:30 PM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Children:

6b507a71

Parents:

5b4da56

Message:

hack to make new “make wconfig”, developer-only, to generate Config.default
feel free to improve

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@2629 afb5a338-a214-0410-bd46-81f09a774fd1

Files:

• Makefile (modified) (2 diffs)
• mk/build.mk (modified) (1 diff)
• tools/config/conf.c (modified) (3 diffs)
• tools/config/confdata.c (modified) (2 diffs)
• tools/config/symbol.c (modified) (2 diffs)

Makefile

@@ -36 +36 @@
         @echo '                 (default when .config does not exist)'
         @echo '  oldconfig    - Update current config utilising a provided .configs base'
+        @echo '  wconfig      - Same as "oldconfig", but also writes out hidden symbols'
         @echo '  allmodconfig - New config selecting modules when possible'
         @echo '  allnoconfig  - New config where all options are answered with no'
@@ -83 +84 @@
 
 oldconfig: .prereq_done
-        @${GMAKE_INV} oldconfig
+        @${GMAKE_INV} oldconfig W=-o
+
+wconfig: .prereq_done
+        @${GMAKE_INV} oldconfig W=-A
 
 cleandir: .prereq_done

mk/build.mk

@@ -138 +138 @@
 oldconfig: $(CONFIG)/conf
         -touch .config
-        $(CONFIG)/conf -o $(CONFIG_CONFIG_IN)
+        $(CONFIG)/conf ${W} $(CONFIG_CONFIG_IN)
         ${POSTCONFIG}
 

tools/config/conf.c

@@ -13 +13 @@
 #define LKC_DIRECT_LINK
 #include "lkc.h"
+
+extern int output_mode;
 
 static void conf(struct menu *menu);
@@ -85 +87 @@
         case ask_new:
         case ask_silent:
-                if (sym_has_value(sym)) {
+                if (sym_has_value(sym) ||
+                    (output_mode && !(sym->flags & SYMBOL_WRITE))) {
                         printf("%s\n", def);
                         return;
@@ -491 +494 @@
         if (ac > i && av[i][0] == '-') {
                 switch (av[i++][1]) {
+                case 'A':
+                        output_mode = 1;
+                        /* FALLTHROUGH */
                 case 'o':
                         input_mode = ask_new;

tools/config/confdata.c

@@ -13 +13 @@
 #define LKC_DIRECT_LINK
 #include "lkc.h"
+
+int output_mode = 0;
 
 const char conf_def_filename[] = ".config";
@@ -338 +340 @@
                 } else if (!(sym->flags & SYMBOL_CHOICE)) {
                         sym_calc_value(sym);
-                        if (!(sym->flags & SYMBOL_WRITE))
+                        if (!(sym->flags & SYMBOL_WRITE) && !output_mode)
                                 goto next;
                         sym->flags &= ~SYMBOL_WRITE;

tools/config/symbol.c

@@ -11 +11 @@
 #define LKC_DIRECT_LINK
 #include "lkc.h"
+
+extern int output_mode;
 
 struct symbol symbol_yes = {
@@ -116 +118 @@
         for_all_defaults(sym, prop) {
                 prop->visible.tri = expr_calc_value(prop->visible.expr);
-                if (prop->visible.tri != no)
+                if (prop->visible.tri != no || output_mode)
                         return prop;
         }