From f024280172094a2e780b75b87e4cc08cac5d0653 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 13 Aug 2007 19:36:51 +0000 Subject: [PATCH 1/8] Initialize branch F-7 for alliance --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..c48525c --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-7 From 29a7809a268dc700d0454db6b51b7204fad78cce Mon Sep 17 00:00:00 2001 From: Chitlesh GOORAH Date: Mon, 13 Aug 2007 20:58:56 +0000 Subject: [PATCH 2/8] *** empty log message *** --- .cvsignore | 1 + alliance-examples.patch | 594 +++++++++++++++++++++++++++++++++ alliance-log3.patch | 22 ++ alliance-perms.patch | 14 + alliance-run.patch | 21 ++ alliance-tutorials.patch | 690 +++++++++++++++++++++++++++++++++++++++ alliance.fedora | 44 +++ alliance.spec | 412 +++++++++++++++++++++++ dreal.desktop | 10 + dreal.png | Bin 0 -> 5967 bytes graal.desktop | 10 + graal.png | Bin 0 -> 6055 bytes sources | 1 + xfsm.desktop | 10 + xfsm.png | Bin 0 -> 5909 bytes xpat.desktop | 10 + xpat.png | Bin 0 -> 6079 bytes xsch.desktop | 10 + xsch.png | Bin 0 -> 3919 bytes xvpn.desktop | 10 + xvpn.png | Bin 0 -> 7998 bytes 21 files changed, 1859 insertions(+) create mode 100644 alliance-examples.patch create mode 100644 alliance-log3.patch create mode 100644 alliance-perms.patch create mode 100644 alliance-run.patch create mode 100644 alliance-tutorials.patch create mode 100644 alliance.fedora create mode 100644 alliance.spec create mode 100644 dreal.desktop create mode 100644 dreal.png create mode 100644 graal.desktop create mode 100644 graal.png create mode 100644 xfsm.desktop create mode 100644 xfsm.png create mode 100644 xpat.desktop create mode 100644 xpat.png create mode 100644 xsch.desktop create mode 100644 xsch.png create mode 100644 xvpn.desktop create mode 100644 xvpn.png diff --git a/.cvsignore b/.cvsignore index e69de29..e2837be 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +alliance-5.0-20070718.tar.gz diff --git a/alliance-examples.patch b/alliance-examples.patch new file mode 100644 index 0000000..582c2fc --- /dev/null +++ b/alliance-examples.patch @@ -0,0 +1,594 @@ +diff -Naur documentation/alliance-examples/addaccu16/Makefile alliance-examples/addaccu16/Makefile +--- documentation/alliance-examples/addaccu16/Makefile 2004-05-24 00:15:16.000000000 +0200 ++++ alliance-examples/addaccu16/Makefile 2007-07-19 13:13:51.000000000 +0200 +@@ -16,7 +16,9 @@ + # | | + # \------------------------------------------------------------*/ + + ALLIANCE_BIN=$(ALLIANCE_TOP)/bin ++ ++ALLIANCE_EXAMPLES=/usr/share/doc/alliance-doc-5.0/alliance-examples + + VASY = $(ALLIANCE_BIN)/vasy + ASIMUT = $(ALLIANCE_BIN)/asimut +@@ -39,8 +41,8 @@ + TOUCH = touch + + TARGET_LIB = $(ALLIANCE_TOP)/cells/sxlib +-RDS_TECHNO_SYMB = ../etc/techno-symb.rds +-RDS_TECHNO = ../etc/techno-035.rds ++RDS_TECHNO_SYMB = $(ALLIANCE_EXAMPLES)/etc/techno-symb.rds ++RDS_TECHNO = $(ALLIANCE_EXAMPLES)/etc/techno-035.rds + SPI_MODEL = $(ALLIANCE_TOP)/etc/spimodel.cfg + METAL_LEVEL = 2 + +diff -Naur documentation/alliance-examples/addaccu16/README alliance-examples/addaccu16/README +--- documentation/alliance-examples/addaccu16/README 2004-07-28 13:00:06.000000000 +0200 ++++ alliance-examples/addaccu16/README 2007-07-19 13:13:51.000000000 +0200 +@@ -10,11 +10,13 @@ + the associated stimuli file, and also a configuration file for IO + placement (used during the Place and Route step). + +-The Makefile set environement variables properly and run Alliance tools, ++The Makefile set environment variables properly and run Alliance tools, + following each step of the design flow from VHDL up to real layout in a + pseudo 0.35 techno. + +-The environement variable ALLIANCE_TOP has to be set. ++ ++copy the folder "addaccu16" to any writable folder of your choice and type: ++$ make + + The main targets of the makefile are listed below (following the design flow). + +diff -Naur documentation/alliance-examples/adder4/adder4.ioc alliance-examples/adder4/adder4.ioc +--- documentation/alliance-examples/adder4/adder4.ioc 2004-05-23 19:27:03.000000000 +0200 ++++ alliance-examples/adder4/adder4.ioc 2007-07-19 13:13:51.000000000 +0200 +@@ -1,4 +1,4 @@ +-# Copyright (c) 1997 by Cadence. All rights reserved. ++# + ################################################################### + # In each of TOP()/BOTTOM()/LEFT()/RIGHT() section, there are # + # placed IOs. In the IGNORE() section, the IOs are ignored # +diff -Naur documentation/alliance-examples/adder4/Makefile alliance-examples/adder4/Makefile +--- documentation/alliance-examples/adder4/Makefile 2004-05-24 00:15:20.000000000 +0200 ++++ alliance-examples/adder4/Makefile 2007-07-19 13:13:51.000000000 +0200 +@@ -16,7 +16,9 @@ + # | | + # \------------------------------------------------------------*/ + + ALLIANCE_BIN=$(ALLIANCE_TOP)/bin ++ ++ALLIANCE_EXAMPLES=/usr/share/doc/alliance-doc-5.0/alliance-examples + + VASY = $(ALLIANCE_BIN)/vasy + ASIMUT = $(ALLIANCE_BIN)/asimut +@@ -39,8 +41,8 @@ + TOUCH = touch + + TARGET_LIB = $(ALLIANCE_TOP)/cells/sxlib +-RDS_TECHNO_SYMB = ../etc/techno-symb.rds +-RDS_TECHNO = ../etc/techno-035.rds ++RDS_TECHNO_SYMB = $(ALLIANCE_EXAMPLES)/etc/techno-symb.rds ++RDS_TECHNO = $(ALLIANCE_EXAMPLES)/etc/techno-035.rds + SPI_MODEL = $(ALLIANCE_TOP)/etc/spimodel.cfg + METAL_LEVEL = 2 + +diff -Naur documentation/alliance-examples/adder4/README alliance-examples/adder4/README +--- documentation/alliance-examples/adder4/README 2004-07-28 13:00:06.000000000 +0200 ++++ alliance-examples/adder4/README 2007-07-19 13:13:51.000000000 +0200 +@@ -14,7 +14,9 @@ + following each step of the design flow from VHDL up to real layout in a + pseudo 0.35 techno. + +-The environement variable ALLIANCE_TOP has to be set. ++ ++copy the folder "adder4" to any writable folder of your choice and type: ++$ make + + The main targets of the makefile are listed below (following the design flow). + +diff -Naur documentation/alliance-examples/amd2901/amd2901_core.ioc alliance-examples/amd2901/amd2901_core.ioc +--- documentation/alliance-examples/amd2901/amd2901_core.ioc 2004-05-23 20:55:16.000000000 +0200 ++++ alliance-examples/amd2901/amd2901_core.ioc 2007-07-19 13:13:52.000000000 +0200 +@@ -1,4 +1,4 @@ +-# Copyright (c) 1997 by Cadence. All rights reserved. ++# + ################################################################### + # In each of TOP()/BOTTOM()/LEFT()/RIGHT() section, there are # + # placed IOs. In the IGNORE() section, the IOs are ignored # + +diff -Naur documentation/alliance-examples/amd2901/Makefile alliance-examples/amd2901/Makefile +--- documentation/alliance-examples/amd2901/Makefile 2004-05-24 00:15:22.000000000 +0200 ++++ alliance-examples/amd2901/Makefile 2007-07-19 13:13:51.000000000 +0200 +@@ -11,7 +11,9 @@ + STANDART_PATH = PATH=$(STANDART_BIN); export PATH + + # Standart Alliance binary access paths. + ALLIANCE_BIN = $(ALLIANCE_TOP)/bin ++ ++ALLIANCE_EXAMPLES=/usr/share/doc/alliance-doc-5.0/alliance-examples + + # -------------------------------------------------------------------- + # Standarts binaries. +@@ -41,8 +43,8 @@ + CATA_LIB2 = $(ALLIANCE_TOP)/cells/padlib + CATA_LIB = .:$(CATA_LIB0):$(CATA_LIB1):$(CATA_LIB2) + TARGET_LIB = $(ALLIANCE_TOP)/cells/sxlib +- RDS_TECHNO = ../etc/techno-symb.rds +- REAL_RDS_TECHNO = ../etc/techno-035.rds ++RDS_TECHNO_SYMB = $(ALLIANCE_EXAMPLES)/etc/techno-symb.rds ++RDS_TECHNO = $(ALLIANCE_EXAMPLES)/etc/techno-035.rds + GRAAL_TECHNO = $(ALLIANCE_TOP)/etc/cmos.graal + + +diff -Naur documentation/alliance-examples/amd2901-vasy/amd2901.ioc alliance-examples/amd2901-vasy/amd2901.ioc +--- documentation/alliance-examples/amd2901-vasy/amd2901.ioc 2004-05-23 21:00:16.000000000 +0200 ++++ alliance-examples/amd2901-vasy/amd2901.ioc 2007-07-19 13:13:52.000000000 +0200 +@@ -1,4 +1,4 @@ +-# Copyright (c) 1997 by Cadence. All rights reserved. ++# + ################################################################### + # In each of TOP()/BOTTOM()/LEFT()/RIGHT() section, there are # + # placed IOs. In the IGNORE() section, the IOs are ignored # +diff -Naur documentation/alliance-examples/amd2901-vasy/Makefile alliance-examples/amd2901-vasy/Makefile +--- documentation/alliance-examples/amd2901-vasy/Makefile 2004-05-24 00:15:23.000000000 +0200 ++++ alliance-examples/amd2901-vasy/Makefile 2007-07-19 13:13:52.000000000 +0200 +@@ -16,7 +16,9 @@ + # | | + # \------------------------------------------------------------*/ + + ALLIANCE_BIN = $(ALLIANCE_TOP)/bin ++ ++ALLIANCE_EXAMPLES=/usr/share/doc/alliance-doc-5.0/alliance-examples + + VASY = $(ALLIANCE_BIN)/vasy + ASIMUT = $(ALLIANCE_BIN)/asimut +@@ -40,8 +42,8 @@ + TOUCH = touch + + TARGET_LIB = $(ALLIANCE_TOP)/cells/sxlib +-RDS_TECHNO_SYMB = ../etc/techno-symb.rds +-RDS_TECHNO = ../etc/techno-035.rds ++RDS_TECHNO_SYMB = $(ALLIANCE_EXAMPLES)/etc/techno-symb.rds ++RDS_TECHNO = $(ALLIANCE_EXAMPLES)/etc/techno-035.rds + SPI_MODEL = $(ALLIANCE_TOP)/etc/spimodel.cfg + METAL_LEVEL = 4 + +diff -Naur documentation/alliance-examples/digi/Makefile alliance-examples/digi/Makefile +--- documentation/alliance-examples/digi/Makefile 2004-09-09 22:03:49.000000000 +0200 ++++ alliance-examples/digi/Makefile 2007-07-19 13:13:52.000000000 +0200 +@@ -16,7 +16,9 @@ + # | | + # \------------------------------------------------------------*/ + + ALLIANCE_BIN=$(ALLIANCE_TOP)/bin ++ ++ALLIANCE_EXAMPLES=/usr/share/doc/alliance-doc-5.0/alliance-examples + + SYF = $(ALLIANCE_BIN)/syf + ASIMUT = $(ALLIANCE_BIN)/asimut +@@ -40,14 +42,14 @@ + TOUCH = touch + + TARGET_LIB = $(ALLIANCE_TOP)/cells/sxlib +-RDS_TECHNO_SYMB = ../etc/techno-symb.rds +-RDS_TECHNO = ../etc/techno-035.rds ++RDS_TECHNO_SYMB = $(ALLIANCE_EXAMPLES)/etc/techno-symb.rds ++RDS_TECHNO = $(ALLIANCE_EXAMPLES)/etc/techno-035.rds + METAL_LEVEL = 2 + SPI_MODEL = $(ALLIANCE_TOP)/etc/spimodel.cfg + + # /*------------------------------------------------------------\ + # | | +-# | Environement | ++# | Environment | + # | | + # \------------------------------------------------------------*/ + +diff -Naur documentation/alliance-examples/divcas4/divcas4.ioc alliance-examples/divcas4/divcas4.ioc +--- documentation/alliance-examples/divcas4/divcas4.ioc 2004-05-23 19:52:10.000000000 +0200 ++++ alliance-examples/divcas4/divcas4.ioc 2007-07-19 13:13:52.000000000 +0200 +@@ -1,4 +1,4 @@ +-# Copyright (c) 1997 by Cadence. All rights reserved. ++# + ################################################################### + # In each of TOP()/BOTTOM()/LEFT()/RIGHT() section, there are # + # placed IOs. In the IGNORE() section, the IOs are ignored # +diff -Naur documentation/alliance-examples/divcas4/Makefile alliance-examples/divcas4/Makefile +--- documentation/alliance-examples/divcas4/Makefile 2004-05-23 21:11:26.000000000 +0200 ++++ alliance-examples/divcas4/Makefile 2007-07-19 13:13:52.000000000 +0200 +@@ -16,7 +16,9 @@ + # | | + # \------------------------------------------------------------*/ + + ALLIANCE_BIN = $(ALLIANCE_TOP)/bin ++ ++ALLIANCE_EXAMPLES=/usr/share/doc/alliance-doc-5.0/alliance-examples + + VASY = $(ALLIANCE_BIN)/vasy + ASIMUT = $(ALLIANCE_BIN)/asimut +@@ -39,8 +41,8 @@ + TOUCH = touch + + TARGET_LIB = $(ALLIANCE_TOP)/cells/sxlib +-RDS_TECHNO_SYMB = ../etc/techno-symb.rds +-RDS_TECHNO = ../etc/techno-035.rds ++RDS_TECHNO_SYMB = $(ALLIANCE_EXAMPLES)/etc/techno-symb.rds ++RDS_TECHNO = $(ALLIANCE_EXAMPLES)/etc/techno-035.rds + SPI_MODEL = $(ALLIANCE_TOP)/etc/spimodel.cfg + METAL_LEVEL = 2 + +diff -Naur documentation/alliance-examples/divcas4/README alliance-examples/divcas4/README +--- documentation/alliance-examples/divcas4/README 2004-07-28 13:00:06.000000000 +0200 ++++ alliance-examples/divcas4/README 2007-07-19 13:13:52.000000000 +0200 +@@ -14,5 +14,6 @@ + following each step of the design flow from VHDL up to real layout in a + pseudo 0.35 techno. + +-The environement variable ALLIANCE_TOP has to be set. +- ++ ++copy the folder "divcas4" to any writable folder of your choice and type: ++$ make +diff -Naur documentation/alliance-examples/hadamard/Makefile alliance-examples/hadamard/Makefile +--- documentation/alliance-examples/hadamard/Makefile 2004-05-24 00:15:25.000000000 +0200 ++++ alliance-examples/hadamard/Makefile 2007-07-19 16:21:10.000000000 +0200 +@@ -16,7 +16,9 @@ + # | | + # \------------------------------------------------------------*/ + + ALLIANCE_BIN = $(ALLIANCE_TOP)/bin ++ ++ALLIANCE_EXAMPLES=/usr/share/doc/alliance-doc-5.0/alliance-examples + + VASY = $(ALLIANCE_BIN)/vasy + ASIMUT = $(ALLIANCE_BIN)/asimut +@@ -39,14 +41,14 @@ + TOUCH = touch + + TARGET_LIB = $(ALLIANCE_TOP)/cells/sxlib +-RDS_TECHNO_SYMB = ../etc/techno-symb.rds +-RDS_TECHNO = ../etc/techno-035.rds ++RDS_TECHNO_SYMB = $(ALLIANCE_EXAMPLES)/etc/techno-symb.rds ++RDS_TECHNO = $(ALLIANCE_EXAMPLES)/etc/techno-035.rds + SPI_MODEL = $(ALLIANCE_TOP)/etc/spimodel.cfg + METAL_LEVEL = 6 + + # /*------------------------------------------------------------\ + # | | +-# | Environement | ++# | Environment | + # | | + # \------------------------------------------------------------*/ + +@@ -163,11 +165,11 @@ + + res_vasy_1.pat : hadamard.vst calcul.vbe ram.vbe rom.vbe \ + compteur.vbe sequenceur.vbe hadamard_model.vbe +- $(ENV_ASIMUT_VASY); $(ASIMUT) hadamard hadamard_1 res_vasy_1 ++ $(ENV_ASIMUT_VASY); $(ASIMUT) hadamard hadamard_1 res_vasy_1 + + res_synth_1.pat : hadamard.vst calcul.vst ram.vst rom.vst \ + compteur.vst sequenceur.vst hadamard_model.vst +- $(ENV_ASIMUT_SYNTH); $(ASIMUT) -zd hadamard hadamard_1 res_synth_1 ++ $(ENV_ASIMUT_SYNTH); $(ASIMUT) -zd hadamard hadamard_1 res_synth_1 + + + # /*------------------------------------------------------------\ +@@ -299,7 +301,7 @@ + # | | + # \------------------------------------------------------------*/ + +-lvx.done : hadamard.vst hadamard_e.al ++lvx.done : hadamard.vst hadamard_e.al + $(ENV_LVX); $(LVX) vst al hadamard hadamard_e -f + $(TOUCH) lvx.done + +@@ -355,4 +357,4 @@ + $(RM) -f *.vst *.vbe *.boom *.done *.xsc *.al *.ap *.gpl *.gds \ + *.log *.drc *.cif *.fin *.dat *.out hadamard_e.spi res_synth_1.pat \ + res_vasy_1.pat +- ++ +diff -Naur documentation/alliance-examples/mipsR3000/sce/Makefile alliance-examples/mipsR3000/sce/Makefile +--- documentation/alliance-examples/mipsR3000/sce/Makefile 2004-07-30 02:40:09.000000000 +0200 ++++ alliance-examples/mipsR3000/sce/Makefile 2007-07-19 13:13:58.000000000 +0200 +@@ -5,7 +5,9 @@ + STANDART_PATH = PATH=$(STANDART_BIN); export PATH + + # Standart Alliance binary access paths. + ALLIANCE_BIN = $(ALLIANCE_TOP)/bin ++ ++ALLIANCE_EXAMPLES=/usr/share/doc/alliance-doc-5.0/alliance-examples + + # FitPath Alliance binary access paths. + # DEVEL_BIN = /users/soft5/newlabo/alliance-4.5.0/archi/Solaris/bin +diff -Naur documentation/alliance-examples/mipsR3000/sce/mips_core.ioc alliance-examples/mipsR3000/sce/mips_core.ioc +--- documentation/alliance-examples/mipsR3000/sce/mips_core.ioc 2004-05-24 00:23:35.000000000 +0200 ++++ alliance-examples/mipsR3000/sce/mips_core.ioc 2007-07-19 13:13:58.000000000 +0200 +@@ -1,4 +1,4 @@ +-# Copyright (c) 1997 by Cadence. All rights reserved. ++# + ################################################################### + # In each of TOP()/BOTTOM()/LEFT()/RIGHT() section, there are # + # placed IOs. In the IGNORE() section, the IOs are ignored # +diff -Naur documentation/alliance-examples/multi16b-reg/Makefile alliance-examples/multi16b-reg/Makefile +--- documentation/alliance-examples/multi16b-reg/Makefile 2004-05-24 00:15:29.000000000 +0200 ++++ alliance-examples/multi16b-reg/Makefile 2007-07-19 13:13:59.000000000 +0200 +@@ -16,7 +16,9 @@ + # | | + # \------------------------------------------------------------*/ + + ALLIANCE_BIN = $(ALLIANCE_TOP)/bin ++ ++ALLIANCE_EXAMPLES=/usr/share/doc/alliance-doc-5.0/alliance-examples + + VASY = $(ALLIANCE_BIN)/vasy + ASIMUT = $(ALLIANCE_BIN)/asimut +@@ -39,14 +41,14 @@ + TOUCH = touch + + TARGET_LIB = $(ALLIANCE_TOP)/cells/sxlib +-RDS_TECHNO_SYMB = ../etc/techno-symb.rds +-RDS_TECHNO = ../etc/techno-035.rds ++RDS_TECHNO_SYMB = $(ALLIANCE_EXAMPLES)/etc/techno-symb.rds ++RDS_TECHNO = $(ALLIANCE_EXAMPLES)/etc/techno-035.rds + SPI_MODEL = $(ALLIANCE_TOP)/etc/spimodel.cfg + METAL_LEVEL = 6 + + # /*------------------------------------------------------------\ + # | | +-# | Environement | ++# | Environment | + # | | + # \------------------------------------------------------------*/ + +diff -Naur documentation/alliance-examples/multi4b/Makefile alliance-examples/multi4b/Makefile +--- documentation/alliance-examples/multi4b/Makefile 2004-05-24 00:15:29.000000000 +0200 ++++ alliance-examples/multi4b/Makefile 2007-07-19 13:14:00.000000000 +0200 +@@ -16,7 +16,9 @@ + # | | + # \------------------------------------------------------------*/ + + ALLIANCE_BIN=$(ALLIANCE_TOP)/bin ++ ++ALLIANCE_EXAMPLES=/usr/share/doc/alliance-doc-5.0/alliance-examples + + VASY = $(ALLIANCE_BIN)/vasy + ASIMUT = $(ALLIANCE_BIN)/asimut +@@ -39,14 +41,14 @@ + TOUCH = touch + + TARGET_LIB = $(ALLIANCE_TOP)/cells/sxlib +-RDS_TECHNO_SYMB = ../etc/techno-symb.rds +-RDS_TECHNO = ../etc/techno-035.rds ++RDS_TECHNO_SYMB = $(ALLIANCE_EXAMPLES)/etc/techno-symb.rds ++RDS_TECHNO = $(ALLIANCE_EXAMPLES)/etc/techno-035.rds + SPI_MODEL = $(ALLIANCE_TOP)/etc/spimodel.cfg + METAL_LEVEL = 2 + + # /*------------------------------------------------------------\ + # | | +-# | Environement | ++# | Environment | + # | | + # \------------------------------------------------------------*/ + +diff -Naur documentation/alliance-examples/multi4b/README alliance-examples/multi4b/README +--- documentation/alliance-examples/multi4b/README 2004-07-28 13:00:06.000000000 +0200 ++++ alliance-examples/multi4b/README 2007-07-19 13:14:00.000000000 +0200 +@@ -14,7 +14,9 @@ + following each step of the design flow from VHDL up to real layout in a + pseudo 0.35 techno. + +-The environement variable ALLIANCE_TOP has to be set. ++ ++copy the folder "multi4b" to any writable folder of your choice and type: ++$ make + + The main targets of the makefile are listed below (following the design flow). + +diff -Naur documentation/alliance-examples/multi8/Makefile alliance-examples/multi8/Makefile +--- documentation/alliance-examples/multi8/Makefile 2004-05-24 00:15:30.000000000 +0200 ++++ alliance-examples/multi8/Makefile 2007-07-19 13:14:00.000000000 +0200 +@@ -16,7 +16,9 @@ + # | | + # \------------------------------------------------------------*/ + + ALLIANCE_BIN=$(ALLIANCE_TOP)/bin ++ ++ALLIANCE_EXAMPLES=/usr/share/doc/alliance-doc-5.0/alliance-examples + + VASY = $(ALLIANCE_BIN)/vasy + ASIMUT = $(ALLIANCE_BIN)/asimut +@@ -39,8 +41,8 @@ + TOUCH = touch + + TARGET_LIB = $(ALLIANCE_TOP)/cells/sxlib +-RDS_TECHNO_SYMB = ../etc/techno-symb.rds +-RDS_TECHNO = ../etc/techno-035.rds ++RDS_TECHNO_SYMB = $(ALLIANCE_EXAMPLES)/etc/techno-symb.rds ++RDS_TECHNO = $(ALLIANCE_EXAMPLES)/etc/techno-035.rds + SPI_MODEL = $(ALLIANCE_TOP)/etc/spimodel.cfg + METAL_LEVEL = 2 + +diff -Naur documentation/alliance-examples/multi8/README alliance-examples/multi8/README +--- documentation/alliance-examples/multi8/README 2004-07-28 13:00:06.000000000 +0200 ++++ alliance-examples/multi8/README 2007-07-19 13:14:00.000000000 +0200 +@@ -15,4 +15,6 @@ + following each step of the design flow from VHDL up to real layout in a + pseudo 0.35 techno. + +-The environement variable ALLIANCE_TOP has to be set. ++ ++copy the folder "multi8" to any writable folder of your choice and type: ++$ make +diff -Naur documentation/alliance-examples/multi8b/Makefile alliance-examples/multi8b/Makefile +--- documentation/alliance-examples/multi8b/Makefile 2004-05-24 00:15:30.000000000 +0200 ++++ alliance-examples/multi8b/Makefile 2007-07-19 13:14:00.000000000 +0200 +@@ -16,7 +16,9 @@ + # | | + # \------------------------------------------------------------*/ + + ALLIANCE_BIN=$(ALLIANCE_TOP)/bin ++ ++ALLIANCE_EXAMPLES=/usr/share/doc/alliance-doc-5.0/alliance-examples + + VASY = $(ALLIANCE_BIN)/vasy + ASIMUT = $(ALLIANCE_BIN)/asimut +@@ -39,8 +41,8 @@ + TOUCH = touch + + TARGET_LIB = $(ALLIANCE_TOP)/cells/sxlib +-RDS_TECHNO_SYMB = ../etc/techno-symb.rds +-RDS_TECHNO = ../etc/techno-035.rds ++RDS_TECHNO_SYMB = $(ALLIANCE_EXAMPLES)/etc/techno-symb.rds ++RDS_TECHNO = $(ALLIANCE_EXAMPLES)/etc/techno-035.rds + SPI_MODEL = $(ALLIANCE_TOP)/etc/spimodel.cfg + METAL_LEVEL = 4 + +diff -Naur documentation/alliance-examples/multi8b/README alliance-examples/multi8b/README +--- documentation/alliance-examples/multi8b/README 2004-07-28 13:00:06.000000000 +0200 ++++ alliance-examples/multi8b/README 2007-07-19 13:14:00.000000000 +0200 +@@ -14,7 +14,9 @@ + following each step of the design flow from VHDL up to real layout in a + pseudo 0.35 techno. + +-The environement variable ALLIANCE_TOP has to be set. ++ ++copy the folder "multi8b" to any writable folder of your choice and type: ++$ make + + The main targets of the makefile are listed below (following the design flow). + +diff -Naur documentation/alliance-examples/pgcd/Makefile alliance-examples/pgcd/Makefile +--- documentation/alliance-examples/pgcd/Makefile 2004-05-24 00:15:31.000000000 +0200 ++++ alliance-examples/pgcd/Makefile 2007-07-19 13:14:00.000000000 +0200 +@@ -16,7 +16,9 @@ + # | | + # \------------------------------------------------------------*/ + + ALLIANCE_BIN=$(ALLIANCE_TOP)/bin ++ ++ALLIANCE_EXAMPLES=/usr/share/doc/alliance-doc-5.0/alliance-examples + + VASY = $(ALLIANCE_BIN)/vasy + ASIMUT = $(ALLIANCE_BIN)/asimut +@@ -39,8 +41,8 @@ + TOUCH = touch + + TARGET_LIB = $(ALLIANCE_TOP)/cells/sxlib +-RDS_TECHNO_SYMB = ../etc/techno-symb.rds +-RDS_TECHNO = ../etc/techno-035.rds ++RDS_TECHNO_SYMB = $(ALLIANCE_EXAMPLES)/etc/techno-symb.rds ++RDS_TECHNO = $(ALLIANCE_EXAMPLES)/etc/techno-035.rds + SPI_MODEL = $(ALLIANCE_TOP)/etc/spimodel.cfg + METAL_LEVEL = 2 + +diff -Naur documentation/alliance-examples/pgcd/README alliance-examples/pgcd/README +--- documentation/alliance-examples/pgcd/README 2004-07-28 13:00:06.000000000 +0200 ++++ alliance-examples/pgcd/README 2007-07-19 13:14:00.000000000 +0200 +@@ -15,5 +15,7 @@ + following each step of the design flow from VHDL up to real layout in a + pseudo 0.35 techno. + +-The environement variable ALLIANCE_TOP has to be set. ++ ++copy the folder "pgcd" to any writable folder of your choice and type: ++$ make + +diff -Naur documentation/alliance-examples/sqrt32/Makefile alliance-examples/sqrt32/Makefile +--- documentation/alliance-examples/sqrt32/Makefile 2004-05-23 20:49:27.000000000 +0200 ++++ alliance-examples/sqrt32/Makefile 2007-07-19 13:14:00.000000000 +0200 +@@ -16,7 +16,9 @@ + # | | + # \------------------------------------------------------------*/ + + ALLIANCE_BIN=$(ALLIANCE_TOP)/bin ++ ++ALLIANCE_EXAMPLES=/usr/share/doc/alliance-doc-5.0/alliance-examples + + VASY = $(ALLIANCE_BIN)/vasy + ASIMUT = $(ALLIANCE_BIN)/asimut +@@ -39,8 +41,8 @@ + TOUCH = touch + + TARGET_LIB = $(ALLIANCE_TOP)/cells/sxlib +-RDS_TECHNO_SYMB = ../etc/techno-symb.rds +-RDS_TECHNO = ../etc/techno-035.rds ++RDS_TECHNO_SYMB = $(ALLIANCE_EXAMPLES)/etc/techno-symb.rds ++RDS_TECHNO = $(ALLIANCE_EXAMPLES)/etc/techno-035.rds + SPI_MODEL = $(ALLIANCE_TOP)/etc/spimodel.cfg + METAL_LEVEL = 5 + +diff -Naur documentation/alliance-examples/sqrt32/README alliance-examples/sqrt32/README +--- documentation/alliance-examples/sqrt32/README 2004-07-28 13:00:06.000000000 +0200 ++++ alliance-examples/sqrt32/README 2007-07-19 13:14:00.000000000 +0200 +@@ -14,4 +14,6 @@ + following each step of the design flow from VHDL up to real layout in a + pseudo 0.35 techno. + +-The environement variable ALLIANCE_TOP has to be set. ++ ++copy the folder "sqrt32" to any writable folder of your choice and type: ++$ make +diff -Naur documentation/alliance-examples/sqrt8/Makefile alliance-examples/sqrt8/Makefile +--- documentation/alliance-examples/sqrt8/Makefile 2004-05-23 20:51:00.000000000 +0200 ++++ alliance-examples/sqrt8/Makefile 2007-07-19 16:20:40.000000000 +0200 +@@ -16,7 +16,9 @@ + # | | + # \------------------------------------------------------------*/ + + ALLIANCE_BIN=$(ALLIANCE_TOP)/bin ++ ++ALLIANCE_EXAMPLES=/usr/share/doc/alliance-doc-5.0/alliance-examples + + VASY = $(ALLIANCE_BIN)/vasy + ASIMUT = $(ALLIANCE_BIN)/asimut +@@ -39,14 +41,14 @@ + TOUCH = touch + + TARGET_LIB = $(ALLIANCE_TOP)/cells/sxlib +-RDS_TECHNO_SYMB = ../etc/techno-symb.rds +-RDS_TECHNO = ../etc/techno-035.rds ++RDS_TECHNO_SYMB = $(ALLIANCE_EXAMPLES)/etc/techno-symb.rds ++RDS_TECHNO = $(ALLIANCE_EXAMPLES)/etc/techno-035.rds + SPI_MODEL = $(ALLIANCE_TOP)/etc/spimodel.cfg + METAL_LEVEL = 5 + + # /*------------------------------------------------------------\ + # | | +-# | Environement | ++# | Environment | + # | | + # \------------------------------------------------------------*/ + +@@ -161,9 +163,9 @@ + # \------------------------------------------------------------*/ + + res_vasy_1.pat : sqrt8.vst sm.vbe sqrt8_model.vbe +- $(ENV_ASIMUT_VASY); $(ASIMUT) sqrt8 sqrt8 res_vasy_1 ++ $(ENV_ASIMUT_VASY); $(ASIMUT) sqrt8 sqrt8 res_vasy_1 + +-res_synth_1.pat : sqrt8.vst sm.vst sqrt8_model.vst ++res_synth_1.pat : sqrt8.vst sm.vst sqrt8_model.vst + $(ENV_ASIMUT_SYNTH); $(ASIMUT) sqrt8 sqrt8 res_synth_1 + + +@@ -257,7 +259,7 @@ + # | | + # \------------------------------------------------------------*/ + +-lvx.done : sqrt8.vst sqrt8_e.al ++lvx.done : sqrt8.vst sqrt8_e.al + $(ENV_LVX); $(LVX) vst al sqrt8 sqrt8_e -f + $(TOUCH) lvx.done + +@@ -313,4 +315,4 @@ + $(RM) -f *.vst *.vbe *.boom *.done *.xsc *.al *.ap *.gpl *.gds \ + *.log *.drc *.cif *.fin *.dat *.out sqrt8_e.spi res_synth_1.pat \ + res_vasy_1.pat +- ++ + diff --git a/alliance-log3.patch b/alliance-log3.patch new file mode 100644 index 0000000..f320083 --- /dev/null +++ b/alliance-log3.patch @@ -0,0 +1,22 @@ +diff -Naur mbk/man3/Makefile.am man3/Makefile.am +--- mbk/man3/Makefile.am 2003-04-03 16:56:36.000000000 +0200 ++++ man3/Makefile.am 2007-07-25 01:33:26.000000000 +0200 +@@ -87,7 +87,6 @@ + locon.3 \ + lofig.3 \ + lofigchain.3 \ +- log.3 \ + loins.3 \ + losig.3 \ + lotrs.3 \ +diff -Naur mbk/man3/Makefile.in man3/Makefile.in +--- mbk/man3/Makefile.in 2007-07-18 19:04:43.000000000 +0200 ++++ man3/Makefile.in 2007-07-25 01:33:18.000000000 +0200 +@@ -422,7 +422,6 @@ + locon.3 \ + lofig.3 \ + lofigchain.3 \ +- log.3 \ + loins.3 \ + losig.3 \ + lotrs.3 \ diff --git a/alliance-perms.patch b/alliance-perms.patch new file mode 100644 index 0000000..32aa5cc --- /dev/null +++ b/alliance-perms.patch @@ -0,0 +1,14 @@ +--- configure 2006-05-09 12:10:10.000000000 +0200 ++++ configure_mod 2007-07-17 02:24:57.000000000 +0200 +@@ -26054,9 +26054,9 @@ + + + +-INSTALL_DATA='${INSTALL} -m 664' ++INSTALL_DATA='${INSTALL} -m 644' + +-INSTALL_PROGRAM='${INSTALL} -m 775' ++INSTALL_PROGRAM='${INSTALL} -m 755' + + + cat >>confdefs.h <<_ACEOF diff --git a/alliance-run.patch b/alliance-run.patch new file mode 100644 index 0000000..32e2009 --- /dev/null +++ b/alliance-run.patch @@ -0,0 +1,21 @@ +diff -Naur documentation/alliance-run/amd2901_core.ioc alliance-run/amd2901_core.ioc +--- documentation/alliance-run/amd2901_core.ioc 2003-10-09 14:31:00.000000000 +0200 ++++ alliance-run/amd2901_core.ioc 2007-07-13 15:42:11.000000000 +0200 +@@ -1,4 +1,3 @@ +-# Copyright (c) 1997 by Cadence. All rights reserved. + ################################################################### + # In each of TOP()/BOTTOM()/LEFT()/RIGHT() section, there are # + # placed IOs. In the IGNORE() section, the IOs are ignored # +diff -Naur documentation/alliance-run/Makefile alliance-run/Makefile +--- documentation/alliance-run/Makefile 2003-12-01 14:07:11.000000000 +0100 ++++ alliance-run/Makefile 2007-07-13 15:37:37.000000000 +0200 +@@ -12,7 +12,9 @@ + STANDART_PATH = PATH=$(STANDART_BIN); export PATH + + # Standart Alliance binary access paths. + ALLIANCE_BIN = $(ALLIANCE_TOP)/bin ++ ++ALLIANCE_EXAMPLES=/usr/share/doc/alliance-doc-5.0/alliance-examples + + # -------------------------------------------------------------------- + # Standarts binaries. diff --git a/alliance-tutorials.patch b/alliance-tutorials.patch new file mode 100644 index 0000000..4675c27 --- /dev/null +++ b/alliance-tutorials.patch @@ -0,0 +1,690 @@ +diff -Naur documentation/tutorials/place_and_route/tex/place_and_route.tex tutorials/place_and_route/tex/place_and_route.tex +--- documentation/tutorials/place_and_route/tex/place_and_route.tex 2004-10-16 14:51:56.000000000 +0200 ++++ tutorials/place_and_route/tex/place_and_route.tex 2007-08-02 18:37:05.000000000 +0200 +@@ -2,6 +2,7 @@ + % $Id: place_and_route.tex,v 1.5 2004/10/16 12:51:56 fred Exp $ + % $Log: place_and_route.tex,v $ + % Revision 1.5 2004/10/16 12:51:56 fred ++% Modified by Chitlesh GOORAH for Alliance release 5.0 (18/07/2007) + % Erasing the psfig include from the file, changed the font to 10 pt + % instead of 12 (sparing trees and not being payed by the thickness of + % my production) and changing font to charter since I got tired of +@@ -11,14 +12,14 @@ + \documentclass{article} + \usepackage[dvips]{graphics} + \usepackage[english]{babel} +-\usepackage{doublespace} ++\usepackage{setspace} + \usepackage{epsf} + \usepackage{fancybox} + \usepackage{fancyheadings} + \usepackage{float} + \usepackage{graphicx} + \usepackage{here} +-\usepackage{isolatin1} ++\usepackage[latin1]{inputenc} + \usepackage{charter} + \usepackage{picinpar} + \usepackage{rotate} +@@ -92,7 +93,8 @@ + \date{} + \author{ + Frederic AK\hspace{2cm} Kai-shing LAM\\ +-Modified by LJ ++Modified by LJ\\ ++Modified by Chitlesh GOORAH (18/07/2007) + } + + \maketitle +@@ -121,7 +123,7 @@ + + {2.2} inverter Diagram + +-{2.3} Buffer diagram ++{2.3} Buffer diagram + + {2.4} sxlib gauge + +@@ -149,8 +151,8 @@ + + {3.8} pads placement + \\ +-{4} {\bf Annexes} +- ++{4} {\bf Annexes} ++ + \newpage + {\huge + PART 3 : } +@@ -158,9 +160,9 @@ + {\huge + Place and route + } +- ++ + All the files used in this part are located under \\ +-\texttt{/tutorial/place\_and\_route/src} directory.\\ ++\texttt{/usr/share/doc/alliance-doc-5.0/tutorial/place\_and\_route/src} directory.\\ + This directory contents three subdirectories and one Makefile : + + \begin{itemize}\itemsep=-.8ex +@@ -169,7 +171,7 @@ + \item inv + \begin{itemize}\itemsep=-.8ex + \item Makefile +- \item inv.vbe : behavioral description ++ \item inv.vbe : behavioral description + \item inv\_x1.ap : inverter cell design using GRAAL + \end{itemize} + \item buffer +@@ -178,7 +180,7 @@ + \item buffer.vbe : behavioral description + \item buf\_x2.ap : buffer cell design using GRAAL + \end{itemize} +-\item amd2901 ++\item amd2901 + \begin{itemize}\itemsep=-.8ex + \item Makefile + \item amd2901\_ctl.vbe : behavioral description of control +@@ -212,9 +214,9 @@ + The predefined cells concepts, model and + hierarchy will be introduced .\\ + Then this tutorial contain the methodology used in Alliance to produce +-the amd2901 physical layout that you conceived in Alliance Tutorial ++the amd2901 physical layout that you conceived in Alliance Tutorial + PART 2 "Synthesis" (All the documents used will be provided to you). +- ++ + \newpage + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +@@ -225,7 +227,7 @@ + %------------------------ + The library can be enriched by new cells with {\bf GRAAL} editor .\\ + { \bf GRAAL } is an editor of \/{\underline{symbolic }} {\it +-layout} integrating the drawing rules checker {\bf DRUC} and also ++layout} integrating the drawing rules checker {\bf DRUC} and also + a net extractor. + The first part here aims to draw an inverter cell inv\_x1 in the shape + of a predefined cell of sxlib complyiant with provided +@@ -236,7 +238,7 @@ + Some tools of Alliance use a particular technological + environment. It is indicated by the environment variable {\bf + RDS\_TECHNO\_NAME} which must be set to +-{\bf/alliance/etc/cmos.rds} ++{\bf/etc/alliance/cmos.rds} + + \subsubsection{GRAAL} + %-------------------- +@@ -244,7 +246,7 @@ + with the menu { \bf CREATE }: + \begin{itemize}\itemsep=-.4ex + \item The ''instance'' (physical cells importation) +-\item The abutment boxes which define the cell limits ++\item The abutment boxes which define the cell limits + \item Segments: DiffN, DiffP, Poly, Alu1, Alu2... CAluX is used to specify + a possible rectangle area for the connectors. + \item VIAs or contacts: ContDiffN, ContDiffP, ContPoly and +@@ -254,10 +256,10 @@ + \end{itemize} + + {\bf GRAAL} uses the environment variable {\bf +-GRAAL\_TECHNO\_NAME}. It must be set to {\bf/alliance/etc/cmos.graal}. ++GRAAL\_TECHNO\_NAME}. It must be set to {\bf/etc/alliance/cmos.graal}. + + Steps to follow to create a sxlib cell by respecting the sxlib gauge : +-( cf 2.4 Sxlib gauge ) ++( cf 2.4 Sxlib gauge ) + \begin{itemize}\itemsep=-.4ex + \item place the supply Vdd and Vss using the menu CREATE->Segment + \item place the VIAs using the menu CREATE->VIA +@@ -267,7 +269,7 @@ + \item link the transistor P and the transistor N with the Poly segment using the menu CREATE->Segment + \item supply each transistor by linking them with Ndiff and Pdiff segments and VIAs contacts + \item define the cell limit with an abutment box using the menu CREATE->Abutment Box +-\end{itemize} ++\end{itemize} + + \subsubsection{COUGAR} + %-------------------- +@@ -276,7 +278,7 @@ + with the format { \bf ap }. + To extract a netlist at transistor level, use the following command : + \begin{commandline} +- > cougar -t file1 file2 ++ > cougar -t file1 file2 + \end{commandline} + + { \bf COUGAR } uses the environment variables { \bf MBK\_IN\_PH } +@@ -286,14 +288,14 @@ + the following environment variables: \\ + + \begin{commandline} +- > MBK_IN_PH = ap +- > export MBK_IN_PH +- > MBK_OUT_LO = spi ++ > MBK_IN_PH = ap ++ > export MBK_IN_PH ++ > MBK_OUT_LO = spi + > export MBK_OUT_LO + \end{commandline} + + \begin{commandline} +- > cougar -t circuit circuit ++ > cougar -t circuit circuit + \end{commandline} + + The resulting spice netlist can be then simulated using a SPICE simulator and a given +@@ -301,7 +303,7 @@ + + The schematic of the transistor neltlist can also be displayed using {\bf XSCH} : + \begin{commandline} +- > xsch -I spi -l circuit ++ > xsch -I spi -l circuit + \end{commandline} + + \subsection{inverter Diagram} +@@ -341,12 +343,12 @@ + + \begin{itemize}\itemsep=-.4ex + \item The sxlib cells have whole 50 lambdas height and a multiple of 5 lambdas width. +-\item The supply Vdd and Vss are carried out in Calu1; they have 6 lambdas width and are ++\item The supply Vdd and Vss are carried out in Calu1; they have 6 lambdas width and are + horizontally placed in top and bottom of the cell. + \item The transistors P are placed close to the Vdd while transistors N are placed close + to the Vss. + \item Box N must have 24 lambdas height . +-\item The special segments CAluX (CAlu1, Calu2, CAlu3...) form the cell interface (PORT\_MAP) ++\item The special segments CAluX (CAlu1, Calu2, CAlu3...) form the cell interface (PORT\_MAP) + and play the role of ''flat'' connectors. They must be placed on a 5x5 grid and can be anywhere in the cell. + \item The special segments TAlux (TAlu1, TAlu2...) are used to indicate the obstacles for the + router. When you want to protect AluX segment, it is necessary to cover them +@@ -356,7 +358,7 @@ + \item The boxes N and P must be polarized. { \bf It should be respectively connected to Vdd and Vss }. + \end{itemize} + +-You will find a summary of these constraints on the diagram ++You will find a summary of these constraints on the diagram + \ref{Fig:gabarit}: + + \begin{figure}[H]\centering +@@ -443,7 +445,7 @@ + \begin{itemize}\itemsep=-.4ex + \item The data-path contains the regular parts of Amd2901, the registers + and the arithmetic logic unit. +-\item The control part contains irregular logic, ++\item The control part contains irregular logic, + the instructions decoding and the `` flags '' computation. + \end{itemize} + +@@ -463,7 +465,7 @@ + The data-path and the control part will be placed and routed together and not separately. \\ + You will use also {\bf lvx}, the netlists comparator. When the + system is too complex it is difficult to use {\bf proof}, the +-formal comparator (calculations too long). A netlists comparison ++formal comparator (calculations too long). A netlists comparison + then is used. Test the two methods ({\bf proof} and {\bf + lvx}). + +@@ -499,7 +501,7 @@ + %--------------------------------- + + Generally, the file describing a netlist must have the same +-name as the one describing its physical layout ++name as the one describing its physical layout + (but of course the file extention is not the same). + The file amd2901\_dpt.vst (LOFIG) must correspond to the file + amd2901\_dpt.ap (PHFIG). The same applies to the file +@@ -517,7 +519,7 @@ + \noindent GENLIB\_SAVE\_LOFIG()\\ + + This permits to generate a structural description in a { \bf +-VST } file. At the same time, { \bf genlib } will generate ++VST } file. At the same time, { \bf genlib } will generate + physical descriptions of each column in { \bf AP } files. + It is up to you to place these columns explicitly. \\ + Edit again the file amd2901\_dpt.c and include the lines :\\ +@@ -526,7 +528,7 @@ + \noindent /* add here you placement directives !! */ \\ + \noindent GENLIB\_SAVE\_PHFIG()\\ + +-For this placement task, you have the following {\bf GENLIB} functions : ++For this placement task, you have the following {\bf GENLIB} functions : + + \begin{itemize}\itemsep=-.4ex + \item GENLIB\_PLACE() +@@ -540,12 +542,12 @@ + \end{itemize} + + Use {\bf GENLIB} manual. The placement of the data-path columns +-should not be done randomly. The routing feasibility and the quality ++should not be done randomly. The routing feasibility and the quality + of the resulting layout depends on it !\\ + + Use genlib to generate all: + \begin{commandline} +- >genlib amd2901_dpt ++ >genlib amd2901_dpt + \end{commandline} + + The figure \ref{Fig:preplacement} summarizes the followed process: +@@ -568,12 +570,12 @@ + %--------------------------------- + + In the same manner, edit agin the file amd2901\_core.c and insert +- data-path explicitly. You should not place the part controls. ++ data-path explicitly. You should not place the part controls. + This one exists only in the form of a structural description. +-It is the placer { \bf ocp } that will undertake some ++It is the placer { \bf ocp } that will undertake some + (during the placement of the heart { \bf ocp } detects which are the +-cells not placed and supplements the placement). +-Nevertheless you should reserve enough space for the cells placement ++cells not placed and supplements the placement). ++Nevertheless you should reserve enough space for the cells placement + { \bf to the top } of the data-path. + + Include the lines:\\ +@@ -583,28 +585,28 @@ + + Space necessary to the placer to place the cells of the control part + will be determined by successive approximations. You will have to +-adjust dimensions of the heart abutment box ++adjust dimensions of the heart abutment box + (GENLIB\_DEF\_AB()). + Use the command: + + \begin{commandline} +- > genlib amd2901_core ++ > genlib amd2901_core + \end{commandline} + + and + \begin{commandline} +- > ocp -partial amd2901_core -ioc amd2901_core amd2901_core amd2901_core_p ++ > ocp -partial amd2901_core -ioc amd2901_core amd2901_core amd2901_core_p + \end{commandline} + + The option {\bf -- partial} indicates that you give a partial +-placement of the data-path. ++placement of the data-path. + The option { \bf -- ioc } permits to specify a placement for external +-connectors described in a .ioc file. +-This file, amd2901\_core.ioc is provided to you (Modify it according ++connectors described in a .ioc file. ++This file, amd2901\_core.ioc is provided to you (Modify it according + to your predefined placement. + The connectors must be in the north and in the south of your circuit). + +-The third argument is the netlist heart filename, the fourth is the ++The third argument is the netlist heart filename, the fourth is the + name of the { \bf .ap } resulting file. + + The figure \ref{Fig:placement} summarize the followed process: +@@ -620,7 +622,7 @@ + Routing the heart by using { \bf NERO } in the following way: + + \begin{commandline} +- > nero -v -3 -p amd2901_core_p amd2901_core amd2901_core ++ > nero -v -3 -p amd2901_core_p amd2901_core amd2901_core + \end{commandline} + + %The option { \bf -- place } indicates that you transmit a placement, that of the heart. +@@ -639,10 +641,10 @@ + \subsection{pads placement} + %--------------------------------- + +-The core of the AMD2001 is completed. ++The core of the AMD2001 is completed. + We focus now on the chip with pads description, placement and routing. + Those pads allow the connection of the inputs/outputs of the core with +-the external nets of the chip. ++the external nets of the chip. + + The tool {\bf ring} instanciates pads that has been specified + in a {\bf vst} netlist, place them using a file { \bf .rin } +@@ -662,7 +664,7 @@ + Name it `` amd2902\_chip.rin '' and apply the command \\ + + \begin{commandline} +- > ring amd2901_chip amd2901_chip ++ > ring amd2901_chip amd2901_chip + \end{commandline} + + We will validate the work of {\bf ring} with the tools { \bf druc +@@ -682,7 +684,7 @@ + > cougar -f amd2901_chip + \end{commandline} + +-Compare two netlists : ++Compare two netlists : + \begin{commandline} + > lvx vst al amd2901_chip amd2901_chip -f + \end{commandline} +@@ -698,7 +700,7 @@ + the circuit on the level transistor: \\ + + \begin{commandline} +-> cougar -t amd2901_chip amd2901_chip ++> cougar -t amd2901_chip amd2901_chip + \end{commandline} + \\ + +@@ -706,7 +708,7 @@ + \begin{commandline} + > make view_ctl_logic + \end{commandline} +- ++ + If you want to see the data-path physical layout: + \begin{commandline} + > make view_dpt_physic +@@ -723,7 +725,7 @@ + \begin{commandline} + > make view_chip_simulation + \end{commandline} +- ++ + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + %\newpage + +diff -Naur documentation/tutorials/simulation/tex/simulation.tex tutorials/simulation/tex/simulation.tex +--- documentation/tutorials/simulation/tex/simulation.tex 2004-10-16 14:52:05.000000000 +0200 ++++ tutorials/simulation/tex/simulation.tex 2007-07-18 15:47:13.000000000 +0200 +@@ -2,6 +2,7 @@ + % $Id: simulation.tex,v 1.5 2004/10/16 12:52:05 fred Exp $ + % $Log: simulation.tex,v $ + % Revision 1.5 2004/10/16 12:52:05 fred ++% Modified by Chitlesh GOORAH for Alliance release 5.0 (18/07/2007) + % Erasing the psfig include from the file, changed the font to 10 pt + % instead of 12 (sparing trees and not being payed by the thickness of + % my production) and changing font to charter since I got tired of +@@ -13,13 +14,13 @@ + \documentclass{article} + \usepackage[dvips]{graphics} + \usepackage[english]{babel} +-\usepackage{doublespace} ++\usepackage{setspace} + \usepackage{fancybox} + \usepackage{fancyheadings} + \usepackage{float} + \usepackage{graphicx} + \usepackage{here} +-\usepackage{isolatin1} ++\usepackage[latin1]{inputenc} + \usepackage{charter} + \usepackage{picinpar} + \usepackage{rotate} +@@ -96,7 +97,8 @@ + \date{} + + \author{Frederic AK \hspace{2cm} Kai-shing LAM\\ +-Modified by LJ ++Modified by LJ\\ ++Modified by Chitlesh GOORAH (18/07/2007) + } + + \maketitle +@@ -171,7 +173,7 @@ + } + + All the files used in this part are located in the \\ +-\texttt{/tutorial/simulation/src} directory.\\ ++\texttt{/usr/share/doc/alliance-doc-5.0/tutorial/simulation/src} directory.\\ + This directory contains two subdirectories and one Makefile : + \begin{itemize} + \item The Makefile allows you to validate automatically the entire simulation part +@@ -626,13 +628,13 @@ + \bf SXLIB }. For the functionality of the various cells and their + interface, the sxlib man is available. The behavioral + description of each cell is present in \\ +-{\bf /alliance/cells/sxlib }. ++{\bf \$ALLIANCE\_TOP/cells/sxlib }. + + You must set the environment variable { \bf MBK\_CATA\_LIB } + to be able to reach these cells. + + \begin{commandline} +- > MBK_CATA_LIB=/alliance/cells/sxlib ++ > MBK_CATA_LIB=$ALLIANCE_TOP/cells/sxlib + > export MBK_CATA_LIB + \end{commandline} + +diff -Naur documentation/tutorials/start/start.tex tutorials/start/start.tex +--- documentation/tutorials/start/start.tex 2004-10-16 14:52:13.000000000 +0200 ++++ tutorials/start/start.tex 2007-07-18 13:28:50.000000000 +0200 +@@ -4,12 +4,13 @@ + % Original Version 1.0 in text form by Francois Pecheux + % Version for Alliance releases 2.0 and up by Frederic Petrot + % Modified by czo for Alliance release 4.0 (01/2000) +-% TODO : no fully working, needs some adjustements ++% Modified by Chitlesh GOORAH for Alliance release 5.0 (18/07/2007) ++% TODO : no fully working, needs some adjustments + % $Id: start.tex,v 1.5 2004/10/16 12:52:13 fred Exp $ + % + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + \documentclass{article} +-\usepackage{charter,doublespace,here,fancybox} ++\usepackage{charter,setspace,here,fancybox} + \textwidth 15cm + \textheight 23cm + \oddsidemargin +0.75cm +@@ -20,7 +21,7 @@ + % Since it is tt, any char is fine + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + \newlength{\verbatimbox} +-\settowidth{\verbatimbox}{\scriptsize\tt ++\settowidth{\verbatimbox}{\scriptsize\tt + xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx + } + \newenvironment{framedverbatim} +@@ -33,8 +34,8 @@ + \begin{Sbox}\begin{minipage}{.979\textwidth}\begin{Verbatim}}% + {\end{Verbatim}\end{minipage}\end{Sbox}\setlength{\shadowsize}{2pt}% + \shadowbox{\TheSbox}\normalsize\par\noindent} +- +- ++ ++ + + %%%%%%%%%%%%%%%%%%%%%%%% + % +@@ -56,9 +57,9 @@ + \begin{quote} + \em + These tutorials introduce the design flow to be used in the +-\textbf{Alliance} CAD framework for the design and verification of a ++\textbf{Alliance} CAD framework for the design and verification of a + standard cells circuit, including the pads. +-Each step of the desgin flow is supported by one or more specific ++Each step of the desgin flow is supported by one or more specific + tools, whose use is briefly explained in the tutorials. + + These texts are meant to be simple and comprehensive, and are to be used +@@ -77,7 +78,7 @@ + proceeding, as it describes the main steps of the design conceptually. + + \section{Before starting} +-In those tutorials you will learn the practical use of the following ++In those tutorials you will learn the practical use of the following + \textbf{Alliance} tools : + + In the first tutorial (simulation/ directory) : +@@ -103,30 +104,32 @@ + In the third tutorial (synthesis/ directory) : + \begin{itemize} + \item \textbf{syf} : Finite state machine synthesizer. +-\item \textbf{boom} : Boolean optimization of a logic level behavioral ++\item \textbf{boom} : Boolean optimization of a logic level behavioral + description (VHDL data flow). +-\item \textbf{boog} : Mapping of a behavioral descriptiononto a standard cell ++\item \textbf{boog} : Mapping of a behavioral descriptiononto a standard cell + library. +-\item \textbf{loon} : Fanout optimizer, global optimizer and timing analyser of ++\item \textbf{loon} : Fanout optimizer, global optimizer and timing analyser of + \item \textbf{scapin} : Scan Path insertion + \item \textbf{xsch} : Graphical schematic viewer. + \end{itemize} + +-If you run a \texttt{c-like} shell, like \texttt{csh} or \texttt{tcsh}, ++If you run a \texttt{c-like} shell, like \texttt{csh} or \texttt{tcsh}, + try to run the following command : + + \begin{phraseverbatim} +-~alp/addaccu %-) source /alliance/etc/alc_env.csh ++~alp/addaccu %-) source /etc/profile.d/alc_env.csh + \end{phraseverbatim} + +-Otherwise, if you run a \texttt{sh-like} shell, try to run the following ++Otherwise, if you run a \texttt{sh-like} shell, try to run the following + command : + \begin{phraseverbatim} +-~alp/addaccu %-) source /alliance/alc_env.sh ++~alp/addaccu %-) source /etc/profile.d/alc_env.sh + \end{phraseverbatim} + \\ ++When a user logs in, these environment variables are automatically set from various places. ++\\ + Before we proceed to the tutorial, you must make sure that the +-\textbf{Alliance} tools are readilly available when invoking them at the ++\textbf{Alliance} tools are readilly available when invoking them at the + prompt. + The prompt in represented in the following text by the symbol~: + \begin{phraseverbatim} +@@ -136,7 +139,7 @@ + directory, and \texttt{\%-)} is supposed to give us courage! + + \section{Execution environment set up} +-Later, before you will start examining alliance tools, you will probably want ++Later, before you will start examining alliance tools, you will probably want + to know the environment variables setup. + To see it, please enter the following command : + +@@ -147,18 +150,21 @@ + \begin{figure}[H]\center\leavevmode + \begin{framedverbatim} + ~alp/addaccu %-) env | grep MBK +-MBK_OUT_PH=ap +-MBK_CATAL_NAME=CATAL ++MBK_IN_PH=ap + MBK_SCALE_X=100 ++MBK_CATAL_NAME=CATAL ++MBK_OUT_PH=ap ++MBK_OUT_LO=vst + MBK_VSS=vss +-MBK_CATA_LIB=.:/alliance/cells/sxlib:/alliance/cells/padlib +-MBK_WORK_LIB=. +-MBK_VDD=vdd + MBK_C4_LIB=./cellsC4 ++MBK_VDD=vdd ++MBK_TARGET_LIB=\$ALLIANCE\_TOP/cells/sxlib + MBK_IN_LO=vst +-MBK_IN_PH=ap +-MBK_TARGET_LIB=/alliance/cells/sxlib +-MBK_OUT_LO=vst ++MBK_WORK_LIB=. ++MBK_CATA_LIB=.:/usr/lib/alliance/cells/sxlib:/usr/lib/alliance/cells/dp_sxlib: ++/usr/lib/alliance/cells/rflib:/usr/lib/alliance/cells/ramlib: ++/usr/lib/alliance/cells/romlib:/usr/lib/alliance/cells/pxlib: ++/usr/lib/alliance/cells/padlib + \end{framedverbatim} + \caption{\label{mbk} \texttt{MBK} environment variables.} + \end{figure} +@@ -167,12 +173,12 @@ + variables are documented in each tutorial. + + \section{File Formats} +-One of the interesting features of \textbf{Alliance} is that different ++One of the interesting features of \textbf{Alliance} is that different + file formats can be used for both netlist and layout view. +-However, +-in the design methodology we wish to promote, some formats are ++However, ++in the design methodology we wish to promote, some formats are + recommended. +-The \texttt{vst}, structural \textbf{VHDL}, is dedicated to netlist ++The \texttt{vst}, structural \textbf{VHDL}, is dedicated to netlist + specification. + The \texttt{al} format is dedicated to extracted layout representation. + The \texttt{ap} format is the usual layout format. +diff -Naur documentation/tutorials/synthesis/src/amd2901/Makefile tutorials/synthesis/src/amd2901/Makefile +--- documentation/tutorials/synthesis/src/amd2901/Makefile 2002-07-25 14:50:18.000000000 +0200 ++++ tutorials/synthesis/src/amd2901/Makefile 2007-07-18 19:34:53.000000000 +0200 +@@ -2,17 +2,17 @@ + all: EXAMPLE VAR CATAL02 res.pat + + +-VAR: ++VAR: + MBK_IN_LO=vst;export MBK_IN_LO ;\ +- MBK_CATA_LIB=/asim/alliance/cells/sxlib;export MBK_CATA_LIB ++ MBK_CATA_LIB=$ALLIANCE_TOP/cells/sxlib;export MBK_CATA_LIB + + CATAL01: +- echo amd2901_ctl C >CATAL ++ echo amd2901_ctl C >CATAL + echo amd2901_dpt C >>CATAL + + CATAL02: + echo amd2901_dpt C >CATAL +- ++ + EXAMPLE: + genlib circuit + +@@ -38,7 +38,7 @@ + + res2.pat: amd2901_chip.vst pattern.pat amd2901_core.vst CATAL + asimut amd2901_chip pattern res2 +- touch amd2901_chip.vst ++ touch amd2901_chip.vst + + clean : + rm -f Makefile-* \ +diff -Naur documentation/tutorials/synthesis/tex/synthesis.tex tutorials/synthesis/tex/synthesis.tex +--- documentation/tutorials/synthesis/tex/synthesis.tex 2004-10-16 14:52:17.000000000 +0200 ++++ tutorials/synthesis/tex/synthesis.tex 2007-07-18 15:46:54.000000000 +0200 +@@ -2,6 +2,7 @@ + % $Id: synthesis.tex,v 1.4 2004/10/16 12:52:17 fred Exp $ + % $Log: synthesis.tex,v $ + % Revision 1.4 2004/10/16 12:52:17 fred ++% Modified by Chitlesh GOORAH for Alliance release 5.0 (18/07/2007) + % Erasing the psfig include from the file, changed the font to 10 pt + % instead of 12 (sparing trees and not being payed by the thickness of + % my production) and changing font to charter since I got tired of +@@ -11,13 +12,13 @@ + \documentclass{article} + \usepackage[dvips]{graphics} + \usepackage[english]{babel} +-\usepackage{doublespace} ++\usepackage{setspace} + \usepackage{fancybox} + \usepackage{fancyheadings} + \usepackage{float} + \usepackage{graphicx} + \usepackage{here} +-\usepackage{isolatin1} ++\usepackage[latin1]{inputenc} + \usepackage{charter} + \usepackage{picinpar} + \usepackage{rotate} +@@ -89,7 +90,8 @@ + \date{} + \author{ + Ak Frederic\hspace{2cm} Lam Kai-shing\\ +-Modified by LJ ++Modified by LJ\\ ++Modified by Chitlesh GOORAH (18/07/2007) + } + + \maketitle +@@ -220,7 +222,7 @@ + } + + All the files used in this part are located under \\ +-\texttt{/tutorial/synthesis/src} directory.\\ ++\texttt{/usr/share/doc/alliance-doc-5.0/tutorial/synthesis/src} directory.\\ + This directory contents four subdirectories and one Makefile : + \begin{itemize}\itemsep=-.8ex + diff --git a/alliance.fedora b/alliance.fedora new file mode 100644 index 0000000..add52ad --- /dev/null +++ b/alliance.fedora @@ -0,0 +1,44 @@ + +=== License === +Alliance CAD system is distributed under the GNU license v2. +There is no more or less limitation than the ones defined by the GPL v2. + +You are kindly requested to mention +" Designed with alliance (c) LIP6, Université Pierre et Marie Curie" +so as to spread the word about "alliance CAD system" and its development team. + + +=== Proper Usage === + +It is recommended to source the alc_env.sh or alc_env.csh before using alliance. + +source /etc/profile.d/alc_env.sh +(for example) + +When a user logs in, environment variables on +/etc/profile.d/alc_env.sh +are set will be automatically sourced. + + +=== Overview === + +A general overview of Alliance CAD System can be found here: +/usr/share/doc/alliance-doc-5.0/design-flow/index.html +(available on the alliance-doc rpm) + +=== Tutorials === + +The tutorials can be found at /usr/share/doc/alliance-doc-5.0/tutorials/ +(available on the alliance-doc rpm) + +It is recommended to first read /usr/share/doc/alliance-doc-5.0/overview.pdf + 1. start.pdf + 2. simulation.pdf + 3. synthesis.pdf + 4. place_and_route.pdf + + +========================================================================================= +Chitlesh Goorah (chitlesh AT fedoraproject DOT org) +Alliance development team and other contributors (ASIM/LIP6/UPMC) +alliance-users AT asim DOT lip6 DOT fr diff --git a/alliance.spec b/alliance.spec new file mode 100644 index 0000000..992d486 --- /dev/null +++ b/alliance.spec @@ -0,0 +1,412 @@ +%define prefix %{_libdir}/%{name} +%define snapshot 20070718 + +Name: alliance +Version: 5.0 +Release: 7.%{snapshot}snap%{?dist} +Summary: Alliance VLSI CAD Sytem + +License: GPL +Group: Applications/Engineering + +Source: http://www-asim.lip6.fr/pub/alliance/distribution/5.0/%{name}-%{version}-%{snapshot}.tar.gz +URL: http://www-asim.lip6.fr/recherche/alliance/ + +Patch1: alliance-examples.patch +Patch2: alliance-run.patch +Patch3: alliance-perms.patch +Patch4: alliance-tutorials.patch +Patch5: alliance-log3.patch + +Source1: xsch.desktop +Source2: dreal.desktop +Source3: xpat.desktop +Source4: xfsm.desktop +Source5: xvpn.desktop +Source6: graal.desktop + +Source7: alliance.fedora + +# Chitlesh's donated pictures to alliance +Source8: graal.png +Source9: dreal.png +Source10: xvpn.png +Source11: xfsm.png +Source12: xpat.png +Source13: xsch.png + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: lesstif-devel libXt-devel byacc desktop-file-utils bison +BuildRequires: libXp-devel libXpm-devel libstdc++-devel flex m4 +BuildRequires: transfig ghostscript tetex-latex + + +%description +Alliance is a complete set of free CAD tools and portable libraries for +VLSI design. It includes a VHDL compiler and simulator, logic synthesis +tools, and automatic place and route tools. + +A complete set of portable CMOS libraries is provided, including a RAM +generator, a ROM generator and a data-path compiler. + +Alliance is the result of more than ten years effort spent at ASIM department +of LIP6 laboratory of the Pierre et Marie Curie University (Paris VI, France). + +Alliance has been used for research projects such as the 875 000 transistors +StaCS superscalar microprocessor and 400 000 transistors IEEE Gigabit HSL +Router. + +You are kindly requested to mention +" Designed with alliance (c) LIP6, Université Pierre et Marie Curie" +so as to spread the word about "alliance CAD system" and its development team. + +Alliance provides CAD tools covering most of all the digital design flow: + + * VHDL Compilation and Simulation + * Model checking and formal proof + * RTL and Logic synthesis + * Data-Path compilation + * Macro-cells generation + * Place and route + * Layout edition + * Netlist extraction and verification + * Design rules checking + + +%package doc +Summary: Alliance VLSI CAD Sytem - Documentations +Group: Applications/Engineering +Requires: %{name} = %{version}-%{release} +Requires: gnuplot + + +%description doc +Documentation and tutorials for the Alliance VLSI CAD Sytem. + + +%prep +%setup -q + +%{__cp} -p %{SOURCE7} . + +# using the formal %%{_sysconfdir} in favor of $${ALLIANCE_TOP}/etc +sed -i "s|sysconfdir='\${prefix}/etc'|sysconfdir=%{_sysconfdir}/%{name}|" configure + +sed -i "s|\${ALLIANCE_TOP}/etc|%{_sysconfdir}/%{name}|" {xfsm,xvpn,xpat,xsch}/src/Makefile* + +sed -i "s|etcdir=\$(prefix)/etc|etcdir=%{_sysconfdir}/%{name}|" \ + {attila,dreal,elp,graal,mbkspice,rds,scapin,sea,xfsm,xvpn,xpat,xsch}/etc/Makefile.am + +sed -i "s|etcdir = \$(prefix)/etc|etcdir = %{_sysconfdir}/%{name}|" \ + {attila,dreal,elp,graal,mbkspice,rds,scapin,sea,xfsm,xvpn,xpat,xsch}/etc/Makefile.in + +sed -i "s|etcdir=\$(prefix)/etc|etcdir=%{_sysconfdir}/profile.d|" distrib/etc/Makefile.am +sed -i "s|etcdir = \$(prefix)/etc|etcdir = %{_sysconfdir}/profile.d|" distrib/etc/Makefile.in + + +%patch1 -p0 -b .examples +%patch2 -p0 -b .run +# fixing permissions +%patch3 -p0 -b .perms + + +## Updating old tutorials +%patch4 -p0 -b .tutorials + +pushd documentation/tutorials + for folder in place_and_route/tex simulation/tex start synthesis/tex; do + pushd $folder + %{__make} + popd + done +popd + +#conflicts with man-pages and is a duplicate of log.1.gz +%patch5 -p0 -b .duplicate + + +# removing useless copyrighted (by Cadence) lines from the examples +# and even in alliance-run +# https://www-asim.lip6.fr/wws/arc/alliance-users/2007-07/msg00006.html +pushd documentation/alliance-examples + for cadence in adder4/adder4.ioc divcas4/divcas4.ioc mipsR3000/sce/mips_core.ioc \ + amd2901/amd2901_core.ioc amd2901-vasy/amd2901.ioc ; do + sed -i "s|# Copyright (c) 1997 by Cadence. All rights reserved.|#|" $cadence + done +popd + +# make sure the man pages are UTF-8... +for nonUTF8 in distrib/doc/alc_origin.1 alcban/man1/alcbanner.1 \ + loon/doc/loon.1 m2e/doc/man1/m2e.1 boog/doc/boog.1 ; do + %{_bindir}/iconv -f ISO-8859-1 -t utf-8 $nonUTF8 > $nonUTF8.conv + %{__mv} -f $nonUTF8.conv $nonUTF8 +done + +#wrong-file-end-of-line-encoding +sed -i 's/\r//' documentation/alliance-examples/mipsR3000/asm/* + + +%build + +export ALLIANCE_TOP=%{prefix} + +%configure --prefix=%{prefix} \ + --enable-alc-shared \ + --disable-static \ + --includedir=%{prefix}/include \ + --libdir=%{prefix}/lib \ + --bindir=%{prefix}/bin + +# disabling rpath +sed -i 's|^hardcode_libdir_flag_spec="\\${wl}--rpath \\${wl}\\$libdir"|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool + +# clean unused-direct-shlib-dependencies +sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool + +# Is not parallel-build-safe +%{__make} + + +%install + +%{__rm} -rf %{buildroot} + +%{__make} INSTALL="install -p" DESTDIR=%{buildroot} install + + +# Set execution rights on the alc_env.* batchs and adjust ALLIANCE_TOP. +pushd %{buildroot}%{_sysconfdir}/profile.d + chmod 0644 alc_env.* + sed -i "s|@DATE@|`date`|" alc_env* + # fixing *** ERROR *** : Variable MBK_SPI_MODEL not found. + echo "MBK_SPI_MODEL=\$ALLIANCE_TOP/etc/spimodel.cfg; export MBK_SPI_MODEL" >> alc_env.sh + echo "setenv MBK_SPI_MODEL \"\${ALLIANCE_TOP}/etc/spimodel.cfg\"" >> alc_env.csh + #don't override $MANPATH + sed -i "s|\$ALLIANCE_TOP/man|\$MANPATH|" alc_env* + sed "s|ALLIANCE_TOP *= *\([^;]*\)|ALLIANCE_TOP=%{prefix}|" alc_env.sh + sed "s|setenv *ALLIANCE_TOP *\([^;]*\)|setenv ALLIANCE_TOP %{prefix}|" alc_env.csh +popd + + +# documentation +%{__cp} -pr %{buildroot}%{prefix}/doc/ . +%{__cp} -pr %{buildroot}%{prefix}/tutorials/ . +%{__cp} -pr %{buildroot}%{prefix}/examples/alliance-examples/ . + +%{__rm} -rf %{buildroot}%{prefix}/doc/ +%{__rm} -rf %{buildroot}%{prefix}/tutorials/ +%{__rm} -rf %{buildroot}%{prefix}/examples/ + +# correcting minor documentation details +sed -i "s|/bin/zsh|/bin/sh|" doc/alliance-run/bench.zsh + + +find %{buildroot} -name '*.la' -exec rm -f {} ';' + + +# Adding icons for the menus +%{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/ +%{__cp} -p %{SOURCE8} %{SOURCE9} %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} \ + %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/ + +# desktop files +for desktopfile in %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6}; do +desktop-file-install --vendor fedora \ + --add-category Engineering \ + --dir %{buildroot}%{_datadir}/applications/ \ + $desktopfile +done + + +## Makefiles and tex folder cleanups +pushd tutorials + for folder in place_and_route/tex simulation/tex start synthesis/tex; do + %{__rm} -rf $folder + done +popd + + +# Architecture independent files +%{__mkdir} -p %{buildroot}%{_datadir}/%{name}/ +%{__mv} %{buildroot}%{prefix}/cells %{buildroot}%{_datadir}/%{name}/ + + +# protecting hardcoded links +ln -sf ../../..%{_sysconfdir}/%{name} %{buildroot}%{prefix}/etc +ln -sf ../../..%{_datadir}/%{name}/cells %{buildroot}%{prefix}/cells + + +%{__mkdir} -p %{buildroot}%{_sysconfdir}/ld.so.conf.d/ +cat > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}.conf << EOF +# Alliance VLSI design system +%{prefix}/lib +EOF + + +# removing tools for compiling and installing Alliance tools +# These are for the packager (i.e me) and not for user +%{__rm} -f %{buildroot}%{_sysconfdir}/%{name}/attila.conf +%{__rm} -f %{buildroot}%{prefix}/bin/attila +%{__rm} -f %{buildroot}%{_datadir}/man/man1/attila* +%{__rm} -f doc/html/alliance/*attila.html +%{__rm} -f doc/pdf/attila.pdf + + + + +%post +/sbin/ldconfig +touch --no-create %{_datadir}/icons/hicolor || : +%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + + +%postun +/sbin/ldconfig +touch --no-create %{_datadir}/icons/hicolor || : +%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + + + +%clean +%{__rm} -rf %{buildroot} + +#These headers are useful for the _usage_ of the binaries +#without these headers some of the binaries will be broken by default + + +%files +%doc CHANGES LICENCE COPYING* FAQ alliance.fedora +%defattr(-,root,root,-) +%{prefix}/ +%{_datadir}/%{name} +%dir %{_sysconfdir}/%{name} +%config(noreplace) %{_sysconfdir}/%{name}/prol.elp +%config(noreplace) %{_sysconfdir}/%{name}/se_defaults.mac +%config(noreplace) %{_sysconfdir}/%{name}/spimodel.cfg +%config(noreplace) %{_sysconfdir}/%{name}/sxlib.scapin +%config %{_sysconfdir}/%{name}/cmos.* +%config %{_sysconfdir}/%{name}/*.par +%config %{_sysconfdir}/ld.so.conf.d/* +%{_datadir}/icons/hicolor/48x48/apps/* +%{_mandir}/man?/* +%{_datadir}/applications/fedora-*.desktop +%{_sysconfdir}/profile.d/alc_env.* + + + +%files doc +%doc doc/html/ +%doc doc/design-flow +%doc doc/pdf/*.pdf +%doc doc/overview/*.ps +%doc doc/overview/*.pdf +%doc tutorials/ +#Makefiles are present in alliance-examples/*. It is normal because +# * it gives the VLSI designer a template on how to create his own +# Makefile for alliance (VLSI designers normally don't know how to do so) +# * it is not part of the build, but part of the working environment of the user +%doc alliance-examples/ +%doc doc/alliance-run/ + + + +%changelog +* Sun Aug 12 2007 Chitlesh Goorah - 5.0-7.20070718snap +- moved Architecture independent files to %%{_datadir}/%%{name} +- Uses verbs in the comments line for desktop files + +* Thu Aug 02 2007 Chitlesh Goorah - 5.0-6.20070718snap +- chose libdir/alliance as prefix +- added new icons to the menus +- removed useless attila +- fixed MANPATH override + +* Sat Jul 28 2007 Chitlesh Goorah - 5.0-5.20070718snap +- fixed unused-direct-shlib-dependency and undefined-non-weak-symbol warnings + +* Tue Jul 24 2007 Chitlesh Goorah - 5.0-4.20070718snap +- removed X-Desktop-File-Install-Version=0.10 from desktop files +- moved the alc_env to /etc/profile.d +- updated to meet reviewer's statements - #248649 + +* Thu Jul 19 2007 Chitlesh Goorah - 5.0-3.20070718snap +- New upstream release which includes bug fixes + +* Wed Jul 18 2007 Chitlesh Goorah - 5.0-2.20060509snap +- minor fixes to the tutorials + added transfig ghostscript tetex-latex as BR +- corrected some hardcoded links in the scripts +- removed %%preun and updated alliance.fedora +- spec file updated to satisfy the review + +* Tue Jul 17 2007 Chitlesh Goorah - 5.0-1 +- prepared spec file for review and spec clean ups +- removed rm and ln from %%post and %%preun +- removed log.3.gz from mandir since it's a duplicate and conflicts with man-pages + +* Sat Jul 14 2007 Chitlesh Goorah - 5.0-0.7 +- since it is not parallel-build-safe, smp mflags are removed : (by wwoods) +- added missing BR : flex : (by wwoods) +- added missing BR : bison: (by rdieter) + +* Fri Jul 13 2007 Chitlesh Goorah - 5.0-0.6 +- removing useless copyrighted lines from .ioc files +- added alliance.fedora among the %%doc + +* Thu Jul 12 2007 Chitlesh Goorah - 5.0-0.5 +- removing copyrighted materials +- patching the remaining examples so that they will still be valid under another folder + +* Wed Jul 04 2007 Chitlesh Goorah - 5.0-0.4 +- removing unwanted debug duplicates + +* Wed May 02 2007 Chitlesh Goorah - 5.0-0.3 +- added desktop files + +* Wed Feb 14 2007 Chitlesh Goorah - 5.0-0.2 +- fixing documentations + +* Wed Dec 13 2006 Chitlesh Goorah - 5.0-0.1 +- Initial package + +* Thu Feb 17 2005 Jean-Paul.Chaput +- Synch with current version: bug & compliance with gcc 3.4.x. + +* Fri Jul 16 2004 Jean-Paul.Chaput +- Added Tutorial sub-package (now managed by autoconf/automake). +- Removed release tag, must be given at compile time using the + --define command line argument of rpmbuild (see mkdistrib). + +* Sat Nov 15 2003 Jean-Paul.Chaput +- assert is now in assert.h, patch mut.h to include it if + GCC_VERSION >= 3003 (gcc >= 3.3.x). + +* Sat Oct 18 2003 Jean-Paul.Chaput +- Synched with 2003/10/18 version. +- Missing depcomp : added "--add-missing --copy" to the individual + packages in autostuff, so the first who needs depcomp will add + it at top level. + +* Sun Oct 13 2002 Jean-Paul.Chaput +- autoconf m4 macros moved back in the Alliance source tree to avoid + re-declaration on our development computers (on which the macros + are in teh source tree). +- Adopt the versioning scheme from czo. +- Try to switch to dynamic libraries. + +* Wed Jul 17 2002 Jean-Paul.Chaput +- Moved autoconf m4 macros to /usr/share/aclocal. +- Synched with the current CVS version of Alliance. + +* Fri May 31 2002 Jean-Paul.Chaput +- GenPat added. +- GenLib docs added. +- seplace/seroute/sea bug fixes. + +* Thu May 16 2002 Jean-Paul.Chaput +- Corrected buggy substitution of ALLIANCE_TOP in alc_env.csh. +- Remove the alc_env.* scripts in "/etc/profile.d" only if this + is the last package to be removed. + +* Mon May 6 2002 Jean-Paul.Chaput +- Initial packaging for release 5.0 (alpha stage). diff --git a/dreal.desktop b/dreal.desktop new file mode 100644 index 0000000..6fc223c --- /dev/null +++ b/dreal.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Alliance: Dreal +Exec=dreal +Icon=dreal.png +Type=Application +Terminal=false +GenericName=Alliance +Categories=Education;Science; +Comment=View the Real layout \ No newline at end of file diff --git a/dreal.png b/dreal.png new file mode 100644 index 0000000000000000000000000000000000000000..50e608ab6c0d88cab066839b83e57ed0b8a06f24 GIT binary patch literal 5967 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%0AHQv=`apl*-~9aNskD*r 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 literal 0 HcmV?d00001 diff --git a/sources b/sources index e69de29..5716e50 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +917f4493c09f6f5c49d5a606a5e9bbd8 alliance-5.0-20070718.tar.gz diff --git a/xfsm.desktop b/xfsm.desktop new file mode 100644 index 0000000..45bd88f --- /dev/null +++ b/xfsm.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Alliance: Xfsm +Exec=xfsm +Icon=xfsm.png +Type=Application +Terminal=false +GenericName=Alliance +Categories=Education;Science; +Comment=View Finite State Machines \ No newline at end of file diff --git a/xfsm.png b/xfsm.png new file mode 100644 index 0000000000000000000000000000000000000000..414f15315c44dc0a18a511aa405cb1269fb50755 GIT binary patch literal 5909 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 literal 0 HcmV?d00001 diff --git a/xpat.desktop b/xpat.desktop new file mode 100644 index 0000000..f60f580 --- /dev/null +++ b/xpat.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Alliance: Xpat +Exec=xpat +Icon=xpat.png +Type=Application +Terminal=false +GenericName=Alliance +Categories=Education;Science; +Comment=View the Patterns \ No newline at end of file diff --git a/xpat.png b/xpat.png new file mode 100644 index 0000000000000000000000000000000000000000..39579358a14cec92673695b12f1b894c90f55ae7 GIT binary patch literal 6079 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 Date: Thu, 16 Aug 2007 12:10:42 +0000 Subject: [PATCH 3/8] *** empty log message *** --- alliance.spec | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/alliance.spec b/alliance.spec index 992d486..5505b45 100644 --- a/alliance.spec +++ b/alliance.spec @@ -3,10 +3,10 @@ Name: alliance Version: 5.0 -Release: 7.%{snapshot}snap%{?dist} +Release: 8.%{snapshot}snap%{?dist} Summary: Alliance VLSI CAD Sytem -License: GPL +License: GPLv2 Group: Applications/Engineering Source: http://www-asim.lip6.fr/pub/alliance/distribution/5.0/%{name}-%{version}-%{snapshot}.tar.gz @@ -122,7 +122,7 @@ pushd documentation/tutorials popd #conflicts with man-pages and is a duplicate of log.1.gz -%patch5 -p0 -b .duplicate +#%patch5 -p0 -b .duplicate # removing useless copyrighted (by Cadence) lines from the examples @@ -155,7 +155,8 @@ export ALLIANCE_TOP=%{prefix} --disable-static \ --includedir=%{prefix}/include \ --libdir=%{prefix}/lib \ - --bindir=%{prefix}/bin + --bindir=%{prefix}/bin \ + --mandir=%{prefix}/man #252941 # disabling rpath sed -i 's|^hardcode_libdir_flag_spec="\\${wl}--rpath \\${wl}\\$libdir"|hardcode_libdir_flag_spec=""|g' libtool @@ -253,8 +254,6 @@ EOF %{__rm} -f doc/pdf/attila.pdf - - %post /sbin/ldconfig touch --no-create %{_datadir}/icons/hicolor || : @@ -289,7 +288,7 @@ touch --no-create %{_datadir}/icons/hicolor || : %config %{_sysconfdir}/%{name}/*.par %config %{_sysconfdir}/ld.so.conf.d/* %{_datadir}/icons/hicolor/48x48/apps/* -%{_mandir}/man?/* +#%{_mandir}/man?/* %{_datadir}/applications/fedora-*.desktop %{_sysconfdir}/profile.d/alc_env.* @@ -312,6 +311,10 @@ touch --no-create %{_datadir}/icons/hicolor || : %changelog +* Thu Aug 16 2007 Chitlesh Goorah - 5.0-8.20070718snap +- fixing conflicts with QuantLib-doc package (#252941) +- update license macro to comply with new guidelines) + * Sun Aug 12 2007 Chitlesh Goorah - 5.0-7.20070718snap - moved Architecture independent files to %%{_datadir}/%%{name} - Uses verbs in the comments line for desktop files From ca12fdaa1762a1598782046f53b0b54c6af9c952 Mon Sep 17 00:00:00 2001 From: Chitlesh GOORAH Date: Sun, 19 Aug 2007 15:10:19 +0000 Subject: [PATCH 4/8] *** empty log message *** --- alliance-env.patch | 151 ++++++++++++++++++++++++++++++++++++++++++++ alliance-log3.patch | 22 ------- alliance.spec | 108 ++++++++++++------------------- dreal.desktop | 2 +- graal.desktop | 2 +- xfsm.desktop | 2 +- xpat.desktop | 2 +- xsch.desktop | 2 +- xvpn.desktop | 2 +- 9 files changed, 198 insertions(+), 95 deletions(-) create mode 100644 alliance-env.patch delete mode 100644 alliance-log3.patch diff --git a/alliance-env.patch b/alliance-env.patch new file mode 100644 index 0000000..601ed54 --- /dev/null +++ b/alliance-env.patch @@ -0,0 +1,151 @@ +diff -Naur distrib/etc/alc_env.csh.in etc/alc_env.csh.in +--- distrib/etc/alc_env.csh.in 2006-10-05 12:09:24.000000000 +0200 ++++ etc/alc_env.csh.in 2007-08-18 13:48:55.000000000 +0200 +@@ -1,4 +1,4 @@ +-# -*- Mode: Shell-script -*- ++# -*- Mode: Shell-script -*- + # -*- vim: set filetype=csh: -*- + # ,,, + # (o o) +@@ -28,17 +28,17 @@ + setenv MBK_OUT_LO vst + setenv MBK_IN_PH ap + setenv MBK_OUT_PH ap +- ++ + setenv MBK_WORK_LIB . + setenv MBK_CATAL_NAME CATAL +- ++ + setenv MBK_SCALE_X 100 +- ++ + setenv VH_MAXERR 10 + setenv VH_BEHSFX vbe + setenv VH_PATSFX pat + setenv VH_DLYSFX dly +- ++ + setenv MBK_CATA_LIB ".:${ALLIANCE_TOP}/cells/sxlib" + setenv MBK_CATA_LIB "${MBK_CATA_LIB}:${ALLIANCE_TOP}/cells/dp_sxlib" + setenv MBK_CATA_LIB "${MBK_CATA_LIB}:${ALLIANCE_TOP}/cells/rflib" +@@ -48,42 +48,29 @@ + setenv MBK_CATA_LIB "${MBK_CATA_LIB}:${ALLIANCE_TOP}/cells/pxlib" + setenv MBK_CATA_LIB "${MBK_CATA_LIB}:${ALLIANCE_TOP}/cells/padlib" + setenv MBK_TARGET_LIB "${ALLIANCE_TOP}/cells/sxlib" +- setenv MBK_C4_LIB ./cellsC4 +- ++ setenv MBK_C4_LIB ./cellsC4 ++ + setenv MBK_VDD vdd + setenv MBK_VSS vss +- ++ + setenv XPAT_PARAM_NAME "${ALLIANCE_TOP}/etc/xpat.par" + setenv XFSM_PARAM_NAME "${ALLIANCE_TOP}/etc/xfsm.par" + setenv XSCH_PARAM_NAME "${ALLIANCE_TOP}/etc/xsch.par" +- ++ + setenv RDS_IN cif + setenv RDS_OUT cif +- ++ + setenv DREAL_TECHNO_NAME "${ALLIANCE_TOP}/etc/cmos.dreal" + setenv GRAAL_TECHNO_NAME "${ALLIANCE_TOP}/etc/cmos.graal" + setenv GENVIEW_TECHNO_NAME "${ALLIANCE_TOP}/etc/cmos.genview" +- ++ + setenv RDS_TECHNO_NAME "${ALLIANCE_TOP}/etc/cmos.rds" + setenv ELP_TECHNO_NAME "${ALLIANCE_TOP}/etc/prol.elp" + + + # System environment variables. +- if ( $?PATH ) then +- setenv PATH "${ALLIANCE_TOP}/bin:$PATH" +- else +- setenv PATH "${ALLIANCE_TOP}/bin" +- endif +- +-# Only needed on Solaris (included in /etc/ld.so.conf under Linux). +- if ( $?LD_LIBRARY_PATH ) then +- setenv LD_LIBRARY_PATH "${ALLIANCE_TOP}/lib:$LD_LIBRARY_PATH" +- else +- setenv LD_LIBRARY_PATH "${ALLIANCE_TOP}/lib" +- endif +- +- if ( $?MANPATH ) then +- setenv MANPATH "${ALLIANCE_TOP}/man:${MANPATH}" +- else +- setenv MANPATH "${ALLIANCE_TOP}/man" +- endif ++ setenv PATH "$PATH:${ALLIANCE_TOP}/bin" ++ setenv MANPATH "${MANPATH}:${ALLIANCE_TOP}/man" ++ ++# fixing *** ERROR *** : Variable MBK_SPI_MODEL not found. ++ setenv MBK_SPI_MODEL "${ALLIANCE_TOP}/etc/spimodel.cfg" +diff -Naur distrib/etc/alc_env.sh.in etc/alc_env.sh.in +--- distrib/etc/alc_env.sh.in 2006-10-05 12:09:24.000000000 +0200 ++++ etc/alc_env.sh.in 2007-08-18 13:47:04.000000000 +0200 +@@ -1,4 +1,4 @@ +-# -*- Mode: Shell-script -*- ++# -*- Mode: Shell-script -*- + # -*- vim: set filetype=sh: -*- + # ,,, + # (o o) +@@ -24,7 +24,7 @@ + + # Alliance environment variables. + MBK_IN_LO=vst; export MBK_IN_LO +- MBK_OUT_LO=vst; export MBK_OUT_LO ++ MBK_OUT_LO=vst; export MBK_OUT_LO + MBK_IN_PH=ap; export MBK_IN_PH + MBK_OUT_PH=ap; export MBK_OUT_PH + +@@ -70,20 +70,8 @@ + + + # System environment variables. +- PATH=$ALLIANCE_TOP/bin:$PATH +- export PATH ++ export PATH=$PATH:$ALLIANCE_TOP/bin ++ export MANPATH=$MANPATH:$ALLIANCE_TOP/man + +-# Only needed on Solaris (included in /etc/ld.so.conf under Linux). +- if [ -z "${LD_LIBRARY_PATH}" ]; then +- LD_LIBRARY_PATH=$ALLIANCE_TOP/lib +- else +- LD_LIBRARY_PATH=$ALLIANCE_TOP/lib:$LD_LIBRARY_PATH +- fi +- export LD_LIBRARY_PATH +- +- if [ -z "${MANPATH}" ]; then +- MANPATH=$ALLIANCE_TOP/man +- else +- MANPATH=$ALLIANCE_TOP/man:$MANPATH +- fi +- export MANPATH ++# fixing *** ERROR *** : Variable MBK_SPI_MODEL not found. ++ MBK_SPI_MODEL=$ALLIANCE_TOP/etc/spimodel.cfg; export MBK_SPI_MODEL +diff -Naur distrib/etc/Makefile.am etc/Makefile.am +--- distrib/etc/Makefile.am 2002-06-25 16:09:38.000000000 +0200 ++++ etc/Makefile.am 2007-08-18 13:58:38.000000000 +0200 +@@ -1,6 +1,6 @@ + # $Id: Makefile.am,v 1.4 2002/06/25 14:09:38 czo Exp $ + +-etcdir=$(prefix)/etc ++etcdir=/etc/profile.d + + etc_SCRIPTS=alc_env.csh alc_env.sh + +diff -Naur distrib/etc/Makefile.in etc/Makefile.in +--- distrib/etc/Makefile.in 2007-07-18 19:04:22.000000000 +0200 ++++ etc/Makefile.in 2007-08-18 13:59:28.000000000 +0200 +@@ -336,7 +336,7 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-etcdir = $(prefix)/etc ++etcdir = /etc/profile.d + etc_SCRIPTS = alc_env.csh alc_env.sh + EXTRA_DIST = alc_env.csh.in alc_env.sh.in + all: all-am diff --git a/alliance-log3.patch b/alliance-log3.patch deleted file mode 100644 index f320083..0000000 --- a/alliance-log3.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Naur mbk/man3/Makefile.am man3/Makefile.am ---- mbk/man3/Makefile.am 2003-04-03 16:56:36.000000000 +0200 -+++ man3/Makefile.am 2007-07-25 01:33:26.000000000 +0200 -@@ -87,7 +87,6 @@ - locon.3 \ - lofig.3 \ - lofigchain.3 \ -- log.3 \ - loins.3 \ - losig.3 \ - lotrs.3 \ -diff -Naur mbk/man3/Makefile.in man3/Makefile.in ---- mbk/man3/Makefile.in 2007-07-18 19:04:43.000000000 +0200 -+++ man3/Makefile.in 2007-07-25 01:33:18.000000000 +0200 -@@ -422,7 +422,6 @@ - locon.3 \ - lofig.3 \ - lofigchain.3 \ -- log.3 \ - loins.3 \ - losig.3 \ - lotrs.3 \ diff --git a/alliance.spec b/alliance.spec index 5505b45..b4acd84 100644 --- a/alliance.spec +++ b/alliance.spec @@ -3,7 +3,7 @@ Name: alliance Version: 5.0 -Release: 8.%{snapshot}snap%{?dist} +Release: 9.%{snapshot}snap%{?dist} Summary: Alliance VLSI CAD Sytem License: GPLv2 @@ -12,11 +12,11 @@ Group: Applications/Engineering Source: http://www-asim.lip6.fr/pub/alliance/distribution/5.0/%{name}-%{version}-%{snapshot}.tar.gz URL: http://www-asim.lip6.fr/recherche/alliance/ +Patch0: alliance-env.patch Patch1: alliance-examples.patch Patch2: alliance-run.patch Patch3: alliance-perms.patch Patch4: alliance-tutorials.patch -Patch5: alliance-log3.patch Source1: xsch.desktop Source2: dreal.desktop @@ -87,23 +87,14 @@ Documentation and tutorials for the Alliance VLSI CAD Sytem. %prep %setup -q -%{__cp} -p %{SOURCE7} . - -# using the formal %%{_sysconfdir} in favor of $${ALLIANCE_TOP}/etc -sed -i "s|sysconfdir='\${prefix}/etc'|sysconfdir=%{_sysconfdir}/%{name}|" configure - -sed -i "s|\${ALLIANCE_TOP}/etc|%{_sysconfdir}/%{name}|" {xfsm,xvpn,xpat,xsch}/src/Makefile* - -sed -i "s|etcdir=\$(prefix)/etc|etcdir=%{_sysconfdir}/%{name}|" \ - {attila,dreal,elp,graal,mbkspice,rds,scapin,sea,xfsm,xvpn,xpat,xsch}/etc/Makefile.am - -sed -i "s|etcdir = \$(prefix)/etc|etcdir = %{_sysconfdir}/%{name}|" \ - {attila,dreal,elp,graal,mbkspice,rds,scapin,sea,xfsm,xvpn,xpat,xsch}/etc/Makefile.in - -sed -i "s|etcdir=\$(prefix)/etc|etcdir=%{_sysconfdir}/profile.d|" distrib/etc/Makefile.am -sed -i "s|etcdir = \$(prefix)/etc|etcdir = %{_sysconfdir}/profile.d|" distrib/etc/Makefile.in +%{__cp} -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} . +sed -i "s|ALLIANCE_TOP|%{prefix}|" *.desktop +%patch0 -p0 -b .env +# removing useless copyrighted (by Cadence) lines from the examples +# and even in alliance-run +# https://www-asim.lip6.fr/wws/arc/alliance-users/2007-07/msg00006.html %patch1 -p0 -b .examples %patch2 -p0 -b .run # fixing permissions @@ -114,32 +105,19 @@ sed -i "s|etcdir = \$(prefix)/etc|etcdir = %{_sysconfdir}/profile.d|" distrib/et %patch4 -p0 -b .tutorials pushd documentation/tutorials - for folder in place_and_route/tex simulation/tex start synthesis/tex; do - pushd $folder - %{__make} - popd - done + for folder in place_and_route/tex simulation/tex start synthesis/tex; do + pushd $folder + %{__make} + popd + done popd -#conflicts with man-pages and is a duplicate of log.1.gz -#%patch5 -p0 -b .duplicate - - -# removing useless copyrighted (by Cadence) lines from the examples -# and even in alliance-run -# https://www-asim.lip6.fr/wws/arc/alliance-users/2007-07/msg00006.html -pushd documentation/alliance-examples - for cadence in adder4/adder4.ioc divcas4/divcas4.ioc mipsR3000/sce/mips_core.ioc \ - amd2901/amd2901_core.ioc amd2901-vasy/amd2901.ioc ; do - sed -i "s|# Copyright (c) 1997 by Cadence. All rights reserved.|#|" $cadence - done -popd # make sure the man pages are UTF-8... for nonUTF8 in distrib/doc/alc_origin.1 alcban/man1/alcbanner.1 \ loon/doc/loon.1 m2e/doc/man1/m2e.1 boog/doc/boog.1 ; do - %{_bindir}/iconv -f ISO-8859-1 -t utf-8 $nonUTF8 > $nonUTF8.conv - %{__mv} -f $nonUTF8.conv $nonUTF8 + %{_bindir}/iconv -f ISO-8859-1 -t utf-8 $nonUTF8 > $nonUTF8.conv + %{__mv} -f $nonUTF8.conv $nonUTF8 done #wrong-file-end-of-line-encoding @@ -156,7 +134,7 @@ export ALLIANCE_TOP=%{prefix} --includedir=%{prefix}/include \ --libdir=%{prefix}/lib \ --bindir=%{prefix}/bin \ - --mandir=%{prefix}/man #252941 + --mandir=%{_datadir}/%{name}/man #252941 # disabling rpath sed -i 's|^hardcode_libdir_flag_spec="\\${wl}--rpath \\${wl}\\$libdir"|hardcode_libdir_flag_spec=""|g' libtool @@ -178,15 +156,10 @@ sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool # Set execution rights on the alc_env.* batchs and adjust ALLIANCE_TOP. pushd %{buildroot}%{_sysconfdir}/profile.d - chmod 0644 alc_env.* - sed -i "s|@DATE@|`date`|" alc_env* - # fixing *** ERROR *** : Variable MBK_SPI_MODEL not found. - echo "MBK_SPI_MODEL=\$ALLIANCE_TOP/etc/spimodel.cfg; export MBK_SPI_MODEL" >> alc_env.sh - echo "setenv MBK_SPI_MODEL \"\${ALLIANCE_TOP}/etc/spimodel.cfg\"" >> alc_env.csh - #don't override $MANPATH - sed -i "s|\$ALLIANCE_TOP/man|\$MANPATH|" alc_env* - sed "s|ALLIANCE_TOP *= *\([^;]*\)|ALLIANCE_TOP=%{prefix}|" alc_env.sh - sed "s|setenv *ALLIANCE_TOP *\([^;]*\)|setenv ALLIANCE_TOP %{prefix}|" alc_env.csh + chmod 0644 alc_env.* + sed -i "s|@DATE@|`date`|" alc_env* + sed "s|ALLIANCE_TOP *= *\([^;]*\)|ALLIANCE_TOP=%{prefix}|" alc_env.sh + sed "s|setenv *ALLIANCE_TOP *\([^;]*\)|setenv ALLIANCE_TOP %{prefix}|" alc_env.csh popd @@ -202,7 +175,6 @@ popd # correcting minor documentation details sed -i "s|/bin/zsh|/bin/sh|" doc/alliance-run/bench.zsh - find %{buildroot} -name '*.la' -exec rm -f {} ';' @@ -212,30 +184,35 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/ # desktop files -for desktopfile in %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6}; do -desktop-file-install --vendor fedora \ - --add-category Engineering \ - --dir %{buildroot}%{_datadir}/applications/ \ - $desktopfile +for desktopfile in *.desktop; do +desktop-file-install --vendor fedora \ + --add-category Engineering \ + --dir %{buildroot}%{_datadir}/applications/ \ + $desktopfile done ## Makefiles and tex folder cleanups pushd tutorials - for folder in place_and_route/tex simulation/tex start synthesis/tex; do - %{__rm} -rf $folder - done + for folder in place_and_route/tex simulation/tex start synthesis/tex; do + %{__rm} -rf $folder + done popd # Architecture independent files -%{__mkdir} -p %{buildroot}%{_datadir}/%{name}/ %{__mv} %{buildroot}%{prefix}/cells %{buildroot}%{_datadir}/%{name}/ +%{__mv} %{buildroot}%{prefix}/etc %{buildroot}%{_datadir}/%{name}/ # protecting hardcoded links -ln -sf ../../..%{_sysconfdir}/%{name} %{buildroot}%{prefix}/etc ln -sf ../../..%{_datadir}/%{name}/cells %{buildroot}%{prefix}/cells +ln -sf ../../..%{_datadir}/%{name}/etc %{buildroot}%{prefix}/etc +ln -sf ../../..%{_datadir}/%{name}/man %{buildroot}%{prefix}/man + + +# manpage-not-gzipped +find %{prefix}/man -type f -not -name '*.gz' -print | xargs gzip -9f %{__mkdir} -p %{buildroot}%{_sysconfdir}/ld.so.conf.d/ @@ -256,6 +233,7 @@ EOF %post /sbin/ldconfig +source %{_sysconfdir}/profile.d/alc_env.sh touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : @@ -278,17 +256,9 @@ touch --no-create %{_datadir}/icons/hicolor || : %doc CHANGES LICENCE COPYING* FAQ alliance.fedora %defattr(-,root,root,-) %{prefix}/ -%{_datadir}/%{name} -%dir %{_sysconfdir}/%{name} -%config(noreplace) %{_sysconfdir}/%{name}/prol.elp -%config(noreplace) %{_sysconfdir}/%{name}/se_defaults.mac -%config(noreplace) %{_sysconfdir}/%{name}/spimodel.cfg -%config(noreplace) %{_sysconfdir}/%{name}/sxlib.scapin -%config %{_sysconfdir}/%{name}/cmos.* -%config %{_sysconfdir}/%{name}/*.par +%{_datadir}/%{name}/ %config %{_sysconfdir}/ld.so.conf.d/* %{_datadir}/icons/hicolor/48x48/apps/* -#%{_mandir}/man?/* %{_datadir}/applications/fedora-*.desktop %{_sysconfdir}/profile.d/alc_env.* @@ -311,6 +281,10 @@ touch --no-create %{_datadir}/icons/hicolor || : %changelog +* Sat Aug 18 2007 Chitlesh Goorah - 5.0-9.20070718snap +- fixing desktop files +- fixing MANPATH and PATH for proper priority + * Thu Aug 16 2007 Chitlesh Goorah - 5.0-8.20070718snap - fixing conflicts with QuantLib-doc package (#252941) - update license macro to comply with new guidelines) diff --git a/dreal.desktop b/dreal.desktop index 6fc223c..e543a85 100644 --- a/dreal.desktop +++ b/dreal.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Encoding=UTF-8 Name=Alliance: Dreal -Exec=dreal +Exec=ALLIANCE_TOP/bin/dreal Icon=dreal.png Type=Application Terminal=false diff --git a/graal.desktop b/graal.desktop index 5f4b562..11431fa 100644 --- a/graal.desktop +++ b/graal.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Encoding=UTF-8 Name=Alliance: Graal -Exec=graal +Exec=ALLIANCE_TOP/bin/graal Icon=graal.png Type=Application Terminal=false diff --git a/xfsm.desktop b/xfsm.desktop index 45bd88f..4c7a9b8 100644 --- a/xfsm.desktop +++ b/xfsm.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Encoding=UTF-8 Name=Alliance: Xfsm -Exec=xfsm +Exec=ALLIANCE_TOP/bin/xfsm Icon=xfsm.png Type=Application Terminal=false diff --git a/xpat.desktop b/xpat.desktop index f60f580..1427297 100644 --- a/xpat.desktop +++ b/xpat.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Encoding=UTF-8 Name=Alliance: Xpat -Exec=xpat +Exec=ALLIANCE_TOP/bin/xpat Icon=xpat.png Type=Application Terminal=false diff --git a/xsch.desktop b/xsch.desktop index f722f45..39740c2 100644 --- a/xsch.desktop +++ b/xsch.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Encoding=UTF-8 Name=Alliance: Xsch -Exec=xsch +Exec=ALLIANCE_TOP/bin/xsch Icon=xsch.png Type=Application Terminal=false diff --git a/xvpn.desktop b/xvpn.desktop index e0a651e..11e0b65 100644 --- a/xvpn.desktop +++ b/xvpn.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Encoding=UTF-8 Name=Alliance: Xvpn -Exec=xvpn +Exec=ALLIANCE_TOP/bin/xvpn Icon=xvpn.png Type=Application Terminal=false From 36e6272a968a12032af9f2c21bd21bbc0d407024 Mon Sep 17 00:00:00 2001 From: Chitlesh GOORAH Date: Mon, 26 May 2008 20:58:56 +0000 Subject: [PATCH 5/8] bugfix --- .cvsignore | 1 + alliance-env.patch | 159 +++------ alliance-gcc43.patch | 47 +++ alliance-tutorials.patch | 690 --------------------------------------- alliance.spec | 100 ++++-- dreal.desktop | 6 +- graal.desktop | 6 +- sources | 1 + xfsm.desktop | 6 +- xpat.desktop | 6 +- xsch.desktop | 6 +- xvpn.desktop | 6 +- 12 files changed, 184 insertions(+), 850 deletions(-) create mode 100644 alliance-gcc43.patch delete mode 100644 alliance-tutorials.patch diff --git a/.cvsignore b/.cvsignore index e2837be..013d539 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ alliance-5.0-20070718.tar.gz +alliance-5.0-tutorials.tar.bz2 diff --git a/alliance-env.patch b/alliance-env.patch index 601ed54..5573c9e 100644 --- a/alliance-env.patch +++ b/alliance-env.patch @@ -1,131 +1,64 @@ -diff -Naur distrib/etc/alc_env.csh.in etc/alc_env.csh.in ---- distrib/etc/alc_env.csh.in 2006-10-05 12:09:24.000000000 +0200 -+++ etc/alc_env.csh.in 2007-08-18 13:48:55.000000000 +0200 -@@ -1,4 +1,4 @@ --# -*- Mode: Shell-script -*- -+# -*- Mode: Shell-script -*- - # -*- vim: set filetype=csh: -*- - # ,,, - # (o o) -@@ -28,17 +28,17 @@ - setenv MBK_OUT_LO vst - setenv MBK_IN_PH ap - setenv MBK_OUT_PH ap -- -+ - setenv MBK_WORK_LIB . - setenv MBK_CATAL_NAME CATAL -- -+ - setenv MBK_SCALE_X 100 -- -+ - setenv VH_MAXERR 10 - setenv VH_BEHSFX vbe - setenv VH_PATSFX pat - setenv VH_DLYSFX dly -- -+ - setenv MBK_CATA_LIB ".:${ALLIANCE_TOP}/cells/sxlib" - setenv MBK_CATA_LIB "${MBK_CATA_LIB}:${ALLIANCE_TOP}/cells/dp_sxlib" - setenv MBK_CATA_LIB "${MBK_CATA_LIB}:${ALLIANCE_TOP}/cells/rflib" -@@ -48,42 +48,29 @@ - setenv MBK_CATA_LIB "${MBK_CATA_LIB}:${ALLIANCE_TOP}/cells/pxlib" - setenv MBK_CATA_LIB "${MBK_CATA_LIB}:${ALLIANCE_TOP}/cells/padlib" - setenv MBK_TARGET_LIB "${ALLIANCE_TOP}/cells/sxlib" -- setenv MBK_C4_LIB ./cellsC4 -- -+ setenv MBK_C4_LIB ./cellsC4 -+ - setenv MBK_VDD vdd - setenv MBK_VSS vss -- -+ - setenv XPAT_PARAM_NAME "${ALLIANCE_TOP}/etc/xpat.par" - setenv XFSM_PARAM_NAME "${ALLIANCE_TOP}/etc/xfsm.par" - setenv XSCH_PARAM_NAME "${ALLIANCE_TOP}/etc/xsch.par" -- -+ - setenv RDS_IN cif - setenv RDS_OUT cif -- -+ - setenv DREAL_TECHNO_NAME "${ALLIANCE_TOP}/etc/cmos.dreal" - setenv GRAAL_TECHNO_NAME "${ALLIANCE_TOP}/etc/cmos.graal" - setenv GENVIEW_TECHNO_NAME "${ALLIANCE_TOP}/etc/cmos.genview" -- -+ - setenv RDS_TECHNO_NAME "${ALLIANCE_TOP}/etc/cmos.rds" - setenv ELP_TECHNO_NAME "${ALLIANCE_TOP}/etc/prol.elp" - - +--- distrib/etc/alc_env.csh.in 2006-10-05 12:09:25.000000000 +0200 ++++ etc/alc_env.csh.in 2008-05-26 22:37:15.000000000 +0200 +@@ -70,20 +70,23 @@ + # System environment variables. -- if ( $?PATH ) then + if ( $?PATH ) then - setenv PATH "${ALLIANCE_TOP}/bin:$PATH" -- else -- setenv PATH "${ALLIANCE_TOP}/bin" -- endif -- --# Only needed on Solaris (included in /etc/ld.so.conf under Linux). -- if ( $?LD_LIBRARY_PATH ) then ++ setenv PATH "$PATH:${ALLIANCE_TOP}/bin:" + else + setenv PATH "${ALLIANCE_TOP}/bin" + endif + + # Only needed on Solaris (included in /etc/ld.so.conf under Linux). + if ( $?LD_LIBRARY_PATH ) then - setenv LD_LIBRARY_PATH "${ALLIANCE_TOP}/lib:$LD_LIBRARY_PATH" -- else -- setenv LD_LIBRARY_PATH "${ALLIANCE_TOP}/lib" -- endif -- ++ setenv LD_LIBRARY_PATH "$LD_LIBRARY_PATH:${ALLIANCE_TOP}/lib:" + else + setenv LD_LIBRARY_PATH "${ALLIANCE_TOP}/lib" + endif + - if ( $?MANPATH ) then - setenv MANPATH "${ALLIANCE_TOP}/man:${MANPATH}" -- else -- setenv MANPATH "${ALLIANCE_TOP}/man" -- endif -+ setenv PATH "$PATH:${ALLIANCE_TOP}/bin" ++ if ($?MANPATH) then + setenv MANPATH "${MANPATH}:${ALLIANCE_TOP}/man" + else +- setenv MANPATH "${ALLIANCE_TOP}/man" ++ setenv MANPATH "${ALLIANCE_TOP}/man" + endif + +# fixing *** ERROR *** : Variable MBK_SPI_MODEL not found. + setenv MBK_SPI_MODEL "${ALLIANCE_TOP}/etc/spimodel.cfg" -diff -Naur distrib/etc/alc_env.sh.in etc/alc_env.sh.in ---- distrib/etc/alc_env.sh.in 2006-10-05 12:09:24.000000000 +0200 -+++ etc/alc_env.sh.in 2007-08-18 13:47:04.000000000 +0200 -@@ -1,4 +1,4 @@ --# -*- Mode: Shell-script -*- -+# -*- Mode: Shell-script -*- - # -*- vim: set filetype=sh: -*- - # ,,, - # (o o) -@@ -24,7 +24,7 @@ - - # Alliance environment variables. - MBK_IN_LO=vst; export MBK_IN_LO -- MBK_OUT_LO=vst; export MBK_OUT_LO -+ MBK_OUT_LO=vst; export MBK_OUT_LO - MBK_IN_PH=ap; export MBK_IN_PH - MBK_OUT_PH=ap; export MBK_OUT_PH - -@@ -70,20 +70,8 @@ - - +--- distrib/etc/alc_env.sh.in 2006-10-05 12:09:25.000000000 +0200 ++++ etc/alc_env.sh.in 2008-05-26 22:41:30.000000000 +0200 +@@ -70,20 +70,23 @@ + + # System environment variables. - PATH=$ALLIANCE_TOP/bin:$PATH -- export PATH -+ export PATH=$PATH:$ALLIANCE_TOP/bin -+ export MANPATH=$MANPATH:$ALLIANCE_TOP/man - --# Only needed on Solaris (included in /etc/ld.so.conf under Linux). -- if [ -z "${LD_LIBRARY_PATH}" ]; then -- LD_LIBRARY_PATH=$ALLIANCE_TOP/lib -- else ++ PATH=$PATH:$ALLIANCE_TOP/bin: + export PATH + + # Only needed on Solaris (included in /etc/ld.so.conf under Linux). + if [ -z "${LD_LIBRARY_PATH}" ]; then + LD_LIBRARY_PATH=$ALLIANCE_TOP/lib + else - LD_LIBRARY_PATH=$ALLIANCE_TOP/lib:$LD_LIBRARY_PATH -- fi -- export LD_LIBRARY_PATH -- -- if [ -z "${MANPATH}" ]; then -- MANPATH=$ALLIANCE_TOP/man -- else ++ LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ALLIANCE_TOP/lib: + fi + export LD_LIBRARY_PATH + + if [ -z "${MANPATH}" ]; then + MANPATH=$ALLIANCE_TOP/man + else - MANPATH=$ALLIANCE_TOP/man:$MANPATH -- fi -- export MANPATH ++ MANPATH=$MANPATH:$ALLIANCE_TOP/man: + fi + export MANPATH ++ +# fixing *** ERROR *** : Variable MBK_SPI_MODEL not found. + MBK_SPI_MODEL=$ALLIANCE_TOP/etc/spimodel.cfg; export MBK_SPI_MODEL + diff -Naur distrib/etc/Makefile.am etc/Makefile.am --- distrib/etc/Makefile.am 2002-06-25 16:09:38.000000000 +0200 +++ etc/Makefile.am 2007-08-18 13:58:38.000000000 +0200 diff --git a/alliance-gcc43.patch b/alliance-gcc43.patch new file mode 100644 index 0000000..6c63b72 --- /dev/null +++ b/alliance-gcc43.patch @@ -0,0 +1,47 @@ +diff -Nur alliance-5.0.old/nero/src/ADefs.h alliance-5.0/nero/src/ADefs.h +--- alliance-5.0.old/nero/src/ADefs.h 2002-10-29 19:46:03.000000000 +0100 ++++ alliance-5.0/nero/src/ADefs.h 2008-03-19 03:16:12.000000000 +0100 +@@ -138,7 +138,7 @@ + + // Allocators. + private: static void *operator new (size_t size); +- private: static void operator delete (void *zone); ++ public: static void operator delete (void *zone); + public: static void *operator new (size_t size, CNodeASSet &NS); + + // Modifiers. +diff -Nur alliance-5.0.old/nero/src/MDefs.h alliance-5.0/nero/src/MDefs.h +--- alliance-5.0.old/nero/src/MDefs.h 2005-10-10 17:34:05.000000000 +0200 ++++ alliance-5.0/nero/src/MDefs.h 2008-03-19 01:08:24.000000000 +0100 +@@ -25,6 +25,8 @@ + + + # include "UDefs.h" ++# include ++# include + + + +diff -Nur alliance-5.0.old/ocp/src/placer/PPlacement.h alliance-5.0/ocp/src/placer/PPlacement.h +--- alliance-5.0.old/ocp/src/placer/PPlacement.h 2006-03-30 21:07:47.000000000 +0200 ++++ alliance-5.0/ocp/src/placer/PPlacement.h 2008-03-19 01:10:41.000000000 +0100 +@@ -43,6 +43,7 @@ + #include + #include + #include ++#include + using namespace std; + + #include "mut.h" +diff -Nur alliance-5.0.old/sea/src/DEF_grammar_lex.l alliance-5.0/sea/src/DEF_grammar_lex.l +--- alliance-5.0.old/sea/src/DEF_grammar_lex.l 2002-04-25 18:16:20.000000000 +0200 ++++ alliance-5.0/sea/src/DEF_grammar_lex.l 2008-03-19 01:11:28.000000000 +0100 +@@ -18,7 +18,7 @@ + # define yylineno DEF_grammarlineno + + +- int yylineno = 1; ++ // int yylineno = 1; + + + static int yywrap(void); diff --git a/alliance-tutorials.patch b/alliance-tutorials.patch deleted file mode 100644 index 4675c27..0000000 --- a/alliance-tutorials.patch +++ /dev/null @@ -1,690 +0,0 @@ -diff -Naur documentation/tutorials/place_and_route/tex/place_and_route.tex tutorials/place_and_route/tex/place_and_route.tex ---- documentation/tutorials/place_and_route/tex/place_and_route.tex 2004-10-16 14:51:56.000000000 +0200 -+++ tutorials/place_and_route/tex/place_and_route.tex 2007-08-02 18:37:05.000000000 +0200 -@@ -2,6 +2,7 @@ - % $Id: place_and_route.tex,v 1.5 2004/10/16 12:51:56 fred Exp $ - % $Log: place_and_route.tex,v $ - % Revision 1.5 2004/10/16 12:51:56 fred -+% Modified by Chitlesh GOORAH for Alliance release 5.0 (18/07/2007) - % Erasing the psfig include from the file, changed the font to 10 pt - % instead of 12 (sparing trees and not being payed by the thickness of - % my production) and changing font to charter since I got tired of -@@ -11,14 +12,14 @@ - \documentclass{article} - \usepackage[dvips]{graphics} - \usepackage[english]{babel} --\usepackage{doublespace} -+\usepackage{setspace} - \usepackage{epsf} - \usepackage{fancybox} - \usepackage{fancyheadings} - \usepackage{float} - \usepackage{graphicx} - \usepackage{here} --\usepackage{isolatin1} -+\usepackage[latin1]{inputenc} - \usepackage{charter} - \usepackage{picinpar} - \usepackage{rotate} -@@ -92,7 +93,8 @@ - \date{} - \author{ - Frederic AK\hspace{2cm} Kai-shing LAM\\ --Modified by LJ -+Modified by LJ\\ -+Modified by Chitlesh GOORAH (18/07/2007) - } - - \maketitle -@@ -121,7 +123,7 @@ - - {2.2} inverter Diagram - --{2.3} Buffer diagram -+{2.3} Buffer diagram - - {2.4} sxlib gauge - -@@ -149,8 +151,8 @@ - - {3.8} pads placement - \\ --{4} {\bf Annexes} -- -+{4} {\bf Annexes} -+ - \newpage - {\huge - PART 3 : } -@@ -158,9 +160,9 @@ - {\huge - Place and route - } -- -+ - All the files used in this part are located under \\ --\texttt{/tutorial/place\_and\_route/src} directory.\\ -+\texttt{/usr/share/doc/alliance-doc-5.0/tutorial/place\_and\_route/src} directory.\\ - This directory contents three subdirectories and one Makefile : - - \begin{itemize}\itemsep=-.8ex -@@ -169,7 +171,7 @@ - \item inv - \begin{itemize}\itemsep=-.8ex - \item Makefile -- \item inv.vbe : behavioral description -+ \item inv.vbe : behavioral description - \item inv\_x1.ap : inverter cell design using GRAAL - \end{itemize} - \item buffer -@@ -178,7 +180,7 @@ - \item buffer.vbe : behavioral description - \item buf\_x2.ap : buffer cell design using GRAAL - \end{itemize} --\item amd2901 -+\item amd2901 - \begin{itemize}\itemsep=-.8ex - \item Makefile - \item amd2901\_ctl.vbe : behavioral description of control -@@ -212,9 +214,9 @@ - The predefined cells concepts, model and - hierarchy will be introduced .\\ - Then this tutorial contain the methodology used in Alliance to produce --the amd2901 physical layout that you conceived in Alliance Tutorial -+the amd2901 physical layout that you conceived in Alliance Tutorial - PART 2 "Synthesis" (All the documents used will be provided to you). -- -+ - \newpage - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -@@ -225,7 +227,7 @@ - %------------------------ - The library can be enriched by new cells with {\bf GRAAL} editor .\\ - { \bf GRAAL } is an editor of \/{\underline{symbolic }} {\it --layout} integrating the drawing rules checker {\bf DRUC} and also -+layout} integrating the drawing rules checker {\bf DRUC} and also - a net extractor. - The first part here aims to draw an inverter cell inv\_x1 in the shape - of a predefined cell of sxlib complyiant with provided -@@ -236,7 +238,7 @@ - Some tools of Alliance use a particular technological - environment. It is indicated by the environment variable {\bf - RDS\_TECHNO\_NAME} which must be set to --{\bf/alliance/etc/cmos.rds} -+{\bf/etc/alliance/cmos.rds} - - \subsubsection{GRAAL} - %-------------------- -@@ -244,7 +246,7 @@ - with the menu { \bf CREATE }: - \begin{itemize}\itemsep=-.4ex - \item The ''instance'' (physical cells importation) --\item The abutment boxes which define the cell limits -+\item The abutment boxes which define the cell limits - \item Segments: DiffN, DiffP, Poly, Alu1, Alu2... CAluX is used to specify - a possible rectangle area for the connectors. - \item VIAs or contacts: ContDiffN, ContDiffP, ContPoly and -@@ -254,10 +256,10 @@ - \end{itemize} - - {\bf GRAAL} uses the environment variable {\bf --GRAAL\_TECHNO\_NAME}. It must be set to {\bf/alliance/etc/cmos.graal}. -+GRAAL\_TECHNO\_NAME}. It must be set to {\bf/etc/alliance/cmos.graal}. - - Steps to follow to create a sxlib cell by respecting the sxlib gauge : --( cf 2.4 Sxlib gauge ) -+( cf 2.4 Sxlib gauge ) - \begin{itemize}\itemsep=-.4ex - \item place the supply Vdd and Vss using the menu CREATE->Segment - \item place the VIAs using the menu CREATE->VIA -@@ -267,7 +269,7 @@ - \item link the transistor P and the transistor N with the Poly segment using the menu CREATE->Segment - \item supply each transistor by linking them with Ndiff and Pdiff segments and VIAs contacts - \item define the cell limit with an abutment box using the menu CREATE->Abutment Box --\end{itemize} -+\end{itemize} - - \subsubsection{COUGAR} - %-------------------- -@@ -276,7 +278,7 @@ - with the format { \bf ap }. - To extract a netlist at transistor level, use the following command : - \begin{commandline} -- > cougar -t file1 file2 -+ > cougar -t file1 file2 - \end{commandline} - - { \bf COUGAR } uses the environment variables { \bf MBK\_IN\_PH } -@@ -286,14 +288,14 @@ - the following environment variables: \\ - - \begin{commandline} -- > MBK_IN_PH = ap -- > export MBK_IN_PH -- > MBK_OUT_LO = spi -+ > MBK_IN_PH = ap -+ > export MBK_IN_PH -+ > MBK_OUT_LO = spi - > export MBK_OUT_LO - \end{commandline} - - \begin{commandline} -- > cougar -t circuit circuit -+ > cougar -t circuit circuit - \end{commandline} - - The resulting spice netlist can be then simulated using a SPICE simulator and a given -@@ -301,7 +303,7 @@ - - The schematic of the transistor neltlist can also be displayed using {\bf XSCH} : - \begin{commandline} -- > xsch -I spi -l circuit -+ > xsch -I spi -l circuit - \end{commandline} - - \subsection{inverter Diagram} -@@ -341,12 +343,12 @@ - - \begin{itemize}\itemsep=-.4ex - \item The sxlib cells have whole 50 lambdas height and a multiple of 5 lambdas width. --\item The supply Vdd and Vss are carried out in Calu1; they have 6 lambdas width and are -+\item The supply Vdd and Vss are carried out in Calu1; they have 6 lambdas width and are - horizontally placed in top and bottom of the cell. - \item The transistors P are placed close to the Vdd while transistors N are placed close - to the Vss. - \item Box N must have 24 lambdas height . --\item The special segments CAluX (CAlu1, Calu2, CAlu3...) form the cell interface (PORT\_MAP) -+\item The special segments CAluX (CAlu1, Calu2, CAlu3...) form the cell interface (PORT\_MAP) - and play the role of ''flat'' connectors. They must be placed on a 5x5 grid and can be anywhere in the cell. - \item The special segments TAlux (TAlu1, TAlu2...) are used to indicate the obstacles for the - router. When you want to protect AluX segment, it is necessary to cover them -@@ -356,7 +358,7 @@ - \item The boxes N and P must be polarized. { \bf It should be respectively connected to Vdd and Vss }. - \end{itemize} - --You will find a summary of these constraints on the diagram -+You will find a summary of these constraints on the diagram - \ref{Fig:gabarit}: - - \begin{figure}[H]\centering -@@ -443,7 +445,7 @@ - \begin{itemize}\itemsep=-.4ex - \item The data-path contains the regular parts of Amd2901, the registers - and the arithmetic logic unit. --\item The control part contains irregular logic, -+\item The control part contains irregular logic, - the instructions decoding and the `` flags '' computation. - \end{itemize} - -@@ -463,7 +465,7 @@ - The data-path and the control part will be placed and routed together and not separately. \\ - You will use also {\bf lvx}, the netlists comparator. When the - system is too complex it is difficult to use {\bf proof}, the --formal comparator (calculations too long). A netlists comparison -+formal comparator (calculations too long). A netlists comparison - then is used. Test the two methods ({\bf proof} and {\bf - lvx}). - -@@ -499,7 +501,7 @@ - %--------------------------------- - - Generally, the file describing a netlist must have the same --name as the one describing its physical layout -+name as the one describing its physical layout - (but of course the file extention is not the same). - The file amd2901\_dpt.vst (LOFIG) must correspond to the file - amd2901\_dpt.ap (PHFIG). The same applies to the file -@@ -517,7 +519,7 @@ - \noindent GENLIB\_SAVE\_LOFIG()\\ - - This permits to generate a structural description in a { \bf --VST } file. At the same time, { \bf genlib } will generate -+VST } file. At the same time, { \bf genlib } will generate - physical descriptions of each column in { \bf AP } files. - It is up to you to place these columns explicitly. \\ - Edit again the file amd2901\_dpt.c and include the lines :\\ -@@ -526,7 +528,7 @@ - \noindent /* add here you placement directives !! */ \\ - \noindent GENLIB\_SAVE\_PHFIG()\\ - --For this placement task, you have the following {\bf GENLIB} functions : -+For this placement task, you have the following {\bf GENLIB} functions : - - \begin{itemize}\itemsep=-.4ex - \item GENLIB\_PLACE() -@@ -540,12 +542,12 @@ - \end{itemize} - - Use {\bf GENLIB} manual. The placement of the data-path columns --should not be done randomly. The routing feasibility and the quality -+should not be done randomly. The routing feasibility and the quality - of the resulting layout depends on it !\\ - - Use genlib to generate all: - \begin{commandline} -- >genlib amd2901_dpt -+ >genlib amd2901_dpt - \end{commandline} - - The figure \ref{Fig:preplacement} summarizes the followed process: -@@ -568,12 +570,12 @@ - %--------------------------------- - - In the same manner, edit agin the file amd2901\_core.c and insert -- data-path explicitly. You should not place the part controls. -+ data-path explicitly. You should not place the part controls. - This one exists only in the form of a structural description. --It is the placer { \bf ocp } that will undertake some -+It is the placer { \bf ocp } that will undertake some - (during the placement of the heart { \bf ocp } detects which are the --cells not placed and supplements the placement). --Nevertheless you should reserve enough space for the cells placement -+cells not placed and supplements the placement). -+Nevertheless you should reserve enough space for the cells placement - { \bf to the top } of the data-path. - - Include the lines:\\ -@@ -583,28 +585,28 @@ - - Space necessary to the placer to place the cells of the control part - will be determined by successive approximations. You will have to --adjust dimensions of the heart abutment box -+adjust dimensions of the heart abutment box - (GENLIB\_DEF\_AB()). - Use the command: - - \begin{commandline} -- > genlib amd2901_core -+ > genlib amd2901_core - \end{commandline} - - and - \begin{commandline} -- > ocp -partial amd2901_core -ioc amd2901_core amd2901_core amd2901_core_p -+ > ocp -partial amd2901_core -ioc amd2901_core amd2901_core amd2901_core_p - \end{commandline} - - The option {\bf -- partial} indicates that you give a partial --placement of the data-path. -+placement of the data-path. - The option { \bf -- ioc } permits to specify a placement for external --connectors described in a .ioc file. --This file, amd2901\_core.ioc is provided to you (Modify it according -+connectors described in a .ioc file. -+This file, amd2901\_core.ioc is provided to you (Modify it according - to your predefined placement. - The connectors must be in the north and in the south of your circuit). - --The third argument is the netlist heart filename, the fourth is the -+The third argument is the netlist heart filename, the fourth is the - name of the { \bf .ap } resulting file. - - The figure \ref{Fig:placement} summarize the followed process: -@@ -620,7 +622,7 @@ - Routing the heart by using { \bf NERO } in the following way: - - \begin{commandline} -- > nero -v -3 -p amd2901_core_p amd2901_core amd2901_core -+ > nero -v -3 -p amd2901_core_p amd2901_core amd2901_core - \end{commandline} - - %The option { \bf -- place } indicates that you transmit a placement, that of the heart. -@@ -639,10 +641,10 @@ - \subsection{pads placement} - %--------------------------------- - --The core of the AMD2001 is completed. -+The core of the AMD2001 is completed. - We focus now on the chip with pads description, placement and routing. - Those pads allow the connection of the inputs/outputs of the core with --the external nets of the chip. -+the external nets of the chip. - - The tool {\bf ring} instanciates pads that has been specified - in a {\bf vst} netlist, place them using a file { \bf .rin } -@@ -662,7 +664,7 @@ - Name it `` amd2902\_chip.rin '' and apply the command \\ - - \begin{commandline} -- > ring amd2901_chip amd2901_chip -+ > ring amd2901_chip amd2901_chip - \end{commandline} - - We will validate the work of {\bf ring} with the tools { \bf druc -@@ -682,7 +684,7 @@ - > cougar -f amd2901_chip - \end{commandline} - --Compare two netlists : -+Compare two netlists : - \begin{commandline} - > lvx vst al amd2901_chip amd2901_chip -f - \end{commandline} -@@ -698,7 +700,7 @@ - the circuit on the level transistor: \\ - - \begin{commandline} --> cougar -t amd2901_chip amd2901_chip -+> cougar -t amd2901_chip amd2901_chip - \end{commandline} - \\ - -@@ -706,7 +708,7 @@ - \begin{commandline} - > make view_ctl_logic - \end{commandline} -- -+ - If you want to see the data-path physical layout: - \begin{commandline} - > make view_dpt_physic -@@ -723,7 +725,7 @@ - \begin{commandline} - > make view_chip_simulation - \end{commandline} -- -+ - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - - %\newpage - -diff -Naur documentation/tutorials/simulation/tex/simulation.tex tutorials/simulation/tex/simulation.tex ---- documentation/tutorials/simulation/tex/simulation.tex 2004-10-16 14:52:05.000000000 +0200 -+++ tutorials/simulation/tex/simulation.tex 2007-07-18 15:47:13.000000000 +0200 -@@ -2,6 +2,7 @@ - % $Id: simulation.tex,v 1.5 2004/10/16 12:52:05 fred Exp $ - % $Log: simulation.tex,v $ - % Revision 1.5 2004/10/16 12:52:05 fred -+% Modified by Chitlesh GOORAH for Alliance release 5.0 (18/07/2007) - % Erasing the psfig include from the file, changed the font to 10 pt - % instead of 12 (sparing trees and not being payed by the thickness of - % my production) and changing font to charter since I got tired of -@@ -13,13 +14,13 @@ - \documentclass{article} - \usepackage[dvips]{graphics} - \usepackage[english]{babel} --\usepackage{doublespace} -+\usepackage{setspace} - \usepackage{fancybox} - \usepackage{fancyheadings} - \usepackage{float} - \usepackage{graphicx} - \usepackage{here} --\usepackage{isolatin1} -+\usepackage[latin1]{inputenc} - \usepackage{charter} - \usepackage{picinpar} - \usepackage{rotate} -@@ -96,7 +97,8 @@ - \date{} - - \author{Frederic AK \hspace{2cm} Kai-shing LAM\\ --Modified by LJ -+Modified by LJ\\ -+Modified by Chitlesh GOORAH (18/07/2007) - } - - \maketitle -@@ -171,7 +173,7 @@ - } - - All the files used in this part are located in the \\ --\texttt{/tutorial/simulation/src} directory.\\ -+\texttt{/usr/share/doc/alliance-doc-5.0/tutorial/simulation/src} directory.\\ - This directory contains two subdirectories and one Makefile : - \begin{itemize} - \item The Makefile allows you to validate automatically the entire simulation part -@@ -626,13 +628,13 @@ - \bf SXLIB }. For the functionality of the various cells and their - interface, the sxlib man is available. The behavioral - description of each cell is present in \\ --{\bf /alliance/cells/sxlib }. -+{\bf \$ALLIANCE\_TOP/cells/sxlib }. - - You must set the environment variable { \bf MBK\_CATA\_LIB } - to be able to reach these cells. - - \begin{commandline} -- > MBK_CATA_LIB=/alliance/cells/sxlib -+ > MBK_CATA_LIB=$ALLIANCE_TOP/cells/sxlib - > export MBK_CATA_LIB - \end{commandline} - -diff -Naur documentation/tutorials/start/start.tex tutorials/start/start.tex ---- documentation/tutorials/start/start.tex 2004-10-16 14:52:13.000000000 +0200 -+++ tutorials/start/start.tex 2007-07-18 13:28:50.000000000 +0200 -@@ -4,12 +4,13 @@ - % Original Version 1.0 in text form by Francois Pecheux - % Version for Alliance releases 2.0 and up by Frederic Petrot - % Modified by czo for Alliance release 4.0 (01/2000) --% TODO : no fully working, needs some adjustements -+% Modified by Chitlesh GOORAH for Alliance release 5.0 (18/07/2007) -+% TODO : no fully working, needs some adjustments - % $Id: start.tex,v 1.5 2004/10/16 12:52:13 fred Exp $ - % - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \documentclass{article} --\usepackage{charter,doublespace,here,fancybox} -+\usepackage{charter,setspace,here,fancybox} - \textwidth 15cm - \textheight 23cm - \oddsidemargin +0.75cm -@@ -20,7 +21,7 @@ - % Since it is tt, any char is fine - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \newlength{\verbatimbox} --\settowidth{\verbatimbox}{\scriptsize\tt -+\settowidth{\verbatimbox}{\scriptsize\tt - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - } - \newenvironment{framedverbatim} -@@ -33,8 +34,8 @@ - \begin{Sbox}\begin{minipage}{.979\textwidth}\begin{Verbatim}}% - {\end{Verbatim}\end{minipage}\end{Sbox}\setlength{\shadowsize}{2pt}% - \shadowbox{\TheSbox}\normalsize\par\noindent} -- -- -+ -+ - - %%%%%%%%%%%%%%%%%%%%%%%% - % -@@ -56,9 +57,9 @@ - \begin{quote} - \em - These tutorials introduce the design flow to be used in the --\textbf{Alliance} CAD framework for the design and verification of a -+\textbf{Alliance} CAD framework for the design and verification of a - standard cells circuit, including the pads. --Each step of the desgin flow is supported by one or more specific -+Each step of the desgin flow is supported by one or more specific - tools, whose use is briefly explained in the tutorials. - - These texts are meant to be simple and comprehensive, and are to be used -@@ -77,7 +78,7 @@ - proceeding, as it describes the main steps of the design conceptually. - - \section{Before starting} --In those tutorials you will learn the practical use of the following -+In those tutorials you will learn the practical use of the following - \textbf{Alliance} tools : - - In the first tutorial (simulation/ directory) : -@@ -103,30 +104,32 @@ - In the third tutorial (synthesis/ directory) : - \begin{itemize} - \item \textbf{syf} : Finite state machine synthesizer. --\item \textbf{boom} : Boolean optimization of a logic level behavioral -+\item \textbf{boom} : Boolean optimization of a logic level behavioral - description (VHDL data flow). --\item \textbf{boog} : Mapping of a behavioral descriptiononto a standard cell -+\item \textbf{boog} : Mapping of a behavioral descriptiononto a standard cell - library. --\item \textbf{loon} : Fanout optimizer, global optimizer and timing analyser of -+\item \textbf{loon} : Fanout optimizer, global optimizer and timing analyser of - \item \textbf{scapin} : Scan Path insertion - \item \textbf{xsch} : Graphical schematic viewer. - \end{itemize} - --If you run a \texttt{c-like} shell, like \texttt{csh} or \texttt{tcsh}, -+If you run a \texttt{c-like} shell, like \texttt{csh} or \texttt{tcsh}, - try to run the following command : - - \begin{phraseverbatim} --~alp/addaccu %-) source /alliance/etc/alc_env.csh -+~alp/addaccu %-) source /etc/profile.d/alc_env.csh - \end{phraseverbatim} - --Otherwise, if you run a \texttt{sh-like} shell, try to run the following -+Otherwise, if you run a \texttt{sh-like} shell, try to run the following - command : - \begin{phraseverbatim} --~alp/addaccu %-) source /alliance/alc_env.sh -+~alp/addaccu %-) source /etc/profile.d/alc_env.sh - \end{phraseverbatim} - \\ -+When a user logs in, these environment variables are automatically set from various places. -+\\ - Before we proceed to the tutorial, you must make sure that the --\textbf{Alliance} tools are readilly available when invoking them at the -+\textbf{Alliance} tools are readilly available when invoking them at the - prompt. - The prompt in represented in the following text by the symbol~: - \begin{phraseverbatim} -@@ -136,7 +139,7 @@ - directory, and \texttt{\%-)} is supposed to give us courage! - - \section{Execution environment set up} --Later, before you will start examining alliance tools, you will probably want -+Later, before you will start examining alliance tools, you will probably want - to know the environment variables setup. - To see it, please enter the following command : - -@@ -147,18 +150,21 @@ - \begin{figure}[H]\center\leavevmode - \begin{framedverbatim} - ~alp/addaccu %-) env | grep MBK --MBK_OUT_PH=ap --MBK_CATAL_NAME=CATAL -+MBK_IN_PH=ap - MBK_SCALE_X=100 -+MBK_CATAL_NAME=CATAL -+MBK_OUT_PH=ap -+MBK_OUT_LO=vst - MBK_VSS=vss --MBK_CATA_LIB=.:/alliance/cells/sxlib:/alliance/cells/padlib --MBK_WORK_LIB=. --MBK_VDD=vdd - MBK_C4_LIB=./cellsC4 -+MBK_VDD=vdd -+MBK_TARGET_LIB=\$ALLIANCE\_TOP/cells/sxlib - MBK_IN_LO=vst --MBK_IN_PH=ap --MBK_TARGET_LIB=/alliance/cells/sxlib --MBK_OUT_LO=vst -+MBK_WORK_LIB=. -+MBK_CATA_LIB=.:/usr/lib/alliance/cells/sxlib:/usr/lib/alliance/cells/dp_sxlib: -+/usr/lib/alliance/cells/rflib:/usr/lib/alliance/cells/ramlib: -+/usr/lib/alliance/cells/romlib:/usr/lib/alliance/cells/pxlib: -+/usr/lib/alliance/cells/padlib - \end{framedverbatim} - \caption{\label{mbk} \texttt{MBK} environment variables.} - \end{figure} -@@ -167,12 +173,12 @@ - variables are documented in each tutorial. - - \section{File Formats} --One of the interesting features of \textbf{Alliance} is that different -+One of the interesting features of \textbf{Alliance} is that different - file formats can be used for both netlist and layout view. --However, --in the design methodology we wish to promote, some formats are -+However, -+in the design methodology we wish to promote, some formats are - recommended. --The \texttt{vst}, structural \textbf{VHDL}, is dedicated to netlist -+The \texttt{vst}, structural \textbf{VHDL}, is dedicated to netlist - specification. - The \texttt{al} format is dedicated to extracted layout representation. - The \texttt{ap} format is the usual layout format. -diff -Naur documentation/tutorials/synthesis/src/amd2901/Makefile tutorials/synthesis/src/amd2901/Makefile ---- documentation/tutorials/synthesis/src/amd2901/Makefile 2002-07-25 14:50:18.000000000 +0200 -+++ tutorials/synthesis/src/amd2901/Makefile 2007-07-18 19:34:53.000000000 +0200 -@@ -2,17 +2,17 @@ - all: EXAMPLE VAR CATAL02 res.pat - - --VAR: -+VAR: - MBK_IN_LO=vst;export MBK_IN_LO ;\ -- MBK_CATA_LIB=/asim/alliance/cells/sxlib;export MBK_CATA_LIB -+ MBK_CATA_LIB=$ALLIANCE_TOP/cells/sxlib;export MBK_CATA_LIB - - CATAL01: -- echo amd2901_ctl C >CATAL -+ echo amd2901_ctl C >CATAL - echo amd2901_dpt C >>CATAL - - CATAL02: - echo amd2901_dpt C >CATAL -- -+ - EXAMPLE: - genlib circuit - -@@ -38,7 +38,7 @@ - - res2.pat: amd2901_chip.vst pattern.pat amd2901_core.vst CATAL - asimut amd2901_chip pattern res2 -- touch amd2901_chip.vst -+ touch amd2901_chip.vst - - clean : - rm -f Makefile-* \ -diff -Naur documentation/tutorials/synthesis/tex/synthesis.tex tutorials/synthesis/tex/synthesis.tex ---- documentation/tutorials/synthesis/tex/synthesis.tex 2004-10-16 14:52:17.000000000 +0200 -+++ tutorials/synthesis/tex/synthesis.tex 2007-07-18 15:46:54.000000000 +0200 -@@ -2,6 +2,7 @@ - % $Id: synthesis.tex,v 1.4 2004/10/16 12:52:17 fred Exp $ - % $Log: synthesis.tex,v $ - % Revision 1.4 2004/10/16 12:52:17 fred -+% Modified by Chitlesh GOORAH for Alliance release 5.0 (18/07/2007) - % Erasing the psfig include from the file, changed the font to 10 pt - % instead of 12 (sparing trees and not being payed by the thickness of - % my production) and changing font to charter since I got tired of -@@ -11,13 +12,13 @@ - \documentclass{article} - \usepackage[dvips]{graphics} - \usepackage[english]{babel} --\usepackage{doublespace} -+\usepackage{setspace} - \usepackage{fancybox} - \usepackage{fancyheadings} - \usepackage{float} - \usepackage{graphicx} - \usepackage{here} --\usepackage{isolatin1} -+\usepackage[latin1]{inputenc} - \usepackage{charter} - \usepackage{picinpar} - \usepackage{rotate} -@@ -89,7 +90,8 @@ - \date{} - \author{ - Ak Frederic\hspace{2cm} Lam Kai-shing\\ --Modified by LJ -+Modified by LJ\\ -+Modified by Chitlesh GOORAH (18/07/2007) - } - - \maketitle -@@ -220,7 +222,7 @@ - } - - All the files used in this part are located under \\ --\texttt{/tutorial/synthesis/src} directory.\\ -+\texttt{/usr/share/doc/alliance-doc-5.0/tutorial/synthesis/src} directory.\\ - This directory contents four subdirectories and one Makefile : - \begin{itemize}\itemsep=-.8ex - diff --git a/alliance.spec b/alliance.spec index b4acd84..8a88285 100644 --- a/alliance.spec +++ b/alliance.spec @@ -3,7 +3,7 @@ Name: alliance Version: 5.0 -Release: 9.%{snapshot}snap%{?dist} +Release: 15.%{snapshot}snap%{?dist} Summary: Alliance VLSI CAD Sytem License: GPLv2 @@ -16,7 +16,7 @@ Patch0: alliance-env.patch Patch1: alliance-examples.patch Patch2: alliance-run.patch Patch3: alliance-perms.patch -Patch4: alliance-tutorials.patch +Patch4: alliance-gcc43.patch Source1: xsch.desktop Source2: dreal.desktop @@ -35,11 +35,16 @@ Source11: xfsm.png Source12: xpat.png Source13: xsch.png +Source14: %{name}-5.0-tutorials.tar.bz2 + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: lesstif-devel libXt-devel byacc desktop-file-utils bison BuildRequires: libXp-devel libXpm-devel libstdc++-devel flex m4 -BuildRequires: transfig ghostscript tetex-latex +BuildRequires: transfig ghostscript +Requires: %{name}-libs = %{version}-%{release} +# 442379 +Requires(post): %{name}-libs = %{version}-%{release} %description Alliance is a complete set of free CAD tools and portable libraries for @@ -72,6 +77,20 @@ Alliance provides CAD tools covering most of all the digital design flow: * Netlist extraction and verification * Design rules checking +%{name} is listed among Fedora Electronic Lab (FEL) packages. + + +%package libs +Summary: Alliance VLSI CAD Sytem - multilibs +Group: Applications/Engineering +Requires: %{name} = %{version}-%{release} +Requires: electronics-menu +Obsoletes: %{name} < 5.0-12 + + +%description libs +Architecture dependent files for the Alliance VLSI CAD Sytem. + %package doc Summary: Alliance VLSI CAD Sytem - Documentations @@ -101,17 +120,12 @@ sed -i "s|ALLIANCE_TOP|%{prefix}|" *.desktop %patch3 -p0 -b .perms -## Updating old tutorials -%patch4 -p0 -b .tutorials +### 2008 March: TexLive introduction to Rawhide +sed -i "s|tutorials||" documentation/Makefile.in +tar -xvf %{SOURCE14} -pushd documentation/tutorials - for folder in place_and_route/tex simulation/tex start synthesis/tex; do - pushd $folder - %{__make} - popd - done -popd +%patch4 -p1 -b .include # make sure the man pages are UTF-8... for nonUTF8 in distrib/doc/alc_origin.1 alcban/man1/alcbanner.1 \ @@ -165,11 +179,9 @@ popd # documentation %{__cp} -pr %{buildroot}%{prefix}/doc/ . -%{__cp} -pr %{buildroot}%{prefix}/tutorials/ . %{__cp} -pr %{buildroot}%{prefix}/examples/alliance-examples/ . %{__rm} -rf %{buildroot}%{prefix}/doc/ -%{__rm} -rf %{buildroot}%{prefix}/tutorials/ %{__rm} -rf %{buildroot}%{prefix}/examples/ # correcting minor documentation details @@ -183,32 +195,28 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %{__cp} -p %{SOURCE8} %{SOURCE9} %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} \ %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/ -# desktop files + +# desktop files with enhanced menu from electronics-menu now on Fedora +# thanks Peter Brett for desktopfile in *.desktop; do desktop-file-install --vendor fedora \ --add-category Engineering \ + --add-category Electronics \ + --remove-category Science \ --dir %{buildroot}%{_datadir}/applications/ \ $desktopfile done -## Makefiles and tex folder cleanups -pushd tutorials - for folder in place_and_route/tex simulation/tex start synthesis/tex; do - %{__rm} -rf $folder - done -popd - - # Architecture independent files %{__mv} %{buildroot}%{prefix}/cells %{buildroot}%{_datadir}/%{name}/ -%{__mv} %{buildroot}%{prefix}/etc %{buildroot}%{_datadir}/%{name}/ +%{__mv} %{buildroot}%{prefix}/etc %{buildroot}%{_datadir}/%{name}/ # protecting hardcoded links -ln -sf ../../..%{_datadir}/%{name}/cells %{buildroot}%{prefix}/cells -ln -sf ../../..%{_datadir}/%{name}/etc %{buildroot}%{prefix}/etc -ln -sf ../../..%{_datadir}/%{name}/man %{buildroot}%{prefix}/man +ln -sf ../../..%{_datadir}/%{name}/cells %{buildroot}%{prefix}/cells +ln -sf ../../..%{_datadir}/%{name}/etc %{buildroot}%{prefix}/etc +ln -sf ../../..%{_datadir}/%{name}/man %{buildroot}%{prefix}/man # manpage-not-gzipped @@ -257,13 +265,15 @@ touch --no-create %{_datadir}/icons/hicolor || : %defattr(-,root,root,-) %{prefix}/ %{_datadir}/%{name}/ -%config %{_sysconfdir}/ld.so.conf.d/* %{_datadir}/icons/hicolor/48x48/apps/* + + +%files libs +%config %{_sysconfdir}/ld.so.conf.d/* %{_datadir}/applications/fedora-*.desktop %{_sysconfdir}/profile.d/alc_env.* - %files doc %doc doc/html/ %doc doc/design-flow @@ -281,6 +291,38 @@ touch --no-create %{_datadir}/icons/hicolor || : %changelog +* Mon May 26 2008 Chitlesh Goorah - 5.0-15.20070718snap +- Bugfix: error in postinstall scriptlet: /etc/profile.d/alc_env.sh not found #442379 +- Bugfix: /etc/profile.d/alc_env.csh assumes MANPATH is preset #440083 + +* Tue May 20 2008 Thibault North < tnorth [AT] fedoraproject DOT org> - 5.0-14.20070718snap +- Add to Electronics Menu + +* Fri Mar 21 2008 Chitlesh Goorah - 5.0-13.20070718snap +- Requiring new FEL menu structure +- Fixing previous desktop files +- closing unconfirmed bug #427691 +- fixing multilibs issues #340621 + +* Tue Mar 18 2008 Thibault North < tnorth [AT] fedoraproject DOT org> - 5.0-13.20070718snap +- dropped patch4: alliance-tutorials.patch +- fixed TexLive related issues for documentation +- commenting previous make in directory tutorials +- attached tutorials made in F8 Werewolf +- dropped BR :tetex-latex +- added patch4: including more useful includes to C files +- fixed bug #434020 : alliance failed massrebuild attempt for GCC4.3 + +* Mon Feb 18 2008 Fedora Release Engineering - 5.0-12.20070718snap +- Autorebuild for GCC 4.3 + +* Sun Feb 10 2008 Chitlesh Goorah - 5.0-11.20070718snap +- mass rebuild for gcc43 on rawhide +- ensuring multilibs (#340621) + +* Thu Aug 23 2007 Chitlesh Goorah - 5.0-10.20070718snap +- complying to freedesktop policies - categories + * Sat Aug 18 2007 Chitlesh Goorah - 5.0-9.20070718snap - fixing desktop files - fixing MANPATH and PATH for proper priority diff --git a/dreal.desktop b/dreal.desktop index e543a85..20f8da8 100644 --- a/dreal.desktop +++ b/dreal.desktop @@ -1,10 +1,10 @@ [Desktop Entry] Encoding=UTF-8 -Name=Alliance: Dreal +Name=Alliance: Layout Viewer Exec=ALLIANCE_TOP/bin/dreal Icon=dreal.png Type=Application Terminal=false -GenericName=Alliance -Categories=Education;Science; +GenericName=dreal +Categories=Science; Comment=View the Real layout \ No newline at end of file diff --git a/graal.desktop b/graal.desktop index 11431fa..b858527 100644 --- a/graal.desktop +++ b/graal.desktop @@ -1,10 +1,10 @@ [Desktop Entry] Encoding=UTF-8 -Name=Alliance: Graal +Name=Alliance: Layout Editor Exec=ALLIANCE_TOP/bin/graal Icon=graal.png Type=Application Terminal=false -GenericName=Alliance -Categories=Education;Science; +GenericName=graal +Categories=Science; Comment=Edits physical layouts \ No newline at end of file diff --git a/sources b/sources index 5716e50..6d91a0b 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 917f4493c09f6f5c49d5a606a5e9bbd8 alliance-5.0-20070718.tar.gz +32cac3116f85713aec2e1e18379811eb alliance-5.0-tutorials.tar.bz2 diff --git a/xfsm.desktop b/xfsm.desktop index 4c7a9b8..4e8ec39 100644 --- a/xfsm.desktop +++ b/xfsm.desktop @@ -1,10 +1,10 @@ [Desktop Entry] Encoding=UTF-8 -Name=Alliance: Xfsm +Name=Alliance: FSM Viewer Exec=ALLIANCE_TOP/bin/xfsm Icon=xfsm.png Type=Application Terminal=false -GenericName=Alliance -Categories=Education;Science; +GenericName=xfsm +Categories=Science; Comment=View Finite State Machines \ No newline at end of file diff --git a/xpat.desktop b/xpat.desktop index 1427297..4648c45 100644 --- a/xpat.desktop +++ b/xpat.desktop @@ -1,10 +1,10 @@ [Desktop Entry] Encoding=UTF-8 -Name=Alliance: Xpat +Name=Alliance: Patterns Viewer Exec=ALLIANCE_TOP/bin/xpat Icon=xpat.png Type=Application Terminal=false -GenericName=Alliance -Categories=Education;Science; +GenericName=xpat +Categories=Science; Comment=View the Patterns \ No newline at end of file diff --git a/xsch.desktop b/xsch.desktop index 39740c2..42a3472 100644 --- a/xsch.desktop +++ b/xsch.desktop @@ -1,10 +1,10 @@ [Desktop Entry] Encoding=UTF-8 -Name=Alliance: Xsch +Name=Alliance: Schematic Viewer Exec=ALLIANCE_TOP/bin/xsch Icon=xsch.png Type=Application Terminal=false -GenericName=Alliance -Categories=Education;Science; +GenericName=Xsch +Categories=Science; Comment=View the Schematic \ No newline at end of file diff --git a/xvpn.desktop b/xvpn.desktop index 11e0b65..8180588 100644 --- a/xvpn.desktop +++ b/xvpn.desktop @@ -1,10 +1,10 @@ [Desktop Entry] Encoding=UTF-8 -Name=Alliance: Xvpn +Name=Alliance: Petri Nets Viewer Exec=ALLIANCE_TOP/bin/xvpn Icon=xvpn.png Type=Application Terminal=false -GenericName=Alliance -Categories=Education;Science; +GenericName=xpvn +Categories=Science; Comment=View the Petri Nets \ No newline at end of file From 3d5575003972151fcbbc5b0e2b4b917803896a86 Mon Sep 17 00:00:00 2001 From: Chitlesh GOORAH Date: Mon, 2 Jun 2008 19:38:58 +0000 Subject: [PATCH 6/8] bugfix path --- alliance-env.patch | 4 ++-- alliance.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/alliance-env.patch b/alliance-env.patch index 5573c9e..e71751b 100644 --- a/alliance-env.patch +++ b/alliance-env.patch @@ -5,7 +5,7 @@ # System environment variables. if ( $?PATH ) then - setenv PATH "${ALLIANCE_TOP}/bin:$PATH" -+ setenv PATH "$PATH:${ALLIANCE_TOP}/bin:" ++ setenv PATH "${PATH}:${ALLIANCE_TOP}/bin:" else setenv PATH "${ALLIANCE_TOP}/bin" endif @@ -13,7 +13,7 @@ # Only needed on Solaris (included in /etc/ld.so.conf under Linux). if ( $?LD_LIBRARY_PATH ) then - setenv LD_LIBRARY_PATH "${ALLIANCE_TOP}/lib:$LD_LIBRARY_PATH" -+ setenv LD_LIBRARY_PATH "$LD_LIBRARY_PATH:${ALLIANCE_TOP}/lib:" ++ setenv LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:${ALLIANCE_TOP}/lib:" else setenv LD_LIBRARY_PATH "${ALLIANCE_TOP}/lib" endif diff --git a/alliance.spec b/alliance.spec index 8a88285..e3ec7d8 100644 --- a/alliance.spec +++ b/alliance.spec @@ -3,7 +3,7 @@ Name: alliance Version: 5.0 -Release: 15.%{snapshot}snap%{?dist} +Release: 16.%{snapshot}snap%{?dist} Summary: Alliance VLSI CAD Sytem License: GPLv2 @@ -291,6 +291,9 @@ touch --no-create %{_datadir}/icons/hicolor || : %changelog +* Fri May 30 2008 Chitlesh Goorah - 5.0-16.20070718snap +- Bugfix /etc/profile.d/alc_env.csh problem #449062 #448480 + * Mon May 26 2008 Chitlesh Goorah - 5.0-15.20070718snap - Bugfix: error in postinstall scriptlet: /etc/profile.d/alc_env.sh not found #442379 - Bugfix: /etc/profile.d/alc_env.csh assumes MANPATH is preset #440083 From ddaea6c562d2e88dffdfb7a03f048becf1b219f0 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:26:31 +0000 Subject: [PATCH 7/8] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 7633618..7e1f9df 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: alliance -# $Id$ +# $Id: Makefile,v 1.1 2007/08/13 19:36:39 kevin Exp $ NAME := alliance SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 6bc765edb603528bc425b5a780fc3ef8cfcc70ae Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:43:21 +0000 Subject: [PATCH 8/8] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 7e1f9df..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: alliance -# $Id: Makefile,v 1.1 2007/08/13 19:36:39 kevin Exp $ -NAME := alliance -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index c48525c..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-7