Skip to content

bpo-29591: [2.7] Update VS project files #2310

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 1 commit into from
Jun 21, 2017
Merged

bpo-29591: [2.7] Update VS project files #2310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions PC/VS9.0/_elementtree.vcproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\Modules\expat"
PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
PreprocessorDefinitions="USE_PYEXPAT_CAPI;XML_STATIC"
/>
<Tool
Name="VCManagedResourceCompilerTool"
Expand Down Expand Up @@ -105,7 +105,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\Modules\expat"
PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
PreprocessorDefinitions="USE_PYEXPAT_CAPI;XML_STATIC"
/>
<Tool
Name="VCManagedResourceCompilerTool"
Expand Down Expand Up @@ -167,7 +167,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\Modules\expat"
PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
PreprocessorDefinitions="USE_PYEXPAT_CAPI;XML_STATIC"
/>
<Tool
Name="VCManagedResourceCompilerTool"
Expand Down Expand Up @@ -230,7 +230,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\Modules\expat"
PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
PreprocessorDefinitions="USE_PYEXPAT_CAPI;XML_STATIC"
/>
<Tool
Name="VCManagedResourceCompilerTool"
Expand Down Expand Up @@ -292,7 +292,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\Modules\expat"
PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
PreprocessorDefinitions="USE_PYEXPAT_CAPI;XML_STATIC"
/>
<Tool
Name="VCManagedResourceCompilerTool"
Expand Down Expand Up @@ -355,7 +355,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\Modules\expat"
PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
PreprocessorDefinitions="USE_PYEXPAT_CAPI;XML_STATIC"
/>
<Tool
Name="VCManagedResourceCompilerTool"
Expand Down Expand Up @@ -418,7 +418,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\Modules\expat"
PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
PreprocessorDefinitions="USE_PYEXPAT_CAPI;XML_STATIC"
/>
<Tool
Name="VCManagedResourceCompilerTool"
Expand Down Expand Up @@ -481,7 +481,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\Modules\expat"
PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
PreprocessorDefinitions="USE_PYEXPAT_CAPI;XML_STATIC"
/>
<Tool
Name="VCManagedResourceCompilerTool"
Expand Down
16 changes: 8 additions & 8 deletions PC/VS9.0/pyexpat.vcproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".\..\..\Modules\expat"
PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
PreprocessorDefinitions="PYEXPAT_EXPORTS;XML_STATIC"
/>
<Tool
Name="VCManagedResourceCompilerTool"
Expand Down Expand Up @@ -104,7 +104,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".\..\..\Modules\expat"
PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
PreprocessorDefinitions="PYEXPAT_EXPORTS;XML_STATIC"
/>
<Tool
Name="VCManagedResourceCompilerTool"
Expand Down Expand Up @@ -165,7 +165,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".\..\..\Modules\expat"
PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
PreprocessorDefinitions="PYEXPAT_EXPORTS;XML_STATIC"
/>
<Tool
Name="VCManagedResourceCompilerTool"
Expand Down Expand Up @@ -227,7 +227,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".\..\..\Modules\expat"
PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
PreprocessorDefinitions="PYEXPAT_EXPORTS;XML_STATIC"
/>
<Tool
Name="VCManagedResourceCompilerTool"
Expand Down Expand Up @@ -288,7 +288,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".\..\..\Modules\expat"
PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
PreprocessorDefinitions="PYEXPAT_EXPORTS;XML_STATIC"
/>
<Tool
Name="VCManagedResourceCompilerTool"
Expand Down Expand Up @@ -350,7 +350,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".\..\..\Modules\expat"
PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
PreprocessorDefinitions="PYEXPAT_EXPORTS;XML_STATIC"
/>
<Tool
Name="VCManagedResourceCompilerTool"
Expand Down Expand Up @@ -412,7 +412,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".\..\..\Modules\expat"
PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
PreprocessorDefinitions="PYEXPAT_EXPORTS;XML_STATIC"
/>
<Tool
Name="VCManagedResourceCompilerTool"
Expand Down Expand Up @@ -474,7 +474,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".\..\..\Modules\expat"
PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
PreprocessorDefinitions="PYEXPAT_EXPORTS;XML_STATIC"
/>
<Tool
Name="VCManagedResourceCompilerTool"
Expand Down
2 changes: 1 addition & 1 deletion PC/VS9.0/pyproject.vsprops
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
InlineFunctionExpansion="1"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\..\Include; ..\..\PC"
PreprocessorDefinitions="_WIN32"
PreprocessorDefinitions="_WIN32;WIN32"
Copy link
Member

Choose a reason for hiding this comment

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

I'm not sure that this change is still needed with expat 2.2.1. Would you mind to check please?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Actually this is unrelated to just Expat. It brings the VS9.0 project files inline with the MSBuild ones. Ever wonder why the Expat change "just worked" on the other releases? ;)

Copy link
Member

Choose a reason for hiding this comment

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

Ok fine. I'm just surprised that we have to define it manualy. It should already be defined by <windows.h> no?

StringPooling="true"
ExceptionHandling="0"
RuntimeLibrary="0"
Expand Down
2 changes: 1 addition & 1 deletion PCbuild/_elementtree.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>..\Modules\expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>USE_PYEXPAT_CAPI;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<BaseAddress>0x1D100000</BaseAddress>
Expand Down
2 changes: 1 addition & 1 deletion PCbuild/pyexpat.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>$(PySourcePath)Modules\expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>PYEXPAT_EXPORTS;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
Expand Down