Index: trunk/scconfig/Rev.h =================================================================== --- trunk/scconfig/Rev.h (revision 7563) +++ trunk/scconfig/Rev.h (revision 7564) @@ -1 +1 @@ -static const int myrev = 7506; +static const int myrev = 7564; Index: trunk/scconfig/Rev.tab =================================================================== --- trunk/scconfig/Rev.tab (revision 7563) +++ trunk/scconfig/Rev.tab (revision 7564) @@ -1,4 +1,4 @@ -7506 configure new plugins: export_spice, target_spice +7564 configure new plugins: export_spice, target_spice 7469 configure new plugin for non-graphical fawk sheets 7468 configure new plugin for non-graphical tEDAx sheets 7370 configure cleanup: get rid of local "inline" defs Index: trunk/src/plugins/target_spice/Plug.tmpasm =================================================================== --- trunk/src/plugins/target_spice/Plug.tmpasm (revision 7563) +++ trunk/src/plugins/target_spice/Plug.tmpasm (revision 7564) @@ -3,6 +3,10 @@ $(PLUGDIR)/target_spice/target_spice.o @] +put /local/rnd/mod/CONFFILE {target_spice.conf} +put /local/rnd/mod/CONF {$(PLUGDIR)/target_spice/target_spice_conf.h} +put /local/rnd/mod/CONFVAR {target_spice_conf_internal} + switch /local/module/target_spice/controls case {buildin} include /local/csch/tmpasm/buildin; end; case {plugin} include /local/csch/tmpasm/plugin; end; Index: trunk/src/plugins/target_spice/target_spice.c =================================================================== --- trunk/src/plugins/target_spice/target_spice.c (revision 7563) +++ trunk/src/plugins/target_spice/target_spice.c (revision 7564) @@ -52,6 +52,11 @@ #include #include +#include "target_spice_conf.h" +#include "conf_internal.c" + +static conf_target_spice_t target_spice_conf; + typedef struct { ldch_ctx_t spicelibs; csch_view_eng_t *eng; @@ -72,12 +77,9 @@ static void spicelib_sheet_postload_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { -TODO("make plugin config");; -#if 0 csch_sheet_t *sheet = (csch_sheet_t *)hidlib; - csch_lib_add_all(sheet, spicelibmaster, &export_spice_conf.plugins.export_spice.search_paths); + csch_lib_add_all(sheet, spicelibmaster, &target_spice_conf.plugins.target_spice.search_paths); csch_lib_add_local(sheet, spicelibmaster); -#endif } #include "loclib.c" Index: trunk/src/plugins/target_spice/target_spice.conf =================================================================== --- trunk/src/plugins/target_spice/target_spice.conf (nonexistent) +++ trunk/src/plugins/target_spice/target_spice.conf (revision 7564) @@ -0,0 +1,14 @@ +li:pcb-rnd-conf-v1 { + ha:append { + ha:plugins { + ha:target_spice { + li:search_paths = { + ?../../library/spice + ?$(rc.path.design)/spice + ?~/.sch-rnd/spice/ + $(rc.path.share)/spice + } + } + } + } +} Index: trunk/src/plugins/target_spice/target_spice_conf.h =================================================================== --- trunk/src/plugins/target_spice/target_spice_conf.h (nonexistent) +++ trunk/src/plugins/target_spice/target_spice_conf.h (revision 7564) @@ -0,0 +1,14 @@ +#ifndef SCH_RND_TARGET_SPICE_CONF_H +#define SCH_RND_TARGET_SPICE_CONF_H + +#include + +typedef struct { + const struct { + const struct { + RND_CFT_LIST search_paths; /* ordered list of paths that are each recursively searched for spice module files */ + } target_spice; + } plugins; +} conf_target_spice_t; + +#endif Index: trunk/src/sch-rnd/Makefile.dep =================================================================== --- trunk/src/sch-rnd/Makefile.dep (revision 7563) +++ trunk/src/sch-rnd/Makefile.dep (revision 7564) @@ -868,10 +868,21 @@ ../libcschem/util_compile.h ../plugins/target_spice/target_spice.o: \ ../plugins/target_spice/target_spice.c ../libcschem/config.h \ - ../libcschem/libcschem.h ../../src_3rd/libminuid/libminuid.h \ - ../libcschem/abstract.h ../libcschem/common_types.h \ - ../libcschem/attrib.h ../libcschem/TODO.h ../libcschem/engine.h \ - ../libcschem/actions_csch.h ../libcschem/util_compile.h + ../../src_3rd/load_cache/load_cache.h ../libcschem/libcschem.h \ + ../../src_3rd/libminuid/libminuid.h ../libcschem/abstract.h \ + ../libcschem/common_types.h ../libcschem/attrib.h ../libcschem/TODO.h \ + ../libcschem/compile.h ../libcschem/concrete.h ../libcschem/rtree.h \ + ../libcschem/oidpath.h ../libcschem/vtoid.h \ + ../../src_3rd/libuundo/uundo.h \ + ../../src_3rd/gengeo2d/typecfg_long_double.h ../../src_3rd/opc89.h \ + ../../src_3rd/gengeo2d/common.h ../../src_3rd/gengeo2d/prim.h \ + ../libcschem/project.h ../libcschem/engine.h ../libcschem/cnc_grp.h \ + ../libcschem/event.h ../libcschem/actions_csch.h \ + ../libcschem/util_compile.h ../libcschem/util_loclib.h \ + ../libcschem/plug_library.h ../libcschem/util_lib_fs.h \ + ../libcschem/config.h ../plugins/target_spice/target_spice_conf.h \ + ../plugins/target_spice/conf_internal.c ../plugins/target_spice/loclib.c \ + ../plugins/target_spice/libs.c ../plugins/target_spice/preview.c ../../src_3rd/libucdf/ucdf.o: ../../src_3rd/libucdf/ucdf.c \ ../../src_3rd/libucdf/ucdf.h buffer.o: buffer.c ../libcschem/config.h ../libcschem/project.h \ Index: trunk/src/sch-rnd/menu-default.lht =================================================================== --- trunk/src/sch-rnd/menu-default.lht (revision 7563) +++ trunk/src/sch-rnd/menu-default.lht (revision 7564) @@ -386,8 +386,10 @@ ha:Command Entry = { li:a={a={w;c}; {:};} action=Command() } ha:Tree view = { a={w;t}; action=TreeDialog() } ha:Abstract model = { a={w;a}; action=AbstractDialog() } + - ha:Library = { a={w;l}; action=LibraryDialog(symbol, sheet) } ha:devmaps = { a={w;w;d}; action=LibraryDialog(devmap, sheet) } + ha:spice libs = { a={w;w;s}; action=LibraryDialog(spicelib, sheet) } } }