Include only Ice and IceMX modules with Python package (#2463)

zeroc-ice · Jul 11, 2024 · f6591df · f6591df
1 parent d8f7575
commit f6591df
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 46 deletions.
diff --git a/python/msbuild/ice.proj b/python/msbuild/ice.proj
@@ -32,17 +32,14 @@
     </ItemDefinitionGroup>
 
     <ItemGroup>
-        <SliceCompile Include="..\..\slice\Ice\*.ice;
-                               ..\..\slice\Glacier2\*.ice"
-                      Exclude="..\..\slice\Ice\Metrics.ice;
-                               ..\..\slice\Glacier2\Metrics.ice">
+        <SliceCompile Include="..\..\slice\Ice\*.ice"
+                      Exclude="..\..\slice\Ice\Metrics.ice">
             <AdditionalOptions>--no-package %(AdditionalOptions)</AdditionalOptions>
         </SliceCompile>
-        <SliceCompile Include="..\..\slice\Glacier2\Metrics.ice;
-                               ..\..\slice\Ice\Metrics.ice;
-                               ..\..\slice\IceBox\*.ice;
-                               ..\..\slice\IceGrid\*.ice;
-                               ..\..\slice\IceStorm\*.ice"/>
+        <!-- Generate this file individually without the "no-package" option to ensure the
+             IceMX package is updated. -->
+        <SliceCompile Include="..\..\slice\Ice\Metrics.ice">
+        </SliceCompile>
         <PythonGenerated Include="$(MSBuildThisFileDirectory)\..\python\**\*_ice.py"/>
     </ItemGroup>
 

diff --git a/python/python/Glacier2/__init__.py b/python/python/Glacier2/__init__.py
diff --git a/python/python/Makefile b/python/python/Makefile
@@ -16,20 +16,12 @@ $(eval $(call load-translator-dependencies,$(top_srcdir)/cpp/src/slice2py))
 .NOTPARALLEL:
 
 $(eval $(call make-python-package,$(slicedir),$(lang_srcdir)/python,Ice,--no-package))
-$(eval $(call make-python-package,$(slicedir),$(lang_srcdir)/python,Glacier2,--no-package))
-$(eval $(call make-python-package,$(slicedir),$(lang_srcdir)/python,IceBox))
 $(eval $(call make-python-package,$(slicedir),$(lang_srcdir)/python,IceMX))
-$(eval $(call make-python-package,$(slicedir),$(lang_srcdir)/python,IceGrid))
-$(eval $(call make-python-package,$(slicedir),$(lang_srcdir)/python,IceStorm))
 
-# Generate these two files individually without the --no-package option to ensure the
+# Generate this file individually without the --no-package option to ensure the
 # IceMX package is updated.
 $(eval $(call make-python-slice,$(slicedir),$(lang_srcdir)/python,Ice,Metrics))
-$(eval $(call make-python-slice,$(slicedir),$(lang_srcdir)/python,Glacier2,Metrics))
 
 install:: | $(DESTDIR)$(install_pythondir)/Ice
-	$(E) "Installing generated code"
-	$(Q)$(INSTALL) -m 644 Ice/__init__.py $(DESTDIR)$(install_pythondir)/Ice
-
-install:: | $(DESTDIR)$(install_pythondir)/Glacier2
-	$(Q)$(INSTALL) -m 644 Glacier2/__init__.py $(DESTDIR)$(install_pythondir)/Glacier2
+	$(E) "Installing python code"
+	$(Q)$(INSTALL) -m 644 Ice/*.py $(DESTDIR)$(install_pythondir)/Ice
diff --git a/python/setup.py b/python/setup.py
@@ -26,12 +26,8 @@
 
 # Define Python packages to be included
 packages = [
-    'Glacier2',
     'Ice',
-    'IceBox',
-    'IceGrid',
     'IceMX',
-    'IceStorm',
     'slice',
     'slice.Glacier2',
     'slice.Ice',

diff --git a/python/test/Glacier2/router/Client.py b/python/test/Glacier2/router/Client.py
@@ -10,6 +10,7 @@
 
 from TestHelper import TestHelper
 
+TestHelper.loadSlice(f"--all {Ice.getSliceDir()}/Glacier2/Router.ice")
 TestHelper.loadSlice("Callback.ice")
 import Test