Changeset 80 for trunk

Timestamp:

04/26/10 14:09:00 (14 years ago)

Author:

pinsard

Message:

improve environnement definition

Location:

trunk

Files:

• adm/makefile (modified) (7 diffs)
• adm/sphinx/conf.py (modified) (1 diff)
• src/ircaam_profile.sh (modified) (5 diffs)
• src/refdataget.sh (modified) (3 diffs)

trunk/adm/makefile

@@ -249 +249 @@
 spellcheck \
 all \
+man \
 man_troff \
 man_html \
@@ -328 +329 @@
 all : \
 man \
-browse
+html_src_browser
 
 man : \
@@ -335 +336 @@
 man_pdf \
 
-browse : \
+html_src_browser : \
 html_src_browser_doxygen
 
@@ -399 +400 @@
 
 $(DIRTMP)/index_many.rst :
-        @echo "$(PRODUCTNAME) manuals" | tr [:print:] = >> $@
+        @echo "$(PRODUCTNAME) manuals" | tr [:print:] = > $@
         @echo "$(PRODUCTNAME) manuals" >> $@
         @echo "$(PRODUCTNAME) manuals" | tr [:print:] = >> $@
         @echo " " >> $@
         @echo "Shell scripts" >> $@
-        @echo "=============" >> $@
+        @echo "Shell scripts" | tr [:print:] = >> $@
         @for file in $(LIST_SRCSH); \
         do echo " "; \
@@ -413 +414 @@
         @echo " " >> $@
         @echo "MATLAB scripts" >> $@
-        @echo "==============" >> $@
+        @echo "MATLAB scripts" | tr [:print:] = >> $@
         @for file in $(LIST_SRCMATLAB); \
         do echo " "; \
@@ -422 +423 @@
         @echo " " >> $@
         @echo "Fortran Sources" >> $@
-        @echo "===============" >> $@
+        @echo "Fortran Sources" | tr [:print:] = >> $@
         @for file in $(LIST_SRCFORTRAN); \
         do echo " "; \
@@ -432 +433 @@
 
 $(DIRTMP)/sphinx_tmpdir/index.rst :
-        @echo ".. _index:" >> $@
+        @echo ".. _index:" > $@
         @echo " " >> $@
         @echo "$(PRODUCTNAME) manuals" | tr [:print:] = >> $@

trunk/adm/sphinx/conf.py

@@ -32 +32 @@
 
 # The encoding of source files.
-#source_encoding = 'utf-8'
+source_encoding = 'iso-8859-15'
 
 # The master toctree document.

trunk/src/ircaam_profile.sh

@@ -84 +84 @@
 # $Id$
 #
+# - fplod 20100426T094821Z aedon.locean-ipsl.upmc.fr (Darwin)
+#
+#   * improve PATH and MANPATH modification
+#
+# - fplod 20100423T143244Z aedon.locean-ipsl.upmc.fr (Darwin)
+#
+#   * add error handling on mkdir
+#
 # - fplod 2009-02-17T11:59:35Z aedon.locean-ipsl.upmc.fr (Darwin)
 #
-#  * more unset statements
+#   * more unset statements
 #
 # - fplod 2009-02-04T13:35:30Z zeus.locean-ipsl.upmc.fr (Linux)
 #
-#  * ${IRCAAM}/../bin/ is added to PATH.
+#   * ${IRCAAM}/../bin/ is added to PATH.
 #
 # - fplod 2008-08-14T12:28:16Z aedon.locean-ipsl.upmc.fr (Darwin)
 #
-#  * move all \*.sh and \*.pro files to src/
+#   * move all \*.sh and \*.pro files to src/
 #
 # - fplod 2008-07-21T10:58:47Z aedon.locean-ipsl.upmc.fr (Darwin)
@@ -124 +132 @@
 do
    case ${1} in
-      -d) # directory for application choosen by user (see svn checkout command used)
+      -d)
+         # directory for application choosen by user (see svn checkout command used)
          directory=${2}
          shift
       ;;
-      -i) # directory for inputs choosen by user
+      -i)
+         # directory for inputs choosen by user
          indir=${2}
          shift
       ;;
-      -o) # directory for outputs choosen by user
+      -o)
+         # directory for outputs choosen by user
          outdir=${2}
          shift
       ;;
-      -t) # directory for temporary outputs choosen by user
+      -t)
+         # directory for temporary outputs choosen by user
          tempdir=${2}
          shift
       ;;
-      *) # other choice
+      *)
+         # other choice
          echo "eee : unknown option ${1}"
          echo "${usage}"
