diff --git a/build.xml b/build.xml index 6fe401f2..b5edd4eb 100644 --- a/build.xml +++ b/build.xml @@ -574,7 +574,7 @@ - + @@ -631,7 +631,7 @@ - + diff --git a/installer/appx/filebot.l4j.ini b/installer/appx/filebot.l4j.ini index faafe7f4..ae529a28 100644 --- a/installer/appx/filebot.l4j.ini +++ b/installer/appx/filebot.l4j.ini @@ -3,25 +3,28 @@ -Dapplication.dir="%APPDATA%\FileBot" # put all temporary files here --Djava.io.tmpdir="%APPDATA%\FileBot\temp" +-Djava.io.tmpdir="%APPDATA%\FileBot\tmp" # network settings -Djava.net.useSystemProxies=true -# use native shell for move/copy operations +# use Java API move/copy operations -DuseNativeShell=false # use NTFS extended attributes for storing metadata -DuseExtendedFileAttributes=true -DuseCreationDate=false -# look for native libs here +# look for executables in the application folder +-Dnet.filebot.AcoustID.fpcalc="%EXEDIR%\fpcalc.exe" + +# look for native libraries in the application folder -Djna.library.path="%EXEDIR%" -Djna.boot.library.path="%EXEDIR%" -Djava.library.path="%EXEDIR%" -# look for fpcalc here --Dnet.filebot.AcoustID.fpcalc="%EXEDIR%\fpcalc.exe" +# reduce default logging +-Djava.util.logging.config.file="%EXEDIR%\logging.properties" # force Application User Model ID for Windows Store -Dnet.filebot.AppUserModelID=PointPlanck.FileBot diff --git a/installer/appx/filebot.launcher.l4j.ini b/installer/appx/filebot.launcher.l4j.ini index 0fe66956..1da55ed1 100644 --- a/installer/appx/filebot.launcher.l4j.ini +++ b/installer/appx/filebot.launcher.l4j.ini @@ -3,25 +3,28 @@ -Dapplication.dir="%APPDATA%\FileBot" # put all temporary files here --Djava.io.tmpdir="%APPDATA%\FileBot\temp" +-Djava.io.tmpdir="%APPDATA%\FileBot\tmp" # network settings -Djava.net.useSystemProxies=true -# use native shell for move/copy operations +# use Windows Shell for move/copy operations -DuseNativeShell=true # use NTFS extended attributes for storing metadata -DuseExtendedFileAttributes=true -DuseCreationDate=false -# look for native libs here +# look for executables in the application folder +-Dnet.filebot.AcoustID.fpcalc="%EXEDIR%\fpcalc.exe" + +# look for native libraries in the application folder -Djna.library.path="%EXEDIR%" -Djna.boot.library.path="%EXEDIR%" -Djava.library.path="%EXEDIR%" -# look for fpcalc here --Dnet.filebot.AcoustID.fpcalc="%EXEDIR%\fpcalc.exe" +# reduce default logging +-Djava.util.logging.config.file="%EXEDIR%\logging.properties" # force Application User Model ID for Windows Store -Dnet.filebot.AppUserModelID=PointPlanck.FileBot diff --git a/installer/appx/logging.properties b/installer/appx/logging.properties new file mode 100644 index 00000000..f9199f53 --- /dev/null +++ b/installer/appx/logging.properties @@ -0,0 +1,12 @@ +# Default global handler +handlers= java.util.logging.ConsoleHandler + +# Default global logging level +.level= WARNING + +# Limit messages that printed on the console to WARNING and above +java.util.logging.ConsoleHandler.level = WARNING +java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter + +# Suppress WindowsPreferences logging +java.util.prefs.WindowsPreferences = SEVERE diff --git a/installer/msi/filebot.l4j.ini b/installer/msi/filebot.l4j.ini index d5dde233..8a51ad18 100644 --- a/installer/msi/filebot.l4j.ini +++ b/installer/msi/filebot.l4j.ini @@ -3,19 +3,25 @@ -Dapplication.dir="%APPDATA%\FileBot" # put all temporary files here --Djava.io.tmpdir="%APPDATA%\FileBot\temp" +-Djava.io.tmpdir="%APPDATA%\FileBot\tmp" # network settings -Djava.net.useSystemProxies=true +# use Java API move/copy operations +-DuseNativeShell=false + # use NTFS extended attributes for storing metadata -DuseExtendedFileAttributes=true -DuseCreationDate=false -# look for native libs here +# look for executables in the application folder +-Dnet.filebot.AcoustID.fpcalc="%EXEDIR%\fpcalc.exe" + +# look for native libraries in the application folder -Djna.library.path="%EXEDIR%" -Djna.boot.library.path="%EXEDIR%" -Djava.library.path="%EXEDIR%" -# look for fpcalc here --Dnet.filebot.AcoustID.fpcalc="%EXEDIR%\fpcalc.exe" +# reduce default logging +-Djava.util.logging.config.file="%EXEDIR%\logging.properties" diff --git a/installer/msi/filebot.launcher.l4j.ini b/installer/msi/filebot.launcher.l4j.ini index 7d79c3d0..97cfb41a 100644 --- a/installer/msi/filebot.launcher.l4j.ini +++ b/installer/msi/filebot.launcher.l4j.ini @@ -3,22 +3,25 @@ -Dapplication.dir="%APPDATA%\FileBot" # put all temporary files here --Djava.io.tmpdir="%APPDATA%\FileBot\temp" +-Djava.io.tmpdir="%APPDATA%\FileBot\tmp" # network settings -Djava.net.useSystemProxies=true -# use native shell for move/copy operations +# use Windows Shell for move/copy operations -DuseNativeShell=true # use NTFS extended attributes for storing metadata -DuseExtendedFileAttributes=true -DuseCreationDate=false -# look for native libs here +# look for executables in the application folder +-Dnet.filebot.AcoustID.fpcalc="%EXEDIR%\fpcalc.exe" + +# look for native libraries in the application folder -Djna.library.path="%EXEDIR%" -Djna.boot.library.path="%EXEDIR%" -Djava.library.path="%EXEDIR%" -# look for fpcalc here --Dnet.filebot.AcoustID.fpcalc="%EXEDIR%\fpcalc.exe" +# reduce default logging +-Djava.util.logging.config.file="%EXEDIR%\logging.properties" diff --git a/installer/msi/filebot.wix b/installer/msi/filebot.wix index b1a6cf4f..83bf551d 100644 --- a/installer/msi/filebot.wix +++ b/installer/msi/filebot.wix @@ -58,6 +58,7 @@ + diff --git a/installer/msi/logging.properties b/installer/msi/logging.properties new file mode 100644 index 00000000..f9199f53 --- /dev/null +++ b/installer/msi/logging.properties @@ -0,0 +1,12 @@ +# Default global handler +handlers= java.util.logging.ConsoleHandler + +# Default global logging level +.level= WARNING + +# Limit messages that printed on the console to WARNING and above +java.util.logging.ConsoleHandler.level = WARNING +java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter + +# Suppress WindowsPreferences logging +java.util.prefs.WindowsPreferences = SEVERE