diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 013d539..0000000 --- a/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -alliance-5.0-20070718.tar.gz -alliance-5.0-tutorials.tar.bz2 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2f30e04 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +alliance-5.0-20090901.tar.gz diff --git a/Makefile b/Makefile deleted file mode 100644 index 7633618..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: alliance -# $Id$ -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 -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/alliance-env.patch b/alliance-env.patch deleted file mode 100644 index 2281a58..0000000 --- a/alliance-env.patch +++ /dev/null @@ -1,85 +0,0 @@ ---- 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 -- setenv PATH "${ALLIANCE_TOP}/bin:$PATH" -+ 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" -+ 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}" -+ 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" ---- 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 -+ 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 -+ LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ALLIANCE_TOP/lib - fi - export LD_LIBRARY_PATH - - if [ -z "${MANPATH}" ]; then -- MANPATH=$ALLIANCE_TOP/man -+ MANPATH=:$ALLIANCE_TOP/man - else -- MANPATH=$ALLIANCE_TOP/man:$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 -@@ -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-examples-go-all-clean.sh b/alliance-examples-go-all-clean.sh new file mode 100755 index 0000000..328e7db --- /dev/null +++ b/alliance-examples-go-all-clean.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +for B in addaccu16 adder4 amd2901 amd2901-vasy digi divcas4 \ + multi16b-reg multi4b multi8 multi8b pgcd sqrt32 sqrt8 \ + mipsR3000 hadamard +do + if [ -d $B ] + then echo "----- BENCH $B ----- " + (cd $B && make clean) + fi +done diff --git a/alliance-examples-go-all.sh b/alliance-examples-go-all.sh new file mode 100755 index 0000000..731c40c --- /dev/null +++ b/alliance-examples-go-all.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +for B in addaccu16 adder4 amd2901 amd2901-vasy digi divcas4 \ + multi16b-reg multi4b multi8 multi8b pgcd sqrt32 sqrt8 \ + mipsR3000 hadamard +do + if [ -d $B ] + then echo "----- BENCH $B ----- " + (cd $B && make clean && make) + fi +done diff --git a/alliance-examples.patch b/alliance-examples.patch deleted file mode 100644 index 582c2fc..0000000 --- a/alliance-examples.patch +++ /dev/null @@ -1,594 +0,0 @@ -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-gcc43.patch b/alliance-gcc43.patch deleted file mode 100755 index 6c63b72..0000000 --- a/alliance-gcc43.patch +++ /dev/null @@ -1,47 +0,0 @@ -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-perms.patch b/alliance-perms.patch deleted file mode 100644 index 32aa5cc..0000000 --- a/alliance-perms.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- 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 deleted file mode 100644 index 32e2009..0000000 --- a/alliance-run.patch +++ /dev/null @@ -1,21 +0,0 @@ -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-go-all-clean.sh b/alliance-tutorials-go-all-clean.sh new file mode 100755 index 0000000..1261775 --- /dev/null +++ b/alliance-tutorials-go-all-clean.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +for B in place_and_route simulation synthesis +do + if [ -d $B/src ] + then echo "--- BENCH $B ----" + (cd $B/src && make clean) + fi +done diff --git a/alliance-tutorials-go-all.sh b/alliance-tutorials-go-all.sh new file mode 100755 index 0000000..489368e --- /dev/null +++ b/alliance-tutorials-go-all.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +for B in place_and_route simulation synthesis +do + if [ -d $B/src ] + then echo "--- BENCH $B ----" + (cd $B/src && make clean && make) + fi +done diff --git a/alliance.spec b/alliance.spec index da37517..bccda9f 100644 --- a/alliance.spec +++ b/alliance.spec @@ -1,11 +1,11 @@ %define prefix %{_libdir}/%{name} -%define snapshot 20070718 +%define snapshot 20090901 %define _default_patch_fuzz 2 Name: alliance Version: 5.0 -Release: 22.%{snapshot}snap%{?dist} -Summary: Alliance VLSI CAD Sytem +Release: 31.%{snapshot}snap%{?dist} +Summary: VLSI EDA System License: GPLv2 Group: Applications/Engineering @@ -13,38 +13,31 @@ 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-gcc43.patch -Source1: xsch.desktop -Source2: dreal.desktop -Source3: xpat.desktop -Source4: xfsm.desktop -Source5: xvpn.desktop -Source6: graal.desktop - -Source7: alliance.fedora +Source1: 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 +# included asfrom snapshot 20090901 -Source14: %{name}-5.0-tutorials.tar.bz2 +Source2: alliance-tutorials-go-all.sh +Source3: alliance-tutorials-go-all-clean.sh +Source4: alliance-examples-go-all.sh +Source5: alliance-examples-go-all-clean.sh BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: lesstif-devel libXt-devel byacc desktop-file-utils bison +BuildRequires: libXt-devel byacc desktop-file-utils bison BuildRequires: libXp-devel libXpm-devel libstdc++-devel flex m4 BuildRequires: transfig ghostscript -Requires: %{name}-libs = %{version}-%{release} -# 442379 +%if 0%{?rhel} +BuildRequires: openmotif-devel +BuildRequires: pkgconfig +%else +BuildRequires: lesstif-devel +%endif + +Requires: xorg-x11-fonts-misc +# RHBZ 442379 Requires(post): %{name}-libs = %{version}-%{release} %description @@ -86,7 +79,6 @@ Summary: Alliance VLSI CAD Sytem - multilibs Group: Applications/Engineering Requires: %{name} = %{version}-%{release} Requires: electronics-menu -Obsoletes: %{name} < 5.0-12 %description libs @@ -97,7 +89,9 @@ Architecture dependent files for the Alliance VLSI CAD Sytem. Summary: Alliance VLSI CAD Sytem - Documentations Group: Applications/Engineering Requires: %{name} = %{version}-%{release} -Requires: gnuplot +Requires: gnuplot +BuildRequires:tetex-latex + %description doc @@ -106,39 +100,72 @@ Documentation and tutorials for the Alliance VLSI CAD Sytem. %prep %setup -q +%{__rm} -rf autom4te.cache -%{__cp} -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} . -sed -i "s|ALLIANCE_TOP|%{prefix}|" *.desktop +%{__cp} -p %{SOURCE1} . +sed -i "s|ALLIANCE_TOP|%{prefix}|" distrib/*.desktop - -%patch0 -p0 -b .env -# removing useless copyrighted (by Cadence) lines from the examples +# removed 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 -%patch3 -p0 -b .perms - -### 2008 March: TexLive introduction to Rawhide +# ------------------------------------------------------------------------------ +# Description : 2008 March : TexLive introduction to Rawhide sed -i "s|tutorials||" documentation/Makefile.in -tar -xvf %{SOURCE14} +sed -i "s|documentation/tutorials/Makefile||" configure* +pushd documentation/tutorials + # clean unneccessary files + %{__rm} Makefile* + %{__rm} *.pdf + # build documentation + for folder in place_and_route/tex start simulation/tex synthesis/tex; do + pushd $folder + %{__make} + popd + # remove useless directories before %%doc + %{__rm} -rf $folder + done + # Add automated scripts to tutorials + %{__install} -pm 755 %{SOURCE2} go-all.sh + %{__install} -pm 755 %{SOURCE3} go-all-clean.sh + # Fedora Electronic Lab self test for alliance + #./go-all.sh 2>&1 | tee self-test-tutorials.log + # clean temporary files + ./go-all-clean.sh +popd +# ------------------------------------------------------------------------------ - -%patch4 -p1 -b .include +# fixing flex and bison update on rawhide +sed -i '30i\#include \"string.h\"' ocp/src/placer/Ocp.cpp ocp/src/placer/PPlacement.h +sed -i '18i\#include \"bvl_bcomp_y.h\"' bvl/src/bvl_bcomp_y.y # make sure the man pages are UTF-8... -for nonUTF8 in distrib/doc/alc_origin.1 alcban/man1/alcbanner.1 \ +for nonUTF8 in FAQ README LICENCE 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 +pushd documentation/alliance-examples/ +# make sure the man pages are UTF-8... +for nonUTF8 in tuner/build_tuner mipsR3000/asm/mips_defs.h tuner/tuner.vbe \ + tuner/README mipsR3000/sce/mips_dpt.c ; 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/* - +sed -i 's/\r//' mipsR3000/asm/* +popd +find documentation/tutorials/ \ + -name *.vbe -o \ + -name *.pat -o \ + -name *.vhdl -o \ + -name *.vst -o \ + -name *.c \ + -exec chmod 0644 {} ';' + %build export ALLIANCE_TOP=%{prefix} @@ -149,7 +176,7 @@ export ALLIANCE_TOP=%{prefix} --includedir=%{prefix}/include \ --libdir=%{prefix}/lib \ --bindir=%{prefix}/bin \ - --mandir=%{_datadir}/%{name}/man #252941 + --mandir=%{_datadir}/%{name}/man # RHBZ 252941 # disabling rpath sed -i 's|^hardcode_libdir_flag_spec="\\${wl}--rpath \\${wl}\\$libdir"|hardcode_libdir_flag_spec=""|g' libtool @@ -168,7 +195,6 @@ sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool %{__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.* @@ -185,25 +211,30 @@ popd %{__rm} -rf %{buildroot}%{prefix}/doc/ %{__rm} -rf %{buildroot}%{prefix}/examples/ -# correcting minor documentation details -sed -i "s|/bin/zsh|/bin/sh|" doc/alliance-run/bench.zsh +# Add automated scripts to examples +%{__install} -pm 755 %{SOURCE4} alliance-examples/go-all.sh +%{__install} -pm 755 %{SOURCE5} alliance-examples/go-all-clean.sh + +pushd alliance-examples/ + # FEL self test for alliance + #./go-all.sh 2>&1 | tee self-test-examples.log + # clean temporary files + ./go-all-clean.sh +popd 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} \ +%{__cp} -p distrib/*.png \ %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/ # 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 \ +for desktopfile in distrib/*.desktop; do +desktop-file-install --vendor "" \ --dir %{buildroot}%{_datadir}/applications/ \ $desktopfile done @@ -215,9 +246,9 @@ done # 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 @@ -234,11 +265,18 @@ 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}/etc/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 +# correcting minor documentation details +sed -i "s|/bin/zsh|/bin/sh|" doc/alliance-run/bench.zsh + +%{_fixperms} %{buildroot}/* + + %post /sbin/ldconfig @@ -262,26 +300,28 @@ touch --no-create %{_datadir}/icons/hicolor || : %files -%doc CHANGES LICENCE COPYING* FAQ alliance.fedora %defattr(-,root,root,-) +%doc CHANGES LICENCE COPYING* FAQ alliance.fedora %{prefix}/ %{_datadir}/%{name}/ %{_datadir}/icons/hicolor/48x48/apps/* %files libs -%config %{_sysconfdir}/ld.so.conf.d/* -%{_datadir}/applications/fedora-*.desktop -%{_sysconfdir}/profile.d/alc_env.* +%defattr(-,root,root,-) +%config(noreplace) %{_sysconfdir}/ld.so.conf.d/* +%{_datadir}/applications/*.desktop +%config(noreplace) %{_sysconfdir}/profile.d/alc_env.* %files doc +%defattr(-,root,root,-) %doc doc/html/ %doc doc/design-flow %doc doc/pdf/*.pdf %doc doc/overview/*.ps %doc doc/overview/*.pdf -%doc tutorials/ +%doc documentation/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) @@ -292,6 +332,37 @@ touch --no-create %{_datadir}/icons/hicolor || : %changelog +* Wed Sep 02 2009 Chitlesh Goorah - 5.0-31.20090901snap +- updated to upstream's 20090901 snapshot +- Removed all patches which are accepted by upstream + +* Thu Aug 27 2009 Chitlesh Goorah - 5.0-30.20090827snap +- updated to upstream's 20090828 snapshot +- merged patches with upstream's snapshot: 64 bits stability patches and upstream enhancements +- fixed EPEL-5 build + +* Sat Aug 8 2009 Chitlesh Goorah - 5.0-29.20070718snap +- improved rawhide build with respect to the broken patches + +* Thu Jul 9 2009 Chitlesh Goorah - 5.0-28.20070718snap +- improved stability on 64 bit architecture +- Patches (14 to 100) added along with new features from upstream + +* Sat Jul 4 2009 Chitlesh Goorah - 5.0-27.20070718snap +- improved autogeneration of documentation and fixed the examples + +* Tue Feb 24 2009 Chitlesh Goorah - 5.0-26.20070718snap +- fixed build due to new releases of flex and bison + +* Mon Feb 23 2009 Fedora Release Engineering - 5.0-25.20070718snap + - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sun Feb 01 2009 Chitlesh Goorah - 5.0-24.20070718snap +- Improved VHDL generic implementation + +* Mon Nov 10 2008 Chitlesh Goorah - 5.0-23.20070718snap +- Added Requires xorg-x11-fonts-misc to fix launch crash + * Mon Nov 3 2008 Chitlesh Goorah - 5.0-22.20070718snap - rebuild for F10 diff --git a/dreal.desktop b/dreal.desktop deleted file mode 100644 index 20f8da8..0000000 --- a/dreal.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Alliance: Layout Viewer -Exec=ALLIANCE_TOP/bin/dreal -Icon=dreal.png -Type=Application -Terminal=false -GenericName=dreal -Categories=Science; -Comment=View the Real layout \ No newline at end of file diff --git a/dreal.png b/dreal.png deleted file mode 100644 index 50e608a..0000000 Binary files a/dreal.png and /dev/null differ diff --git a/graal.desktop b/graal.desktop deleted file mode 100644 index b858527..0000000 --- a/graal.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Alliance: Layout Editor -Exec=ALLIANCE_TOP/bin/graal -Icon=graal.png -Type=Application -Terminal=false -GenericName=graal -Categories=Science; -Comment=Edits physical layouts \ No newline at end of file diff --git a/graal.png b/graal.png deleted file mode 100644 index fdd2a03..0000000 Binary files a/graal.png and /dev/null differ diff --git a/import.log b/import.log deleted file mode 100644 index 7ceab48..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -alliance-5_0-21_20070718snap_fc9:HEAD:alliance-5.0-21.20070718snap.fc9.src.rpm:1221496180 diff --git a/sources b/sources index 6d91a0b..9af8cf1 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -917f4493c09f6f5c49d5a606a5e9bbd8 alliance-5.0-20070718.tar.gz -32cac3116f85713aec2e1e18379811eb alliance-5.0-tutorials.tar.bz2 +f3b692c4ea9e54c040280f660b3cf170 alliance-5.0-20090901.tar.gz diff --git a/xfsm.desktop b/xfsm.desktop deleted file mode 100644 index 4e8ec39..0000000 --- a/xfsm.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Alliance: FSM Viewer -Exec=ALLIANCE_TOP/bin/xfsm -Icon=xfsm.png -Type=Application -Terminal=false -GenericName=xfsm -Categories=Science; -Comment=View Finite State Machines \ No newline at end of file diff --git a/xfsm.png b/xfsm.png deleted file mode 100644 index 414f153..0000000 Binary files a/xfsm.png and /dev/null differ diff --git a/xpat.desktop b/xpat.desktop deleted file mode 100644 index 4648c45..0000000 --- a/xpat.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Alliance: Patterns Viewer -Exec=ALLIANCE_TOP/bin/xpat -Icon=xpat.png -Type=Application -Terminal=false -GenericName=xpat -Categories=Science; -Comment=View the Patterns \ No newline at end of file diff --git a/xpat.png b/xpat.png deleted file mode 100644 index 3957935..0000000 Binary files a/xpat.png and /dev/null differ diff --git a/xsch.desktop b/xsch.desktop deleted file mode 100644 index 42a3472..0000000 --- a/xsch.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Alliance: Schematic Viewer -Exec=ALLIANCE_TOP/bin/xsch -Icon=xsch.png -Type=Application -Terminal=false -GenericName=Xsch -Categories=Science; -Comment=View the Schematic \ No newline at end of file diff --git a/xsch.png b/xsch.png deleted file mode 100644 index fc180e3..0000000 Binary files a/xsch.png and /dev/null differ diff --git a/xvpn.desktop b/xvpn.desktop deleted file mode 100644 index 8180588..0000000 --- a/xvpn.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Alliance: Petri Nets Viewer -Exec=ALLIANCE_TOP/bin/xvpn -Icon=xvpn.png -Type=Application -Terminal=false -GenericName=xpvn -Categories=Science; -Comment=View the Petri Nets \ No newline at end of file diff --git a/xvpn.png b/xvpn.png deleted file mode 100644 index 30c25db..0000000 Binary files a/xvpn.png and /dev/null differ