From: Collin Funk <collin.funk1@gmail.com>
Date: Sat, 30 Mar 2024 10:23:46 +0000 (-0700)
Subject: gnulib-tool.py: Don't discard the 'dummy' module.
X-Git-Tag: v1.0~202
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa3eb8a6c67e7a390241a445508ed756b8256a2d;p=thirdparty%2Fgnulib.git

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 ba0a246e54..cf25ecf79e 100644
--- 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 81298eeca1..c3a7597d02 100644
--- 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 6ec366eecd..4add195f2a 100644
--- 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