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

* bpo-35296: make install now installs the internal API (GH-10665)

make install now also installs the internal API: Include/internal/*.h
header files.

(cherry picked from commit f653fd4d950ac092719b6152e38d77c62b443125)

* Windows installer now also install Include/internal/

The Windows installer (MSI) now also install header files of the
Include/internal/ subdirectory.

diff --git a/Makefile.pre.in b/Makefile.pre.in
index afbc8f8c9bea7f08839e1fe1194158f97a150334..7d9cbd5c8bf3f5045c6f46860954a3a6a83a134e 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -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

diff --git a/Misc/NEWS.d/next/Build/2018-12-04-17-10-17.bpo-35296.2ktH40.rst b/Misc/NEWS.d/next/Build/2018-12-04-17-10-17.bpo-35296.2ktH40.rst
new file mode 100644 (file)
index 0000000..e6eda2d
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2018-12-04-17-10-17.bpo-35296.2ktH40.rst
@@ -0,0 +1,2 @@
+The Windows installer (MSI) now also install internal header files
+(``Include/internal/`` subdirectory).

diff --git a/Misc/NEWS.d/next/C API/2018-11-22-18-34-23.bpo-35296.nxrIQt.rst b/Misc/NEWS.d/next/C API/2018-11-22-18-34-23.bpo-35296.nxrIQt.rst
new file mode 100644 (file)
index 0000000..c5f877a
--- /dev/null
+++ b/Misc/NEWS.d/next/C API/2018-11-22-18-34-23.bpo-35296.nxrIQt.rst
@@ -0,0 +1,2 @@
+``make install`` now also installs the internal API:
+``Include/internal/*.h`` header files.

diff --git a/Tools/msi/dev/dev.wixproj b/Tools/msi/dev/dev.wixproj
index 682b66031f1e77c029d9bfbc6220a4e94ae09839..bc3a19ce33ca38c875ac2ef4228fd985ab060323 100644 (file)
--- a/Tools/msi/dev/dev.wixproj
+++ b/Tools/msi/dev/dev.wixproj
@@ -21,7 +21,7 @@
         <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>
@@ -29,7 +29,7 @@
             <Group>dev_include</Group>
         </InstallFiles>
     </ItemGroup>
-    
+
     <Target Name="BuildMinGWLib"
             Inputs="$(BuildPath)$(PyDllName).dll"
             Outputs="$(BuildPath)lib$(PyDllName).a"
@@ -46,4 +46,4 @@
     </Target>
 
     <Import Project="..\msi.targets" />
-</Project>
\ No newline at end of file
+</Project>