Changeset 2437 in Sophya for trunk


Ignore:
Timestamp:
Sep 17, 2003, 2:20:44 PM (22 years ago)
Author:
cmv
Message:

chgt DPC...REP en SOPHYA...REP et EROSCXX en SOPHYACXX cmv 17/09/2003

Location:
trunk
Files:
41 edited

Legend:

Unmodified
Added
Removed

  • trunk/Eval/JET/makefile

    r2363 r2437  
    1414# USERFLAGS := -I/.../myincludes
    1515
    16 include $(DPCBASEREP)/Include/MakefileUser.h
     16include $(SOPHYABASEREP)/Include/MakefileUser.h
    1717
    1818

  • trunk/SophyaExt/CodeMinuit/MakeMinuit

    r2403 r2437  
    1 include $(DPCBASEREP)/Include/MakefileUser.h
     1include $(SOPHYABASEREP)/Include/MakefileUser.h
    22
    33

  • trunk/SophyaExt/CodeMinuit/Makefile

    r2403 r2437  
    1 include $(DPCBASEREP)/Include/MakefileUser.h
     1include $(SOPHYABASEREP)/Include/MakefileUser.h
    22
    33all:

  • trunk/SophyaExt/CodeMinuit/code/MakeMinuit

    r2403 r2437  
    1 include $(DPCBASEREP)/Include/MakefileUser.h
     1include $(SOPHYABASEREP)/Include/MakefileUser.h
    22
    33

  • trunk/SophyaExt/JThreadsC++/Examples/Makefile

    r1025 r2437  
    44
    55CXX := g++
    6 ifdef EROSCXX
    7   CXX := $(EROSCXX)
     6ifdef SOPHYACXX
     7  CXX := $(SOPHYACXX)
    88endif
    99

  • trunk/SophyaExt/JThreadsC++/JTCSrc/Makefile

    r1023 r2437  
    44
    55CXX := g++
    6 ifdef EROSCXX
    7   CXX := $(EROSCXX)
     6ifdef SOPHYACXX
     7  CXX := $(SOPHYACXX)
    88endif
    99

  • trunk/SophyaExt/JThreadsC++/README

    r1024 r2437  
    2828
    29291) Select the compiler through the environment variable
    30 EROSCXX
     30SOPHYACXX
    31312) Build the libray (make in JTCSrc)
    32323) Define the path for installation through the
    … …  
    35355) Try to build and test the example programs
    3636(make in Examples/) - The LD_LIBRARY_PATH should
    37 contain $JTCBASEREP/`uname`-$EROSCXX/ShLibs
     37contain $JTCBASEREP/`uname`-$SOPHYACXX/ShLibs
    38386) The use of GNU make is mandatory
    3939
    … …  
    4242using c-shell commands. (uname = OSF1)
    4343
    44 Cmd> setenv EROSCXX cxx
     44Cmd> setenv SOPHYACXX cxx
    4545Cmd> setenv JTCBASEREP /usr/local/
    4646Cmd> cd JTCSrc

  • trunk/SophyaExt/XAstroPack/Maketest

    r1811 r2437  
    11MODULECXXREPNAME :=  CmvTests
    22MODULEDECCXXFLAGS := -msg_quiet
    3 include $(DPCBASEREP)/Include/MakefileUser.h
     3include $(SOPHYABASEREP)/Include/MakefileUser.h
    44
    55LIBNEED := -L$(SLB) -lsophya -L$(LIB) -lFitsIOServer -L$(EXTLIBPATH) -lcfitsio

  • trunk/SophyaExt/XephemAstroLib/Makefile

    r2395 r2437  
    1 include $(DPCBASEREP)/Include/MakefileUser.h
     1include $(SOPHYABASEREP)/Include/MakefileUser.h
    22
    33all: libxastro.a

  • trunk/SophyaLib/Manual/piapp.tex

    r2384 r2437  
    8585a copy of the on-line help (accessible through the menu {\tt File/Help}).
    8686Once the SOPHYA/piapp (or PEIDA++/piapp) environment
    87 \footnote{ The environment variables {\tt DPCBASEREP} (or {\tt EROSBASEREP}),
    88 {\tt EROSCXX} (compiler selector), the shared library path
     87\footnote{ The environment variables {\tt SOPHYABASEREP} (or {\tt EROSBASEREP}),
     88{\tt SOPHYACXX} (compiler selector), the shared library path
    8989{\tt LD\_LIBRARY\_PATH} and the executable search path {\tt PATH} must
    9090be defined}

  • trunk/SophyaLib/Manual/sophya.tex

    r2304 r2437  
    174174
    175175\subsection{Environment variables}
    176 Two environment variables {\bf DPCBASEREP} and {\bf EROSCXX} are used
     176Two environment variables {\bf SOPHYABASEREP} and {\bf SOPHYACXX} are used
    177177to define the path where the Sophya libraries and executable are installed.
    178 {\bf DPCBASEREP} defines the base directory path and {\bf EROSCXX} the
    179 name of the C++ compiler. The complete path is built using {\bf DPCBASEREP},
     178{\bf SOPHYABASEREP} defines the base directory path and {\bf SOPHYACXX} the
     179name of the C++ compiler. The complete path is built using {\bf SOPHYABASEREP},
    180180the operating system name (as obtained by the {\tt uname} command), and
    181181the compiler name. In the example below, we show the complete path
    … …  
    183183
    184184\begin{itemize}
    185 \item \$DPCBASEREP/Include : Include (.h) files
    186 \item \$DPCBASEREP/Linux-g++/Libs : Path for the archive libraries (.a)
    187 \item \$DPCBASEREP/Linux-g++/ShLibs : Shared library path (.so)
    188 \item \$DPCBASEREP/Linux-g++/Exec : Executable file path
     185\item \$SOPHYABASEREP/Include : Include (.h) files
     186\item \$SOPHYABASEREP/Linux-g++/Libs : Path for the archive libraries (.a)
     187\item \$SOPHYABASEREP/Linux-g++/ShLibs : Shared library path (.so)
     188\item \$SOPHYABASEREP/Linux-g++/Exec : Executable file path
    189189\end{itemize}
    190190
    191191In order to use the shared libraries, the {\bf LD\_LIBRARY\_PATH} variable
    192192should contain the Sophya shared library path
    193 ({\tt \$DPCBASEREP/Linux-g++/ShLibs } when using g++ compiler on Linux)
     193({\tt \$SOPHYABASEREP/Linux-g++/ShLibs } when using g++ compiler on Linux)
    194194
    195195For modules using external libraries, the {\bf EXTLIBDIR}
    … …  
    203203
    204204\subsection{User makefiles}
    205 The file {\tt \$DPCBASEREP/Include/MakefileUser.h} defines the compilation
     205The file {\tt \$SOPHYABASEREP/Include/MakefileUser.h} defines the compilation
    206206flags and the list of Sophya libraries. It should be included in the
    207207user's makefile. The default compilation rules assumes that the object (.o)
    208208and executable files would be put in the following directories: \\
    209 {\tt \$HOME/`uname`-\$EROSCXX/Objs} \\
    210 {\tt \$HOME/`uname`-\$EROSCXX/Exec}.
     209{\tt \$HOME/`uname`-\$SOPHYACXX/Objs} \\
     210{\tt \$HOME/`uname`-\$SOPHYACXX/Exec}.
    211211In the case of a {\tt Linux} system and using {\tt g++} as the C++ compiler,
    212212these two directories would be translated to \\
    … …  
    15171517The build procedure expects to find the include files and the libraries in: \\
    15181518{\tt \$EXTLIBDIR/Include/FitsIO } \\
    1519 {\tt \$EXTLIBDIR/`uname`-\$EROSCXX/Libs} \\
     1519{\tt \$EXTLIBDIR/`uname`-\$SOPHYACXX/Libs} \\
    15201520The complete directory tree content for the various external libraries used
    15211521by this version of SOPHYA is listed below:
    … …  
    15441544grouped in ({\tt libPI.so}).
    15451545
    1546 The environment variables {\bf DPCDEVREP}, {\bf EXTLIBDIR} and {\bf EROSCXX}
     1546The environment variables {\bf SOPHYADEVREP}, {\bf EXTLIBDIR} and {\bf SOPHYACXX}
    15471547must be defined in order to install the Sophya package.
    15481548In the example below, we assume that we want to install Sophya from a
    … …  
    15591559\begin{verbatim}
    15601560# We select our C++ compiler
    1561 csh> setenv EROSCXX g++
     1561csh> setenv SOPHYACXX g++
    15621562# Setup the build directory
    15631563csh> mkdir /usr/local/Sophya/
    1564 csh> setenv DPCDEVREP /usr/local/Sophya/
     1564csh> setenv SOPHYADEVREP /usr/local/Sophya/
    15651565csh> setenv EXTLIBDIR /usr/local/ExtLibs/
    15661566# Use the top level makefile in Mgr/
    … …  
    16201620for the different compilers and systems. (to be included in makefiles)
    16211621\item {\bf crerep\_sophya} c-shell script for creating the directory tree
    1622 under {\tt \$DPCBASEREP} and {\tt \$DPCDEVREP}
     1622under {\tt \$SOPHYABASEREP} and {\tt \$SOPHYADEVREP}
    16231623\item {\bf install\_sophya} c-shell script for installing the Sophya package.
    1624 Usually from {\tt \$DPCDEVREP} to {\tt \$DPCBASEREP}
     1624Usually from {\tt \$SOPHYADEVREP} to {\tt \$SOPHYABASEREP}
    16251625\item {\bf mkmflien} c-shell script for making symbolic links or copying
    1626 include files to {\tt \$DPCDEVREP/Include} or {\tt \$DPCBASEREP/Include}
     1626include files to {\tt \$SOPHYADEVREP/Include} or {\tt \$SOPHYABASEREP/Include}
    16271627\item {\bf mkmf} c-shell script for generating module makefiles and the
    16281628top level makefile (named GNUmakefile)

  • trunk/SophyaLib/Mgr/Makefile

    r1881 r2437  
    2121#--- Create directory and copy includes for install
    2222depend:
    23 ifdef DPCDEVREP
    24 ifdef EROSCXX
     23ifdef SOPHYADEVREP
     24ifdef SOPHYACXX
    2525        @echo "Sophya will be installed under:"
    26         @echo "  $(DPCDEVREP)/Include"
    27         @echo "  $(DPCDEVREP)/`uname`-$(EROSCXX)"
     26        @echo "  $(SOPHYADEVREP)/Include"
     27        @echo "  $(SOPHYADEVREP)/`uname`-$(SOPHYACXX)"
    2828        if [ -d Mgr ] ; then cd Mgr; \
    29         ./crerep_sophya $(DPCDEVREP) `uname`-$(EROSCXX); \
     29        ./crerep_sophya $(SOPHYADEVREP) `uname`-$(SOPHYACXX); \
    3030        ./makefileuser.csh; \
    3131        ./mkmflien -copy ; \
    3232        fi
    3333else
    34         @echo "Variable EROSCXX must be define with setenv"
     34        @echo "Variable SOPHYACXX must be define with setenv"
    3535endif
    3636else
    37         @echo "Variable DPCDEVREP must be define with setenv"
     37        @echo "Variable SOPHYADEVREP must be define with setenv"
    3838endif
    3939#--------------------------------------------------------------------

  • trunk/SophyaLib/Mgr/Makefile.h

    r2435 r2437  
    99#
    1010# Makefile variables set are:
    11 # - Path to Exec, Include, Libs, Obj directories (from DPCDEVREP env. var.)
     11# - Path to Exec, Include, Libs, Obj directories (from SOPHYADEVREP env. var.)
    1212#     i.e. variables LIB, OBJ, EXE, INC
    1313#---------------------------------------------------------------------------
    … …  
    2222
    2323#### C++
    24 ifdef EROSCXX
    25   CXX := $(EROSCXX)
     24ifdef SOPHYACXX
     25  CXX := $(SOPHYACXX)
    2626endif
    2727
    … …  
    3030endif
    3131
    32 ifeq ($(EROSCXX),egcs++)
     32ifeq ($(SOPHYACXX),egcs++)
    3333  # en fait de compilo de egcs++ s'appelle g++ !
    3434  # comme il faut bien differentier ln -s /usr/bin/g++ /usr/bin/egcs++
    … …  
    4949endif
    5050
    51 ifeq ($(EROSCXX), egcs++)
     51ifeq ($(SOPHYACXX), egcs++)
    5252  CC := egcs
    5353endif
    … …  
    7777#-  (NE PAS TOUCHER CES LIGNES: generation automatique de MakefileUser.h)
    7878#- 
    79 PP  := ${DPCDEVREP}/${MACHDIR}/
     79PP  := ${SOPHYADEVREP}/${MACHDIR}/
    8080LIB := ${PP}/Libs/
    8181SLB := ${PP}/ShLibs/
    8282OBJ := ${PP}/Objs/
    8383EXE := ${PP}/Exec/
    84 INC := ${DPCDEVREP}/Include/
     84INC := ${SOPHYADEVREP}/Include/
    8585GLB := /usr/local/lib/
    8686#--
    … …  
    141141ARFLAGS := -static -o
    142142ARARGS := ^
    143 EROSCXX := g++
     143SOPHYACXX := g++
    144144CXX := g++
    145145CC := cc

  • trunk/SophyaLib/Mgr/Makefile.slb

    r2432 r2437  
    4747USECXX4SO := Y
    4848# On utilise le compilo g++ pour la fabrication des shared libs
    49 ifeq ($(EROSCXX), g++)
     49ifeq ($(SOPHYACXX), g++)
    5050  override USECXX4SO := Y
    5151  override CMDSHLCXX := $(LINK.cc) -shared
    … …  
    5454
    5555# On utilise le compilo KCC pour la fabrication des shared libs
    56 ifeq ($(EROSCXX), KCC)
     56ifeq ($(SOPHYACXX), KCC)
    5757  override USECXX4SO := Y
    5858  override CMDSHLCXX := $(LINK.cc)
    … …  
    6060
    6161# On utilise le compilo aCC (HP) pour la fabrication des shared libs
    62 ifeq ($(EROSCXX), aCC)
     62ifeq ($(SOPHYACXX), aCC)
    6363  override USECXX4SO := Y
    6464  override CMDSHLCXX := $(LINK.cc) -b
    … …  
    9393  override FGSHLN := --no-whole-archiv
    9494  override CMDSHLCXX := $(LINK.cc) -shared
    95   ifeq ($(EROSCXX), KCC)
     95  ifeq ($(SOPHYACXX), KCC)
    9696    override CMDSHLCXX := $(LINK.cc)
    9797  endif
    … …  
    120120  override FGSHLN := -notall
    121121  override TILSHL :=
    122   ifeq ($(EROSCXX), CC)
     122  ifeq ($(SOPHYACXX), CC)
    123123    override CMDSHLCXX := CC -shared
    124124  endif

  • trunk/SophyaLib/Mgr/README

    r2284 r2437  
    5858MacOSX/Darwin 10.1           c++/gcc 2.95    (shared-library only)
    5959
    60 The environment variables  DPCDEVREP EXTLIBDIR EROSCXX must be defined
     60The environment variables  SOPHYADEVREP EXTLIBDIR SOPHYACXX must be defined
    6161for building and installing the libraries.
    6262
    63 $EROSCXX is the name of C++ compiler being used.
    64 $DPCDEVREP is the path to where the libraries and executables will be put.
    65 $DPCDEVREP/Include : header files
     63$SOPHYACXX is the name of C++ compiler being used.
     64$SOPHYADEVREP is the path to where the libraries and executables will be put.
     65$SOPHYADEVREP/Include : header files
    6666The libraries and binaries will be put in subdirectories containing
    67 the operating system name and the compiler name: `uname`-$EROSCXX
     67the operating system name and the compiler name: `uname`-$SOPHYACXX
    6868For example, on a Linux system, using the GNU compiler:
    6969
    70 $DPCDEVREP/Linux-g++/Libs     archive librarires
    71 $DPCDEVREP/Linux-g++/ShLibs   shared libraries
    72 $DPCDEVREP/Linux-g++/Exec     binaries
     70$SOPHYADEVREP/Linux-g++/Libs     archive librarires
     71$SOPHYADEVREP/Linux-g++/ShLibs   shared libraries
     72$SOPHYADEVREP/Linux-g++/Exec     binaries
    7373
    7474The build procedure expects to find the include files and the libraries
    7575for cfitsio in :
    7676$EXTLIBDIR/Include/FitsIO
    77 $EXTLIBDIR/`uname`-$EROSCXX/Libs
     77$EXTLIBDIR/`uname`-$SOPHYACXX/Libs
    7878This would translate to Linux-g++ on a Linux system, using g++.
    7979$EXTLIBDIR/Linux-g++/Libs
    … …  
    8383
    8484# We select our C++ compiler
    85 csh> setenv EROSCXX g++
     85csh> setenv SOPHYACXX g++
    8686# Setup the build directory
    8787csh> mkdir /usr/local/Sophya/
    88 csh> setenv DPCDEVREP  /usr/local/Sophya/
    89 csh> setenv DPCBASEREP /usr/local/Sophya/
     88csh> setenv SOPHYADEVREP  /usr/local/Sophya/
     89csh> setenv SOPHYABASEREP /usr/local/Sophya/
    9090csh> setenv EXTLIBDIR  /usr/local/ExtLibs/
    9191
    … …  
    174174  Usage: crerep_sophya <nom des repertoires> [nom_machine-compilateur]
    175175  Example :
    176   Cmd> crerep_sophya $DPCDEVREP OSF1-cxx
     176  Cmd> crerep_sophya $SOPHYADEVREP OSF1-cxx
    177177  Cmd> crerep_sophya ~/Work/ Linux-g++
    178178
    179179* install_sophya
    180   Install SOPHYA libraries/include files from dev directory ($DPCDEVREP)
    181   to the install ($DPCBASEREP) directory
     180  Install SOPHYA libraries/include files from dev directory ($SOPHYADEVREP)
     181  to the install ($SOPHYABASEREP) directory
    182182  Copy files Include/*.h Libs/*.a ShLibs/*.so Exec/*
    183183
    … …  
    192192
    193193  Steps :
    194   - mkmflien : Creates symbolic links for all header files in $DPCDEVREP/Include
     194  - mkmflien : Creates symbolic links for all header files in $SOPHYADEVREP/Include
    195195
    196196  - mkmflib : Creation of a GNUmakefile in each library module

  • trunk/SophyaLib/Mgr/cleantstprg.csh

    r2018 r2437  
    11#!/bin/csh
    2 set OBJREP = ${DPCDEVREP}/`uname`-$EROSCXX/Objs/
    3 set EXEREP = ${DPCDEVREP}/`uname`-$EROSCXX/Exec/
     2set OBJREP = ${SOPHYADEVREP}/`uname`-$SOPHYACXX/Objs/
     3set EXEREP = ${SOPHYADEVREP}/`uname`-$SOPHYACXX/Exec/
    44echo ' ---> cleantstprg.csh: Removing Objs/$f.o , Exec/$f '
    55foreach f (*.cc)

  • trunk/SophyaLib/Mgr/crerep_sophya

    r968 r2437  
    66  echo " - possibilites nom_machine-compilateur"
    77  echo "    [AIX-xlC AIX-g++ HP-UX-aCC HP-UX-g++ OSF1-cxx OSF1-g++ Linux-g++ ...]"
    8   if($?EROSCXX) then
    9     echo "    defaut: `uname`-$EROSCXX"
     8  if($?SOPHYACXX) then
     9    echo "    defaut: `uname`-$SOPHYACXX"
    1010  else
    1111    echo "    pas de defaut donnez explicitement nom_machine-compilateur"
    … …  
    2626  set diru = $1
    2727  echo "machine-compilateur: ${diru}"
    28 else if ($?EROSCXX) then
    29   echo uname=`uname` EROSCXX = $EROSCXX
    30   set diru = `uname`-$EROSCXX
     28else if ($?SOPHYACXX) then
     29  echo uname=`uname` SOPHYACXX = $SOPHYACXX
     30  set diru = `uname`-$SOPHYACXX
    3131  echo "AUTOMATIQUE machine-compilateur: ${diru}"
    3232else
    33   echo "precisez nom_machine-compilateur ou EROSCXX"
     33  echo "precisez nom_machine-compilateur ou SOPHYACXX"
    3434  exit -1
    3535endif

  • trunk/SophyaLib/Mgr/install_sophya

    r1587 r2437  
    66  echo "install_sophya <-s repertoire source> <-d repertoire destination>"
    77  echo "              [-m nom_machine-compilateur]"
    8   if($?DPCDEVREP) then
    9     echo " - defaut repertoire source: $DPCDEVREP"
     8  if($?SOPHYADEVREP) then
     9    echo " - defaut repertoire source: $SOPHYADEVREP"
    1010  else
    1111    echo "   pas de defaut donnez explicitement le repertoire source"
    1212  endif
    13   if($?DPCBASEREP) then
    14     echo " - defaut repertoire destination: $DPCBASEREP"
     13  if($?SOPHYABASEREP) then
     14    echo " - defaut repertoire destination: $SOPHYABASEREP"
    1515  else
    1616    echo "   pas de defaut donnez explicitement le repertoire destination"
    … …  
    1818  echo " - possibilites nom_machine-compilateur"
    1919  echo "    [AIX-xlC AIX-g++ HP-UX-aCC HP-UX-g++ OSF1-cxx OSF1-g++  Linux-g++ ...]"
    20   if($?EROSCXX) then
    21     echo "    defaut: `uname`-$EROSCXX"
     20  if($?SOPHYACXX) then
     21    echo "    defaut: `uname`-$SOPHYACXX"
    2222  else
    2323    echo "    pas de defaut donnez explicitement nom_machine-compilateur"
    … …  
    4444end
    4545
    46 if( ! $?srcdir && $?DPCDEVREP ) then
    47   echo "defaut srcdir set to DPCDEVREP"
    48   set srcdir = $DPCDEVREP
     46if( ! $?srcdir && $?SOPHYADEVREP ) then
     47  echo "defaut srcdir set to SOPHYADEVREP"
     48  set srcdir = $SOPHYADEVREP
    4949endif
    50 if( ! $?dstdir && $?DPCBASEREP ) then
    51   echo "defaut dstdir set to DPCBASEREP"
    52   set dstdir = $DPCBASEREP
     50if( ! $?dstdir && $?SOPHYABASEREP ) then
     51  echo "defaut dstdir set to SOPHYABASEREP"
     52  set dstdir = $SOPHYABASEREP
    5353endif
    54 if( ! $?macomp && $?EROSCXX ) then
    55   echo "defaut macomp set to uname-EROSCXX"
    56   set macomp = `uname`-$EROSCXX
     54if( ! $?macomp && $?SOPHYACXX ) then
     55  echo "defaut macomp set to uname-SOPHYACXX"
     56  set macomp = `uname`-$SOPHYACXX
    5757endif
    5858

  • trunk/SophyaLib/Mgr/makefile.darwin

    r2432 r2437  
    2121#--- Create directory and copy includes for install
    2222depend:
    23 ifdef DPCDEVREP
    24 ifdef EROSCXX
     23ifdef SOPHYADEVREP
     24ifdef SOPHYACXX
    2525        @echo "Sophya will be installed under:"
    26         @echo "  $(DPCDEVREP)/Include"
    27         @echo "  $(DPCDEVREP)/`uname`-$(EROSCXX)"
     26        @echo "  $(SOPHYADEVREP)/Include"
     27        @echo "  $(SOPHYADEVREP)/`uname`-$(SOPHYACXX)"
    2828        if [ -d Mgr ] ; then cd Mgr; \
    29         ./crerep_sophya $(DPCDEVREP) `uname`-$(EROSCXX); \
     29        ./crerep_sophya $(SOPHYADEVREP) `uname`-$(SOPHYACXX); \
    3030        ./makefileuser.csh; \
    3131        ./mkmflien -copy ; \
    3232        fi
    3333else
    34         @echo "Variable EROSCXX must be define with setenv"
     34        @echo "Variable SOPHYACXX must be define with setenv"
    3535endif
    3636else
    37         @echo "Variable DPCDEVREP must be define with setenv"
     37        @echo "Variable SOPHYADEVREP must be define with setenv"
    3838endif
    3939#--------------------------------------------------------------------

  • trunk/SophyaLib/Mgr/makefileuser.awk

    r218 r2437  
    11BEGIN {change=0;}
    2 /^PP  := \$\{DPCDEVREP\}\/\$\{MACHDIR\}\// {
    3   print "PP  := \$\{DPCBASEREP\}\/\$\{MACHDIR\}\/";
     2/^PP  := \$\{SOPHYADEVREP\}\/\$\{MACHDIR\}\// {
     3  print "PP  := \$\{SOPHYABASEREP\}\/\$\{MACHDIR\}\/";
    44  print "PPH := \$\{HOME\}\/\$\{MACHDIR\}\/";
    55  change=1;
    … …  
    1313  change=1;
    1414}
    15 /^INC := \$\{DPCDEVREP\}\/Include\// {
    16   print "INC := \$\{DPCBASEREP\}\/Include\/";
     15/^INC := \$\{SOPHYADEVREP\}\/Include\// {
     16  print "INC := \$\{SOPHYABASEREP\}\/Include\/";
    1717  change=1;
    1818}

  • trunk/SophyaLib/Mgr/mkmf

    r2424 r2437  
    11#!/bin/csh
    2 # $Id: mkmf,v 1.18 2003-08-28 14:26:09 cmv Exp $
     2# $Id: mkmf,v 1.19 2003-09-17 12:19:26 cmv Exp $
    33
    44#  Pour debugger
    … …  
    9898echo '#--- Create directory and copy includes for install' >> GNUmakefile
    9999echo 'depend:' >> GNUmakefile
    100 echo 'ifdef DPCDEVREP' >> GNUmakefile
    101 echo 'ifdef EROSCXX' >> GNUmakefile
     100echo 'ifdef SOPHYADEVREP' >> GNUmakefile
     101echo 'ifdef SOPHYACXX' >> GNUmakefile
    102102echo '  @echo "Sophya will be installed under:"' >> GNUmakefile
    103 echo '  @echo "  $(DPCDEVREP)/Include" ' >> GNUmakefile
    104 echo '  @echo "  $(DPCDEVREP)/`uname`-$(EROSCXX)" ' >> GNUmakefile
     103echo '  @echo "  $(SOPHYADEVREP)/Include" ' >> GNUmakefile
     104echo '  @echo "  $(SOPHYADEVREP)/`uname`-$(SOPHYACXX)" ' >> GNUmakefile
    105105echo '  if [ -d Mgr ] ; then cd Mgr; \' >> GNUmakefile
    106 echo '  ./crerep_sophya $(DPCDEVREP) `uname`-$(EROSCXX); \' >> GNUmakefile
     106echo '  ./crerep_sophya $(SOPHYADEVREP) `uname`-$(SOPHYACXX); \' >> GNUmakefile
    107107echo '  ./makefileuser.csh; \' >> GNUmakefile
    108108echo '  ./mkmflien -copy ; \' >> GNUmakefile
    109109echo '  fi' >> GNUmakefile
    110110echo 'else' >> GNUmakefile
    111 echo '  @echo "Variable EROSCXX must be define with setenv"' >> GNUmakefile
     111echo '  @echo "Variable SOPHYACXX must be define with setenv"' >> GNUmakefile
    112112echo 'endif' >> GNUmakefile
    113113echo 'else' >> GNUmakefile
    114 echo '  @echo "Variable DPCDEVREP must be define with setenv"' >> GNUmakefile
     114echo '  @echo "Variable SOPHYADEVREP must be define with setenv"' >> GNUmakefile
    115115echo 'endif' >> GNUmakefile
    116116echo '#--------------------------------------------------------------------' >> GNUmakefile

  • trunk/SophyaLib/Mgr/mkmfPI

    r2002 r2437  
    11#!/bin/csh
    2 # $Id: mkmfPI,v 1.9 2002-05-14 15:14:47 ansari Exp $
     2# $Id: mkmfPI,v 1.10 2003-09-17 12:19:26 cmv Exp $
    33
    44set makefname = 'GNUmakefile'
    … …  
    7272echo " " >> $makefname
    7373
    74 set inc = $DPCDEVREP/Include
     74set inc = $SOPHYADEVREP/Include
    7575set incext = $EXTLIBDIR/Include
    7676set nomsys = `uname`

  • trunk/SophyaLib/Mgr/mkmflib

    r2002 r2437  
    11#!/bin/csh
    2 # $Id: mkmflib,v 1.11 2002-05-14 15:14:47 ansari Exp $
     2# $Id: mkmflib,v 1.12 2003-09-17 12:19:26 cmv Exp $
    33
    44cd ../$1
    … …  
    6868echo " " >> GNUmakefile
    6969
    70 set inc = $DPCDEVREP/Include
     70set inc = $SOPHYADEVREP/Include
    7171# set incxx = $inc/CxxInc
    7272set incext = $EXTLIBDIR/Include

  • trunk/SophyaLib/Mgr/mkmflib_save

    r511 r2437  
    11#!/bin/csh
    2 # $Id: mkmflib_save,v 1.2 1999-10-25 16:24:49 ansari Exp $
     2# $Id: mkmflib_save,v 1.3 2003-09-17 12:19:26 cmv Exp $
    33
    44cd ../$1
    … …  
    4444echo " " >> GNUmakefile
    4545
    46 set inc = $DPCDEVREP/Include
     46set inc = $SOPHYADEVREP/Include
    4747set incxx = $inc/CxxInc
    4848

  • trunk/SophyaLib/Mgr/mkmflien

    r1834 r2437  
    11#!/bin/csh
    2 # $Id: mkmflien,v 1.12 2001-12-19 18:34:11 ansari Exp $
     2# $Id: mkmflien,v 1.13 2003-09-17 12:19:26 cmv Exp $
    33
    44# WARNING : mkmflien has to be runned FROM Mgr/
    … …  
    77#  -clean : after copy/link file are deleted if not existing (empty link)
    88#  dir_dest : link/copy to dir_dest/
    9 #             default : $DPCDEVREP/Include
     9#             default : $SOPHYADEVREP/Include
    1010
    1111#######################
    … …  
    1515set cpln = "ln -sf"
    1616unset clln
    17 if( $?DPCDEVREP ) then
    18   set dst = $DPCDEVREP/Include
     17if( $?SOPHYADEVREP ) then
     18  set dst = $SOPHYADEVREP/Include
    1919endif
    2020
    … …  
    3131
    3232if( ! $?dst ) then
    33   echo "Variable DPCDEVREP must be set"
     33  echo "Variable SOPHYADEVREP must be set"
    3434  echo "OR you must give a directory for linking/copying"
    3535  exit -1

  • trunk/SophyaLib/Mgr/mkmfprog

    r911 r2437  
    11#!/bin/csh
    2 # $Id: mkmfprog,v 1.4 2000-04-13 15:56:03 ansari Exp $
     2# $Id: mkmfprog,v 1.5 2003-09-17 12:19:26 cmv Exp $
    33
    44# $1 : nom du repertoire
    … …  
    7878#end
    7979
    80 set inc = $DPCDEVREP/Include
     80set inc = $SOPHYADEVREP/Include
    8181set incext = $EXTLIBDIR/Include
    8282set nomsys = `uname`

  • trunk/SophyaLib/Mgr/mkslbsgi.csh

    r1614 r2437  
    1818set XPILIBS = "$LIBXPIPATH $LIBXPILIST"
    1919
    20 set LIB = $DPCDEVREP/IRIX64-CC/Libs/
    21 set SLB = $DPCDEVREP/IRIX64-CC/ShLibs/
    22 set OBJ = $DPCDEVREP/IRIX64-CC/Objs/
     20set LIB = $SOPHYADEVREP/IRIX64-CC/Libs/
     21set SLB = $SOPHYADEVREP/IRIX64-CC/ShLibs/
     22set OBJ = $SOPHYADEVREP/IRIX64-CC/Objs/
    2323
    2424set EXTLIBPL = -L${EXTLIBDIR}/IRIX64-CC/Libs/

  • trunk/SophyaLib/Mgr/sgienv.csh

    r1332 r2437  
    2424echo ' en.csh : setting environment variables for SOPHYA on SGI'
    2525
    26 setenv EROSCXX CC
     26setenv SOPHYACXX CC
    2727if ($sgi64 == 'Y')  then
    2828  echo ' SGI-64 bits architecture selected ... '
    29   setenv DPCBASEREP /usr/local/Sophya64/$sversion
     29  setenv SOPHYABASEREP /usr/local/Sophya64/$sversion
    3030  setenv EXTLIBDIR /usr/local/Sophya64/ExtLibs
    3131  setenv SOPHYA_SGI64 1
    32   setenv LD_LIBRARY64_PATH .:${LD_LIBRARY64_PATH}:${DPCBASEREP}/IRIX64-CC/ShLibs
     32  setenv LD_LIBRARY64_PATH .:${LD_LIBRARY64_PATH}:${SOPHYABASEREP}/IRIX64-CC/ShLibs
    3333else
    34   setenv DPCBASEREP /usr/local/Sophya/$sversion
     34  setenv SOPHYABASEREP /usr/local/Sophya/$sversion
    3535  setenv EXTLIBDIR /usr/local/Sophya/ExtLibs
    3636  unsetenv SOPHYA_SGI64
    37   setenv LD_LIBRARYN32_PATH .:${LD_LIBRARYN32_PATH}:${DPCBASEREP}/IRIX64-CC/ShLibs
     37  setenv LD_LIBRARYN32_PATH .:${LD_LIBRARYN32_PATH}:${SOPHYABASEREP}/IRIX64-CC/ShLibs
    3838endif
    3939
    40 set path = ($path $DPCBASEREP/IRIX64-CC/Exec)
     40set path = ($path $SOPHYABASEREP/IRIX64-CC/Exec)
    4141
    42 echo ' EROSCXX= ' $EROSCXX
    43 echo ' DPCBASEREP= ' $DPCBASEREP
     42echo ' SOPHYACXX= ' $SOPHYACXX
     43echo ' SOPHYABASEREP= ' $SOPHYABASEREP
    4444echo ' EXTLIBDIR= ' $EXTLIBDIR
    4545echo ' LD_LIBRARYN32_PATH= ' $LD_LIBRARYN32_PATH

  • trunk/SophyaLib/Mgr/tar_for_web.csh

    r2318 r2437  
    3333  endif
    3434end
    35 if( ! $?DPCBASEREP ) then
    36   echo Precisez DPCBASEREP
     35if( ! $?SOPHYABASEREP ) then
     36  echo Precisez SOPHYABASEREP
    3737  exit -1
    3838endif
    39 if( ! -e $DPCBASEREP/Include ) then
    40   echo Pas de repertoire $DPCBASEREP/Include
     39if( ! -e $SOPHYABASEREP/Include ) then
     40  echo Pas de repertoire $SOPHYABASEREP/Include
    4141  exit -1
    4242endif
    43 if( ! -e $DPCBASEREP/${OSCC} ) then
    44   echo Pas de repertoire $DPCBASEREP/${OSCC}
     43if( ! -e $SOPHYABASEREP/${OSCC} ) then
     44  echo Pas de repertoire $SOPHYABASEREP/${OSCC}
    4545  exit -1
    4646endif
    4747foreach d ( Libs ShLibs Exec )
    48   if( ! -d $DPCBASEREP/${OSCC}/$d ) then
    49     echo repertoire $DPCBASEREP/${OSCC}/$d inexistant
     48  if( ! -d $SOPHYABASEREP/${OSCC}/$d ) then
     49    echo repertoire $SOPHYABASEREP/${OSCC}/$d inexistant
    5050    exit -1
    5151  endif
    … …  
    7171set SYS = `echo $OSCC | awk -F"-" '{print $1}'`
    7272echo "SOURCE        = " `pwd`
    73 echo "DPCBASEREP    = " $DPCBASEREP
     73echo "SOPHYABASEREP    = " $SOPHYABASEREP
    7474echo "EXTLIBDIR     = " $EXTLIBDIR
    7575echo "Version       = " $VS
    … …  
    124124##################################################
    125125echo '>>>>>>>>' Librairies et executables de Sophya
    126 pushd $DPCBASEREP > /dev/null
     126pushd $SOPHYABASEREP > /dev/null
    127127tar -chf - Include |(cd $tmp/${VS}/.; tar -xf -)
    128128popd > /dev/null
    129 pushd $DPCBASEREP/${OSCC} > /dev/null
     129pushd $SOPHYABASEREP/${OSCC} > /dev/null
    130130tar -chf - Libs   |(cd $tmp/${VS}/.; tar -xf -)
    131131tar -chf - ShLibs |(cd $tmp/${VS}/.; tar -xf -)

  • trunk/SophyaLib/SysTools/cxxcmplnk.cc

    r2322 r2437  
    110110  string dpcbase;
    111111  char* varenv=NULL;
    112   varenv=getenv("DPCBASEREP");
     112  varenv=getenv("SOPHYABASEREP");
    113113  if (varenv) {
    114114    dpcbase = varenv;

  • trunk/SophyaPI/DemoPIApp/Makefile

    r1338 r2437  
    11MODULEDECCXXFLAGS := -msg_quiet
    2 include $(DPCBASEREP)/Include/MakefileUser.h
     2include $(SOPHYABASEREP)/Include/MakefileUser.h
    33LIBS = -L$(SLB) -lPI -lextsophya -lsophya -lm
    44

  • trunk/SophyaPI/PI/Tests/Makefile

    r1843 r2437  
    11MODULECXXREPNAME := PITest
    22MODULEDECCXXFLAGS := -msg_quiet
    3 include $(DPCDEVREP)/Include/Makefile.h
     3include $(SOPHYADEVREP)/Include/Makefile.h
    44
    55

  • trunk/SophyaPI/PIext/cxxexecutor.cc

    r2322 r2437  
    648648//---------------------------------------------------------------------
    649649//os<<"MODULEDECCXXFLAGS := -msg_quiet"<<endl;
    650 //os<<"include $(DPCBASEREP)/Include/MakefileUser.h"<<endl;
     650//os<<"include $(SOPHYABASEREP)/Include/MakefileUser.h"<<endl;
    651651//os<<"MYLIBS ="<<endl;
    652652//os<<"LIBS = -L$(SLB) -lPI -lextsophya -lsophya -lm"<<endl;

  • trunk/SophyaProg/Examples/Makefile

    r1337 r2437  
    11MODULECXXREPNAME := Tests
    22MODULEDECCXXFLAGS := -msg_quiet
    3 include $(DPCDEVREP)/Include/Makefile.h
     3include $(SOPHYADEVREP)/Include/Makefile.h
    44
    55

  • trunk/SophyaProg/Examples/README

    r1969 r2437  
    11#   Programmes exemple pour l'utilisation de Sophya
    22
    3 On suppose que $DPCBASREP/`uname`-$EROSCXX/Exec est ds le path et
    4   .:$DPCBASREP/`uname`-$EROSCXX/ShLibs ds LD_LIBRARY_PATH
     3On suppose que $DPCBASREP/`uname`-$SOPHYACXX/Exec est ds le path et
     4  .:$DPCBASREP/`uname`-$SOPHYACXX/ShLibs ds LD_LIBRARY_PATH
    55
    661) ex1.cc

  • trunk/SophyaProg/Examples/auto_makefile

    r1433 r2437  
    1414# USERFLAGS := -I/.../myincludes
    1515
    16 include $(DPCBASEREP)/Include/MakefileUser.h
     16include $(SOPHYABASEREP)/Include/MakefileUser.h
    1717
    1818

  • trunk/SophyaProg/Examples/ex_makefile

    r1433 r2437  
    1616# USERFLAGS := -I/.../myincludes
    1717
    18 include $(DPCBASEREP)/Include/MakefileUser.h
     18include $(SOPHYABASEREP)/Include/MakefileUser.h
    1919
    2020

  • trunk/SophyaProg/PMixer/makeprog

    r761 r2437  
    11MODULECXXREPNAME := SkyT
    22# MODULEDECCXXFLAGS := -msg_quiet
    3 include $(DPCDEVREP)/Include/Makefile.h
     3include $(SOPHYADEVREP)/Include/Makefile.h
    44
    55ifdef NOSHLIB

  • trunk/SophyaProg/Tests/JTCMakefile

    r1043 r2437  
    11MODULECXXREPNAME := Tests
    22MODULEDECCXXFLAGS := -msg_quiet -pthread
    3 include $(DPCDEVREP)/Include/Makefile.h
     3include $(SOPHYADEVREP)/Include/Makefile.h
    44
    55# Makefile pour linket avec libJThreadsC++

  • trunk/SophyaProg/Tests/Makefile

    r2431 r2437  
    11MODULECXXREPNAME := Tests
    22MODULEDECCXXFLAGS := -msg_quiet
    3 include $(DPCDEVREP)/Include/Makefile.h
     3include $(SOPHYADEVREP)/Include/Makefile.h
    44
    55

  • trunk/SophyaProg/Tests/makepi

    r1726 r2437  
    11MODULECXXREPNAME := Tests
    22MODULEDECCXXFLAGS := -msg_quiet
    3 include $(DPCDEVREP)/Include/Makefile.h
     3include $(SOPHYADEVREP)/Include/Makefile.h
    44
    55
Note: See TracChangeset for help on using the changeset viewer.