From 716d13b2d9f70732b48eade5ab66953441719062 Mon Sep 17 00:00:00 2001 From: Ales Hvezda Date: Fri, 25 Aug 2006 01:00:06 +0000 Subject: [PATCH] Fixed a few Makefiles to allow make distcheck to work again. Bumped version numbers again, fixed a component update bug, and bunch of other last minute piddly fixes. --- Makefile | 40 ++-- examples/configure.ac | 2 +- gattrib/configure.ac | 4 +- geda/configure.ac | 2 +- gnetlist/ChangeLog | 5 + gnetlist/configure.ac | 2 +- gnetlist/scheme/Makefile.am | 6 +- gschem/ChangeLog | 20 ++ gschem/INSTALL | 10 +- gschem/configure.ac | 2 +- gschem/examples/drawing_primitives.sch | 354 ++++++++++++++++----------------- gschem/examples/filter_1.sch | 216 +++++++++++++++++++- gschem/src/Makefile.am | 1 - gschem/src/o_misc.c | 15 +- gsymcheck/configure.ac | 2 +- libgeda/ChangeLog | 8 + libgeda/INSTALL | 12 +- libgeda/configure.ac | 2 +- libgeda/share/Makefile.am | 5 + libgeda/src/Makefile.am | 5 - setup/configure.ac | 2 +- symbols/configure.ac | 2 +- utils/ChangeLog | 9 + utils/configure.ac | 2 +- utils/scripts/Makefile.am | 25 ++- utils/scripts/config.sh.in | 3 - 26 files changed, 516 insertions(+), 240 deletions(-) diff --git a/Makefile b/Makefile index 34555520a..82c5c8bd0 100644 --- a/Makefile +++ b/Makefile @@ -109,7 +109,8 @@ notarget: ## of each program in the configure.ac in each directory. In principle, ## you can check that "make dist" worked by doing: ## 5. make distcheck -## however, "make distcheck" is broken right now. +## "make distcheck" will create a set of tarballs and untar, configure, +## compile and run make check in each directory. ## ## Note that you need to have the autotools installed; if you are not a ## developer or you don't know what the autotools are, you probably @@ -194,10 +195,10 @@ distcheck: libgeda_distcheck symbols_distcheck gschem_distcheck \ gnetlist_distcheck gattrib_distcheck gsymcheck_distcheck \ utils_distcheck docs_distcheck examples_distcheck mv -f libgeda/libgeda*.tar.gz . - mv -f symbols/symbols*.tar.gz . + mv -f symbols/geda-symbols*.tar.gz . mv -f gschem/geda-gschem*.tar.gz . mv -f gnetlist/geda-gnetlist*.tar.gz . - mv -f gnetlist/geda-gattrib*.tar.gz . + mv -f gattrib/geda-gattrib*.tar.gz . mv -f gsymcheck/geda-gsymcheck*.tar.gz . mv -f utils/geda-utils*.tar.gz . mv -f docs/geda-docs*.tar.gz . @@ -243,7 +244,8 @@ symbols_distconfig: symbols_dist: ( cd $(DIR_PREFIX)symbols$(CD_VERSION); ${MAKE} dist ) -symbols_distcheck: +symbols_distcheck: $(DIR_PREFIX)symbols$(CD_VERSION)/configure \ + $(DIR_PREFIX)symbols$(CD_VERSION)/Makefile ( cd $(DIR_PREFIX)symbols$(CD_VERSION); ${MAKE} distcheck ) # gschem @@ -277,7 +279,8 @@ gschem_distconfig: gschem_dist: ( cd $(DIR_PREFIX)gschem$(CD_VERSION); ${MAKE} dist ) -gschem_distcheck: +gschem_distcheck: $(DIR_PREFIX)gschem$(CD_VERSION)/configure \ + $(DIR_PREFIX)gschem$(CD_VERSION)/config.h ( cd $(DIR_PREFIX)gschem$(CD_VERSION); ${MAKE} distcheck ) gschem_maint: $(DIR_PREFIX)gschem$(CD_VERSION)/config.h @@ -332,7 +335,8 @@ gnetlist_distconfig: gnetlist_dist: ( cd $(DIR_PREFIX)gnetlist$(CD_VERSION); ${MAKE} dist ) -gnetlist_distcheck: +gnetlist_distcheck: $(DIR_PREFIX)gnetlist$(CD_VERSION)/configure \ + $(DIR_PREFIX)gnetlist$(CD_VERSION)/config.h ( cd $(DIR_PREFIX)gnetlist$(CD_VERSION); ${MAKE} distcheck ) # gattrib @@ -375,7 +379,8 @@ gattrib_distconfig: gattrib_dist: ( cd $(DIR_PREFIX)gattrib$(CD_VERSION); ${MAKE} dist ) -gattrib_distcheck: +gattrib_distcheck: $(DIR_PREFIX)gattrib$(CD_VERSION)/configure \ + $(DIR_PREFIX)gattrib$(CD_VERSION)/config.h ( cd $(DIR_PREFIX)gattrib$(CD_VERSION); ${MAKE} distcheck ) # gsymcheck @@ -406,7 +411,8 @@ gsymcheck_distconfig: gsymcheck_dist: ( cd $(DIR_PREFIX)gsymcheck$(CD_VERSION); ${MAKE} dist ) -gsymcheck_distcheck: +gsymcheck_distcheck: $(DIR_PREFIX)gsymcheck$(CD_VERSION)/configure \ + $(DIR_PREFIX)gsymcheck$(CD_VERSION)/config.h ( cd $(DIR_PREFIX)gsymcheck$(CD_VERSION); ${MAKE} distcheck ) gsymcheck_maint: $(DIR_PREFIX)gsymcheck$(CD_VERSION)/config.h @@ -449,7 +455,8 @@ utils_distconfig: utils_dist: ( cd $(DIR_PREFIX)utils$(CD_VERSION); ${MAKE} dist ) -utils_distcheck: +utils_distcheck: $(DIR_PREFIX)utils$(CD_VERSION)/configure \ + $(DIR_PREFIX)utils$(CD_VERSION)/config.h ( cd $(DIR_PREFIX)utils$(CD_VERSION); ${MAKE} distcheck ) utils_maint: $(DIR_PREFIX)utils$(CD_VERSION)/config.h @@ -488,7 +495,8 @@ geda_distconfig: geda_dist: ( cd geda$(CD_VERSION); ${MAKE} dist ) -geda_distcheck: +geda_distcheck: geda$(CD_VERSION)/configure \ + geda$(CD_VERSION)/config.h ( cd geda$(CD_VERSION); ${MAKE} distcheck ) geda_maint: geda$(CD_VERSION)/config.h @@ -529,7 +537,8 @@ setup_distconfig: setup_dist: ( cd $(DIR_PREFIX)setup$(CD_VERSION); ${MAKE} dist ) -setup_distcheck: +setup_distcheck: $(DIR_PREFIX)setup$(CD_VERSION)/configure \ + $(DIR_PREFIX)setup$(CD_VERSION)/config.h ( cd $(DIR_PREFIX)setup$(CD_VERSION); ${MAKE} distcheck ) setup_maint: $(DIR_PREFIX)setup$(CD_VERSION)/config.h @@ -574,7 +583,8 @@ libgeda_distconfig: libgeda_dist: ( cd libgeda$(CD_VERSION); ${MAKE} dist ) -libgeda_distcheck: +libgeda_distcheck: libgeda$(CD_VERSION)/configure \ + libgeda$(CD_VERSION)/config.h ( cd libgeda$(CD_VERSION); ${MAKE} distcheck ) libgeda_uninstall: libgeda$(CD_VERSION)/config.h @@ -611,7 +621,8 @@ docs_distconfig: docs_dist: ( cd $(DIR_PREFIX)docs$(CD_VERSION); ${MAKE} dist ) -docs_distcheck: +docs_distcheck: $(DIR_PREFIX)docs$(CD_VERSION)/configure \ + $(DIR_PREFIX)docs$(CD_VERSION)/Makefile ( cd $(DIR_PREFIX)docs$(CD_VERSION); ${MAKE} distcheck ) docs_maint: $(DIR_PREFIX)docs$(CD_VERSION)/Makefile @@ -647,7 +658,8 @@ examples_distconfig: examples_dist: ( cd $(DIR_PREFIX)examples$(CD_VERSION); ${MAKE} dist ) -examples_distcheck: +examples_distcheck: $(DIR_PREFIX)examples$(CD_VERSION)/configure \ + $(DIR_PREFIX)examples$(CD_VERSION)/Makefile ( cd $(DIR_PREFIX)examples$(CD_VERSION); ${MAKE} distcheck ) examples_maint: $(DIR_PREFIX)examples$(CD_VERSION)/Makefile diff --git a/examples/configure.ac b/examples/configure.ac index b161ffdb6..a961af8d2 100644 --- a/examples/configure.ac +++ b/examples/configure.ac @@ -3,7 +3,7 @@ AC_INIT AC_CONFIG_SRCDIR([gTAG/gTAG.sch]) PACKAGE=geda-examples -VERSION=20060821 +VERSION=20060824 echo Configuring $PACKAGE version $VERSION # Initialize automake diff --git a/gattrib/configure.ac b/gattrib/configure.ac index be68a5b21..3d2044405 100644 --- a/gattrib/configure.ac +++ b/gattrib/configure.ac @@ -4,8 +4,8 @@ AC_CONFIG_SRCDIR([src/gattrib.c]) AC_PREREQ(2.53) PACKAGE=geda-gattrib -GEDA_VERSION=20060821 -GATTRIB_VERSION=20060821 +GEDA_VERSION=20060824 +GATTRIB_VERSION=20060824 echo Configuring $PACKAGE version $GATTRIB_VERSION echo Part of gEDA version $GEDA_VERSION diff --git a/geda/configure.ac b/geda/configure.ac index 3b430c06d..8e0675834 100644 --- a/geda/configure.ac +++ b/geda/configure.ac @@ -2,7 +2,7 @@ AC_INIT(configure.ac) PACKAGE=geda -VERSION=20060821 +VERSION=20060824 echo Configuring $PACKAGE version $VERSION # Initialize automake diff --git a/gnetlist/ChangeLog b/gnetlist/ChangeLog index 355df51e3..2b26c1668 100644 --- a/gnetlist/ChangeLog +++ b/gnetlist/ChangeLog @@ -1,3 +1,8 @@ +2006-08-22 Ales Hvezda + + * scheme/Makefile.am: Added a couple files to the distclean and + maintainerclean rules to make distcheck happy. + 2006-08-21 Ales Hvezda * README: Updated the README a little to be ready for the next diff --git a/gnetlist/configure.ac b/gnetlist/configure.ac index 3d70d77c0..13b5d2357 100644 --- a/gnetlist/configure.ac +++ b/gnetlist/configure.ac @@ -4,7 +4,7 @@ AC_CONFIG_SRCDIR([src/gnetlist.c]) AC_PREREQ(2.54) PACKAGE=geda-gnetlist -VERSION=20060821 +VERSION=20060824 echo Configuring $PACKAGE version $VERSION # Initialize automake diff --git a/gnetlist/scheme/Makefile.am b/gnetlist/scheme/Makefile.am index b0eb0115a..3899914bf 100644 --- a/gnetlist/scheme/Makefile.am +++ b/gnetlist/scheme/Makefile.am @@ -44,5 +44,7 @@ gnet-gsch2pcb.scm: $(srcdir)/gnet-gsch2pcb.scm.in MOSTLYCLEANFILES = *.log *~ CLEANFILES = *.log *~ -DISTCLEANFILES = *.log core FILE *~ prototype.bak -MAINTAINERCLEANFILES = *.log *~ Makefile.in configure +DISTCLEANFILES = *.log core FILE *~ prototype.bak \ + gnet-PCBboard.scm gnet-gsch2pcb.scm +MAINTAINERCLEANFILES = *.log *~ Makefile.in configure \ + gnet-PCBboard.scm gnet-gsch2pcb.scm diff --git a/gschem/ChangeLog b/gschem/ChangeLog index 9e1e9a8e3..b26493cda 100644 --- a/gschem/ChangeLog +++ b/gschem/ChangeLog @@ -1,3 +1,23 @@ +2006-08-24 Ales Hvezda + + * INSTALL: Updated install file a little (still somewhat dated) + + * src/o_misc.c: Fixed o_update_component to actually work correctly. + All this time, it was just doing the wrong thing by search for + existing components in the wrong place. Update Component still + doesn't do the right thing for symversion, but that can be fixed + later. + + * examples/filter_1.sch: Updated all components to the latest version. + + * examples/drawing_primitives.sch: Translated schematic a little so + it looks better on the screen. + +2006-08-22 Ales Hvezda + + * src/Makefile.am: Removed old VPATH, since it is no longer needed + and it is interfering with make distcheck + 2006-08-21 Ales Hvezda * README: Updated the README a little to be ready for the next diff --git a/gschem/INSTALL b/gschem/INSTALL index a08df7143..90f4868e0 100644 --- a/gschem/INSTALL +++ b/gschem/INSTALL @@ -6,7 +6,7 @@ GPL Electronic Design Automation Installation instructions Please see the end of this file for platform / vendor specific hints and -tips. +tips. Also please read the README file in this same directory. ----------------------------------------------------------------------------- Quick Ref: @@ -17,10 +17,10 @@ Quick Ref: In order to build gschem you must install the following packages first: - GLIB 1.2.x - GTK+ 1.2.x - guile 1.4.x or 1.6.x - libgeda + GLIB 2.4.x + GTK+ 2.4.x and all dependancies + guile 1.6.x or later + libgeda (match version and must be installed first) symbols LibStroke 0.5.1 (optional) libgdgeda 2.0.15 (optional; you also need zlib and libpng for this lib) diff --git a/gschem/configure.ac b/gschem/configure.ac index 292b7b94b..286fce7b5 100644 --- a/gschem/configure.ac +++ b/gschem/configure.ac @@ -4,7 +4,7 @@ AC_CONFIG_SRCDIR([src/gschem.c]) AC_PREREQ(2.54) PACKAGE=geda-gschem -VERSION=20060821 +VERSION=20060824 echo Configuring $PACKAGE version $VERSION # Initialize automake diff --git a/gschem/examples/drawing_primitives.sch b/gschem/examples/drawing_primitives.sch index 3be3eb301..61e71f95c 100644 --- a/gschem/examples/drawing_primitives.sch +++ b/gschem/examples/drawing_primitives.sch @@ -1,134 +1,134 @@ -v 20060123 1 -T 500 10600 9 10 1 0 0 0 1 +v 20060824 1 +T 1500 11600 9 10 1 0 0 0 1 Text Justifications: -T 1500 10100 9 10 1 0 0 0 1 +T 2500 11100 9 10 1 0 0 0 1 Lower Left -T 1500 9600 9 10 1 0 0 1 1 +T 2500 10600 9 10 1 0 0 1 1 Middle Left -T 1500 9100 9 10 1 0 0 2 1 +T 2500 10100 9 10 1 0 0 2 1 Upper Left -T 1500 8600 9 10 1 0 0 3 1 +T 2500 9600 9 10 1 0 0 3 1 Lower Middle -T 1500 8100 9 10 1 0 0 4 1 +T 2500 9100 9 10 1 0 0 4 1 Middle Middle -T 1500 7600 9 10 1 0 0 5 1 +T 2500 8600 9 10 1 0 0 5 1 Upper Middle -T 1500 7100 9 10 1 0 0 6 1 +T 2500 8100 9 10 1 0 0 6 1 Lower Right -T 1500 6600 9 10 1 0 0 7 1 +T 2500 7600 9 10 1 0 0 7 1 Middle Right -T 1500 6100 9 10 1 0 0 8 1 +T 2500 7100 9 10 1 0 0 8 1 Upper Right -L 1500 10400 1500 5700 3 0 0 0 -1 -1 -L 1300 10100 1700 10100 3 0 0 0 -1 -1 -L 1300 9600 1700 9600 3 0 0 0 -1 -1 -L 1300 9100 1700 9100 3 0 0 0 -1 -1 -L 1300 8600 1700 8600 3 0 0 0 -1 -1 -L 1300 8100 1700 8100 3 0 0 0 -1 -1 -L 1300 7600 1700 7600 3 0 0 0 -1 -1 -L 1300 7100 1700 7100 3 0 0 0 -1 -1 -L 1300 6600 1700 6600 3 0 0 0 -1 -1 -L 1300 6100 1700 6100 3 0 0 0 -1 -1 -T 2800 8700 9 10 1 0 0 0 6 +L 2500 11400 2500 6700 3 0 0 0 -1 -1 +L 2300 11100 2700 11100 3 0 0 0 -1 -1 +L 2300 10600 2700 10600 3 0 0 0 -1 -1 +L 2300 10100 2700 10100 3 0 0 0 -1 -1 +L 2300 9600 2700 9600 3 0 0 0 -1 -1 +L 2300 9100 2700 9100 3 0 0 0 -1 -1 +L 2300 8600 2700 8600 3 0 0 0 -1 -1 +L 2300 8100 2700 8100 3 0 0 0 -1 -1 +L 2300 7600 2700 7600 3 0 0 0 -1 -1 +L 2300 7100 2700 7100 3 0 0 0 -1 -1 +T 3800 9700 9 10 1 0 0 0 6 Line Types: Solid: Dotted: Dashed: Center: Phantom: -L 3900 9900 6300 9900 3 0 0 0 -1 -1 -L 3900 9600 6300 9600 3 0 0 1 -1 100 -L 3900 9300 6300 9300 3 0 0 2 100 100 -L 3900 9000 6300 9000 3 0 0 3 100 100 -L 3900 8700 6300 8700 3 0 0 4 100 100 -T 3300 8400 9 10 1 0 0 5 6 +L 4900 10900 7300 10900 3 0 0 0 -1 -1 +L 4900 10600 7300 10600 3 0 0 1 -1 100 +L 4900 10300 7300 10300 3 0 0 2 100 100 +L 4900 10000 7300 10000 3 0 0 3 100 100 +L 4900 9700 7300 9700 3 0 0 4 100 100 +T 4300 9400 9 10 1 0 0 5 6 Arc Types: Solid: Dotted: Dashed: Center: Phantom: -A 4000 6700 1400 315 135 3 0 0 0 -1 -1 -A 4000 6700 1200 315 135 3 0 0 1 -1 100 -A 4000 6700 1000 315 135 3 0 0 2 100 100 -A 4000 6700 800 315 135 3 0 0 3 100 100 -A 4000 6700 600 315 135 3 0 0 4 100 100 -T 13700 6100 9 10 1 0 0 7 1 +A 5000 7700 1400 315 135 3 0 0 0 -1 -1 +A 5000 7700 1200 315 135 3 0 0 1 -1 100 +A 5000 7700 1000 315 135 3 0 0 2 100 100 +A 5000 7700 800 315 135 3 0 0 3 100 100 +A 5000 7700 600 315 135 3 0 0 4 100 100 +T 14700 7100 9 10 1 0 0 7 1 Nets: -N 13800 6100 14900 6100 4 -N 13800 5900 15100 5900 4 -N 15100 5900 15100 6300 4 -N 13800 6300 15100 6300 4 -U 14400 5500 14400 4200 10 -1 -U 14400 4200 15400 4200 10 1 -N 14600 5300 15000 5300 4 -C 14600 5300 1 180 0 busripper-1.sym -N 14600 4900 15000 4900 4 -C 14600 4900 1 180 0 busripper-1.sym -N 14200 5100 13900 5100 4 -C 14200 5100 1 270 0 busripper-1.sym -N 14800 4400 14800 4600 4 -C 14800 4400 1 270 0 busripper-1.sym -N 14600 4000 14600 3700 4 -C 14600 4000 1 0 0 busripper-1.sym -T 14200 4500 9 10 1 0 0 7 1 +N 14800 7100 15900 7100 4 +N 14800 6900 16100 6900 4 +N 16100 6900 16100 7300 4 +N 14800 7300 16100 7300 4 +U 15400 6500 15400 5200 10 -1 +U 15400 5200 16400 5200 10 1 +N 15600 6300 16000 6300 4 +C 15600 6300 1 180 0 busripper-1.sym +N 15600 5900 16000 5900 4 +C 15600 5900 1 180 0 busripper-1.sym +N 15200 6100 14900 6100 4 +C 15200 6100 1 270 0 busripper-1.sym +N 15800 5400 15800 5600 4 +C 15800 5400 1 270 0 busripper-1.sym +N 15600 5000 15600 4700 4 +C 15600 5000 1 0 0 busripper-1.sym +T 15200 5500 9 10 1 0 0 7 1 Busses: -B 7900 6400 600 500 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1 -T 7000 6900 9 10 1 0 0 0 1 +B 8900 7400 600 500 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1 +T 8000 7900 9 10 1 0 0 0 1 Boxes -B 8700 6400 600 500 3 0 0 1 -1 100 0 -1 -1 -1 -1 -1 -B 9500 6400 600 500 3 0 0 2 100 100 0 -1 -1 -1 -1 -1 -B 10300 6400 600 500 3 0 0 3 100 100 0 -1 -1 -1 -1 -1 -B 11100 6400 600 500 3 0 0 4 100 100 0 -1 -1 -1 -1 -1 -B 7900 5700 600 500 3 0 0 0 -1 -1 1 -1 -1 -1 -1 -1 -B 8700 5700 600 500 3 0 0 1 -1 100 1 -1 -1 -1 -1 -1 -B 9500 5700 600 500 3 0 0 2 100 100 1 -1 -1 -1 -1 -1 -B 10300 5700 600 500 3 0 0 3 100 100 1 -1 -1 -1 -1 -1 -B 11100 5700 600 500 3 0 0 4 100 100 1 -1 -1 -1 -1 -1 -B 7900 5000 600 500 3 0 0 0 -1 -1 2 1 0 50 90 50 -B 8700 5000 600 500 3 0 0 1 -1 100 2 1 0 50 90 50 -B 9500 5000 600 500 3 0 0 2 100 100 2 1 0 50 90 50 -B 10300 5000 600 500 3 0 0 3 100 100 2 1 0 50 90 50 -B 11100 5000 600 500 3 0 0 4 100 100 2 1 0 50 90 50 -B 7900 4300 600 500 3 0 0 0 -1 -1 3 1 45 50 -1 -1 -B 8700 4300 600 500 3 0 0 1 -1 100 3 1 45 50 -1 -1 -B 9500 4300 600 500 3 0 0 2 100 100 3 1 45 50 -1 -1 -B 10300 4300 600 500 3 0 0 3 100 100 3 1 45 50 -1 -1 -B 11100 4300 600 500 3 0 0 4 100 100 3 1 45 50 -1 -1 -V 3300 4500 600 3 0 0 4 100 100 0 -1 -1 -1 -1 -1 -V 3300 4500 800 3 0 0 3 100 100 0 -1 -1 -1 -1 -1 -V 3300 4500 1000 3 0 0 2 100 100 0 -1 -1 -1 -1 -1 -V 3300 4500 1200 3 0 0 1 -1 100 0 -1 -1 -1 -1 -1 -V 3300 4500 1400 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1 -T 3300 4500 9 10 1 0 0 4 1 +B 9700 7400 600 500 3 0 0 1 -1 100 0 -1 -1 -1 -1 -1 +B 10500 7400 600 500 3 0 0 2 100 100 0 -1 -1 -1 -1 -1 +B 11300 7400 600 500 3 0 0 3 100 100 0 -1 -1 -1 -1 -1 +B 12100 7400 600 500 3 0 0 4 100 100 0 -1 -1 -1 -1 -1 +B 8900 6700 600 500 3 0 0 0 -1 -1 1 -1 -1 -1 -1 -1 +B 9700 6700 600 500 3 0 0 1 -1 100 1 -1 -1 -1 -1 -1 +B 10500 6700 600 500 3 0 0 2 100 100 1 -1 -1 -1 -1 -1 +B 11300 6700 600 500 3 0 0 3 100 100 1 -1 -1 -1 -1 -1 +B 12100 6700 600 500 3 0 0 4 100 100 1 -1 -1 -1 -1 -1 +B 8900 6000 600 500 3 0 0 0 -1 -1 2 1 0 50 90 50 +B 9700 6000 600 500 3 0 0 1 -1 100 2 1 0 50 90 50 +B 10500 6000 600 500 3 0 0 2 100 100 2 1 0 50 90 50 +B 11300 6000 600 500 3 0 0 3 100 100 2 1 0 50 90 50 +B 12100 6000 600 500 3 0 0 4 100 100 2 1 0 50 90 50 +B 8900 5300 600 500 3 0 0 0 -1 -1 3 1 45 50 -1 -1 +B 9700 5300 600 500 3 0 0 1 -1 100 3 1 45 50 -1 -1 +B 10500 5300 600 500 3 0 0 2 100 100 3 1 45 50 -1 -1 +B 11300 5300 600 500 3 0 0 3 100 100 3 1 45 50 -1 -1 +B 12100 5300 600 500 3 0 0 4 100 100 3 1 45 50 -1 -1 +V 4300 5500 600 3 0 0 4 100 100 0 -1 -1 -1 -1 -1 +V 4300 5500 800 3 0 0 3 100 100 0 -1 -1 -1 -1 -1 +V 4300 5500 1000 3 0 0 2 100 100 0 -1 -1 -1 -1 -1 +V 4300 5500 1200 3 0 0 1 -1 100 0 -1 -1 -1 -1 -1 +V 4300 5500 1400 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1 +T 4300 5500 9 10 1 0 0 4 1 Circles -P 13800 2800 14300 2800 1 0 0 +P 14800 3800 15300 3800 1 0 0 { -T 13700 2800 5 10 0 0 0 0 1 +T 14700 3800 5 10 0 0 0 0 1 pintype=unknown -T 14350 2800 5 10 1 1 0 0 1 +T 15350 3800 5 10 1 1 0 0 1 pinlabel=unknown -T 14200 2850 5 10 1 1 0 6 1 +T 15200 3850 5 10 1 1 0 6 1 pinnumber=0 -T 13700 2800 5 10 0 0 0 0 1 +T 14700 3800 5 10 0 0 0 0 1 pinseq=0 } -P 15100 2500 14600 2500 1 0 0 +P 16100 3500 15600 3500 1 0 0 { -T 15100 2500 5 10 0 0 0 0 1 +T 16100 3500 5 10 0 0 0 0 1 pintype=unknown -T 14550 2500 5 10 1 1 0 6 1 +T 15550 3500 5 10 1 1 0 6 1 pinlabel=unknown -T 14700 2550 5 10 1 1 0 0 1 +T 15700 3550 5 10 1 1 0 0 1 pinnumber=0 -T 15100 2500 5 10 0 0 0 0 1 +T 16100 3500 5 10 0 0 0 0 1 pinseq=0 } -T 14300 3200 9 10 1 0 0 6 1 +T 15300 4200 9 10 1 0 0 6 1 Pins: -T 4400 10300 9 10 1 0 0 6 1 +T 5400 11300 9 10 1 0 0 6 1 Picture: -G 4500 10000 800 800 0 0 1 +G 5500 11000 800 800 0 0 1 /usr/home/mike/geda/mycvs/eda/geda/devel/gschem/bitmap/gschem-warning.png R2RrUAAAJBgBAQACAAAAwAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA @@ -303,134 +303,134 @@ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAA . -T 13400 7300 9 10 1 0 0 2 3 +T 14400 8300 9 10 1 0 0 2 3 This is Multi-Line Text. This text takes up more than one line. -B 13400 6600 2000 700 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1 -T 14200 100 9 10 1 0 0 0 1 +B 14400 7600 2000 700 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1 +T 15200 1100 9 10 1 0 0 0 1 Mike Jarabek -T 14200 400 9 10 1 0 0 0 1 +T 15200 1400 9 10 1 0 0 0 1 1.0 -T 10500 100 9 10 1 0 0 0 1 +T 11500 1100 9 10 1 0 0 0 1 1 -T 12000 100 9 10 1 0 0 0 1 +T 13000 1100 9 10 1 0 0 0 1 1 -T 10100 400 9 10 1 0 0 0 1 +T 11100 1400 9 10 1 0 0 0 1 drawing_primitives.sch -T 10500 900 9 20 1 0 0 0 1 +T 11500 1900 9 20 1 0 0 0 1 All Drawing Primitives in gschem -T 12000 9500 9 10 1 0 0 0 1 +T 13000 10500 9 10 1 0 0 0 1 One Line Text with \_Overbar\_ and a \_second\_ with more text. -T 13400 8100 9 10 1 0 0 0 5 +T 14400 9100 9 10 1 0 0 0 5 This is \_Multiline\_ text with \_overbars\_ on a bunch of \_random\_ words scattered in the \_text\_. -C 0 0 0 0 0 title-B.sym -T 7000 10600 9 10 1 0 0 0 1 +C 1000 1000 0 0 0 title-B.sym +T 8000 11600 9 10 1 0 0 0 1 Circles -V 8200 9700 300 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1 -V 9000 9700 300 3 0 0 1 -1 100 0 -1 -1 -1 -1 -1 -V 9800 9700 300 3 0 0 2 100 100 0 -1 -1 -1 -1 -1 -V 10600 9700 300 3 0 0 3 100 100 0 -1 -1 -1 -1 -1 -V 11400 9700 300 3 0 0 4 100 100 0 -1 -1 -1 -1 -1 -V 8200 9000 300 3 0 0 0 -1 -1 1 -1 -1 -1 -1 -1 -V 9000 9000 300 3 0 0 1 -1 100 1 -1 -1 -1 -1 -1 -V 9800 9000 300 3 0 0 2 100 100 1 -1 -1 -1 -1 -1 -V 10600 9000 300 3 0 0 3 100 100 1 -1 -1 -1 -1 -1 -V 11400 9000 300 3 0 0 4 100 100 1 -1 -1 -1 -1 -1 -V 8200 8200 300 3 0 0 0 -1 -1 2 -1 0 50 90 50 -V 9000 8200 300 3 0 0 1 -1 100 2 -1 0 50 90 50 -V 9800 8200 300 3 0 0 2 100 100 2 -1 0 50 90 50 -V 10600 8200 300 3 0 0 3 100 100 2 -1 0 50 90 50 -V 11400 8200 300 3 0 0 4 100 100 2 -1 0 50 90 50 -V 8200 7400 300 3 0 0 0 -1 -1 3 1 45 50 -1 -1 -V 9000 7400 300 3 0 0 1 -1 100 3 1 45 50 -1 -1 -V 9800 7400 300 3 0 0 2 100 100 3 1 45 50 -1 -1 -V 10600 7400 300 3 0 0 3 100 100 3 1 45 50 -1 -1 -V 11400 7400 300 3 0 0 4 100 100 3 1 45 50 -1 -1 -T 7700 9700 9 10 1 0 0 7 1 +V 9200 10700 300 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1 +V 10000 10700 300 3 0 0 1 -1 100 0 -1 -1 -1 -1 -1 +V 10800 10700 300 3 0 0 2 100 100 0 -1 -1 -1 -1 -1 +V 11600 10700 300 3 0 0 3 100 100 0 -1 -1 -1 -1 -1 +V 12400 10700 300 3 0 0 4 100 100 0 -1 -1 -1 -1 -1 +V 9200 10000 300 3 0 0 0 -1 -1 1 -1 -1 -1 -1 -1 +V 10000 10000 300 3 0 0 1 -1 100 1 -1 -1 -1 -1 -1 +V 10800 10000 300 3 0 0 2 100 100 1 -1 -1 -1 -1 -1 +V 11600 10000 300 3 0 0 3 100 100 1 -1 -1 -1 -1 -1 +V 12400 10000 300 3 0 0 4 100 100 1 -1 -1 -1 -1 -1 +V 9200 9200 300 3 0 0 0 -1 -1 2 -1 0 50 90 50 +V 10000 9200 300 3 0 0 1 -1 100 2 -1 0 50 90 50 +V 10800 9200 300 3 0 0 2 100 100 2 -1 0 50 90 50 +V 11600 9200 300 3 0 0 3 100 100 2 -1 0 50 90 50 +V 12400 9200 300 3 0 0 4 100 100 2 -1 0 50 90 50 +V 9200 8400 300 3 0 0 0 -1 -1 3 1 45 50 -1 -1 +V 10000 8400 300 3 0 0 1 -1 100 3 1 45 50 -1 -1 +V 10800 8400 300 3 0 0 2 100 100 3 1 45 50 -1 -1 +V 11600 8400 300 3 0 0 3 100 100 3 1 45 50 -1 -1 +V 12400 8400 300 3 0 0 4 100 100 3 1 45 50 -1 -1 +T 8700 10700 9 10 1 0 0 7 1 No Fill -T 7700 9000 9 10 1 0 0 7 1 +T 8700 10000 9 10 1 0 0 7 1 Solid Fill -T 7700 8200 9 10 1 0 0 7 1 +T 8700 9200 9 10 1 0 0 7 1 Mesh Fill -T 7700 7400 9 10 1 0 0 7 1 +T 8700 8400 9 10 1 0 0 7 1 Hatch Fill -T 7600 6600 9 10 1 0 0 7 1 +T 8600 7600 9 10 1 0 0 7 1 No Fill -T 7600 5900 9 10 1 0 0 7 1 +T 8600 6900 9 10 1 0 0 7 1 Solid Fill -T 7600 5200 9 10 1 0 0 7 1 +T 8600 6200 9 10 1 0 0 7 1 Mesh Fill -T 7600 4500 9 10 1 0 0 7 1 +T 8600 5500 9 10 1 0 0 7 1 Hatch Fill -T 8200 10200 9 10 1 0 0 3 1 +T 9200 11200 9 10 1 0 0 3 1 Solid -T 9000 10200 9 10 1 0 0 3 1 +T 10000 11200 9 10 1 0 0 3 1 Dotted -T 9800 10200 9 10 1 0 0 3 1 +T 10800 11200 9 10 1 0 0 3 1 Dashed -T 10600 10200 9 10 1 0 0 3 1 +T 11600 11200 9 10 1 0 0 3 1 Center -T 11400 10200 9 10 1 0 0 3 1 +T 12400 11200 9 10 1 0 0 3 1 Phantom -T 7800 4000 9 10 1 0 0 6 1 +T 8800 5000 9 10 1 0 0 6 1 Line Types with Thickness -L 7900 3700 8500 3700 3 0 0 0 -1 -1 -L 8700 3700 9300 3700 3 0 0 1 -1 100 -L 9500 3700 10100 3700 3 0 0 2 100 100 -L 10300 3700 10900 3700 3 0 0 3 100 100 -L 11100 3700 11700 3700 3 0 0 4 100 100 -L 7900 3300 8500 3300 3 10 0 0 -1 -1 -L 8700 3300 9300 3300 3 10 0 1 -1 100 -L 9500 3300 10100 3300 3 10 0 2 100 100 -L 10300 3300 10900 3300 3 10 0 3 100 100 -L 11100 3300 11700 3300 3 10 0 4 100 100 -L 7900 2900 8500 2900 3 50 0 0 -1 -1 -L 8700 2900 9300 2900 3 50 0 1 -1 100 -L 9500 2900 10100 2900 3 50 0 2 100 100 -L 10300 2900 10900 2900 3 50 0 3 100 100 -L 11100 2900 11700 2900 3 50 0 4 100 100 -L 7900 2400 8500 2400 3 100 0 0 -1 -1 -L 8700 2400 9300 2400 3 100 0 1 -1 100 -L 9500 2400 10100 2400 3 100 0 2 100 100 -L 10300 2400 10900 2400 3 100 0 3 100 100 -L 11100 2400 11700 2400 3 100 0 4 100 100 -L 7900 1900 8500 1900 3 150 0 0 -1 -1 -L 8700 1900 9300 1900 3 150 0 1 -1 100 -L 9500 1900 10100 1900 3 150 0 2 100 100 -L 10300 1900 10900 1900 3 150 0 3 100 100 -L 11100 1900 11700 1900 3 150 0 4 100 100 -T 7600 3700 9 10 1 0 0 7 1 +L 8900 4700 9500 4700 3 0 0 0 -1 -1 +L 9700 4700 10300 4700 3 0 0 1 -1 100 +L 10500 4700 11100 4700 3 0 0 2 100 100 +L 11300 4700 11900 4700 3 0 0 3 100 100 +L 12100 4700 12700 4700 3 0 0 4 100 100 +L 8900 4300 9500 4300 3 10 0 0 -1 -1 +L 9700 4300 10300 4300 3 10 0 1 -1 100 +L 10500 4300 11100 4300 3 10 0 2 100 100 +L 11300 4300 11900 4300 3 10 0 3 100 100 +L 12100 4300 12700 4300 3 10 0 4 100 100 +L 8900 3900 9500 3900 3 50 0 0 -1 -1 +L 9700 3900 10300 3900 3 50 0 1 -1 100 +L 10500 3900 11100 3900 3 50 0 2 100 100 +L 11300 3900 11900 3900 3 50 0 3 100 100 +L 12100 3900 12700 3900 3 50 0 4 100 100 +L 8900 3400 9500 3400 3 100 0 0 -1 -1 +L 9700 3400 10300 3400 3 100 0 1 -1 100 +L 10500 3400 11100 3400 3 100 0 2 100 100 +L 11300 3400 11900 3400 3 100 0 3 100 100 +L 12100 3400 12700 3400 3 100 0 4 100 100 +L 8900 2900 9500 2900 3 150 0 0 -1 -1 +L 9700 2900 10300 2900 3 150 0 1 -1 100 +L 10500 2900 11100 2900 3 150 0 2 100 100 +L 11300 2900 11900 2900 3 150 0 3 100 100 +L 12100 2900 12700 2900 3 150 0 4 100 100 +T 8600 4700 9 10 1 0 0 7 1 0 -T 7600 3300 9 10 1 0 0 7 1 +T 8600 4300 9 10 1 0 0 7 1 10 -T 7600 2900 9 10 1 0 0 7 1 +T 8600 3900 9 10 1 0 0 7 1 50 -T 7600 2400 9 10 1 0 0 7 1 +T 8600 3400 9 10 1 0 0 7 1 100 -T 7600 1900 9 10 1 0 0 7 1 +T 8600 2900 9 10 1 0 0 7 1 150 -T 600 2800 9 10 1 0 0 0 1 +T 1600 3800 9 10 1 0 0 0 1 Text Sizes -T 1000 2500 9 10 1 0 0 0 1 +T 2000 3500 9 10 1 0 0 0 1 10 Points -T 1000 2100 9 15 1 0 0 0 1 +T 2000 3100 9 15 1 0 0 0 1 15 Points -T 1000 1500 9 30 1 0 0 0 1 +T 2000 2500 9 30 1 0 0 0 1 30 Points -T 1000 300 9 72 1 0 0 0 1 +T 2000 1300 9 72 1 0 0 0 1 72 Points -T 4600 3300 9 10 1 0 0 0 1 +T 5600 4300 9 10 1 0 0 0 1 Text Angles -T 6200 2600 9 10 1 0 0 0 1 +T 7200 3600 9 10 1 0 0 0 1 0 Degrees -T 6100 2700 9 10 1 0 90 0 1 +T 7100 3700 9 10 1 0 90 0 1 90 Degrees -T 6000 2600 9 10 1 0 180 0 1 +T 7000 3600 9 10 1 0 180 0 1 180 Degrees -T 6100 2500 9 10 1 0 270 0 1 +T 7100 3500 9 10 1 0 270 0 1 270 Degrees diff --git a/gschem/examples/filter_1.sch b/gschem/examples/filter_1.sch index a0b56c780..62535f5d7 100644 --- a/gschem/examples/filter_1.sch +++ b/gschem/examples/filter_1.sch @@ -1,17 +1,87 @@ -v 20031231 1 +v 20060824 1 C 31600 26500 1 180 1 opamp-1.sym { T 32200 25800 5 10 1 1 0 0 1 value=LMC662 +T 32300 27300 5 10 0 0 0 0 1 +device=OPAMP +T 32300 27100 5 10 1 1 0 0 1 +refdes=U1 +T 32300 27900 5 10 0 0 0 0 1 +symversion=0.1 } C 33600 20700 1 270 0 capacitor-1.sym +{ +T 33800 21400 5 10 0 0 0 0 1 +device=CAPACITOR +T 33900 20400 5 10 1 1 0 0 1 +refdes=C1 +T 33800 21600 5 10 0 0 0 0 1 +symversion=0.1 +} C 34200 20700 1 270 0 capacitor-1.sym +{ +T 34400 21400 5 10 0 0 0 0 1 +device=CAPACITOR +T 34500 20400 5 10 1 1 0 0 1 +refdes=C2 +T 34400 21600 5 10 0 0 0 0 1 +symversion=0.1 +} C 34800 20700 1 270 0 capacitor-1.sym +{ +T 35000 21400 5 10 0 0 0 0 1 +device=CAPACITOR +T 35100 20400 5 10 1 1 0 0 1 +refdes=C3 +T 35000 21600 5 10 0 0 0 0 1 +symversion=0.1 +} C 35400 20700 1 270 0 capacitor-1.sym +{ +T 35600 21400 5 10 0 0 0 0 1 +device=CAPACITOR +T 35700 20400 5 10 1 1 0 0 1 +refdes=C4 +T 35600 21600 5 10 0 0 0 0 1 +symversion=0.1 +} C 36000 20700 1 270 0 capacitor-1.sym +{ +T 36200 21400 5 10 0 0 0 0 1 +device=CAPACITOR +T 36300 20400 5 10 1 1 0 0 1 +refdes=C5 +T 36200 21600 5 10 0 0 0 0 1 +symversion=0.1 +} C 36600 20700 1 270 0 capacitor-1.sym +{ +T 36800 21400 5 10 0 0 0 0 1 +device=CAPACITOR +T 36900 20400 5 10 1 1 0 0 1 +refdes=C6 +T 36800 21600 5 10 0 0 0 0 1 +symversion=0.1 +} C 37200 20700 1 270 0 capacitor-1.sym +{ +T 37400 21400 5 10 0 0 0 0 1 +device=CAPACITOR +T 37500 20400 5 10 1 1 0 0 1 +refdes=C7 +T 37400 21600 5 10 0 0 0 0 1 +symversion=0.1 +} C 37800 20700 1 270 0 capacitor-1.sym +{ +T 38000 21400 5 10 0 0 0 0 1 +device=CAPACITOR +T 38100 20400 5 10 1 1 0 0 1 +refdes=C8 +T 38000 21600 5 10 0 0 0 0 1 +symversion=0.1 +} N 33800 20700 33800 20800 4 N 33800 20800 33300 20800 4 N 34400 20700 34400 21100 4 @@ -37,6 +107,10 @@ C 29500 25800 1 0 0 resistor-1.sym { T 29900 25600 5 10 1 1 0 0 1 value=47K +T 29800 26200 5 10 0 0 0 0 1 +device=RESISTOR +T 29700 26100 5 10 1 1 0 0 1 +refdes=R1 } C 32000 23800 1 0 0 gnd-1.sym N 30400 20800 31300 20800 4 @@ -68,6 +142,10 @@ C 18400 22000 1 0 0 resistor-1.sym { T 18700 21800 5 10 1 1 0 0 1 10K +T 18700 22400 5 10 0 0 0 0 1 +device=RESISTOR +T 18600 22300 5 10 1 1 0 0 1 +refdes=R2 } T 17200 22900 9 10 1 0 0 0 1 50/60Hz mains frequency @@ -78,6 +156,14 @@ T 34900 20800 9 10 1 0 0 0 1 T 24000 30900 9 10 1 0 0 0 1 COMMUTATING FILTER PHASE-LOCKED TO MAINS FREQUENCY C 22400 19500 1 0 0 4046-1.sym +{ +T 22701 23050 5 10 0 0 0 0 1 +device=4046 +T 24100 22900 5 10 1 1 0 6 1 +refdes=U2 +T 22700 23250 5 10 0 0 0 0 1 +footprint=DIP16 +} N 27100 21300 26900 21300 4 N 26900 21300 26900 21100 4 N 24400 21600 27100 21600 4 @@ -85,11 +171,21 @@ C 25500 19200 1 270 0 resistor-1.sym { T 25800 18600 5 10 1 1 0 0 1 value=220K +T 25800 19600 5 10 0 0 0 0 1 +device=RESISTOR +T 25700 19500 5 10 1 1 0 0 1 +refdes=R3 } C 24900 19200 1 270 0 capacitor-1.sym { T 24300 18600 5 10 1 1 0 0 1 value=33nF +T 25100 19900 5 10 0 0 0 0 1 +device=CAPACITOR +T 25100 19700 5 10 1 1 0 0 1 +refdes=C9 +T 25100 20100 5 10 0 0 0 0 1 +symversion=0.1 } N 25100 18300 25100 18100 4 N 25100 18100 24800 18100 4 @@ -105,11 +201,21 @@ C 22900 23100 1 0 0 resistor-1.sym { T 23200 23500 5 10 1 1 0 0 1 value=100K +T 23200 23500 5 10 0 0 0 0 1 +device=RESISTOR +T 23100 23400 5 10 1 1 0 0 1 +refdes=R4 } C 21900 19200 1 270 0 capacitor-1.sym { T 22500 18700 5 10 1 1 0 0 1 value=6n8F +T 22100 19900 5 10 0 0 0 0 1 +device=CAPACITOR +T 22100 19700 5 10 1 1 0 0 1 +refdes=C10 +T 22100 20100 5 10 0 0 0 0 1 +symversion=0.1 } C 22000 17800 1 0 0 gnd-1.sym N 22100 18100 22100 18300 4 @@ -120,26 +226,58 @@ N 24600 23200 24600 22500 4 N 24600 22500 24400 22500 4 N 22400 21500 22100 21500 4 C 31300 20600 1 0 0 4051-1.sym +{ +T 31600 23450 5 10 0 0 0 0 1 +device=4051 +T 33000 23300 5 10 1 1 0 6 1 +refdes=U3 +T 31600 23650 5 10 0 0 0 0 1 +footprint=DIL16 +} N 21800 22200 22400 22200 4 N 19500 22500 22400 22500 4 N 22400 20400 21100 20400 4 N 21100 18100 21100 21500 4 C 19900 27700 1 0 0 icl7660-1.sym +{ +T 21700 29200 5 10 0 0 0 0 1 +device=icl7660 +T 21600 29300 5 10 1 1 0 6 1 +refdes=U4 +} C 21000 17800 1 0 0 gnd-1.sym C 22600 27700 1 270 0 capacitor-2.sym { T 23200 27200 5 10 1 1 0 0 1 value=22uF +T 22800 28400 5 10 0 0 0 0 1 +device=POLARIZED_CAPACITOR +T 22800 28200 5 10 1 1 0 0 1 +refdes=C11 +T 22800 28600 5 10 0 0 0 0 1 +symversion=0.1 } C 23400 29800 1 270 0 capacitor-2.sym { T 23900 29300 5 10 1 1 0 0 1 value=22uF +T 23600 30500 5 10 0 0 0 0 1 +device=POLARIZED_CAPACITOR +T 23600 30300 5 10 1 1 0 0 1 +refdes=C12 +T 23600 30700 5 10 0 0 0 0 1 +symversion=0.1 } C 24300 27700 1 270 0 capacitor-2.sym { T 24900 27200 5 10 1 1 0 0 1 value=22uF +T 24500 28400 5 10 0 0 0 0 1 +device=POLARIZED_CAPACITOR +T 24500 28200 5 10 1 1 0 0 1 +refdes=C13 +T 24500 28600 5 10 0 0 0 0 1 +symversion=0.1 } C 23500 28400 1 0 0 gnd-1.sym C 20800 25900 1 0 0 gnd-1.sym @@ -153,7 +291,19 @@ N 22000 26300 22000 28000 4 N 19700 26300 24500 26300 4 N 21900 28000 22000 28000 4 C 23300 27800 1 0 0 diode-1.sym +{ +T 23700 28400 5 10 0 0 0 0 1 +device=DIODE +T 23600 28300 5 10 1 1 0 0 1 +refdes=D? +} C 22600 29400 1 270 0 diode-1.sym +{ +T 23000 30000 5 10 0 0 0 0 1 +device=DIODE +T 22900 29900 5 10 1 1 0 0 1 +refdes=D? +} N 21900 28600 22400 28600 4 N 22400 26600 22400 28600 4 N 23300 28000 22800 28000 4 @@ -173,11 +323,19 @@ C 31000 28200 1 270 0 resistor-1.sym { T 30800 27800 5 10 1 1 270 0 1 value=100K +T 31300 28600 5 10 0 0 0 0 1 +device=RESISTOR +T 31200 28500 5 10 1 1 0 0 1 +refdes=R5 } C 31000 25400 1 270 0 resistor-1.sym { T 30800 25200 5 10 1 1 270 0 1 value=100K +T 31300 25800 5 10 0 0 0 0 1 +device=RESISTOR +T 31200 25700 5 10 1 1 0 0 1 +refdes=R6 } N 31100 24500 31100 24300 4 C 27700 27100 1 0 0 vdd-1.sym @@ -198,6 +356,14 @@ bits is not out of the question Good long term design takes care of these voltage shifts in one hit but of course, this is just a bodged up test cct... C 27100 19600 1 0 0 4040-1.sym +{ +T 27400 23750 5 10 0 0 0 0 1 +device=4040 +T 28800 23600 5 10 1 1 0 6 1 +refdes=U5 +T 27400 23950 5 10 0 0 0 0 1 +footprint=DIP16 +} N 29400 22300 29400 23800 4 N 21800 23800 29400 23800 4 T 24500 21700 9 10 1 0 0 0 1 @@ -218,6 +384,12 @@ C 31700 26900 1 0 0 capacitor-1.sym { T 32000 27400 5 10 1 1 0 0 1 33nF +T 31900 27600 5 10 0 0 0 0 1 +device=CAPACITOR +T 31900 27400 5 10 1 1 0 0 1 +refdes=C14 +T 31900 27800 5 10 0 0 0 0 1 +symversion=0.1 } N 30700 21900 30700 25900 4 N 31700 27100 30700 27100 4 @@ -226,6 +398,10 @@ C 29500 26200 1 0 0 resistor-1.sym { T 29900 26500 5 10 1 1 0 0 1 value=47K +T 29800 26600 5 10 0 0 0 0 1 +device=RESISTOR +T 29700 26500 5 10 1 1 0 0 1 +refdes=R7 } N 30400 25900 31600 25900 4 N 31100 25400 31100 25900 4 @@ -241,6 +417,12 @@ post-commutator lowpass rolls off at 100 Hz T 31100 18200 9 10 1 0 0 0 1 Disadvantage with using 200/100/50 Hz in is low freq. to filter out C 16800 20600 1 0 0 pwrxfmr-1.sym +{ +T 17100 22300 5 10 1 1 0 0 1 +refdes=T? +T 17100 22500 5 10 0 0 0 0 1 +device=transformer +} N 16400 21700 16400 22100 4 N 16400 22100 16800 22100 4 N 16800 21500 16700 21500 4 @@ -249,10 +431,20 @@ N 16700 21300 16800 21300 4 N 16800 20700 16400 20700 4 N 16400 20700 16400 21100 4 C 15000 20900 1 0 0 mains-plug-1.sym +{ +T 15400 22000 5 10 1 1 0 0 1 +refdes=CONN? +T 15400 22200 5 10 0 0 0 0 1 +device=MAINS_CONNECTOR +} C 18400 21400 1 0 0 resistor-1.sym { T 18700 21200 5 10 1 1 0 0 1 10K +T 18700 21800 5 10 0 0 0 0 1 +device=RESISTOR +T 18600 21700 5 10 1 1 0 0 1 +refdes=R8 } N 19300 22100 19500 22100 4 N 19500 22000 19500 22500 4 @@ -266,6 +458,10 @@ C 26300 19200 1 270 0 resistor-1.sym { T 26600 18600 5 10 1 1 0 0 1 value=100K +T 26600 19600 5 10 0 0 0 0 1 +device=RESISTOR +T 26500 19500 5 10 1 1 0 0 1 +refdes=R9 } N 24400 21300 26400 21300 4 N 26400 21300 26400 19200 4 @@ -277,6 +473,12 @@ C 27400 26300 1 180 1 opamp-1.sym { T 28000 25600 5 10 1 1 0 0 1 value=LMC662 +T 28100 27100 5 10 0 0 0 0 1 +device=OPAMP +T 28100 26300 5 10 1 1 0 0 1 +refdes=U6 +T 28100 27700 5 10 0 0 0 0 1 +symversion=0.1 } N 27400 26100 27100 26100 4 N 27100 26100 27100 26600 4 @@ -298,6 +500,10 @@ C 31700 28000 1 0 0 resistor-1.sym { T 32000 28300 5 10 1 1 0 0 1 value=47K +T 32000 28400 5 10 0 0 0 0 1 +device=RESISTOR +T 31900 28300 5 10 1 1 0 0 1 +refdes=R10 } N 31100 24300 32100 24300 4 N 32100 25700 32100 24100 4 @@ -306,6 +512,14 @@ N 31500 28100 31500 27100 4 N 32800 28100 32600 28100 4 N 32800 28100 32800 27100 4 C 19500 21300 1 0 0 bridge-1.sym +{ +T 19700 22300 5 10 1 1 0 0 1 +refdes=U7 +T 19700 22700 5 10 0 0 0 0 1 +device=bridge +T 19700 23100 5 10 0 0 0 0 1 +symversion=0.1 +} N 18300 22100 18400 22100 4 N 18300 21500 18400 21500 4 T 24700 30600 9 10 1 0 0 0 1 diff --git a/gschem/src/Makefile.am b/gschem/src/Makefile.am index 6c16397fd..10a56b953 100644 --- a/gschem/src/Makefile.am +++ b/gschem/src/Makefile.am @@ -3,7 +3,6 @@ # directory are distributed by the demo_distfiles variable in the top # level Makefile. # -VPATH = ../include:src bin_PROGRAMS = gschem diff --git a/gschem/src/o_misc.c b/gschem/src/o_misc.c index 4866a0fa5..36628bb83 100644 --- a/gschem/src/o_misc.c +++ b/gschem/src/o_misc.c @@ -1652,14 +1652,16 @@ void o_update_component(TOPLEVEL *w_current, OBJECT *o_current) while (a_current != NULL) { OBJECT *o_attrib; gchar *name, *value; + char *attrfound; g_assert (a_current->object->type == OBJ_TEXT); o_attrib_get_name_value (a_current->object->text->string, &name, &value); - - if (o_attrib_search_name (o_current, name, 0) == NULL) { + + attrfound = o_attrib_search_name_single(o_current, name, NULL); + if (attrfound == NULL) { /* attribute with same name not found in old component: */ /* add new attribute to old component */ - + /* make a copy of the attribute object */ o_list_copy_to (w_current, o_current, a_current->object, NORMAL_FLAG, &o_attrib); @@ -1673,6 +1675,11 @@ void o_update_component(TOPLEVEL *w_current, OBJECT *o_current) o_redraw_single (w_current, o_attrib); /* note: this object is unselected (not added to selection). */ } + else + { + g_free(attrfound); + } + a_current = a_current->next; } @@ -1683,7 +1690,7 @@ void o_update_component(TOPLEVEL *w_current, OBJECT *o_current) s_conn_update_complex (w_current, o_current->complex->prim_objs); o_selection_select (o_current, SELECT_COLOR); o_redraw_single (w_current, o_current); - + if (is_embedded) { /* we previously allocated memory for basename and clib */ g_free (basename); diff --git a/gsymcheck/configure.ac b/gsymcheck/configure.ac index 57c06645a..26a1baefd 100644 --- a/gsymcheck/configure.ac +++ b/gsymcheck/configure.ac @@ -4,7 +4,7 @@ AC_CONFIG_SRCDIR([src/gsymcheck.c]) AC_PREREQ(2.54) PACKAGE=geda-gsymcheck -VERSION=20060821 +VERSION=20060824 echo Configuring $PACKAGE version $VERSION # Initialize automake diff --git a/libgeda/ChangeLog b/libgeda/ChangeLog index d07dc882d..0d2c6111c 100644 --- a/libgeda/ChangeLog +++ b/libgeda/ChangeLog @@ -1,3 +1,11 @@ +2006-08-22 Ales Hvezda + + * src/Makefile.am: Removed old VPATH, since it is no longer needed + and it is interfering with make distcheck + + * share/Makefile.am: Added prolog.ps to EXTRA_DIST to make distcheck + happy (and it was missing from the dist in general). + 2006-08-21 Ales Hvezda * README: Updated the README a little to be ready for the next diff --git a/libgeda/INSTALL b/libgeda/INSTALL index 974ad8ad5..1903dc19a 100644 --- a/libgeda/INSTALL +++ b/libgeda/INSTALL @@ -6,7 +6,7 @@ GPL Electronic Design Automation Installation instructions Please see the end of this file for platform / vendor specific hints and -tips. +tips. Also please read the README file in this same directory. ----------------------------------------------------------------------------- Quick Ref: @@ -20,11 +20,11 @@ Quick Ref: In order to build libgeda you must install the following packages first: - GLIB 1.2.x - GTK+ 1.2.x - guile 1.4.x or 1.6.x - LibStroke 0.5.1 (optional) - libgdgeda 2.0.15 (optional; you also need zlib and libpng for this lib) + GLIB 2.4.x + GTK+ 2.4.x and all dependancies + guile 1.6.x or later + LibStroke 0.5.1 (optional) + libgdgeda 2.0.15 (optional; you also need zlib and libpng for this lib) ----------------------------------------------------------------------------- More detailed info: diff --git a/libgeda/configure.ac b/libgeda/configure.ac index e326cb393..f63577cbf 100644 --- a/libgeda/configure.ac +++ b/libgeda/configure.ac @@ -4,7 +4,7 @@ AC_CONFIG_SRCDIR([include/libgeda.h]) AC_PREREQ(2.54) PACKAGE=libgeda -VERSION=20060821 +VERSION=20060824 SHARED_LIBRARY_VERSION=26:0:0 echo Configuring $PACKAGE version $VERSION diff --git a/libgeda/share/Makefile.am b/libgeda/share/Makefile.am index d76325dcf..890e6ce1b 100644 --- a/libgeda/share/Makefile.am +++ b/libgeda/share/Makefile.am @@ -1,2 +1,7 @@ +# $Id$ +# + prologdatadir = @GEDARCDIR@ prologdata_DATA = prolog.ps + +EXTRA_DIST = $(prologdata_DATA) diff --git a/libgeda/src/Makefile.am b/libgeda/src/Makefile.am index c88c54a72..70550733c 100644 --- a/libgeda/src/Makefile.am +++ b/libgeda/src/Makefile.am @@ -5,11 +5,6 @@ # level Makefile. AUTOMAKE_OPTIONS = foreign -INDENTBIN= @INDENT@ -INDENTFLAG= -kr -i2 - -VPATH = ../include:src - if CCISGCC AM_CFLAGS = -Wall endif diff --git a/setup/configure.ac b/setup/configure.ac index 291df1a03..4a8227e92 100644 --- a/setup/configure.ac +++ b/setup/configure.ac @@ -5,7 +5,7 @@ dnl Initialize automake stuff PACKAGE=geda-setup # new way of doing version -VERSION=20060821 +VERSION=20060824 echo Configuring $PACKAGE version $VERSION diff --git a/symbols/configure.ac b/symbols/configure.ac index 1ba81cf03..4cb7e6581 100644 --- a/symbols/configure.ac +++ b/symbols/configure.ac @@ -4,7 +4,7 @@ AC_CONFIG_SRCDIR([74/7400-1.sym]) AC_PREREQ(2.54) PACKAGE=geda-symbols -VERSION=20060821 +VERSION=20060824 echo Configuring $PACKAGE version $VERSION # Initialize automake stuff diff --git a/utils/ChangeLog b/utils/ChangeLog index 56847e6a2..210458e1d 100644 --- a/utils/ChangeLog +++ b/utils/ChangeLog @@ -1,3 +1,12 @@ +2006-08-22 Ales Hvezda + + * scripts/config.sh.in: Removed unused environment variables that + were causing a warning from configure: config.status: WARNING: + scripts/config.sh contains a reference to the variable `datarootdir' + + * scripts/Makefile.am: Added $(srcdir) to gschemdoc.sh to make + distcheck happy. Also misc cleanup. + 2006-08-21 Ales Hvezda * README: Updated the README a little to be ready for the next diff --git a/utils/configure.ac b/utils/configure.ac index badbd0d5f..50ad1fb7e 100644 --- a/utils/configure.ac +++ b/utils/configure.ac @@ -4,7 +4,7 @@ AC_CONFIG_SRCDIR([src/gmk_sym.c]) AC_PREREQ(2.54) PACKAGE=geda-utils -VERSION=20060821 +VERSION=20060824 echo Configuring $PACKAGE version $VERSION # Initialize automake diff --git a/utils/scripts/Makefile.am b/utils/scripts/Makefile.am index d88fb945b..e46c57b17 100644 --- a/utils/scripts/Makefile.am +++ b/utils/scripts/Makefile.am @@ -7,19 +7,22 @@ EXTRA_DIST = convert_sym.awk gpstoimage mk_char_tab.pl \ sarlacc_sym gschupdate gsymupdate refdes_renum gsymfix.pl \ config.sh.in gschemdoc.sh tragesym pads_backannotate garchive.py +BUILT_SOURCES = config.sh + +gschemdoc: config.sh $(srcdir)/gschemdoc.sh + cat config.sh $(srcdir)/gschemdoc.sh > tmp$@ + chmod a+x tmp$@ + mv -f tmp$@ $@ + +## SDB's stuff to enable garchive. This hardcodes the path to the +## system libraries into garchive prior to installation. +garchive: $(srcdir)/garchive.py + sed -e "s#GEDADATADIR#$(GEDADATADIR)#" $(srcdir)/garchive.py > tmp$@ + chmod a+x tmp$@ + mv -f tmp$@ $@ + MOSTLYCLEANFILES = *.log *.ps core FILE tmp *~ CLEANFILES = *.log *.ps core FILE tmp *~ DISTCLEANFILES = *.log core FILE tmp *~ prototype.bak gschemdoc garchive MAINTAINERCLEANFILES = *.log *.ps core FILE tmp *~ Makefile.in \ configure gschemdoc garchive - -gschemdoc: config.sh gschemdoc.sh - cat config.sh gschemdoc.sh >tmp - chmod a+x tmp - mv -f tmp gschemdoc - -## SDB's stuff to enable garchive. This hardcodes the path to the -## system libraries into garchive prior to installation. -garchive: garchive.py - sed -e "s#GEDADATADIR#$(GEDADATADIR)#" garchive.py > garchive - chmod a+x garchive diff --git a/utils/scripts/config.sh.in b/utils/scripts/config.sh.in index 7c4f4de4a..645649381 100644 --- a/utils/scripts/config.sh.in +++ b/utils/scripts/config.sh.in @@ -19,8 +19,5 @@ # GEDAVERSION="@VERSION@" -GEDAHOME="@HOME@" -GEDARCDIR="@GEDARCDIR@" -GEDADATADIR="@GEDADATADIR@" DOCDIR="@GEDADOCDIR@" -- 2.11.4.GIT