mobeigi
/
filebot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* no need to override -Xmx anymore since newer version of Java have a better default max-memory value

This commit is contained in:
Reinhard Pointner 2013-02-15 10:45:06 +00:00
parent bb5ac66c98
commit 61bd6f1d9e
9 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.xml
View File

@ -206,7 +206,7 @@
<copy tofile="${dir.dist}/appbundle/FileBot.jar" file="${path.fatjar}" /> <copy tofile="${dir.dist}/appbundle/FileBot.jar" file="${path.fatjar}" />
<!-- build app bundle folder and add native libs --> <!-- build app bundle folder and add native libs -->
<jarbundler dir="${dir.dist}" name="${title}" version="${version}" build="${svn.revision}" icon="${dir.installer}/appbundle/icon.icns" bundleid="net.sourceforge.filebot" jar="${dir.dist}/appbundle/FileBot.jar" stubfile="${dir.installer}/appbundle/JavaApplicationStub" workingdirectory="$APP_PACKAGE/Contents/Resources/Java" mainclass="net.sourceforge.filebot.Main" jvmversion="1.6+" vmoptions="-Xmx256m"> <jarbundler dir="${dir.dist}" name="${title}" version="${version}" build="${svn.revision}" icon="${dir.installer}/appbundle/icon.icns" bundleid="net.sourceforge.filebot" jar="${dir.dist}/appbundle/FileBot.jar" stubfile="${dir.installer}/appbundle/JavaApplicationStub" workingdirectory="$APP_PACKAGE/Contents/Resources/Java" mainclass="net.sourceforge.filebot.Main" jvmversion="1.6+">
<javaproperty name="application.deployment" value="app" /> <javaproperty name="application.deployment" value="app" />
<javaproperty name="unixfs" value="false" /> <javaproperty name="unixfs" value="false" />
<javaproperty name="useExtendedFileAttributes" value="true" /> <javaproperty name="useExtendedFileAttributes" value="true" />

2
installer/appbundle/filebot
View File

@ -4,4 +4,4 @@ while [ -h "$SOURCE" ] ; do SOURCE="$(readlink "$SOURCE")"; done
dir_bin="$( cd -P "$( dirname "$SOURCE" )" && pwd )" dir_bin="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
dir_app=$dir_bin/../Resources/Java dir_app=$dir_bin/../Resources/Java
java -Xmx256m -Djava.awt.headless=true -Dunixfs=false -DuseExtendedFileAttributes=true -Djava.net.useSystemProxies=true -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Dapplication.deployment=app "-Djna.library.path=$dir_app" "-Djava.library.path=$dir_app" -jar "$dir_app/FileBot.jar" "$@" java -Djava.awt.headless=true -Dunixfs=false -DuseExtendedFileAttributes=true -Djava.net.useSystemProxies=true -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Dapplication.deployment=app "-Djna.library.path=$dir_app" "-Djava.library.path=$dir_app" -jar "$dir_app/FileBot.jar" "$@"

2
installer/deb/filebot.sh
View File

@ -1,2 +1,2 @@
#!/bin/bash #!/bin/bash
java -Xmx256m -Dunixfs=false -DuseGVFS=true -DuseExtendedFileAttributes=true -Djava.net.useSystemProxies=true -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Dapplication.deployment=deb -Dapplication.analytics=true -Dapplication.warmup=true -Dapplication.dir=$HOME/.filebot -Djava.io.tmpdir=$HOME/.filebot/temp -Djna.library.path=/usr/share/filebot -Djava.library.path=/usr/share/filebot -jar /usr/share/filebot/FileBot.jar "$@" java -Dunixfs=false -DuseGVFS=true -DuseExtendedFileAttributes=true -Djava.net.useSystemProxies=true -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Dapplication.deployment=deb -Dapplication.analytics=true -Dapplication.warmup=true -Dapplication.dir=$HOME/.filebot -Djava.io.tmpdir=$HOME/.filebot/temp -Djna.library.path=/usr/share/filebot -Djava.library.path=/usr/share/filebot -jar /usr/share/filebot/FileBot.jar "$@"

3
installer/msi/filebot.launcher.l4j.ini
View File

@ -17,9 +17,6 @@
# use NTFS extended attributes for storing metadata # use NTFS extended attributes for storing metadata
-DuseExtendedFileAttributes=true -DuseExtendedFileAttributes=true
# memory settings
-Xmx256m
# look for native libs here # look for native libs here
-Djna.library.path="%EXEDIR%" -Djna.library.path="%EXEDIR%"
-Djava.library.path="%EXEDIR%" -Djava.library.path="%EXEDIR%"

