Index: trunk/scconfig/plugins.h =================================================================== --- trunk/scconfig/plugins.h (revision 8231) +++ trunk/scconfig/plugins.h (revision 8232) @@ -1,128 +1,123 @@ +/****************************************************************************** + Auto-generated by trunk/src_plugins/map_plugins.sh - do NOT edit, + run make map_plugins in trunk/src/ - to change any of the data below, + edit trunk/src_plugins/PLUGIN/PLUGIN.pup +******************************************************************************/ + plugin_header("\nLibrary plugins:\n") -plugin_def("lib_gensexpr", "#s-expression library", sdisable, 0) -plugin_def("lib_legacy_func", "legacy functions", sbuildin, 1) -plugin_def("lib_gtk_common", "all-hid_gtk common code", sdisable, 0) -plugin_def("lib_gtk_config", "hid_gtk preferences dialog",sdisable, 0) -plugin_def("lib_gtk_hid", "hid_gtk generic part", sdisable, 0) +plugin_def("lib_gensexpr", "#s-expression library", sdisable, 0) +plugin_def("lib_gtk_common", "all-hid_gtk common code", sdisable, 0) +plugin_def("lib_gtk_config", "hid_gtk preferences dialog", sdisable, 0) +plugin_def("lib_gtk_hid", "hid_gtk generic part", sdisable, 0) +plugin_def("lib_legacy_func", "legacy functions", sbuildin, 1) plugin_header("\nFeature plugins:\n") -plugin_def("gpmi", "GPMI scripting", sbuildin, 1) -plugin_def("diag", "diagnostic acts. for devs", sdisable, 1) -plugin_def("autocrop", "crop board to fit objects", sbuildin, 1) -plugin_def("autoroute", "the original autorouter", sbuildin, 1) -plugin_def("boardflip", "flip board objects", sdisable, 0) -plugin_def("distalign", "distribute and align objs", sbuildin, 1) -plugin_def("distaligntext", "distribute and align text", sbuildin, 1) -plugin_def("draw_fab", "fab layer in some exports", sbuildin, 1) -plugin_def("draw_csect", "draw cross-section (layers)",sdisable, 1) -plugin_def("draw_fontsel", "font selection GUI", sdisable, 1) -plugin_def("jostle", "push lines out of the way", sbuildin, 1) -plugin_def("polycombine", "combine selected polygons", sbuildin, 1) -plugin_def("polystitch", "stitch polygon at cursor", sdisable, 0) -plugin_def("teardrops", "draw teardrops on pins", sbuildin, 1) -plugin_def("smartdisperse", "netlist based dispenser", sbuildin, 1) -plugin_def("autoplace", "auto place components", sbuildin, 1) -plugin_def("vendordrill", "vendor drill mapping", sbuildin, 1) -plugin_def("puller", "puller", sbuildin, 1) -plugin_def("djopt", "djopt", sbuildin, 1) -plugin_def("mincut", "minimal cut shorts", sbuildin, 1) -plugin_def("renumber", "renumber action", sbuildin, 1) -plugin_def("oldactions", "old/obsolete actions", sdisable, 1) -plugin_def("fontmode", "font editor", sbuildin, 1) -plugin_def("stroke", "libstroke gestures", sdisable, 1) -plugin_def("report", "report actions", sbuildin, 1) -plugin_def("dbus", "DBUS interface", sdisable, 1) -plugin_def("shand_cmd", "command shorthands", sbuildin, 1) -plugin_def("propedit", "object property editor", sbuildin, 1) -plugin_def("loghid", "diagnostics: log HID calls",sdisable, 1) -plugin_def("query", "query language", sbuildin, 1) -plugin_def("acompnet", "net auto-completion", sdisable, 1) -plugin_def("rubberband_orig", "the original rubberband", sbuildin, 1) +plugin_def("acompnet", "net auto-completion", sdisable, 1) +plugin_def("autocrop", "crop board to fit objects", sbuildin, 1) +plugin_def("autoplace", "auto place components", sbuildin, 1) +plugin_def("autoroute", "the original autorouter", sbuildin, 1) +plugin_def("boardflip", "flip board objects", sbuildin, 1) +plugin_def("dbus", "DBUS interface", sdisable, 1) +plugin_def("diag", "diagnostic acts. for devs", sdisable, 1) +plugin_def("distaligntext", "distribute and align text", sbuildin, 1) +plugin_def("distalign", "distribute and align objs", sbuildin, 1) +plugin_def("djopt", "djopt board optimization", sbuildin, 1) +plugin_def("draw_csect", "draw cross-section (layers)", sdisable, 1) +plugin_def("draw_fab", "fab layer in some exports", sbuildin, 1) +plugin_def("draw_fontsel", "font selection GUI", sdisable, 1) +plugin_def("fontmode", "font editor", sbuildin, 1) +plugin_def("gpmi", "GPMI scripting", sbuildin, 1) +plugin_def("jostle", "push lines out of the way", sbuildin, 1) +plugin_def("loghid", "diagnostics: log HID calls", sdisable, 1) +plugin_def("mincut", "minimal cut shorts", sbuildin, 1) +plugin_def("oldactions", "old/obsolete actions", sdisable, 1) +plugin_def("polycombine", "combine selected polygons", sbuildin, 1) +plugin_def("polystitch", "stitch polygon at cursor", sdisable, 0) +plugin_def("propedit", "object property editor", sbuildin, 1) +plugin_def("puller", "puller", sbuildin, 1) +plugin_def("query", "query language", sbuildin, 1) +plugin_def("renumber", "renumber action", sbuildin, 1) +plugin_def("report", "report actions", sbuildin, 1) +plugin_def("rubberband_orig", "the original rubberband", sbuildin, 1) +plugin_def("shand_cmd", "command shorthands", sbuildin, 1) +plugin_def("smartdisperse", "netlist based dispenser", sbuildin, 1) +plugin_def("stroke", "libstroke gestures", sdisable, 1) +plugin_def("teardrops", "draw teardrops on pins", sbuildin, 1) +plugin_def("vendordrill", "vendor drill mapping", sbuildin, 1) plugin_header("\nFootprint backends:\n") -plugin_def("fp_fs", "filesystem footprints", sbuildin, 1) -plugin_def("fp_wget", "web footprints", sbuildin, 1) +plugin_def("fp_fs", "filesystem footprints", sbuildin, 1) +plugin_def("fp_wget", "web footprints", sbuildin, 1) plugin_header("\nImport plugins:\n") -plugin_def("import_sch", "import sch", sbuildin, 1) -plugin_def("import_edif", "import edif", sbuildin, 1) -plugin_def("import_netlist", "import netlist", sbuildin, 1) -plugin_def("import_dsn", "specctra .dsn importer", sbuildin, 1) +plugin_def("import_dsn", "specctra .dsn importer", sbuildin, 1) +plugin_def("import_edif", "import edif", sbuildin, 1) +plugin_def("import_ltspice", "import ltspice .net+.asc", sbuildin, 1) +plugin_def("import_mentor_sch","import mentor graphics sch", sbuildin, 1) +plugin_def("import_mucs", "import mucs routing", sbuildin, 1) +plugin_def("import_netlist", "import netlist", sbuildin, 1) +plugin_def("import_sch", "import sch", sbuildin, 1) +plugin_def("import_tinycad", "import tinycad .net", sbuildin, 1) +plugin_def("io_hyp", "hyperlynx .hyp loader", sbuildin, 1) +plugin_def("io_tedax", "tEDAx (Trivial EDA eXchange)", sbuildin, 1) -plugin_def("import_mucs", "import mucs routing", sbuildin, 1) -plugin_def("import_ltspice", "import ltspice .net+.asc", sbuildin, 1) -plugin_def("import_tinycad", "import tinycad .net", sbuildin, 1) -plugin_def("import_mentor_sch","import mentor graphics sch",sbuildin, 1) +plugin_header("\nImport plugins:\n") +plugin_def("export_bboard", "breadboard pcb_exporter", sdisable, 0) +plugin_def("export_bom", "bom pcb_exporter", sbuildin, 1) +plugin_def("export_dsn", "specctra .dsn pcb_exporter", sbuildin, 1) +plugin_def("export_dxf", "DXF pcb_exporter", sdisable, 0) +plugin_def("export_fidocadj", "FidoCadJ .fcd pcb_exporter", sdisable, 0) +plugin_def("export_gcode", "gcode pcb_exporter", sbuildin, 1) +plugin_def("export_gerber", "gerber pcb_exporter", sbuildin, 1) +plugin_def("export_ipcd356", "IPC-D-356 Netlist pcb_exporter", sdisable, 0) +plugin_def("export_lpr", "lpr pcb_exporter (printer)", sbuildin, 1) +plugin_def("export_nelma", "nelma pcb_exporter", sbuildin, 1) +plugin_def("export_openscad", "openscad pcb_exporter", sdisable, 0) +plugin_def("export_png", "png/gif/jpg pcb_exporter", sbuildin, 1) +plugin_def("export_ps", "postscript pcb_exporter", sbuildin, 1) +plugin_def("export_stat", "export board statistics", sbuildin, 1) +plugin_def("export_svg", "SVG pcb_exporter", sbuildin, 1) +plugin_def("export_test", "dummy test pcb_exporter", sdisable, 1) +plugin_def("export_xy", "xy (centroid) pcb_exporter", sbuildin, 1) - -plugin_header("\nExport plugins:\n") -plugin_def("export_gcode", "gcode pcb_exporter", sbuildin, 1) -plugin_def("export_nelma", "nelma pcb_exporter", sbuildin, 1) -plugin_def("export_png", "png/gif/jpg pcb_exporter", sbuildin, 1) -plugin_def("export_bom", "bom pcb_exporter", sbuildin, 1) -plugin_def("export_xy", "xy (centroid) pcb_exporter", sbuildin, 1) -plugin_def("export_gerber", "gerber pcb_exporter", sbuildin, 1) -plugin_def("export_lpr", "lpr pcb_exporter (printer)", sbuildin, 1) -plugin_def("export_ps", "postscript pcb_exporter", sbuildin, 1) -plugin_def("export_dxf", "DXF pcb_exporter", sdisable, 0) -plugin_def("export_test", "dummy test pcb_exporter", sdisable, 1) -plugin_def("export_bboard", "breadboard pcb_exporter", sdisable, 0) -plugin_def("export_openscad", "openscad pcb_exporter", sdisable, 0) -plugin_def("export_dsn", "specctra .dsn pcb_exporter", sbuildin, 1) -plugin_def("export_ipcd356", "IPC-D-356 Netlist pcb_exporter",sdisable, 0) -plugin_def("export_svg", "SVG pcb_exporter", sbuildin, 1) -plugin_def("export_stat", "export board statistics", sbuildin, 1) -plugin_def("export_fidocadj", "FidoCadJ .fcd pcb_exporter ", sdisable, 0) - plugin_header("\nIO plugins (file formats):\n") -plugin_def("io_lihata", "lihata board format", sbuildin, 1) -plugin_def("io_pcb", "the original pcb format", sbuildin, 1) -plugin_def("io_kicad_legacy", "Kicad's legacy format", sbuildin, 1) -plugin_def("io_kicad", "Kicad's s-expr format", sbuildin, 1) -plugin_def("io_eagle", "Eagle's xml format", sdisable, 0) -plugin_def("io_hyp", "hyperlynx .hyp loader", sbuildin, 1) -plugin_def("io_tedax", "tEDAx (Trivial EDA eXchange)", sbuildin, 1) +plugin_def("io_eagle", "Eagle's xml format", sdisable, 0) +plugin_def("io_kicad_legacy", "Kicad's legacy format", sbuildin, 1) +plugin_def("io_kicad", "Kicad's s-expr format", sbuildin, 1) +plugin_def("io_lihata", "lihata board format", sbuildin, 1) +plugin_def("io_pcb", "the original pcb format", sbuildin, 1) - plugin_header("\nHID plugins:\n") -plugin_def("hid_batch", "batch process (no-gui HID)",sbuildin, 1) -plugin_def("hid_gtk2_gdk", "GTK2 GUI, software render", sbuildin, 1) -plugin_def("hid_gtk2_gl", "GTK2 GUI, opengl render", sbuildin, 1) -plugin_def("hid_gtk3_cairo", "GTK3 GUI, cairo render", sdisable, 0) -plugin_def("hid_lesstif", "the lesstif gui", sbuildin, 1) -plugin_def("hid_remote", "remote HID server", sdisable, 0) -plugin_def("hid_srv_ws", "websocket server HID", sdisable, 0) +plugin_def("hid_batch", "batch process (no-gui HID)", sbuildin, 1) +plugin_def("hid_gtk2_gdk", "GTK2 GUI, software render", sbuildin, 1) +plugin_def("hid_gtk2_gl", "GTK2 GUI, opengl render", sbuildin, 1) +plugin_def("hid_gtk3_cairo", "GTK3 GUI, cairo render", sdisable, 0) +plugin_def("hid_lesstif", "the lesstif gui", sbuildin, 1) +plugin_def("hid_remote", "remote HID server", sdisable, 0) +plugin_def("hid_srv_ws", "websocket server HID", sdisable, 0) + +plugin_dep("draw_fab", "report") plugin_dep("export_lpr", "export_ps") -plugin_dep("export_xy", "export_bom") -plugin_dep("io_kicad", "lib_gensexpr") -plugin_dep("lib_gtk_common", "lib_gtk_config") -plugin_dep("hid_lesstif", "draw_csect") -plugin_dep("hid_lesstif", "draw_fontsel") -plugin_dep("hid_srv_ws", "hid_remote") - -plugin_dep("hid_gtk2_gdk", "lib_gtk_common") -plugin_dep("hid_gtk2_gdk", "lib_gtk_config") -plugin_dep("hid_gtk2_gdk", "lib_gtk_hid") -plugin_dep("hid_gtk2_gdk", "draw_csect") -plugin_dep("hid_gtk2_gdk", "draw_fontsel") - plugin_dep("hid_gtk2_gl", "lib_gtk_common") plugin_dep("hid_gtk2_gl", "lib_gtk_config") plugin_dep("hid_gtk2_gl", "lib_gtk_hid") plugin_dep("hid_gtk2_gl", "draw_csect") plugin_dep("hid_gtk2_gl", "draw_fontsel") - +plugin_dep("io_kicad_legacy", "io_kicad") +plugin_dep("hid_lesstif", "draw_csect") +plugin_dep("hid_lesstif", "draw_fontsel") +plugin_dep("io_kicad", "lib_gensexpr") +plugin_dep("io_eagle", "boardflip") plugin_dep("hid_gtk3_cairo", "lib_gtk_common") plugin_dep("hid_gtk3_cairo", "lib_gtk_config") plugin_dep("hid_gtk3_cairo", "lib_gtk_hid") plugin_dep("hid_gtk3_cairo", "draw_csect") plugin_dep("hid_gtk3_cairo", "draw_fontsel") - -/* for the uniq name lib: */ -plugin_dep("io_kicad_legacy", "io_kicad") - -/* for drill.[ch] */ -plugin_dep("draw_fab", "report") - -plugin_dep("io_eagle", "boardflip") +plugin_dep("export_xy", "export_bom") +plugin_dep("lib_gtk_common", "lib_gtk_config") +plugin_dep("hid_gtk2_gdk", "lib_gtk_common") +plugin_dep("hid_gtk2_gdk", "lib_gtk_config") +plugin_dep("hid_gtk2_gdk", "lib_gtk_hid") +plugin_dep("hid_gtk2_gdk", "draw_csect") +plugin_dep("hid_gtk2_gdk", "draw_fontsel") Index: trunk/src/Makefile.in =================================================================== --- trunk/src/Makefile.in (revision 8231) +++ trunk/src/Makefile.in (revision 8232) @@ -358,10 +358,8 @@ $(MAKE) install_all HOW="uninstall" map_plugins: - echo "# List of all plugins - generated by make map_plugins - do NOT edit" > ../src_plugins/plugins_ALL.tmpasm - LANG=C cd ../src_plugins && ../src_3rd/puplug/util/puplug findpups . "include {../src_plugins/%D/Plug.tmpasm}\n" | sort >> plugins_ALL.tmpasm + cd ../src_plugins && ./map_plugins.sh - @] # generate explicit rules for .c -> .o Index: trunk/src_plugins/hid_batch/hid_batch.pup =================================================================== --- trunk/src_plugins/hid_batch/hid_batch.pup (revision 8231) +++ trunk/src_plugins/hid_batch/hid_batch.pup (revision 8232) @@ -1,5 +1,5 @@ $class hid $short batch process (no-gui HID) -$long HID without GUI; read actions from stdin. +$long HID without GUI: read actions from stdin. $state works default buildin Index: trunk/src_plugins/map_plugins.sh =================================================================== --- trunk/src_plugins/map_plugins.sh (nonexistent) +++ trunk/src_plugins/map_plugins.sh (revision 8232) @@ -0,0 +1,56 @@ +#!/bin/sh + +# Run this script after changing or adding .pup files. +# WARNING: this script requires a fair amount of tools - it is intended to +# run on developers' machines, not on users' + +export LANG=C +PUPLUG=../src_3rd/puplug/util/puplug + + +# generate scconfig's 3 state plugin list +$PUPLUG findpups . '%$class$|%N|%3|%A|%$short$\n' | sed ' +s/^lib/1|lib/ +s/^feature/2|feature/ +s/^fp/3|fp/ +s/^import/4|import/ +s/^export/5|export/ +s/^io/6|io/ +s/^hid/7|hid/ +' | sort | awk -F "[|]" ' +BEGIN { + HDR["lib"] = "Library plugins" + HDR["feature"] = "Feature plugins" + HDR["fp"] = "Footprint backends" + HDR["import"] = "Import plugins" + HDR["export"] = "Import plugins" + HDR["io"] = "IO plugins (file formats)" + HDR["hid"] = "HID plugins" + print "/******************************************************************************" + print " Auto-generated by trunk/src_plugins/map_plugins.sh - do NOT edit," + print " run make map_plugins in trunk/src/ - to change any of the data below," + print " edit trunk/src_plugins/PLUGIN/PLUGIN.pup" + print "******************************************************************************/" +} + +function q(s) { return "\"" s "\"," } + +($2 != last) { + print "\nplugin_header(\"\\n" HDR[$2] ":\\n\")" + last = $2 +} + +{ + printf("plugin_def(%-20s%-35s%-10s%s)\n", q($3), q($6), $4 "," , $5) +} + +END { print "\n" } + +' > ../scconfig/plugins.h + +$PUPLUG findpups . "" 'plugin_dep("%N", "%m")\n' >> ../scconfig/plugins.h + + +# Generate the plugin list +echo "# List of all plugins - generated by make map_plugins - do NOT edit" > plugins_ALL.tmpasm +$PUPLUG findpups . "include {../src_plugins/%D/Plug.tmpasm}\n" | sort >> plugins_ALL.tmpasm Property changes on: trunk/src_plugins/map_plugins.sh ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Index: trunk/src_plugins/oldactions/oldactions.pup =================================================================== --- trunk/src_plugins/oldactions/oldactions.pup (revision 8231) +++ trunk/src_plugins/oldactions/oldactions.pup (revision 8232) @@ -1,5 +1,5 @@ $class feature $short old/obsolete actions -$long Random collection of old/obsolete actions. Bell(): audible feedback; DumpLibrary(): print footprint library on stdout; a set of debug actions useful for writing pcb scripts: Debug(), DebugXY(), Return(). Old plugin actions to toggle or set settings that are now accessible via the unified config system (vendordrill, djopt) +$long Random collection of old/obsolete actions. Bell(): audible feedback, DumpLibrary(): print footprint library on stdout, a set of debug actions useful for writing pcb scripts: Debug(), DebugXY(), Return(). Old plugin actions to toggle or set settings that are now accessible via the unified config system (vendordrill, djopt) $state works default disable Index: trunk/src_plugins/stroke/stroke.pup =================================================================== --- trunk/src_plugins/stroke/stroke.pup (revision 8231) +++ trunk/src_plugins/stroke/stroke.pup (revision 8232) @@ -1,5 +1,5 @@ $class feature $short libstroke gestures $long Gesture recognition with libstroke. -$state partially works (doesn't work with lesstif; works with the gtk hid, but there's no zoom bindings) +$state partially works (doesn't work with lesstif, works with the gtk hid, but there's no zoom bindings) default disable