@@ -67,9 +67,13 @@ ${line.separator}with the path to where you have the code for Processing 4 check
6767 https://download2.gluonhq.com/openjfx/17.0.2/openjfx-17.0.2_linux-aarch64_bin-sdk.zip
6868 -->
6969 <target name =" retrieve-gluon" >
70+ <property name =" platform.zip"
71+ value =" javafx-${ gluon.version } -${ platform.variant } .zip" />
72+ <property name =" platform.path"
73+ value =" ${ library.path } /${ platform.variant } " />
74+
7075 <get src =" https://download2.gluonhq.com/openjfx/${ gluon.version } /openjfx-${ gluon.version } _${ platform.name } -${ platform.arch } _bin-sdk.zip"
7176 dest =" ${ platform.zip } "
72- ignoreerrors =" ${ javafx.ignorable } "
7377 usetimestamp =" true" />
7478
7579 <antcall target =" unzip-gluon-jars" />
@@ -121,52 +125,60 @@ ${line.separator}with the path to where you have the code for Processing 4 check
121125 </target >
122126
123127 <target name =" download-javafx" >
128+ <property name =" gluon.version" value =" 17.0.2" />
129+
124130 <antcall target =" retrieve-gluon" >
125- <param name =" gluon.base " value =" javafx-${ gluon.version } -macos" />
131+ <!-- < param name="platform.zip " value="javafx-${gluon.version}-macos" /> -- >
126132 <param name =" platform.name" value =" osx" />
127133 <param name =" platform.arch" value =" x64" />
128- <param name =" platform.path" value =" ${ library.path } /macos-x86_64" />
134+ <!-- <param name="platform.path" value="${library.path}/macos-x86_64" /> -->
135+ <param name =" platform.variant" value =" macos-x86_64" />
129136 </antcall >
130137
131138 <antcall target =" retrieve-gluon" >
132- <param name =" gluon.base" value =" javafx-${ gluon.version } -macos" />
139+ <!-- < param name="gluon.base" value="javafx-${gluon.version}-macos" /> -- >
133140 <param name =" platform.name" value =" osx" />
134141 <param name =" platform.arch" value =" aarch64" />
135- <param name =" platform.path" value =" ${ library.path } /macos-aarch64" />
142+ <param name =" platform.variant" value =" macos-aarch64" />
143+ <!-- <param name="platform.path" value="${library.path}/macos-aarch64" /> -->
136144 </antcall >
137145
138146 <antcall target =" retrieve-gluon" >
139- <param name =" gluon.base" value =" javafx-${ gluon.version } -windows" />
147+ <!-- < param name="gluon.base" value="javafx-${gluon.version}-windows" /> -- >
140148 <param name =" platform.name" value =" windows" />
141149 <param name =" platform.arch" value =" x64" />
142- <param name =" platform.path" value =" ${ library.path } /windows-amd64" />
150+ <param name =" platform.variant" value =" windows-amd64" />
151+ <!-- <param name="platform.path" value="${library.path}/windows-amd64" /> -->
143152 </antcall >
144153
145154 <antcall target =" retrieve-gluon" >
146- <param name =" gluon.base" value =" javafx-${ gluon.version } -linux" />
155+ <!-- < param name="gluon.base" value="javafx-${gluon.version}-linux" /> -- >
147156 <param name =" platform.name" value =" linux" />
148157 <param name =" platform.arch" value =" x64" />
149- <param name =" platform.path" value =" ${ library.path } /linux-amd64" />
158+ <param name =" platform.variant" value =" linux-amd64" />
159+ <!-- <param name="platform.path" value="${library.path}/linux-amd64" /> -->
150160 </antcall >
151161
152162 <antcall target =" retrieve-gluon" >
153- <param name =" gluon.base" value =" javafx-${ gluon.version } -linux" />
163+ <!-- < param name="gluon.base" value="javafx-${gluon.version}-linux" /> -- >
154164 <param name =" platform.name" value =" linux" />
155165 <param name =" platform.arch" value =" arm32" />
156- <param name =" platform.path" value =" ${ library.path } /linux-arm" />
166+ <param name =" platform.variant" value =" linux-arm" />
167+ <!-- <param name="platform.path" value="${library.path}/linux-arm" /> -->
157168 </antcall >
158169
159170 <antcall target =" retrieve-gluon" >
160- <param name =" gluon.base" value =" javafx-${ gluon.version } -linux" />
171+ <!-- < param name="gluon.base" value="javafx-${gluon.version}-linux" /> -- >
161172 <param name =" platform.name" value =" linux" />
162173 <param name =" platform.arch" value =" aarch64" />
163- <param name =" platform.path" value =" ${ library.path } /linux-aarch64" />
174+ <param name =" platform.variant" value =" linux-aarch64" />
175+ <!-- <param name="platform.path" value="${library.path}/linux-aarch64" /> -->
164176 </antcall >
165177 </target >
166178
167179 <target name =" compile" depends =" download-javafx,core-check" >
168180 <!-- just pick a platform; any should be sufficient for building -->
169- <property name =" javafx.jar.path" value =" library/macos/modules" />
181+ <property name =" javafx.jar.path" value =" library/macos-x86_64 /modules" />
170182
171183 <mkdir dir =" bin" />
172184 <javac source =" 11" target =" 11"
0 commit comments