History

Merge branch 'kbuild/kconfig-for-40' into kbuild/kconfig

Michal Marek committed 15 years ago

Commit 51f31af2 parents de12518 bdebd483 files · +9 −20Browse files

Unified · Split

3 files
  1. Documentation/kbuild/kconfig.txt +0 −5
  2. scripts/kconfig/confdata.c +1 −11
  3. scripts/kconfig/gconf.c +8 −4
Documentation/kbuild/kconfig.txt+0−5
@@ -48,11 +48,6 @@ KCONFIG_OVERWRITECONFIG · 47 unmodified lines
48If you set KCONFIG_OVERWRITECONFIG in the environment, Kconfig will not48If you set KCONFIG_OVERWRITECONFIG in the environment, Kconfig will not
49break symlinks when .config is a symlink to somewhere else.49break symlinks when .config is a symlink to somewhere else.
50 50
51KCONFIG_NOTIMESTAMP
52--------------------------------------------------
53If this environment variable exists and is non-null, the timestamp line
54in generated .config files is omitted.
55
56______________________________________________________________________51______________________________________________________________________
57Environment variables for '{allyes/allmod/allno/rand}config'52Environment variables for '{allyes/allmod/allno/rand}config'
58 53
scripts/kconfig/confdata.c+1−11
@@ -560,8 +560,6 @@ int conf_write(const char *name) · 559 unmodified lines
560 const char *basename;560 const char *basename;
561 const char *str;561 const char *str;
562 char dirname[PATH_MAX+1], tmpname[PATH_MAX+1], newname[PATH_MAX+1];562 char dirname[PATH_MAX+1], tmpname[PATH_MAX+1], newname[PATH_MAX+1];
563 time_t now;
564 int use_timestamp = 1;
565 char *env;563 char *env;
566 564
567 dirname[0] = 0;565 dirname[0] = 0;
@@ -598,19 +596,11 @@ int conf_write(const char *name) · 30 unmodified lines
598 if (!out)596 if (!out)
599 return 1;597 return 1;
600 598
601 time(&now);
602 env = getenv("KCONFIG_NOTIMESTAMP");
603 if (env && *env)
604 use_timestamp = 0;
605
606 fprintf(out, _("#\n"599 fprintf(out, _("#\n"
607 "# Automatically generated make config: don't edit\n"600 "# Automatically generated make config: don't edit\n"
608 "# %s\n"601 "# %s\n"
609 "%s%s"
610 "#\n"),602 "#\n"),
611 rootmenu.prompt->text,603 rootmenu.prompt->text);
612 use_timestamp ? "# " : "",
613 use_timestamp ? ctime(&now) : "");
614 604
615 if (!conf_get_changed())605 if (!conf_get_changed())
616 sym_clear_all_valid();606 sym_clear_all_valid();
scripts/kconfig/gconf.c+8−4
@@ -253,7 +253,7 @@ void init_left_tree(void) · 252 unmodified lines
253 253
254 gtk_tree_view_set_model(view, model1);254 gtk_tree_view_set_model(view, model1);
255 gtk_tree_view_set_headers_visible(view, TRUE);255 gtk_tree_view_set_headers_visible(view, TRUE);
256 gtk_tree_view_set_rules_hint(view, FALSE);256 gtk_tree_view_set_rules_hint(view, TRUE);
257 257
258 column = gtk_tree_view_column_new();258 column = gtk_tree_view_column_new();
259 gtk_tree_view_append_column(view, column);259 gtk_tree_view_append_column(view, column);
@@ -298,7 +298,7 @@ void init_right_tree(void) · 38 unmodified lines
298 298
299 gtk_tree_view_set_model(view, model2);299 gtk_tree_view_set_model(view, model2);
300 gtk_tree_view_set_headers_visible(view, TRUE);300 gtk_tree_view_set_headers_visible(view, TRUE);
301 gtk_tree_view_set_rules_hint(view, FALSE);301 gtk_tree_view_set_rules_hint(view, TRUE);
302 302
303 column = gtk_tree_view_column_new();303 column = gtk_tree_view_column_new();
304 gtk_tree_view_append_column(view, column);304 gtk_tree_view_append_column(view, column);
@@ -756,7 +756,6 @@ void on_load_clicked(GtkButton * button, gpointer user_data) · 451 unmodified lines
756void on_single_clicked(GtkButton * button, gpointer user_data)756void on_single_clicked(GtkButton * button, gpointer user_data)
757{757{
758 view_mode = SINGLE_VIEW;758 view_mode = SINGLE_VIEW;
759 gtk_paned_set_position(GTK_PANED(hpaned), 0);
760 gtk_widget_hide(tree1_w);759 gtk_widget_hide(tree1_w);
761 current = &rootmenu;760 current = &rootmenu;
762 display_tree_part();761 display_tree_part();
@@ -782,7 +781,6 @@ void on_split_clicked(GtkButton * button, gpointer user_data) · 19 unmodified lines
782void on_full_clicked(GtkButton * button, gpointer user_data)781void on_full_clicked(GtkButton * button, gpointer user_data)
783{782{
784 view_mode = FULL_VIEW;783 view_mode = FULL_VIEW;
785 gtk_paned_set_position(GTK_PANED(hpaned), 0);
786 gtk_widget_hide(tree1_w);784 gtk_widget_hide(tree1_w);
787 if (tree2)785 if (tree2)
788 gtk_tree_store_clear(tree2);786 gtk_tree_store_clear(tree2);
@@ -1444,6 +1442,12 @@ static void display_tree(struct menu *menu) · 655 unmodified lines
1444 if (((menu != &rootmenu) && !(menu->flags & MENU_ROOT))1442 if (((menu != &rootmenu) && !(menu->flags & MENU_ROOT))
1445 || (view_mode == FULL_VIEW)1443 || (view_mode == FULL_VIEW)
1446 || (view_mode == SPLIT_VIEW))*/1444 || (view_mode == SPLIT_VIEW))*/
1445
1446 /* Change paned position if the view is not in 'split mode' */
1447 if (view_mode == SINGLE_VIEW || view_mode == FULL_VIEW) {
1448 gtk_paned_set_position(GTK_PANED(hpaned), 0);
1449 }
1450
1447 if (((view_mode == SINGLE_VIEW) && (menu->flags & MENU_ROOT))1451 if (((view_mode == SINGLE_VIEW) && (menu->flags & MENU_ROOT))
1448 || (view_mode == FULL_VIEW)1452 || (view_mode == FULL_VIEW)
1449 || (view_mode == SPLIT_VIEW)) {1453 || (view_mode == SPLIT_VIEW)) {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t