]> Savannah Git Hosting - gnulib.git/commitdiff
gnulib-tool.py: Implement option --single-configure.
authorBruno Haible <bruno@clisp.org>
Wed, 3 Aug 2022 20:42:25 +0000 (22:42 +0200)
committerBruno Haible <bruno@clisp.org>
Wed, 3 Aug 2022 23:52:00 +0000 (01:52 +0200)
* gnulib-tool.py (main): Accept option --single-configure. Pass its
value to the GLConfig constructor.
* pygnulib/GLTestDir.py (GLTestDir.execute): Remove debugging output.

ChangeLog
gnulib-tool.py
gnulib-tool.py.TODO
pygnulib/GLTestDir.py

index 6723ba9c081fef551a15458eb45b071201eccbc5..58cb2b610a1c993d35cdc11ee55e7f8d883d5896 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2022-08-03  Bruno Haible  <bruno@clisp.org>
 
+       gnulib-tool.py: Implement option --single-configure.
+       * gnulib-tool.py (main): Accept option --single-configure. Pass its
+       value to the GLConfig constructor.
+       * pygnulib/GLTestDir.py (GLTestDir.execute): Remove debugging output.
+
        gnulib-tool.py: Implement options --without-c++-tests etc.
        * gnulib-tool.py (main): Accept options --without-c++-tests,
        --without-longrunning-tests, --without-privileged-tests,
index bf7b98a61e57e860cd64700eedb5792e78d638c6..55e94fb25a9dd7be2f28b964187d818071fb79c0 100755 (executable)
@@ -359,6 +359,11 @@ def main():
                         dest="makefile",
                         default=None,
                         type=str)
+    # single-configure
+    parser.add_argument('--single-configure',
+                        dest='single_configure',
+                        default=None,
+                        action='store_true')
     # symlink
     parser.add_argument('-s', '--symbolic', '--symlink',
                         dest='symlink',
@@ -516,7 +521,8 @@ def main():
 
     if ((mode in ['import', 'add-import', 'remove-import']
          and (cmdargs.excl_cxx_tests or cmdargs.excl_longrunning_tests
-              or cmdargs.excl_privileged_tests or cmdargs.excl_unportable_tests))
+              or cmdargs.excl_privileged_tests or cmdargs.excl_unportable_tests
+              or cmdargs.single_configure))
         or (mode == 'update'
             and (cmdargs.localpath != None or cmdargs.libname != None
                  or cmdargs.sourcebase != None or cmdargs.m4base != None
@@ -615,6 +621,7 @@ def main():
                    for module in list1 ]
     symlink = cmdargs.symlink == True
     lsymlink = cmdargs.lsymlink == True
+    single_configure = cmdargs.single_configure
 
     # Create pygnulib configuration.
     config = classes.GLConfig(
@@ -642,6 +649,7 @@ def main():
         symbolic=symlink,
         lsymbolic=lsymlink,
         modcache=modcache,
+        single_configure=single_configure,
         verbose=verbose,
         dryrun=dryrun,
     )
index e4dcabef51c42385f7f8a8ff548263de0f766516..8814a215a44f3568a12085071c43d9dfecc82f6e 100644 (file)
@@ -24,7 +24,6 @@ Implement the options:
   --extract-recursive-dependencies
   --extract-recursive-link-directive
   --extract-tests-module
-  --single-configure
   --conditional-dependencies
   --no-conditional-dependencies
   --gnu-make
index cb75ba1eab779bec8ec30160d8890b07d16fb549..384b5f3aeb4f955400eaec5fef33667d2f417593 100644 (file)
@@ -398,7 +398,6 @@ class GLTestDir(object):
             if single_configure:
                 # Create $testsbase/Makefile.am.
                 destfile = joinpath(directory, 'Makefile.am')
-                print(repr(destfile))
                 witness_macro = '%stests_WITNESS' % macro_prefix
                 emit, uses_subdirs = self.emiter.tests_Makefile_am(destfile,
                                                                    tests_modules, self.makefiletable, witness_macro, for_test)