Merge pull request #113 in G/fastr from...

Merge pull request #113 in G/fastr from ~LUKAS.STADLER_ORACLE.COM/fastr:feature/store_logs to master

* commit '2a4ed929':
  store logs via ci.hocon instead of outputting to the console

ci.hocon

@@ -13,6 +13,13 @@ common : {
   }
   environment : {
   }
+  logs : [
+    "com.oracle.truffle.r.native/gnur/R-*/gnur_configure.log"
+    "com.oracle.truffle.r.native/gnur/R-*/gnur_make.log"
+    "com.oracle.truffle.r.native/gnur/R-*/Makeconf"
+    "com.oracle.truffle.r.native/gnur/libiconv-*/iconv_configure.log"
+    "com.oracle.truffle.r.native/gnur/libiconv-*/iconv_make.log"
+  ]
   timelimit : "1:00:00"
 }
 

com.oracle.truffle.r.native/gnur/Makefile.gnur

@@ -89,12 +89,12 @@ $(ICONV):
 iconv_config: $(ICONV)/Makefile
 
 $(ICONV)/Makefile:
-	(cd $(ICONV); ./configure --prefix $(ICONV_INSTALL) $(ICONV_CONFIG_FLAGS) > iconv_configure.log 2>&1 || cat iconv_configure.log)
+	(cd $(ICONV); ./configure --prefix $(ICONV_INSTALL) $(ICONV_CONFIG_FLAGS) > iconv_configure.log 2>&1)
 
 iconv_build: $(ICONV)/lib/libcharset.so
 
 $(ICONV)/lib/libcharset.so:
-	(cd $(ICONV); $(MAKE) MAKE=$(MAKE) && $(MAKE) MAKE=$(MAKE) install > iconv_make.log 2>&1 || cat iconv_make.log)
+	(cd $(ICONV); $(MAKE) MAKE=$(MAKE) && $(MAKE) MAKE=$(MAKE) install > iconv_make.log 2>&1)
 else
     GNUR_CONFIG_FLAGS := CFLAGS=-DLIBICONV_PLUG CPPFLAGS=-DLIBICONV_PLUG CXXFLAGS=-DLIBICONV_PLUG
 iconv:
@@ -116,12 +116,12 @@ endif
 
 $(GNUR_HOME)/Makefile:
 	ed $(GNUR_HOME)/src/extra/xz/Makefile.in < patchXzMakefile
-	(cd $(GNUR_HOME); ./configure --with-x=no --without-recommended-packages $(GNUR_CONFIG_FLAGS) > gnur_configure.log 2>&1 || cat gnur_configure.log)
+	(cd $(GNUR_HOME); ./configure --with-x=no --without-recommended-packages $(GNUR_CONFIG_FLAGS) > gnur_configure.log 2>&1)
 
 build: $(GNUR_HOME)/bin/R
 
 $(GNUR_HOME)/bin/R: $(GNUR_HOME)/Makeconf 
-	(cd $(GNUR_HOME); $(MAKE) MAKE=$(MAKE) -j > gnur_make.log 2>&1 || cat gnur_make.log)
+	(cd $(GNUR_HOME); $(MAKE) MAKE=$(MAKE) -j > gnur_make.log 2>&1)
 
 clean: cleangnur cleaniconv
 	rm -f Makeconf.done