Changeset 2739 in Sophya for trunk/SophyaLib/BuildMgr


Ignore:
Timestamp:
May 20, 2005, 9:28:55 AM (20 years ago)
Author:
cmv
Message:

suite nouvelle structure cmv 20/05/05

Location:
trunk/SophyaLib/BuildMgr
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/SophyaLib/BuildMgr/Makefile

    r2726 r2739  
    2828        if [ -d ../LinAlg ] ; then cd  ../LinAlg ; $(MAKE) ; fi
    2929        if [ -d ../XAstroPack ] ; then cd  ../XAstroPack ; $(MAKE) ; fi
     30        if [ -d ../MinuitAdapt ] ; then cd  ../MinuitAdapt ; $(MAKE) ; fi
    3031 
    3132PI::
    … …  
    3839#  List of libraries (.a)
    3940PSLB =  $(SOPHYALIBP)libBaseTools.a $(SOPHYALIBP)libSysTools.a $(SOPHYALIBP)libSUtils.a $(SOPHYALIBP)libTArray.a $(SOPHYALIBP)libNTools.a $(SOPHYALIBP)libHiStats.a $(SOPHYALIBP)libSkyMap.a $(SOPHYALIBP)libSamba.a $(SOPHYALIBP)libSkyT.a
    40 EXTPSLB =  $(SOPHYALIBP)libFitsIOServer.a $(SOPHYALIBP)libIFFTW.a $(SOPHYALIBP)libLinAlg.a $(SOPHYALIBP)libXAstroPack.a
    41 EXTPSLB =  $(SOPHYALIBP)libFitsIOServer.a $(SOPHYALIBP)libIFFTW.a $(SOPHYALIBP)libLinAlg.a
     41EXTPSLB =  $(SOPHYALIBP)libFitsIOServer.a $(SOPHYALIBP)libIFFTW.a $(SOPHYALIBP)libLinAlg.a $(SOPHYALIBP)libXAstroPack.a $(SOPHYALIBP)libMinuitAdapt.a
     42#EXTPSLB =  $(SOPHYALIBP)libFitsIOServer.a $(SOPHYALIBP)libIFFTW.a $(SOPHYALIBP)libLinAlg.a
    4243PIPSLB =  $(SOPHYALIBP)libPI.a $(SOPHYALIBP)libPIGcont.a $(SOPHYALIBP)libPIext.a
    4344

  • trunk/SophyaLib/BuildMgr/README

    r2720 r2739  
    66   ./mkmflib -sbase /tmp/sbase SUtils
    77
    8 3/ domkmf : c-shell script : calls mkmflib for all modules
     83/ mkmfprog : c-shell script for creation of programs module Makefile / smakefile
     9   ./mkmfprog -sbase /tmp/sbase SUtils
     10
     114/ domkmf : c-shell script : calls mkmflib for all modules
    912   ./domkmf -sbase /tmp/sbase
    1013
    11 4/ Makefile : Top level makefile for library modules
     145/ Makefile : Top level makefile for library modules
    1215
    13 5/ Configuration files :
     166/ Configuration files :
    1417   - Linux_g++_make.inc : Linux with g++ compiler
    1518   - OSF1_cxx_make.inc : (HP/Compaq/Digital Tru64 with native cxx compiler)

  • trunk/SophyaLib/BuildMgr/configure

    r2726 r2739  
    3434  echo 'configure [-sbase SOPHYABASE] [-scxx SOPHYACXX] [-incln] [-minc mymake.inc] '
    3535  echo '  [-extp dir1 -extp dir2 ...] [-extip dir1 -extip dir2 ... ] [-extlp dir1 -extlp dir2 ... ]'
    36   echo '  [-noext fits -noext fftw -noext lapack -noext astro -noext minuit]'
     36  echo '  [-noextlib -noext fits -noext fftw -noext lapack -noext astro -noext minuit]'
    3737  exit -1
    3838endif
    … …  
    6363  set extpathlib = ( $extpathlib $2 )
    6464  shift
     65endif
     66if( "$1" == "-noextlib" ) then
     67  set i = 0
     68  while ( $i < $#SOPEXTOK )
     69    @ i += 1
     70    set SOPEXTOK[$i] = 0
     71  end 
    6572endif
    6673if( "$1" == "-noext" ) then
    … …  
    172179        set file
    173180        foreach f ( *.h )
    174           grep "$f" excludeinc > /dev/null
     181          grep -q "$f:r\.h" excludeinc
    175182          if( $status != 0 ) set file = ( $file $f )
    176183        end
    … …  
    350357echo " 7.b/ Creating $objlistname "
    351358rm -f $objlistname ; touch $objlistname
    352 foreach d ( $SOPEXT )
    353   if ( -d ../$d ) then
    354     cat ../$d/objlist.list >> $objlistname
    355   endif
    356 end
     359set i = 0
     360while ( $i < $#SOPEXT )
     361  @ i += 1
     362  if( $SOPEXTOK[$i] <= 0 ) continue
     363  set d = $SOPEXT[$i]
     364  if ( ! -d ../$d ) continue
     365  cat ../$d/objlist.list >> $objlistname
     366end 
    357367
    358368set objlistname = $sconf/libPI.objlist

  • trunk/SophyaLib/BuildMgr/domkmf

    r2734 r2739  
    2626end
    2727
    28 ###echo " ==== Creation smakefile pour les modules de Programmes ===="
    29 ###foreach f ( ProgPI PrgUtil PrgMap Tests PMixer )
    30 ###  set cmd = "./mkmfprog $* $f"
    31 ###  $DO $cmd
    32 ###end
     28echo " ==== Creation smakefile pour les modules de Programmes ===="
     29#foreach f ( ProgPI PrgUtil PrgMap Tests PMixer )
     30foreach f ( ProgPI PrgUtil PrgMap PMixer )
     31  set cmd = "./mkmfprog $* $f"
     32  $DO $cmd
     33end

  • trunk/SophyaLib/BuildMgr/mkdepend.csh

    r2734 r2739  
    3030       | sed -e 's?'$inc/'?$(SOPHYAINCP)?g'
    3131else
    32   echo "extension $ext not reated"
     32  echo "extension $ext not treated"
    3333endif
    3434

  • trunk/SophyaLib/BuildMgr/mkmflib

    r2734 r2739  
    33#  librairies SOPHYA 
    44#  C. Magneville / R. Ansari - Mai 2005
     5#------
     6#  Option controlant la generation des smakefile OU Makefile
     7#  smakefile utilise pour le developpement - contient une reference
     8#  a $(SOPHYABASE)/include/sophyamake.inc
     9#  les Makefile reference ../BuildMgr/sophyamake.inc
     10#------
     11
     12if ( ! $?TMPDIR ) set TMPDIR = /tmp
     13set makname = "Makefile"
     14unset targetdir
    515
    616if ( $#argv < 1) then
    … …  
    818  exit -1
    919endif
    10 
    11 #  Option controlant la generation des smakefile OU Makefile
    12 #  smakefile utilise pour le developpement - contient une reference
    13 #  a $(SOPHYABASE)/include/sophyamake.inc
    14 #  les Makefile reference ../BuildMgr/sophyamake.inc
    15 
    16 set makname = "Makefile"
    17 unset targetdir
    1820
    1921while ( $#argv > 0 )
    … …  
    4446cd ../$targetdir
    4547
     48#--- fichier des fichiers a exclure
    4649if ( ! -f exclude ) touch exclude
    47 if ( ! -f flags_compil ) touch flags_compil
    48 if ( ! -f extlib_list ) touch extlib_list
    49 if ( ! -f extslb_list ) touch extslb_list
    50 
    51 if ( ! $?TMPDIR ) set TMPDIR = /tmp
    52 if (-f exclude_dpc ) then
    53 #  CHECK !!! qque chose a faire ...
    54 #  On utilise alors le fichier exclude_dpc
    55   echo ' DBG - utilisation du fichier exclude_dpc pour ' $targetdir
    56   sort exclude_dpc >! $TMPDIR/exclude.sort
    57   set exclfile = 'exclude_dpc'
    58 else
    59   sort exclude >! $TMPDIR/exclude.sort
    60   set exclfile = 'exclude'
    61 endif
     50sort exclude >! $TMPDIR/exclude.sort
     51set exclfile = 'exclude'
    6252
    6353echo "mkmflib: Creating $targetdir/objlist.list , $targetdir/$makname"
    6454
    65 ##############################################
    66 ########### fichier de la liste des .o #######
    67 ##############################################
    68 
     55#--- fichier de la liste des .o
    6956set liblist = objlist.list
    7057rm -f $liblist
    … …  
    7360unset liblist
    7461
    75 ##############################################
    76 ########### Creation de smakefile ##########
    77 ##############################################
    78 
     62#--- Creation de smakefile
    7963set libf='$(SOPHYALIBP)lib'$targetdir'.a'
    80 
    81 
    82 rm -f $makname
    83 touch $makname
     64rm -f $makname; touch $makname
    8465
    8566if ($makname == "smakefile") then
    … …  
    8970endif
    9071
    91 echo " " >> $makname
     72echo ' ' >> $makname
    9273echo 'all:' $libf  >> $makname
    9374echo ' ' >> $makname
    … …  
    9576echo 'clean:' >> $makname
    9677set toto='rm -f'
    97 foreach f (*.cc *.c)
     78foreach f ( *.cc *.c )
    9879  set toto= ( $toto '$(SOPHYAOBJP)'$f:r.o )
    9980end
    100 echo '  '$toto >> $makname
     81echo '  ' $toto >> $makname
    10182echo '  rm -f '$libf >> $makname
    10283echo ' ' >> $makname
    … …  
    10990echo " " >> $makname
    11091
    111 set inc = `echo $SOPHYABASE/include | sed "s?//?/?g"`
     92
     93#--- Creation des dependances
     94set inc = `echo $SOPHYABASE/include | sed "s?//?/?g" | sed 's?/$??'`
    11295set nomsys = `uname`
    11396
    … …  
    130113end
    131114
     115foreach f ( *.f )
     116  grep -q '^'$f'$' $exclfile && continue
     117  echo '$(SOPHYAOBJP)'$f:r'.o: '$f >> $makname
     118  echo '        $(FCOMPILE) -o $@ $<' >> $makname
     119  echo ' ' >> $makname
     120end
     121
    132122exit 0
Note: See TracChangeset for help on using the changeset viewer.