From b2a869f9e953a53d7eb7047f4a287ed8778154ee Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 7 Nov 2008 04:20:43 +0000 Subject: [PATCH 1/8] Initialize branch F-10 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..dc32377 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-10 From d5ade4861062123127ce27d0747e7d14a30aa48a Mon Sep 17 00:00:00 2001 From: Chitlesh GOORAH Date: Mon, 10 Nov 2008 15:05:41 +0000 Subject: [PATCH 2/8] *** empty log message *** --- alliance.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/alliance.spec b/alliance.spec index da37517..2433fbd 100644 --- a/alliance.spec +++ b/alliance.spec @@ -4,7 +4,7 @@ Name: alliance Version: 5.0 -Release: 22.%{snapshot}snap%{?dist} +Release: 23.%{snapshot}snap%{?dist} Summary: Alliance VLSI CAD Sytem License: GPLv2 @@ -43,7 +43,7 @@ BuildRequires: lesstif-devel libXt-devel byacc desktop-file-utils bison BuildRequires: libXp-devel libXpm-devel libstdc++-devel flex m4 BuildRequires: transfig ghostscript -Requires: %{name}-libs = %{version}-%{release} +Requires: xorg-x11-fonts-misc # 442379 Requires(post): %{name}-libs = %{version}-%{release} @@ -292,6 +292,9 @@ touch --no-create %{_datadir}/icons/hicolor || : %changelog +* 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 From eb4593aece3eef03098bcc522522baedab3a5fd1 Mon Sep 17 00:00:00 2001 From: Chitlesh GOORAH Date: Sun, 1 Feb 2009 19:21:50 +0000 Subject: [PATCH 3/8] generic bug fix --- alliance-generic.patch | 20 ++++++++++++++++++++ alliance.spec | 9 +++++++-- import.log | 1 + 3 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 alliance-generic.patch diff --git a/alliance-generic.patch b/alliance-generic.patch new file mode 100644 index 0000000..24591b9 --- /dev/null +++ b/alliance-generic.patch @@ -0,0 +1,20 @@ +--- vbl/src/vbl_bcomp_y.y 2004-09-03 21:11:18.000000000 +0200 ++++ vbl_bcomp_y.y 2009-02-01 15:39:12.000000000 +0100 +@@ -4645,7 +4645,7 @@ + + if ( ! $1.DYNAMIC ) + { +- VexTarget = vbl_dynamicvexatom( $1.NAME, $1.LEFT, $1.RIGHT, Dynamic ); ++ VexTarget = vbl_dynamicvexatom( $1.NAME, $1.LEFT, $1.RIGHT, 0 ); + } + else + { +@@ -4903,7 +4903,7 @@ + + if ( ! $5.DYNAMIC ) + { +- VexTarget = vbl_dynamicvexatom( $5.NAME, $5.LEFT, $5.RIGHT, Dynamic ); ++ VexTarget = vbl_dynamicvexatom( $5.NAME, $5.LEFT, $5.RIGHT, 0 ); + } + else + { diff --git a/alliance.spec b/alliance.spec index 2433fbd..994b2bc 100644 --- a/alliance.spec +++ b/alliance.spec @@ -4,8 +4,8 @@ Name: alliance Version: 5.0 -Release: 23.%{snapshot}snap%{?dist} -Summary: Alliance VLSI CAD Sytem +Release: 24.%{snapshot}snap%{?dist} +Summary: VLSI EDA System License: GPLv2 Group: Applications/Engineering @@ -18,6 +18,7 @@ Patch1: alliance-examples.patch Patch2: alliance-run.patch Patch3: alliance-perms.patch Patch4: alliance-gcc43.patch +Patch5: alliance-generic.patch Source1: xsch.desktop Source2: dreal.desktop @@ -127,6 +128,7 @@ tar -xvf %{SOURCE14} %patch4 -p1 -b .include +%patch5 -p0 -b .generic # make sure the man pages are UTF-8... for nonUTF8 in distrib/doc/alc_origin.1 alcban/man1/alcbanner.1 \ @@ -292,6 +294,9 @@ touch --no-create %{_datadir}/icons/hicolor || : %changelog +* 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 diff --git a/import.log b/import.log index 7ceab48..ac3dec5 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ alliance-5_0-21_20070718snap_fc9:HEAD:alliance-5.0-21.20070718snap.fc9.src.rpm:1221496180 +alliance-5_0-24_20070718snap_fc10:F-10:alliance-5.0-24.20070718snap.fc10.src.rpm:1233515871 From dff4912015400d706272569d03648aa5701b4bad Mon Sep 17 00:00:00 2001 From: Chitlesh GOORAH Date: Fri, 28 Aug 2009 10:26:10 +0000 Subject: [PATCH 4/8] snapshot 20090827 --- .cvsignore | 3 +- alliance-env.patch | 48 +++--- alliance-examples-adm2901.patch | 60 ++++++++ alliance-examples-go-all-clean.sh | 11 ++ alliance-examples-go-all.sh | 11 ++ alliance-examples-mipsR3000.patch | 12 ++ alliance-gcc43.patch | 47 ------ alliance-generic.patch | 20 --- alliance-tutorials-amd2901.patch | 35 +++++ alliance-tutorials-go-all-clean.sh | 9 ++ alliance-tutorials-go-all.sh | 9 ++ alliance-tutorials-place_n_route.patch | 39 +++++ alliance-tutorials-simulation.patch | 28 ++++ alliance-tutorials-start.patch | 35 +++++ alliance-tutorials-synthesis.patch | 45 ++++++ alliance-xgra-xgrerror-ld.patch | 20 +++ alliance-xgra.patch | 147 ++++++++++++++++++ alliance.spec | 205 +++++++++++++++++++------ dreal.desktop | 4 +- graal.desktop | 4 +- import.log | 1 + sources | 3 +- xfsm.desktop | 4 +- xgra.desktop | 10 ++ xgra.png | Bin 0 -> 6079 bytes xpat.desktop | 4 +- xsch.desktop | 4 +- xvpn.desktop | 4 +- 28 files changed, 666 insertions(+), 156 deletions(-) create mode 100644 alliance-examples-adm2901.patch create mode 100755 alliance-examples-go-all-clean.sh create mode 100755 alliance-examples-go-all.sh create mode 100644 alliance-examples-mipsR3000.patch delete mode 100755 alliance-gcc43.patch delete mode 100644 alliance-generic.patch create mode 100644 alliance-tutorials-amd2901.patch create mode 100755 alliance-tutorials-go-all-clean.sh create mode 100755 alliance-tutorials-go-all.sh create mode 100644 alliance-tutorials-place_n_route.patch create mode 100644 alliance-tutorials-simulation.patch create mode 100644 alliance-tutorials-start.patch create mode 100644 alliance-tutorials-synthesis.patch create mode 100644 alliance-xgra-xgrerror-ld.patch create mode 100644 alliance-xgra.patch create mode 100644 xgra.desktop create mode 100644 xgra.png diff --git a/.cvsignore b/.cvsignore index 013d539..6cd5c0b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -alliance-5.0-20070718.tar.gz -alliance-5.0-tutorials.tar.bz2 +alliance-5.0-20090827.tar.gz diff --git a/alliance-env.patch b/alliance-env.patch index 2281a58..2743ed5 100644 --- a/alliance-env.patch +++ b/alliance-env.patch @@ -1,7 +1,8 @@ ---- 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 +diff -Naur distrib/etc/alc_env.csh.in distrib1/etc/alc_env.csh.in +--- distrib/etc/alc_env.csh.in 2007-11-28 15:58:10.000000000 +0100 ++++ distrib1/etc/alc_env.csh.in 2009-08-27 18:16:05.285270921 +0200 @@ -70,20 +70,23 @@ - + # System environment variables. if ( $?PATH ) then - setenv PATH "${ALLIANCE_TOP}/bin:$PATH" @@ -9,36 +10,36 @@ 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" + setenv LD_LIBRARY_PATH "${ALLIANCE_TOP}/lib:`manpath`" endif - -- if ( $?MANPATH ) then + + if ( $?MANPATH ) then - setenv MANPATH "${ALLIANCE_TOP}/man:${MANPATH}" -+ if ($?MANPATH) then -+ setenv MANPATH "${MANPATH}:${ALLIANCE_TOP}/man" ++ setenv MANPATH "${MANPATH}:${ALLIANCE_TOP}/man" else - setenv MANPATH "${ALLIANCE_TOP}/man" -+ 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 ++ ++ # 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 distrib1/etc/alc_env.sh.in +--- distrib/etc/alc_env.sh.in 2007-11-28 15:58:10.000000000 +0100 ++++ distrib1/etc/alc_env.sh.in 2009-08-27 18:17:38.477272066 +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 @@ -47,19 +48,18 @@ + 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 +- MANPATH=$ALLIANCE_TOP/man:$(manpath) ++ MANPATH=:$ALLIANCE_TOP/man:$(manpath) 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 - ++ 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-examples-adm2901.patch b/alliance-examples-adm2901.patch new file mode 100644 index 0000000..dd18a4b --- /dev/null +++ b/alliance-examples-adm2901.patch @@ -0,0 +1,60 @@ +diff -Naur alliance-5.0/documentation/alliance-examples/amd2901/amd2901_chip.c test-64/alliance-examples/amd2901/amd2901_chip.c +--- alliance-5.0/documentation/alliance-examples/amd2901/amd2901_chip.c 2004-05-23 20:55:16.000000000 +0200 ++++ test-64/alliance-examples/amd2901/amd2901_chip.c 2009-06-14 02:35:45.000000000 +0200 +@@ -1,5 +1,5 @@ + #include +-#define POWER "vdde","vdd","vsse","vss",0 ++#define POWER "vdde","vdd","vsse","vss",NULL + + int main () + { +@@ -78,7 +78,7 @@ + + "vdd => vdd", + "vss => vss", +- 0); ++ NULL); + + GENLIB_LOINS("pck_sp","p_ck","ck","cki", POWER); + +@@ -119,13 +119,13 @@ + GENLIB_LOINS ("piot_sp","p_r3", + "ram_o_up","sh_left","ram_i_up","r3","cki", POWER ); + +- GENLIB_LOINS("pvddick_sp","p_vddick0","ckc","cki","vdde","vdd","vsse","vss",0); +- GENLIB_LOINS("pvssick_sp","p_vssick0","ckc","cki","vdde","vdd","vsse","vss",0); ++ GENLIB_LOINS("pvddick_sp","p_vddick0","ckc","cki","vdde","vdd","vsse","vss",NULL); ++ GENLIB_LOINS("pvssick_sp","p_vssick0","ckc","cki","vdde","vdd","vsse","vss",NULL); + +- GENLIB_LOINS("pvddeck_sp","p_vddeck0","ckc","cki","vdde","vdd","vsse","vss",0); +- GENLIB_LOINS("pvddeck_sp","p_vddeck1","ckc","cki","vdde","vdd","vsse","vss",0); +- GENLIB_LOINS("pvsseck_sp","p_vsseck0","ckc","cki","vdde","vdd","vsse","vss",0); +- GENLIB_LOINS("pvsseck_sp","p_vsseck1","ckc","cki","vdde","vdd","vsse","vss",0); ++ GENLIB_LOINS("pvddeck_sp","p_vddeck0","ckc","cki","vdde","vdd","vsse","vss",NULL); ++ GENLIB_LOINS("pvddeck_sp","p_vddeck1","ckc","cki","vdde","vdd","vsse","vss",NULL); ++ GENLIB_LOINS("pvsseck_sp","p_vsseck0","ckc","cki","vdde","vdd","vsse","vss",NULL); ++ GENLIB_LOINS("pvsseck_sp","p_vsseck1","ckc","cki","vdde","vdd","vsse","vss",NULL); + + GENLIB_SAVE_LOFIG(); + +diff -Naur alliance-5.0/documentation/alliance-examples/amd2901/amd2901_core.c test-64/alliance-examples/amd2901/amd2901_core.c +--- alliance-5.0/documentation/alliance-examples/amd2901/amd2901_core.c 2004-05-23 20:55:16.000000000 +0200 ++++ test-64/alliance-examples/amd2901/amd2901_core.c 2009-06-14 02:36:07.000000000 +0200 +@@ -109,7 +109,7 @@ + "out_x[3:0] => y[3:0]", + + "vdd => vdd", +- "vss => vss", 0); ++ "vss => vss", NULL); + + + /* ***************** Control Instanciation ****************** */ +@@ -161,7 +161,7 @@ + "oe => oe", + + "vdd => vdd", +- "vss => vss", 0); ++ "vss => vss", NULL); + + GENLIB_PLACE ("amd2901_dpt", "amd2901_dpt", NOSYM, 0, 0); + GENLIB_DEF_AB (0, 0, 0, 100); 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-mipsR3000.patch b/alliance-examples-mipsR3000.patch new file mode 100644 index 0000000..5e1bdf0 --- /dev/null +++ b/alliance-examples-mipsR3000.patch @@ -0,0 +1,12 @@ +diff -Naur alliance-5.0/documentation/alliance-examples/mipsR3000/sce/Makefile test-64/alliance-examples/mipsR3000/sce/Makefile +--- alliance-5.0/documentation/alliance-examples/mipsR3000/sce/Makefile 2004-07-30 02:40:09.000000000 +0200 ++++ test-64/alliance-examples/mipsR3000/sce/Makefile 2009-06-14 03:12:56.000000000 +0200 +@@ -119,7 +119,7 @@ + LVX = $(MBK_EXTRACT_ENV); $(ALLIANCE_BIN)/lvx + PROOF = $(MBK_EXTRACT_ENV); $(ALLIANCE_BIN)/proof + RING = $(MBK_GENERAT_ENV); $(ALLIANCE_BIN)/ring +- DPGEN = $(MBK_GENERAT_ENV); $(ALLIANCE_BIN)/genlib ++ DPGEN = $(MBK_GENERAT_ENV); $(ALLIANCE_BIN)/genlib --keep-exec --verbose + OCP = $(MBK_GENERAT_ENV); $(ALLIANCE_BIN)/ocp -v -gnuplot + OCR = $(MBK_GENERAT_ENV); $(ALLIANCE_BIN)/ocr + NERO = $(MBK_GENERAT_ENV); $(ALLIANCE_BIN)/nero -V 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-generic.patch b/alliance-generic.patch deleted file mode 100644 index 24591b9..0000000 --- a/alliance-generic.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- vbl/src/vbl_bcomp_y.y 2004-09-03 21:11:18.000000000 +0200 -+++ vbl_bcomp_y.y 2009-02-01 15:39:12.000000000 +0100 -@@ -4645,7 +4645,7 @@ - - if ( ! $1.DYNAMIC ) - { -- VexTarget = vbl_dynamicvexatom( $1.NAME, $1.LEFT, $1.RIGHT, Dynamic ); -+ VexTarget = vbl_dynamicvexatom( $1.NAME, $1.LEFT, $1.RIGHT, 0 ); - } - else - { -@@ -4903,7 +4903,7 @@ - - if ( ! $5.DYNAMIC ) - { -- VexTarget = vbl_dynamicvexatom( $5.NAME, $5.LEFT, $5.RIGHT, Dynamic ); -+ VexTarget = vbl_dynamicvexatom( $5.NAME, $5.LEFT, $5.RIGHT, 0 ); - } - else - { diff --git a/alliance-tutorials-amd2901.patch b/alliance-tutorials-amd2901.patch new file mode 100644 index 0000000..2cf6a4f --- /dev/null +++ b/alliance-tutorials-amd2901.patch @@ -0,0 +1,35 @@ +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 --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-tutorials-place_n_route.patch b/alliance-tutorials-place_n_route.patch new file mode 100644 index 0000000..9ad6eab --- /dev/null +++ b/alliance-tutorials-place_n_route.patch @@ -0,0 +1,39 @@ +diff -Naur alliance-5.0/documentation/tutorials/place_and_route/src/amd2901/amd2901_chip.c test-64/tutorials/place_and_route/src/amd2901/amd2901_chip.c +--- alliance-5.0/documentation/tutorials/place_and_route/src/amd2901/amd2901_chip.c 2002-07-25 14:50:19.000000000 +0200 ++++ test-64/tutorials/place_and_route/src/amd2901/amd2901_chip.c 2009-06-14 02:27:03.000000000 +0200 +@@ -1,5 +1,5 @@ + #include +-#define POWER "vdde","vdd","vsse","vss",0 ++#define POWER "vdde","vdd","vsse","vss",NULL + + int main () + { +@@ -78,7 +78,7 @@ + + "vdd => vdd", + "vss => vss", +- 0); ++ NULL); + + GENLIB_LOINS("pck_sp","p_ck","ck","cki", POWER); + +@@ -119,13 +119,13 @@ + GENLIB_LOINS ("piot_sp","p_r3", + "ram_o_up","sh_left","ram_i_up","r3","cki", POWER ); + +- GENLIB_LOINS("pvddick_sp","p_vddick0","ckc","cki","vdde","vdd","vsse","vss",0); +- GENLIB_LOINS("pvssick_sp","p_vssick0","ckc","cki","vdde","vdd","vsse","vss",0); ++ GENLIB_LOINS("pvddick_sp","p_vddick0","ckc","cki","vdde","vdd","vsse","vss",NULL); ++ GENLIB_LOINS("pvssick_sp","p_vssick0","ckc","cki","vdde","vdd","vsse","vss",NULL); + +- GENLIB_LOINS("pvddeck_sp","p_vddeck0","ckc","cki","vdde","vdd","vsse","vss",0); +- GENLIB_LOINS("pvddeck_sp","p_vddeck1","ckc","cki","vdde","vdd","vsse","vss",0); +- GENLIB_LOINS("pvsseck_sp","p_vsseck0","ckc","cki","vdde","vdd","vsse","vss",0); +- GENLIB_LOINS("pvsseck_sp","p_vsseck1","ckc","cki","vdde","vdd","vsse","vss",0); ++ GENLIB_LOINS("pvddeck_sp","p_vddeck0","ckc","cki","vdde","vdd","vsse","vss",NULL); ++ GENLIB_LOINS("pvddeck_sp","p_vddeck1","ckc","cki","vdde","vdd","vsse","vss",NULL); ++ GENLIB_LOINS("pvsseck_sp","p_vsseck0","ckc","cki","vdde","vdd","vsse","vss",NULL); ++ GENLIB_LOINS("pvsseck_sp","p_vsseck1","ckc","cki","vdde","vdd","vsse","vss",NULL); + + GENLIB_SAVE_LOFIG(); + diff --git a/alliance-tutorials-simulation.patch b/alliance-tutorials-simulation.patch new file mode 100644 index 0000000..5d7daae --- /dev/null +++ b/alliance-tutorials-simulation.patch @@ -0,0 +1,28 @@ +diff -Naur alliance-5.0/documentation/tutorials/simulation/tex/simulation.tex test-64/tutorials/simulation/tex/simulation.tex +--- alliance-5.0/documentation/tutorials/simulation/tex/simulation.tex 2004-10-16 14:52:05.000000000 +0200 ++++ test-64/tutorials/simulation/tex/simulation.tex 2009-07-04 12:18:54.867711418 +0200 +@@ -171,7 +162,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 +617,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 --git a/alliance-tutorials-start.patch b/alliance-tutorials-start.patch new file mode 100644 index 0000000..a2a6344 --- /dev/null +++ b/alliance-tutorials-start.patch @@ -0,0 +1,35 @@ +diff -Naur alliance-5.0/documentation/tutorials/start/start.tex test-64/tutorials/start/start.tex +--- alliance-5.0/documentation/tutorials/start/start.tex 2004-10-16 14:52:13.000000000 +0200 ++++ test-64/tutorials/start/start.tex 2009-07-04 12:17:35.389714653 +0200 +@@ -116,13 +116,13 @@ + 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 + command : + \begin{phraseverbatim} +-~alp/addaccu %-) source /alliance/alc_env.sh ++~alp/addaccu %-) source /etc/profile.d/alc_env.sh + \end{phraseverbatim} + \\ + Before we proceed to the tutorial, you must make sure that the +@@ -151,13 +151,13 @@ + MBK_CATAL_NAME=CATAL + MBK_SCALE_X=100 + MBK_VSS=vss +-MBK_CATA_LIB=.:/alliance/cells/sxlib:/alliance/cells/padlib ++MBK_CATA_LIB=.:\$ALLIANCE\_TOP/cells/sxlib:\$ALLIANCE\_TOP/cells/padlib + MBK_WORK_LIB=. + MBK_VDD=vdd + MBK_C4_LIB=./cellsC4 + MBK_IN_LO=vst + MBK_IN_PH=ap +-MBK_TARGET_LIB=/alliance/cells/sxlib ++MBK_TARGET_LIB=\$ALLIANCE\_TOP/cells/sxlib + MBK_OUT_LO=vst + \end{framedverbatim} + \caption{\label{mbk} \texttt{MBK} environment variables.} diff --git a/alliance-tutorials-synthesis.patch b/alliance-tutorials-synthesis.patch new file mode 100644 index 0000000..d6702b9 --- /dev/null +++ b/alliance-tutorials-synthesis.patch @@ -0,0 +1,45 @@ +diff -Naur alliance-5.0/documentation/tutorials/synthesis/src/amd2901/amd2901_chip.c test-64/tutorials/synthesis/src/amd2901/amd2901_chip.c +--- alliance-5.0/documentation/tutorials/synthesis/src/amd2901/amd2901_chip.c 2002-07-25 14:50:18.000000000 +0200 ++++ test-64/tutorials/synthesis/src/amd2901/amd2901_chip.c 2009-06-14 00:31:18.000000000 +0200 +@@ -78,7 +78,7 @@ + + "vdd => vdd", + "vss => vss", +- 0); ++ NULL); + + GENLIB_LOINS("pck_sp","p_ck","ck","cki", POWER); + +@@ -119,13 +119,13 @@ + GENLIB_LOINS ("piot_sp","p_r3", + "ram_o_up","sh_left","ram_i_up","r3","cki", POWER ); + +- GENLIB_LOINS("pvddick_sp","p_vddick0","ckc","cki","vdde","vdd","vsse","vss",0); +- GENLIB_LOINS("pvssick_sp","p_vssick0","ckc","cki","vdde","vdd","vsse","vss",0); ++ GENLIB_LOINS("pvddick_sp","p_vddick0","ckc","cki","vdde","vdd","vsse","vss",NULL); ++ GENLIB_LOINS("pvssick_sp","p_vssick0","ckc","cki","vdde","vdd","vsse","vss",NULL); + +- GENLIB_LOINS("pvddeck_sp","p_vddeck0","ckc","cki","vdde","vdd","vsse","vss",0); +- GENLIB_LOINS("pvddeck_sp","p_vddeck1","ckc","cki","vdde","vdd","vsse","vss",0); +- GENLIB_LOINS("pvsseck_sp","p_vsseck0","ckc","cki","vdde","vdd","vsse","vss",0); +- GENLIB_LOINS("pvsseck_sp","p_vsseck1","ckc","cki","vdde","vdd","vsse","vss",0); ++ GENLIB_LOINS("pvddeck_sp","p_vddeck0","ckc","cki","vdde","vdd","vsse","vss",NULL); ++ GENLIB_LOINS("pvddeck_sp","p_vddeck1","ckc","cki","vdde","vdd","vsse","vss",NULL); ++ GENLIB_LOINS("pvsseck_sp","p_vsseck0","ckc","cki","vdde","vdd","vsse","vss",NULL); ++ GENLIB_LOINS("pvsseck_sp","p_vsseck1","ckc","cki","vdde","vdd","vsse","vss",NULL); + + GENLIB_SAVE_LOFIG(); + +diff -Naur alliance-5.0/documentation/tutorials/synthesis/tex/synthesis.tex test-64/tutorials/synthesis/tex/synthesis.tex +--- alliance-5.0/documentation/tutorials/synthesis/tex/synthesis.tex 2004-10-16 14:52:17.000000000 +0200 ++++ test-64/tutorials/synthesis/tex/synthesis.tex 2009-07-04 12:26:03.345711622 +0200 +@@ -220,7 +211,7 @@ + } + + All the files used in this part are located under \\ +-\texttt{/tutorial/synthesis/src} directory.\\ ++\texttt{/usr/share/doc/alliance-doc-5.0/tutorials/synthesis/src} directory.\\ + This directory contents four subdirectories and one Makefile : + \begin{itemize}\itemsep=-.8ex + + diff --git a/alliance-xgra-xgrerror-ld.patch b/alliance-xgra-xgrerror-ld.patch new file mode 100644 index 0000000..48dc20a --- /dev/null +++ b/alliance-xgra-xgrerror-ld.patch @@ -0,0 +1,20 @@ +--- xgra/src/XGR_error.c 2007-11-27 21:41:32.000000000 +0100 ++++ XGR_error.c 2009-08-28 07:53:58.546631214 +0200 +@@ -270,7 +270,7 @@ + + if ( XgraFigureGra != (autgraph *)NULL ) + { +- sprintf( Scan, " FIGURE : %s\n\n NODES : %d\n ARCS : %d\n\n", ++ sprintf( Scan, " FIGURE : %s\n\n NODES : %ld\n ARCS : %ld\n\n", + XgraFigure->NAME, + XgraFigureGra->NUMBER_NODE, + XgraFigureGra->NUMBER_ARC ); +@@ -282,7 +282,7 @@ + + Scan = Scan + strlen( Scan ); + +- sprintf( Scan, " BOUNDING BOX : \n\n XMIN : %d\n YMIN : %d\n XMAX : %d\n YMAX : %d\n\n", ++ sprintf( Scan, " BOUNDING BOX : \n\n XMIN : %ld\n YMIN : %ld\n XMAX : %ld\n YMAX : %ld\n\n", + XgraBoundXmin / XGRA_UNIT, XgraBoundYmin / XGRA_UNIT, + XgraBoundXmax / XGRA_UNIT, XgraBoundYmax / XGRA_UNIT ); + diff --git a/alliance-xgra.patch b/alliance-xgra.patch new file mode 100644 index 0000000..89bddda --- /dev/null +++ b/alliance-xgra.patch @@ -0,0 +1,147 @@ +--- /home/chitlesh/rpmbuild/BUILD/alliance-5.0/xgra/Makefile.am 2009-08-28 07:20:46.993629321 +0200 ++++ src/xgra/Makefile.am 2009-08-28 07:26:58.090631633 +0200 +@@ -1 +1,143 @@ +-SUBDIRS = src etc ++bin_PROGRAMS = \ ++ xgra ++ ++xgra_CPPFLAGS = \ ++ $(GLIB_CFLAGS) \ ++ -DG_LOG_DOMAIN=\"xgra\" \ ++ $(MOTIF_CFLAGS) \ ++ -DXGRA_DEFAULT_PARAM_NAME=\"${sysconfdir}/xgra.par\" \ ++ -DXMS_FILE_NAME=\".xgra.cfg\" \ ++ -I$(top_srcdir)/mbk/src \ ++ -I$(top_srcdir)/aut/src ++ ++xgra_SOURCES = \ ++ xgra.c \ ++ xgra.h \ ++ XGR_bound.c \ ++ XGR_bound.h \ ++ XGR_error.c \ ++ XGR_error.h \ ++ XGR_graph.c \ ++ XGR_graph.h \ ++ XGR_object.c \ ++ XGR_object.h \ ++ XGR_place.c \ ++ XGR_place.h \ ++ XGR_select.c \ ++ XGR_select.h \ ++ XGR.h \ ++ XME_dialog.c \ ++ XME_dialog.h \ ++ XME_edit.c \ ++ XME_edit.h \ ++ XME.h \ ++ XME_menu.c \ ++ XME_menu.h \ ++ XME_message.c \ ++ XME_message.h \ ++ XME_panel.c \ ++ XME_panel.h \ ++ XME_search.c \ ++ XME_search.h \ ++ XME_select.c \ ++ XME_select.h \ ++ XMF_dialog.c \ ++ XMF_dialog.h \ ++ XMF_file.c \ ++ XMF_file.h \ ++ XMF.h \ ++ XMF_menu.c \ ++ XMF_menu.h \ ++ XMF_panel.c \ ++ XMF_panel.h \ ++ XMH.h \ ++ XMH_help.c \ ++ XMH_help.h \ ++ XMH_menu.c \ ++ XMH_menu.h \ ++ XMH_panel.c \ ++ XMH_panel.h \ ++ XMS_dialog.c \ ++ XMS_dialog.h \ ++ XMS.h \ ++ XMS_menu.c \ ++ XMS_menu.h \ ++ XMS_panel.c \ ++ XMS_panel.h \ ++ XMS_setup.c \ ++ XMS_setup.h \ ++ XMT_dialog.c \ ++ XMT_dialog.h \ ++ XMT.h \ ++ XMT_menu.c \ ++ XMT_menu.h \ ++ XMT_message.c \ ++ XMT_message.h \ ++ XMT_panel.c \ ++ XMT_panel.h \ ++ XMT_tools.c \ ++ XMT_tools.h \ ++ XMV_dialog.c \ ++ XMV_dialog.h \ ++ XMV.h \ ++ XMV_map.c \ ++ XMV_map.h \ ++ XMV_menu.c \ ++ XMV_menu.h \ ++ XMV_message.c \ ++ XMV_message.h \ ++ XMV_panel.c \ ++ XMV_panel.h \ ++ XMV_view.c \ ++ XMV_view.h \ ++ XMX_color.c \ ++ XMX_color.h \ ++ XMX_cursor.c \ ++ XMX_cursor.h \ ++ XMX_dialog.c \ ++ XMX_dialog.h \ ++ XMX_event.c \ ++ XMX_event.h \ ++ XMX_graphic.c \ ++ XMX_graphic.h \ ++ XMX_grid.c \ ++ XMX_grid.h \ ++ XMX.h \ ++ XMX_icon.c \ ++ XMX_icon.h \ ++ XMX_menu.c \ ++ XMX_menu.h \ ++ XMX_message.c \ ++ XMX_message.h \ ++ XMX_motif.c \ ++ XMX_motif.h \ ++ XMX_panel.c \ ++ XMX_panel.h \ ++ XMX_view.c \ ++ XMX_view.h \ ++ XSB_error.c \ ++ XSB_error.h \ ++ XSB.h \ ++ XSB_parse.c \ ++ XSB_parse.h \ ++ XSB_share.c \ ++ XSB_share.h \ ++ XTB_cursor.c \ ++ XTB_cursor.h \ ++ XTB_dialog.c \ ++ XTB_dialog.h \ ++ XTB.h \ ++ XTB_icon.c \ ++ XTB_icon.h \ ++ XTB_menu.c \ ++ XTB_menu.h \ ++ XTB_panel.c \ ++ XTB_panel.h \ ++ XTB_pixmap.c \ ++ XTB_pixmap.h ++ ++xgra_LDADD = \ ++ $(GLIB_CFLAGS) \ ++ $(MOTIF_LIBS) \ ++ $(top_builddir)/src/aut/libAut.la \ ++ $(top_builddir)/src/mbk/libMut.la diff --git a/alliance.spec b/alliance.spec index 994b2bc..38f8128 100644 --- a/alliance.spec +++ b/alliance.spec @@ -1,10 +1,9 @@ %define prefix %{_libdir}/%{name} -%define snapshot 20070718 -%define _default_patch_fuzz 2 +%define snapshot 20090827 Name: alliance Version: 5.0 -Release: 24.%{snapshot}snap%{?dist} +Release: 30.%{snapshot}snap%{?dist} Summary: VLSI EDA System License: GPLv2 @@ -14,11 +13,26 @@ Source: http://www-asim.lip6.fr/pub/alliance/distribution/5.0/%{name}-%{v 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 -Patch5: alliance-generic.patch +Patch1: alliance-run.patch +Patch2: alliance-perms.patch + +# Improving autogeneration of documentation +Patch3: alliance-tutorials-place_n_route.patch +Patch4: alliance-tutorials-simulation.patch +Patch5: alliance-tutorials-start.patch +Patch6: alliance-tutorials-synthesis.patch +Patch7: alliance-tutorials-amd2901.patch + +# Improving examples +Patch8: alliance-examples.patch +Patch9: alliance-examples-adm2901.patch +Patch10: alliance-examples-mipsR3000.patch + +# upstream enhancements +Patch11: alliance-xgra.patch + +# Fixes warning: format '%%d' expects type 'int', but argument N has type 'long int' +Patch12: alliance-xgra-xgrerror-ld.patch Source1: xsch.desktop Source2: dreal.desktop @@ -26,25 +40,37 @@ Source3: xpat.desktop Source4: xfsm.desktop Source5: xvpn.desktop Source6: graal.desktop +Source7: xgra.desktop -Source7: alliance.fedora +Source8: 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 +Source9: graal.png +Source10: dreal.png +Source11: xvpn.png +Source12: xfsm.png +Source13: xpat.png +Source14: xsch.png +Source15: xgra.png -Source14: %{name}-5.0-tutorials.tar.bz2 +Source16: alliance-tutorials-go-all.sh +Source17: alliance-tutorials-go-all-clean.sh +Source18: alliance-examples-go-all.sh +Source19: 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: xorg-x11-fonts-misc +%if 0%{?rhel} +BuildRequires: openmotif-devel +BuildRequires: pkgconfig +%else +BuildRequires: lesstif-devel +%endif + +Requires: xorg-x11-fonts-misc # 442379 Requires(post): %{name}-libs = %{version}-%{release} @@ -87,7 +113,6 @@ Summary: Alliance VLSI CAD Sytem - multilibs Group: Applications/Engineering Requires: %{name} = %{version}-%{release} Requires: electronics-menu -Obsoletes: %{name} < 5.0-12 %description libs @@ -98,7 +123,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 @@ -107,39 +134,85 @@ 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} . +%{__cp} -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} . sed -i "s|ALLIANCE_TOP|%{prefix}|" *.desktop +# 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 + +%patch11 -p1 -b .xgra-makefile.am +%patch12 -p0 -b .xgra-long + %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 -%patch3 -p0 -b .perms +%patch1 -p0 -b .run +%patch2 -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* +%patch3 -p1 -b .doc +%patch4 -p1 -b .doc +%patch5 -p1 -b .doc +%patch6 -p1 -b .doc +%patch7 -p0 -b .doc +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 %{SOURCE16} go-all.sh + %{__install} -pm 755 %{SOURCE17} 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 +# ------------------------------------------------------------------------------ +%patch8 -p0 -b .examples +%patch9 -p1 -b .examples +%patch10 -p1 -b .examples -%patch4 -p1 -b .include -%patch5 -p0 -b .generic +# 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 -#wrong-file-end-of-line-encoding -sed -i 's/\r//' documentation/alliance-examples/mipsR3000/asm/* +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//' mipsR3000/asm/* +popd + +# Fix xgra build +sed -i "s|AM_CFLAGS =|AM_CFLAGS = -I../../mbk/src -I../../aut/src/|g" xgra/src/Makefile* +sed -i "s|xgra_LDADD =|xgra_LDADD = -L../../mbk/src -L../../aut/src/|g" xgra/src/Makefile* %build @@ -187,25 +260,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 %{SOURCE18} alliance-examples/go-all.sh +%{__install} -pm 755 %{SOURCE19} 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 %{SOURCE9} %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} %{SOURCE15} \ %{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 \ +desktop-file-install --vendor "" \ --dir %{buildroot}%{_datadir}/applications/ \ $desktopfile done @@ -217,9 +295,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 @@ -236,11 +314,17 @@ 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 @@ -272,18 +356,20 @@ touch --no-create %{_datadir}/icons/hicolor || : %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) @@ -294,6 +380,27 @@ touch --no-create %{_datadir}/icons/hicolor || : %changelog +* 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 diff --git a/dreal.desktop b/dreal.desktop index 20f8da8..73d12f0 100644 --- a/dreal.desktop +++ b/dreal.desktop @@ -6,5 +6,5 @@ Icon=dreal.png Type=Application Terminal=false GenericName=dreal -Categories=Science; -Comment=View the Real layout \ No newline at end of file +Categories=Electronics;Engineering; +Comment=View the Real layout diff --git a/graal.desktop b/graal.desktop index b858527..8dd4c6c 100644 --- a/graal.desktop +++ b/graal.desktop @@ -6,5 +6,5 @@ Icon=graal.png Type=Application Terminal=false GenericName=graal -Categories=Science; -Comment=Edits physical layouts \ No newline at end of file +Categories=Electronics;Engineering; +Comment=Edits physical layouts diff --git a/import.log b/import.log index ac3dec5..be4025a 100644 --- a/import.log +++ b/import.log @@ -1,2 +1,3 @@ alliance-5_0-21_20070718snap_fc9:HEAD:alliance-5.0-21.20070718snap.fc9.src.rpm:1221496180 alliance-5_0-24_20070718snap_fc10:F-10:alliance-5.0-24.20070718snap.fc10.src.rpm:1233515871 +alliance-5_0-30_20090827snap_fc11:F-10:alliance-5.0-30.20090827snap.fc11.src.rpm:1251454888 diff --git a/sources b/sources index 6d91a0b..21938b3 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -917f4493c09f6f5c49d5a606a5e9bbd8 alliance-5.0-20070718.tar.gz -32cac3116f85713aec2e1e18379811eb alliance-5.0-tutorials.tar.bz2 +8591c98de3f24a76e81b5ecb4cf60f7d alliance-5.0-20090827.tar.gz diff --git a/xfsm.desktop b/xfsm.desktop index 4e8ec39..6dd425c 100644 --- a/xfsm.desktop +++ b/xfsm.desktop @@ -6,5 +6,5 @@ Icon=xfsm.png Type=Application Terminal=false GenericName=xfsm -Categories=Science; -Comment=View Finite State Machines \ No newline at end of file +Categories=Electronics;Engineering; +Comment=View Finite State Machines diff --git a/xgra.desktop b/xgra.desktop new file mode 100644 index 0000000..6aedfb2 --- /dev/null +++ b/xgra.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Alliance: Graphic Graph Viewer +Exec=ALLIANCE_TOP/bin/xgra +Icon=xgra.png +Type=Application +Terminal=false +GenericName=xpvn +Categories=Electronics;Engineering; +Comment=View the graphic graph diff --git a/xgra.png b/xgra.png new file mode 100644 index 0000000000000000000000000000000000000000..39579358a14cec92673695b12f1b894c90f55ae7 GIT binary patch literal 6079 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 Date: Fri, 28 Aug 2009 14:51:18 +0000 Subject: [PATCH 5/8] re-added default_patch_fuzz 2 --- alliance.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/alliance.spec b/alliance.spec index 38f8128..546597c 100644 --- a/alliance.spec +++ b/alliance.spec @@ -1,5 +1,6 @@ %define prefix %{_libdir}/%{name} %define snapshot 20090827 +%define _default_patch_fuzz 2 Name: alliance Version: 5.0 From dbfb98bd92e8de7c048b6b5917668d6c5164a077 Mon Sep 17 00:00:00 2001 From: Chitlesh GOORAH Date: Thu, 3 Sep 2009 05:12:49 +0000 Subject: [PATCH 6/8] 20090901snap: upstream merged most of our patches --- .cvsignore | 2 +- alliance-env.patch | 85 ---- alliance-examples-adm2901.patch | 60 --- alliance-examples-mipsR3000.patch | 12 - alliance-examples.patch | 594 ------------------------- alliance-perms.patch | 14 - alliance-run.patch | 21 - alliance-tutorials-amd2901.patch | 35 -- alliance-tutorials-place_n_route.patch | 39 -- alliance-tutorials-simulation.patch | 28 -- alliance-tutorials-start.patch | 35 -- alliance-tutorials-synthesis.patch | 45 -- alliance-xgra-xgrerror-ld.patch | 20 - alliance-xgra.patch | 147 ------ alliance.spec | 109 ++--- dreal.desktop | 10 - dreal.png | Bin 5967 -> 0 bytes graal.desktop | 10 - graal.png | Bin 6055 -> 0 bytes import.log | 1 + sources | 2 +- xfsm.desktop | 10 - xfsm.png | Bin 5909 -> 0 bytes xgra.desktop | 10 - xgra.png | Bin 6079 -> 0 bytes xpat.desktop | 10 - xpat.png | Bin 6079 -> 0 bytes xsch.desktop | 10 - xsch.png | Bin 3919 -> 0 bytes xvpn.desktop | 10 - xvpn.png | Bin 7998 -> 0 bytes 31 files changed, 35 insertions(+), 1284 deletions(-) delete mode 100644 alliance-env.patch delete mode 100644 alliance-examples-adm2901.patch delete mode 100644 alliance-examples-mipsR3000.patch delete mode 100644 alliance-examples.patch delete mode 100644 alliance-perms.patch delete mode 100644 alliance-run.patch delete mode 100644 alliance-tutorials-amd2901.patch delete mode 100644 alliance-tutorials-place_n_route.patch delete mode 100644 alliance-tutorials-simulation.patch delete mode 100644 alliance-tutorials-start.patch delete mode 100644 alliance-tutorials-synthesis.patch delete mode 100644 alliance-xgra-xgrerror-ld.patch delete mode 100644 alliance-xgra.patch delete mode 100644 dreal.desktop delete mode 100644 dreal.png delete mode 100644 graal.desktop delete mode 100644 graal.png delete mode 100644 xfsm.desktop delete mode 100644 xfsm.png delete mode 100644 xgra.desktop delete mode 100644 xgra.png delete mode 100644 xpat.desktop delete mode 100644 xpat.png delete mode 100644 xsch.desktop delete mode 100644 xsch.png delete mode 100644 xvpn.desktop delete mode 100644 xvpn.png diff --git a/.cvsignore b/.cvsignore index 6cd5c0b..2f30e04 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -alliance-5.0-20090827.tar.gz +alliance-5.0-20090901.tar.gz diff --git a/alliance-env.patch b/alliance-env.patch deleted file mode 100644 index 2743ed5..0000000 --- a/alliance-env.patch +++ /dev/null @@ -1,85 +0,0 @@ -diff -Naur distrib/etc/alc_env.csh.in distrib1/etc/alc_env.csh.in ---- distrib/etc/alc_env.csh.in 2007-11-28 15:58:10.000000000 +0100 -+++ distrib1/etc/alc_env.csh.in 2009-08-27 18:16:05.285270921 +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:`manpath`" - endif - - if ( $?MANPATH ) then -- setenv MANPATH "${ALLIANCE_TOP}/man:${MANPATH}" -+ 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 distrib1/etc/alc_env.sh.in ---- distrib/etc/alc_env.sh.in 2007-11-28 15:58:10.000000000 +0100 -+++ distrib1/etc/alc_env.sh.in 2009-08-27 18:17:38.477272066 +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) -+ MANPATH=:$ALLIANCE_TOP/man:$(manpath) - 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-adm2901.patch b/alliance-examples-adm2901.patch deleted file mode 100644 index dd18a4b..0000000 --- a/alliance-examples-adm2901.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff -Naur alliance-5.0/documentation/alliance-examples/amd2901/amd2901_chip.c test-64/alliance-examples/amd2901/amd2901_chip.c ---- alliance-5.0/documentation/alliance-examples/amd2901/amd2901_chip.c 2004-05-23 20:55:16.000000000 +0200 -+++ test-64/alliance-examples/amd2901/amd2901_chip.c 2009-06-14 02:35:45.000000000 +0200 -@@ -1,5 +1,5 @@ - #include --#define POWER "vdde","vdd","vsse","vss",0 -+#define POWER "vdde","vdd","vsse","vss",NULL - - int main () - { -@@ -78,7 +78,7 @@ - - "vdd => vdd", - "vss => vss", -- 0); -+ NULL); - - GENLIB_LOINS("pck_sp","p_ck","ck","cki", POWER); - -@@ -119,13 +119,13 @@ - GENLIB_LOINS ("piot_sp","p_r3", - "ram_o_up","sh_left","ram_i_up","r3","cki", POWER ); - -- GENLIB_LOINS("pvddick_sp","p_vddick0","ckc","cki","vdde","vdd","vsse","vss",0); -- GENLIB_LOINS("pvssick_sp","p_vssick0","ckc","cki","vdde","vdd","vsse","vss",0); -+ GENLIB_LOINS("pvddick_sp","p_vddick0","ckc","cki","vdde","vdd","vsse","vss",NULL); -+ GENLIB_LOINS("pvssick_sp","p_vssick0","ckc","cki","vdde","vdd","vsse","vss",NULL); - -- GENLIB_LOINS("pvddeck_sp","p_vddeck0","ckc","cki","vdde","vdd","vsse","vss",0); -- GENLIB_LOINS("pvddeck_sp","p_vddeck1","ckc","cki","vdde","vdd","vsse","vss",0); -- GENLIB_LOINS("pvsseck_sp","p_vsseck0","ckc","cki","vdde","vdd","vsse","vss",0); -- GENLIB_LOINS("pvsseck_sp","p_vsseck1","ckc","cki","vdde","vdd","vsse","vss",0); -+ GENLIB_LOINS("pvddeck_sp","p_vddeck0","ckc","cki","vdde","vdd","vsse","vss",NULL); -+ GENLIB_LOINS("pvddeck_sp","p_vddeck1","ckc","cki","vdde","vdd","vsse","vss",NULL); -+ GENLIB_LOINS("pvsseck_sp","p_vsseck0","ckc","cki","vdde","vdd","vsse","vss",NULL); -+ GENLIB_LOINS("pvsseck_sp","p_vsseck1","ckc","cki","vdde","vdd","vsse","vss",NULL); - - GENLIB_SAVE_LOFIG(); - -diff -Naur alliance-5.0/documentation/alliance-examples/amd2901/amd2901_core.c test-64/alliance-examples/amd2901/amd2901_core.c ---- alliance-5.0/documentation/alliance-examples/amd2901/amd2901_core.c 2004-05-23 20:55:16.000000000 +0200 -+++ test-64/alliance-examples/amd2901/amd2901_core.c 2009-06-14 02:36:07.000000000 +0200 -@@ -109,7 +109,7 @@ - "out_x[3:0] => y[3:0]", - - "vdd => vdd", -- "vss => vss", 0); -+ "vss => vss", NULL); - - - /* ***************** Control Instanciation ****************** */ -@@ -161,7 +161,7 @@ - "oe => oe", - - "vdd => vdd", -- "vss => vss", 0); -+ "vss => vss", NULL); - - GENLIB_PLACE ("amd2901_dpt", "amd2901_dpt", NOSYM, 0, 0); - GENLIB_DEF_AB (0, 0, 0, 100); diff --git a/alliance-examples-mipsR3000.patch b/alliance-examples-mipsR3000.patch deleted file mode 100644 index 5e1bdf0..0000000 --- a/alliance-examples-mipsR3000.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur alliance-5.0/documentation/alliance-examples/mipsR3000/sce/Makefile test-64/alliance-examples/mipsR3000/sce/Makefile ---- alliance-5.0/documentation/alliance-examples/mipsR3000/sce/Makefile 2004-07-30 02:40:09.000000000 +0200 -+++ test-64/alliance-examples/mipsR3000/sce/Makefile 2009-06-14 03:12:56.000000000 +0200 -@@ -119,7 +119,7 @@ - LVX = $(MBK_EXTRACT_ENV); $(ALLIANCE_BIN)/lvx - PROOF = $(MBK_EXTRACT_ENV); $(ALLIANCE_BIN)/proof - RING = $(MBK_GENERAT_ENV); $(ALLIANCE_BIN)/ring -- DPGEN = $(MBK_GENERAT_ENV); $(ALLIANCE_BIN)/genlib -+ DPGEN = $(MBK_GENERAT_ENV); $(ALLIANCE_BIN)/genlib --keep-exec --verbose - OCP = $(MBK_GENERAT_ENV); $(ALLIANCE_BIN)/ocp -v -gnuplot - OCR = $(MBK_GENERAT_ENV); $(ALLIANCE_BIN)/ocr - NERO = $(MBK_GENERAT_ENV); $(ALLIANCE_BIN)/nero -V 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-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-amd2901.patch b/alliance-tutorials-amd2901.patch deleted file mode 100644 index 2cf6a4f..0000000 --- a/alliance-tutorials-amd2901.patch +++ /dev/null @@ -1,35 +0,0 @@ -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 --git a/alliance-tutorials-place_n_route.patch b/alliance-tutorials-place_n_route.patch deleted file mode 100644 index 9ad6eab..0000000 --- a/alliance-tutorials-place_n_route.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -Naur alliance-5.0/documentation/tutorials/place_and_route/src/amd2901/amd2901_chip.c test-64/tutorials/place_and_route/src/amd2901/amd2901_chip.c ---- alliance-5.0/documentation/tutorials/place_and_route/src/amd2901/amd2901_chip.c 2002-07-25 14:50:19.000000000 +0200 -+++ test-64/tutorials/place_and_route/src/amd2901/amd2901_chip.c 2009-06-14 02:27:03.000000000 +0200 -@@ -1,5 +1,5 @@ - #include --#define POWER "vdde","vdd","vsse","vss",0 -+#define POWER "vdde","vdd","vsse","vss",NULL - - int main () - { -@@ -78,7 +78,7 @@ - - "vdd => vdd", - "vss => vss", -- 0); -+ NULL); - - GENLIB_LOINS("pck_sp","p_ck","ck","cki", POWER); - -@@ -119,13 +119,13 @@ - GENLIB_LOINS ("piot_sp","p_r3", - "ram_o_up","sh_left","ram_i_up","r3","cki", POWER ); - -- GENLIB_LOINS("pvddick_sp","p_vddick0","ckc","cki","vdde","vdd","vsse","vss",0); -- GENLIB_LOINS("pvssick_sp","p_vssick0","ckc","cki","vdde","vdd","vsse","vss",0); -+ GENLIB_LOINS("pvddick_sp","p_vddick0","ckc","cki","vdde","vdd","vsse","vss",NULL); -+ GENLIB_LOINS("pvssick_sp","p_vssick0","ckc","cki","vdde","vdd","vsse","vss",NULL); - -- GENLIB_LOINS("pvddeck_sp","p_vddeck0","ckc","cki","vdde","vdd","vsse","vss",0); -- GENLIB_LOINS("pvddeck_sp","p_vddeck1","ckc","cki","vdde","vdd","vsse","vss",0); -- GENLIB_LOINS("pvsseck_sp","p_vsseck0","ckc","cki","vdde","vdd","vsse","vss",0); -- GENLIB_LOINS("pvsseck_sp","p_vsseck1","ckc","cki","vdde","vdd","vsse","vss",0); -+ GENLIB_LOINS("pvddeck_sp","p_vddeck0","ckc","cki","vdde","vdd","vsse","vss",NULL); -+ GENLIB_LOINS("pvddeck_sp","p_vddeck1","ckc","cki","vdde","vdd","vsse","vss",NULL); -+ GENLIB_LOINS("pvsseck_sp","p_vsseck0","ckc","cki","vdde","vdd","vsse","vss",NULL); -+ GENLIB_LOINS("pvsseck_sp","p_vsseck1","ckc","cki","vdde","vdd","vsse","vss",NULL); - - GENLIB_SAVE_LOFIG(); - diff --git a/alliance-tutorials-simulation.patch b/alliance-tutorials-simulation.patch deleted file mode 100644 index 5d7daae..0000000 --- a/alliance-tutorials-simulation.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -Naur alliance-5.0/documentation/tutorials/simulation/tex/simulation.tex test-64/tutorials/simulation/tex/simulation.tex ---- alliance-5.0/documentation/tutorials/simulation/tex/simulation.tex 2004-10-16 14:52:05.000000000 +0200 -+++ test-64/tutorials/simulation/tex/simulation.tex 2009-07-04 12:18:54.867711418 +0200 -@@ -171,7 +162,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 +617,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 --git a/alliance-tutorials-start.patch b/alliance-tutorials-start.patch deleted file mode 100644 index a2a6344..0000000 --- a/alliance-tutorials-start.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -Naur alliance-5.0/documentation/tutorials/start/start.tex test-64/tutorials/start/start.tex ---- alliance-5.0/documentation/tutorials/start/start.tex 2004-10-16 14:52:13.000000000 +0200 -+++ test-64/tutorials/start/start.tex 2009-07-04 12:17:35.389714653 +0200 -@@ -116,13 +116,13 @@ - 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 - command : - \begin{phraseverbatim} --~alp/addaccu %-) source /alliance/alc_env.sh -+~alp/addaccu %-) source /etc/profile.d/alc_env.sh - \end{phraseverbatim} - \\ - Before we proceed to the tutorial, you must make sure that the -@@ -151,13 +151,13 @@ - MBK_CATAL_NAME=CATAL - MBK_SCALE_X=100 - MBK_VSS=vss --MBK_CATA_LIB=.:/alliance/cells/sxlib:/alliance/cells/padlib -+MBK_CATA_LIB=.:\$ALLIANCE\_TOP/cells/sxlib:\$ALLIANCE\_TOP/cells/padlib - MBK_WORK_LIB=. - MBK_VDD=vdd - MBK_C4_LIB=./cellsC4 - MBK_IN_LO=vst - MBK_IN_PH=ap --MBK_TARGET_LIB=/alliance/cells/sxlib -+MBK_TARGET_LIB=\$ALLIANCE\_TOP/cells/sxlib - MBK_OUT_LO=vst - \end{framedverbatim} - \caption{\label{mbk} \texttt{MBK} environment variables.} diff --git a/alliance-tutorials-synthesis.patch b/alliance-tutorials-synthesis.patch deleted file mode 100644 index d6702b9..0000000 --- a/alliance-tutorials-synthesis.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -Naur alliance-5.0/documentation/tutorials/synthesis/src/amd2901/amd2901_chip.c test-64/tutorials/synthesis/src/amd2901/amd2901_chip.c ---- alliance-5.0/documentation/tutorials/synthesis/src/amd2901/amd2901_chip.c 2002-07-25 14:50:18.000000000 +0200 -+++ test-64/tutorials/synthesis/src/amd2901/amd2901_chip.c 2009-06-14 00:31:18.000000000 +0200 -@@ -78,7 +78,7 @@ - - "vdd => vdd", - "vss => vss", -- 0); -+ NULL); - - GENLIB_LOINS("pck_sp","p_ck","ck","cki", POWER); - -@@ -119,13 +119,13 @@ - GENLIB_LOINS ("piot_sp","p_r3", - "ram_o_up","sh_left","ram_i_up","r3","cki", POWER ); - -- GENLIB_LOINS("pvddick_sp","p_vddick0","ckc","cki","vdde","vdd","vsse","vss",0); -- GENLIB_LOINS("pvssick_sp","p_vssick0","ckc","cki","vdde","vdd","vsse","vss",0); -+ GENLIB_LOINS("pvddick_sp","p_vddick0","ckc","cki","vdde","vdd","vsse","vss",NULL); -+ GENLIB_LOINS("pvssick_sp","p_vssick0","ckc","cki","vdde","vdd","vsse","vss",NULL); - -- GENLIB_LOINS("pvddeck_sp","p_vddeck0","ckc","cki","vdde","vdd","vsse","vss",0); -- GENLIB_LOINS("pvddeck_sp","p_vddeck1","ckc","cki","vdde","vdd","vsse","vss",0); -- GENLIB_LOINS("pvsseck_sp","p_vsseck0","ckc","cki","vdde","vdd","vsse","vss",0); -- GENLIB_LOINS("pvsseck_sp","p_vsseck1","ckc","cki","vdde","vdd","vsse","vss",0); -+ GENLIB_LOINS("pvddeck_sp","p_vddeck0","ckc","cki","vdde","vdd","vsse","vss",NULL); -+ GENLIB_LOINS("pvddeck_sp","p_vddeck1","ckc","cki","vdde","vdd","vsse","vss",NULL); -+ GENLIB_LOINS("pvsseck_sp","p_vsseck0","ckc","cki","vdde","vdd","vsse","vss",NULL); -+ GENLIB_LOINS("pvsseck_sp","p_vsseck1","ckc","cki","vdde","vdd","vsse","vss",NULL); - - GENLIB_SAVE_LOFIG(); - -diff -Naur alliance-5.0/documentation/tutorials/synthesis/tex/synthesis.tex test-64/tutorials/synthesis/tex/synthesis.tex ---- alliance-5.0/documentation/tutorials/synthesis/tex/synthesis.tex 2004-10-16 14:52:17.000000000 +0200 -+++ test-64/tutorials/synthesis/tex/synthesis.tex 2009-07-04 12:26:03.345711622 +0200 -@@ -220,7 +211,7 @@ - } - - All the files used in this part are located under \\ --\texttt{/tutorial/synthesis/src} directory.\\ -+\texttt{/usr/share/doc/alliance-doc-5.0/tutorials/synthesis/src} directory.\\ - This directory contents four subdirectories and one Makefile : - \begin{itemize}\itemsep=-.8ex - - diff --git a/alliance-xgra-xgrerror-ld.patch b/alliance-xgra-xgrerror-ld.patch deleted file mode 100644 index 48dc20a..0000000 --- a/alliance-xgra-xgrerror-ld.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- xgra/src/XGR_error.c 2007-11-27 21:41:32.000000000 +0100 -+++ XGR_error.c 2009-08-28 07:53:58.546631214 +0200 -@@ -270,7 +270,7 @@ - - if ( XgraFigureGra != (autgraph *)NULL ) - { -- sprintf( Scan, " FIGURE : %s\n\n NODES : %d\n ARCS : %d\n\n", -+ sprintf( Scan, " FIGURE : %s\n\n NODES : %ld\n ARCS : %ld\n\n", - XgraFigure->NAME, - XgraFigureGra->NUMBER_NODE, - XgraFigureGra->NUMBER_ARC ); -@@ -282,7 +282,7 @@ - - Scan = Scan + strlen( Scan ); - -- sprintf( Scan, " BOUNDING BOX : \n\n XMIN : %d\n YMIN : %d\n XMAX : %d\n YMAX : %d\n\n", -+ sprintf( Scan, " BOUNDING BOX : \n\n XMIN : %ld\n YMIN : %ld\n XMAX : %ld\n YMAX : %ld\n\n", - XgraBoundXmin / XGRA_UNIT, XgraBoundYmin / XGRA_UNIT, - XgraBoundXmax / XGRA_UNIT, XgraBoundYmax / XGRA_UNIT ); - diff --git a/alliance-xgra.patch b/alliance-xgra.patch deleted file mode 100644 index 89bddda..0000000 --- a/alliance-xgra.patch +++ /dev/null @@ -1,147 +0,0 @@ ---- /home/chitlesh/rpmbuild/BUILD/alliance-5.0/xgra/Makefile.am 2009-08-28 07:20:46.993629321 +0200 -+++ src/xgra/Makefile.am 2009-08-28 07:26:58.090631633 +0200 -@@ -1 +1,143 @@ --SUBDIRS = src etc -+bin_PROGRAMS = \ -+ xgra -+ -+xgra_CPPFLAGS = \ -+ $(GLIB_CFLAGS) \ -+ -DG_LOG_DOMAIN=\"xgra\" \ -+ $(MOTIF_CFLAGS) \ -+ -DXGRA_DEFAULT_PARAM_NAME=\"${sysconfdir}/xgra.par\" \ -+ -DXMS_FILE_NAME=\".xgra.cfg\" \ -+ -I$(top_srcdir)/mbk/src \ -+ -I$(top_srcdir)/aut/src -+ -+xgra_SOURCES = \ -+ xgra.c \ -+ xgra.h \ -+ XGR_bound.c \ -+ XGR_bound.h \ -+ XGR_error.c \ -+ XGR_error.h \ -+ XGR_graph.c \ -+ XGR_graph.h \ -+ XGR_object.c \ -+ XGR_object.h \ -+ XGR_place.c \ -+ XGR_place.h \ -+ XGR_select.c \ -+ XGR_select.h \ -+ XGR.h \ -+ XME_dialog.c \ -+ XME_dialog.h \ -+ XME_edit.c \ -+ XME_edit.h \ -+ XME.h \ -+ XME_menu.c \ -+ XME_menu.h \ -+ XME_message.c \ -+ XME_message.h \ -+ XME_panel.c \ -+ XME_panel.h \ -+ XME_search.c \ -+ XME_search.h \ -+ XME_select.c \ -+ XME_select.h \ -+ XMF_dialog.c \ -+ XMF_dialog.h \ -+ XMF_file.c \ -+ XMF_file.h \ -+ XMF.h \ -+ XMF_menu.c \ -+ XMF_menu.h \ -+ XMF_panel.c \ -+ XMF_panel.h \ -+ XMH.h \ -+ XMH_help.c \ -+ XMH_help.h \ -+ XMH_menu.c \ -+ XMH_menu.h \ -+ XMH_panel.c \ -+ XMH_panel.h \ -+ XMS_dialog.c \ -+ XMS_dialog.h \ -+ XMS.h \ -+ XMS_menu.c \ -+ XMS_menu.h \ -+ XMS_panel.c \ -+ XMS_panel.h \ -+ XMS_setup.c \ -+ XMS_setup.h \ -+ XMT_dialog.c \ -+ XMT_dialog.h \ -+ XMT.h \ -+ XMT_menu.c \ -+ XMT_menu.h \ -+ XMT_message.c \ -+ XMT_message.h \ -+ XMT_panel.c \ -+ XMT_panel.h \ -+ XMT_tools.c \ -+ XMT_tools.h \ -+ XMV_dialog.c \ -+ XMV_dialog.h \ -+ XMV.h \ -+ XMV_map.c \ -+ XMV_map.h \ -+ XMV_menu.c \ -+ XMV_menu.h \ -+ XMV_message.c \ -+ XMV_message.h \ -+ XMV_panel.c \ -+ XMV_panel.h \ -+ XMV_view.c \ -+ XMV_view.h \ -+ XMX_color.c \ -+ XMX_color.h \ -+ XMX_cursor.c \ -+ XMX_cursor.h \ -+ XMX_dialog.c \ -+ XMX_dialog.h \ -+ XMX_event.c \ -+ XMX_event.h \ -+ XMX_graphic.c \ -+ XMX_graphic.h \ -+ XMX_grid.c \ -+ XMX_grid.h \ -+ XMX.h \ -+ XMX_icon.c \ -+ XMX_icon.h \ -+ XMX_menu.c \ -+ XMX_menu.h \ -+ XMX_message.c \ -+ XMX_message.h \ -+ XMX_motif.c \ -+ XMX_motif.h \ -+ XMX_panel.c \ -+ XMX_panel.h \ -+ XMX_view.c \ -+ XMX_view.h \ -+ XSB_error.c \ -+ XSB_error.h \ -+ XSB.h \ -+ XSB_parse.c \ -+ XSB_parse.h \ -+ XSB_share.c \ -+ XSB_share.h \ -+ XTB_cursor.c \ -+ XTB_cursor.h \ -+ XTB_dialog.c \ -+ XTB_dialog.h \ -+ XTB.h \ -+ XTB_icon.c \ -+ XTB_icon.h \ -+ XTB_menu.c \ -+ XTB_menu.h \ -+ XTB_panel.c \ -+ XTB_panel.h \ -+ XTB_pixmap.c \ -+ XTB_pixmap.h -+ -+xgra_LDADD = \ -+ $(GLIB_CFLAGS) \ -+ $(MOTIF_LIBS) \ -+ $(top_builddir)/src/aut/libAut.la \ -+ $(top_builddir)/src/mbk/libMut.la diff --git a/alliance.spec b/alliance.spec index 546597c..bccda9f 100644 --- a/alliance.spec +++ b/alliance.spec @@ -1,10 +1,10 @@ %define prefix %{_libdir}/%{name} -%define snapshot 20090827 +%define snapshot 20090901 %define _default_patch_fuzz 2 Name: alliance Version: 5.0 -Release: 30.%{snapshot}snap%{?dist} +Release: 31.%{snapshot}snap%{?dist} Summary: VLSI EDA System License: GPLv2 @@ -13,51 +13,16 @@ 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-run.patch -Patch2: alliance-perms.patch -# Improving autogeneration of documentation -Patch3: alliance-tutorials-place_n_route.patch -Patch4: alliance-tutorials-simulation.patch -Patch5: alliance-tutorials-start.patch -Patch6: alliance-tutorials-synthesis.patch -Patch7: alliance-tutorials-amd2901.patch - -# Improving examples -Patch8: alliance-examples.patch -Patch9: alliance-examples-adm2901.patch -Patch10: alliance-examples-mipsR3000.patch - -# upstream enhancements -Patch11: alliance-xgra.patch - -# Fixes warning: format '%%d' expects type 'int', but argument N has type 'long int' -Patch12: alliance-xgra-xgrerror-ld.patch - -Source1: xsch.desktop -Source2: dreal.desktop -Source3: xpat.desktop -Source4: xfsm.desktop -Source5: xvpn.desktop -Source6: graal.desktop -Source7: xgra.desktop - -Source8: alliance.fedora +Source1: alliance.fedora # Chitlesh's donated pictures to alliance -Source9: graal.png -Source10: dreal.png -Source11: xvpn.png -Source12: xfsm.png -Source13: xpat.png -Source14: xsch.png -Source15: xgra.png +# included asfrom snapshot 20090901 -Source16: alliance-tutorials-go-all.sh -Source17: alliance-tutorials-go-all-clean.sh -Source18: alliance-examples-go-all.sh -Source19: alliance-examples-go-all-clean.sh +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: libXt-devel byacc desktop-file-utils bison @@ -72,7 +37,7 @@ BuildRequires: lesstif-devel %endif Requires: xorg-x11-fonts-misc -# 442379 +# RHBZ 442379 Requires(post): %{name}-libs = %{version}-%{release} %description @@ -137,31 +102,17 @@ Documentation and tutorials for the Alliance VLSI CAD Sytem. %setup -q %{__rm} -rf autom4te.cache -%{__cp} -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} . -sed -i "s|ALLIANCE_TOP|%{prefix}|" *.desktop +%{__cp} -p %{SOURCE1} . +sed -i "s|ALLIANCE_TOP|%{prefix}|" distrib/*.desktop # 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 -%patch11 -p1 -b .xgra-makefile.am -%patch12 -p0 -b .xgra-long - - -%patch0 -p0 -b .env -%patch1 -p0 -b .run -%patch2 -p0 -b .perms - - # ------------------------------------------------------------------------------ # Description : 2008 March : TexLive introduction to Rawhide sed -i "s|tutorials||" documentation/Makefile.in sed -i "s|documentation/tutorials/Makefile||" configure* -%patch3 -p1 -b .doc -%patch4 -p1 -b .doc -%patch5 -p1 -b .doc -%patch6 -p1 -b .doc -%patch7 -p0 -b .doc pushd documentation/tutorials # clean unneccessary files %{__rm} Makefile* @@ -175,8 +126,8 @@ pushd documentation/tutorials %{__rm} -rf $folder done # Add automated scripts to tutorials - %{__install} -pm 755 %{SOURCE16} go-all.sh - %{__install} -pm 755 %{SOURCE17} go-all-clean.sh + %{__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 @@ -184,10 +135,6 @@ pushd documentation/tutorials popd # ------------------------------------------------------------------------------ -%patch8 -p0 -b .examples -%patch9 -p1 -b .examples -%patch10 -p1 -b .examples - # 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 @@ -211,10 +158,14 @@ done sed -i 's/\r//' mipsR3000/asm/* popd -# Fix xgra build -sed -i "s|AM_CFLAGS =|AM_CFLAGS = -I../../mbk/src -I../../aut/src/|g" xgra/src/Makefile* -sed -i "s|xgra_LDADD =|xgra_LDADD = -L../../mbk/src -L../../aut/src/|g" xgra/src/Makefile* - +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} @@ -225,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 @@ -244,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.* @@ -262,8 +212,8 @@ popd %{__rm} -rf %{buildroot}%{prefix}/examples/ # Add automated scripts to examples -%{__install} -pm 755 %{SOURCE18} alliance-examples/go-all.sh -%{__install} -pm 755 %{SOURCE19} alliance-examples/go-all-clean.sh +%{__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 @@ -277,13 +227,13 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' # Adding icons for the menus %{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/ -%{__cp} -p %{SOURCE9} %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} %{SOURCE15} \ +%{__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 +for desktopfile in distrib/*.desktop; do desktop-file-install --vendor "" \ --dir %{buildroot}%{_datadir}/applications/ \ $desktopfile @@ -327,6 +277,7 @@ sed -i "s|/bin/zsh|/bin/sh|" doc/alliance-run/bench.zsh %{_fixperms} %{buildroot}/* + %post /sbin/ldconfig source %{_sysconfdir}/profile.d/alc_env.sh @@ -349,8 +300,8 @@ 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/* @@ -381,6 +332,10 @@ 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 diff --git a/dreal.desktop b/dreal.desktop deleted file mode 100644 index 73d12f0..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=Electronics;Engineering; -Comment=View the Real layout diff --git a/dreal.png b/dreal.png deleted file mode 100644 index 50e608ab6c0d88cab066839b83e57ed0b8a06f24..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5967 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%0AHQv=`apl*-~9aNskD*r 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 diff --git a/import.log b/import.log index be4025a..8f83fb7 100644 --- a/import.log +++ b/import.log @@ -1,3 +1,4 @@ alliance-5_0-21_20070718snap_fc9:HEAD:alliance-5.0-21.20070718snap.fc9.src.rpm:1221496180 alliance-5_0-24_20070718snap_fc10:F-10:alliance-5.0-24.20070718snap.fc10.src.rpm:1233515871 alliance-5_0-30_20090827snap_fc11:F-10:alliance-5.0-30.20090827snap.fc11.src.rpm:1251454888 +alliance-5_0-31_20090901snap_fc11:F-10:alliance-5.0-31.20090901snap.fc11.src.rpm:1251954526 diff --git a/sources b/sources index 21938b3..9af8cf1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8591c98de3f24a76e81b5ecb4cf60f7d alliance-5.0-20090827.tar.gz +f3b692c4ea9e54c040280f660b3cf170 alliance-5.0-20090901.tar.gz diff --git a/xfsm.desktop b/xfsm.desktop deleted file mode 100644 index 6dd425c..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=Electronics;Engineering; -Comment=View Finite State Machines diff --git a/xfsm.png b/xfsm.png deleted file mode 100644 index 414f15315c44dc0a18a511aa405cb1269fb50755..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5909 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 diff --git a/xgra.desktop b/xgra.desktop deleted file mode 100644 index 6aedfb2..0000000 --- a/xgra.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Alliance: Graphic Graph Viewer -Exec=ALLIANCE_TOP/bin/xgra -Icon=xgra.png -Type=Application -Terminal=false -GenericName=xpvn -Categories=Electronics;Engineering; -Comment=View the graphic graph diff --git a/xgra.png b/xgra.png deleted file mode 100644 index 39579358a14cec92673695b12f1b894c90f55ae7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6079 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 Date: Thu, 26 Nov 2009 01:26:29 +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 2202898c4027664c79f1a8cf8f24af6d2e1714d1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:43:30 +0000 Subject: [PATCH 8/8] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 4 ---- 4 files changed, 26 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log 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 dc32377..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-10 diff --git a/import.log b/import.log deleted file mode 100644 index 8f83fb7..0000000 --- a/import.log +++ /dev/null @@ -1,4 +0,0 @@ -alliance-5_0-21_20070718snap_fc9:HEAD:alliance-5.0-21.20070718snap.fc9.src.rpm:1221496180 -alliance-5_0-24_20070718snap_fc10:F-10:alliance-5.0-24.20070718snap.fc10.src.rpm:1233515871 -alliance-5_0-30_20090827snap_fc11:F-10:alliance-5.0-30.20090827snap.fc11.src.rpm:1251454888 -alliance-5_0-31_20090901snap_fc11:F-10:alliance-5.0-31.20090901snap.fc11.src.rpm:1251954526