rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-01-30 19:52:13 +01:00
Code Issues Releases Activity

Merge pull request #2712 from ffissore/jvm-memory-params

Browse Source 
jvm memory settings update
This commit is contained in:
Federico Fissore 2015-03-01 21:15:38 +01:00
commit 94a2c67964
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build/build.xml
View File

@ -301,7 +301,7 @@
<option value="-Dfile.encoding=UTF-8"/> <option value="-Dfile.encoding=UTF-8"/>
<option value="-Xms128M"/> <option value="-Xms128M"/>
<option value="-Xmx256M"/> <option value="-Xmx1024M"/>
<bundledocument extensions="ino,c,cpp,h" <bundledocument extensions="ino,c,cpp,h"
icon="macosx/template.app/Contents/Resources/pde.icns" icon="macosx/template.app/Contents/Resources/pde.icns"
@ -854,12 +854,12 @@
<copy todir="windows/work"> <copy todir="windows/work">
<fileset dir="windows/launcher" <fileset dir="windows/launcher"
includes="about.bmp, application.ico, config.xml, config_debug.xml"/> includes="about.bmp, application.ico, config.xml, config_debug.xml, arduino.l4j.ini"/>
</copy> </copy>
<launch4j configFile="windows/work/config.xml" /> <launch4j configFile="windows/work/config.xml" />
<launch4j configFile="windows/work/config_debug.xml" /> <launch4j configFile="windows/work/config_debug.xml" />
<delete dir="windows/work" <delete dir="windows/work" includes="about.bmp, application.ico, config.xml, config_debug.xml" />
includes="about.bmp, 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 --> <!-- cygwin requires html, dll, and exe to have the +x flag -->
<chmod perm="755"> <chmod perm="755">

2
build/macosx/template.app/Contents/Info.plist
View File

@ -81,7 +81,7 @@
<key>VMOptions</key> <key>VMOptions</key>
<array> <array>
<string>-Xms128M</string> <string>-Xms128M</string>
<string>-Xmx256M</string> <string>-Xmx1024M</string>
</array> </array>
<key>MainClass</key> <key>MainClass</key>

2
build/windows/launcher/arduino.l4j.ini Normal file
View File

@ -0,0 +1,2 @@
-Xms128M
-Xmx1024M

1
build/windows/launcher/config.xml
View File

@ -32,7 +32,6 @@
<minVersion>1.6.0</minVersion> <minVersion>1.6.0</minVersion>
<maxVersion></maxVersion> <maxVersion></maxVersion>
<jdkPreference>preferJre</jdkPreference> <jdkPreference>preferJre</jdkPreference>
<opt>-Xms128m -Xmx128m</opt>
</jre> </jre>
<splash> <splash>
<file>about.bmp</file> <file>about.bmp</file>

1
build/windows/launcher/config_debug.xml
View File

@ -32,7 +32,6 @@
<minVersion>1.6.0</minVersion> <minVersion>1.6.0</minVersion>
<maxVersion></maxVersion> <maxVersion></maxVersion>
<jdkPreference>preferJre</jdkPreference> <jdkPreference>preferJre</jdkPreference>
<opt>-Xms128m -Xmx128m</opt>
</jre> </jre>
<messages> <messages>
<startupErr>An error occurred while starting the application.</startupErr> <startupErr>An error occurred while starting the application.</startupErr>