diff --git a/diylc/diylc-core/src/org/diylc/log4j.properties b/diylc/diylc-core/src/org/diylc/log4j.properties deleted file mode 100644 index df80fe66..00000000 --- a/diylc/diylc-core/src/org/diylc/log4j.properties +++ /dev/null @@ -1,9 +0,0 @@ -log4j.rootLogger = DEBUG, fileout, stdout -log4j.appender.fileout = com.diyfever.gui.miscutils.NewLogForEachRunFileAppender -log4j.appender.fileout.layout.ConversionPattern = %d{ABSOLUTE} %5p [%t] %c{1} - %m%n -log4j.appender.fileout.layout = org.apache.log4j.PatternLayout -log4j.appender.fileout.File = log/log.log - -log4j.appender.stdout = org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout.ConversionPattern = %d{ABSOLUTE} %5p [%t] %c{1} - %m%n -log4j.appender.stdout.layout = org.apache.log4j.PatternLayout \ No newline at end of file diff --git a/diylc/diylc-core/src/org/diylc/presenter/Presenter.java b/diylc/diylc-core/src/org/diylc/presenter/Presenter.java index b7a879b9..a8702158 100644 --- a/diylc/diylc-core/src/org/diylc/presenter/Presenter.java +++ b/diylc/diylc-core/src/org/diylc/presenter/Presenter.java @@ -432,7 +432,7 @@ public class Presenter implements IPlugInPort { try { componentTypeClasses = Utils.getClasses("org.diylc.components"); File libraryFile = new File("library"); - if (libraryFile.exists() && libraryFile.isDirectory()) { + if (libraryFile.exists() && libraryFile.isDirectory() && !Utils.isMac()) { LOG.info("Loading additional library JARs"); try { List> additionalComponentTypeClasses = diff --git a/diylc/diylc-core/src/org/diylc/presenter/update.xml b/diylc/diylc-core/src/org/diylc/presenter/update.xml index 4920ee9b..2a5d30d1 100644 --- a/diylc/diylc-core/src/org/diylc/presenter/update.xml +++ b/diylc/diylc-core/src/org/diylc/presenter/update.xml @@ -3385,5 +3385,25 @@ https://github.com/bancika/diy-layout-creator/releases + + + 4 + 14 + 0 + + 2020-12-20 00:00:00.000 CET + + + + BUG_FIX + macOS: splash screen hangs for several minutes on some machines + + + BUG_FIX + macOS: logging does not produce files on Mac OS Sierra + + + https://github.com/bancika/diy-layout-creator/releases + diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar index a464823a..ac171966 100644 Binary files a/diylc/diylc-library/lib/diylc-core.jar and b/diylc/diylc-library/lib/diylc-core.jar differ diff --git a/diylc/diylc-swing/lib/diylc-core.jar b/diylc/diylc-swing/lib/diylc-core.jar index a464823a..ac171966 100644 Binary files a/diylc/diylc-swing/lib/diylc-core.jar and b/diylc/diylc-swing/lib/diylc-core.jar differ diff --git a/diylc/diylc-swing/library/main.jar b/diylc/diylc-swing/library/main.jar index 8e7b3157..6f2e943d 100644 Binary files a/diylc/diylc-swing/library/main.jar and b/diylc/diylc-swing/library/main.jar differ diff --git a/diylc/diylc-swing/src/org/diylc/DIYLCStarter.java b/diylc/diylc-swing/src/org/diylc/DIYLCStarter.java index 44d490fa..6f64725c 100644 --- a/diylc/diylc-swing/src/org/diylc/DIYLCStarter.java +++ b/diylc/diylc-swing/src/org/diylc/DIYLCStarter.java @@ -46,6 +46,8 @@ import com.apple.eawt.AppEvent; import com.apple.eawt.Application; import com.thoughtworks.xstream.XStream; +import ca.cgjennings.jvm.JarLoader; + /** * Main class that runs DIYLC. * @@ -103,6 +105,8 @@ public class DIYLCStarter { // disable HIGHLIGHT_CONTINUITY_AREA config, keep it transient ConfigurationManager.getInstance().writeValue(IPlugInPort.HIGHLIGHT_CONTINUITY_AREA, false); + + LOG.info("JarLoader strategy: " + JarLoader.getStrategy()); LOG.info("Loading languages..."); @@ -143,7 +147,11 @@ public class DIYLCStarter { @Override public void run() { - FontOptimizer.run(ConfigurationManager.getInstance()); + try { + FontOptimizer.run(ConfigurationManager.getInstance()); + } catch (Exception e) { + LOG.error("Could not ", e); + } } }); fontThread.setPriority(Thread.MIN_PRIORITY);