[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master b0ed5cc 07/30: Create required files in the b
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master b0ed5cc 07/30: Create required files in the build directory with autotools |
Date: |
Wed, 24 Mar 2021 15:31:07 -0400 (EDT) |
branch: master
commit b0ed5cc81ef3884afeacdef941586cb43bf455b7
Author: Vadim Zeitlin <vadim@tt-solutions.com>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>
Create required files in the build directory with autotools
The existing tests rely on existence of these files in the current
directory and they can't (easily) be run from the source directory with
automake, so create the required files in the build directory instead.
A better solution might be to make the directory with these files
configurable, e.g. via an environment variable, but for now this is
enough to allow "make check" to work.
---
configure.ac | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/configure.ac b/configure.ac
index 025469d..566dc14 100644
--- a/configure.ac
+++ b/configure.ac
@@ -592,5 +592,21 @@ if test "x$GXX" == "xyes"; then
fi
dnl === Generate output files ===
+
+dnl These files are used by various tests and must be present in the build
+dnl directory. The configurable settings file contains just the bare minimum
+dnl required, but what little is there, is really needed for the tests to pass.
+AC_CONFIG_COMMANDS([configurable_settings.xml], [
+cat >configurable_settings.xml <<EOF
+<?xml version="1.0"?>
+<configurable_settings version="2">
+ <print_directory>.</print_directory>
+ <spreadsheet_file_extension>.tsv</spreadsheet_file_extension>
+</configurable_settings>
+EOF
+])
+AC_CONFIG_COMMANDS([sample.policy], [touch sample.policy])
+AC_CONFIG_LINKS([sample.cns:sample.cns sample.ill:sample.ill])
+
AC_CONFIG_FILES([Makefile])
AC_OUTPUT
- [lmi-commits] [lmi] master c5d4a99 17/30: Show config.log if configure step in the CI build fails, (continued)
- [lmi-commits] [lmi] master c5d4a99 17/30: Show config.log if configure step in the CI build fails, Greg Chicares, 2021/03/24
- [lmi-commits] [lmi] master d5728f4 19/30: Show the test suite log if running tests failed in the CI build, Greg Chicares, 2021/03/24
- [lmi-commits] [lmi] master 48c0613 20/30: Fix Boost detection and use in configure with clang in C++17 mode, Greg Chicares, 2021/03/24
- [lmi-commits] [lmi] master 41bd0a3 22/30: Update wx submodule to avoid clang warning in wx/hashmap.h, Greg Chicares, 2021/03/24
- [lmi-commits] [lmi] master 1f94454 25/30: Disable clang -Wstring-plus-int warning, Greg Chicares, 2021/03/24
- [lmi-commits] [lmi] master 12922c2 27/30: Generate product files in the CI builds using autotools too, Greg Chicares, 2021/03/24
- [lmi-commits] [lmi] master 80e1b14 23/30: Fix caching of wxWidgets and wxPdfDoc libraries, Greg Chicares, 2021/03/24
- [lmi-commits] [lmi] master f4a91e3 28/30: Move XSD and XSL copy command to a more appropriate CI job step, Greg Chicares, 2021/03/24
- [lmi-commits] [lmi] master 593a712 29/30: Actually update wx, Greg Chicares, 2021/03/24
- [lmi-commits] [lmi] master 0b85c14 30/30: Improve documentation, Greg Chicares, 2021/03/24
- [lmi-commits] [lmi] master b0ed5cc 07/30: Create required files in the build directory with autotools,
Greg Chicares <=
- [lmi-commits] [lmi] master f5b317c 08/30: Don't skip path_utility_test unnecessarily in the CI builds, Greg Chicares, 2021/03/24
- [lmi-commits] [lmi] master ecd3435 11/30: Default to x86_64-pc-linux-gnu LMI_TRIPLET in the CI builds, Greg Chicares, 2021/03/24
- [lmi-commits] [lmi] master 396441f 13/30: Use gcc_version value from the environment, if any, in scripts, Greg Chicares, 2021/03/24
- [lmi-commits] [lmi] master 91116f9 14/30: Suppress -Wdeprecated-copy in Boost headers for gcc9 too, Greg Chicares, 2021/03/24
- [lmi-commits] [lmi] master dd0b2a63 16/30: Work around problem with executable files under .git in CI builds, Greg Chicares, 2021/03/24
- [lmi-commits] [lmi] master 1c6ac28 04/30: Simplify test targets definitions in Automake makefile, Greg Chicares, 2021/03/24
- [lmi-commits] [lmi] master e859cc7 09/30: Test build using autotools in GitHub Actions CI workflow too, Greg Chicares, 2021/03/24
- [lmi-commits] [lmi] master fc0987e 18/30: Disable clang-specific warning when compiling Boost libraries, Greg Chicares, 2021/03/24
- [lmi-commits] [lmi] master 815b26b 21/30: Show config.log if running configure for XML libraries failed, Greg Chicares, 2021/03/24
- [lmi-commits] [lmi] master 2663129 24/30: Ignore more warnings in Boost.Regex headers with clang, Greg Chicares, 2021/03/24