diff --git a/alliance/src/alliance.m4 b/alliance/src/alliance.m4 index 97f09725..5a5b36d1 100644 --- a/alliance/src/alliance.m4 +++ b/alliance/src/alliance.m4 @@ -98,9 +98,9 @@ AC_SUBST(ALLIANCE_CFLAGS) AC_SUBST(ALLIANCE_LIBS) AC_SUBST(ALLIANCE_TOP) -INSTALL_DATA='${INSTALL} -m 664' +INSTALL_DATA='${INSTALL} -m 644' AC_SUBST(INSTALL_DATA) -INSTALL_PROGRAM='${INSTALL} -m 775' +INSTALL_PROGRAM='${INSTALL} -m 755' AC_SUBST(INSTALL_PROGRAM) AC_DEFINE_UNQUOTED(ALLIANCE_VERSION, "5.0") diff --git a/alliance/src/aut/src/autresize.c b/alliance/src/aut/src/autresize.c index 68f7a8ca..f2e8a54c 100644 --- a/alliance/src/aut/src/autresize.c +++ b/alliance/src/aut/src/autresize.c @@ -42,7 +42,7 @@ \------------------------------------------------------------*/ # include -# include +# include # include # include diff --git a/alliance/src/distrib/alliance-fedora.spec b/alliance/src/distrib/alliance-fedora.spec new file mode 100644 index 00000000..546597cb --- /dev/null +++ b/alliance/src/distrib/alliance-fedora.spec @@ -0,0 +1,565 @@ +%define prefix %{_libdir}/%{name} +%define snapshot 20090827 +%define _default_patch_fuzz 2 + +Name: alliance +Version: 5.0 +Release: 30.%{snapshot}snap%{?dist} +Summary: VLSI EDA System + +License: GPLv2 +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 + +# 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 + +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: libXt-devel byacc desktop-file-utils bison +BuildRequires: libXp-devel libXpm-devel libstdc++-devel flex m4 +BuildRequires: transfig ghostscript + +%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} + +%description +Alliance is a complete set of free CAD tools and portable libraries for +VLSI design. It includes a VHDL compiler and simulator, logic synthesis +tools, and automatic place and route tools. + +A complete set of portable CMOS libraries is provided, including a RAM +generator, a ROM generator and a data-path compiler. + +Alliance is the result of more than ten years effort spent at ASIM department +of LIP6 laboratory of the Pierre et Marie Curie University (Paris VI, France). + +Alliance has been used for research projects such as the 875 000 transistors +StaCS superscalar microprocessor and 400 000 transistors IEEE Gigabit HSL +Router. + +You are kindly requested to mention +" Designed with alliance (c) LIP6, Université Pierre et Marie Curie" +so as to spread the word about "alliance CAD system" and its development team. + +Alliance provides CAD tools covering most of all the digital design flow: + + * VHDL Compilation and Simulation + * Model checking and formal proof + * RTL and Logic synthesis + * Data-Path compilation + * Macro-cells generation + * Place and route + * Layout edition + * Netlist extraction and verification + * Design rules checking + +%{name} is listed among Fedora Electronic Lab (FEL) packages. + + +%package libs +Summary: Alliance VLSI CAD Sytem - multilibs +Group: Applications/Engineering +Requires: %{name} = %{version}-%{release} +Requires: electronics-menu + + +%description libs +Architecture dependent files for the Alliance VLSI CAD Sytem. + + +%package doc +Summary: Alliance VLSI CAD Sytem - Documentations +Group: Applications/Engineering +Requires: %{name} = %{version}-%{release} +Requires: gnuplot +BuildRequires:tetex-latex + + + +%description doc +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} %{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 +%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* + %{__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 + +# 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 FAQ README LICENCE distrib/doc/alc_origin.1 alcban/man1/alcbanner.1 \ + loon/doc/loon.1 m2e/doc/man1/m2e.1 boog/doc/boog.1 ; do + %{_bindir}/iconv -f ISO-8859-1 -t utf-8 $nonUTF8 > $nonUTF8.conv + %{__mv} -f $nonUTF8.conv $nonUTF8 +done + +pushd documentation/alliance-examples/ +# make sure the man pages are UTF-8... +for nonUTF8 in tuner/build_tuner mipsR3000/asm/mips_defs.h tuner/tuner.vbe \ + tuner/README mipsR3000/sce/mips_dpt.c ; do + %{_bindir}/iconv -f ISO-8859-1 -t utf-8 $nonUTF8 > $nonUTF8.conv + %{__mv} -f $nonUTF8.conv $nonUTF8 +done + +#wrong-file-end-of-line-encoding +sed -i 's/\r//' 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 + +export ALLIANCE_TOP=%{prefix} + +%configure --prefix=%{prefix} \ + --enable-alc-shared \ + --disable-static \ + --includedir=%{prefix}/include \ + --libdir=%{prefix}/lib \ + --bindir=%{prefix}/bin \ + --mandir=%{_datadir}/%{name}/man #252941 + +# disabling rpath +sed -i 's|^hardcode_libdir_flag_spec="\\${wl}--rpath \\${wl}\\$libdir"|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool + +# clean unused-direct-shlib-dependencies +sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool + +# Is not parallel-build-safe +%{__make} + + +%install + +%{__rm} -rf %{buildroot} + +%{__make} INSTALL="install -p" DESTDIR=%{buildroot} install + + +# Set execution rights on the alc_env.* batchs and adjust ALLIANCE_TOP. +pushd %{buildroot}%{_sysconfdir}/profile.d + chmod 0644 alc_env.* + sed -i "s|@DATE@|`date`|" alc_env* + sed "s|ALLIANCE_TOP *= *\([^;]*\)|ALLIANCE_TOP=%{prefix}|" alc_env.sh + sed "s|setenv *ALLIANCE_TOP *\([^;]*\)|setenv ALLIANCE_TOP %{prefix}|" alc_env.csh +popd + + +# documentation +%{__cp} -pr %{buildroot}%{prefix}/doc/ . +%{__cp} -pr %{buildroot}%{prefix}/examples/alliance-examples/ . + +%{__rm} -rf %{buildroot}%{prefix}/doc/ +%{__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 + +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 %{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 "" \ + --dir %{buildroot}%{_datadir}/applications/ \ + $desktopfile +done + + +# Architecture independent files +%{__mv} %{buildroot}%{prefix}/cells %{buildroot}%{_datadir}/%{name}/ +%{__mv} %{buildroot}%{prefix}/etc %{buildroot}%{_datadir}/%{name}/ + + +# protecting hardcoded links +ln -sf ../../..%{_datadir}/%{name}/cells %{buildroot}%{prefix}/cells +ln -sf ../../..%{_datadir}/%{name}/etc %{buildroot}%{prefix}/etc +ln -sf ../../..%{_datadir}/%{name}/man %{buildroot}%{prefix}/man + + +# manpage-not-gzipped +find %{prefix}/man -type f -not -name '*.gz' -print | xargs gzip -9f + + +%{__mkdir} -p %{buildroot}%{_sysconfdir}/ld.so.conf.d/ +cat > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}.conf << EOF +# Alliance VLSI design system +%{prefix}/lib +EOF + + +# removing tools for compiling and installing Alliance tools +# These are for the packager (i.e me) and not for user +%{__rm} -f %{buildroot}%{_sysconfdir}/%{name}/attila.conf +%{__rm} -f %{buildroot}%{prefix}/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 +source %{_sysconfdir}/profile.d/alc_env.sh +touch --no-create %{_datadir}/icons/hicolor || : +%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + + +%postun +/sbin/ldconfig +touch --no-create %{_datadir}/icons/hicolor || : +%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + + + +%clean +%{__rm} -rf %{buildroot} + +#These headers are useful for the _usage_ of the binaries +#without these headers some of the binaries will be broken by default + + +%files +%doc CHANGES LICENCE COPYING* FAQ alliance.fedora +%defattr(-,root,root,-) +%{prefix}/ +%{_datadir}/%{name}/ +%{_datadir}/icons/hicolor/48x48/apps/* + + +%files libs +%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 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) +# * it is not part of the build, but part of the working environment of the user +%doc alliance-examples/ +%doc doc/alliance-run/ + + + +%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 + +* 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 + +* Mon Sep 15 2008 Chitlesh Goorah - 5.0-21.20070718snap +- Bugfix : Alliance incorrectly mungs your path and adds the cwd to the path #459336 +- Bugfix : Latest alc_env fixes broken system man path #452645 + +* Mon Aug 04 2008 Aanjhan Ranganathan - 5.0-20.20070718snap +- Bumped release version to match changelog + +* Fri Aug 01 2008 Aanjhan Ranganathan - 5.0-16.20070718snap +- Rebuild using latest lesstif-devel. For #368441 +- Temporarily set fuzz parameter of patch system to be 2 + +* Fri May 30 2008 Chitlesh Goorah - 5.0-16.20070718snap +- Bugfix /etc/profile.d/alc_env.csh problem #449062 #448480 + +* Mon May 26 2008 Chitlesh Goorah - 5.0-15.20070718snap +- Bugfix: error in postinstall scriptlet: /etc/profile.d/alc_env.sh not found #442379 +- Bugfix: /etc/profile.d/alc_env.csh assumes MANPATH is preset #440083 + +* Tue May 20 2008 Thibault North < tnorth [AT] fedoraproject DOT org> - 5.0-14.20070718snap +- Add to Electronics Menu + +* Fri Mar 21 2008 Chitlesh Goorah - 5.0-13.20070718snap +- Requiring new FEL menu structure +- Fixing previous desktop files +- closing unconfirmed bug #427691 +- fixing multilibs issues #340621 + +* Tue Mar 18 2008 Thibault North < tnorth [AT] fedoraproject DOT org> - 5.0-13.20070718snap +- dropped patch4: alliance-tutorials.patch +- fixed TexLive related issues for documentation +- commenting previous make in directory tutorials +- attached tutorials made in F8 Werewolf +- dropped BR :tetex-latex +- added patch4: including more useful includes to C files +- fixed bug #434020 : alliance failed massrebuild attempt for GCC4.3 + +* Mon Feb 18 2008 Fedora Release Engineering - 5.0-12.20070718snap +- Autorebuild for GCC 4.3 + +* Sun Feb 10 2008 Chitlesh Goorah - 5.0-11.20070718snap +- mass rebuild for gcc43 on rawhide +- ensuring multilibs (#340621) + +* Thu Aug 23 2007 Chitlesh Goorah - 5.0-10.20070718snap +- complying to freedesktop policies - categories + +* Sat Aug 18 2007 Chitlesh Goorah - 5.0-9.20070718snap +- fixing desktop files +- fixing MANPATH and PATH for proper priority + +* Thu Aug 16 2007 Chitlesh Goorah - 5.0-8.20070718snap +- fixing conflicts with QuantLib-doc package (#252941) +- update license macro to comply with new guidelines) + +* Sun Aug 12 2007 Chitlesh Goorah - 5.0-7.20070718snap +- moved Architecture independent files to %%{_datadir}/%%{name} +- Uses verbs in the comments line for desktop files + +* Thu Aug 02 2007 Chitlesh Goorah - 5.0-6.20070718snap +- chose libdir/alliance as prefix +- added new icons to the menus +- removed useless attila +- fixed MANPATH override + +* Sat Jul 28 2007 Chitlesh Goorah - 5.0-5.20070718snap +- fixed unused-direct-shlib-dependency and undefined-non-weak-symbol warnings + +* Tue Jul 24 2007 Chitlesh Goorah - 5.0-4.20070718snap +- removed X-Desktop-File-Install-Version=0.10 from desktop files +- moved the alc_env to /etc/profile.d +- updated to meet reviewer's statements - #248649 + +* Thu Jul 19 2007 Chitlesh Goorah - 5.0-3.20070718snap +- New upstream release which includes bug fixes + +* Wed Jul 18 2007 Chitlesh Goorah - 5.0-2.20060509snap +- minor fixes to the tutorials + added transfig ghostscript tetex-latex as BR +- corrected some hardcoded links in the scripts +- removed %%preun and updated alliance.fedora +- spec file updated to satisfy the review + +* Tue Jul 17 2007 Chitlesh Goorah - 5.0-1 +- prepared spec file for review and spec clean ups +- removed rm and ln from %%post and %%preun +- removed log.3.gz from mandir since it's a duplicate and conflicts with man-pages + +* Sat Jul 14 2007 Chitlesh Goorah - 5.0-0.7 +- since it is not parallel-build-safe, smp mflags are removed : (by wwoods) +- added missing BR : flex : (by wwoods) +- added missing BR : bison: (by rdieter) + +* Fri Jul 13 2007 Chitlesh Goorah - 5.0-0.6 +- removing useless copyrighted lines from .ioc files +- added alliance.fedora among the %%doc + +* Thu Jul 12 2007 Chitlesh Goorah - 5.0-0.5 +- removing copyrighted materials +- patching the remaining examples so that they will still be valid under another folder + +* Wed Jul 04 2007 Chitlesh Goorah - 5.0-0.4 +- removing unwanted debug duplicates + +* Wed May 02 2007 Chitlesh Goorah - 5.0-0.3 +- added desktop files + +* Wed Feb 14 2007 Chitlesh Goorah - 5.0-0.2 +- fixing documentations + +* Wed Dec 13 2006 Chitlesh Goorah - 5.0-0.1 +- Initial package + +* Thu Feb 17 2005 Jean-Paul.Chaput +- Synch with current version: bug & compliance with gcc 3.4.x. + +* Fri Jul 16 2004 Jean-Paul.Chaput +- Added Tutorial sub-package (now managed by autoconf/automake). +- Removed release tag, must be given at compile time using the + --define command line argument of rpmbuild (see mkdistrib). + +* Sat Nov 15 2003 Jean-Paul.Chaput +- assert is now in assert.h, patch mut.h to include it if + GCC_VERSION >= 3003 (gcc >= 3.3.x). + +* Sat Oct 18 2003 Jean-Paul.Chaput +- Synched with 2003/10/18 version. +- Missing depcomp : added "--add-missing --copy" to the individual + packages in autostuff, so the first who needs depcomp will add + it at top level. + +* Sun Oct 13 2002 Jean-Paul.Chaput +- autoconf m4 macros moved back in the Alliance source tree to avoid + re-declaration on our development computers (on which the macros + are in teh source tree). +- Adopt the versioning scheme from czo. +- Try to switch to dynamic libraries. + +* Wed Jul 17 2002 Jean-Paul.Chaput +- Moved autoconf m4 macros to /usr/share/aclocal. +- Synched with the current CVS version of Alliance. + +* Fri May 31 2002 Jean-Paul.Chaput +- GenPat added. +- GenLib docs added. +- seplace/seroute/sea bug fixes. + +* Thu May 16 2002 Jean-Paul.Chaput +- Corrected buggy substitution of ALLIANCE_TOP in alc_env.csh. +- Remove the alc_env.* scripts in "/etc/profile.d" only if this + is the last package to be removed. + +* Mon May 6 2002 Jean-Paul.Chaput +- Initial packaging for release 5.0 (alpha stage). diff --git a/alliance/src/distrib/dreal.desktop b/alliance/src/distrib/dreal.desktop new file mode 100644 index 00000000..73d12f06 --- /dev/null +++ b/alliance/src/distrib/dreal.desktop @@ -0,0 +1,10 @@ +[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/alliance/src/distrib/dreal.png b/alliance/src/distrib/dreal.png new file mode 100644 index 00000000..50e608ab Binary files /dev/null and b/alliance/src/distrib/dreal.png differ diff --git a/alliance/src/distrib/etc/Makefile.am b/alliance/src/distrib/etc/Makefile.am index f3d9ad32..2437e8fe 100644 --- a/alliance/src/distrib/etc/Makefile.am +++ b/alliance/src/distrib/etc/Makefile.am @@ -1,6 +1,6 @@ -# $Id: Makefile.am,v 1.4 2002/06/25 14:09:38 czo Exp $ +# $Id: Makefile.am,v 1.5 2009/09/01 21:33:39 jpc Exp $ -etcdir=$(prefix)/etc +etcdir=/etc/profile.d etc_SCRIPTS=alc_env.csh alc_env.sh diff --git a/alliance/src/distrib/etc/alc_env.csh.in b/alliance/src/distrib/etc/alc_env.csh.in index fb2bfaa5..4791161a 100644 --- a/alliance/src/distrib/etc/alc_env.csh.in +++ b/alliance/src/distrib/etc/alc_env.csh.in @@ -7,7 +7,7 @@ # Alliance CAD system environnement # Usage (in C-shell) : > source alc_env.csh # (C) 1997 Czo -- -# $Id: alc_env.csh.in,v 1.9 2007/11/28 14:58:10 noury Exp $ +# $Id: alc_env.csh.in,v 1.10 2009/09/01 21:33:39 jpc Exp $ # Generated from alc_env.csh.in on @DATE@ # $ALLIANCE_OS and $ALLIANCE_TOP are the only variables you will @@ -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 --git a/alliance/src/distrib/etc/alc_env.sh.in b/alliance/src/distrib/etc/alc_env.sh.in index 34512732..056bd054 100644 --- a/alliance/src/distrib/etc/alc_env.sh.in +++ b/alliance/src/distrib/etc/alc_env.sh.in @@ -7,7 +7,7 @@ # Alliance CAD system environnement # Usage (in Bourne-shell) : > . alc_env.sh # (C) 1997 Czo -- -# $Id: alc_env.sh.in,v 1.8 2007/11/28 14:58:10 noury Exp $ +# $Id: alc_env.sh.in,v 1.9 2009/09/01 21:33:39 jpc Exp $ # Generated from alc_env.sh.in on @DATE@ # $ALLIANCE_OS and $ALLIANCE_TOP are the only variables you will @@ -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 --git a/alliance/src/distrib/graal.desktop b/alliance/src/distrib/graal.desktop new file mode 100644 index 00000000..8dd4c6c5 --- /dev/null +++ b/alliance/src/distrib/graal.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Alliance: Layout Editor +Exec=ALLIANCE_TOP/bin/graal +Icon=graal.png +Type=Application +Terminal=false +GenericName=graal +Categories=Electronics;Engineering; +Comment=Edits physical layouts diff --git a/alliance/src/distrib/graal.png b/alliance/src/distrib/graal.png new file mode 100644 index 00000000..fdd2a038 Binary files /dev/null and b/alliance/src/distrib/graal.png differ diff --git a/alliance/src/distrib/xfsm.desktop b/alliance/src/distrib/xfsm.desktop new file mode 100644 index 00000000..6dd425cd --- /dev/null +++ b/alliance/src/distrib/xfsm.desktop @@ -0,0 +1,10 @@ +[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/alliance/src/distrib/xfsm.png b/alliance/src/distrib/xfsm.png new file mode 100644 index 00000000..414f1531 Binary files /dev/null and b/alliance/src/distrib/xfsm.png differ diff --git a/alliance/src/distrib/xgra.desktop b/alliance/src/distrib/xgra.desktop new file mode 100644 index 00000000..6aedfb28 --- /dev/null +++ b/alliance/src/distrib/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/alliance/src/distrib/xgra.png b/alliance/src/distrib/xgra.png new file mode 100644 index 00000000..39579358 Binary files /dev/null and b/alliance/src/distrib/xgra.png differ diff --git a/alliance/src/distrib/xpat.desktop b/alliance/src/distrib/xpat.desktop new file mode 100644 index 00000000..c9f03750 --- /dev/null +++ b/alliance/src/distrib/xpat.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Alliance: Patterns Viewer +Exec=ALLIANCE_TOP/bin/xpat +Icon=xpat.png +Type=Application +Terminal=false +GenericName=xpat +Categories=Electronics;Engineering; +Comment=View the Patterns diff --git a/alliance/src/distrib/xpat.png b/alliance/src/distrib/xpat.png new file mode 100644 index 00000000..39579358 Binary files /dev/null and b/alliance/src/distrib/xpat.png differ diff --git a/alliance/src/distrib/xsch.desktop b/alliance/src/distrib/xsch.desktop new file mode 100644 index 00000000..316f8777 --- /dev/null +++ b/alliance/src/distrib/xsch.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Alliance: Schematic Viewer +Exec=ALLIANCE_TOP/bin/xsch +Icon=xsch.png +Type=Application +Terminal=false +GenericName=Xsch +Categories=Electronics;Engineering; +Comment=View the Schematic diff --git a/alliance/src/distrib/xsch.png b/alliance/src/distrib/xsch.png new file mode 100644 index 00000000..fc180e30 Binary files /dev/null and b/alliance/src/distrib/xsch.png differ diff --git a/alliance/src/distrib/xvpn.desktop b/alliance/src/distrib/xvpn.desktop new file mode 100644 index 00000000..a6f870bd --- /dev/null +++ b/alliance/src/distrib/xvpn.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Alliance: Petri Nets Viewer +Exec=ALLIANCE_TOP/bin/xvpn +Icon=xvpn.png +Type=Application +Terminal=false +GenericName=xpvn +Categories=Electronics;Engineering; +Comment=View the Petri Nets diff --git a/alliance/src/distrib/xvpn.png b/alliance/src/distrib/xvpn.png new file mode 100644 index 00000000..30c25db2 Binary files /dev/null and b/alliance/src/distrib/xvpn.png differ diff --git a/alliance/src/documentation/alliance-examples/addaccu16/Makefile b/alliance/src/documentation/alliance-examples/addaccu16/Makefile index 0a51974f..ca7de8b3 100644 --- a/alliance/src/documentation/alliance-examples/addaccu16/Makefile +++ b/alliance/src/documentation/alliance-examples/addaccu16/Makefile @@ -17,6 +17,8 @@ # \------------------------------------------------------------*/ 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 @@ XFSM = $(ALLIANCE_BIN)/xfsm 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 --git a/alliance/src/documentation/alliance-examples/addaccu16/README b/alliance/src/documentation/alliance-examples/addaccu16/README index b064a317..27b61048 100644 --- a/alliance/src/documentation/alliance-examples/addaccu16/README +++ b/alliance/src/documentation/alliance-examples/addaccu16/README @@ -10,11 +10,13 @@ This directory contains the VHDL description of a 16 bits adder-accumulator and 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 --git a/alliance/src/documentation/alliance-examples/adder4/Makefile b/alliance/src/documentation/alliance-examples/adder4/Makefile index 5028c4d8..e79a1635 100644 --- a/alliance/src/documentation/alliance-examples/adder4/Makefile +++ b/alliance/src/documentation/alliance-examples/adder4/Makefile @@ -17,6 +17,8 @@ # \------------------------------------------------------------*/ 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 @@ XFSM = $(ALLIANCE_BIN)/xfsm 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 --git a/alliance/src/documentation/alliance-examples/adder4/README b/alliance/src/documentation/alliance-examples/adder4/README index 869db9c9..09d90381 100644 --- a/alliance/src/documentation/alliance-examples/adder4/README +++ b/alliance/src/documentation/alliance-examples/adder4/README @@ -14,7 +14,9 @@ The Makefile set environement 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 "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 --git a/alliance/src/documentation/alliance-examples/adder4/adder4.ioc b/alliance/src/documentation/alliance-examples/adder4/adder4.ioc index 1de844cc..ec5e1026 100644 --- a/alliance/src/documentation/alliance-examples/adder4/adder4.ioc +++ b/alliance/src/documentation/alliance-examples/adder4/adder4.ioc @@ -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 --git a/alliance/src/documentation/alliance-examples/amd2901-vasy/Makefile b/alliance/src/documentation/alliance-examples/amd2901-vasy/Makefile index f8f575be..b6ea1250 100644 --- a/alliance/src/documentation/alliance-examples/amd2901-vasy/Makefile +++ b/alliance/src/documentation/alliance-examples/amd2901-vasy/Makefile @@ -17,6 +17,8 @@ # \------------------------------------------------------------*/ 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 @@ XFSM = $(ALLIANCE_BIN)/xfsm 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 --git a/alliance/src/documentation/alliance-examples/amd2901-vasy/amd2901.ioc b/alliance/src/documentation/alliance-examples/amd2901-vasy/amd2901.ioc index ab330ceb..5ce485a4 100644 --- a/alliance/src/documentation/alliance-examples/amd2901-vasy/amd2901.ioc +++ b/alliance/src/documentation/alliance-examples/amd2901-vasy/amd2901.ioc @@ -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 --git a/alliance/src/documentation/alliance-examples/amd2901/Makefile b/alliance/src/documentation/alliance-examples/amd2901/Makefile index 824d6e5e..326714bc 100644 --- a/alliance/src/documentation/alliance-examples/amd2901/Makefile +++ b/alliance/src/documentation/alliance-examples/amd2901/Makefile @@ -12,6 +12,8 @@ # 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 --git a/alliance/src/documentation/alliance-examples/amd2901/amd2901_chip.c b/alliance/src/documentation/alliance-examples/amd2901/amd2901_chip.c index 3650e3aa..b40d6260 100644 --- a/alliance/src/documentation/alliance-examples/amd2901/amd2901_chip.c +++ b/alliance/src/documentation/alliance-examples/amd2901/amd2901_chip.c @@ -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 @@ int main () "vdd => vdd", "vss => vss", - 0); + NULL); GENLIB_LOINS("pck_sp","p_ck","ck","cki", POWER); @@ -119,13 +119,13 @@ int main () 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/src/documentation/alliance-examples/amd2901/amd2901_core.c b/alliance/src/documentation/alliance-examples/amd2901/amd2901_core.c index 5a54160b..246ac092 100644 --- a/alliance/src/documentation/alliance-examples/amd2901/amd2901_core.c +++ b/alliance/src/documentation/alliance-examples/amd2901/amd2901_core.c @@ -109,7 +109,7 @@ main() "out_x[3:0] => y[3:0]", "vdd => vdd", - "vss => vss", 0); + "vss => vss", NULL); /* ***************** Control Instanciation ****************** */ @@ -161,7 +161,7 @@ main() "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/src/documentation/alliance-examples/amd2901/amd2901_core.ioc b/alliance/src/documentation/alliance-examples/amd2901/amd2901_core.ioc index 83801e88..bd118c2a 100644 --- a/alliance/src/documentation/alliance-examples/amd2901/amd2901_core.ioc +++ b/alliance/src/documentation/alliance-examples/amd2901/amd2901_core.ioc @@ -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 --git a/alliance/src/documentation/alliance-examples/digi/Makefile b/alliance/src/documentation/alliance-examples/digi/Makefile index c53f29e0..48242456 100644 --- a/alliance/src/documentation/alliance-examples/digi/Makefile +++ b/alliance/src/documentation/alliance-examples/digi/Makefile @@ -17,6 +17,8 @@ # \------------------------------------------------------------*/ 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 @@ XFSM = $(ALLIANCE_BIN)/xfsm 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 --git a/alliance/src/documentation/alliance-examples/divcas4/Makefile b/alliance/src/documentation/alliance-examples/divcas4/Makefile index 0d943329..5ced360d 100644 --- a/alliance/src/documentation/alliance-examples/divcas4/Makefile +++ b/alliance/src/documentation/alliance-examples/divcas4/Makefile @@ -17,6 +17,8 @@ # \------------------------------------------------------------*/ 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 @@ XFSM = $(ALLIANCE_BIN)/xfsm 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 --git a/alliance/src/documentation/alliance-examples/divcas4/README b/alliance/src/documentation/alliance-examples/divcas4/README index 4099228a..4c0560a1 100644 --- a/alliance/src/documentation/alliance-examples/divcas4/README +++ b/alliance/src/documentation/alliance-examples/divcas4/README @@ -14,5 +14,6 @@ The Makefile set environement 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 "divcas4" to any writable folder of your choice and type: +$ make diff --git a/alliance/src/documentation/alliance-examples/divcas4/divcas4.ioc b/alliance/src/documentation/alliance-examples/divcas4/divcas4.ioc index 681d47c9..4d21df00 100644 --- a/alliance/src/documentation/alliance-examples/divcas4/divcas4.ioc +++ b/alliance/src/documentation/alliance-examples/divcas4/divcas4.ioc @@ -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 --git a/alliance/src/documentation/alliance-examples/go-all-clean.sh b/alliance/src/documentation/alliance-examples/go-all-clean.sh new file mode 100644 index 00000000..328e7db1 --- /dev/null +++ b/alliance/src/documentation/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/documentation/alliance-examples/go-all.sh b/alliance/src/documentation/alliance-examples/go-all.sh new file mode 100644 index 00000000..731c40c8 --- /dev/null +++ b/alliance/src/documentation/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/documentation/alliance-examples/hadamard/Makefile b/alliance/src/documentation/alliance-examples/hadamard/Makefile index cd9310b4..d545e344 100644 --- a/alliance/src/documentation/alliance-examples/hadamard/Makefile +++ b/alliance/src/documentation/alliance-examples/hadamard/Makefile @@ -17,6 +17,8 @@ # \------------------------------------------------------------*/ 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 @@ XFSM = $(ALLIANCE_BIN)/xfsm 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 @@ hadamard.vst calcul.vbe ram.vbe rom.vbe compteur.vbe sequenceur.vbe hadamard_mod 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 @@ hadamard_er.al : hadamard.cif # | | # \------------------------------------------------------------*/ -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 @@ clean : $(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 --git a/alliance/src/documentation/alliance-examples/mipsR3000/sce/Makefile b/alliance/src/documentation/alliance-examples/mipsR3000/sce/Makefile index 2c404832..ca4c22fc 100644 --- a/alliance/src/documentation/alliance-examples/mipsR3000/sce/Makefile +++ b/alliance/src/documentation/alliance-examples/mipsR3000/sce/Makefile @@ -6,6 +6,8 @@ # 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 @@ -119,7 +121,7 @@ ENV_COUGAR_SPI = MBK_WORK_LIB=.; export MBK_WORK_LIB; \ 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/src/documentation/alliance-examples/mipsR3000/sce/mips_core.ioc b/alliance/src/documentation/alliance-examples/mipsR3000/sce/mips_core.ioc index 6f10fa39..4b5b3b3a 100644 --- a/alliance/src/documentation/alliance-examples/mipsR3000/sce/mips_core.ioc +++ b/alliance/src/documentation/alliance-examples/mipsR3000/sce/mips_core.ioc @@ -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 --git a/alliance/src/documentation/alliance-examples/multi16b-reg/Makefile b/alliance/src/documentation/alliance-examples/multi16b-reg/Makefile index e8fa6874..2e1a61b5 100644 --- a/alliance/src/documentation/alliance-examples/multi16b-reg/Makefile +++ b/alliance/src/documentation/alliance-examples/multi16b-reg/Makefile @@ -17,6 +17,8 @@ # \------------------------------------------------------------*/ 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 @@ XFSM = $(ALLIANCE_BIN)/xfsm 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 --git a/alliance/src/documentation/alliance-examples/multi4b/Makefile b/alliance/src/documentation/alliance-examples/multi4b/Makefile index 2f14ef4e..73b12b98 100644 --- a/alliance/src/documentation/alliance-examples/multi4b/Makefile +++ b/alliance/src/documentation/alliance-examples/multi4b/Makefile @@ -17,6 +17,8 @@ # \------------------------------------------------------------*/ 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 @@ XFSM = $(ALLIANCE_BIN)/xfsm 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 --git a/alliance/src/documentation/alliance-examples/multi4b/README b/alliance/src/documentation/alliance-examples/multi4b/README index f6d901e4..e5eae9d2 100644 --- a/alliance/src/documentation/alliance-examples/multi4b/README +++ b/alliance/src/documentation/alliance-examples/multi4b/README @@ -14,7 +14,9 @@ The Makefile set environement 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 "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 --git a/alliance/src/documentation/alliance-examples/multi8/Makefile b/alliance/src/documentation/alliance-examples/multi8/Makefile index da76e8dc..28a466e0 100644 --- a/alliance/src/documentation/alliance-examples/multi8/Makefile +++ b/alliance/src/documentation/alliance-examples/multi8/Makefile @@ -17,6 +17,8 @@ # \------------------------------------------------------------*/ 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 @@ XFSM = $(ALLIANCE_BIN)/xfsm 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 --git a/alliance/src/documentation/alliance-examples/multi8/README b/alliance/src/documentation/alliance-examples/multi8/README index a9b632d6..7d2aabba 100644 --- a/alliance/src/documentation/alliance-examples/multi8/README +++ b/alliance/src/documentation/alliance-examples/multi8/README @@ -15,4 +15,6 @@ The Makefile set environement 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 "multi8" to any writable folder of your choice and type: +$ make diff --git a/alliance/src/documentation/alliance-examples/multi8b/Makefile b/alliance/src/documentation/alliance-examples/multi8b/Makefile index 59b3d3d4..f4d5ad78 100644 --- a/alliance/src/documentation/alliance-examples/multi8b/Makefile +++ b/alliance/src/documentation/alliance-examples/multi8b/Makefile @@ -17,6 +17,8 @@ # \------------------------------------------------------------*/ 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 @@ XFSM = $(ALLIANCE_BIN)/xfsm 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 --git a/alliance/src/documentation/alliance-examples/multi8b/README b/alliance/src/documentation/alliance-examples/multi8b/README index 111a2cc5..d1b87862 100644 --- a/alliance/src/documentation/alliance-examples/multi8b/README +++ b/alliance/src/documentation/alliance-examples/multi8b/README @@ -14,7 +14,9 @@ The Makefile set environement 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 "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 --git a/alliance/src/documentation/alliance-examples/pgcd/Makefile b/alliance/src/documentation/alliance-examples/pgcd/Makefile index 5a937bb4..d44afc57 100644 --- a/alliance/src/documentation/alliance-examples/pgcd/Makefile +++ b/alliance/src/documentation/alliance-examples/pgcd/Makefile @@ -17,6 +17,8 @@ # \------------------------------------------------------------*/ 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 @@ XFSM = $(ALLIANCE_BIN)/xfsm 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 --git a/alliance/src/documentation/alliance-examples/pgcd/README b/alliance/src/documentation/alliance-examples/pgcd/README index bfb604a4..311597d8 100644 --- a/alliance/src/documentation/alliance-examples/pgcd/README +++ b/alliance/src/documentation/alliance-examples/pgcd/README @@ -15,5 +15,7 @@ The Makefile set environement 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 "pgcd" to any writable folder of your choice and type: +$ make diff --git a/alliance/src/documentation/alliance-examples/sqrt32/Makefile b/alliance/src/documentation/alliance-examples/sqrt32/Makefile index daf4ec72..08beed6a 100644 --- a/alliance/src/documentation/alliance-examples/sqrt32/Makefile +++ b/alliance/src/documentation/alliance-examples/sqrt32/Makefile @@ -17,6 +17,8 @@ # \------------------------------------------------------------*/ 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 @@ XFSM = $(ALLIANCE_BIN)/xfsm 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 --git a/alliance/src/documentation/alliance-examples/sqrt32/README b/alliance/src/documentation/alliance-examples/sqrt32/README index b8b06435..279ade3a 100644 --- a/alliance/src/documentation/alliance-examples/sqrt32/README +++ b/alliance/src/documentation/alliance-examples/sqrt32/README @@ -14,4 +14,6 @@ The Makefile set environement 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 "sqrt32" to any writable folder of your choice and type: +$ make diff --git a/alliance/src/documentation/alliance-examples/sqrt8/Makefile b/alliance/src/documentation/alliance-examples/sqrt8/Makefile index f23617dc..220ade21 100644 --- a/alliance/src/documentation/alliance-examples/sqrt8/Makefile +++ b/alliance/src/documentation/alliance-examples/sqrt8/Makefile @@ -17,6 +17,8 @@ # \------------------------------------------------------------*/ 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 @@ XFSM = $(ALLIANCE_BIN)/xfsm 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 @@ sqrt8.vst sm.vbe sqrt8_model.vbe : sqrt8.vhdl # \------------------------------------------------------------*/ 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 @@ sqrt8_er.al : sqrt8.cif # | | # \------------------------------------------------------------*/ -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 @@ clean : $(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/src/documentation/alliance-run/Makefile b/alliance/src/documentation/alliance-run/Makefile index 7307ac70..13e6dff1 100644 --- a/alliance/src/documentation/alliance-run/Makefile +++ b/alliance/src/documentation/alliance-run/Makefile @@ -13,6 +13,8 @@ # 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/src/documentation/alliance-run/amd2901_core.ioc b/alliance/src/documentation/alliance-run/amd2901_core.ioc index 11bd40b9..b838eee0 100644 --- a/alliance/src/documentation/alliance-run/amd2901_core.ioc +++ b/alliance/src/documentation/alliance-run/amd2901_core.ioc @@ -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 --git a/alliance/src/documentation/tutorials/go-all-clean.sh b/alliance/src/documentation/tutorials/go-all-clean.sh new file mode 100644 index 00000000..12617754 --- /dev/null +++ b/alliance/src/documentation/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/documentation/tutorials/go-all.sh b/alliance/src/documentation/tutorials/go-all.sh new file mode 100644 index 00000000..489368ee --- /dev/null +++ b/alliance/src/documentation/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/documentation/tutorials/place_and_route/src/amd2901/amd2901_chip.c b/alliance/src/documentation/tutorials/place_and_route/src/amd2901/amd2901_chip.c index 3650e3aa..b40d6260 100644 --- a/alliance/src/documentation/tutorials/place_and_route/src/amd2901/amd2901_chip.c +++ b/alliance/src/documentation/tutorials/place_and_route/src/amd2901/amd2901_chip.c @@ -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 @@ int main () "vdd => vdd", "vss => vss", - 0); + NULL); GENLIB_LOINS("pck_sp","p_ck","ck","cki", POWER); @@ -119,13 +119,13 @@ int main () 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/src/documentation/tutorials/simulation/tex/simulation.tex b/alliance/src/documentation/tutorials/simulation/tex/simulation.tex index 83c6a8fc..7a7bc19b 100644 --- a/alliance/src/documentation/tutorials/simulation/tex/simulation.tex +++ b/alliance/src/documentation/tutorials/simulation/tex/simulation.tex @@ -1,6 +1,9 @@ %%%%%%%%%%%%%%%% -% $Id: simulation.tex,v 1.8 2009/08/26 12:25:16 jpc Exp $ +% $Id: simulation.tex,v 1.9 2009/09/01 21:33:42 jpc Exp $ % $Log: simulation.tex,v $ +% Revision 1.9 2009/09/01 21:33:42 jpc +% Include patches from Fedora (Chitlesh Goorah) and Naohiko Shimizu. +% % Revision 1.8 2009/08/26 12:25:16 jpc % Some more adjustments for LaTeX: no more here.sty, rule thickness put % after begin{document} for fancyhdr. @@ -180,7 +183,7 @@ manual page. } 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 @@ -635,13 +638,13 @@ be chosen among those available in the library of standard cells { \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/src/documentation/tutorials/start/start.tex b/alliance/src/documentation/tutorials/start/start.tex index 8f76c8b7..c88481b4 100755 --- a/alliance/src/documentation/tutorials/start/start.tex +++ b/alliance/src/documentation/tutorials/start/start.tex @@ -5,7 +5,7 @@ % Version for Alliance releases 2.0 and up by Frederic Petrot % Modified by czo for Alliance release 4.0 (01/2000) % TODO : no fully working, needs some adjustements -% $Id: start.tex,v 1.7 2009/08/26 12:25:16 jpc Exp $ +% $Id: start.tex,v 1.8 2009/09/01 21:33:42 jpc Exp $ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \documentclass{article} @@ -116,13 +116,13 @@ If you run a \texttt{c-like} shell, like \texttt{csh} or \texttt{tcsh}, try to run the following command : \begin{phraseverbatim} -~alp/addaccu %-) source /alliance/etc/alc_env.csh +~alp/addaccu %-) source /etc/profile.d/alc_env.csh \end{phraseverbatim} Otherwise, if you run a \texttt{sh-like} shell, try to run the following 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_OUT_PH=ap 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/src/documentation/tutorials/synthesis/src/amd2901/Makefile b/alliance/src/documentation/tutorials/synthesis/src/amd2901/Makefile index cba44fd4..68c16d37 100644 --- a/alliance/src/documentation/tutorials/synthesis/src/amd2901/Makefile +++ b/alliance/src/documentation/tutorials/synthesis/src/amd2901/Makefile @@ -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 @@ amd2901_ctl.vst: amd2901_ctl.c 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/src/documentation/tutorials/synthesis/src/amd2901/amd2901_chip.c b/alliance/src/documentation/tutorials/synthesis/src/amd2901/amd2901_chip.c index 5b0d2baa..753860a0 100644 --- a/alliance/src/documentation/tutorials/synthesis/src/amd2901/amd2901_chip.c +++ b/alliance/src/documentation/tutorials/synthesis/src/amd2901/amd2901_chip.c @@ -78,7 +78,7 @@ int main () "vdd => vdd", "vss => vss", - 0); + NULL); GENLIB_LOINS("pck_sp","p_ck","ck","cki", POWER); @@ -119,13 +119,13 @@ int main () 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/src/documentation/tutorials/synthesis/tex/synthesis.tex b/alliance/src/documentation/tutorials/synthesis/tex/synthesis.tex index 5eb2bb27..bf2fdde2 100755 --- a/alliance/src/documentation/tutorials/synthesis/tex/synthesis.tex +++ b/alliance/src/documentation/tutorials/synthesis/tex/synthesis.tex @@ -1,6 +1,9 @@ %%%%%%%%%%%%%%%% -% $Id: synthesis.tex,v 1.7 2009/08/26 12:25:16 jpc Exp $ +% $Id: synthesis.tex,v 1.8 2009/09/01 21:33:43 jpc Exp $ % $Log: synthesis.tex,v $ +% Revision 1.8 2009/09/01 21:33:43 jpc +% Include patches from Fedora (Chitlesh Goorah) and Naohiko Shimizu. +% % Revision 1.7 2009/08/26 12:25:16 jpc % Some more adjustments for LaTeX: no more here.sty, rule thickness put % after begin{document} for fancyhdr. @@ -230,7 +233,7 @@ manual page. } 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/src/ocp/src/placer/iocscan.l b/alliance/src/ocp/src/placer/iocscan.l index 1b936808..586f9b82 100644 --- a/alliance/src/ocp/src/placer/iocscan.l +++ b/alliance/src/ocp/src/placer/iocscan.l @@ -30,7 +30,7 @@ #define YY_NO_UNPUT /* Avoids warning */ -int yylineno = 1; +/*int yylineno = 1;*/ %} diff --git a/alliance/src/xgra/Makefile.am b/alliance/src/xgra/Makefile.am index c1fa8896..2f035807 100644 --- a/alliance/src/xgra/Makefile.am +++ b/alliance/src/xgra/Makefile.am @@ -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/src/xgra/src/XGR_error.c b/alliance/src/xgra/src/XGR_error.c index 38549bad..32044236 100644 --- a/alliance/src/xgra/src/XGR_error.c +++ b/alliance/src/xgra/src/XGR_error.c @@ -270,7 +270,7 @@ char *XgraGetInformations() 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 @@ char *XgraGetInformations() 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 );