Changeset 20352

Timestamp:

03/24/16 16:39:50 (9 years ago)

Author:

Eric.Larour

Message:

CHG (JS):
-added sprintf script which is often used across the js code.
-make sure all the .js files end up in bin/issm-prebin.js and bin/issm.js

Location:

issm/trunk-jpl/src

Files:

• m/Makefile.am (modified) (2 diffs)
• m/print/sprintf.js (added)
• wrappers/javascript/Makefile.am (modified) (1 diff)

issm/trunk-jpl/src/m/Makefile.am

@@ -153 +153 @@
                                 ${ISSM_DIR}/src/m/plot/gauge.js \
                                 ${ISSM_DIR}/src/m/plot/webgl.js \
+                                ${ISSM_DIR}/src/m/print/sprintf.js \
                                 ${ISSM_DIR}/src/m/solve/loadresultsfrombuffer.js \
                                 ${ISSM_DIR}/src/m/solve/marshall.js \
@@ -159 +160 @@
                                 ${ISSM_DIR}/src/m/solve/WriteData.js \
                                 ${ISSM_DIR}/src/m/solvers/issmgslsolver.js 
-
 bin_SCRIPTS +=  issm-bin.js
 

issm/trunk-jpl/src/wrappers/javascript/Makefile.am

@@ -7 +7 @@
 AM_CPPFLAGS+=  -DISSM_PREFIX='"$(prefix)"'
 
-bin_SCRIPTS = 
-bin_SCRIPTS += ../TriMesh/TriMesh.js  \
-                           ../NodeConnectivity/NodeConnectivity.js\
-                           ../ContourToMesh/ContourToMesh.js\
-                           ../ElementConnectivity/ElementConnectivity.js\
-                           ../InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.js\
-                           ../IssmConfig/IssmConfig.js\
-                           ../EnumToString/EnumToString.js\
-                           ../StringToEnum/StringToEnum.js\
-                           ../Issm/issm.js
+js_scripts = ${ISSM_DIR}/src/wrappers/TriMesh/TriMesh.js  \
+                         ${ISSM_DIR}/src/wrappers/NodeConnectivity/NodeConnectivity.js\
+                         ${ISSM_DIR}/src/wrappers/ContourToMesh/ContourToMesh.js\
+                         ${ISSM_DIR}/src/wrappers/ElementConnectivity/ElementConnectivity.js\
+                         ${ISSM_DIR}/src/wrappers/InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.js\
+                         ${ISSM_DIR}/src/wrappers/IssmConfig/IssmConfig.js\
+                         ${ISSM_DIR}/src/wrappers/EnumToString/EnumToString.js\
+                         ${ISSM_DIR}/src/wrappers/StringToEnum/StringToEnum.js\
+                         ${ISSM_DIR}/src/wrappers/Issm/issm.js
+
+bin_SCRIPTS =  issm-prebin.js
+
+issm-prebin.js: ${js_scripts}
+        cat ${js_scripts}  > issm-prebin.js
         
 #javascript io{{{