Changeset 22624


Ignore:
Timestamp:
03/23/18 14:33:03 (7 years ago)
Author:
jdquinn
Message:

CHG: Config adjustments for Linux JavaScript build.

Location:
issm/trunk-jpl
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/externalpackages/emscripten/install.sh

    r21963 r22624  
    11#!/bin/bash
    22set -eu
     3
     4export CC=gcc
     5export CXX=g++
    36
    47#Some cleanup
     
    1215mv emsdk_portable install
    1316
    14 cd install
    15 
    16 export CXX=g++
    17 export CC=gcc
     17cd install
    1818
    1919./emsdk update
    20 ./emsdk install latest
    21 ./emsdk activate latest
     20./emsdk install sdk-tag-1.34.12-64bit
     21./emsdk activate sdk-tag-1.34.12-64bit
    2222
    2323#Related to moving the install path after installation - However, not safe to install in dir named "install" since a failure would not be noticed by jenkins when triggering
  • issm/trunk-jpl/externalpackages/gsl/install-javascript.sh

    r21976 r22624  
    11#!/bin/bash
    22set -eu
     3
     4#Source emscripten to ensure emcc/em++ compiler are in env
     5source $ISSM_DIR/externalpackages/emscripten/install/emsdk_env.sh
     6export CC=emcc
     7export CXX=em++
     8
     9# Issue with variadic function signatures.
     10export CFLAGS=-DSTDC_HEADERS
    311
    412#Some cleanup
     
    1927cd src-javascript
    2028
    21 #Source emscripten to ensure emcc/em++ compiler are in env
    22 source $ISSM_DIR/externalpackages/emscripten/install/emsdk_env.sh
    23 export CC=emcc
    24 export CXX=em++
    25 
    26 # Issue with variadic function signatures.
    27 export CFLAGS=-DSTDC_HEADERS
    28 
    2929./configure --prefix="$ISSM_DIR/externalpackages/gsl/install-javascript" \
    3030        --disable-shared
  • issm/trunk-jpl/externalpackages/triangle/install-javascript.sh

    r21976 r22624  
    11#!/bin/bash
    22set -eu
     3
     4#Source emscripten to ensure emcc/em++ compiler are in env
     5source $ISSM_DIR/externalpackages/emscripten/install/emsdk_env.sh
     6export CC=emcc
     7export CXX=em++
    38
    49#Some cleanup
     
    813#Download from ISSM server
    914$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/triangle.zip' 'triangle.zip'
    10 
    11 #Source emscripten to ensure emcc/em++ compiler are in env
    12 source $ISSM_DIR/externalpackages/emscripten/install/emsdk_env.sh
    13 export CXX=em++
    14 export CC=emcc
    1515
    1616#Untar
  • issm/trunk-jpl/jenkins/linux64_ross_javascript

    r22274 r22624  
    1111    --with-gsl-dir="$ISSM_DIR/externalpackages/gsl/install-javascript" \
    1212        --without-Love \
    13     --without-kml\
    14     --without-kriging\
    15     --with-cxxoptflags=""\
    16     CXXFLAGS=""\
    17     CFLAGS=""'
     13    --without-kml \
     14    --without-kriging \
     15    --with-cxxoptflags="-O2"'
    1816
    1917#PYTHON and MATLAB testing
Note: See TracChangeset for help on using the changeset viewer.