diff --git a/alliance/src/distrib/Makefile.am b/alliance/src/distrib/Makefile.am index 2185e856..62316f0d 100644 --- a/alliance/src/distrib/Makefile.am +++ b/alliance/src/distrib/Makefile.am @@ -1,8 +1,10 @@ -# $Id: Makefile.am,v 1.3 2009/09/02 08:48:47 jpc Exp $ +# $Id: Makefile.am,v 1.4 2012/04/17 08:05:13 alliance Exp $ SUBDIRS = doc etc -EXTRA_DIST = alliance.spec.in alliance.spec alliance-fedora.spec \ +EXTRA_DIST = alliance.spec.in alliance-fedora.spec \ + alliance-examples-go-all.sh alliance-examples-go-all-clean.sh \ + alliance-tutorials-go-all.sh alliance-tutorials-go-all-clean.sh \ dreal.png graal.png xfsm.png xgra.png xpat.png xsch.png xvpn.png \ dreal.desktop graal.desktop xfsm.desktop xgra.desktop xpat.desktop \ xsch.desktop xvpn.desktop diff --git a/alliance/src/distrib/alliance-examples-go-all-clean.sh b/alliance/src/distrib/alliance-examples-go-all-clean.sh new file mode 100755 index 00000000..328e7db1 --- /dev/null +++ b/alliance/src/distrib/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/src/distrib/alliance-examples-go-all.sh b/alliance/src/distrib/alliance-examples-go-all.sh new file mode 100755 index 00000000..731c40c8 --- /dev/null +++ b/alliance/src/distrib/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/src/distrib/alliance-fedora.spec b/alliance/src/distrib/alliance-fedora.spec index de65f97a..c1420de5 100644 --- a/alliance/src/distrib/alliance-fedora.spec +++ b/alliance/src/distrib/alliance-fedora.spec @@ -1,10 +1,10 @@ %define prefix %{_libdir}/%{name} -%define snapshot 20110203 +%define snapshot 20120416 %define _default_patch_fuzz 2 Name: alliance Version: 5.0 -Release: 1.%{snapshot}snap%{?dist} +Release: 32.%{snapshot}snap%{?dist} Summary: VLSI EDA System License: GPLv2 @@ -13,17 +13,9 @@ 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/ - -Source1: alliance.fedora - # Chitlesh's donated pictures to alliance # included asfrom snapshot 20090901 -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 BuildRequires: libXp-devel libXpm-devel libstdc++-devel flex m4 @@ -104,7 +96,7 @@ Documentation and tutorials for the Alliance VLSI CAD Sytem. %setup -q %{__rm} -rf autom4te.cache -%{__cp} -p %{SOURCE1} . +cp distrib/alliance.fedora . sed -i "s|ALLIANCE_TOP|%{prefix}|" distrib/*.desktop # removed useless copyrighted (by Cadence) lines from the examples @@ -129,8 +121,8 @@ pushd documentation/tutorials %{__rm} -rf $folder done # Add automated scripts to tutorials - %{__install} -pm 755 %{SOURCE2} go-all.sh - %{__install} -pm 755 %{SOURCE3} go-all-clean.sh + %{__install} -pm 755 ../../distrib/alliance-tutorials-go-all.sh go-all.sh + %{__install} -pm 755 ../../distrib/alliance-tutorials-go-all-clean.sh go-all-clean.sh # Fedora Electronic Lab self test for alliance #./go-all.sh 2>&1 | tee self-test-tutorials.log # clean temporary files @@ -182,6 +174,7 @@ autoconf --includedir=%{prefix}/include \ --libdir=%{prefix}/lib \ --bindir=%{prefix}/bin \ + --sysconfdir=/etc \ --mandir=%{_datadir}/%{name}/man # RHBZ 252941 # disabling rpath @@ -202,6 +195,8 @@ 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. +#%{__mkdir_p} %{buildroot}%{_sysconfdir}/profile.d +#mv %{buildroot}%{prefix}/etc/*.*sh %{buildroot}%{_sysconfdir}/profile.d pushd %{buildroot}%{_sysconfdir}/profile.d chmod 0644 alc_env.* sed -i "s|@DATE@|`date`|" alc_env* @@ -218,8 +213,8 @@ popd %{__rm} -rf %{buildroot}%{prefix}/examples/ # Add automated scripts to examples -%{__install} -pm 755 %{SOURCE4} alliance-examples/go-all.sh -%{__install} -pm 755 %{SOURCE5} alliance-examples/go-all-clean.sh +%{__install} -pm 755 ./distrib/alliance-examples-go-all.sh alliance-examples/go-all.sh +%{__install} -pm 755 ./distrib/alliance-examples-go-all-clean.sh alliance-examples/go-all-clean.sh pushd alliance-examples/ # FEL self test for alliance @@ -341,6 +336,10 @@ touch --no-create %{_datadir}/icons/hicolor || : %changelog +* Tue Apr 17 2012 Jean-Paul Chaput - 5.0-32.20120416 +- This snapshot integrates the bug avoidance for druc (uses -O0 and *not* -O2). +- Merge in the scripts written by Chitlest Goorah (no more extra sources). + * Wed Sep 02 2009 Chitlesh Goorah - 5.0-31.20090901snap - updated to upstream's 20090901 snapshot - Removed all patches which are accepted by upstream diff --git a/alliance/src/distrib/alliance-tutorials-go-all-clean.sh b/alliance/src/distrib/alliance-tutorials-go-all-clean.sh new file mode 100755 index 00000000..12617754 --- /dev/null +++ b/alliance/src/distrib/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/src/distrib/alliance-tutorials-go-all.sh b/alliance/src/distrib/alliance-tutorials-go-all.sh new file mode 100755 index 00000000..489368ee --- /dev/null +++ b/alliance/src/distrib/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/src/distrib/alliance.fedora b/alliance/src/distrib/alliance.fedora new file mode 100644 index 00000000..add52ada --- /dev/null +++ b/alliance/src/distrib/alliance.fedora @@ -0,0 +1,44 @@ + +=== License === +Alliance CAD system is distributed under the GNU license v2. +There is no more or less limitation than the ones defined by the GPL v2. + +You are kindly requested to mention +" Designed with alliance (c) LIP6, Université Pierre et Marie Curie" +so as to spread the word about "alliance CAD system" and its development team. + + +=== Proper Usage === + +It is recommended to source the alc_env.sh or alc_env.csh before using alliance. + +source /etc/profile.d/alc_env.sh +(for example) + +When a user logs in, environment variables on +/etc/profile.d/alc_env.sh +are set will be automatically sourced. + + +=== Overview === + +A general overview of Alliance CAD System can be found here: +/usr/share/doc/alliance-doc-5.0/design-flow/index.html +(available on the alliance-doc rpm) + +=== Tutorials === + +The tutorials can be found at /usr/share/doc/alliance-doc-5.0/tutorials/ +(available on the alliance-doc rpm) + +It is recommended to first read /usr/share/doc/alliance-doc-5.0/overview.pdf + 1. start.pdf + 2. simulation.pdf + 3. synthesis.pdf + 4. place_and_route.pdf + + +========================================================================================= +Chitlesh Goorah (chitlesh AT fedoraproject DOT org) +Alliance development team and other contributors (ASIM/LIP6/UPMC) +alliance-users AT asim DOT lip6 DOT fr