gnulib-tool.py: Don't discard the 'dummy' module.

* pygnulib/GLImport.py (GLImport.prepare): Don't set modules stored in
the GLModuleTable until after the 'dummy' module is added.
* pygnulib/GLModuleSystem.py (GLImport.setBaseModules)
(GLImport.setFinalModules, GLImport.setMainModules)
(GLImport.setTestsModules): Don't sort modules since the 'dummy' module
should be placed last in the Makefiles.

diff --git a/ChangeLog b/ChangeLog
index ba0a246e544c640ea3184ac26e5ad89b08929755..cf25ecf79e37cddcf87c9dccfbbcefbbe03c00a4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2024-03-30  Collin Funk  <collin.funk1@gmail.com>
+
+       gnulib-tool.py: Don't discard the 'dummy' module.
+       * pygnulib/GLImport.py (GLImport.prepare): Don't set modules stored in
+       the GLModuleTable until after the 'dummy' module is added.
+       * pygnulib/GLModuleSystem.py (GLImport.setBaseModules)
+       (GLImport.setFinalModules, GLImport.setMainModules)
+       (GLImport.setTestsModules): Don't sort modules since the 'dummy' module
+       should be placed last in the Makefiles.
+
 2024-03-30  Collin Funk  <collin.funk1@gmail.com>
 
        gnulib-tool.py: Fix reading of 'gl_VC_FILES' in gnulib-cache.m4.

diff --git a/pygnulib/GLImport.py b/pygnulib/GLImport.py
index 81298eeca1854a7d55ac408fed6b27ea0b854666..c3a7597d0298a7c8187a54222119c9ecf8ca4891 100644 (file)
--- a/pygnulib/GLImport.py
+++ b/pygnulib/GLImport.py
@@ -860,12 +860,6 @@ AC_DEFUN([%s_FILE_LIST], [\n''' % macro_prefix
             self.moduletable.transitive_closure_separately(base_modules, final_modules)
         main_modules, tests_modules = modules
 
-        # Transmit base_modules, final_modules, main_modules and tests_modules.
-        self.moduletable.setBaseModules(base_modules)
-        self.moduletable.setFinalModules(final_modules)
-        self.moduletable.setMainModules(main_modules)
-        self.moduletable.setTestsModules(tests_modules)
-
         # Print main_modules and tests_modules.
         if verbose >= 1:
             print('Main module list:')
@@ -892,6 +886,12 @@ AC_DEFUN([%s_FILE_LIST], [\n''' % macro_prefix
             # Add the dummy module to the tests-related module list if needed.
             tests_modules = self.moduletable.add_dummy(tests_modules)
 
+        # Transmit base_modules, final_modules, main_modules and tests_modules.
+        self.moduletable.setBaseModules(base_modules)
+        self.moduletable.setFinalModules(final_modules)
+        self.moduletable.setMainModules(main_modules)
+        self.moduletable.setTestsModules(tests_modules)
+
         # Check license incompatibilities.
         listing = list()
         compatibilities = dict()

diff --git a/pygnulib/GLModuleSystem.py b/pygnulib/GLModuleSystem.py
index 6ec366eecd8265bb906a319142c58e06a1c1a2b9..4add195f2a48c28e8fc71b2b6293f6760b303060 100644 (file)
--- a/pygnulib/GLModuleSystem.py
+++ b/pygnulib/GLModuleSystem.py
@@ -1102,7 +1102,7 @@ class GLModuleTable(object):
         for module in modules:
             if type(module) is not GLModule:
                 raise TypeError('each module must be a GLModule instance')
-        self.base_modules = sorted(set(modules))
+        self.base_modules = modules
 
     def getFinalModules(self) -> list[GLModule]:
         '''Return list of final modules.'''
@@ -1113,7 +1113,7 @@ class GLModuleTable(object):
         for module in modules:
             if type(module) is not GLModule:
                 raise TypeError('each module must be a GLModule instance')
-        self.final_modules = sorted(set(modules))
+        self.final_modules = modules
 
     def getMainModules(self) -> list[GLModule]:
         '''Return list of main modules.'''
@@ -1124,7 +1124,7 @@ class GLModuleTable(object):
         for module in modules:
             if type(module) is not GLModule:
                 raise TypeError('each module must be a GLModule instance')
-        self.main_modules = sorted(set(modules))
+        self.main_modules = modules
 
     def getTestsModules(self) -> list[GLModule]:
         '''Return list of tests modules.'''
@@ -1135,4 +1135,4 @@ class GLModuleTable(object):
         for module in modules:
             if type(module) is not GLModule:
                 raise TypeError('each module must be a GLModule instance')
-        self.tests_modules = sorted(set(modules))
+        self.tests_modules = modules