Index: trunk/scconfig/Rev.h =================================================================== --- trunk/scconfig/Rev.h (revision 9377) +++ trunk/scconfig/Rev.h (revision 9378) @@ -1 +1 @@ -static const int myrev = 9359; +static const int myrev = 9378; Index: trunk/scconfig/Rev.tab =================================================================== --- trunk/scconfig/Rev.tab (revision 9377) +++ trunk/scconfig/Rev.tab (revision 9378) @@ -1,3 +1,4 @@ +9378 configure io_orcad 9359 configure drc infrastructure in libcschem 9254 configure new plugin: funcmap 9211 configure lib: per-plugin-per-project storage Index: trunk/scconfig/plugins.h =================================================================== --- trunk/scconfig/plugins.h (revision 9377) +++ trunk/scconfig/plugins.h (revision 9378) @@ -55,6 +55,7 @@ plugin_def("lib_alien", "alien format helper", sbuildin, 1) plugin_def("lib_ngrp", "non-graphical seet helper", sbuildin, 1) plugin_def("lib_tedax", "low level tEDAx support", sbuildin, 1) +plugin_def("lib_ucdf", "read ucdf files", sbuildin, 1) plugin_header("\nGUI:\n") plugin_def("gui", "Graphical User Interface", sbuildin, 1) @@ -72,6 +73,7 @@ plugin_dep("funcmap", "lib_anymap") plugin_dep("gui", "lib_hid_common") plugin_dep("io_altium", "lib_alien") +plugin_dep("io_altium", "lib_ucdf") plugin_dep("io_geda", "lib_alien") plugin_dep("io_ngrp_fawk", "lib_ngrp") plugin_dep("io_ngrp_fawk", "script") Index: trunk/src/plugins/io_altium/Plug.tmpasm =================================================================== --- trunk/src/plugins/io_altium/Plug.tmpasm (revision 9377) +++ trunk/src/plugins/io_altium/Plug.tmpasm (revision 9378) @@ -4,7 +4,6 @@ $(PLUGDIR)/io_altium/read.o $(PLUGDIR)/io_altium/pcbdoc_ascii.o $(PLUGDIR)/io_altium/altium_kw_sphash.o - ../../src_3rd/libucdf/ucdf.o @] put /local/rnd/mod/CONFFILE {io_altium.conf} Index: trunk/src/plugins/io_altium/io_altium.pup =================================================================== --- trunk/src/plugins/io_altium/io_altium.pup (revision 9377) +++ trunk/src/plugins/io_altium/io_altium.pup (revision 9378) @@ -5,5 +5,6 @@ $fmt-feature-r altium schematics $package io-alien dep lib_alien +dep lib_ucdf default buildin autoload 1 Index: trunk/src/plugins/io_orcad/io_orcad.pup.NOPE =================================================================== --- trunk/src/plugins/io_orcad/io_orcad.pup.NOPE (revision 9377) +++ trunk/src/plugins/io_orcad/io_orcad.pup.NOPE (revision 9378) @@ -5,5 +5,6 @@ $fmt-feature-r orcad schematics $package io-alien dep lib_alien +dep lib_ucdf default buildin autoload 1 Index: trunk/src/plugins/lib_ucdf/Makefile =================================================================== --- trunk/src/plugins/lib_ucdf/Makefile (nonexistent) +++ trunk/src/plugins/lib_ucdf/Makefile (revision 9378) @@ -0,0 +1,2 @@ +all: + cd ../../sch-rnd && make mod_lib_ucdf Index: trunk/src/plugins/lib_ucdf/Plug.tmpasm =================================================================== --- trunk/src/plugins/lib_ucdf/Plug.tmpasm (nonexistent) +++ trunk/src/plugins/lib_ucdf/Plug.tmpasm (revision 9378) @@ -0,0 +1,11 @@ +put /local/rnd/mod {lib_ucdf} +put /local/rnd/mod/OBJS [@ + $(PLUGDIR)/lib_ucdf/lib_ucdf.o + ../../src_3rd/libucdf/ucdf.o +@] + +switch /local/module/lib_ucdf/controls + case {buildin} include /local/csch/tmpasm/buildin; end; + case {plugin} include /local/csch/tmpasm/plugin; end; + case {disable} include /local/csch/tmpasm/disable; end; +end Index: trunk/src/plugins/lib_ucdf/lib_ucdf.c =================================================================== --- trunk/src/plugins/lib_ucdf/lib_ucdf.c (nonexistent) +++ trunk/src/plugins/lib_ucdf/lib_ucdf.c (revision 9378) @@ -0,0 +1,51 @@ +/* + * COPYRIGHT + * + * cschem - modular/flexible schematics editor - wrapper around libucdf + * Copyright (C) 2023 Tibor 'Igor2' Palinkas + * + * (Supported by NLnet NGI0 Entrust in 2023) + * + * 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/sch-rnd + * contact lead developer: http://www.repo.hu/projects/sch-rnd/contact.html + * mailing list: http://www.repo.hu/projects/sch-rnd/contact.html + */ + +/* Wrap libucdf so multiple plugins can use it */ + +#include + +#include +#include +#include + +/*** plugin ***/ + +int pplg_check_ver_lib_ucdf(int ver_needed) { return 0; } + +void pplg_uninit_lib_ucdf(void) +{ +} + +int pplg_init_lib_ucdf(void) +{ + RND_API_CHK_VER; + + return 0; +} + Index: trunk/src/plugins/lib_ucdf/lib_ucdf.pup =================================================================== --- trunk/src/plugins/lib_ucdf/lib_ucdf.pup (nonexistent) +++ trunk/src/plugins/lib_ucdf/lib_ucdf.pup (revision 9378) @@ -0,0 +1,7 @@ +$class io +$short read ucdf files +$long Helper functions for reading (unpacking) ucdf files +$state works +$package io-alien +default buildin +autoload 1 Index: trunk/src/plugins/plugins_ALL.tmpasm =================================================================== --- trunk/src/plugins/plugins_ALL.tmpasm (revision 9377) +++ trunk/src/plugins/plugins_ALL.tmpasm (revision 9378) @@ -27,6 +27,7 @@ include {../src/plugins/lib_plot/Plug.tmpasm} include {../src/plugins/lib_target/Plug.tmpasm} include {../src/plugins/lib_tedax/Plug.tmpasm} +include {../src/plugins/lib_ucdf/Plug.tmpasm} include {../src/plugins/place/Plug.tmpasm} include {../src/plugins/propedit/Plug.tmpasm} include {../src/plugins/query/Plug.tmpasm} Index: trunk/src/sch-rnd/Makefile.dep =================================================================== --- trunk/src/sch-rnd/Makefile.dep (revision 9377) +++ trunk/src/sch-rnd/Makefile.dep (revision 9378) @@ -201,6 +201,7 @@ ../plugins/funcmap/compiler.c ../plugins/funcmap/dlg_funcmap.c \ ../sch-rnd/funchash_core.h ../sch-rnd/funchash_core_list.h \ ../sch-rnd/crosshair.h ../sch-rnd/search.h ../sch-rnd/draw.h \ + ../plugins/funcmap/fmdrc.c ../libcschem/drc.h \ ../plugins/funcmap/funcmap_conf_fields.h ../plugins/gui/act.o: ../plugins/gui/act.c ../libcschem/config.h \ ../plugins/gui/act.h