Skip to content

Commit

Permalink
Fixed issue #1001.
Browse files Browse the repository at this point in the history
  • Loading branch information
nilsschmidt1337 authored Nov 4, 2023
1 parent 8e58d9f commit 84f0b5a
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 18 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ant.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
uses: actions/cache@v3
with:
path: ./dependencies
key: swt-jface-lwjgl3zip-tools-windows-v4
key: swt-jface-lwjgl3zip-tools-windows-v5
- name: Set up JDK 21
uses: actions/setup-java@v3
with:
Expand Down Expand Up @@ -55,7 +55,7 @@ jobs:
uses: actions/cache@v3
with:
path: ./dependencies
key: swt-jface-lwjgl3zip-tools-linux-v4
key: swt-jface-lwjgl3zip-tools-linux-v5
- name: Set up JDK 21
uses: actions/setup-java@v3
with:
Expand Down Expand Up @@ -86,7 +86,7 @@ jobs:
uses: actions/cache@v3
with:
path: ./dependencies
key: swt-jface-lwjgl3zip-tools-macos-v4
key: swt-jface-lwjgl3zip-tools-macos-v5
- name: Set up JDK 21
uses: actions/setup-java@v3
with:
Expand Down
8 changes: 3 additions & 5 deletions build-linux.xml
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,9 @@

<!-- JARs from LWJGL -->
<get-and-checksum
file="lwjgl3.3.zip"
file="lwjgl3.3.3.zip"
destdir="${dependenciesFolder}"
checksum="0bcf240bdbc7116fcdba0163b33e748c090dc54d"
checksum="bdbda4fa9e5e3f3de57c1556705620a59bf65b78"
dir="buildfiles-v2" />
<get-and-checksum
file="lwjgl_util.jar"
Expand All @@ -142,7 +142,7 @@

<unzip src="${swt.linux.gtk3.zipfile}" dest="${dependenciesFolder}/${linuxGtk3Folder}"/>
<unzip src="${dependenciesFolder}/${linuxGtk3Folder}/swt.jar" dest="${dependenciesFolder}/${linuxGtk3Folder}"/>
<unzip src="${dependenciesFolder}/lwjgl3.3.zip" dest="${libsFolder}"/>
<unzip src="${dependenciesFolder}/lwjgl3.3.3.zip" dest="${libsFolder}"/>

<copy todir="${sourceFolder}" >
<fileset dir="${linuxSourceFolder}" includes="**"/>
Expand Down Expand Up @@ -248,11 +248,9 @@
<zipfileset excludes="META-INF/*.SF" src="${libsFolder}/swing2swt.jar"/>
<zipfileset excludes="META-INF/*.SF" src="${libsFolder}/lwjgl3/lwjgl.jar"/>
<zipfileset excludes="META-INF/*.SF" src="${libsFolder}/lwjgl3/lwjgl-opengl.jar"/>
<zipfileset excludes="META-INF/*.SF" src="${libsFolder}/lwjgl3/lwjgl-opengles.jar"/>
<zipfileset excludes="META-INF/*.SF" src="${libsFolder}/lwjgl3/lwjgl-vulkan.jar"/>
<zipfileset excludes="META-INF/*.SF" src="${libsFolder}/lwjgl3-linux/lwjgl-natives-linux.jar"/>
<zipfileset excludes="META-INF/*.SF" src="${libsFolder}/lwjgl3-linux/lwjgl-opengl-natives-linux.jar"/>
<zipfileset excludes="META-INF/*.SF" src="${libsFolder}/lwjgl3-linux/lwjgl-opengles-natives-linux.jar"/>
<zipfileset excludes="META-INF/*.SF" src="${core.commands}"/>
<zipfileset excludes="META-INF/*.SF" src="${core.databinding}"/>
<zipfileset excludes="META-INF/*.SF" src="${core.databinding.beans}"/>
Expand Down
8 changes: 3 additions & 5 deletions build-macos.xml
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,9 @@

<!-- JARs from LWJGL -->
<get-and-checksum
file="lwjgl3.3.zip"
file="lwjgl3.3.3.zip"
destdir="${dependenciesFolder}"
checksum="0bcf240bdbc7116fcdba0163b33e748c090dc54d"
checksum="bdbda4fa9e5e3f3de57c1556705620a59bf65b78"
dir="buildfiles-v2" />
<get-and-checksum
file="lwjgl_util.jar"
Expand All @@ -142,7 +142,7 @@

