Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Include only Ice and IceMX modules with Python package #2463

Merged
merged 3 commits into from
Jul 11, 2024
Merged

Include only Ice and IceMX modules with Python package #2463

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4dbf385
Include only Ice and IceMX modules with Python package
pepone Jul 11, 2024
bd3ea91
Windows build fixes
pepone Jul 11, 2024
d93b13c
Add comment
pepone Jul 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions python/msbuild/ice.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,11 @@
</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"/>
<SliceCompile Include="..\..\slice\Ice\Metrics.ice"/>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not clear why we have this special handling for Metrics.ice. Add a comment in there?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will, it is because for Ice we run with --no-package as the Ice/init.py file is not manually generated. For Metrics we want the generated IceMX/__init__.py.

<PythonGenerated Include="$(MSBuildThisFileDirectory)\..\python\**\*_ice.py"/>
</ItemGroup>

Expand Down
22 changes: 0 additions & 22 deletions python/python/Glacier2/__init__.py
View file
Open in desktop

This file was deleted.

14 changes: 3 additions & 11 deletions python/python/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 0 additions & 4 deletions python/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,8 @@

# Define Python packages to be included
packages = [
'Glacier2',
'Ice',
'IceBox',
'IceGrid',
'IceMX',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What are all the slice packages, and should we include them?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is to include the Slice files in the packages directory. I will check if there is a better alternative.

'IceStorm',
'slice',
'slice.Glacier2',
'slice.Ice',
Expand Down
1 change: 1 addition & 0 deletions python/test/Glacier2/router/Client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

from TestHelper import TestHelper

TestHelper.loadSlice(f"--all {Ice.getSliceDir()}/Glacier2/Router.ice")
TestHelper.loadSlice("Callback.ice")
import Test

Expand Down
Loading