From 9adc02d69b5a788c885a01aa1cece9983d975b7e Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Mon, 8 Jul 2019 17:52:02 +0200 Subject: [PATCH] fix the build on appveyor since travis has no artifacts --- src/bindings/java/org/simgrid/NativeLib.java | 4 ++-- tools/cmake/Java.cmake | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/bindings/java/org/simgrid/NativeLib.java b/src/bindings/java/org/simgrid/NativeLib.java index 9592f82a03..e19be694ac 100644 --- a/src/bindings/java/org/simgrid/NativeLib.java +++ b/src/bindings/java/org/simgrid/NativeLib.java @@ -163,9 +163,9 @@ public final class NativeLib { public void run() { try { for (File f : dir.listFiles()) - if (! f.delete() && !f.getAbsolutePath().contains("travis")) // Be silent on Travis to not break the tests. Ugly trick :) + if (! f.delete() && !f.getAbsolutePath().contains("travis") && !f.getAbsolutePath().contains("appveyor")) // Be silent on Travis to not break the tests. Ugly trick :) System.out.println("Unable to clean temporary file "+f.getAbsolutePath()+" during shutdown."); - if (! dir.delete() && !dir.getAbsolutePath().contains("travis") ) + if (! dir.delete() && !dir.getAbsolutePath().contains("travis") && !dir.getAbsolutePath().contains("appveyor")) System.out.println("Unable to clean temporary file "+dir.getAbsolutePath()+" during shutdown."); } catch(Exception e) { System.out.println("Error while cleaning temporary file "+dir.getAbsolutePath()+" during shutdown: "+e.getCause()); diff --git a/tools/cmake/Java.cmake b/tools/cmake/Java.cmake index a254ff167f..bb6ecba1e7 100644 --- a/tools/cmake/Java.cmake +++ b/tools/cmake/Java.cmake @@ -137,6 +137,7 @@ if(WIN32) # So let's be brutal and copy it in any case (even on non-windows builds) from the location where appveyor provides it. # The copy is only expected to work on the appveyor builder, but that's all we need right now # since our users are directed to download that file as nightly build. + COMMAND ${CMAKE_COMMAND} -E copy_if_different C:/mingw-w64/x86_64-7.2.0-posix-seh-rt_v5-rev1/mingw64/bin/libwinpthread-1.dll ${JAVA_NATIVE_PATH}/libwinpthread-1.dll || true COMMAND ${CMAKE_COMMAND} -E copy_if_different C:/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/bin/libwinpthread-1.dll ${JAVA_NATIVE_PATH}/libwinpthread-1.dll || true ) endif() -- 2.20.1