|
10 | 10 | CLANG_VERSION="export CC=gcc-7 && export CXX=g++-7"; |
11 | 11 | elif [[ "$TRAVIS_OS_NAME" == "windows" ]] ; then |
12 | 12 | echo "Windoes compiler?"; |
13 | | - HDF5_HOME_WIN="C:/Program\\ Files/HDF_Group/HDF5/1.10.5" |
14 | 13 | else |
15 | 14 | GCC_VERSION="export CC=gcc-7 && export CXX=g++-7"; |
16 | 15 | fi |
@@ -76,32 +75,32 @@ before_install: |
76 | 75 | powershell "Start-Process msiexec.exe -Wait -ArgumentList '/I C:\\Users\\travis\\build\\HDF-NI\\hdf5.node\\hdf\\HDF5-1.10.5-win64.msi /quiet'" ; |
77 | 76 | fi |
78 | 77 |
|
79 | | -install: |
80 | | - - if [[ "$TRAVIS_OS_NAME" == "osx" ]] ; then |
81 | | - echo ${HDF5_HOME}; |
82 | | - npm install --longlong_type=LONGLONG53BITS --hdf5_home_mac=${HDF5_HOME_MAC}; |
83 | | - elif [[ "$TRAVIS_OS_NAME" == "windows" ]] ; then |
84 | | - echo "Windoes compiler?"; |
85 | | - npm install --longlong_type=LONGLONG53BITS --hdf5_home_win=${HDF5_HOME_WIN}; |
86 | | - else |
87 | | - export HDF5_HOME_LINUX=/usr/lib/x86_64-linux-gnu/hdf5/serial; |
88 | | - eval "${GCC_VERSION}" ; |
89 | | - npm install --longlong_type=LONGLONG53BITS --hdf5_home_linux=${HDF5_HOME_LINUX}; |
90 | | - fi |
91 | | - |
92 | 78 | # install: |
93 | 79 | # - if [[ "$TRAVIS_OS_NAME" == "osx" ]] ; then |
94 | 80 | # echo ${HDF5_HOME}; |
95 | 81 | # npm install --longlong_type=LONGLONG53BITS --hdf5_home_mac=${HDF5_HOME_MAC}; |
96 | 82 | # elif [[ "$TRAVIS_OS_NAME" == "windows" ]] ; then |
97 | 83 | # echo "Windoes compiler?"; |
98 | | -# npm install --longlong_type=LONGLONG53BITS; |
| 84 | +# npm install --longlong_type=LONGLONG53BITS --hdf5_home_win=${HDF5_HOME_WIN}; |
99 | 85 | # else |
100 | 86 | # export HDF5_HOME_LINUX=/usr/lib/x86_64-linux-gnu/hdf5/serial; |
101 | 87 | # eval "${GCC_VERSION}" ; |
102 | 88 | # npm install --longlong_type=LONGLONG53BITS --hdf5_home_linux=${HDF5_HOME_LINUX}; |
103 | 89 | # fi |
104 | 90 |
|
| 91 | +install: |
| 92 | + - if [[ "$TRAVIS_OS_NAME" == "osx" ]] ; then |
| 93 | + echo ${HDF5_HOME}; |
| 94 | + npm install --longlong_type=LONGLONG53BITS --hdf5_home_mac=${HDF5_HOME_MAC}; |
| 95 | + elif [[ "$TRAVIS_OS_NAME" == "windows" ]] ; then |
| 96 | + echo "Windoes compiler?"; |
| 97 | + npm install --longlong_type=LONGLONG53BITS; |
| 98 | + else |
| 99 | + export HDF5_HOME_LINUX=/usr/lib/x86_64-linux-gnu/hdf5/serial; |
| 100 | + eval "${GCC_VERSION}" ; |
| 101 | + npm install --longlong_type=LONGLONG53BITS --hdf5_home_linux=${HDF5_HOME_LINUX}; |
| 102 | + fi |
| 103 | + |
105 | 104 |
|
106 | 105 | before-scripte: |
107 | 106 | - export PATH=`pwd`/node_modules/.bin:${PATH} |
|
0 commit comments