Index: trunk/scconfig/plugins.h =================================================================== --- trunk/scconfig/plugins.h (revision 29467) +++ trunk/scconfig/plugins.h (revision 29468) @@ -74,11 +74,13 @@ plugin_def("import_dsn", "specctra .dsn importer", sbuildin, 1, 0) plugin_def("import_edif", "import edif", sbuildin, 1, 0) plugin_def("import_fpcb_nl", "import freepcb netlist", sbuildin, 1, 0) +plugin_def("import_gnetlist", "sch import: run gnetlist", sbuildin, 1, 0) plugin_def("import_hpgl", "import HP-GL plot files", sbuildin, 1, 0) plugin_def("import_ipcd356", "import IPC-D-356 Netlist", sbuildin, 1, 0) plugin_def("import_ltspice", "import ltspice .net+.asc", sbuildin, 1, 0) plugin_def("import_mentor_sch","import mentor graphics sch", sbuildin, 1, 0) plugin_def("import_mucs", "import mucs routing", sbuildin, 1, 0) +plugin_def("import_net_cmd", "sch/net import: run custom cmd", sbuildin, 1, 0) plugin_def("import_netlist", "import netlist", sbuildin, 1, 0) plugin_def("import_pxm_gd", "import pixmaps from png/gif/jpg", sbuildin, 1, 0) plugin_def("import_pxm_pnm", "import pixmaps from pnm ", sbuildin, 1, 0) Index: trunk/src_plugins/import_gnetlist/Makefile =================================================================== --- trunk/src_plugins/import_gnetlist/Makefile (nonexistent) +++ trunk/src_plugins/import_gnetlist/Makefile (revision 29468) @@ -0,0 +1,6 @@ +all: + cd ../../src && $(MAKE) mod_import_gnetlist + +clean: + rm *.o *.so 2>/dev/null ; true + Index: trunk/src_plugins/import_gnetlist/Plug.tmpasm =================================================================== --- trunk/src_plugins/import_gnetlist/Plug.tmpasm (nonexistent) +++ trunk/src_plugins/import_gnetlist/Plug.tmpasm (revision 29468) @@ -0,0 +1,8 @@ +put /local/pcb/mod {import_gnetlist} +append /local/pcb/mod/OBJS [@ $(PLUGDIR)/import_gnetlist/import_gnetlist.o @] + +switch /local/pcb/import_gnetlist/controls + case {buildin} include /local/pcb/tmpasm/buildin; end; + case {plugin} include /local/pcb/tmpasm/plugin; end; + case {disable} include /local/pcb/tmpasm/disable; end; +end Index: trunk/src_plugins/import_gnetlist/import_gnetlist.c =================================================================== --- trunk/src_plugins/import_gnetlist/import_gnetlist.c (nonexistent) +++ trunk/src_plugins/import_gnetlist/import_gnetlist.c (revision 29468) @@ -0,0 +1,75 @@ +/* + * COPYRIGHT + * + * pcb-rnd, interactive printed circuit board design + * (this file is based on PCB, interactive printed circuit board design) + * Copyright (C) 2020 Tibor 'Igor2' Palinkas + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Contact: + * Project page: http://repo.hu/projects/pcb-rnd + * lead developer: http://repo.hu/projects/pcb-rnd/contact.html + * mailing list: pcb-rnd (at) list.repo.hu (send "subscribe") + */ + +#include "config.h" + +#include +#include +#include + +#include "plug_import.h" + +static pcb_plug_import_t import_gnetlist; + + +int gnetlist_support_prio(pcb_plug_import_t *ctx, unsigned int aspects, FILE *fp, const char *filename) +{ + if (aspects != IMPORT_ASPECT_NETLIST) + return 0; /* only pure netlist import is supported */ + + return 100; +} + + +static int gnetlist_import(pcb_plug_import_t *ctx, unsigned int aspects, const char *fn) +{ + return -1; +} + +int pplg_check_ver_import_gnetlist(int ver_needed) { return 0; } + +void pplg_uninit_import_gnetlist(void) +{ + PCB_HOOK_UNREGISTER(pcb_plug_import_t, pcb_plug_import_chain, &import_gnetlist); +} + +int pplg_init_import_gnetlist(void) +{ + PCB_API_CHK_VER; + + /* register the IO hook */ + import_gnetlist.plugin_data = NULL; + + import_gnetlist.fmt_support_prio = gnetlist_support_prio; + import_gnetlist.import = gnetlist_import; + import_gnetlist.name = "gEDA sch using gnetlist"; + + PCB_HOOK_REGISTER(pcb_plug_import_t, pcb_plug_import_chain, &import_gnetlist); + + return 0; +} + Index: trunk/src_plugins/import_gnetlist/import_gnetlist.pup =================================================================== --- trunk/src_plugins/import_gnetlist/import_gnetlist.pup (nonexistent) +++ trunk/src_plugins/import_gnetlist/import_gnetlist.pup (revision 29468) @@ -0,0 +1,9 @@ +$class import +$short sch import: run gnetlist +$long Import gEDA/gschem schematics running gnetlist +$state works +$fmt-native no +$fmt-feature-r import gEDA/gschem schematics running gnetlist +$package import-net +default buildin +autoload 1 Index: trunk/src_plugins/import_net_cmd/Makefile =================================================================== --- trunk/src_plugins/import_net_cmd/Makefile (nonexistent) +++ trunk/src_plugins/import_net_cmd/Makefile (revision 29468) @@ -0,0 +1,6 @@ +all: + cd ../../src && $(MAKE) mod_import_net_cmd + +clean: + rm *.o *.so 2>/dev/null ; true + Index: trunk/src_plugins/import_net_cmd/Plug.tmpasm =================================================================== --- trunk/src_plugins/import_net_cmd/Plug.tmpasm (nonexistent) +++ trunk/src_plugins/import_net_cmd/Plug.tmpasm (revision 29468) @@ -0,0 +1,8 @@ +put /local/pcb/mod {import_net_cmd} +append /local/pcb/mod/OBJS [@ $(PLUGDIR)/import_net_cmd/import_net_cmd.o @] + +switch /local/pcb/import_net_cmd/controls + case {buildin} include /local/pcb/tmpasm/buildin; end; + case {plugin} include /local/pcb/tmpasm/plugin; end; + case {disable} include /local/pcb/tmpasm/disable; end; +end Index: trunk/src_plugins/import_net_cmd/import_net_cmd.c =================================================================== --- trunk/src_plugins/import_net_cmd/import_net_cmd.c (nonexistent) +++ trunk/src_plugins/import_net_cmd/import_net_cmd.c (revision 29468) @@ -0,0 +1,75 @@ +/* + * COPYRIGHT + * + * pcb-rnd, interactive printed circuit board design + * (this file is based on PCB, interactive printed circuit board design) + * Copyright (C) 2020 Tibor 'Igor2' Palinkas + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Contact: + * Project page: http://repo.hu/projects/pcb-rnd + * lead developer: http://repo.hu/projects/pcb-rnd/contact.html + * mailing list: pcb-rnd (at) list.repo.hu (send "subscribe") + */ + +#include "config.h" + +#include +#include +#include + +#include "plug_import.h" + +static pcb_plug_import_t import_net_cmd; + + +int net_cmd_support_prio(pcb_plug_import_t *ctx, unsigned int aspects, FILE *fp, const char *filename) +{ + if (aspects != IMPORT_ASPECT_NETLIST) + return 0; /* only pure netlist import is supported */ + + return 100; +} + + +static int net_cmd_import(pcb_plug_import_t *ctx, unsigned int aspects, const char *fn) +{ + return -1; +} + +int pplg_check_ver_import_net_cmd(int ver_needed) { return 0; } + +void pplg_uninit_import_net_cmd(void) +{ + PCB_HOOK_UNREGISTER(pcb_plug_import_t, pcb_plug_import_chain, &import_net_cmd); +} + +int pplg_init_import_net_cmd(void) +{ + PCB_API_CHK_VER; + + /* register the IO hook */ + import_net_cmd.plugin_data = NULL; + + import_net_cmd.fmt_support_prio = net_cmd_support_prio; + import_net_cmd.import = net_cmd_import; + import_net_cmd.name = "sch/netlist by cmd"; + + PCB_HOOK_REGISTER(pcb_plug_import_t, pcb_plug_import_chain, &import_net_cmd); + + return 0; +} + Index: trunk/src_plugins/import_net_cmd/import_net_cmd.pup =================================================================== --- trunk/src_plugins/import_net_cmd/import_net_cmd.pup (nonexistent) +++ trunk/src_plugins/import_net_cmd/import_net_cmd.pup (revision 29468) @@ -0,0 +1,10 @@ +$class import +$short sch/net import: run custom cmd +$long Import schematics/netlist by running a commandline +$state works +$fmt-native no +$fmt-feature-r Import schematics by running a commandline +$fmt-feature-r Import netlist by running a commandline +$package import-net +default buildin +autoload 1 Index: trunk/src_plugins/import_sch2/import_sch_conf.h =================================================================== --- trunk/src_plugins/import_sch2/import_sch_conf.h (revision 29467) +++ trunk/src_plugins/import_sch2/import_sch_conf.h (revision 29468) @@ -6,8 +6,7 @@ typedef struct { const struct { const struct { - CFT_STRING netlist_cmd; /* netlist generator program (command line) */ - CFT_STRING netlist_act; /* netlist import action to execute */ + CFT_STRING import_fmt; /* name of the input format */ CFT_BOOLEAN verbose; /* verbose logging of the import code */ } import_sch; } plugins; Index: trunk/src_plugins/plugins_ALL.tmpasm =================================================================== --- trunk/src_plugins/plugins_ALL.tmpasm (revision 29467) +++ trunk/src_plugins/plugins_ALL.tmpasm (revision 29468) @@ -55,11 +55,13 @@ include {../src_plugins/import_dsn/Plug.tmpasm} include {../src_plugins/import_edif/Plug.tmpasm} include {../src_plugins/import_fpcb_nl/Plug.tmpasm} +include {../src_plugins/import_gnetlist/Plug.tmpasm} include {../src_plugins/import_hpgl/Plug.tmpasm} include {../src_plugins/import_ipcd356/Plug.tmpasm} include {../src_plugins/import_ltspice/Plug.tmpasm} include {../src_plugins/import_mentor_sch/Plug.tmpasm} include {../src_plugins/import_mucs/Plug.tmpasm} +include {../src_plugins/import_net_cmd/Plug.tmpasm} include {../src_plugins/import_netlist/Plug.tmpasm} include {../src_plugins/import_pxm_gd/Plug.tmpasm} include {../src_plugins/import_pxm_pnm/Plug.tmpasm}