From bb8f4fb3e7ed34b0c492f514be36b51e65f51e6c Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Wed, 28 Dec 2011 13:51:36 +0000 Subject: [PATCH] + added portable profile --- build.xml | 29 ++- installer/msi/filebot-launch4j.xml | 1 - installer/msi/filebot-platform-launch4j.xml | 2 +- installer/msi/filebot-wix.xml | 1 + installer/msi/filebot.cmd | 2 +- installer/msi/filebot.launcher.exe | Bin 41472 -> 41472 bytes installer/msi/filebot.launcher.l4j.ini | 7 + installer/msi/filebot.platform.launcher.exe | Bin 41984 -> 41472 bytes .../msi/filebot.platform.launcher.l4j.ini | 4 +- installer/portable/FileBot-launch4j.xml | 23 ++ installer/portable/FileBot.exe | Bin 0 -> 41472 bytes installer/portable/FileBot.l4j.ini | 15 ++ installer/portable/filebot.sh | 7 + installer/webstart/filebot.jnlp | 3 +- source/ehcache.xml | 2 +- source/net/sourceforge/filebot/Main.java | 2 +- source/net/sourceforge/filebot/Settings.java | 37 ++- .../net/sourceforge/tuned/PreferencesMap.java | 97 ++++---- .../tuned/prefs/FilePreferences.java | 216 ++++++++++++++++++ .../tuned/prefs/FilePreferencesFactory.java | 73 ++++++ website/download.php | 2 + 21 files changed, 442 insertions(+), 81 deletions(-) create mode 100644 installer/msi/filebot.launcher.l4j.ini create mode 100644 installer/portable/FileBot-launch4j.xml create mode 100644 installer/portable/FileBot.exe create mode 100644 installer/portable/FileBot.l4j.ini create mode 100644 installer/portable/filebot.sh create mode 100644 source/net/sourceforge/tuned/prefs/FilePreferences.java create mode 100644 source/net/sourceforge/tuned/prefs/FilePreferencesFactory.java diff --git a/build.xml b/build.xml index 63c4bb4e..2949a685 100644 --- a/build.xml +++ b/build.xml @@ -213,8 +213,22 @@ - - + + + + + + + + + + + + + + + + @@ -378,17 +392,18 @@ - + - + + @@ -404,6 +419,12 @@ + + + + + + diff --git a/installer/msi/filebot-launch4j.xml b/installer/msi/filebot-launch4j.xml index 2ba5a835..1a846482 100644 --- a/installer/msi/filebot-launch4j.xml +++ b/installer/msi/filebot-launch4j.xml @@ -19,6 +19,5 @@ preferJre 256 - -Dapplication.deployment=msi \ No newline at end of file diff --git a/installer/msi/filebot-platform-launch4j.xml b/installer/msi/filebot-platform-launch4j.xml index 29ccc8cb..157720de 100644 --- a/installer/msi/filebot-platform-launch4j.xml +++ b/installer/msi/filebot-platform-launch4j.xml @@ -15,7 +15,7 @@ ..\icons\shortcut.ico net.sourceforge.filebot - FileBot + diff --git a/installer/msi/filebot-wix.xml b/installer/msi/filebot-wix.xml index f2ee5c6e..537cfe39 100644 --- a/installer/msi/filebot-wix.xml +++ b/installer/msi/filebot-wix.xml @@ -17,6 +17,7 @@ + diff --git a/installer/msi/filebot.cmd b/installer/msi/filebot.cmd index ba326b6f..ab8a1d47 100644 --- a/installer/msi/filebot.cmd +++ b/installer/msi/filebot.cmd @@ -1,2 +1,2 @@ @ECHO OFF -java -Dapplication.deployment=msi -Xmx256m -jar "%~dp0FileBot.jar" %* +java -Dapplication.dir="%APPDATA%\FileBot" -Dapplication.deployment=msi -Djava.io.tmpdir="%APPDATA%\FileBot\temp" -Xmx256m -jar "%~dp0FileBot.jar" %* diff --git a/installer/msi/filebot.launcher.exe b/installer/msi/filebot.launcher.exe index 6806dd0d7c87dcd896f3e4c8c2d82daff8ddaebb..ede7076da56e8c7e1bdf856f1a3009dc6cb6c020 100644 GIT binary patch delta 662 zcmZ{hJxjw-6o%h>BU)6Xhyk^TMJRRHAzdKJSQak8;R%G+gy_Yxc zqZo;%cP!rKdR8aW_ctCz2gP6Ldx{U~(a(v`Zo^w`ee8R=ZYbQM GIR61iRA7++ delta 752 zcmZ{hy-Pw-7>D0;u9RRzgo2?$5RywJLLgDJG}KT-Q%jm(rQydF#cq>#Xb2j*a+kJN zcMXCD8~g(rrKzF8F`SBq`d#&MPpJnk56}BM=klKOs%@^exppmG6nnLseO^1Py@q&m zTQBl+U12Y*+1TSxQK?ew>C;4Byf=fPdj37&v1Pys!l2ByF|cnUs)XJ7|RgC8JZ8#J15jWnuQjp)%a z`JIs8j>#W|ypeyxB zp!68^9t&U$2sBapT$8o9btx|_LsY%BI9~}f-LCA*=alDKYg-fPMc<@^X?L?dnvN96 zZu?FrUD~OW57ZO?)DMU1J~$--bDDiZ_? zWSu-Gze&OwJfGGU{tj-qgINB|aDJ!c@e%oplIKU{btS(ak++omBcly0ma9eBUHrge zLmpsdNg&5-?49DWKsnGeK-cLJ*BeQJaaZw0pHjS;6ot+$bc-#%!0+_W4}Gq0yrm<7 nkm51=y5cAFE5+;dO~nH#{(#~}$}h006rL(O+2B?s_fQqTMj~m~ delta 808 zcmZ{hy-UMD7>D1x`VrcoQ7mmOqM*eLmHL5D5FvDsBBJ6Tomy$BrsANuxFuspOBM$Q zaq4C<|3C+aj)J3t9o<}=#9x|(T&2C`;dy_#d*92MFWl_#+xl#B>U*EO)uqW$gz+rx zqHx@J%!Dr)(FoD+Hfy}Eaapsj__=k%Uc<76PZp5o>?8hM3gH-QygV0CIhjbv@k}|j z5ghNHRNzk9%e}U4T@UKkd?jiG`($z=iIF)0qNOH{1{7c9``!4LBFNH82*8jfo zA$4^~Jv*R|4y5&8+(5}~oX3X3A|oB|?yvSTqo(2;{x*JpGZnZ}WHc5i#o@BxOK|VL zy{ZcL=IVL6XfR3$8}j(Tc}9Poz$ITm9lkF3J^Wg5rNn4c@I2gkc7L_tXkaUYj*mr9VZKWBC98 diff --git a/installer/msi/filebot.platform.launcher.l4j.ini b/installer/msi/filebot.platform.launcher.l4j.ini index 5368b1b0..fdf8fe6e 100644 --- a/installer/msi/filebot.platform.launcher.l4j.ini +++ b/installer/msi/filebot.platform.launcher.l4j.ini @@ -1,12 +1,14 @@ # FileBot launch4j runtime config -Dapplication.deployment=msi --Dfile.encoding=UTF-8 +-Dapplication.dir="%APPDATA%\FileBot" +-Djava.io.tmpdir="%APPDATA%\FileBot\temp" # memory settings -Xms64m -Xmx512m # force english locale +-Dfile.encoding=UTF-8 -Duser.country=US -Duser.country.format=US -Duser.language=en diff --git a/installer/portable/FileBot-launch4j.xml b/installer/portable/FileBot-launch4j.xml new file mode 100644 index 00000000..fc4c2698 --- /dev/null +++ b/installer/portable/FileBot-launch4j.xml @@ -0,0 +1,23 @@ + + true + gui + FileBot.jar + FileBot.exe + + + + normal + http://java.com/download + + false + false + + ..\icons\shortcut.ico + + + 1.6.0 + + preferJre + 256 + + \ No newline at end of file diff --git a/installer/portable/FileBot.exe b/installer/portable/FileBot.exe new file mode 100644 index 0000000000000000000000000000000000000000..a3d78303db079fa62940cfa4ed5d97e180e4db7e GIT binary patch literal 41472 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 h|F>(h@_&I(|bMgZ3N#{2!XT*cSi* literal 0 HcmV?d00001 diff --git a/installer/portable/FileBot.l4j.ini b/installer/portable/FileBot.l4j.ini new file mode 100644 index 00000000..bb172514 --- /dev/null +++ b/installer/portable/FileBot.l4j.ini @@ -0,0 +1,15 @@ +# FileBot launch4j runtime config +-Dapplication.deployment=portable +-Dapplication.dir="%EXEDIR%" +-Duser.home="%EXEDIR%" +-Djava.io.tmpdir="%EXEDIR%\temp" + +# memory settings +-Xmx256m + +# look for native libs here +-Djna.library.path="%EXEDIR%" + +# store preferences to text file +-Djava.util.prefs.PreferencesFactory=net.sourceforge.tuned.prefs.FilePreferencesFactory +-Dnet.sourceforge.tuned.prefs.file=prefs.properties diff --git a/installer/portable/filebot.sh b/installer/portable/filebot.sh new file mode 100644 index 00000000..d82dc24a --- /dev/null +++ b/installer/portable/filebot.sh @@ -0,0 +1,7 @@ +#!/bin/bash +SOURCE="${BASH_SOURCE[0]}" +while [ -h "$SOURCE" ] ; do SOURCE="$(readlink "$SOURCE")"; done +dir_bin="$( cd -P "$( dirname "$SOURCE" )" && pwd )" + +# WARNING: NOT TESTED / HERE THERE BE DRAGONS +javaw -Dapplication.deployment=portable -Dapplication.dir="$dir_bin" -Duser.home="$dir_bin" -Djava.io.tmpdir="$dir_bin/temp" -Djna.library.path="$dir_bin" -Djava.util.prefs.PreferencesFactory=net.sourceforge.tuned.prefs.FilePreferencesFactory -Dnet.sourceforge.tuned.prefs.file=prefs.properties -Xmx256m -jar "$dir_app/FileBot.jar" "$@" diff --git a/installer/webstart/filebot.jnlp b/installer/webstart/filebot.jnlp index d49a0c7f..3a04e358 100644 --- a/installer/webstart/filebot.jnlp +++ b/installer/webstart/filebot.jnlp @@ -27,7 +27,8 @@ - + + diff --git a/source/ehcache.xml b/source/ehcache.xml index 181ba126..c8369dec 100644 --- a/source/ehcache.xml +++ b/source/ehcache.xml @@ -39,7 +39,7 @@ Subdirectories can be specified below the property e.g. java.io.tmpdir/one --> - +