Skip to content

Commit

Permalink
Switch mirror to develop build (broken)
Browse files Browse the repository at this point in the history
  • Loading branch information
tresf committed Dec 18, 2023
1 parent 8c3948f commit 84e823c
Showing 1 changed file with 17 additions and 7 deletions.
24 changes: 17 additions & 7 deletions ant/javafx.xml
Original file line number Diff line number Diff line change
Expand Up @@ -208,15 +208,25 @@
</condition>

<!-- FIXME:
- Temporary Google Drive URL
- Linux x86_64 only
- Temporary johan mirror URL
- x86_64 only
- Experimental "headless" build which no longer requires "monocle"
-->
<condition property="fx.url" value="https://drive.google.com/uc?export=download&amp;id=1DEHDHmY-96xJdFT3Wjf3y2zo0slQiaoL&amp;confirm=yes">
<and>
<equals arg1="${fx.arch}" arg2="x86_64"/>
<equals arg1="${fx.os}" arg2="linux"/>
</and>

<property name="headless.version" value="22"/>
<!-- FIXME: Ideally, these should all match -->
<condition property="headless.patch" value="312">
<equals arg1="${fx.os}" arg2="linux"/>
</condition>
<condition property="headless.patch" value="313">
<equals arg1="${fx.os}" arg2="mac"/>
</condition>
<property description="fallback value" name="headless.patch" value="314"/>

<property name="headless.base" value="https://download2.gluonhq.com/openjfx/forks/johanvos/headless"/>

<condition property="fx.url" value="${headless.base}/openjfx-${headless.version}+${headless.patch}_headless_${fx.os}-${fx.arch}_bin-sdk.zip">
<equals arg1="${fx.arch}" arg2="x86_64"/>
</condition>

<property name="fx.url" value="${javafx.mirror}/${fx.majver}/openjfx-${fx.urlver}-${fx.os.fixed}-${fx.arch.fixed}_bin-sdk.zip"/>
Expand Down

0 comments on commit 84e823c

Please sign in to comment.