noisymime
/
Arduino
mirror of https://github.com/noisymime/Arduino.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3312 from ffissore/linux-jvm-bundle 

Linux: bundling the JVM
This commit is contained in:
Federico Fissore 2015-06-10 09:38:59 +02:00
parent fec9fb4d0e 30f7fc4518
commit 47f9c091b0
3 changed files with 44 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
build/build.xml
View File

@ -52,6 +52,24 @@
<property name="MACOSX_BUNDLED_JVM" value="${java.home}/../"/>
<property name="WINDOWS_BUNDLED_JVM" value="${java.home}"/>
<property name="LINUX32_BUNDLED_JVM" value="none"/>
<property name="LINUX64_BUNDLED_JVM" value="none"/>
<condition property="linux-bundle-jvm-task" value="noop">
<and>
<equals arg1="${LINUX32_BUNDLED_JVM}" arg2="none"/>
<equals arg1="${LINUX64_BUNDLED_JVM}" arg2="none"/>
</and>
</condition>
<condition property="linux-bundle-jvm-task" value="bundle">
<or>
<not>
<equals arg1="${LINUX32_BUNDLED_JVM}" arg2="none"/>
</not>
<not>
<equals arg1="${LINUX64_BUNDLED_JVM}" arg2="none"/>
</not>
</or>
</condition>
<!-- Libraries required for running arduino -->
<fileset dir=".." id="runtime.jars">
@ -620,6 +638,10 @@
</target>
<target name="linux32-build" depends="linux-build" description="Build linux (32-bit) version">
<antcall target="linux-jvm-${linux-bundle-jvm-task}">
<param name="JVM" value="${LINUX32_BUNDLED_JVM}"/>
</antcall>
<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"/>
@ -632,6 +654,10 @@
</target>
<target name="linux64-build" depends="linux-build" description="Build linux (64-bit) version">
<antcall target="linux-jvm-${linux-bundle-jvm-task}">
<param name="JVM" value="${LINUX64_BUNDLED_JVM}"/>
</antcall>
<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"/>
@ -643,6 +669,18 @@
<antcall target="package-library-index-json-bundle"/>
</target>
<target name="linux-jvm-noop"/>
<target name="linux-jvm-bundle">
<mkdir dir="${staging_folder}/work/java" />
<exec executable="rsync">
<arg value="-a"/>
<arg value="${JVM}"/>
<arg value="${staging_folder}/work/java/"/>
</exec>
</target>
<target name="linux32-run" depends="build" description="Run Linux (32-bit) version">
<exec executable="./linux/work/arduino" spawn="false" failonerror="true"/>
</target>

2
build/build_pull_request.bash
View File

@ -18,5 +18,5 @@ fi
VERSION="PR-${ghprbPullId}-BUILD-${BUILD_NUMBER}"
./build_all_dist.bash -Dversion="${VERSION}" -DMACOSX_BUNDLED_JVM=$MACOSX_BUNDLED_JVM -DWINDOWS_BUNDLED_JVM=$WINDOWS_BUNDLED_JVM
./build_all_dist.bash -Dversion="${VERSION}" -DMACOSX_BUNDLED_JVM=$MACOSX_BUNDLED_JVM -DWINDOWS_BUNDLED_JVM=$WINDOWS_BUNDLED_JVM -DLINUX32_BUNDLED_JVM=$LINUX32_BUNDLED_JVM -DLINUX64_BUNDLED_JVM=$LINUX64_BUNDLED_JVM

6
build/linux/dist/arduino vendored
View File

@ -28,5 +28,9 @@ fi
export JAVA_TOOL_OPTIONS=`echo $JAVA_TOOL_OPTIONS | sed 's|-javaagent:/usr/share/java/jayatanaag.jar||g'`
java -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel $SPLASH processing.app.Base --curdir $CURDIR "$@"
JAVA=java
if [ -x ./java/bin/java ]; then
JAVA=./java/bin/java
fi
$JAVA -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel $SPLASH processing.app.Base --curdir $CURDIR "$@"