diff --git a/alliance/src/distrib/alliance.spec.in b/alliance/src/distrib/alliance.spec.in index 3c8ca2f3..c933bb0d 100644 --- a/alliance/src/distrib/alliance.spec.in +++ b/alliance/src/distrib/alliance.spec.in @@ -1,21 +1,20 @@ %define name alliance %define ver @VERSION@ -%define release 20021016 -%define tag alpha.1 +%define release 20031115 %define prefix @prefix@ Name: %{name} Summary: Alliance VLSI CAD Sytem Version: %{ver} -Release: %{release}.%{tag} +Release: %{release} Copyright: GPL Group: Applications/VLSI Source: %{name}-%{ver}.tar.gz URL: http://www-asim.lip6.fr/alliance/ Packager: Jean-Paul Chaput -BuildRoot: /var/tmp/root-%{name} +BuildRoot: %{_tmppath}/root-%{name} @@ -147,6 +146,8 @@ Sources of the Alliance VLSI CAD System, as you might guess... %{prefix}/etc/*.par %{prefix}/etc/*.scapin %{prefix}/etc/*.conf +%{prefix}/etc/*.mac +%{prefix}/etc/*.lef %{prefix}/cells/* %{prefix}/bin/* %{prefix}/lib/* @@ -165,6 +166,16 @@ Sources of the Alliance VLSI CAD System, as you might guess... %changelog +* 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 diff --git a/alliance/src/ocp/src/common/PCommon.h b/alliance/src/ocp/src/common/PCommon.h index a74efb80..7216d0f5 100644 --- a/alliance/src/ocp/src/common/PCommon.h +++ b/alliance/src/ocp/src/common/PCommon.h @@ -1,9 +1,14 @@ #ifndef __PCOMMON_H #define __PCOMMON_H +#include +#if defined(GCC_VERSION) && (GCC_VERSION >= 3003) +#include +#endif #include #include "mut.h" #include "mlo.h" #include "mph.h" + using namespace std; const double SquareShape(const double margin, const double sumwidth, diff --git a/alliance/src/ocp/src/placer/PPlacement.h b/alliance/src/ocp/src/placer/PPlacement.h index 0297ebdc..bd75a372 100644 --- a/alliance/src/ocp/src/placer/PPlacement.h +++ b/alliance/src/ocp/src/placer/PPlacement.h @@ -12,6 +12,10 @@ using namespace __gnu_cxx; // GCC 3.1 and later #endif #endif #endif +#include +#if defined(GCC_VERSION) && (GCC_VERSION >= 3003) +#include +#endif #include #include diff --git a/alliance/src/vst2xnf/src/vst2xnf.c b/alliance/src/vst2xnf/src/vst2xnf.c index 4d48b340..29f35a33 100644 --- a/alliance/src/vst2xnf/src/vst2xnf.c +++ b/alliance/src/vst2xnf/src/vst2xnf.c @@ -86,8 +86,8 @@ locon_list *plc; fprintf(stderr,"**liste des connecteurs externes\n"); plc = ptfig->LOCON ; while(plc) { - fprintf(stderr,"connecteur : %s ,sig index : %d ,type : %c, - direction : %c \n",plc->NAME,plc->SIG->INDEX,plc->TYPE, + fprintf(stderr,"connecteur : %s ,sig index : %d ,type : %c," + "direction : %c \n",plc->NAME,plc->SIG->INDEX,plc->TYPE, plc->DIRECTION); plc = plc->NEXT; } @@ -122,8 +122,8 @@ locon_list *pc; fprintf(stderr,"modele : %s ,instance : %s \n",pi->FIGNAME,pi->INSNAME); pc = pi->LOCON; while(pc) { - fprintf(stderr,"connecteur : %s ,index : %d ,type : %c, - dir : %c \n",pc->NAME,pc->SIG->INDEX,pc->TYPE,pc->DIRECTION); + fprintf(stderr,"connecteur : %s ,index : %d ,type : %c," + "dir : %c \n",pc->NAME,pc->SIG->INDEX,pc->TYPE,pc->DIRECTION); pc = pc->NEXT; } pi = pi->NEXT; @@ -178,8 +178,8 @@ int prim_add_inv(char *name) else if ( ! strcmp(name,"i2") ) { pin=2 ; } else if ( ! strcmp(name,"i3") ) { pin=3 ; } else if ( ! strcmp(name,"i4") ) { pin=4 ; } - else { fprintf(stderr,"FORMAT_ERROR: pin name *%s* not in set o,i0,i1, - i2,i3,i4 \n",name) ; } + else { fprintf(stderr,"FORMAT_ERROR: pin name *%s* not in set o,i0,i1," + "i2,i3,i4 \n",name) ; } if ( pin >= diff ) { return 1 ; } else { return 0 ; } } @@ -194,8 +194,8 @@ static char *prim_map_pin_name(char *name,char *buffer) else if ( ! strcmp(buffer,"i2") ) { return "3" ; } else if ( ! strcmp(buffer,"i3") ) { return "4" ; } else if ( ! strcmp(buffer,"i4") ) { return "5" ; } - else { fprintf(stderr,"FORMAT_ERROR: pin name *%s* not in set o,i0,i1, - i2,i3,i4 \n",buffer) ; + else { fprintf(stderr,"FORMAT_ERROR: pin name *%s* not in set o,i0,i1," + "i2,i3,i4 \n",buffer) ; return buffer ;} } /*-------------------------------------------------------------*/ diff --git a/alliance/src/x2y/src/x2y.c b/alliance/src/x2y/src/x2y.c index 62c16fd5..ce831bec 100644 --- a/alliance/src/x2y/src/x2y.c +++ b/alliance/src/x2y/src/x2y.c @@ -21,7 +21,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ident "$Id: x2y.c,v 1.3 2003/05/20 13:28:39 czo Exp $" +#ident "$Id: x2y.c,v 1.4 2003/11/15 21:26:19 jpc Exp $" #include #include #include "mut.h" @@ -63,20 +63,20 @@ int main( argc, argv ) if ( argc != 5 ) { - fprintf( stdout, " -Syntax: x2y in_format out_format in_file out_file -Where format is one of - al ALLIANCE netlist - ap ALLIANCE layout - cct HILO netlist - cp VTI layout - edi EDIF netlist or layout - fne VTI extracted netlist - hns VTI netlist - spi, sp, cir SPICE netlist - vlg VERILOG netlist - vst VHDL netlist -" ); + fprintf( stdout, +"Syntax: x2y in_format out_format in_file out_file" +"Where format is one of" +" al ALLIANCE netlist" +" ap ALLIANCE layout" +" cct HILO netlist" +" cp VTI layout" +" edi EDIF netlist or layout" +" fne VTI extracted netlist" +" hns VTI netlist" +" spi, sp, cir SPICE netlist" +" vlg VERILOG netlist" +" vst VHDL netlist" + ); return( 1 ); }