Index: trunk/scconfig/Rev.h =================================================================== --- trunk/scconfig/Rev.h (revision 7431) +++ trunk/scconfig/Rev.h (revision 7432) @@ -1 +1 @@ -static const int myrev = 7372; +static const int myrev = 7432; Index: trunk/scconfig/Rev.tab =================================================================== --- trunk/scconfig/Rev.tab (revision 7431) +++ trunk/scconfig/Rev.tab (revision 7432) @@ -1,3 +1,4 @@ +7432 configure mentor_sch plugin upgrades 7372 configure gtk splitup 7241 configure gtk parametric footprint handling 7217 configure gtk splitup Index: trunk/src/Makefile.dep =================================================================== --- trunk/src/Makefile.dep (revision 7431) +++ trunk/src/Makefile.dep (revision 7432) @@ -1618,7 +1618,35 @@ vtonpoint.h hid.h error.h drc.h buffer.h error.h pcb-printf.h \ ../src_3rd/genvector/gds_char.h compat_misc.h ../src_3rd/gensexpr/gsxl.h \ ../src_3rd/gensexpr/gensexpr_impl.h ../src_3rd/gensexpr/gsx_parse.h \ - action_helper.h hid_actions.h plugins.h hid.h dolists.h + action_helper.h hid_actions.h plugins.h hid.h \ + ../src_plugins/import_mentor_sch/mentor_sch_conf.h conf.h pcb-printf.h \ + ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/dom.h \ + ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \ + ../src_3rd/liblihata/genht/htsp.h ../src_3rd/genvector/vtp0.h \ + list_conf.h conf.h ../src_plugins/import_mentor_sch/netlist_helper.h \ + ../src_3rd/liblihata/genht/htsp.h ../src_3rd/genregex/regex_se.h \ + ../src_3rd/genregex/regex_templ.h ../src_3rd/genregex/regex.h dolists.h \ + ../src_plugins/import_mentor_sch/mentor_sch_conf_fields.h +../src_plugins/import_mentor_sch/netlist_helper.o: \ + ../src_plugins/import_mentor_sch/netlist_helper.c ../config.h \ + ../src_3rd/liblihata/genht/hash.h \ + ../src_plugins/import_mentor_sch/netlist_helper.h \ + ../src_3rd/liblihata/genht/htsp.h ../src_3rd/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h ../src_3rd/genregex/regex_se.h \ + ../src_3rd/genregex/regex_templ.h ../src_3rd/genregex/regex.h \ + compat_misc.h pcb-printf.h ../src_3rd/genvector/gds_char.h \ + ../src_3rd/genvector/genvector_impl.h \ + ../src_3rd/genvector/genvector_undef.h unit.h error.h hid_actions.h \ + hid.h error.h drc.h global_typedefs.h pcb_bool.h attrib.h layer.h \ + globalconst.h obj_all_list.h obj_arc_list.h obj_common.h \ + ../src_3rd/genlist/gendlist.h flag.h obj_arc.h \ + ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ + ../src_3rd/genlist/gentdlist_undef.h obj_elem_list.h obj_elem.h \ + obj_line_list.h obj_line.h obj_pad_list.h obj_pad.h obj_pinvia_list.h \ + obj_pinvia.h obj_text.h font.h ../src_3rd/liblihata/genht/htip.h box.h \ + math_helper.h macro.h move.h misc_util.h ht_element.h \ + ../src_3rd/liblihata/genht/ht.h obj_poly_list.h obj_poly.h polyarea.h \ + obj_text_list.h obj_rat_list.h obj_rat.h layer_grp.h ../src_plugins/import_mucs/mucs.o: ../src_plugins/import_mucs/mucs.c \ ../config.h board.h const.h macro.h global_typedefs.h pcb_bool.h unit.h \ vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \ Index: trunk/src/pcb-conf.lht =================================================================== --- trunk/src/pcb-conf.lht (revision 7431) +++ trunk/src/pcb-conf.lht (revision 7432) @@ -226,6 +226,12 @@ gnetlist_program = gnetlist make_program = make } + ha:import_mentor_sch { + li:map_search_paths = { + {./mentor_parts.map} + {$(rc.path.share)/mentor_parts.map} + } + } ha:hid_gtk { compact_horizontal = 1 compact_vertical = 1 Index: trunk/src_plugins/import_mentor_sch/Plug.tmpasm =================================================================== --- trunk/src_plugins/import_mentor_sch/Plug.tmpasm (revision 7431) +++ trunk/src_plugins/import_mentor_sch/Plug.tmpasm (revision 7432) @@ -3,7 +3,9 @@ $(PLUGDIR)/import_mentor_sch/netlist_helper.o $(PLUGDIR)/import_mentor_sch/mentor_sch.o @] +put /local/pcb/mod/CONF {$(PLUGDIR)/import_mentor_sch/mentor_sch_conf.h} + switch /local/pcb/import_mentor_sch/controls case {buildin} include /local/pcb/tmpasm/buildin; end; case {plugin} include /local/pcb/tmpasm/plugin; end; Index: trunk/src_plugins/import_mentor_sch/mentor_sch.c =================================================================== --- trunk/src_plugins/import_mentor_sch/mentor_sch.c (revision 7431) +++ trunk/src_plugins/import_mentor_sch/mentor_sch.c (revision 7432) @@ -39,9 +39,13 @@ #include "hid_actions.h" #include "plugins.h" #include "hid.h" +#include "mentor_sch_conf.h" #include "netlist_helper.h" +conf_mentor_sch_t conf_mentor; + + static const char *mentor_sch_cookie = "mentor_sch importer"; /* Return the nth child's string of the subtree called subtree_name under node */ @@ -266,11 +270,17 @@ static void hid_mentor_sch_uninit() { pcb_hid_remove_actions_by_cookie(mentor_sch_cookie); + conf_unreg_fields("plugins/import_mentor_sch/"); } #include "dolists.h" pcb_uninit_t hid_import_mentor_sch_init() { + +#define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \ + conf_reg_field(conf_mentor, field,isarray,type_name,cpath,cname,desc,flags); +#include "mentor_sch_conf_fields.h" + PCB_REGISTER_ACTIONS(mentor_sch_action_list, mentor_sch_cookie) return hid_mentor_sch_uninit; } Index: trunk/src_plugins/import_mentor_sch/mentor_sch_conf.h =================================================================== --- trunk/src_plugins/import_mentor_sch/mentor_sch_conf.h (nonexistent) +++ trunk/src_plugins/import_mentor_sch/mentor_sch_conf.h (revision 7432) @@ -0,0 +1,14 @@ +#ifndef PCB_MENTOR_SCH_CONF_H +#define PCB_MENTOR_SCH_CONF_H + +#include "conf.h" + +typedef struct { + const struct plugins { + const struct import_mentor_sch { + CFT_LIST map_search_paths; /* parts map file search paths */ + } import_mentor_sch; + } plugins; +} conf_mentor_sch_t; + +#endif