@@ -146 +159 @@
       ;;
    esac
-   shift # next flag
+   # next flag
+   shift
 done
 unset usage
@@ -172 +186 @@
 # add IRCAAM tools to PATH
 # if not already done
-echo ${PATH} | grep -q ${IRCAAM}
+suppath=$(echo ${IRCAAM} | tr -s "/")
+echo ${PATH} | grep -q "${suppath}:"
 test_path=${?}
 if [ ${test_path} -ne 0 ]
 then
-   PATH=${IRCAAM}/:${PATH}
+   PATH=${suppath}:${PATH}
    export PATH
 else
    # option bavarde oui/non pas encore implantée ++
-   echo "${command} : iii : ${IRCAAM}/ already in \${PATH}"
+   echo "${command} : iii : ${suppath} already in \${PATH}"
 fi
 unset test_path
+unset suppath
 #
 # add ${IRCAAM}/../bin tools to PATH
 # if not already done
-echo ${PATH} | grep -q "${IRCAAM}/../bin"
+suppath=$(echo ${IRCAAM}/../bin | tr -s "/")
+echo ${PATH} | grep -q "${suppath}:"
 test_path=${?}
 if [ ${test_path} -ne 0 ]
 then
-   PATH=${IRCAAM}/../bin/:${PATH}
+   PATH=${suppath}:${PATH}
    export PATH
 else
    # option bavarde oui/non pas encore implantée ++
-   echo "${command} : iii : ${IRCAAM}/../bin/ already in \${PATH}"
+   echo "${command} : iii : ${suppath} already in \${PATH}"
 fi
 unset test_path
+unset suppath 
 #
 # add IRCAAM manuals to MANPATH
 # if not already done
-echo ${MANPATH} | grep -q ${IRCAAM}
+suppath=$(echo ${IRCAAM}/doc/manuals/man | tr -s "/")
+echo ${MANPATH} | grep -q ${suppath}
 test_manpath=${?}
 if [ ${test_manpath} -ne 0 ]
 then
-   MANPATH=${IRCAAM}/doc/manuals/man/:${MANPATH}
+   MANPATH=${suppath}:${MANPATH}
    export MANPATH
 else
    # option bavarde oui/non pas encore implantée ++
-   echo "${command} : iii : ${IRCAAM}/doc/manuals/man/ already in \${MANPATH}"
+   echo "${command} : iii : ${suppath} already in \${MANPATH}"
 fi
 unset test_manpath
+unset suppath
 #
 IRCAAM_LOG=${tempdir}
@@ -217 +237 @@
 if [ ! -d ${IRCAAM_LOG} ]
 then
-  mkdir -p ${IRCAAM_LOG}
-  echo "${command} : iii : creation of \${IRCAAM_LOG}"
+   mkdir -p ${IRCAAM_LOG}
+   status=${?}
+   if [ ${status} -ne 0 ]
+   then
+      echo "${command} : eee : can not create \${IRCAAM_LOG}"
+      # nb : no exit because this file should be launched by login process
+   else
+      echo "${command} : iii : creation of \${IRCAAM_LOG}"
+   fi
+   unset status
 fi
 # check for permission on IRCAAM_LOG

trunk/src/refdataget.sh

@@ -18 +18 @@
 # ===========
 #
-# Put in ${IRCAAM_ID} all the reference data files 
+# Put in ${IRCAAM_ID} all the reference data files
 #
 # This includes :
 #
-# - ARPEGE data 
+# - ARPEGE data
 #   4 parameters (rlut_d zg_d pr_d) in 5 simulations experiences
 #   (CtIV CtCl AfNQIVIV AsNQIVIV TrNQIVIV) between 1971 and 2000.
 #
-#   You will need password from authorized people to access to ARPEGE 
+#   You will need password from authorized people to access to ARPEGE
 #   simulation files.
 #
@@ -39 +39 @@
 # ========
 #
-# If you are working on LOCEAN machine and you don't have any reference data, 
+# If you are working on LOCEAN machine and you don't have any reference data,
 # you just have to run this tool ::
 #
 #  $ refdataget.sh
-# 
+#
 # And look at log file with ::
 #
 #  $ tlogd.sh refdataget
-# 
+#
 # and of course on files in ${IRCAAM_ID}.
 #
@@ -150 +150 @@
 # ARPEGE
 list_param="rlut_d zg_d pr_d"
-list_simu="CtIV CtCl AfNQIVIV AsNQIVIV TrNQIVIV" 
+list_simu="CtIV CtCl AfNQIVIV AsNQIVIV TrNQIVIV"
 year_min=1971
 year_max=2000