Index: trunk/doc/TODO =================================================================== --- trunk/doc/TODO (revision 473) +++ trunk/doc/TODO (revision 474) @@ -14,6 +14,8 @@ - replace byacc with byaccic: - gcode - gerber + - test ./configure --fontdir + - test ./configure --dot_camv_rnd later: - BUG: {i c p}, tree tab, layer colors, [4], edit at user role: saves a conf array with empty nodes up to [4] [report: Alain] Index: trunk/scconfig/hooks.c =================================================================== --- trunk/scconfig/hooks.c (revision 473) +++ trunk/scconfig/hooks.c (revision 474) @@ -11,8 +11,8 @@ #include -/* we are doing /local/csch/ */ -#define LIBRND_SCCONFIG_APP_TREE "csch" +/* we are doing /local/camv/ */ +#define LIBRND_SCCONFIG_APP_TREE "camv" #include #include @@ -19,17 +19,15 @@ #include #include -#define version "0.9.0-dev" +#define version "1.1.0-dev" #define REQ_LIBRND_MAJOR 3 -#define REQ_LIBRND_MINOR 1 +#define REQ_LIBRND_MINOR 2 const arg_auto_set_t disable_libs[] = { /* list of --disable-LIBs and the subtree they affect */ - {"enable-bison", "/local/csch/want_bison", arg_true, "$enable generating language files using bison/flex"}, - {"disable-bison", "/local/csch/want_bison", arg_false, "$disable generating language files using bison/flex"}, - {"enable-byaccic", "/local/csch/want_byaccic", arg_true, "$enable generating language files using byaccic/ureglex"}, - {"disable-byaccic", "/local/csch/want_byaccic", arg_false, "$disable generating language files byaccic/ureglex"}, + {"enable-byaccic", "/local/camv/want_byaccic", arg_true, "$enable generating language files using byaccic/ureglex"}, + {"disable-byaccic", "/local/camv/want_byaccic", arg_false, "$disable generating language files byaccic/ureglex"}, #undef plugin_def #undef plugin_header @@ -48,8 +46,8 @@ static void help1(void) { - rnd_help1("sch-rnd"); - printf(" --dot_sch_rnd=path .sch-rnd config path under $HOME/\n"); + rnd_help1("camv-rnd"); + printf(" --dot_camv_rnd=path .camv-rnd config path under $HOME/\n"); printf(" --fontdir=path system font dir that hosts ttf files\n"); } @@ -59,24 +57,16 @@ { rnd_hook_custom_arg(key, value, disable_libs); /* call arg_auto_print_options() instead */ - if (strcmp(key, "dot_sch_rnd") == 0) { - need_value("use --dot_sch_rnd=dir"); - put("/local/csch/dot_sch_rnd", value); + if (strcmp(key, "dot_camv_rnd") == 0) { + need_value("use --dot_camv_rnd=dir"); + put("/local/camv/dot_camv_rnd", value); return 1; } if (strcmp(key, "fontdir") == 0) { need_value("use --fontdir=path"); - put("/local/csch/fontdir", value); + put("/local/camv/fontdir", value); return 1; } -/* if (strcmp(key, "debug") == 0) { - put("/local/csch/debug", strue); - return 1; - } - if (strcmp(key, "profile") == 0) { - put("/local/csch/profile", strue); - return 1; - }*/ if (arg_auto_set(key, value, disable_libs) == 0) { fprintf(stderr, "Error: unknown argument %s\n", key); @@ -99,15 +89,15 @@ int hook_postinit() { db_mkdir("/local"); - db_mkdir("/local/csch"); + db_mkdir("/local/camv"); rnd_hook_postinit(); /* defaults */ - put("/local/csch/debug", sfalse); - put("/local/csch/profile", sfalse); + put("/local/camv/debug", sfalse); + put("/local/camv/profile", sfalse); - put("/local/csch/librnd_prefix", TO_STR(LIBRND_PREFIX)); - put("/local/csch/dot_sch_rnd", ".sch-rnd"); + put("/local/camv/librnd_prefix", TO_STR(LIBRND_PREFIX)); + put("/local/camv/dot_camv_rnd", ".camv-rnd"); librnd_ver_req_min(REQ_LIBRND_MAJOR, REQ_LIBRND_MINOR); @@ -119,10 +109,10 @@ { char *tmp; - put("/local/csch/librnd_template", tmp = str_concat("", TO_STR(LIBRND_PREFIX), "/", get("/local/libarchdir"), "/librnd3/scconfig/template", NULL)); + put("/local/camv/librnd_template", tmp = str_concat("", TO_STR(LIBRND_PREFIX), "/", get("/local/libarchdir"), "/librnd3/scconfig/template", NULL)); free(tmp); - return rnd_hook_postarg(TO_STR(LIBRND_PREFIX), "sch-rnd"); + return rnd_hook_postarg(TO_STR(LIBRND_PREFIX), "camv-rnd"); } /* Runs when things should be detected for the host system */ @@ -137,7 +127,6 @@ int hook_detect_target() { const char *host_ansi, *host_ped, *target_ansi, *target_ped, *target_pg, *target_no_pie; - int want_xml2 = plug_is_enabled("io_tinycad"); require("cc/cc", 0, 1); require("cc/fpic", 0, 0); @@ -154,46 +143,20 @@ require("libs/sul/librnd-hid/*", 0, 1); require("libs/sul/freetype2/*", 0, 1); - /* yacc/lex - are we able to regenerate languages? */ - if (istrue(get("/local/csch/want_bison"))) { - require("parsgen/flex/*", 0, 0); - require("parsgen/bison/*", 0, 0); - if (!istrue(get("parsgen/flex/presents")) || !istrue(get("parsgen/bison/presents"))) - put("/local/csch/want_parsgen", sfalse); - else - put("/local/csch/want_parsgen", strue); - } - else { - report("Bison/flex are disabled, along with parser generation.\n"); - put("/local/csch/want_parsgen", sfalse); - } - /* byaccic - are we able to regenerate languages? */ - if (istrue(get("/local/csch/want_byaccic"))) { + if (istrue(get("/local/camv/want_byaccic"))) { require("parsgen/byaccic/*", 0, 0); require("parsgen/ureglex/*", 0, 0); if (!istrue(get("parsgen/byaccic/presents")) || !istrue(get("parsgen/ureglex/presents"))) - put("/local/csch/want_parsgen_byaccic", sfalse); + put("/local/camv/want_parsgen_byaccic", sfalse); else - put("/local/csch/want_parsgen_byaccic", strue); + put("/local/camv/want_parsgen_byaccic", strue); } else { report("byaccic/ureglex are disabled, along with parser generation.\n"); - put("/local/csch/want_parsgen_byaccic", sfalse); + put("/local/camv/want_parsgen_byaccic", sfalse); } - if (want_xml2) { - require("libs/sul/libxml2/presents", 0, 0); - if (!istrue(get("libs/sul/libxml2/presents"))) { - report("libxml2 is not available, disabling io_tinycad...\n"); - report_repeat("WARNING: Since there's no libxml2 found, disabling the tinycad plugin...\n"); - hook_custom_arg("disable-io_tinycad", NULL); - } - put("/local/csch/want_libxml2", strue); - } - else - put("/local/csch/want_libxml2", sfalse); - if (find_fontdir() != 0) return 1; @@ -225,12 +188,12 @@ put("/local/pup/sccbox", "../../scconfig/sccbox"); - printf("Generating src/libcschem/config.h... %s\n", IS_OK(&generr, tmpasm(NULL, "../src/libcschem/config.h.in", "../src/libcschem/config.h"))); - printf("Generating src/libcschem/config.sh... %s\n", IS_OK(&generr, tmpasm(NULL, "../src/libcschem/config.sh.in", "../src/libcschem/config.sh"))); - printf("Generating src/libcschem/Makefile... %s\n", IS_OK(&generr, tmpasm(NULL, "../src/libcschem/Makefile.in", "../src/libcschem/Makefile"))); - printf("Generating src/sch-rnd/Makefile... %s\n", IS_OK(&generr, tmpasm(NULL, "../src/sch-rnd/Makefile.in", "../src/sch-rnd/Makefile"))); - printf("Generating src/sch-rnd/config.h... %s\n", IS_OK(&generr, tmpasm(NULL, "../src/sch-rnd/config.h.in", "../src/sch-rnd/config.h"))); +/* + printf("Generating config.h... %s\n", IS_OK(&generr, tmpasm(NULL, "../config.h.in", "../config.h"))); + printf("Generating config.sh... %s\n", IS_OK(&generr, tmpasm(NULL, "../config.sh.in", "../config.sh"))); + printf("Generating src/Makefile... %s\n", IS_OK(&generr, tmpasm(NULL, "../src/Makefile.in", "../src/Makefile"))); printf("Generating Makefile.conf... %s\n", IS_OK(&generr, tmpasm(NULL, "../Makefile.conf.in", "../Makefile.conf"))); +*/ if (!generr) { printf("\n\n"); @@ -238,12 +201,12 @@ printf("Configuration summary\n"); printf("=====================\n"); - print_sum_setting("/local/csch/debug", "Compilation for debugging"); - print_sum_setting_or("/local/csch/symbols", "Include debug symbols", istrue(get("/local/csch/debug"))); + print_sum_setting("/local/camv/debug", "Compilation for debugging"); + print_sum_setting_or("/local/camv/symbols", "Include debug symbols", istrue(get("/local/camv/debug"))); print_sum_cfg_val("/local/prefix", "installation prefix (--prefix)"); print_sum_cfg_val("/local/confdir", "configuration directory (--confdir)"); - print_sum_cfg_val("/local/csch/dot_sch_rnd", ".sch_rnd config dir under $HOME"); - print_sum_cfg_val("/local/csch/fontdir", "system font dir"); + print_sum_cfg_val("/local/camv/dot_camv_rnd", ".camv_rnd config dir under $HOME"); + print_sum_cfg_val("/local/camv/fontdir", "system font dir"); #undef plugin_def #undef plugin_header