Skip to content

[3.7] bpo-35296: make install now installs the internal API (GH-10665) #10897

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

Merged
merged 2 commits into from
Dec 4, 2018
Merged

[3.7] bpo-35296: make install now installs the internal API (GH-10665) #10897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9914eb7
bpo-35296: make install now installs the internal API (GH-10665)
vstinner Nov 23, 2018
72e37f9
Windows installer now also install Include/internal/
vstinner Dec 4, 2018
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
10 changes: 10 additions & 0 deletions Makefile.pre.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1443,11 +1443,21 @@ inclinstall:
else true; \
fi; \
done
@if test ! -d $(DESTDIR)$(INCLUDEPY)/internal; then \
echo "Creating directory $(DESTDIR)$(INCLUDEPY)/internal"; \
$(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(INCLUDEPY)/internal; \
else true; \
fi
@for i in $(srcdir)/Include/*.h; \
do \
echo $(INSTALL_DATA) $$i $(INCLUDEPY); \
$(INSTALL_DATA) $$i $(DESTDIR)$(INCLUDEPY); \
done
@for i in $(srcdir)/Include/internal/*.h; \
do \
echo $(INSTALL_DATA) $$i $(INCLUDEPY)/internal; \
$(INSTALL_DATA) $$i $(DESTDIR)$(INCLUDEPY)/internal; \
done
$(INSTALL_DATA) pyconfig.h $(DESTDIR)$(CONFINCLUDEPY)/pyconfig.h

# Install the library and miscellaneous stuff needed for extending/embedding
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Build/2018-12-04-17-10-17.bpo-35296.2ktH40.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
The Windows installer (MSI) now also install internal header files
(``Include/internal/`` subdirectory).
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/C API/2018-11-22-18-34-23.bpo-35296.nxrIQt.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
``make install`` now also installs the internal API:
``Include/internal/*.h`` header files.
6 changes: 3 additions & 3 deletions Tools/msi/dev/dev.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@
<EmbeddedResource Include="*.wxl" />
</ItemGroup>
<ItemGroup>
<InstallFiles Include="$(PySourcePath)include\*.h">
<InstallFiles Include="$(PySourcePath)include\**\*.h">
<SourceBase>$(PySourcePath)</SourceBase>
<Source>!(bindpath.src)</Source>
<TargetBase>$(PySourcePath)</TargetBase>
<Target_></Target_>
<Group>dev_include</Group>
</InstallFiles>
</ItemGroup>

<Target Name="BuildMinGWLib"
Inputs="$(BuildPath)$(PyDllName).dll"
Outputs="$(BuildPath)lib$(PyDllName).a"
Expand All @@ -46,4 +46,4 @@
</Target>

<Import Project="..\msi.targets" />
</Project>
</Project>