Chameleon

Chameleon Commit Details

Date:2011-05-27 03:35:14 (8 years 24 days ago)
Author:Azimutz
Commit:890
Parents: 889
Message:Merge trunk (r886 --> 889).
Changes:
M/branches/azimutz/Cleancut/i386/config/Makefile
M/branches/azimutz/Cleancut/Makefile
M/branches/azimutz/Cleancut/i386/config/confdata.c
M/branches/azimutz/Cleancut
M/branches/azimutz/Cleancut/Make.rules
M/branches/azimutz/Cleancut/i386/Makefile
M/branches/azimutz/Cleancut/i386/config/cconfig.c

File differences

branches/azimutz/Cleancut/i386/config/cconfig.c
523523
524524
525525
526
526527
527528
528529
......
799800
800801
801802
803
802804
805
806
807
803808
804809
810
805811
806812
807813
......
813819
814820
815821
816
817
818
819
820
821
822
823
824
822
823
824
825
826
827
828
829
830
831
832
825833
826
827
828
829
830
831
832
833
834
835
836
837
838
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
839855
840856
841857
......
847863
848864
849865
850
866
867
851868
852869
853870
int s_scroll = 0;
while (1) {
item_reset();
current_menu = menu;
build_conf(menu);
int saved_x, saved_y;
char *mode;
int res;
int rebuild = 0;
if(ac > 2 && (strcmp(av[2], "rebuild") == 0)) rebuild = 1;
setlocale(LC_ALL, "");
bindtextdomain(PACKAGE, LOCALEDIR);
textdomain(PACKAGE);
conf_parse(av[1]);
single_menu_mode = 1;
}
initscr();
getyx(stdscr, saved_y, saved_x);
if (init_dialog(NULL)) {
fprintf(stderr, N_("Your display is too small to run Menuconfig!\n"));
fprintf(stderr, N_("It must be at least 19 lines by 80 columns.\n"));
return 1;
}
if(!rebuild)
{
initscr();
getyx(stdscr, saved_y, saved_x);
if (init_dialog(NULL)) {
fprintf(stderr, N_("Your display is too small to run Menuconfig!\n"));
fprintf(stderr, N_("It must be at least 19 lines by 80 columns.\n"));
return 1;
}
}
set_config_filename(conf_get_configname());
do {
conf(&rootmenu);
dialog_clear();
if (conf_get_changed())
res = dialog_yesno(NULL,
_("Do you wish to save your "
"new configuration?\n"
"<ESC><ESC> to continue."),
6, 60);
else
res = -1;
} while (res == KEY_ESC);
end_dialog(saved_x, saved_y);
if(rebuild)
{
res = 0;
}
else
{
do {
conf(&rootmenu);
dialog_clear();
if (conf_get_changed())
res = dialog_yesno(NULL,
_("Do you wish to save your "
"new configuration?\n"
"<ESC><ESC> to continue."),
6, 60);
else
res = -1;
} while (res == KEY_ESC);
end_dialog(saved_x, saved_y);
}
switch (res) {
case 0:
return 1;
}
case -1:
printf(_("\n\n"
if(!rebuild)
printf(_("\n\n"
"*** End of the configuration.\n"
"*** Execute 'make' to start the build or try 'make help'."
"\n\n"));
branches/azimutz/Cleancut/i386/config/confdata.c
659659
660660
661661
662
662
663663
664664
665665
return 1;
}
conf_message(_("configuration written to %s"), newname);
//conf_message(_("configuration written to %s"), newname);
sym_set_change_count(0);
branches/azimutz/Cleancut/i386/config/Makefile
4747
4848
4949
50
51
52
5053
54
5155
5256
5357
config: $(DIRS_NEEDED) $(SYMPROG)
@cd ${SRCROOT} && $(SYMPROG) $(SRCROOT)/Cconfig
rebuild_config: $(DIRS_NEEDED) $(SYMPROG)
@cd ${SRCROOT} && $(SYMPROG) $(SRCROOT)/Cconfig rebuild
.PHONY: config
#dependencies
branches/azimutz/Cleancut/i386/Makefile
3737
3838
3939
40
40
4141
4242
4343
) || exit $$?; \
done
config:
config rebuild_config:
@for i in config; \
do \
echo ================= make $@ for $$i =================; \
branches/azimutz/Cleancut/Make.rules
104104
105105
106106
107
107
108108
109109
110110
......
123123
124124
125125
126
127
$(SRCROOT)/auto.conf $(SRCROOT)/autoconf.h $(SRCROOT)/.config:
@echo "\t[MAKE] config"
@cd $(SRCROOT) && make config
@cd $(SRCROOT) && make rebuild_config
.PHONY: clean
clean:
$(SRCROOT)/autoconf.h \
$(SRCROOT)/autoconf.inc
.DEFAULT_GOAL := all
branches/azimutz/Cleancut/Makefile
3030
3131
3232
33
33
3434
3535
3636
......
9393
9494
9595
96
#
# Currently builds for i386
#
clean config:
config rebuild_config:
@if [ -e ".svn" ]; then svnversion -n | tr -d [:alpha:] > revision; fi
@echo ================= make config for i386 =================;
@( OBJROOT=$(OBJROOT)/i386; \
.PHONY: config
.PHONY: clean
.DEFAULT_GOAL := all

Archive Download the corresponding diff file

Revision: 890