Changeset 235

Timestamp:

06/27/11 15:47:06 (13 years ago)

Author:

hozdoba

Message:

Préparation nouvelle arborescence

Location:

XMLIO_V2/dev/common

Files:

• arch/arch-X86_LOCGNU_FEDORA.fcm (modified) (1 diff)
• arch/arch-X86_LOCGNU_FEDORA.path (modified) (1 diff)
• tools/bld.cfg (modified) (1 diff)
• tools/xiosInstall (modified) (1 diff)

XMLIO_V2/dev/common/arch/arch-X86_LOCGNU_FEDORA.fcm

@@ -18 +18 @@
 %DEBUG_FFLAGS   -D XIOS_DEBUG -g
 
-%CBASE_INC      -I /usr/include/openmpi-i386 -I /work/dev_rv/extra/netcdf4/include -I /work/dev_rv/extra/hdf5/include
-%FBASE_INC      -I /usr/include/openmpi-i386 
-%BASE_LD        -L /work/dev_rv/extra/hdf5/lib -L /work/dev_rv/extra/netcdf4/lib -lnetcdf -lhdf5_hl -lhdf5 -lz -lmpi -lmpi_cxx -lstdc++       
+%BASE_LD        -lstdc++       

XMLIO_V2/dev/common/arch/arch-X86_LOCGNU_FEDORA.path

@@ +1 @@
+NETCDF_INCDIR="-I /work/dev_rv/extra/netcdf4/include"
+NETCDF_LIBDIR="-L /work/dev_rv/extra/netcdf4/lib"
+NETCDF_LIB="-lnetcdf"
 
+MPI_INCDIR="-I /usr/include/openmpi-i386"
+MPI_LIBDIR="-L /usr/lib/openmpi/lib"
+MPI_LIB="-lmpi -lmpi_cxx"
+
+HDF5_INCDIR="-I /work/dev_rv/extra/hdf5/include"
+HDF5_LIBDIR="-L /work/dev_rv/extra/hdf5/lib"
+HDF5_LIB="-lhdf5_hl -lhdf5 -lz"

XMLIO_V2/dev/common/tools/bld.cfg

@@ -13 +13 @@
 %CFLAGS           %BASE_CFLAGS %COMPIL_CFLAGS
 %FFLAGS           %BASE_FFLAGS %COMPIL_FFLAGS
-%LD_FLAGS         %BASE_LD
+%LD_FLAGS         %ARCH_LD %BASE_LD
 
 

XMLIO_V2/dev/common/tools/xiosInstall

@@ -50 +50 @@
 else 
    echo "Veuillez definir un mode de compilation [debug|dev|prod] !"
+   exit 1
 fi
+
+XMLIO_CINCDIR="$NETCDF_INCDIR $HDF5_INCDIR $MPI_INCDIR"
+XMLIO_FINCDIR="$MPI_INCDIR"
+
+XMLIO_LIB="$NETCDF_LIBDIR $HDF5_LIBDIR $MPI_LIBDIR $NETCDF_LIB $HDF5_LIB $MPI_LIB"
 
 rm -f config.fcm
 echo "%COMPIL_CFLAGS $COMPIL_CFLAGS" >> config.fcm
 echo "%COMPIL_FFLAGS $COMPIL_FFLAGS" >> config.fcm
+
+echo "%CBASE_INC     $XMLIO_CINCDIR" >> config.fcm     
+echo "%FBASE_INC     $XMLIO_FINCDIR" >> config.fcm
+echo "%ARCH_LD       $XMLIO_LIB" >> config.fcm 
 
 echo "=> Activation du mode "$compil_mode" pour la distribution sous l'architecture \""$arch"\" !"