niklas/cyclonedds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove dependency on jdk8 Chocolatey package

Browse source 
Signed-off-by: Jeroen Koekkoek <jeroen@koekkoek.nl>
This commit is contained in:
Jeroen Koekkoek 2019-04-18 17:34:14 +02:00 • committed by eboasson
parent 58f21af36e
commit 2700dce0eb
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
.travis.yml
View file

@ -64,6 +64,9 @@ before_install:
- if [ "${TRAVIS_OS_NAME}" = "windows" ]; then - if [ "${TRAVIS_OS_NAME}" = "windows" ]; then
eval "unset CC"; eval "unset CC";
eval "unset CXX"; eval "unset CXX";
JAVA_HOME=$(find "/c/Program Files/Android/jdk/" -name "*openjdk*" | sort | head -n 1);
export JAVA_HOME;
export PATH="${PATH}:${JAVA_HOME}/bin";
else else
eval "export CC=${C_COMPILER}"; eval "export CC=${C_COMPILER}";
eval "export CXX=${CXX_COMPILER}"; eval "export CXX=${CXX_COMPILER}";
@ -83,13 +86,10 @@ before_install:
# issue, JAVA_HOME is read from the registry and exported by this script. # issue, JAVA_HOME is read from the registry and exported by this script.
install: install:
- if [ "${TRAVIS_OS_NAME}" = "windows" ]; then - if [ "${TRAVIS_OS_NAME}" = "windows" ]; then
choco install innoextract maven; choco install innoextract;
choco install maven --ignore-dependencies;
wget -q https://dl.bintray.com/conan/installers/conan-win-64_1_10_0.exe; wget -q https://dl.bintray.com/conan/installers/conan-win-64_1_10_0.exe;
innoextract conan-win-64_1_10_0.exe; innoextract conan-win-64_1_10_0.exe;
KEY='HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Environment';
VALUE='JAVA_HOME';
JAVA_HOME=$(REG QUERY "${KEY}" -v "${VALUE}" | sed -n 's/^.*JAVA_HOME \+[_A-Z]\+ \+//ip');
eval "export JAVA_HOME=\"${JAVA_HOME}\"";
eval "export PATH=\"$(pwd)/app/conan:${PATH}\""; eval "export PATH=\"$(pwd)/app/conan:${PATH}\"";
elif [ "${TRAVIS_OS_NAME}" = "osx" ]; then elif [ "${TRAVIS_OS_NAME}" = "osx" ]; then
eval "$(pyenv init -)"; eval "$(pyenv init -)";