Added working arduino 1.6.9 ebuild
This commit is contained in:
parent
6daa628c7d
commit
528b4c8758
@ -1,6 +1,13 @@
|
|||||||
AUX arduino-1.6.7-Do-Not-ThinkDifferent.patch 832 SHA256 f3be70a62f24a91ba5de4350772fe365983b23c1ff12dc4add555954d499b997 SHA512 cfcb1a7fb9ea89fb48b0795a64c80e22962a8db3417ab51aaef140e76d7d2d27f311ab9463d530e190e06b0ad4412460af71a263dd93115cb2cb89c21ba8107c WHIRLPOOL da06bde9ef309fb0a55ef0c94a1427410ce0aea875ee577fc00f9171905dffe6748bd1777639408f4e10e6d1f1fbc8beaf753379e8ad6ae64f4eb7d099585531
|
AUX arduino-1.6.7-Do-Not-ThinkDifferent.patch 832 SHA256 f3be70a62f24a91ba5de4350772fe365983b23c1ff12dc4add555954d499b997 SHA512 cfcb1a7fb9ea89fb48b0795a64c80e22962a8db3417ab51aaef140e76d7d2d27f311ab9463d530e190e06b0ad4412460af71a263dd93115cb2cb89c21ba8107c WHIRLPOOL da06bde9ef309fb0a55ef0c94a1427410ce0aea875ee577fc00f9171905dffe6748bd1777639408f4e10e6d1f1fbc8beaf753379e8ad6ae64f4eb7d099585531
|
||||||
AUX arduino-1.6.7-build.xml.patch 27270 SHA256 143a1a1698280378166d00a69e21ca2d8d31b294ce15ed3f4ce9593c20db0227 SHA512 7bca2efb434a41d0f6f4594bb11f940584896dcd647eff5f621358a679402ff07673c7b7c8fb38dfdc53c724bc3add674af934680a814aff1053c296ab1e4182 WHIRLPOOL abcad8468201020cb6c2244fdacd2f11c8d77849974970b41b99bf404151fc588fa4ecdc2f4e5a084e238860b6905d40250197c250f81e8f02e72dc16cb79f23
|
AUX arduino-1.6.7-build.xml.patch 27270 SHA256 143a1a1698280378166d00a69e21ca2d8d31b294ce15ed3f4ce9593c20db0227 SHA512 7bca2efb434a41d0f6f4594bb11f940584896dcd647eff5f621358a679402ff07673c7b7c8fb38dfdc53c724bc3add674af934680a814aff1053c296ab1e4182 WHIRLPOOL abcad8468201020cb6c2244fdacd2f11c8d77849974970b41b99bf404151fc588fa4ecdc2f4e5a084e238860b6905d40250197c250f81e8f02e72dc16cb79f23
|
||||||
AUX arduino-1.6.7-script.patch 580 SHA256 553335d62134c9ca66e7b9f0b9496f187c76a3223438f2659e29d51cdd55776d SHA512 65b2868a18201f738a64377d965601dda77cee9713720e1d91de4378038083669370e3353b82f48f41c27d0ff65a859a8acc9b15bb20ba55bb7685daa98db173 WHIRLPOOL 2b9de5c030c05f48a52fd67f54d2ae1a25b1f95b1e02a69a172fe286d9b1c6912a652954b3e6d35b1c0cf252ba2ccaffa86e844e9f8075323ef1e413a0a988af
|
AUX arduino-1.6.7-script.patch 580 SHA256 553335d62134c9ca66e7b9f0b9496f187c76a3223438f2659e29d51cdd55776d SHA512 65b2868a18201f738a64377d965601dda77cee9713720e1d91de4378038083669370e3353b82f48f41c27d0ff65a859a8acc9b15bb20ba55bb7685daa98db173 WHIRLPOOL 2b9de5c030c05f48a52fd67f54d2ae1a25b1f95b1e02a69a172fe286d9b1c6912a652954b3e6d35b1c0cf252ba2ccaffa86e844e9f8075323ef1e413a0a988af
|
||||||
|
AUX arduino-1.6.9-Do-Not-ThinkDifferent.patch 832 SHA256 f3be70a62f24a91ba5de4350772fe365983b23c1ff12dc4add555954d499b997 SHA512 cfcb1a7fb9ea89fb48b0795a64c80e22962a8db3417ab51aaef140e76d7d2d27f311ab9463d530e190e06b0ad4412460af71a263dd93115cb2cb89c21ba8107c WHIRLPOOL da06bde9ef309fb0a55ef0c94a1427410ce0aea875ee577fc00f9171905dffe6748bd1777639408f4e10e6d1f1fbc8beaf753379e8ad6ae64f4eb7d099585531
|
||||||
|
AUX arduino-1.6.9-build.xml.patch 29384 SHA256 9417ebed1e3f122eefbc8992b700f3865bfda53974ac04a284f1ac7a8f76099e SHA512 0a7b6bfaa252b56f3685e0b5acccd92db8b794523bed3e7750206fe303ba2004b3aa6e1086601a0adbb81277c4adc4ef6b9f0a35fe4b06fad2d9406e33b5359e WHIRLPOOL 3e705f9df74208bc16105f775d92216cbbd41156f0799481d6870b91be6e034d810e7d3a863875a523877855d9fc979f01c72c083649ddc88607cbc9e25adcc1
|
||||||
|
AUX arduino-1.6.9-platform.patch 1102 SHA256 4026317625b48b4f845b31655a3553417e62cfd96072ac3b9dc2166806e95838 SHA512 91300f146fac62c16e542536e780ade8e4a10f95dc0e254fd7de1504eedec3fccffe6ef137ab05b457c9c675007b4067d53736e409c7dab7711e590ede22e4e4 WHIRLPOOL 787bfa52278cc2cc443c346bac7e7f1f9a52be409e64fc04c9a77461d3770118bf0ae583316918190fdd12c975d59869a5dc19157739bc37b396ce92a0adb07c
|
||||||
|
AUX arduino-1.6.9-script.patch 580 SHA256 553335d62134c9ca66e7b9f0b9496f187c76a3223438f2659e29d51cdd55776d SHA512 65b2868a18201f738a64377d965601dda77cee9713720e1d91de4378038083669370e3353b82f48f41c27d0ff65a859a8acc9b15bb20ba55bb7685daa98db173 WHIRLPOOL 2b9de5c030c05f48a52fd67f54d2ae1a25b1f95b1e02a69a172fe286d9b1c6912a652954b3e6d35b1c0cf252ba2ccaffa86e844e9f8075323ef1e413a0a988af
|
||||||
|
AUX platform-1.6.9/platform.txt 1447 SHA256 1a971137ac7575b4a6cb5869f79158db8ab61c1e899a275900ae9cce9fd140ed SHA512 269be33d4a2f22f59f149037614eca87b062c4f41f71dd3576db395d67018954f855d79b370a0b88b823985b287e163bbd0bdc430546a5ed3f5316fd7a0f41cb WHIRLPOOL 0daa35b52af6f8a1e6a3a58d4db7bb63798ac656400bf4227e94c166a1e8c159ef01012f1a8ea0a3c9a2aa836e5e00e1e5c6e65c0d34f72f7465419caa2ddeb0
|
||||||
DIST arduino-1.6.7.tar.gz 77578555 SHA256 ae524c19c3b6fcd00cbf709e693321a13e694316fea5642a54b02d4170213586 SHA512 2f76aedad6f8bb9c3e17c4b02ecf816f5fe628b4856a6bd9a3d7c0fe3d9999a39df60a4794d99b1e62c3ae41695350f27d148a0925f7f59b8071359d33be2b00 WHIRLPOOL c5bdf2a67ff37fc8bc4a002ea24f003d97f6ae04632d906fc4d37d2af64c113f698e26720c73b40afc39925f03206a41a4ec0faba0d80756427714102ad47f90
|
DIST arduino-1.6.7.tar.gz 77578555 SHA256 ae524c19c3b6fcd00cbf709e693321a13e694316fea5642a54b02d4170213586 SHA512 2f76aedad6f8bb9c3e17c4b02ecf816f5fe628b4856a6bd9a3d7c0fe3d9999a39df60a4794d99b1e62c3ae41695350f27d148a0925f7f59b8071359d33be2b00 WHIRLPOOL c5bdf2a67ff37fc8bc4a002ea24f003d97f6ae04632d906fc4d37d2af64c113f698e26720c73b40afc39925f03206a41a4ec0faba0d80756427714102ad47f90
|
||||||
|
DIST arduino-1.6.9.tar.gz 81103494 SHA256 0927e4d6bb24fd297765aaf529fe7b16a7da3223848e7b40cdc9843d4246f98d SHA512 92b3508068e3aae6a88c3a395d0906fb63d2fd8ee20d003173b96f3f0ff6851eddcdb77c6349dfec3ad0ee36976f53432c643f56724490e9187d4af049fd4bf8 WHIRLPOOL 841ebd6e4c23b610f87a5254b888a31bd9b36ea162f52f9301b8cc0af2288cb7cff83f130f7f3a03ca71fdaf471818f2faea99ab3f1c64b233d7d504b7ac0049
|
||||||
DIST arduino-icons.tar.bz2 58775 SHA256 9086ae27a13cc19e428ed7e6434366752b33a7d066b5620bfdd371709277390e SHA512 b750e79d6117f5df619f2b765dad6e64f0ba4aa3314b0b6e00801577e3ea1f15951ba15efe7a00f5317285a19ac29ac41c78b71342f45cd164c794a42bafcdd9 WHIRLPOOL b53ab3ff2981ca9f6d45311b9f885ca831700a7a49fef4a376cdc489f7cc3a6c39fbb93994b962b6854b0833d7342b951b5c6327422aafce762f92952b7a5876
|
DIST arduino-icons.tar.bz2 58775 SHA256 9086ae27a13cc19e428ed7e6434366752b33a7d066b5620bfdd371709277390e SHA512 b750e79d6117f5df619f2b765dad6e64f0ba4aa3314b0b6e00801577e3ea1f15951ba15efe7a00f5317285a19ac29ac41c78b71342f45cd164c794a42bafcdd9 WHIRLPOOL b53ab3ff2981ca9f6d45311b9f885ca831700a7a49fef4a376cdc489f7cc3a6c39fbb93994b962b6854b0833d7342b951b5c6327422aafce762f92952b7a5876
|
||||||
EBUILD arduino-1.6.7.ebuild 3617 SHA256 c078fd90e9d0eed48b0757dc1df7a1d078feef5abfcde907bd42317d1f146d9e SHA512 6f193f84325863969546350d6c10378aeaade1eb6f5207e824c9546ae500da3e93b003d52ef752a8c8e25371ba8838cc32659df0c9ef879a8956762dc24fa9eb WHIRLPOOL d67cc32dea2c31f3ed1dc130ea8a3e1c6d006d40e069c4efa00fdea46c40a00d92ab6c0b5205a03a5386ab6452cf040e03bc2e23dec0dfae302b2aeefd34b0ad
|
EBUILD arduino-1.6.7.ebuild 3617 SHA256 c078fd90e9d0eed48b0757dc1df7a1d078feef5abfcde907bd42317d1f146d9e SHA512 6f193f84325863969546350d6c10378aeaade1eb6f5207e824c9546ae500da3e93b003d52ef752a8c8e25371ba8838cc32659df0c9ef879a8956762dc24fa9eb WHIRLPOOL d67cc32dea2c31f3ed1dc130ea8a3e1c6d006d40e069c4efa00fdea46c40a00d92ab6c0b5205a03a5386ab6452cf040e03bc2e23dec0dfae302b2aeefd34b0ad
|
||||||
|
EBUILD arduino-1.6.9.ebuild 4423 SHA256 e36a3ec472ddedb03539fe0a72edb2f0f1ddbdae7a7410cf665cda492b176829 SHA512 f6584fda9073668755d63689ec73165984321156f76dbcc95ca727557b2d2cd0131bd16e29a05f56b90ffafe1cb5a40ed75696d2b77e4653b7e54b679214395e WHIRLPOOL 9bdcc2bb2fcfdaaed4e15286374bd6553c5f22e383f9fdee08503fafec0e3712884f4b54bb1fccaf2322bf0505f98a0a12fc356f1e78af3c01a70c6d9b9495f0
|
||||||
|
147
dev-embedded/arduino/arduino-1.6.9.ebuild
Normal file
147
dev-embedded/arduino/arduino-1.6.9.ebuild
Normal file
@ -0,0 +1,147 @@
|
|||||||
|
# Copyright 1999-2015 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
# $Id$
|
||||||
|
|
||||||
|
EAPI=5
|
||||||
|
JAVA_PKG_IUSE="doc examples"
|
||||||
|
|
||||||
|
inherit eutils java-pkg-2 java-ant-2
|
||||||
|
|
||||||
|
DESCRIPTION="An open-source AVR electronics prototyping platform"
|
||||||
|
HOMEPAGE="http://arduino.cc/ https://github.com/arduino/Arduino"
|
||||||
|
SRC_URI="https://github.com/arduino/Arduino/archive/${PV}.tar.gz -> ${P}.tar.gz
|
||||||
|
mirror://gentoo/arduino-icons.tar.bz2"
|
||||||
|
LICENSE="GPL-2 GPL-2+ LGPL-2 CC-BY-SA-3.0"
|
||||||
|
SLOT="0"
|
||||||
|
KEYWORDS="amd64 x86"
|
||||||
|
RESTRICT="strip binchecks"
|
||||||
|
IUSE=""
|
||||||
|
|
||||||
|
COMMONDEP="
|
||||||
|
dev-embedded/listserialportsc
|
||||||
|
dev-java/jna:0
|
||||||
|
>dev-java/rxtx-2.1:2
|
||||||
|
dev-util/astyle"
|
||||||
|
|
||||||
|
RDEPEND="${COMMONDEP}
|
||||||
|
dev-embedded/avrdude
|
||||||
|
dev-embedded/uisp
|
||||||
|
sys-devel/crossdev
|
||||||
|
>=virtual/jre-1.8"
|
||||||
|
|
||||||
|
DEPEND="${COMMONDEP}
|
||||||
|
>=virtual/jdk-1.8"
|
||||||
|
|
||||||
|
EANT_GENTOO_CLASSPATH="jna,rxtx-2"
|
||||||
|
EANT_EXTRA_ARGS="-Dversion=${PV}"
|
||||||
|
EANT_BUILD_TARGET="build"
|
||||||
|
JAVA_ANT_REWRITE_CLASSPATH="yes"
|
||||||
|
|
||||||
|
src_unpack() {
|
||||||
|
unpack ${A}
|
||||||
|
# cd ../"${S}"
|
||||||
|
mv Arduino-${PV} arduino-${PV}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
java_prepare() {
|
||||||
|
# Remove the libraries to ensure the system
|
||||||
|
# libraries are used
|
||||||
|
# rm app/lib/* || die
|
||||||
|
rm -rf app/src/processing/app/macosx || die
|
||||||
|
# Patch build/build.xml - remove local jar files
|
||||||
|
# for rxtx and ecj (use system wide versions)
|
||||||
|
epatch "${FILESDIR}"/${P}-build.xml.patch
|
||||||
|
|
||||||
|
# Patch launcher script to include rxtx class/ld paths
|
||||||
|
epatch "${FILESDIR}"/${P}-script.patch
|
||||||
|
|
||||||
|
# Some OS X ThinkDifferent stuff from processing library
|
||||||
|
epatch "${FILESDIR}"/${P}-Do-Not-ThinkDifferent.patch
|
||||||
|
|
||||||
|
# Patch platform.txt for compiler paths
|
||||||
|
epatch "${FILESDIR}"/${P}-platform.patch
|
||||||
|
}
|
||||||
|
|
||||||
|
src_compile() {
|
||||||
|
eant -f arduino-core/build.xml
|
||||||
|
EANT_GENTOO_CLASSPATH_EXTRA="../arduino-core/arduino-core.jar"
|
||||||
|
eant -f app/build.xml
|
||||||
|
eant "${EANT_EXTRA_ARGS}" -f build/build.xml
|
||||||
|
}
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
cd "${S}"/build/linux/work || die
|
||||||
|
# java-pkg_dojar lib/arduino-core.jar lib/pde.jar
|
||||||
|
java-pkg_dojar lib/*.jar
|
||||||
|
java-pkg_dolauncher ${PN} --pwd /usr/share/${PN} --main processing.app.Base
|
||||||
|
|
||||||
|
# This doesn't seem to be optional, it just hangs when starting without
|
||||||
|
# examples in correct place
|
||||||
|
#if use examples; then
|
||||||
|
#java-pkg_doexamples examples
|
||||||
|
#docompress -x /usr/share/doc/${P}/examples/
|
||||||
|
#fi
|
||||||
|
|
||||||
|
if use doc; then
|
||||||
|
dodoc revisions.txt "${S}"/readme.txt
|
||||||
|
dohtml -r reference
|
||||||
|
java-pkg_dojavadoc "${S}"/build/javadoc/everything
|
||||||
|
fi
|
||||||
|
|
||||||
|
insinto "/usr/share/${PN}/"
|
||||||
|
doins -r dist examples hardware libraries
|
||||||
|
insinto "/usr/share/${PN}/hardware"
|
||||||
|
doins "${FILESDIR}/platform-${PV}/platform.txt"
|
||||||
|
fowners -R root:uucp "/usr/share/${PN}/hardware"
|
||||||
|
|
||||||
|
exeinto "/usr/share/${PN}/"
|
||||||
|
doexe arduino-builder
|
||||||
|
|
||||||
|
insinto "/usr/share/${PN}/lib"
|
||||||
|
doins -r lib/*.txt lib/theme lib/*.png lib/*.conf lib/*.key
|
||||||
|
|
||||||
|
# For TeensyDuino
|
||||||
|
dosym /usr/bin/arduino "/usr/share/${PN}/arduino"
|
||||||
|
|
||||||
|
# use system avrdude
|
||||||
|
# patching class files is too hard
|
||||||
|
dosym /usr/bin/avrdude "/usr/share/${PN}/hardware/tools/avrdude"
|
||||||
|
dodir "/usr/share/${PN}/hardware/tools/avr/etc/"
|
||||||
|
dosym /etc/avrdude.conf "/usr/share/${PN}/hardware/tools/avr/etc/avrdude.conf"
|
||||||
|
|
||||||
|
dosym /usr/$(get_libdir)/libastyle.so "/usr/share/${PN}/lib/libastylej.so"
|
||||||
|
dosym /usr/$(get_libdir)/liblistSerialsj.so "/usr/share/${PN}/lib/liblistSerialsj.so"
|
||||||
|
dodir "/usr/share/${PN}/hardware/tools/avr/bin/"
|
||||||
|
dosym /usr/bin/avr-g++ "/usr/share/${PN}/hardware/tools/avr/bin/avr-g++"
|
||||||
|
dosym /usr/bin/avr-gcc "/usr/share/${PN}/hardware/tools/avr/bin/avr-gcc"
|
||||||
|
dosym /usr/bin/avr-ar "/usr/share/${PN}/hardware/tools/avr/bin/avr-ar"
|
||||||
|
dosym /usr/bin/avr-objcopy "/usr/share/${PN}/hardware/tools/avr/bin/avr-objcopy"
|
||||||
|
dosym /usr/bin/avr-size "/usr/share/${PN}/hardware/tools/avr/bin/avr-size"
|
||||||
|
|
||||||
|
if [ -x /usr/bin/avr-ld ]; then
|
||||||
|
BU_VER=$( avr-ld --version | head -1 | sed -e 's/^.*(.*) //' )
|
||||||
|
dosym /usr/lib/binutils/avr/${BU_VER}/ldscripts "/usr/avr/lib/ldscripts"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# install menu and icons
|
||||||
|
domenu "${FILESDIR}/${PN}.desktop"
|
||||||
|
for sz in 16 24 32 48 128 256; do
|
||||||
|
newicon -s $sz \
|
||||||
|
"${WORKDIR}/${PN}-icons/debian_icons_${sz}x${sz}_apps_${PN}.png" \
|
||||||
|
"${PN}.png"
|
||||||
|
done
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
pkg_postinst() {
|
||||||
|
if [ ! -x /usr/bin/avr-g++ ]; then
|
||||||
|
ewarn "Install avr crosscompiler using:"
|
||||||
|
ewarn " USE=\"-openmp -hardened -sanitize -vtv\" \\"
|
||||||
|
ewarn " crossdev -s4 --ex-gdb -v -S --target avr"
|
||||||
|
echo
|
||||||
|
ewarn "Afterwards, create a symlink for ldscripts:"
|
||||||
|
ewarn " BU_VER=$( avr-ld --version | head -1 | sed -e 's/^.*(.*) //' ) \\"
|
||||||
|
ewarn " ln -s /usr/lib/binutils/avr/\$BU_VER/ldscripts /usr/avr/lib/ldscripts"
|
||||||
|
fi
|
||||||
|
}
|
@ -0,0 +1,22 @@
|
|||||||
|
diff -uNr a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
|
||||||
|
--- a/app/src/processing/app/Base.java 2015-11-07 16:00:54.614383789 +0100
|
||||||
|
+++ b/app/src/processing/app/Base.java 2015-11-07 16:01:09.486384112 +0100
|
||||||
|
@@ -49,7 +49,6 @@
|
||||||
|
import processing.app.helpers.filefilters.OnlyFilesWithExtension;
|
||||||
|
import processing.app.javax.swing.filechooser.FileNameExtensionFilter;
|
||||||
|
import processing.app.legacy.PApplet;
|
||||||
|
-import processing.app.macosx.ThinkDifferent;
|
||||||
|
import processing.app.packages.LibraryList;
|
||||||
|
import processing.app.packages.UserLibrary;
|
||||||
|
import processing.app.syntax.PdeKeywords;
|
||||||
|
@@ -129,10 +128,6 @@
|
||||||
|
|
||||||
|
splashScreenHelper.splashText(_("Loading configuration..."));
|
||||||
|
|
||||||
|
- if (OSUtils.isMacOS()) {
|
||||||
|
- ThinkDifferent.init();
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
try {
|
||||||
|
guardedMain(args);
|
||||||
|
} catch (Throwable e) {
|
615
dev-embedded/arduino/files/arduino-1.6.9-build.xml.patch
Normal file
615
dev-embedded/arduino/files/arduino-1.6.9-build.xml.patch
Normal file
@ -0,0 +1,615 @@
|
|||||||
|
diff -ur arduino-1.6.9.orig/build/build.xml arduino-1.6.9/build/build.xml
|
||||||
|
--- arduino-1.6.9.orig/build/build.xml 2016-05-10 10:36:07.000000000 +0200
|
||||||
|
+++ arduino-1.6.9/build/build.xml 2016-07-06 09:06:45.863114224 +0200
|
||||||
|
@@ -13,37 +13,20 @@
|
||||||
|
<property name="package_index_url" value="http://downloads.arduino.cc/packages/package_index.json" />
|
||||||
|
|
||||||
|
<!-- Sets properties for macosx/windows/linux depending on current system -->
|
||||||
|
- <condition property="platform" value="macosx-old">
|
||||||
|
- <and>
|
||||||
|
- <os family="mac" />
|
||||||
|
- <matches string="${os.version}" pattern="^10.[56]." />
|
||||||
|
- </and>
|
||||||
|
- </condition>
|
||||||
|
- <condition property="macosx-old"><equals arg1="${platform}" arg2="macosx-old" /></condition>
|
||||||
|
- <fail if="macosx-old" message="MacOSX older than 10.7 are not supported"/>
|
||||||
|
-
|
||||||
|
- <condition property="platform" value="macosx"><os family="mac" /></condition>
|
||||||
|
- <condition property="platform" value="windows"><os family="windows" /></condition>
|
||||||
|
<condition property="platform" value="linux32"><os family="unix" arch="i386" /></condition>
|
||||||
|
<condition property="platform" value="linux64"><os family="unix" arch="amd64" /></condition>
|
||||||
|
<condition property="platform" value="linuxarm"><os family="unix" arch="arm" /></condition>
|
||||||
|
|
||||||
|
- <condition property="macosx"><equals arg1="${platform}" arg2="macosx" /></condition>
|
||||||
|
- <condition property="windows"><equals arg1="${platform}" arg2="windows" /></condition>
|
||||||
|
<condition property="linux32"><equals arg1="${platform}" arg2="linux32" /></condition>
|
||||||
|
<condition property="linux64"><equals arg1="${platform}" arg2="linux64" /></condition>
|
||||||
|
<condition property="linux"><equals arg1="${platform}" arg2="linux32" /></condition>
|
||||||
|
<condition property="linux"><equals arg1="${platform}" arg2="linux64" /></condition>
|
||||||
|
<condition property="linux"><equals arg1="${platform}" arg2="linuxarm" /></condition>
|
||||||
|
|
||||||
|
- <condition property="staging_folder" value="macosx"><equals arg1="${platform}" arg2="macosx" /></condition>
|
||||||
|
- <condition property="staging_folder" value="windows"><equals arg1="${platform}" arg2="windows" /></condition>
|
||||||
|
<condition property="staging_folder" value="linux"><equals arg1="${platform}" arg2="linux32" /></condition>
|
||||||
|
<condition property="staging_folder" value="linux"><equals arg1="${platform}" arg2="linux64" /></condition>
|
||||||
|
<condition property="staging_folder" value="linux"><equals arg1="${platform}" arg2="linuxarm" /></condition>
|
||||||
|
|
||||||
|
- <condition property="staging_hardware_folder" value="Arduino.app/Contents/Java/hardware"><equals arg1="${platform}" arg2="macosx" /></condition>
|
||||||
|
- <condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="windows" /></condition>
|
||||||
|
<condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="linux32" /></condition>
|
||||||
|
<condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="linux64" /></condition>
|
||||||
|
<condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="linuxarm" /></condition>
|
||||||
|
@@ -58,7 +41,6 @@
|
||||||
|
<equals arg1="${platform}" arg2="linux64"/>
|
||||||
|
</condition>
|
||||||
|
|
||||||
|
- <condition property="launch4j-download-unpack-target-name" value="launch4j-windows"><os family="windows" /></condition>
|
||||||
|
<property name="launch4j-download-unpack-target-name" value="launch4j-linux"/>
|
||||||
|
|
||||||
|
<property name="MACOSX_BUNDLED_JVM" value="${java.home}/../"/>
|
||||||
|
@@ -323,258 +305,6 @@
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<!-- - - - - - - - -->
|
||||||
|
- <!-- Mac OS X -->
|
||||||
|
- <!-- - - - - - - - -->
|
||||||
|
- <target name="macosx-clean" depends="subprojects-clean" description="Clean Mac OS X build">
|
||||||
|
- <delete dir="macosx/work" />
|
||||||
|
- <delete dir="macosx/working_dir" />
|
||||||
|
- <delete dir="macosx/working.dmg" />
|
||||||
|
- <delete file="macosx/arduino-*.dmg" />
|
||||||
|
- <delete>
|
||||||
|
- <fileset dir="macosx" includes="arduino-*macosx*.zip"/>
|
||||||
|
- </delete>
|
||||||
|
- </target>
|
||||||
|
-
|
||||||
|
- <target name="macosx-checkos" unless="macosx">
|
||||||
|
- <echo>
|
||||||
|
- =======================================================
|
||||||
|
- Arduino for Mac OS X can only be built on Mac OS X.
|
||||||
|
-
|
||||||
|
- Bye.
|
||||||
|
- =======================================================
|
||||||
|
- </echo>
|
||||||
|
- <fail message="wrong platform (${os.name})" />
|
||||||
|
- </target>
|
||||||
|
-
|
||||||
|
- <target name="macosx-build" if="macosx" depends="revision-check, macosx-checkos, subprojects-build" description="Build Mac OS X version">
|
||||||
|
- <fail unless="MACOSX_BUNDLED_JVM" message="MacOSX requires MACOSX_BUNDLED_JVM property set"/>
|
||||||
|
- <mkdir dir="${staging_folder}/work" />
|
||||||
|
-
|
||||||
|
- <antcall target="unzip">
|
||||||
|
- <param name="archive_file" value="${staging_folder}/appbundler-1.0ea-arduino4.jar.zip" />
|
||||||
|
- <param name="archive_url" value="http://downloads.arduino.cc/appbundler-1.0ea-arduino4.jar.zip" />
|
||||||
|
- <param name="final_folder" value="${staging_folder}/appbundler-1.0ea-arduino4" />
|
||||||
|
- <param name="dest_folder" value="${staging_folder}/appbundler-1.0ea-arduino4" />
|
||||||
|
- </antcall>
|
||||||
|
-
|
||||||
|
- <taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask" classpath="${staging_folder}/appbundler-1.0ea-arduino4/appbundler-1.0ea-arduino4.jar"/>
|
||||||
|
-
|
||||||
|
- <bundleapp
|
||||||
|
- jvmRequired="1.8"
|
||||||
|
- jrepreferred="true"
|
||||||
|
- outputdirectory="${staging_folder}/work"
|
||||||
|
- name="Arduino"
|
||||||
|
- displayname="Arduino"
|
||||||
|
- executablename="Arduino"
|
||||||
|
- identifier="cc.arduino.Arduino"
|
||||||
|
- shortversion="${version}"
|
||||||
|
- version="${revision}"
|
||||||
|
- signature="Pde1"
|
||||||
|
- icon="macosx/processing.icns"
|
||||||
|
- mainclassname="processing.app.Base"
|
||||||
|
- copyright="Arduino LLC"
|
||||||
|
- applicationCategory="public.app-category.education"
|
||||||
|
- minimumsystemversion="10.7"
|
||||||
|
- highresolutioncapable="true">
|
||||||
|
-
|
||||||
|
- <runtime dir="${MACOSX_BUNDLED_JVM}"/>
|
||||||
|
-
|
||||||
|
- <arch name="x86_64"/>
|
||||||
|
- <arch name="i386"/>
|
||||||
|
-
|
||||||
|
- <classpath refid="runtime.jars"/>
|
||||||
|
-
|
||||||
|
- <option value="-Dapple.awt.application.name=Arduino"/>
|
||||||
|
- <option value="-Dapple.laf.useScreenMenuBar=true"/>
|
||||||
|
- <option value="-Dcom.apple.macos.use-file-dialog-packages=true"/>
|
||||||
|
- <option value="-Dcom.apple.smallTabs=true"/>
|
||||||
|
- <option value="-Dcom.apple.macos.useScreenMenuBar=true"/>
|
||||||
|
- <option value="-DAPP_DIR=$APP_ROOT/Contents/Java"/>
|
||||||
|
- <option value="-Djava.ext.dirs=$JVM_RUNTIME/Contents/Home/lib/ext/:$JVM_RUNTIME/Contents/Home/jre/lib/ext/"/>
|
||||||
|
-
|
||||||
|
- <!--
|
||||||
|
- <option value="-Dapple.awt.showGrowBox=false"/>
|
||||||
|
- <option value="-Dapple.awt.Antialiasing=false"/>
|
||||||
|
- <option value="-Dapple.awt.TextAntialiasing=true"/>
|
||||||
|
- <option value="-Dcom.apple.hwaccel=true"/>
|
||||||
|
- <option value="-Dapple.awt.graphics.UseQuartz=true"/>
|
||||||
|
- -->
|
||||||
|
-
|
||||||
|
- <!--<option value="-Dcom.apple.macos.useScreenMenuBar=true"/>-->
|
||||||
|
-
|
||||||
|
- <!-- Workaround since the icon parameter for bundleapp doesn't work -->
|
||||||
|
- <option value="-Xdock:name=Arduino"/>
|
||||||
|
- <option value="-Dcom.apple.mrj.application.apple.menu.about.name=Arduino"/>
|
||||||
|
- <option value="-Dfile.encoding=UTF-8"/>
|
||||||
|
-
|
||||||
|
- <option value="-Xms128M"/>
|
||||||
|
- <option value="-Xmx512M"/>
|
||||||
|
- <option value="-splash:$APP_ROOT/Contents/Java/lib/splash.png"/>
|
||||||
|
-
|
||||||
|
- <bundledocument extensions="ino,c,cpp,h"
|
||||||
|
- icon="macosx/pde.icns"
|
||||||
|
- name="Arduino Source File"
|
||||||
|
- role="Editor" ispackage="false">
|
||||||
|
- </bundledocument>
|
||||||
|
-
|
||||||
|
- </bundleapp>
|
||||||
|
-
|
||||||
|
- <mkdir dir="${staging_folder}/work/${staging_hardware_folder}" />
|
||||||
|
-
|
||||||
|
- <copy todir="${staging_folder}/work/${staging_hardware_folder}/../">
|
||||||
|
- <fileset dir="shared" includes="lib/**" />
|
||||||
|
- <fileset file="shared/revisions.txt" />
|
||||||
|
- </copy>
|
||||||
|
-
|
||||||
|
- <mkdir dir="${staging_folder}/work" />
|
||||||
|
- <mkdir dir="${staging_folder}/work/${staging_hardware_folder}" />
|
||||||
|
-
|
||||||
|
- <antcall target="macosx-build-avr-toolchain" />
|
||||||
|
-
|
||||||
|
- <antcall target="package-library-index-json-bundle"/>
|
||||||
|
-
|
||||||
|
- <antcall target="assemble">
|
||||||
|
- <param name="target.path" value="${staging_folder}/work/${staging_hardware_folder}/.." />
|
||||||
|
- </antcall>
|
||||||
|
-
|
||||||
|
- <antcall target="unzip">
|
||||||
|
- <param name="archive_file" value="./libastylej-2.05.1-3.zip" />
|
||||||
|
- <param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.1-3.zip" />
|
||||||
|
- <param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
|
||||||
|
- <param name="dest_folder" value="${staging_folder}" />
|
||||||
|
- </antcall>
|
||||||
|
- <copy file="macosx/libastylej-2.05.1/libastylej.jnilib" todir="macosx/work/${staging_hardware_folder}/../lib/" />
|
||||||
|
- <chmod perm="755" file="macosx/work/${staging_hardware_folder}/../lib/libastylej.jnilib" />
|
||||||
|
- <copy file="macosx/libastylej-2.05.1/libastylej.jnilib" tofile="macosx/work/${staging_hardware_folder}/../lib/libastylej.dylib" />
|
||||||
|
- <chmod perm="755" file="macosx/work/${staging_hardware_folder}/../lib/libastylej.dylib" />
|
||||||
|
-
|
||||||
|
- <antcall target="unzip">
|
||||||
|
- <param name="archive_file" value="./liblistSerials-${LIBLISTSERIAL-VERSION}.zip" />
|
||||||
|
- <param name="archive_url" value="http://downloads.arduino.cc/liblistSerials/liblistSerials-${LIBLISTSERIAL-VERSION}.zip" />
|
||||||
|
- <param name="final_folder" value="${staging_folder}/liblistSerials-${LIBLISTSERIAL-VERSION}" />
|
||||||
|
- <param name="dest_folder" value="${staging_folder}" />
|
||||||
|
- </antcall>
|
||||||
|
- <copy file="macosx/liblistSerials-${LIBLISTSERIAL-VERSION}/osx/liblistSerialsj.dylib" todir="macosx/work/${staging_hardware_folder}/../lib/" />
|
||||||
|
- <chmod perm="755" file="macosx/work/${staging_hardware_folder}/../lib/liblistSerialsj.dylib" />
|
||||||
|
-
|
||||||
|
- <delete dir="${staging_folder}/arduino-builder-macosx" includeemptydirs="true"/>
|
||||||
|
- <mkdir dir="${staging_folder}/arduino-builder-macosx"/>
|
||||||
|
- <antcall target="untar">
|
||||||
|
- <param name="archive_file" value="./arduino-builder-macosx-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
|
||||||
|
- <param name="archive_url" value="http://downloads.arduino.cc/tools/arduino-builder-macosx-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
|
||||||
|
- <param name="final_folder" value="${staging_folder}/arduino-builder-macosx/arduino-builder" />
|
||||||
|
- <param name="dest_folder" value="${staging_folder}/arduino-builder-macosx" />
|
||||||
|
- </antcall>
|
||||||
|
- <copy file="${staging_folder}/arduino-builder-macosx/arduino-builder" tofile="macosx/work/${staging_hardware_folder}/../arduino-builder" />
|
||||||
|
- <chmod perm="755" file="macosx/work/${staging_hardware_folder}/../arduino-builder" />
|
||||||
|
- <move file="${staging_folder}/arduino-builder-macosx/tools" tofile="macosx/work/${staging_hardware_folder}/../tools-builder"/>
|
||||||
|
- <copy todir="macosx/work/${staging_hardware_folder}" overwrite="true">
|
||||||
|
- <fileset dir="${staging_folder}/arduino-builder-macosx/hardware" includes="*.txt"/>
|
||||||
|
- </copy>
|
||||||
|
- <delete dir="${staging_folder}/arduino-builder-macosx" includeemptydirs="true"/>
|
||||||
|
-
|
||||||
|
- <antcall target="portable-${portable}">
|
||||||
|
- <param name="parentdir" value="macosx/work/${staging_hardware_folder}/.." />
|
||||||
|
- </antcall>
|
||||||
|
- </target>
|
||||||
|
-
|
||||||
|
- <!-- Unzip AVR tools -->
|
||||||
|
- <target name="macosx-build-avr-toolchain" unless="light_bundle">
|
||||||
|
- <antcall target="avr-toolchain-bundle">
|
||||||
|
- <param name="unpack_target" value="untar"/>
|
||||||
|
- <param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino5-i386-apple-darwin11.tar.bz2"/>
|
||||||
|
- <param name="gcc_version" value="4.8.1-arduino5"/>
|
||||||
|
- <param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-r2-i386-apple-darwin11.tar.bz2"/>
|
||||||
|
- <param name="avrdude_version" value="6.0.1-arduino5"/>
|
||||||
|
- </antcall>
|
||||||
|
-
|
||||||
|
- <chmod perm="+x">
|
||||||
|
- <fileset dir="${staging_folder}/work/${staging_hardware_folder}/tools" includes="**/bin/*"/>
|
||||||
|
- <fileset dir="${staging_folder}/work/${staging_hardware_folder}/tools" includes="**/libexec/gcc/avr/4.8.1/*"/>
|
||||||
|
- </chmod>
|
||||||
|
-
|
||||||
|
- <!-- macosx gatekeeper workaround. See https://github.com/arduino/Arduino/issues/3468 -->
|
||||||
|
- <chmod perm="-x">
|
||||||
|
- <fileset dir="${staging_folder}/work/${staging_hardware_folder}/tools" includes="**/bin/avrdude_bin" />
|
||||||
|
- </chmod>
|
||||||
|
- </target>
|
||||||
|
-
|
||||||
|
- <target name="macosx-run" depends="build,start"/>
|
||||||
|
-
|
||||||
|
- <target name="macosx-start">
|
||||||
|
- <exec executable="macosx/work/Arduino.app/Contents/MacOS/Arduino" spawn="false" failonerror="true"/>
|
||||||
|
- </target>
|
||||||
|
-
|
||||||
|
- <!-- - - - - - - - - - - - - - - - -->
|
||||||
|
- <!-- Sign application for MacOSX. -->
|
||||||
|
- <!-- - - - - - - - - - - - - - - - -->
|
||||||
|
- <target name="macosx-signed-dist" if="macosx" depends="macosx-singed-dist-check, dist"
|
||||||
|
- description="Create a downloadable and signed .zip for the Mac OS X version">
|
||||||
|
- <fail unless="version" message="Please set the property 'version' to correctly sign distribution file" />
|
||||||
|
-
|
||||||
|
- <!-- Remove everything from working folder -->
|
||||||
|
- <delete dir="macosx/work/Arduino.app" />
|
||||||
|
-
|
||||||
|
- <!-- Unzip unsigned app into working dir -->
|
||||||
|
- <exec executable="unzip" dir="macosx/work" failonerror="true">
|
||||||
|
- <arg line="../arduino-${version}-${platform}.zip" />
|
||||||
|
- </exec>
|
||||||
|
-
|
||||||
|
- <!-- Unlock keychain file -->
|
||||||
|
- <exec executable="security" dir="macosx/work" failonerror="true">
|
||||||
|
- <arg line="unlock-keychain -p "${macosx-sign-keychain-pass}" "${macosx-sign-keychain}"" />
|
||||||
|
- </exec>
|
||||||
|
-
|
||||||
|
- <!-- Sign app -->
|
||||||
|
- <exec executable="codesign" dir="macosx/work" failonerror="true">
|
||||||
|
- <arg line="--keychain "${macosx-sign-keychain}" --force -s "${macosx-sign-id}" --deep -v Arduino.app/" />
|
||||||
|
- </exec>
|
||||||
|
-
|
||||||
|
- <!-- Check for successful signing -->
|
||||||
|
- <exec executable="codesign" dir="macosx/work" failonerror="true">
|
||||||
|
- <arg line="-vvvv Arduino.app/" />
|
||||||
|
- </exec>
|
||||||
|
-
|
||||||
|
- <delete file="macosx/arduino-${version}-${platform}.zip" />
|
||||||
|
-
|
||||||
|
- <!-- Create signed zip file -->
|
||||||
|
- <exec executable="zip" dir="macosx/work" failonerror="true">
|
||||||
|
- <arg line="-q -r ../arduino-${full-version}-signed.zip ." />
|
||||||
|
- </exec>
|
||||||
|
-
|
||||||
|
- <echo>
|
||||||
|
- =======================================================
|
||||||
|
- Arduino for Mac OS X built and signed.
|
||||||
|
-
|
||||||
|
- macosx/arduino-${full-version}-signed.zip
|
||||||
|
- =======================================================
|
||||||
|
- </echo>
|
||||||
|
- </target>
|
||||||
|
-
|
||||||
|
- <target name="macosx-singed-dist-check">
|
||||||
|
- <fail unless="macosx-sign-keychain" message="Please set the property 'macosx-sign-keychain' to the correct keychain file" />
|
||||||
|
- <fail unless="macosx-sign-keychain-pass" message="Please set the property 'macosx-sign-keychain-pass' with the password to unlock the keychain" />
|
||||||
|
- <fail unless="macosx-sign-id" message="Please set the property 'macosx-sign-id' to the correct cert identifier" />
|
||||||
|
- </target>
|
||||||
|
-
|
||||||
|
- <!-- - - - - - - - - - - - - - - - - - - -->
|
||||||
|
- <!-- Build distribution file for MacOSX. -->
|
||||||
|
- <!-- - - - - - - - - - - - - - - - - - - -->
|
||||||
|
- <target name="macosx-dist" if="macosx" depends="build" description="Create a downloadable .zip for the Mac OS X version">
|
||||||
|
- <exec executable="zip" dir="macosx/work" failonerror="true">
|
||||||
|
- <arg line="-q -r ../arduino-${full-version}.zip ." />
|
||||||
|
- </exec>
|
||||||
|
-
|
||||||
|
- <echo>
|
||||||
|
- =======================================================
|
||||||
|
- Arduino for Mac OS X was built. Grab the image from
|
||||||
|
-
|
||||||
|
- macosx/arduino-${full-version}.zip
|
||||||
|
- =======================================================
|
||||||
|
- </echo>
|
||||||
|
- </target>
|
||||||
|
-
|
||||||
|
- <!-- - - - - - - - -->
|
||||||
|
<!-- Linux -->
|
||||||
|
<!-- - - - - - - - -->
|
||||||
|
|
||||||
|
@@ -710,14 +440,6 @@
|
||||||
|
</copy>
|
||||||
|
<delete dir="${staging_folder}/arduino-builder-arm" includeemptydirs="true"/>
|
||||||
|
|
||||||
|
- <antcall target="avr-toolchain-bundle">
|
||||||
|
- <param name="unpack_target" value="untar"/>
|
||||||
|
- <param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino5-armhf-pc-linux-gnu-glibc2.13.tar.bz2"/>
|
||||||
|
- <param name="gcc_version" value="4.8.1-arduino5"/>
|
||||||
|
- <param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-armhf-pc-linux-gnu-glibc2.13.tar.bz2"/>
|
||||||
|
- <param name="avrdude_version" value="6.0.1-arduino5"/>
|
||||||
|
- </antcall>
|
||||||
|
-
|
||||||
|
<antcall target="package-library-index-json-bundle"/>
|
||||||
|
</target>
|
||||||
|
|
||||||
|
@@ -742,14 +464,6 @@
|
||||||
|
</copy>
|
||||||
|
<delete dir="${staging_folder}/arduino-builder-linux32" includeemptydirs="true"/>
|
||||||
|
|
||||||
|
- <antcall target="avr-toolchain-bundle">
|
||||||
|
- <param name="unpack_target" value="untar"/>
|
||||||
|
- <param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino5-i686-pc-linux-gnu.tar.bz2"/>
|
||||||
|
- <param name="gcc_version" value="4.8.1-arduino5"/>
|
||||||
|
- <param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-i686-pc-linux-gnu.tar.bz2"/>
|
||||||
|
- <param name="avrdude_version" value="6.0.1-arduino5"/>
|
||||||
|
- </antcall>
|
||||||
|
-
|
||||||
|
<antcall target="package-library-index-json-bundle"/>
|
||||||
|
</target>
|
||||||
|
|
||||||
|
@@ -774,14 +488,6 @@
|
||||||
|
</copy>
|
||||||
|
<delete dir="${staging_folder}/arduino-builder-linux64" includeemptydirs="true"/>
|
||||||
|
|
||||||
|
- <antcall target="avr-toolchain-bundle">
|
||||||
|
- <param name="unpack_target" value="untar"/>
|
||||||
|
- <param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino5-x86_64-pc-linux-gnu.tar.bz2"/>
|
||||||
|
- <param name="gcc_version" value="4.8.1-arduino5"/>
|
||||||
|
- <param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-x86_64-pc-linux-gnu.tar.bz2"/>
|
||||||
|
- <param name="avrdude_version" value="6.0.1-arduino5"/>
|
||||||
|
- </antcall>
|
||||||
|
-
|
||||||
|
<antcall target="package-library-index-json-bundle"/>
|
||||||
|
</target>
|
||||||
|
|
||||||
|
@@ -902,197 +608,6 @@
|
||||||
|
<target name="linuxarm-dist" depends="linux-dist"
|
||||||
|
description="Build .tar.xz of linux armhf version" />
|
||||||
|
|
||||||
|
- <!-- - - - - - - - -->
|
||||||
|
- <!-- Windows -->
|
||||||
|
- <!-- - - - - - - - -->
|
||||||
|
-
|
||||||
|
- <target name="windows-clean" depends="subprojects-clean"
|
||||||
|
- description="Clean windows version">
|
||||||
|
- <delete dir="windows/work" />
|
||||||
|
- <delete>
|
||||||
|
- <fileset dir="windows" includes="arduino-*windows*.zip"/>
|
||||||
|
- </delete>
|
||||||
|
- </target>
|
||||||
|
-
|
||||||
|
- <target name="windows-checkos" unless="windows">
|
||||||
|
- <echo>
|
||||||
|
- =======================================================
|
||||||
|
- Arduino for Windows can only be built on windows.
|
||||||
|
-
|
||||||
|
- Bye.
|
||||||
|
- =======================================================
|
||||||
|
- </echo>
|
||||||
|
-
|
||||||
|
- <fail message="wrong platform (${os.name})" />
|
||||||
|
- </target>
|
||||||
|
-
|
||||||
|
- <target name="download-launch4j-windows">
|
||||||
|
- <antcall target="unzip-with-ant-task">
|
||||||
|
- <param name="archive_file" value="windows/launch4j-3.8-win32.zip"/>
|
||||||
|
- <param name="archive_url" value="http://downloads.sourceforge.net/project/launch4j/launch4j-3/3.8/launch4j-3.8-win32.zip"/>
|
||||||
|
- <param name="final_folder" value="windows/launcher/launch4j"/>
|
||||||
|
- <param name="dest_folder" value="windows/launcher/"/>
|
||||||
|
- </antcall>
|
||||||
|
- </target>
|
||||||
|
-
|
||||||
|
- <target name="download-launch4j-linux">
|
||||||
|
- <antcall target="untar">
|
||||||
|
- <param name="archive_file" value="windows/launch4j-3.8-linux.tgz"/>
|
||||||
|
- <param name="archive_url" value="http://downloads.sourceforge.net/project/launch4j/launch4j-3/3.8/launch4j-3.8-linux.tgz"/>
|
||||||
|
- <param name="final_folder" value="windows/launcher/launch4j"/>
|
||||||
|
- <param name="dest_folder" value="windows/launcher/"/>
|
||||||
|
- </antcall>
|
||||||
|
- </target>
|
||||||
|
-
|
||||||
|
- <target name="windows-build"
|
||||||
|
- depends="revision-check, windows-checkos, subprojects-build"
|
||||||
|
- description="Build windows version">
|
||||||
|
- <mkdir dir="windows/work" />
|
||||||
|
- <mkdir dir="windows/work/${staging_hardware_folder}" />
|
||||||
|
-
|
||||||
|
- <copy todir="windows/work/lib">
|
||||||
|
- <fileset dir="shared" includes="icons/**/*.png"/>
|
||||||
|
- </copy>
|
||||||
|
-
|
||||||
|
- <!-- assemble the pde -->
|
||||||
|
- <mkdir dir="windows/work/lib" />
|
||||||
|
- <copy todir="windows/work/lib" flatten="true">
|
||||||
|
- <fileset refid="runtime.jars" />
|
||||||
|
- </copy>
|
||||||
|
-
|
||||||
|
- <copy todir="windows/work">
|
||||||
|
- <fileset dir="shared" includes="lib/**" />
|
||||||
|
- <fileset file="shared/revisions.txt" />
|
||||||
|
- </copy>
|
||||||
|
-
|
||||||
|
- <fixcrlf file="windows/work/revisions.txt" eol="dos"/>
|
||||||
|
- <fixcrlf file="windows/work/lib/formatter.conf" eol="dos"/>
|
||||||
|
-
|
||||||
|
- <copy todir="windows/work">
|
||||||
|
- <fileset dir="windows/dist" includes="*.dll" />
|
||||||
|
- </copy>
|
||||||
|
-
|
||||||
|
- <copy todir="windows/work">
|
||||||
|
- <fileset dir="windows/dist" includes="drivers/**" />
|
||||||
|
- </copy>
|
||||||
|
-
|
||||||
|
- <antcall target="windows-build-avr-toolchain" />
|
||||||
|
-
|
||||||
|
- <antcall target="unzip">
|
||||||
|
- <param name="archive_file" value="./libastylej-2.05.1-3.zip" />
|
||||||
|
- <param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.1-3.zip" />
|
||||||
|
- <param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
|
||||||
|
- <param name="dest_folder" value="${staging_folder}" />
|
||||||
|
- </antcall>
|
||||||
|
- <copy file="windows/libastylej-2.05.1/AStylej.dll" todir="windows/work/lib" />
|
||||||
|
- <copy file="windows/msvcp100.dll" todir="windows/work" />
|
||||||
|
- <copy file="windows/msvcr100.dll" todir="windows/work" />
|
||||||
|
-
|
||||||
|
- <antcall target="unzip">
|
||||||
|
- <param name="archive_file" value="./liblistSerials-${LIBLISTSERIAL-VERSION}.zip" />
|
||||||
|
- <param name="archive_url" value="http://downloads.arduino.cc/liblistSerials/liblistSerials-${LIBLISTSERIAL-VERSION}.zip" />
|
||||||
|
- <param name="final_folder" value="${staging_folder}/liblistSerials-${LIBLISTSERIAL-VERSION}" />
|
||||||
|
- <param name="dest_folder" value="${staging_folder}" />
|
||||||
|
- </antcall>
|
||||||
|
- <copy file="windows/liblistSerials-${LIBLISTSERIAL-VERSION}/windows/listSerialsj.dll" todir="windows/work/lib/" />
|
||||||
|
- <chmod perm="755" file="windows/work/lib/listSerialsj.dll" />
|
||||||
|
-
|
||||||
|
- <delete dir="${staging_folder}/arduino-builder-windows" includeemptydirs="true"/>
|
||||||
|
- <mkdir dir="${staging_folder}/arduino-builder-windows"/>
|
||||||
|
- <antcall target="unzip-with-ant-task">
|
||||||
|
- <param name="archive_file" value="./arduino-builder-windows-${ARDUINO-BUILDER-VERSION}.zip" />
|
||||||
|
- <param name="archive_url" value="http://downloads.arduino.cc/tools/arduino-builder-windows-${ARDUINO-BUILDER-VERSION}.zip" />
|
||||||
|
- <param name="final_folder" value="${staging_folder}/arduino-builder-windows/arduino-builder.exe" />
|
||||||
|
- <param name="dest_folder" value="${staging_folder}/arduino-builder-windows" />
|
||||||
|
- </antcall>
|
||||||
|
- <copy file="${staging_folder}/arduino-builder-windows/arduino-builder.exe" tofile="windows/work/arduino-builder.exe" />
|
||||||
|
- <chmod perm="755" file="windows/work/arduino-builder.exe" />
|
||||||
|
- <move file="${staging_folder}/arduino-builder-windows/tools" tofile="windows/work/tools-builder"/>
|
||||||
|
- <chmod perm="755" file="windows/work/tools-builder/ctags/5.8-arduino10/ctags.exe" />
|
||||||
|
- <copy todir="windows/work/hardware" overwrite="true">
|
||||||
|
- <fileset dir="${staging_folder}/arduino-builder-windows/hardware" includes="*.txt"/>
|
||||||
|
- </copy>
|
||||||
|
- <delete dir="${staging_folder}/arduino-builder-windows" includeemptydirs="true"/>
|
||||||
|
-
|
||||||
|
- <antcall target="assemble">
|
||||||
|
- <param name="target.path" value="windows/work" />
|
||||||
|
- </antcall>
|
||||||
|
-
|
||||||
|
- <delete dir="windows/launcher/launch4j"/>
|
||||||
|
- <antcall target="download-${launch4j-download-unpack-target-name}" />
|
||||||
|
-
|
||||||
|
- <property name="launch4j.dir" value="windows/launcher/launch4j/" />
|
||||||
|
- <taskdef name="launch4j"
|
||||||
|
- classname="net.sf.launch4j.ant.Launch4jTask"
|
||||||
|
- classpath="${launch4j.dir}/launch4j.jar; ${launch4j.dir}/lib/xstream.jar" />
|
||||||
|
-
|
||||||
|
- <copy todir="windows/work">
|
||||||
|
- <fileset dir="windows/launcher"
|
||||||
|
- includes="application.ico, config.xml, config_debug.xml, arduino.l4j.ini"/>
|
||||||
|
- </copy>
|
||||||
|
- <launch4j configFile="windows/work/config.xml" fileVersion="${revision}.0" txtFileVersion="${revision}" productVersion="${revision}.0" txtProductVersion="${revision}"/>
|
||||||
|
- <launch4j configFile="windows/work/config_debug.xml" fileVersion="${revision}.0" txtFileVersion="${revision}" productVersion="${revision}.0" txtProductVersion="${revision}"/>
|
||||||
|
- <delete dir="windows/work" includes="application.ico, config.xml, config_debug.xml" />
|
||||||
|
- <copy file="windows/work/arduino.l4j.ini" tofile="windows/work/arduino_debug.l4j.ini" />
|
||||||
|
-
|
||||||
|
- <!-- cygwin requires html, dll, and exe to have the +x flag -->
|
||||||
|
- <chmod perm="755">
|
||||||
|
- <fileset dir="windows/work" includes="**/*.html, **/*.dll, **/*.exe" />
|
||||||
|
- </chmod>
|
||||||
|
-
|
||||||
|
- <!-- For JVM within JDK, release file is in parent directory -->
|
||||||
|
- <property file="${WINDOWS_BUNDLED_JVM}/release" prefix="windows"/>
|
||||||
|
- <property file="${WINDOWS_BUNDLED_JVM}/../release" prefix="windows"/>
|
||||||
|
-
|
||||||
|
- <fail message="It looks like ${WINDOWS_BUNDLED_JVM} does not contain a Windows JVM">
|
||||||
|
- <condition>
|
||||||
|
- <not>
|
||||||
|
- <equals arg1="${windows.OS_NAME}" arg2=""Windows""/>
|
||||||
|
- </not>
|
||||||
|
- </condition>
|
||||||
|
- </fail>
|
||||||
|
-
|
||||||
|
- <copy todir="${staging_folder}/work/java" includeemptydirs="true" preservelastmodified="true" overwrite="true" failonerror="true">
|
||||||
|
- <fileset dir="${WINDOWS_BUNDLED_JVM}" includes="*/**"/>
|
||||||
|
- </copy>
|
||||||
|
-
|
||||||
|
- <antcall target="portable-${portable}">
|
||||||
|
- <param name="parentdir" value="${staging_folder}/work" />
|
||||||
|
- </antcall>
|
||||||
|
- </target>
|
||||||
|
-
|
||||||
|
- <target name="windows-build-avr-toolchain">
|
||||||
|
- <antcall target="avr-toolchain-bundle">
|
||||||
|
- <param name="unpack_target" value="unzip"/>
|
||||||
|
- <param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino5-i686-mingw32.zip"/>
|
||||||
|
- <param name="gcc_version" value="4.8.1-arduino5"/>
|
||||||
|
- <param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-i686-mingw32.zip"/>
|
||||||
|
- <param name="avrdude_version" value="6.0.1-arduino5"/>
|
||||||
|
- </antcall>
|
||||||
|
-
|
||||||
|
- <antcall target="package-library-index-json-bundle"/>
|
||||||
|
- </target>
|
||||||
|
-
|
||||||
|
- <target name="windows-run" depends="build,start"/>
|
||||||
|
-
|
||||||
|
- <target name="windows-start">
|
||||||
|
- <exec executable="windows/work/arduino.exe" dir="windows/work" spawn="false" failonerror="true"/>
|
||||||
|
- </target>
|
||||||
|
-
|
||||||
|
- <target name="windows-dist" depends="build" description="Create .zip files of windows version">
|
||||||
|
- <zip destfile="windows/arduino-${full-version}.zip" level="9">
|
||||||
|
- <zipfileset dir="windows/work" prefix="arduino-${version}"/>
|
||||||
|
- </zip>
|
||||||
|
-
|
||||||
|
- <echo>
|
||||||
|
- =======================================================
|
||||||
|
- Arduino for Windows was built. Grab the archive from
|
||||||
|
-
|
||||||
|
- windows/arduino-${full-version}.zip
|
||||||
|
- =======================================================
|
||||||
|
- </echo>
|
||||||
|
- </target>
|
||||||
|
-
|
||||||
|
|
||||||
|
<!-- - - - - - - - -->
|
||||||
|
<!-- Source -->
|
||||||
|
@@ -1109,8 +624,6 @@
|
||||||
|
prefix="arduino-${version}"
|
||||||
|
excludes="**/*.tgz,
|
||||||
|
**/*.bz2,
|
||||||
|
- **/build/macosx/,
|
||||||
|
- **/build/windows/,
|
||||||
|
**/work/,
|
||||||
|
**/.git/,
|
||||||
|
**/*.class"
|
||||||
|
@@ -1132,35 +645,7 @@
|
||||||
|
<!-- - - - - - - - -->
|
||||||
|
|
||||||
|
<target name="clean" description="Perform a spring cleaning"
|
||||||
|
- depends="linux-clean, windows-clean, macosx-clean, subprojects-clean">
|
||||||
|
- </target>
|
||||||
|
-
|
||||||
|
- <target name="avr-toolchain-bundle" unless="light_bundle">
|
||||||
|
- <!-- Unzip AVR tools -->
|
||||||
|
- <mkdir dir="${staging_folder}/work/${staging_hardware_folder}/tmp/gcc"/>
|
||||||
|
-
|
||||||
|
- <antcall target="${unpack_target}">
|
||||||
|
- <param name="archive_file" value="${staging_folder}/${gcc_archive_file}"/>
|
||||||
|
- <param name="archive_url" value="http://downloads.arduino.cc/tools/${gcc_archive_file}"/>
|
||||||
|
- <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tmp/gcc/${gcc_version}/"/>
|
||||||
|
- <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tmp/gcc/"/>
|
||||||
|
- </antcall>
|
||||||
|
-
|
||||||
|
- <mkdir dir="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude"/>
|
||||||
|
-
|
||||||
|
- <antcall target="${unpack_target}">
|
||||||
|
- <param name="archive_file" value="${staging_folder}/${avrdude_archive_file}"/>
|
||||||
|
- <param name="archive_url" value="http://downloads.arduino.cc/tools/${avrdude_archive_file}"/>
|
||||||
|
- <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/${avrdude_version}"/>
|
||||||
|
- <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/"/>
|
||||||
|
- </antcall>
|
||||||
|
-
|
||||||
|
- <move file="${staging_folder}/work/${staging_hardware_folder}/tmp/gcc/avr" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/avr"/>
|
||||||
|
- <move file="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/avrdude-6.0.1" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/avr"/>
|
||||||
|
- <antcall target="macosx-fix-bundled-toolchain-missing-symlinks"/>
|
||||||
|
-
|
||||||
|
- <echo append="true" file="${staging_folder}/work/${staging_hardware_folder}/tools/avr/builtin_tools_versions.txt" message="arduino.avrdude=${avrdude_version}${line.separator}"/>
|
||||||
|
- <echo append="true" file="${staging_folder}/work/${staging_hardware_folder}/tools/avr/builtin_tools_versions.txt" message="arduino.avr-gcc=${gcc_version}${line.separator}"/>
|
||||||
|
+ depends="linux-clean, subprojects-clean">
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<target name="package-library-index-json-bundle">
|
||||||
|
@@ -1187,17 +672,6 @@
|
||||||
|
<delete dir="${staging_folder}/work/${staging_hardware_folder}/tmp"/>
|
||||||
|
</target>
|
||||||
|
|
||||||
|
- <target name="macosx-fix-bundled-toolchain-missing-symlinks" if="macosx">
|
||||||
|
- <exec executable="mv" failonerror="true">
|
||||||
|
- <arg value="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/avrdude-6.0.1/lib/libusb.dylib"/>
|
||||||
|
- <arg value="${staging_folder}/work/${staging_hardware_folder}/tools/avr/lib/"/>
|
||||||
|
- </exec>
|
||||||
|
- <exec executable="mv" failonerror="true">
|
||||||
|
- <arg value="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/avrdude-6.0.1/lib/libusb-1.0.dylib"/>
|
||||||
|
- <arg value="${staging_folder}/work/${staging_hardware_folder}/tools/avr/lib/"/>
|
||||||
|
- </exec>
|
||||||
|
- </target>
|
||||||
|
-
|
||||||
|
<target name="generate-hourly-build-txt" if="hourly">
|
||||||
|
<echo file="${staging_folder}/work/${staging_hardware_folder}/../lib/hourlyBuild.txt">${BUILD_DATE}</echo>
|
||||||
|
</target>
|
24
dev-embedded/arduino/files/arduino-1.6.9-platform.patch
Normal file
24
dev-embedded/arduino/files/arduino-1.6.9-platform.patch
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
diff -ur arduino-1.6.9.orig/hardware/arduino/avr/platform.txt arduino-1.6.9/hardware/arduino/avr/platform.txt
|
||||||
|
--- arduino-1.6.9.orig/hardware/arduino/avr/platform.txt 2016-05-10 10:36:07.000000000 +0200
|
||||||
|
+++ arduino-1.6.9/hardware/arduino/avr/platform.txt 2016-07-06 17:11:45.587888237 +0200
|
||||||
|
@@ -18,7 +18,7 @@
|
||||||
|
compiler.warning_flags.all=-Wall -Wextra
|
||||||
|
|
||||||
|
# Default "compiler.path" is correct, change only if you want to override the initial value
|
||||||
|
-compiler.path={runtime.tools.avr-gcc.path}/bin/
|
||||||
|
+compiler.path=/usr/bin/
|
||||||
|
compiler.c.cmd=avr-gcc
|
||||||
|
compiler.c.flags=-c -g -Os {compiler.warning_flags} -std=gnu11 -ffunction-sections -fdata-sections -MMD
|
||||||
|
compiler.c.elf.flags={compiler.warning_flags} -Os -Wl,--gc-sections
|
||||||
|
@@ -91,9 +91,9 @@
|
||||||
|
# AVR Uploader/Programmers tools
|
||||||
|
# ------------------------------
|
||||||
|
|
||||||
|
-tools.avrdude.path={runtime.tools.avrdude.path}
|
||||||
|
+tools.avrdude.path=/usr
|
||||||
|
tools.avrdude.cmd.path={path}/bin/avrdude
|
||||||
|
-tools.avrdude.config.path={path}/etc/avrdude.conf
|
||||||
|
+tools.avrdude.config.path=/etc/avrdude.conf
|
||||||
|
|
||||||
|
tools.avrdude.upload.params.verbose=-v
|
||||||
|
tools.avrdude.upload.params.quiet=-q -q
|
17
dev-embedded/arduino/files/arduino-1.6.9-script.patch
Normal file
17
dev-embedded/arduino/files/arduino-1.6.9-script.patch
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
diff -uNr a/build/linux/dist/arduino b/build/linux/dist/arduino
|
||||||
|
--- a/build/linux/dist/arduino 2015-11-07 16:21:27.391410539 +0100
|
||||||
|
+++ b/build/linux/dist/arduino 2015-11-07 16:22:19.534411671 +0100
|
||||||
|
@@ -8,11 +8,11 @@
|
||||||
|
"$APPDIR"/lib/*.jar \
|
||||||
|
;
|
||||||
|
do
|
||||||
|
- CLASSPATH="${CLASSPATH}:${LIB}"
|
||||||
|
+ CLASSPATH="${CLASSPATH+$CLASSPATH:}${LIB}"
|
||||||
|
done
|
||||||
|
export CLASSPATH
|
||||||
|
|
||||||
|
-LD_LIBRARY_PATH=$APPDIR/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
|
||||||
|
+LD_LIBRARY_PATH="$(java-config -di rxtx-2)${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}"
|
||||||
|
export LD_LIBRARY_PATH
|
||||||
|
|
||||||
|
export PATH="${APPDIR}/java/bin:${PATH}"
|
16
dev-embedded/arduino/files/platform-1.6.9/platform.txt
Normal file
16
dev-embedded/arduino/files/platform-1.6.9/platform.txt
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
# ctags
|
||||||
|
# ------------------------------
|
||||||
|
tools.ctags.path=/usr/bin
|
||||||
|
tools.ctags.cmd.path={path}/ctags
|
||||||
|
tools.ctags.pattern="{cmd.path}" -u --language-force=c++ -f - --c++-kinds=svpf --fields=KSTtzns --line-directives "{source_file}"
|
||||||
|
|
||||||
|
# additional entries
|
||||||
|
tools.avrdude.path=/usr/bin
|
||||||
|
|
||||||
|
preproc.includes.flags=-w -x c++ -M -MG -MP
|
||||||
|
#preproc.includes.compatibility_flags={build.mbed_api_include} {build.nRF51822_api_include} {build.ble_api_include} {compiler.libsam.c.flags} {compiler.arm.cmsis.path} {build.variant_system_include}
|
||||||
|
#recipe.preproc.includes="{compiler.path}{compiler.cpp.cmd}" {preproc.includes.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.cpp.extra_flags} {build.extra_flags} {preproc.includes.compatibility_flags} {includes} "{source_file}"
|
||||||
|
|
||||||
|
preproc.macros.flags=-w -x c++ -E -CC
|
||||||
|
#preproc.macros.compatibility_flags={build.mbed_api_include} {build.nRF51822_api_include} {build.ble_api_include} {compiler.libsam.c.flags} {compiler.arm.cmsis.path} {build.variant_system_include}
|
||||||
|
#recipe.preproc.macros="{compiler.path}{compiler.cpp.cmd}" {compiler.cpreprocessor.flags} {compiler.cpp.flags} {preproc.macros.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.cpp.extra_flags} {build.extra_flags} {preproc.macros.compatibility_flags} {includes} "{source_file}" -o "{preprocessed_file_path}"
|
Loading…
Reference in New Issue
Block a user