4
installer/msi/filebot.platform.launcher.l4j.ini
View File

@ -21,10 +21,6 @@
# do not use NTFS extended attributes for storing metadata # do not use NTFS extended attributes for storing metadata
-DuseExtendedFileAttributes=false -DuseExtendedFileAttributes=false
# memory settings
-Xms64m
-Xmx512m
# look for native libs here # look for native libs here
-Djna.library.path="%EXEDIR%" -Djna.library.path="%EXEDIR%"
-Djava.library.path="%EXEDIR%" -Djava.library.path="%EXEDIR%"

3
installer/portable/FileBot.l4j.ini
View File

@ -18,9 +18,6 @@
# do not use NTFS extended attributes for storing metadata # do not use NTFS extended attributes for storing metadata
-DuseExtendedFileAttributes=false -DuseExtendedFileAttributes=false
# memory settings
-Xmx256m
# put all temporary files here # put all temporary files here
-Djava.io.tmpdir="%EXEDIR%/temp" -Djava.io.tmpdir="%EXEDIR%/temp"

2
installer/portable/filebot.sh
View File

@ -6,4 +6,4 @@ dir_bin="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
# force JVM language and encoding settings # force JVM language and encoding settings
export LANG=en_US.utf8 export LANG=en_US.utf8
java -Xmx256m -Dunixfs=false -DuseGVFS=false -DuseExtendedFileAttributes=false -Djava.net.useSystemProxies=true -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Dapplication.deployment=portable -Dapplication.analytics=true -Dapplication.warmup=false "-Dapplication.dir=$dir_bin" "-Djava.io.tmpdir=$dir_bin/temp" "-Duser.home=$dir_bin" "-Djna.library.path=$dir_bin" "-Djava.library.path=$dir_bin" -Djava.util.prefs.PreferencesFactory=net.sourceforge.tuned.prefs.FilePreferencesFactory "-Dnet.sourceforge.tuned.prefs.file=$dir_bin/prefs.properties" -jar "$dir_bin/FileBot.jar" "$@" java -Dunixfs=false -DuseGVFS=false -DuseExtendedFileAttributes=false -Djava.net.useSystemProxies=true -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Dapplication.deployment=portable -Dapplication.analytics=true -Dapplication.warmup=false "-Dapplication.dir=$dir_bin" "-Djava.io.tmpdir=$dir_bin/temp" "-Duser.home=$dir_bin" "-Djna.library.path=$dir_bin" "-Djava.library.path=$dir_bin" -Djava.util.prefs.PreferencesFactory=net.sourceforge.tuned.prefs.FilePreferencesFactory "-Dnet.sourceforge.tuned.prefs.file=$dir_bin/prefs.properties" -jar "$dir_bin/FileBot.jar" "$@"

2
installer/ubuntu/filebot.sh
View File

@ -1,2 +1,2 @@
#!/bin/bash #!/bin/bash
java -Xmx256m -Dunixfs=false -DuseGVFS=true -DuseExtendedFileAttributes=true -Djava.net.useSystemProxies=true -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Dapplication.update=skip -Dapplication.deployment=ppa -Dapplication.analytics=false -Dapplication.warmup=true -Dapplication.dir=$HOME/.filebot -Djava.io.tmpdir=$HOME/.filebot/temp -Djna.library.path=/opt/filebot -Djava.library.path=/opt/filebot -jar /opt/filebot/FileBot.jar "$@" java -Dunixfs=false -DuseGVFS=true -DuseExtendedFileAttributes=true -Djava.net.useSystemProxies=true -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Dapplication.update=skip -Dapplication.deployment=ppa -Dapplication.analytics=false -Dapplication.warmup=true -Dapplication.dir=$HOME/.filebot -Djava.io.tmpdir=$HOME/.filebot/temp -Djna.library.path=/opt/filebot -Djava.library.path=/opt/filebot -jar /opt/filebot/FileBot.jar "$@"

2
installer/webstart/filebot.jnlp
View File

@ -33,7 +33,7 @@
<property name="sun.net.client.defaultReadTimeout" value="60000" /> <property name="sun.net.client.defaultReadTimeout" value="60000" />
<java version="1.6+" max-heap-size="256m" /> <java version="1.6+" />
<property name="jnlp.packEnabled" value="true" /> <property name="jnlp.packEnabled" value="true" />
<jar href="filebot.jar" download="eager" main="true" /> <jar href="filebot.jar" download="eager" main="true" />