Index: trunk/scconfig/Rev.h =================================================================== --- trunk/scconfig/Rev.h (revision 29487) +++ trunk/scconfig/Rev.h (revision 29488) @@ -1 +1 @@ -static const int myrev = 29412; +static const int myrev = 29488; Index: trunk/scconfig/Rev.tab =================================================================== --- trunk/scconfig/Rev.tab (revision 29487) +++ trunk/scconfig/Rev.tab (revision 29488) @@ -1,3 +1,4 @@ +29488 configure import_sch conf changes 29412 configure move generic actions from core to librnd 29385 configure remove build system special casing: generated lists for action registration 29375 configure librnd separation: stroke plugin API conversion from stub to event Index: trunk/src_plugins/import_gnetlist/Plug.tmpasm =================================================================== --- trunk/src_plugins/import_gnetlist/Plug.tmpasm (revision 29487) +++ trunk/src_plugins/import_gnetlist/Plug.tmpasm (revision 29488) @@ -1,6 +1,8 @@ put /local/pcb/mod {import_gnetlist} append /local/pcb/mod/OBJS [@ $(PLUGDIR)/import_gnetlist/import_gnetlist.o @] put /local/pcb/mod/CONF {$(PLUGDIR)/import_gnetlist/import_gnetlist_conf.h} +put /local/pcb/mod/CONFFILE {import_gnetlist.conf} +put /local/pcb/mod/CONFVAR {import_gnetlist_conf_internal} switch /local/pcb/import_gnetlist/controls Index: trunk/src_plugins/import_gnetlist/import_gnetlist.c =================================================================== --- trunk/src_plugins/import_gnetlist/import_gnetlist.c (revision 29487) +++ trunk/src_plugins/import_gnetlist/import_gnetlist.c (revision 29488) @@ -39,7 +39,10 @@ #include "plug_import.h" #include "import_gnetlist_conf.h" +#include "../src_plugins/import_gnetlist/conf_internal.c" +#define IMPORT_GNETLIST_CONF_FN "import_gnetlist.conf" + conf_import_gnetlist_t conf_import_gnetlist; static pcb_plug_import_t import_gnetlist; @@ -106,6 +109,7 @@ void pplg_uninit_import_gnetlist(void) { PCB_HOOK_UNREGISTER(pcb_plug_import_t, pcb_plug_import_chain, &import_gnetlist); + pcb_conf_unreg_file(IMPORT_GNETLIST_CONF_FN, import_gnetlist_conf_internal); pcb_conf_unreg_fields("plugins/import_gnetlist/"); } @@ -126,6 +130,8 @@ PCB_HOOK_REGISTER(pcb_plug_import_t, pcb_plug_import_chain, &import_gnetlist); + pcb_conf_reg_file(IMPORT_GNETLIST_CONF_FN, import_gnetlist_conf_internal); + #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \ pcb_conf_reg_field(conf_import_gnetlist, field,isarray,type_name,cpath,cname,desc,flags); #include "import_gnetlist_conf_fields.h" Index: trunk/src_plugins/import_gnetlist/import_gnetlist.conf =================================================================== --- trunk/src_plugins/import_gnetlist/import_gnetlist.conf (nonexistent) +++ trunk/src_plugins/import_gnetlist/import_gnetlist.conf (revision 29488) @@ -0,0 +1,9 @@ +li:pcb-rnd-conf-v1 { + ha:overwrite { + ha:plugins { + ha:import_gnetlist { + gnetlist_program=gnetlist + } + } + } +}