Skip to content

Commit d422514

Browse files
committed
fix jogl version
1 parent 7f12045 commit d422514

File tree

1 file changed

+39
-14
lines changed

1 file changed

+39
-14
lines changed

resources/build.xml

Lines changed: 39 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,8 @@
8888
<mkdir dir="${project.bin}" />
8989
<mkdir dir="${project.libs}" />
9090
<mkdir dir="${project.libs}/windows-amd64" />
91-
<mkdir dir="${project.libs}/macos-universal" />
91+
<mkdir dir="${project.libs}/macos-x86_64" />
92+
<mkdir dir="${project.libs}/macos-aarch64" />
9293
<mkdir dir="${project.libs}/linux-amd64" />
9394
<mkdir dir="${project.libs}/linux-arm" />
9495
<mkdir dir="${project.libs}/linux-aarch64" />
@@ -127,30 +128,37 @@
127128

128129
<get dest="${project.libs}/linux-arm" skipexisting="true" ignoreerrors="true">
129130
<url
130-
url="https://jogamp.org/deployment/v2.5.0/jar/gluegen-rt-natives-linux-armv6hf.jar" />
131+
url="${jogl.url}/gluegen-rt-natives-linux-armv6hf.jar" />
131132
<url
132-
url="https://jogamp.org/deployment/v2.5.0/jar/jogl-all-natives-linux-armv6hf.jar" />
133+
url="${jogl.url}jogl-all-natives-linux-armv6hf.jar" />
133134
</get>
134135

135136
<get dest="${project.libs}/linux-aarch64" skipexisting="true" ignoreerrors="true">
136137
<url
137-
url="https://jogamp.org/deployment/v2.5.0/jar/gluegen-rt-natives-linux-aarch64.jar" />
138+
url="${jogl.url}/gluegen-rt-natives-linux-aarch64.jar" />
138139
<url
139-
url="https://jogamp.org/deployment/v2.5.0/jar/jogl-all-natives-linux-aarch64.jar" />
140+
url="${jogl.url}/jogl-all-natives-linux-aarch64.jar" />
140141
</get>
141142

142143
<get dest="${project.libs}/windows-amd64" skipexisting="true" ignoreerrors="true">
143144
<url
144-
url="https://jogamp.org/deployment/v2.5.0/jar/gluegen-rt-natives-windows-amd64.jar" />
145+
url="${jogl.url}/gluegen-rt-natives-windows-amd64.jar" />
145146
<url
146-
url="https://jogamp.org/deployment/v2.5.0/jar/jogl-all-natives-windows-amd64.jar" />
147+
url="${jogl.url}/jogl-all-natives-windows-amd64.jar" />
147148
</get>
148149

149-
<get dest="${project.libs}/macos-universal" skipexisting="true" ignoreerrors="true">
150+
<get dest="${project.libs}/macos-x86_64" skipexisting="true" ignoreerrors="true">
150151
<url
151-
url="https://jogamp.org/deployment/v2.5.0/jar/gluegen-rt-natives-macosx-universal.jar" />
152+
url="${jogl.url}/gluegen-rt-natives-macosx-x86_64.jar" />
152153
<url
153-
url="https://jogamp.org/deployment/v2.5.0/jar/jogl-all-natives-macosx-universal.jar" />
154+
url="${jogl.url}/jogl-all-natives-macosx-x86_64.jar" />
155+
</get>
156+
157+
<get dest="${project.libs}/macos-aarch64" skipexisting="true" ignoreerrors="true">
158+
<url
159+
url="${jogl.url}/gluegen-rt-natives-macos-aarch64.jar" />
160+
<url
161+
url="${jogl.url}/jogl-all-natives-macos-aarch64.jar" />
154162
</get>
155163

156164
<if>
@@ -297,10 +305,24 @@
297305
</jar>
298306

299307
<jar
300-
jarfile="${project.tmp}/${project.name}/${folder}/${project.jar.name}-macos-universal.jar"
308+
jarfile="${project.tmp}/${project.name}/${folder}/${project.jar.name}-macos-x86_64.jar"
309+
basedir="${project.bin}">
310+
<zipgroupfileset dir="${project.libs}" includes="*.jar" />
311+
<zipgroupfileset dir="${project.libs}/macos-x86_64" includes="*.jar" />
312+
<manifest>
313+
<attribute name="Class-Path" value="${project.libs}" />
314+
<!-- Information about the program itself -->
315+
<attribute name="Implementation-Vendor" value="${author.name}" />
316+
<attribute name="Implementation-Title" value="${project.prettyName}" />
317+
<attribute name="Implementation-Version" value="${library.version}" />
318+
</manifest>
319+
</jar>
320+
321+
<jar
322+
jarfile="${project.tmp}/${project.name}/${folder}/${project.jar.name}-macos-aarch64.jar"
301323
basedir="${project.bin}">
302324
<zipgroupfileset dir="${project.libs}" includes="*.jar" />
303-
<zipgroupfileset dir="${project.libs}/macos-universal" includes="*.jar" />
325+
<zipgroupfileset dir="${project.libs}/macos-aarch64" includes="*.jar" />
304326
<manifest>
305327
<attribute name="Class-Path" value="${project.libs}" />
306328
<!-- Information about the program itself -->
@@ -356,7 +378,10 @@
356378
file="${project.dist.version}/tmp/${project.name}/library/${project.jar.name}-linux-aarch64.jar"
357379
todir="${project.dist}" />
358380
<move
359-
file="${project.dist.version}/tmp/${project.name}/library/${project.jar.name}-macos-universal.jar"
381+
file="${project.dist.version}/tmp/${project.name}/library/${project.jar.name}-macos-x86_64.jar"
382+
todir="${project.dist}" />
383+
<move
384+
file="${project.dist.version}/tmp/${project.name}/library/${project.jar.name}-macos-aarch64.jar"
360385
todir="${project.dist}" />
361386

362387
<copy file="resources/index.html" todir="${project.dist}" />
@@ -378,4 +403,4 @@
378403
</echo>
379404
</target>
380405

381-
</project>
406+
</project>

0 commit comments

Comments
 (0)