<unzip src="${swt.macosx.zipfile}" dest="${dependenciesFolder}/${macosxFolder}"/>
<unzip src="${dependenciesFolder}/${macosxFolder}/swt.jar" dest="${dependenciesFolder}/${macosxFolder}"/>
<unzip src="${dependenciesFolder}/lwjgl3.3.zip" dest="${libsFolder}"/>
<unzip src="${dependenciesFolder}/lwjgl3.3.3.zip" dest="${libsFolder}"/>

<copy todir="${sourceFolder}" >
<fileset dir="${macosxSourceFolder}" includes="**"/>
Expand Down Expand Up @@ -248,11 +248,9 @@
<zipfileset excludes="META-INF/*.SF" src="${libsFolder}/swing2swt.jar"/>
<zipfileset excludes="META-INF/*.SF" src="${libsFolder}/lwjgl3/lwjgl.jar"/>
<zipfileset excludes="META-INF/*.SF" src="${libsFolder}/lwjgl3/lwjgl-opengl.jar"/>
<zipfileset excludes="META-INF/*.SF" src="${libsFolder}/lwjgl3/lwjgl-opengles.jar"/>
<zipfileset excludes="META-INF/*.SF" src="${libsFolder}/lwjgl3/lwjgl-vulkan.jar"/>
<zipfileset excludes="META-INF/*.SF" src="${libsFolder}/lwjgl3-macos/lwjgl-natives-macos.jar"/>
<zipfileset excludes="META-INF/*.SF" src="${libsFolder}/lwjgl3-macos/lwjgl-opengl-natives-macos.jar"/>
<zipfileset excludes="META-INF/*.SF" src="${libsFolder}/lwjgl3-macos/lwjgl-opengles-natives-macos.jar"/>
<zipfileset excludes="META-INF/*.SF" src="${libsFolder}/lwjgl3-macos/lwjgl-vulkan-natives-macos.jar"/>
<zipfileset excludes="META-INF/*.SF" src="${core.commands}"/>
<zipfileset excludes="META-INF/*.SF" src="${core.databinding}"/>
Expand Down
8 changes: 3 additions & 5 deletions build-windows.xml
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,9 @@

<!-- JARs from LWJGL -->
<get-and-checksum
file="lwjgl3.3.zip"
file="lwjgl3.3.3.zip"
destdir="${dependenciesFolder}"
checksum="0bcf240bdbc7116fcdba0163b33e748c090dc54d"
checksum="bdbda4fa9e5e3f3de57c1556705620a59bf65b78"
dir="buildfiles-v2" />
<get-and-checksum
file="lwjgl_util.jar"
Expand All @@ -142,7 +142,7 @@
</pathconvert>

<unzip src="${swt.windows.zipfile}" dest="${dependenciesFolder}/${windowsFolder}"/>
<unzip src="${dependenciesFolder}/lwjgl3.3.zip" dest="${libsFolder}"/>
<unzip src="${dependenciesFolder}/lwjgl3.3.3.zip" dest="${libsFolder}"/>

<copy todir="${sourceFolder}" >
<fileset dir="${windowsSourceFolder}" includes="**"/>
Expand Down Expand Up @@ -248,11 +248,9 @@
<zipfileset excludes="META-INF/*.SF" src="${libsFolder}/swing2swt.jar"/>
<zipfileset excludes="META-INF/*.SF" src="${libsFolder}/lwjgl3/lwjgl.jar"/>
<zipfileset excludes="META-INF/*.SF" src="${libsFolder}/lwjgl3/lwjgl-opengl.jar"/>
<zipfileset excludes="META-INF/*.SF" src="${libsFolder}/lwjgl3/lwjgl-opengles.jar"/>
<zipfileset excludes="META-INF/*.SF" src="${libsFolder}/lwjgl3/lwjgl-vulkan.jar"/>
<zipfileset excludes="META-INF/*.SF" src="${libsFolder}/lwjgl3-windows/lwjgl-natives-windows.jar"/>
<zipfileset excludes="META-INF/*.SF" src="${libsFolder}/lwjgl3-windows/lwjgl-opengl-natives-windows.jar"/>
<zipfileset excludes="META-INF/*.SF" src="${libsFolder}/lwjgl3-windows/lwjgl-opengles-natives-windows.jar"/>
<zipfileset excludes="META-INF/*.SF" src="${core.commands}"/>
<zipfileset excludes="META-INF/*.SF" src="${core.databinding}"/>
<zipfileset excludes="META-INF/*.SF" src="${core.databinding.beans}"/>
Expand Down

0 comments on commit 84f0b5a

Please sign in to comment.