Re: Logic Gates in SVG format for Dia [1/2]

[Cyril Chevrot <chevrot altern org>]

Hi,

I have posted two weeks ago about some new Logic Gates for dia.

For memory: 
> Here some logic gates in SVG format for Dia.
> The Logic section of Dia 0.92 already contains some logic gates however
> only a subset has been implemented.
> My version is more complete. It contains :
> - 10 logic gates : and/or/xor/nand/nor/nxor/inverter/buffer/mux/register
> - NMOS and PMOS transistor
> - Connection stuff
> - Comparater
>
> All this gates are available in all positions.
>
> Of course, all files are under GPL license. I haven't mentionned it
> because it wasn't mentionned in the other SVG files.
>
> My tarball contains a `shapes/Boolean' directory with *.shape and *.xpm
> files and a `sheets' directory with only one file `Boolean.sheet'.
> The name for the section is Boolean.
>
> INSTALLATION
> In your own `.dia' directory:
> tar -C ~/.dia -xvzf logic_gates.tgz
>
> For all users:
> su -c 'tar -C /usr/share/dia -xvzf logic_gates.tgz'
> 
> Then launch dia and go into the Boolean section.
>
> hope this could be included in the next version of Dia.

Then we have advised me to include these files more properly in the Dia 
source Tree.

On Sun, 2 Nov 2003, Alan Horkan wrote:

> if you want to be incredibly cool provide the necessary makefiles so that
> we can commit these files!

So, because I am an incredibly cool man, I provide the necessary makefiles 
so that you can commit these files ;)

I didn't attain to fetch the cvs version of dia (version 0.92.2). 
Apparently, no anonymous account exists. If one exists, I would be glad 
to know  it.
So, my patch must be applied to the 0.92 version of dia.
I submit my changes in two different manners :

- A patch file: patch-0.92.gz [Available in the second part of this mail]
  I obtain it via:
  # diff -urN dia-0.92 dia-0.92-cc
  where dia-0.92-cc is my own tree.
  You can apply it via the following commands:
  # cp patch-0.92 dia-0.92
  # cd dia-0.92
  # patch -p1 < patch-0.92

- A tarball with only the new and update files: patchfiles-0.92.tgz
  For each update files, I provide three files:
  - file.orig:  the 0.92 version
  - file:       the new version 
  - file.patch: diff -u file.orig file

Below, the files which are added and updated by my patch:
(U means Update, N means New).

U configure.in

U sheets/Makefile.am
N sheets/Boolean.sheet.in

U shapes/Makefile.am

N shapes/Boolean/Makefile.am
N shapes/Boolean/and.xpm
N shapes/Boolean/and.shape
N shapes/Boolean/and_r90.xpm
N shapes/Boolean/and_r90.shape
N shapes/Boolean/and_r180.xpm
N shapes/Boolean/and_r180.shape
N shapes/Boolean/and_r270.xpm
N shapes/Boolean/and_r270.shape
...

Below, I show the modifications to the `Makefile.am's and `configure.in':

----------

# diff -u configure.in.orig configure.in
--- configure.in.orig   2003-10-19 15:22:38.000000000 +0200
+++ configure.in        2003-11-13 17:52:13.000000000 +0100
@@ -404,6 +404,7 @@
 objects/UML/Makefile
 shapes/Makefile
 shapes/Assorted/Makefile
+shapes/Boolean/Makefile
 shapes/Circuit/Makefile
 shapes/Cisco/Makefile
 shapes/Civil/Makefile

# diff sheets/Makefile.am.orig sheets/Makefile.am
--- Makefile.am.orig    2002-12-02 06:05:37.000000000 +0100
+++ Makefile.am 2003-11-13 17:06:20.000000000 +0100
@@ -7,7 +7,7 @@
   civil.sheet.in jigsaw.sheet.in MSE.sheet.in SDL.sheet.in Logic.sheet.in 
\
   EML.sheet.in Misc.sheet.in Assorted.sheet.in ciscocomputer.sheet.in \
   ciscohub.sheet.in ciscomisc.sheet.in cisconetwork.sheet.in \
-  ciscorouter.sheet.in
+  ciscorouter.sheet.in Boolean.sheet.in

 SHEETS = $(sheet_in_files:.sheet.in=.sheet)


# diff shapes/Makefile.am.orig shapes/Makefile.am
--- Makefile.am.orig    2002-12-02 06:11:52.000000000 +0100
+++ Makefile.am 2003-11-13 17:13:46.000000000 +0100
@@ -1,5 +1,5 @@

 SUBDIRS = Circuit flowchart Contact network Pneumatic Electric \
-       Civil jigsaw MSE SDL Logic sybase Misc Assorted Cisco
+       Civil jigsaw MSE SDL Logic sybase Misc Assorted Cisco Boolean

# cat shapes/Boolean/Makefile.am

shapedir = $(pkgdatadir)/shapes/Boolean

SHAPES = \
        and.shape \
        and.xpm \
        and_r90.shape \
        and_r90.xpm \
        and_r180.shape \
        and_r180.xpm \
        and_r270.shape \
        ...

EXTRA_DIST = $(SHAPES)

shape_DATA = $(SHAPES)

----------

If some modifications are still necessary, please warn me.

-- 
  Cyril

patchfiles-0.92.tgz