Skip to content

Commit 9ec2e3f

Browse files
authored
Merge pull request #22 from mbooth101/master
Use the version of ant shipped in the OpenJDK extension
2 parents a826d66 + 057ea43 commit 9ec2e3f

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

cc.arduino.arduinoide.json

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,12 @@
6060
"buildsystem": "simple",
6161
"build-options": {
6262
"env": {
63-
"PATH": "/usr/bin:/usr/lib/sdk/openjdk11/jvm/openjdk-11/bin",
63+
"PATH": "/usr/bin:/usr/lib/sdk/openjdk11/bin",
6464
"JAVA_HOME": "/usr/lib/sdk/openjdk11/jvm/openjdk-11"
6565
}
6666
},
6767
"build-commands": [
68-
"./ant/bin/ant --execdebug build",
68+
"ant --execdebug build",
6969
"mkdir -p /app/bin /app/Arduino",
7070
"cp -a linux/work/* /app/Arduino",
7171
"ln -s /app/Arduino/arduino /app/bin",
@@ -348,12 +348,6 @@
348348
"url": "http://downloads.arduino.cc/tools/arduinoOTA-1.3.0-linux_amd64.tar.bz2",
349349
"sha256": "aa45ee2441ffc3a122daec5802941d1fa2ac47adf5c5c481b5e0daa4dc259ffa",
350350
"dest": "build/linux"
351-
},
352-
{
353-
"type": "archive",
354-
"url": "https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.2-bin.tar.xz",
355-
"sha256": "361c8ad2ed8341416e323e7c28af10a8297170a80fdffba294a5c2031527bb6c",
356-
"dest": "build/ant"
357351
}
358352
]
359353
}

0 commit comments

Comments
 (0)