diff options
| author | John J. Camilleri <john@digitalgrammars.com> | 2021-07-22 22:56:39 +0200 |
|---|---|---|
| committer | John J. Camilleri <john@digitalgrammars.com> | 2021-07-22 22:56:39 +0200 |
| commit | 2610219f6a4d43d53d43c04c12f597c9b2eba39e (patch) | |
| tree | 15ffc0a03bea5bde73942b39253825bfa4ca208e | |
| parent | 7674f078d61fac8f193886c1e1dfe803e479f6de (diff) | |
Update path
| -rw-r--r-- | .github/workflows/build-windows-binary.yml | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/.github/workflows/build-windows-binary.yml b/.github/workflows/build-windows-binary.yml index 46a34d7f1..be39f357b 100644 --- a/.github/workflows/build-windows-binary.yml +++ b/.github/workflows/build-windows-binary.yml @@ -23,11 +23,6 @@ jobs: gcc python-devel - - name: Find Java stuff - shell: msys2 {0} - run: | - find "/c/hostedtoolcache/windows/Java_Adopt_jdk" -name "jni.h" - - name: Prepare dist folder shell: msys2 {0} run: | @@ -47,13 +42,15 @@ jobs: cp /mingw64/bin/libpgf-0.dll /c/tmp-dist/c cp /mingw64/bin/libgu-0.dll /c/tmp-dist/c + # JAVA_HOME_8_X64 = C:\hostedtoolcache\windows\Java_Adopt_jdk\8.0.292-10\x64 - name: Build Java bindings shell: msys2 {0} run: | - export PATH="${PATH}:/c/Program Files/Java/jdk8u275-b01/bin" + export JDKPATH=/c/hostedtoolcache/windows/Java_Adopt_jdk/8.0.292-10/x64 + export PATH="${PATH}:${JDKPATH}/bin" cd src/runtime/java make \ - JNI_INCLUDES="-I \"/c/Program Files/Java/jdk8u275-b01/include\" -I \"/c/Program Files/Java/jdk8u275-b01/include/win32\" -I \"/mingw64/include\" -D__int64=int64_t" \ + JNI_INCLUDES="-I \"${JDKPATH}/include\" -I \"${JDKPATH}/include/win32\" -I \"/mingw64/include\" -D__int64=int64_t" \ WINDOWS_LDFLAGS="-L\"/mingw64/lib\" -no-undefined" make install cp .libs//msys-jpgf-0.dll /c/tmp-dist/java/jpgf.dll |