Update subtree mirror of repository 'git@github.com:nestlabs/nlbuild-autotools.git' branch 'feature/git-submodule-repos' at tag '1.5.0'.
diff --git a/third_party/nlbuild-autotools/repo/CHANGES b/third_party/nlbuild-autotools/repo/CHANGES
index ee0e5b6..df91a38 100644
--- a/third_party/nlbuild-autotools/repo/CHANGES
+++ b/third_party/nlbuild-autotools/repo/CHANGES
@@ -1,4 +1,4 @@
-1.5.0 (2018-04-12)
+1.5.0 (2018-04-19)
* Added support for pulling down remote package dependencies
using git submodule.
diff --git a/third_party/nlbuild-autotools/repo/examples/Makefile-third_party.am b/third_party/nlbuild-autotools/repo/examples/Makefile-third_party.am
index 519e614..7bd0be5 100644
--- a/third_party/nlbuild-autotools/repo/examples/Makefile-third_party.am
+++ b/third_party/nlbuild-autotools/repo/examples/Makefile-third_party.am
@@ -27,9 +27,26 @@
DIST_SUBDIRS = \
$(NULL)
-# Always build (e.g. for 'make all') these subdirectories.
+# Here is an example with nlunit-test. Uncomment and adapt or delete
+# this, as needed. If you choose to use this, please also take a look at
+# configure.ac and Makefile.am and uncomment the appropriate sections
+# there.
-SUBDIRS = \
+# # NLUNIT_TEST_SUBDIRS is not a permanent part of DIST_SUBDIRS since we do not
+# # ever want to include it in a distribution archive; however, when it's been
+# # pulled as a 'repo' module, we do want to remove it on invocation of the
+# # 'distclean' target. Consequently, we conditionally include it in DIST_SUBDIRS
+# # on invocation of 'distclean-recursive'
+#
+# distclean-recursive: DIST_SUBDIRS += $(NLUNIT_TEST_SUBDIRS)
+
+# Always build (e.g. for 'make all') these subdirectories.
+# #
+# # The value of NLUNIT_TEST_SUBDIRS will be populated by configure if
+# # --with-nlunit_test=internal
+
+SUBDIRS = \
+ $(NLUNIT_TEST_SUBDIRS) \
$(NULL)
include $(abs_top_nlbuild_autotools_dir)/automake/post.am
diff --git a/third_party/nlbuild-autotools/repo/examples/Makefile-toplevel.am b/third_party/nlbuild-autotools/repo/examples/Makefile-toplevel.am
index c6249de..54578d3 100644
--- a/third_party/nlbuild-autotools/repo/examples/Makefile-toplevel.am
+++ b/third_party/nlbuild-autotools/repo/examples/Makefile-toplevel.am
@@ -1,5 +1,5 @@
#
-# Copyright 2016 Nest Labs Inc. All Rights Reserved.
+# Copyright 2016-2018 Nest Labs Inc. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -137,10 +137,35 @@
$(distdir)/.dist-version $(builddir)/.local-version:
$(call check-file,$(@F))
+# If you are synchronizing a package on which yours depends using 'repos.conf',
+# to 'third_party', uncomment and adapt or delete this, as needed. If you choose
+# to use this, please also take a look at Makefile.am and third_party/Makefile.am
+# and uncomment the appropriate sections there.
+
+# #
+# # When we run 'distcheck' and --with-nlunit_test defaults to 'internal',
+# # the nlbuild-autotools infrastructure will attempt to create git paths
+# # to manage the nlunit-test repo. Two directories need to be writable
+# # to facilitate this.
+# #
+# DISTCHECK_CONFIGURE_FLAGS=`chmod u+w .. ../third_party`
+
dist distcheck: $(BUILT_SOURCES)
dist-hook: $(distdir)/.dist-version
+# If you are synchronizing a package on which yours depends using 'repos.conf',
+# to 'third_party', uncomment and adapt or delete this, as needed. If you choose
+# to use this, please also take a look at Makefile.am and third_party/Makefile.am
+# and uncomment the appropriate sections there.
+
+# #
+# # Ensure any locally synchronized repositories defined by 'repos.conf'
+# # are cleaned up.
+# #
+# distclean-local:
+# $(MAKE) -C $(srcdir) -f Makefile-bootstrap clean-repos
+
#
# Top-level convenience target for making a documentation-only
# distribution whose results appear at the top level of the build tree
diff --git a/third_party/nlbuild-autotools/repo/examples/configure.ac b/third_party/nlbuild-autotools/repo/examples/configure.ac
index 588a331..cec220c 100644
--- a/third_party/nlbuild-autotools/repo/examples/configure.ac
+++ b/third_party/nlbuild-autotools/repo/examples/configure.ac
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
#
-# Copyright 2016-2017 Nest Labs Inc. All Rights Reserved.
+# Copyright 2016-2018 Nest Labs Inc. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@
#
# Initialize autoconf for the package
#
-AC_INIT([@PACKAGE_SHORT_UPPER@],
+AC_INIT([@PACKAGE_SHORT_LOWER@],
m4_esyscmd([@NLBUILD_AUTOTOOLS_STEM@/scripts/mkversion -b `cat .default-version` .]),
[@PACKAGE_EMAIL@],
[@PACKAGE_SHORT_LOWER@],
@@ -268,12 +268,69 @@
#
AC_MSG_NOTICE([checking required package dependencies])
-# NL_WITH_PACKAGE(...)
-
# Check if the build host has pkg-config
AC_PATH_PROG([PKG_CONFIG],[pkg-config])
+# Here is a package example with nlunit-test. Uncomment and adapt or delete
+# this, as needed. If you choose to use this, please also take a look at
+# Makefile.am and third_party/Makefile.am and uncomment the appropriate
+# sections there.
+
+# #
+# # Nlunit-test
+# #
+#
+# if test "${nl_cv_build_tests}" = "yes"; then
+# NL_WITH_PACKAGE(
+# [Nlunit-test],
+# [NLUNIT_TEST],
+# [nlunit_test],
+# [-lnlunit-test],
+# [
+# # At this point, the internal Nlunit-test package will be neither
+# # configured nor built, so the normal checks we undertake for an
+# # external package cannot be run here. Simply set the appropriate
+# # variables and trust all will be well.
+#
+# NLUNIT_TEST_CPPFLAGS="-I\${abs_top_srcdir}/third_party/nlunit-test/repo/src"
+# NLUNIT_TEST_LDFLAGS="-L${ac_pwd}/third_party/nlunit-test/repo/src"
+# NLUNIT_TEST_LIBS="-lnlunit-test"
+# ],
+# [
+# # Check for required nlunit-test headers.
+#
+# AC_CHECK_HEADERS([nlunit-test.h],
+# [],
+# [
+# AC_MSG_ERROR(The nlunit-test header "$ac_header" is required but cannot be found.)
+# ])
+# ])
+# fi
+#
+# # Depending on whether nlunit-test has been configured for an internal
+# # location, its directory stem within this package needs to be set
+# # accordingly. In addition, if the location is internal, then we need
+# # to attempt to pull it down using the bootstrap makefile.
+#
+# if test "${nl_with_nlunit_test}" = "internal"; then
+# maybe_nlunit_test_dirstem="nlunit-test/repo"
+# nlunit_test_dirstem="third_party/${maybe_nlunit_test_dirstem}"
+#
+# AC_MSG_NOTICE([attempting to create internal ${nlunit_test_dirstem}])
+#
+# ${MAKE-make} --no-print-directory -C ${srcdir} -f Makefile-bootstrap ${nlunit_test_dirstem}
+#
+# if test $? -ne 0; then
+# AC_MSG_ERROR([failed to create ${nlunit_test_dirstem}. Please check your network connection or the correctness of 'repos.conf'])
+# fi
+# else
+# maybe_nlunit_test_dirstem=""
+# fi
+#
+# AC_SUBST(NLUNIT_TEST_SUBDIRS, [${maybe_nlunit_test_dirstem}])
+# AM_CONDITIONAL([@PACKAGE_SHORT_UPPER@_WITH_NLUNIT_TEST_INTERNAL], [test "${nl_with_nlunit_test}" = "internal"])
+
#
# Check for headers
#
@@ -303,6 +360,15 @@
AC_CHECK_FUNCS([memcpy])
fi
+# Here is an example with nlunit-test. Uncomment and adapt or delete
+# this, as needed.
+
+# # Add any nlunit-test CPPFLAGS, LDFLAGS, and LIBS
+#
+# CPPFLAGS="${CPPFLAGS} ${NLUNIT_TEST_CPPFLAGS}"
+# LDFLAGS="${LDFLAGS} ${NLUNIT_TEST_LDFLAGS}"
+# LIBS="${LIBS} ${NLUNIT_TEST_LIBS}"
+
# Add any code coverage CPPFLAGS and LIBS
CPPFLAGS="${CPPFLAGS} ${NL_COVERAGE_CPPFLAGS}"
@@ -314,6 +380,15 @@
NL_RESTORE_WERROR
+# Here is an example with nlunit-test. Uncomment and adapt or delete
+# this, as needed.
+
+# # Configure any autotools-based subdirectories
+#
+# if test "${nl_with_nlunit_test}" = "internal"; then
+# AC_CONFIG_SUBDIRS([third_party/nlunit-test/repo])
+# fi
+
#
# Identify the various makefiles and auto-generated files for the package
#
@@ -362,6 +437,10 @@
Doxygen : ${DOXYGEN:--}
GraphViz dot : ${DOT:--}
PERL : ${PERL:--}
+ Nlunit-test source : ${nl_with_nlunit_test:--}
+ Nlunit-test compile flags : ${NLUNIT_TEST_CPPFLAGS:--}
+ Nlunit-test link flags : ${NLUNIT_TEST_LDFLAGS:--}
+ Nlunit-test link libraries : ${NLUNIT_TEST_LIBS:--}
C Preprocessor : ${CPP}
C Compiler : ${CC}
C++ Preprocessor : ${CXXCPP}
@@ -377,6 +456,3 @@
Link libraries : ${LIBS}
])
-
-
-
diff --git a/third_party/nlbuild-autotools/repo/examples/repos.conf b/third_party/nlbuild-autotools/repo/examples/repos.conf
new file mode 100644
index 0000000..5e2b14d
--- /dev/null
+++ b/third_party/nlbuild-autotools/repo/examples/repos.conf
@@ -0,0 +1,17 @@
+# You can synchronize a remote package on which yours depends with git
+# to 'third_party' (or another direcotry).
+#
+# Here is an example using nlunit-test. Uncomment and adapter or
+# delete this, as needed. If you do not have any packages to
+# sychronize, then this file is unneeded and may be deleted from your
+# project.
+#
+# If you choose to use this, please also take a look at configure.ac,
+# Makefile.am, and third_party/Makefile.am and uncomment the appropriate
+# sections there.
+
+# [submodule "nlunit-test"]
+# path = third_party/nlunit-test/repo
+# url = https://github.com/nestlabs/nlunit-test.git
+# branch = master
+# update = none
diff --git a/third_party/nlbuild-autotools/repo/scripts/mkskeleton b/third_party/nlbuild-autotools/repo/scripts/mkskeleton
index d41b41f..2a1233e 100755
--- a/third_party/nlbuild-autotools/repo/scripts/mkskeleton
+++ b/third_party/nlbuild-autotools/repo/scripts/mkskeleton
@@ -222,6 +222,7 @@
populate "${DIR}" 664 configure.ac .
populate "${DIR}" 775 bootstrap .
+populate "${DIR}" 664 repos.conf .
populate "${DIR}" 664 Makefile.am .
populate "${DIR}" 664 Makefile-bootstrap .
populate "${DIR}" 664 Makefile.am doc
