From 60b2c3a05a430b8b725beb23a8a1631010713dda Mon Sep 17 00:00:00 2001 From: Denis Feklushkin Date: Sat, 14 Oct 2017 12:47:09 +0700 Subject: [PATCH 1/3] Travis CI: console build added --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 7d5f68f2..de59c98d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,9 +17,11 @@ env: - ARCH=x86_64 CONFIG=default - ARCH=x86_64 CONFIG=minimal - ARCH=x86_64 CONFIG=x11 + - ARCH=x86_64 CONFIG=console - ARCH=x86 CONFIG=default - ARCH=x86 CONFIG=minimal - ARCH=x86 CONFIG=x11 + - ARCH=x86 CONFIG=console # No-one cares about OS X x86 and X11 on OSX matrix: From 1c561ddbd000bcb68c45a3e6823578f744c3f30a Mon Sep 17 00:00:00 2001 From: Denis Feklushkin Date: Sat, 14 Oct 2017 13:17:28 +0700 Subject: [PATCH 2/3] Travis CI: console linking fix --- src/dlangui/platforms/console/consoleapp.d | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/dlangui/platforms/console/consoleapp.d b/src/dlangui/platforms/console/consoleapp.d index 020668c8..f3e3888a 100644 --- a/src/dlangui/platforms/console/consoleapp.d +++ b/src/dlangui/platforms/console/consoleapp.d @@ -505,8 +505,11 @@ extern(C) int DLANGUImain(string[] args) { Log.i("Entering UIAppMain: ", args); int result = -1; try { - result = UIAppMain(args); - Log.i("UIAppMain returned ", result); + version (unittest) { + } else { + result = UIAppMain(args); + Log.i("UIAppMain returned ", result); + } } catch (Exception e) { Log.e("Abnormal UIAppMain termination"); Log.e("UIAppMain exception: ", e); From ba26ecd9808d7ecc95fb9869e4388aecbcf3a163 Mon Sep 17 00:00:00 2001 From: Denis Feklushkin Date: Sat, 14 Oct 2017 18:08:38 +0700 Subject: [PATCH 3/3] Travis CI: console linking fix, right way --- src/dlangui/platforms/console/consoleapp.d | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/dlangui/platforms/console/consoleapp.d b/src/dlangui/platforms/console/consoleapp.d index f3e3888a..335d4d18 100644 --- a/src/dlangui/platforms/console/consoleapp.d +++ b/src/dlangui/platforms/console/consoleapp.d @@ -504,15 +504,16 @@ extern(C) int DLANGUImain(string[] args) { Log.i("Entering UIAppMain: ", args); int result = -1; - try { - version (unittest) { - } else { - result = UIAppMain(args); - Log.i("UIAppMain returned ", result); + version (unittest) { + result = 0; + } else { + try { + result = UIAppMain(args); + Log.i("UIAppMain returned ", result); + } catch (Exception e) { + Log.e("Abnormal UIAppMain termination"); + Log.e("UIAppMain exception: ", e); } - } catch (Exception e) { - Log.e("Abnormal UIAppMain termination"); - Log.e("UIAppMain exception: ", e); } Platform.setInstance(null);