Merge branch 'master' of github.com:acplt/open62541

.travis.yml

@@ -1,4 +1,23 @@
 language: c
+compiler:
+  - gcc
+
+env:
+  global:
+   # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
+   #   via the "travis encrypt" command using the project repo's public key
+   - secure: "daDBy/1RrqpWonB1RnRlrKSFUsiG4dOPWwBz/2bnhtiULD0Ghf9yvMpN0Ji2ofXyiPQvmf6LO6pCkKtWjvMgUKNzMl7svooXi5xxwSNcpXphoSzI88wpB9ANjzOC4ZrLzQHteodeVsiYr2j7TGaVenRpZRH5SuZjSzSqLnFR6Og="
+
+addons:
+  coverity_scan:
+    project:
+      name: "acplt/open62541"
+      description: "Open-source OPC UA"
+    notification_email: 
+    build_command_prepend: "./autogen.sh && ./configure"
+    build_command: "make"
+    branch_pattern: master
+
 before_install:
  - sudo apt-get update -qq
  - sudo apt-get install -qq build-essential subversion git autoconf libtool texinfo python-lxml valgrind

Makefile.am

@@ -7,12 +7,13 @@ endif
 
 export GLOBAL_AM_CFLAGS = $(AM_CFLAGS)
 
+SUBS=tool include src
 if HAVE_CHECK
-    SUBS=tool include src tests
-
-else 
-    SUBS=tool include src
+	SUBS+= tests
 endif
 
+if USE_DOXYGEN
+	SUBS+= doc
+endif
 SUBDIRS = $(SUBS) examples/src	
 

README.md

@@ -4,6 +4,7 @@ Open62541
 An open-source communication stack implementation of OPC UA (OPC Unified Architecture) licensed under LGPL + static linking exception.
 
 [![Build Status](https://travis-ci.org/acplt/open62541.png?branch=master)](https://travis-ci.org/acplt/open62541)
+[![Coverity Scan Build Status](https://scan.coverity.com/projects/1864/badge.svg)](https://scan.coverity.com/projects/1864)
 
 ## Getting dependencies
 ### Ubuntu

configure.ac

@@ -1,8 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(OPCUAServer, 1.0)
-
+AC_INIT(Open62541, 1.0)
 
 AC_CANONICAL_SYSTEM
 AM_INIT_AUTOMAKE()
@@ -43,19 +42,63 @@ AM_COND_IF([DEBUG],
 
 AC_ARG_ENABLE(multithreading,
 AS_HELP_STRING([--enable-multithreading],
-               [enable debugging, default: yes]),
+               [enable multithreading, default: yes]),
 			   [case "${enableval}" in
                		 yes) multithreading=true ;;
              		 no)  multithreading=false ;;
              		 *)   AC_MSG_ERROR([bad value ${enableval} for --enable-multithreading]) ;; esac],
-[multithreading=true])
+[multithreading=false])
 AM_CONDITIONAL(MULTITHREADING, test x"$multithreading" = x"true")
 AM_COND_IF([MULTITHREADING],
     AC_DEFINE([MULTITHREADING])) #define MULTITHREADING is accessible from pre-processor
+
+AC_ARG_ENABLE(doxygen,
+	AS_HELP_STRING([--enable-doxygen],
+               [enable doxygen, default: no]),
+			   [case "${enableval}" in
+               		 yes) enabledoxygen=true ;;
+             		 no)  enabledoxygen=false ;;
+             		 *)   AC_MSG_ERROR([bad value ${enableval} for --enable-doxygen]) ;; esac],
+[enabledoxygen=false])
+
+AM_CONDITIONAL(ENABLE_DOXYGEN, test x"$enabledoxygen" = x"true")
+AC_CHECK_PROGS([DOXYGEN], [doxygen])
+AM_CONDITIONAL([HAVE_DOXYGEN],[test -n "$DOXYGEN"])
+
+AM_COND_IF([ENABLE_DOXYGEN],[AM_COND_IF([HAVE_DOXYGEN],[usedoxygen=true],[usedoxygen=false])],[usedoxygen=false])
+
+#if ENABLE_DOXYGEN;then
+   # if HAVE_DOXYGEN;then
+   #     usedoxygen = true
+   # else
+  #      usedoxygen = false
+ #  fi
+#else
+ #  usedoxygen = false
+#fi
+AM_CONDITIONAL([USE_DOXYGEN], test x"$usedoxygen" = x"true")
+
+AM_COND_IF([USE_DOXYGEN], [AC_CONFIG_FILES([doc/Doxyfile])])
+
+
+
+
+
+    
+if test -z "$DOXYGEN";then 
+    AC_MSG_WARN([Doxygen not found - continuing without Doxygen support])
+fi
+
+
+
+
+
+
+
    
 AC_LIBTOOL_WIN32_DLL
 AC_PROG_LIBTOOL
 AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_FILES(Makefile include/Makefile src/Makefile tool/Makefile tests/Makefile examples/src/Makefile)
+AC_CONFIG_FILES(Makefile include/Makefile src/Makefile tool/Makefile tests/Makefile examples/src/Makefile doc/Makefile)
 AC_OUTPUT
 

doc/Makefile.am

@@ -0,0 +1,18 @@
+if USE_DOXYGEN
+directory = $(top_srcdir)/doc/man/man3/
+
+dist_man_MANS = $(directory)/man_page_1.3 $(directory)/man_page_2.3
+$(directory)/man_page_1.3: doxyfile.stamp
+$(directory)/man_page_2.3: doxyfile.stamp
+
+doxyfile.stamp:
+	$(DOXYGEN) Doxyfile
+	echo Timestamp > doxyfile.stamp
+
+CLEANFILES = doxyfile.stamp
+
+all-local: doxyfile.stamp
+clean-local:
+	rm -rf $(top_srcdir)/docs/man
+
+endif