Index: /issm/trunk-jpl/Makefile.am =================================================================== --- /issm/trunk-jpl/Makefile.am (revision 16095) +++ /issm/trunk-jpl/Makefile.am (revision 16096) @@ -4,3 +4,2 @@ ACLOCAL_AMFLAGS = -I m4 - Index: /issm/trunk-jpl/configure.ac =================================================================== --- /issm/trunk-jpl/configure.ac (revision 16095) +++ /issm/trunk-jpl/configure.ac (revision 16096) @@ -33,13 +33,15 @@ #List all Makefiles -AC_CONFIG_FILES([Makefile - src/Makefile - src/c/Makefile - src/wrappers/Makefile - src/wrappers/python/Makefile - src/wrappers/matlab/Makefile - src/mobile/Makefile - src/mobile/native/Makefile - src/m/Makefile]) +AC_CONFIG_FILES([ + Makefile + src/Makefile + src/c/Makefile + src/wrappers/Makefile + src/wrappers/python/Makefile + src/wrappers/matlab/Makefile + src/mobile/Makefile + src/mobile/native/Makefile + src/m/Makefile + ]) #End of configure.ac Index: /issm/trunk-jpl/externalpackages/valgrind/install-macosx64.sh =================================================================== --- /issm/trunk-jpl/externalpackages/valgrind/install-macosx64.sh (revision 16095) +++ /issm/trunk-jpl/externalpackages/valgrind/install-macosx64.sh (revision 16096) @@ -3,16 +3,16 @@ #Some cleanup -rm -rf install valgrind-3.8.0 +rm -rf install valgrind-3.8.1 mkdir install #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/valgrind-3.8.0.tar.bz2' 'valgrind-3.8.0.tar.bz2' +#$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/valgrind-3.8.1.tar.bz2' 'valgrind-3.8.1.tar.bz2' #Untar -tar -jxvf valgrind-3.8.0.tar.bz2 +tar -jxvf valgrind-3.8.1.tar.bz2 #Move valgrind into install directory -mv valgrind-3.8.0/* install -rm -rf valgrind-3.8.0 +mv valgrind-3.8.1/* install +rm -rf valgrind-3.8.1 #configure @@ -21,4 +21,4 @@ #Compile valgrind -make -j 4 +make -j 8 make install Index: /issm/trunk-jpl/externalpackages/valgrind/issm.supp =================================================================== --- /issm/trunk-jpl/externalpackages/valgrind/issm.supp (revision 16095) +++ /issm/trunk-jpl/externalpackages/valgrind/issm.supp (revision 16096) @@ -3,5 +3,5 @@ # # to add errors: -# 1. in m/public/queue/ClusterScript.m, +# 1. in m/classes/clusters/generic.m, # add: --gen-suppressions=all # 2. in the errlog, copy and paste the suppression log Index: /issm/trunk-jpl/externalpackages/vim/addons/vimrc =================================================================== --- /issm/trunk-jpl/externalpackages/vim/addons/vimrc (revision 16095) +++ /issm/trunk-jpl/externalpackages/vim/addons/vimrc (revision 16096) @@ -155,4 +155,6 @@ " and here some nice options for cindenting set cinoptions={.5s,+.5s,t0,n-2,p2s,(03s,=.5s,>1s,=1s,:1s +" pound sign identation +inoremap # X# " ----------------------------------------------------------------------}}} " TEX special{{{ Index: /issm/trunk-jpl/m4/issm_options.m4 =================================================================== --- /issm/trunk-jpl/m4/issm_options.m4 (revision 16095) +++ /issm/trunk-jpl/m4/issm_options.m4 (revision 16096) @@ -2,4 +2,8 @@ AC_DEFUN([ISSM_OPTIONS],[ + + AC_MSG_NOTICE(============================================================================) + AC_MSG_NOTICE(= Checking ISSM specific options =) + AC_MSG_NOTICE(============================================================================) dnl ISSM's internal options @@ -10,8 +14,20 @@ [enable_debugging=no]) dnl action if not given + AC_MSG_CHECKING(for debugging support) if test "x$enable_debugging" = xyes; then AC_DEFINE([_ISSM_DEBUG_],[1],[Macro to enable debugging in ISSM]) fi - dnl }}} + AC_MSG_RESULT($enable_debugging) + dnl }}} + dnl Development{{{ + AC_ARG_ENABLE([development], dnl feature + AS_HELP_STRING([--enable-development],[turn development on]), dnl help string + [enable_development=$enableval], dnl action if given + [enable_development=yes]) dnl action if not given + + AC_MSG_CHECKING(for development support) + AM_CONDITIONAL([DEVELOPMENT], [test x$enable_development = xyes]) + AC_MSG_RESULT($enable_development) + dnl }}} dnl Shared build {{{ AC_ARG_ENABLE([sharedlibs], dnl feature @@ -19,5 +35,7 @@ [enable_sharedlibs=$enableval], dnl action if given [enable_sharedlibs=no]) dnl action if not given + AC_MSG_CHECKING(for shared library build) AM_CONDITIONAL([SHAREDLIBS], [test x$enable_sharedlibs = xyes]) + AC_MSG_RESULT($enable_sharedlibs) dnl }}} dnl Version{{{ Index: /issm/trunk-jpl/src/m/Makefile.am =================================================================== --- /issm/trunk-jpl/src/m/Makefile.am (revision 16095) +++ /issm/trunk-jpl/src/m/Makefile.am (revision 16096) @@ -3,50 +3,105 @@ #find . -type d -exec ls -d {} \; +bin_SCRIPTS = if WRAPPERS -bin_SCRIPTS= ./qmu/*.m \ - ./qmu/setupdesign/*.m \ - ./qmu/plot/*.m \ - ./qmu/examples/*.m \ - ./kml/*.m \ - ./enum/*.m \ - ./classes/*.m \ - ./classes/qmu/*.m \ - ./classes/qmu/@dakota_method/*.m \ - ./classes/clusters/*.m \ - ./classes/model/*.m \ - ./consistency/*.m \ - ./array/*.m \ - ./boundaryconditions/*.m \ - ./exp/*.m \ - ./exp/operation/*.m \ - ./geometry/*.m \ - ./interp/*.m \ - ./coordsystems/*.m \ - ./mech/*.m \ - ./mesh/*.m \ - ./mesh/planet/*.m \ - ./mesh/rifts/*.m \ - ./miscellaneous/*.m \ - ./os/*.m \ - ./plot/*.m \ - ./plot/colormaps/*.m \ - ./string/*.m \ - ./contrib/massbalance/*.m \ - ./contrib/ecco/*.m \ - ./contrib/hydrology/*.m \ - ./contrib/hack/*.m \ - ./contrib/gslib/*.m \ - ./contrib/uci/*.m \ - ./contrib/oasis/*.m \ - ./contrib/bamg/*.m \ - ./extrusion/*.m \ - ./inversions/*.m \ - ./io/*.m \ - ./parameterization/*.m \ - ./partition/*.m \ - ./print/*.m \ - ./regional/*.m \ - ./solve/*.m \ - ./solvers/*.m \ - ./materials/*.m +if MATLAB +if !DEVELOPMENT +bin_SCRIPTS += ./qmu/*.m \ + ./qmu/setupdesign/*.m \ + ./qmu/plot/*.m \ + ./qmu/examples/*.m \ + ./kml/*.m \ + ./enum/*.m \ + ./classes/*.m \ + ./classes/qmu/*.m \ + ./classes/qmu/@dakota_method/*.m \ + ./classes/clusters/*.m \ + ./classes/model/*.m \ + ./consistency/*.m \ + ./array/*.m \ + ./boundaryconditions/*.m \ + ./exp/*.m \ + ./exp/operation/*.m \ + ./geometry/*.m \ + ./interp/*.m \ + ./coordsystems/*.m \ + ./mech/*.m \ + ./mesh/*.m \ + ./mesh/planet/*.m \ + ./mesh/rifts/*.m \ + ./miscellaneous/*.m \ + ./os/*.m \ + ./plot/*.m \ + ./plot/colormaps/*.m \ + ./string/*.m \ + ./contrib/massbalance/*.m \ + ./contrib/ecco/*.m \ + ./contrib/hydrology/*.m \ + ./contrib/hack/*.m \ + ./contrib/gslib/*.m \ + ./contrib/uci/*.m \ + ./contrib/oasis/*.m \ + ./contrib/bamg/*.m \ + ./extrusion/*.m \ + ./inversions/*.m \ + ./io/*.m \ + ./parameterization/*.m \ + ./partition/*.m \ + ./print/*.m \ + ./regional/*.m \ + ./solve/*.m \ + ./solvers/*.m \ + ./materials/*.m endif +endif +if PYTHON +if !DEVELOPMENT +bin_SCRIPTS += ./qmu/*.py \ + ./qmu/setupdesign/*.py \ + ./qmu/plot/*.py \ + ./qmu/examples/*.py \ + ./kml/*.py \ + ./enum/*.py \ + ./classes/*.py \ + ./classes/qmu/*.py \ + ./classes/qmu/@dakota_method/*.py \ + ./classes/clusters/*.py \ + ./classes/model/*.py \ + ./consistency/*.py \ + ./array/*.py \ + ./boundaryconditions/*.py \ + ./exp/*.py \ + ./exp/operation/*.py \ + ./geometry/*.py \ + ./interp/*.py \ + ./coordsystems/*.py \ + ./mech/*.py \ + ./mesh/*.py \ + ./mesh/planet/*.py \ + ./mesh/rifts/*.py \ + ./miscellaneous/*.py \ + ./os/*.py \ + ./plot/*.py \ + ./plot/colormaps/*.py \ + ./string/*.py \ + ./contrib/massbalance/*.py \ + ./contrib/ecco/*.py \ + ./contrib/hydrology/*.py \ + ./contrib/hack/*.py \ + ./contrib/gslib/*.py \ + ./contrib/uci/*.py \ + ./contrib/oasis/*.py \ + ./contrib/bamg/*.py \ + ./extrusion/*.py \ + ./inversions/*.py \ + ./io/*.py \ + ./parameterization/*.py \ + ./partition/*.py \ + ./print/*.py \ + ./regional/*.py \ + ./solve/*.py \ + ./solvers/*.py \ + ./materials/*.py +endif +endif +endif