diff options
| author | John J. Camilleri <john@johnjcamilleri.com> | 2021-07-23 15:55:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-23 15:55:37 +0200 |
| commit | 9533edc3ca28fcbc1c105eb79495b125b9cb4005 (patch) | |
| tree | eef1cf6e821f60643075db55407422d134c7225e | |
| parent | dfa5b9276d4c5b67b30323f7c3224237fbdaeced (diff) | |
| parent | 4df8999ed5d477aae92bfa8c0d9e814930d9d4c5 (diff) | |
Merge pull request #128 from GrammaticalFramework/windows-binary
Fixes to building Windows binary
| -rw-r--r-- | .github/workflows/build-binary-packages.yml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/.github/workflows/build-binary-packages.yml b/.github/workflows/build-binary-packages.yml index 810fa1352..53f039714 100644 --- a/.github/workflows/build-binary-packages.yml +++ b/.github/workflows/build-binary-packages.yml @@ -136,16 +136,18 @@ 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 + cp .libs/msys-jpgf-0.dll /c/tmp-dist/java/jpgf.dll cp jpgf.jar /c/tmp-dist/java - name: Build Python bindings @@ -157,7 +159,7 @@ jobs: cd src/runtime/python python setup.py build python setup.py install - cp /usr/lib/python3.8/site-packages/pgf* /c/tmp-dist/python + cp /usr/lib/python3.9/site-packages/pgf* /c/tmp-dist/python - name: Setup Haskell uses: actions/setup-haskell@v1 |