[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - accessibility/bridge apache-commons/patches python/python-2.7.5-pcbuild.patch solenv/inc
Oliver-Rainer Wittmann
orw at apache.org
Fri Aug 2 05:09:12 PDT 2013
accessibility/bridge/source/java/makefile.mk | 2
apache-commons/patches/codec.patch | 8
python/python-2.7.5-pcbuild.patch | 562 +++++++++++++--------------
solenv/inc/tg_ext.mk | 16
4 files changed, 288 insertions(+), 300 deletions(-)
New commits:
commit 6d231def8163b1404a40cfa8ff054c27e8c1df95
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date: Fri Aug 2 11:58:45 2013 +0000
122938: - Windows: do not change line endings of patches before its application
- unify line endings in patches to match the line endings of the files to be patched
diff --git a/apache-commons/patches/codec.patch b/apache-commons/patches/codec.patch
index 6b4b3e1..38e8651 100644
--- a/apache-commons/patches/codec.patch
+++ b/apache-commons/patches/codec.patch
@@ -1,6 +1,6 @@
---- misc/build/commons-codec-1.6-src/build.xml-old 2012-05-05 22:12:32.000000000 -0500
-+++ misc/build/commons-codec-1.6-src/build.xml 2012-05-05 22:16:00.000000000 -0500
-@@ -96,7 +96,6 @@
+--- misc/build/commons-codec-1.6-src/build.xml-old 2012-05-05 22:12:32.000000000 -0500
++++ misc/build/commons-codec-1.6-src/build.xml 2012-05-05 22:16:00.000000000 -0500
+@@ -96,7 +96,6 @@
</target>
<target name="dist" depends="compile, javadoc" description="Create binary distribution">
<mkdir dir="${dist.home}"/>
@@ -8,7 +8,7 @@
<copy file="${basedir}/NOTICE.txt" todir="${dist.home}"/>
<copy file="${basedir}/RELEASE-NOTES.txt" todir="${dist.home}"/>
<antcall target="jar"/>
-@@ -104,8 +103,7 @@
+@@ -104,8 +103,7 @@
<target name="jar" depends="compile" description="Create jar">
<mkdir dir="${dist.home}"/>
<mkdir dir="${build.home}/classes/META-INF"/>
diff --git a/python/python-2.7.5-pcbuild.patch b/python/python-2.7.5-pcbuild.patch
index 82b16dd..2526be6 100644
--- a/python/python-2.7.5-pcbuild.patch
+++ b/python/python-2.7.5-pcbuild.patch
@@ -1,7 +1,7 @@
-diff -u misc/Python-2.7.5/PCbuild/_bsddb.vcproj misc/build/Python-2.7.5/PCbuild/_bsddb.vcproj
---- misc/Python-2.7.5/PCbuild/_bsddb.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.5/PCbuild/_bsddb.vcproj 2012-07-30 20:59:37.000000000 -0500
-@@ -56,6 +56,7 @@
+diff -u misc/Python-2.7.5/PCbuild/_bsddb.vcproj misc/build/Python-2.7.5/PCbuild/_bsddb.vcproj
+--- misc/Python-2.7.5/PCbuild/_bsddb.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/_bsddb.vcproj 2012-07-30 20:59:37.000000000 -0500
+@@ -56,6 +56,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -9,7 +9,7 @@ diff -u misc/Python-2.7.5/PCbuild/_bsddb.vcproj misc/build/Python-2.7.5/PCbuild/
AdditionalDependencies="$(bsddbDepLibs)"
BaseAddress="0x1e180000"
/>
-@@ -120,6 +121,7 @@
+@@ -120,6 +121,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -17,7 +17,7 @@ diff -u misc/Python-2.7.5/PCbuild/_bsddb.vcproj misc/build/Python-2.7.5/PCbuild/
AdditionalDependencies="$(bsddbDepLibs)"
BaseAddress="0x1e180000"
/>
-@@ -183,6 +185,7 @@
+@@ -183,6 +185,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -25,7 +25,7 @@ diff -u misc/Python-2.7.5/PCbuild/_bsddb.vcproj misc/build/Python-2.7.5/PCbuild/
AdditionalDependencies="$(bsddbDepLibs)"
BaseAddress="0x1e180000"
/>
-@@ -248,6 +251,7 @@
+@@ -248,6 +251,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -33,7 +33,7 @@ diff -u misc/Python-2.7.5/PCbuild/_bsddb.vcproj misc/build/Python-2.7.5/PCbuild/
AdditionalDependencies="$(bsddbDepLibs)"
BaseAddress="0x1e180000"
/>
-@@ -311,6 +315,7 @@
+@@ -311,6 +315,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -41,7 +41,7 @@ diff -u misc/Python-2.7.5/PCbuild/_bsddb.vcproj misc/build/Python-2.7.5/PCbuild/
AdditionalDependencies="$(bsddbDepLibs)"
BaseAddress="0x1e180000"
/>
-@@ -375,6 +380,7 @@
+@@ -375,6 +380,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -49,7 +49,7 @@ diff -u misc/Python-2.7.5/PCbuild/_bsddb.vcproj misc/build/Python-2.7.5/PCbuild/
AdditionalDependencies="$(bsddbDepLibs)"
BaseAddress="0x1e180000"
TargetMachine="17"
-@@ -439,6 +445,7 @@
+@@ -439,6 +445,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -57,7 +57,7 @@ diff -u misc/Python-2.7.5/PCbuild/_bsddb.vcproj misc/build/Python-2.7.5/PCbuild/
AdditionalDependencies="$(bsddbDepLibs)"
BaseAddress="0x1e180000"
/>
-@@ -503,6 +510,7 @@
+@@ -503,6 +510,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -65,10 +65,10 @@ diff -u misc/Python-2.7.5/PCbuild/_bsddb.vcproj misc/build/Python-2.7.5/PCbuild/
AdditionalDependencies="$(bsddbDepLibs)"
BaseAddress="0x1e180000"
TargetMachine="17"
-diff -u misc/Python-2.7.5/PCbuild/_ctypes.vcproj misc/build/Python-2.7.5/PCbuild/_ctypes.vcproj
---- misc/Python-2.7.5/PCbuild/_ctypes.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.5/PCbuild/_ctypes.vcproj 2012-07-30 20:59:37.000000000 -0500
-@@ -177,7 +177,7 @@
+diff -u misc/Python-2.7.5/PCbuild/_ctypes.vcproj misc/build/Python-2.7.5/PCbuild/_ctypes.vcproj
+--- misc/Python-2.7.5/PCbuild/_ctypes.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/_ctypes.vcproj 2012-07-30 20:59:37.000000000 -0500
+@@ -177,7 +177,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -77,7 +77,7 @@ diff -u misc/Python-2.7.5/PCbuild/_ctypes.vcproj misc/build/Python-2.7.5/PCbuild
SubSystem="0"
BaseAddress="0x1D1A0000"
/>
-@@ -241,7 +241,7 @@
+@@ -241,7 +241,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -86,7 +86,7 @@ diff -u misc/Python-2.7.5/PCbuild/_ctypes.vcproj misc/build/Python-2.7.5/PCbuild
SubSystem="0"
BaseAddress="0x1D1A0000"
/>
-@@ -304,7 +304,7 @@
+@@ -304,7 +304,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -95,7 +95,7 @@ diff -u misc/Python-2.7.5/PCbuild/_ctypes.vcproj misc/build/Python-2.7.5/PCbuild
SubSystem="0"
BaseAddress="0x1D1A0000"
/>
-@@ -368,7 +368,7 @@
+@@ -368,7 +368,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -104,7 +104,7 @@ diff -u misc/Python-2.7.5/PCbuild/_ctypes.vcproj misc/build/Python-2.7.5/PCbuild
SubSystem="0"
BaseAddress="0x1D1A0000"
TargetMachine="17"
-@@ -432,7 +432,7 @@
+@@ -432,7 +432,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -113,7 +113,7 @@ diff -u misc/Python-2.7.5/PCbuild/_ctypes.vcproj misc/build/Python-2.7.5/PCbuild
SubSystem="0"
BaseAddress="0x1D1A0000"
/>
-@@ -496,7 +496,7 @@
+@@ -496,7 +496,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -122,10 +122,10 @@ diff -u misc/Python-2.7.5/PCbuild/_ctypes.vcproj misc/build/Python-2.7.5/PCbuild
SubSystem="0"
BaseAddress="0x1D1A0000"
TargetMachine="17"
-diff -u misc/Python-2.7.5/PCbuild/_ctypes_test.vcproj misc/build/Python-2.7.5/PCbuild/_ctypes_test.vcproj
---- misc/Python-2.7.5/PCbuild/_ctypes_test.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.5/PCbuild/_ctypes_test.vcproj 2012-07-30 20:59:37.000000000 -0500
-@@ -54,6 +54,7 @@
+diff -u misc/Python-2.7.5/PCbuild/_ctypes_test.vcproj misc/build/Python-2.7.5/PCbuild/_ctypes_test.vcproj
+--- misc/Python-2.7.5/PCbuild/_ctypes_test.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/_ctypes_test.vcproj 2012-07-30 20:59:37.000000000 -0500
+@@ -54,6 +54,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -133,7 +133,7 @@ diff -u misc/Python-2.7.5/PCbuild/_ctypes_test.vcproj misc/build/Python-2.7.5/PC
/>
<Tool
Name="VCALinkTool"
-@@ -113,6 +114,7 @@
+@@ -113,6 +114,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -141,7 +141,7 @@ diff -u misc/Python-2.7.5/PCbuild/_ctypes_test.vcproj misc/build/Python-2.7.5/PC
/>
<Tool
Name="VCALinkTool"
-@@ -172,6 +174,7 @@
+@@ -172,6 +174,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -149,7 +149,7 @@ diff -u misc/Python-2.7.5/PCbuild/_ctypes_test.vcproj misc/build/Python-2.7.5/PC
/>
<Tool
Name="VCALinkTool"
-@@ -232,6 +235,7 @@
+@@ -232,6 +235,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -157,7 +157,7 @@ diff -u misc/Python-2.7.5/PCbuild/_ctypes_test.vcproj misc/build/Python-2.7.5/PC
/>
<Tool
Name="VCALinkTool"
-@@ -291,6 +295,7 @@
+@@ -291,6 +295,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -165,7 +165,7 @@ diff -u misc/Python-2.7.5/PCbuild/_ctypes_test.vcproj misc/build/Python-2.7.5/PC
/>
<Tool
Name="VCALinkTool"
-@@ -352,6 +357,7 @@
+@@ -352,6 +357,7 @@
<Tool
Name="VCLinkerTool"
TargetMachine="17"
@@ -173,7 +173,7 @@ diff -u misc/Python-2.7.5/PCbuild/_ctypes_test.vcproj misc/build/Python-2.7.5/PC
/>
<Tool
Name="VCALinkTool"
-@@ -411,6 +417,7 @@
+@@ -411,6 +417,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -181,7 +181,7 @@ diff -u misc/Python-2.7.5/PCbuild/_ctypes_test.vcproj misc/build/Python-2.7.5/PC
/>
<Tool
Name="VCALinkTool"
-@@ -472,6 +479,7 @@
+@@ -472,6 +479,7 @@
<Tool
Name="VCLinkerTool"
TargetMachine="17"
@@ -189,10 +189,10 @@ diff -u misc/Python-2.7.5/PCbuild/_ctypes_test.vcproj misc/build/Python-2.7.5/PC
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.5/PCbuild/_elementtree.vcproj misc/build/Python-2.7.5/PCbuild/_elementtree.vcproj
---- misc/Python-2.7.5/PCbuild/_elementtree.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.5/PCbuild/_elementtree.vcproj 2012-07-30 20:59:37.000000000 -0500
-@@ -57,6 +57,7 @@
+diff -u misc/Python-2.7.5/PCbuild/_elementtree.vcproj misc/build/Python-2.7.5/PCbuild/_elementtree.vcproj
+--- misc/Python-2.7.5/PCbuild/_elementtree.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/_elementtree.vcproj 2012-07-30 20:59:37.000000000 -0500
+@@ -57,6 +57,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1D100000"
@@ -200,7 +200,7 @@ diff -u misc/Python-2.7.5/PCbuild/_elementtree.vcproj misc/build/Python-2.7.5/PC
/>
<Tool
Name="VCALinkTool"
-@@ -119,6 +120,7 @@
+@@ -119,6 +120,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1D100000"
@@ -208,7 +208,7 @@ diff -u misc/Python-2.7.5/PCbuild/_elementtree.vcproj misc/build/Python-2.7.5/PC
/>
<Tool
Name="VCALinkTool"
-@@ -181,6 +183,7 @@
+@@ -181,6 +183,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1D100000"
@@ -216,7 +216,7 @@ diff -u misc/Python-2.7.5/PCbuild/_elementtree.vcproj misc/build/Python-2.7.5/PC
/>
<Tool
Name="VCALinkTool"
-@@ -244,6 +247,7 @@
+@@ -244,6 +247,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1D100000"
@@ -224,7 +224,7 @@ diff -u misc/Python-2.7.5/PCbuild/_elementtree.vcproj misc/build/Python-2.7.5/PC
/>
<Tool
Name="VCALinkTool"
-@@ -306,6 +310,7 @@
+@@ -306,6 +310,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1D100000"
@@ -232,7 +232,7 @@ diff -u misc/Python-2.7.5/PCbuild/_elementtree.vcproj misc/build/Python-2.7.5/PC
/>
<Tool
Name="VCALinkTool"
-@@ -370,6 +375,7 @@
+@@ -370,6 +375,7 @@
Name="VCLinkerTool"
BaseAddress="0x1D100000"
TargetMachine="17"
@@ -240,7 +240,7 @@ diff -u misc/Python-2.7.5/PCbuild/_elementtree.vcproj misc/build/Python-2.7.5/PC
/>
<Tool
Name="VCALinkTool"
-@@ -432,6 +438,7 @@
+@@ -432,6 +438,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1D100000"
@@ -248,7 +248,7 @@ diff -u misc/Python-2.7.5/PCbuild/_elementtree.vcproj misc/build/Python-2.7.5/PC
/>
<Tool
Name="VCALinkTool"
-@@ -496,6 +503,7 @@
+@@ -496,6 +503,7 @@
Name="VCLinkerTool"
BaseAddress="0x1D100000"
TargetMachine="17"
@@ -256,10 +256,10 @@ diff -u misc/Python-2.7.5/PCbuild/_elementtree.vcproj misc/build/Python-2.7.5/PC
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.5/PCbuild/_hashlib.vcproj misc/build/Python-2.7.5/PCbuild/_hashlib.vcproj
---- misc/Python-2.7.5/PCbuild/_hashlib.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.5/PCbuild/_hashlib.vcproj 2012-07-30 20:59:37.000000000 -0500
-@@ -58,6 +58,7 @@
+diff -u misc/Python-2.7.5/PCbuild/_hashlib.vcproj misc/build/Python-2.7.5/PCbuild/_hashlib.vcproj
+--- misc/Python-2.7.5/PCbuild/_hashlib.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/_hashlib.vcproj 2012-07-30 20:59:37.000000000 -0500
+@@ -58,6 +58,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
@@ -267,7 +267,7 @@ diff -u misc/Python-2.7.5/PCbuild/_hashlib.vcproj misc/build/Python-2.7.5/PCbuil
/>
<Tool
Name="VCALinkTool"
-@@ -121,6 +122,7 @@
+@@ -121,6 +122,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
@@ -275,7 +275,7 @@ diff -u misc/Python-2.7.5/PCbuild/_hashlib.vcproj misc/build/Python-2.7.5/PCbuil
/>
<Tool
Name="VCALinkTool"
-@@ -184,6 +186,7 @@
+@@ -184,6 +186,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
@@ -283,7 +283,7 @@ diff -u misc/Python-2.7.5/PCbuild/_hashlib.vcproj misc/build/Python-2.7.5/PCbuil
/>
<Tool
Name="VCALinkTool"
-@@ -248,6 +251,7 @@
+@@ -248,6 +251,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
@@ -291,7 +291,7 @@ diff -u misc/Python-2.7.5/PCbuild/_hashlib.vcproj misc/build/Python-2.7.5/PCbuil
/>
<Tool
Name="VCALinkTool"
-@@ -311,6 +315,7 @@
+@@ -311,6 +315,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
@@ -299,7 +299,7 @@ diff -u misc/Python-2.7.5/PCbuild/_hashlib.vcproj misc/build/Python-2.7.5/PCbuil
/>
<Tool
Name="VCALinkTool"
-@@ -376,6 +381,7 @@
+@@ -376,6 +381,7 @@
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
TargetMachine="17"
@@ -307,7 +307,7 @@ diff -u misc/Python-2.7.5/PCbuild/_hashlib.vcproj misc/build/Python-2.7.5/PCbuil
/>
<Tool
Name="VCALinkTool"
-@@ -439,6 +445,7 @@
+@@ -439,6 +445,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
@@ -315,7 +315,7 @@ diff -u misc/Python-2.7.5/PCbuild/_hashlib.vcproj misc/build/Python-2.7.5/PCbuil
/>
<Tool
Name="VCALinkTool"
-@@ -504,6 +511,7 @@
+@@ -504,6 +511,7 @@
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
TargetMachine="17"
@@ -323,10 +323,10 @@ diff -u misc/Python-2.7.5/PCbuild/_hashlib.vcproj misc/build/Python-2.7.5/PCbuil
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.5/PCbuild/_msi.vcproj misc/build/Python-2.7.5/PCbuild/_msi.vcproj
---- misc/Python-2.7.5/PCbuild/_msi.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.5/PCbuild/_msi.vcproj 2012-07-30 20:59:37.000000000 -0500
-@@ -56,6 +56,7 @@
+diff -u misc/Python-2.7.5/PCbuild/_msi.vcproj misc/build/Python-2.7.5/PCbuild/_msi.vcproj
+--- misc/Python-2.7.5/PCbuild/_msi.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/_msi.vcproj 2012-07-30 20:59:37.000000000 -0500
+@@ -56,6 +56,7 @@
Name="VCLinkerTool"
AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
BaseAddress="0x1D160000"
@@ -334,7 +334,7 @@ diff -u misc/Python-2.7.5/PCbuild/_msi.vcproj misc/build/Python-2.7.5/PCbuild/_m
/>
<Tool
Name="VCALinkTool"
-@@ -117,6 +118,7 @@
+@@ -117,6 +118,7 @@
Name="VCLinkerTool"
AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
BaseAddress="0x1D160000"
@@ -342,7 +342,7 @@ diff -u misc/Python-2.7.5/PCbuild/_msi.vcproj misc/build/Python-2.7.5/PCbuild/_m
/>
<Tool
Name="VCALinkTool"
-@@ -178,6 +180,7 @@
+@@ -178,6 +180,7 @@
Name="VCLinkerTool"
AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
BaseAddress="0x1D160000"
@@ -350,7 +350,7 @@ diff -u misc/Python-2.7.5/PCbuild/_msi.vcproj misc/build/Python-2.7.5/PCbuild/_m
/>
<Tool
Name="VCALinkTool"
-@@ -240,6 +243,7 @@
+@@ -240,6 +243,7 @@
Name="VCLinkerTool"
AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
BaseAddress="0x1D160000"
@@ -358,7 +358,7 @@ diff -u misc/Python-2.7.5/PCbuild/_msi.vcproj misc/build/Python-2.7.5/PCbuild/_m
/>
<Tool
Name="VCALinkTool"
-@@ -301,6 +305,7 @@
+@@ -301,6 +305,7 @@
Name="VCLinkerTool"
AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
BaseAddress="0x1D160000"
@@ -366,7 +366,7 @@ diff -u misc/Python-2.7.5/PCbuild/_msi.vcproj misc/build/Python-2.7.5/PCbuild/_m
/>
<Tool
Name="VCALinkTool"
-@@ -364,6 +369,7 @@
+@@ -364,6 +369,7 @@
AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
BaseAddress="0x1D160000"
TargetMachine="17"
@@ -374,7 +374,7 @@ diff -u misc/Python-2.7.5/PCbuild/_msi.vcproj misc/build/Python-2.7.5/PCbuild/_m
/>
<Tool
Name="VCALinkTool"
-@@ -425,6 +431,7 @@
+@@ -425,6 +431,7 @@
Name="VCLinkerTool"
AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
BaseAddress="0x1D160000"
@@ -382,7 +382,7 @@ diff -u misc/Python-2.7.5/PCbuild/_msi.vcproj misc/build/Python-2.7.5/PCbuild/_m
/>
<Tool
Name="VCALinkTool"
-@@ -488,6 +495,7 @@
+@@ -488,6 +495,7 @@
AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
BaseAddress="0x1D160000"
TargetMachine="17"
@@ -390,10 +390,10 @@ diff -u misc/Python-2.7.5/PCbuild/_msi.vcproj misc/build/Python-2.7.5/PCbuild/_m
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.5/PCbuild/_multiprocessing.vcproj misc/build/Python-2.7.5/PCbuild/_multiprocessing.vcproj
---- misc/Python-2.7.5/PCbuild/_multiprocessing.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.5/PCbuild/_multiprocessing.vcproj 2012-07-30 20:59:37.000000000 -0500
-@@ -56,6 +56,7 @@
+diff -u misc/Python-2.7.5/PCbuild/_multiprocessing.vcproj misc/build/Python-2.7.5/PCbuild/_multiprocessing.vcproj
+--- misc/Python-2.7.5/PCbuild/_multiprocessing.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/_multiprocessing.vcproj 2012-07-30 20:59:37.000000000 -0500
+@@ -56,6 +56,7 @@
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib"
BaseAddress="0x1e1D0000"
@@ -401,7 +401,7 @@ diff -u misc/Python-2.7.5/PCbuild/_multiprocessing.vcproj misc/build/Python-2.7.
/>
<Tool
Name="VCALinkTool"
-@@ -117,6 +118,7 @@
+@@ -117,6 +118,7 @@
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib"
BaseAddress="0x1e1D0000"
@@ -409,7 +409,7 @@ diff -u misc/Python-2.7.5/PCbuild/_multiprocessing.vcproj misc/build/Python-2.7.
/>
<Tool
Name="VCALinkTool"
-@@ -178,6 +180,7 @@
+@@ -178,6 +180,7 @@
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib"
BaseAddress="0x1e1D0000"
@@ -417,7 +417,7 @@ diff -u misc/Python-2.7.5/PCbuild/_multiprocessing.vcproj misc/build/Python-2.7.
/>
<Tool
Name="VCALinkTool"
-@@ -240,6 +243,7 @@
+@@ -240,6 +243,7 @@
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib"
BaseAddress="0x1e1D0000"
@@ -425,7 +425,7 @@ diff -u misc/Python-2.7.5/PCbuild/_multiprocessing.vcproj misc/build/Python-2.7.
/>
<Tool
Name="VCALinkTool"
-@@ -301,6 +305,7 @@
+@@ -301,6 +305,7 @@
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib"
BaseAddress="0x1e1D0000"
@@ -433,7 +433,7 @@ diff -u misc/Python-2.7.5/PCbuild/_multiprocessing.vcproj misc/build/Python-2.7.
/>
<Tool
Name="VCALinkTool"
-@@ -364,6 +369,7 @@
+@@ -364,6 +369,7 @@
AdditionalDependencies="ws2_32.lib"
BaseAddress="0x1e1D0000"
TargetMachine="17"
@@ -441,7 +441,7 @@ diff -u misc/Python-2.7.5/PCbuild/_multiprocessing.vcproj misc/build/Python-2.7.
/>
<Tool
Name="VCALinkTool"
-@@ -425,6 +431,7 @@
+@@ -425,6 +431,7 @@
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib"
BaseAddress="0x1e1D0000"
@@ -449,7 +449,7 @@ diff -u misc/Python-2.7.5/PCbuild/_multiprocessing.vcproj misc/build/Python-2.7.
/>
<Tool
Name="VCALinkTool"
-@@ -488,6 +495,7 @@
+@@ -488,6 +495,7 @@
AdditionalDependencies="ws2_32.lib"
BaseAddress="0x1e1D0000"
TargetMachine="17"
@@ -457,10 +457,10 @@ diff -u misc/Python-2.7.5/PCbuild/_multiprocessing.vcproj misc/build/Python-2.7.
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.5/PCbuild/_socket.vcproj misc/build/Python-2.7.5/PCbuild/_socket.vcproj
---- misc/Python-2.7.5/PCbuild/_socket.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.5/PCbuild/_socket.vcproj 2012-07-30 20:59:37.000000000 -0500
-@@ -56,6 +56,7 @@
+diff -u misc/Python-2.7.5/PCbuild/_socket.vcproj misc/build/Python-2.7.5/PCbuild/_socket.vcproj
+--- misc/Python-2.7.5/PCbuild/_socket.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/_socket.vcproj 2012-07-30 20:59:37.000000000 -0500
+@@ -56,6 +56,7 @@
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib"
BaseAddress="0x1e1D0000"
@@ -468,7 +468,7 @@ diff -u misc/Python-2.7.5/PCbuild/_socket.vcproj misc/build/Python-2.7.5/PCbuild
/>
<Tool
Name="VCALinkTool"
-@@ -117,6 +118,7 @@
+@@ -117,6 +118,7 @@
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib"
BaseAddress="0x1e1D0000"
@@ -476,7 +476,7 @@ diff -u misc/Python-2.7.5/PCbuild/_socket.vcproj misc/build/Python-2.7.5/PCbuild
/>
<Tool
Name="VCALinkTool"
-@@ -178,6 +180,7 @@
+@@ -178,6 +180,7 @@
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib"
BaseAddress="0x1e1D0000"
@@ -484,7 +484,7 @@ diff -u misc/Python-2.7.5/PCbuild/_socket.vcproj misc/build/Python-2.7.5/PCbuild
/>
<Tool
Name="VCALinkTool"
-@@ -240,6 +243,7 @@
+@@ -240,6 +243,7 @@
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib"
BaseAddress="0x1e1D0000"
@@ -492,7 +492,7 @@ diff -u misc/Python-2.7.5/PCbuild/_socket.vcproj misc/build/Python-2.7.5/PCbuild
/>
<Tool
Name="VCALinkTool"
-@@ -301,6 +305,7 @@
+@@ -301,6 +305,7 @@
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib"
BaseAddress="0x1e1D0000"
@@ -500,7 +500,7 @@ diff -u misc/Python-2.7.5/PCbuild/_socket.vcproj misc/build/Python-2.7.5/PCbuild
/>
<Tool
Name="VCALinkTool"
-@@ -364,6 +369,7 @@
+@@ -364,6 +369,7 @@
AdditionalDependencies="ws2_32.lib"
BaseAddress="0x1e1D0000"
TargetMachine="17"
@@ -508,7 +508,7 @@ diff -u misc/Python-2.7.5/PCbuild/_socket.vcproj misc/build/Python-2.7.5/PCbuild
/>
<Tool
Name="VCALinkTool"
-@@ -425,6 +431,7 @@
+@@ -425,6 +431,7 @@
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib"
BaseAddress="0x1e1D0000"
@@ -516,7 +516,7 @@ diff -u misc/Python-2.7.5/PCbuild/_socket.vcproj misc/build/Python-2.7.5/PCbuild
/>
<Tool
Name="VCALinkTool"
-@@ -488,6 +495,7 @@
+@@ -488,6 +495,7 @@
AdditionalDependencies="ws2_32.lib"
BaseAddress="0x1e1D0000"
TargetMachine="17"
@@ -524,10 +524,10 @@ diff -u misc/Python-2.7.5/PCbuild/_socket.vcproj misc/build/Python-2.7.5/PCbuild
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.5/PCbuild/_sqlite3.vcproj misc/build/Python-2.7.5/PCbuild/_sqlite3.vcproj
---- misc/Python-2.7.5/PCbuild/_sqlite3.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.5/PCbuild/_sqlite3.vcproj 2012-07-30 20:59:37.000000000 -0500
-@@ -57,6 +57,7 @@
+diff -u misc/Python-2.7.5/PCbuild/_sqlite3.vcproj misc/build/Python-2.7.5/PCbuild/_sqlite3.vcproj
+--- misc/Python-2.7.5/PCbuild/_sqlite3.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/_sqlite3.vcproj 2012-07-30 20:59:37.000000000 -0500
+@@ -57,6 +57,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1e180000"
@@ -535,7 +535,7 @@ diff -u misc/Python-2.7.5/PCbuild/_sqlite3.vcproj misc/build/Python-2.7.5/PCbuil
/>
<Tool
Name="VCALinkTool"
-@@ -119,6 +120,7 @@
+@@ -119,6 +120,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1e180000"
@@ -543,7 +543,7 @@ diff -u misc/Python-2.7.5/PCbuild/_sqlite3.vcproj misc/build/Python-2.7.5/PCbuil
/>
<Tool
Name="VCALinkTool"
-@@ -181,6 +183,7 @@
+@@ -181,6 +183,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1e180000"
@@ -551,7 +551,7 @@ diff -u misc/Python-2.7.5/PCbuild/_sqlite3.vcproj misc/build/Python-2.7.5/PCbuil
/>
<Tool
Name="VCALinkTool"
-@@ -244,6 +247,7 @@
+@@ -244,6 +247,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1e180000"
@@ -559,7 +559,7 @@ diff -u misc/Python-2.7.5/PCbuild/_sqlite3.vcproj misc/build/Python-2.7.5/PCbuil
/>
<Tool
Name="VCALinkTool"
-@@ -306,6 +310,7 @@
+@@ -306,6 +310,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1e180000"
@@ -567,7 +567,7 @@ diff -u misc/Python-2.7.5/PCbuild/_sqlite3.vcproj misc/build/Python-2.7.5/PCbuil
/>
<Tool
Name="VCALinkTool"
-@@ -370,6 +375,7 @@
+@@ -370,6 +375,7 @@
Name="VCLinkerTool"
BaseAddress="0x1e180000"
TargetMachine="17"
@@ -575,7 +575,7 @@ diff -u misc/Python-2.7.5/PCbuild/_sqlite3.vcproj misc/build/Python-2.7.5/PCbuil
/>
<Tool
Name="VCALinkTool"
-@@ -432,6 +438,7 @@
+@@ -432,6 +438,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1e180000"
@@ -583,7 +583,7 @@ diff -u misc/Python-2.7.5/PCbuild/_sqlite3.vcproj misc/build/Python-2.7.5/PCbuil
/>
<Tool
Name="VCALinkTool"
-@@ -496,6 +503,7 @@
+@@ -496,6 +503,7 @@
Name="VCLinkerTool"
BaseAddress="0x1e180000"
TargetMachine="17"
@@ -591,10 +591,10 @@ diff -u misc/Python-2.7.5/PCbuild/_sqlite3.vcproj misc/build/Python-2.7.5/PCbuil
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.5/PCbuild/_ssl.vcproj misc/build/Python-2.7.5/PCbuild/_ssl.vcproj
---- misc/Python-2.7.5/PCbuild/_ssl.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.5/PCbuild/_ssl.vcproj 2012-07-30 20:59:37.000000000 -0500
-@@ -43,7 +43,7 @@
+diff -u misc/Python-2.7.5/PCbuild/_ssl.vcproj misc/build/Python-2.7.5/PCbuild/_ssl.vcproj
+--- misc/Python-2.7.5/PCbuild/_ssl.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/_ssl.vcproj 2012-07-30 20:59:37.000000000 -0500
+@@ -43,7 +43,7 @@
/>
<Tool
Name="VCCLCompilerTool"
@@ -603,7 +603,7 @@ diff -u misc/Python-2.7.5/PCbuild/_ssl.vcproj misc/build/Python-2.7.5/PCbuild/_s
/>
<Tool
Name="VCManagedResourceCompilerTool"
-@@ -57,7 +57,8 @@
+@@ -57,7 +57,8 @@
/>
<Tool
Name="VCLinkerTool"
@@ -613,7 +613,7 @@ diff -u misc/Python-2.7.5/PCbuild/_ssl.vcproj misc/build/Python-2.7.5/PCbuild/_s
/>
<Tool
Name="VCALinkTool"
-@@ -106,7 +107,7 @@
+@@ -106,7 +107,7 @@
/>
<Tool
Name="VCCLCompilerTool"
@@ -622,7 +622,7 @@ diff -u misc/Python-2.7.5/PCbuild/_ssl.vcproj misc/build/Python-2.7.5/PCbuild/_s
/>
<Tool
Name="VCManagedResourceCompilerTool"
-@@ -120,7 +121,8 @@
+@@ -120,7 +121,8 @@
/>
<Tool
Name="VCLinkerTool"
@@ -632,7 +632,7 @@ diff -u misc/Python-2.7.5/PCbuild/_ssl.vcproj misc/build/Python-2.7.5/PCbuild/_s
/>
<Tool
Name="VCALinkTool"
-@@ -169,7 +171,7 @@
+@@ -169,7 +171,7 @@
/>
<Tool
Name="VCCLCompilerTool"
@@ -641,7 +641,7 @@ diff -u misc/Python-2.7.5/PCbuild/_ssl.vcproj misc/build/Python-2.7.5/PCbuild/_s
/>
<Tool
Name="VCManagedResourceCompilerTool"
-@@ -183,7 +185,8 @@
+@@ -183,7 +185,8 @@
/>
<Tool
Name="VCLinkerTool"
@@ -651,7 +651,7 @@ diff -u misc/Python-2.7.5/PCbuild/_ssl.vcproj misc/build/Python-2.7.5/PCbuild/_s
/>
<Tool
Name="VCALinkTool"
-@@ -233,7 +236,7 @@
+@@ -233,7 +236,7 @@
/>
<Tool
Name="VCCLCompilerTool"
@@ -660,7 +660,7 @@ diff -u misc/Python-2.7.5/PCbuild/_ssl.vcproj misc/build/Python-2.7.5/PCbuild/_s
/>
<Tool
Name="VCManagedResourceCompilerTool"
-@@ -247,7 +250,8 @@
+@@ -247,7 +250,8 @@
/>
<Tool
Name="VCLinkerTool"
@@ -670,7 +670,7 @@ diff -u misc/Python-2.7.5/PCbuild/_ssl.vcproj misc/build/Python-2.7.5/PCbuild/_s
/>
<Tool
Name="VCALinkTool"
-@@ -296,7 +300,7 @@
+@@ -296,7 +300,7 @@
/>
<Tool
Name="VCCLCompilerTool"
@@ -679,7 +679,7 @@ diff -u misc/Python-2.7.5/PCbuild/_ssl.vcproj misc/build/Python-2.7.5/PCbuild/_s
/>
<Tool
Name="VCManagedResourceCompilerTool"
-@@ -310,7 +314,8 @@
+@@ -310,7 +314,8 @@
/>
<Tool
Name="VCLinkerTool"
@@ -689,7 +689,7 @@ diff -u misc/Python-2.7.5/PCbuild/_ssl.vcproj misc/build/Python-2.7.5/PCbuild/_s
/>
<Tool
Name="VCALinkTool"
-@@ -360,7 +365,7 @@
+@@ -360,7 +365,7 @@
/>
<Tool
Name="VCCLCompilerTool"
@@ -698,7 +698,7 @@ diff -u misc/Python-2.7.5/PCbuild/_ssl.vcproj misc/build/Python-2.7.5/PCbuild/_s
/>
<Tool
Name="VCManagedResourceCompilerTool"
-@@ -374,7 +379,8 @@
+@@ -374,7 +379,8 @@
/>
<Tool
Name="VCLinkerTool"
@@ -708,7 +708,7 @@ diff -u misc/Python-2.7.5/PCbuild/_ssl.vcproj misc/build/Python-2.7.5/PCbuild/_s
TargetMachine="17"
/>
<Tool
-@@ -424,7 +430,7 @@
+@@ -424,7 +430,7 @@
/>
<Tool
Name="VCCLCompilerTool"
@@ -717,7 +717,7 @@ diff -u misc/Python-2.7.5/PCbuild/_ssl.vcproj misc/build/Python-2.7.5/PCbuild/_s
/>
<Tool
Name="VCManagedResourceCompilerTool"
-@@ -438,7 +444,8 @@
+@@ -438,7 +444,8 @@
/>
<Tool
Name="VCLinkerTool"
@@ -727,7 +727,7 @@ diff -u misc/Python-2.7.5/PCbuild/_ssl.vcproj misc/build/Python-2.7.5/PCbuild/_s
/>
<Tool
Name="VCALinkTool"
-@@ -488,7 +495,7 @@
+@@ -488,7 +495,7 @@
/>
<Tool
Name="VCCLCompilerTool"
@@ -736,7 +736,7 @@ diff -u misc/Python-2.7.5/PCbuild/_ssl.vcproj misc/build/Python-2.7.5/PCbuild/_s
/>
<Tool
Name="VCManagedResourceCompilerTool"
-@@ -502,7 +509,8 @@
+@@ -502,7 +509,8 @@
/>
<Tool
Name="VCLinkerTool"
@@ -746,10 +746,10 @@ diff -u misc/Python-2.7.5/PCbuild/_ssl.vcproj misc/build/Python-2.7.5/PCbuild/_s
TargetMachine="17"
/>
<Tool
-diff -u misc/Python-2.7.5/PCbuild/_testcapi.vcproj misc/build/Python-2.7.5/PCbuild/_testcapi.vcproj
---- misc/Python-2.7.5/PCbuild/_testcapi.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.5/PCbuild/_testcapi.vcproj 2012-07-30 20:59:37.000000000 -0500
-@@ -55,6 +55,7 @@
+diff -u misc/Python-2.7.5/PCbuild/_testcapi.vcproj misc/build/Python-2.7.5/PCbuild/_testcapi.vcproj
+--- misc/Python-2.7.5/PCbuild/_testcapi.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/_testcapi.vcproj 2012-07-30 20:59:37.000000000 -0500
+@@ -55,6 +55,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1e1F0000"
@@ -757,7 +757,7 @@ diff -u misc/Python-2.7.5/PCbuild/_testcapi.vcproj misc/build/Python-2.7.5/PCbui
/>
<Tool
Name="VCALinkTool"
-@@ -115,6 +116,7 @@
+@@ -115,6 +116,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1e1F0000"
@@ -765,7 +765,7 @@ diff -u misc/Python-2.7.5/PCbuild/_testcapi.vcproj misc/build/Python-2.7.5/PCbui
/>
<Tool
Name="VCALinkTool"
-@@ -175,6 +177,7 @@
+@@ -175,6 +177,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1e1F0000"
@@ -773,7 +773,7 @@ diff -u misc/Python-2.7.5/PCbuild/_testcapi.vcproj misc/build/Python-2.7.5/PCbui
/>
<Tool
Name="VCALinkTool"
-@@ -236,6 +239,7 @@
+@@ -236,6 +239,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1e1F0000"
@@ -781,7 +781,7 @@ diff -u misc/Python-2.7.5/PCbuild/_testcapi.vcproj misc/build/Python-2.7.5/PCbui
/>
<Tool
Name="VCALinkTool"
-@@ -296,6 +300,7 @@
+@@ -296,6 +300,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1e1F0000"
@@ -789,7 +789,7 @@ diff -u misc/Python-2.7.5/PCbuild/_testcapi.vcproj misc/build/Python-2.7.5/PCbui
/>
<Tool
Name="VCALinkTool"
-@@ -358,6 +363,7 @@
+@@ -358,6 +363,7 @@
Name="VCLinkerTool"
BaseAddress="0x1e1F0000"
TargetMachine="17"
@@ -797,7 +797,7 @@ diff -u misc/Python-2.7.5/PCbuild/_testcapi.vcproj misc/build/Python-2.7.5/PCbui
/>
<Tool
Name="VCALinkTool"
-@@ -418,6 +424,7 @@
+@@ -418,6 +424,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1e1F0000"
@@ -805,7 +805,7 @@ diff -u misc/Python-2.7.5/PCbuild/_testcapi.vcproj misc/build/Python-2.7.5/PCbui
/>
<Tool
Name="VCALinkTool"
-@@ -480,6 +487,7 @@
+@@ -480,6 +487,7 @@
Name="VCLinkerTool"
BaseAddress="0x1e1F0000"
TargetMachine="17"
@@ -813,10 +813,10 @@ diff -u misc/Python-2.7.5/PCbuild/_testcapi.vcproj misc/build/Python-2.7.5/PCbui
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.5/PCbuild/_tkinter.vcproj misc/build/Python-2.7.5/PCbuild/_tkinter.vcproj
---- misc/Python-2.7.5/PCbuild/_tkinter.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.5/PCbuild/_tkinter.vcproj 2012-07-30 20:59:37.000000000 -0500
-@@ -57,6 +57,7 @@
+diff -u misc/Python-2.7.5/PCbuild/_tkinter.vcproj misc/build/Python-2.7.5/PCbuild/_tkinter.vcproj
+--- misc/Python-2.7.5/PCbuild/_tkinter.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/_tkinter.vcproj 2012-07-30 20:59:37.000000000 -0500
+@@ -57,6 +57,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="$(tcltkLibDebug)"
@@ -824,7 +824,7 @@ diff -u misc/Python-2.7.5/PCbuild/_tkinter.vcproj misc/build/Python-2.7.5/PCbuil
/>
<Tool
Name="VCALinkTool"
-@@ -119,6 +120,7 @@
+@@ -119,6 +120,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="$(tcltk64LibDebug)"
@@ -832,7 +832,7 @@ diff -u misc/Python-2.7.5/PCbuild/_tkinter.vcproj misc/build/Python-2.7.5/PCbuil
/>
<Tool
Name="VCALinkTool"
-@@ -181,6 +183,7 @@
+@@ -181,6 +183,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="$(tcltkLib)"
@@ -840,7 +840,7 @@ diff -u misc/Python-2.7.5/PCbuild/_tkinter.vcproj misc/build/Python-2.7.5/PCbuil
/>
<Tool
Name="VCALinkTool"
-@@ -244,6 +247,7 @@
+@@ -244,6 +247,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="$(tcltk64Lib)"
@@ -848,7 +848,7 @@ diff -u misc/Python-2.7.5/PCbuild/_tkinter.vcproj misc/build/Python-2.7.5/PCbuil
/>
<Tool
Name="VCALinkTool"
-@@ -306,6 +310,7 @@
+@@ -306,6 +310,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="$(tcltkLib)"
@@ -856,7 +856,7 @@ diff -u misc/Python-2.7.5/PCbuild/_tkinter.vcproj misc/build/Python-2.7.5/PCbuil
/>
<Tool
Name="VCALinkTool"
-@@ -370,6 +375,7 @@
+@@ -370,6 +375,7 @@
Name="VCLinkerTool"
AdditionalDependencies="$(tcltk64Lib)"
TargetMachine="17"
@@ -864,7 +864,7 @@ diff -u misc/Python-2.7.5/PCbuild/_tkinter.vcproj misc/build/Python-2.7.5/PCbuil
/>
<Tool
Name="VCALinkTool"
-@@ -432,6 +438,7 @@
+@@ -432,6 +438,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="$(tcltkLib)"
@@ -872,7 +872,7 @@ diff -u misc/Python-2.7.5/PCbuild/_tkinter.vcproj misc/build/Python-2.7.5/PCbuil
/>
<Tool
Name="VCALinkTool"
-@@ -496,6 +503,7 @@
+@@ -496,6 +503,7 @@
Name="VCLinkerTool"
AdditionalDependencies="$(tcltk64Lib)"
TargetMachine="17"
@@ -880,10 +880,10 @@ diff -u misc/Python-2.7.5/PCbuild/_tkinter.vcproj misc/build/Python-2.7.5/PCbuil
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.5/PCbuild/bdist_wininst.vcproj misc/build/Python-2.7.5/PCbuild/bdist_wininst.vcproj
---- misc/Python-2.7.5/PCbuild/bdist_wininst.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.5/PCbuild/bdist_wininst.vcproj 2012-07-30 20:59:37.000000000 -0500
-@@ -81,8 +81,7 @@
+diff -u misc/Python-2.7.5/PCbuild/bdist_wininst.vcproj misc/build/Python-2.7.5/PCbuild/bdist_wininst.vcproj
+--- misc/Python-2.7.5/PCbuild/bdist_wininst.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/bdist_wininst.vcproj 2012-07-30 20:59:37.000000000 -0500
+@@ -81,8 +81,7 @@
IgnoreDefaultLibraryNames="LIBC"
ProgramDatabaseFile="..\lib\distutils\command\wininst-9.0.pdb"
SubSystem="2"
@@ -893,7 +893,7 @@ diff -u misc/Python-2.7.5/PCbuild/bdist_wininst.vcproj misc/build/Python-2.7.5/P
TargetMachine="1"
/>
<Tool
-@@ -171,8 +170,7 @@
+@@ -171,8 +170,7 @@
IgnoreDefaultLibraryNames="LIBC"
ProgramDatabaseFile="..\lib\distutils\command\wininst-9.0-amd64.pdb"
SubSystem="2"
@@ -903,10 +903,10 @@ diff -u misc/Python-2.7.5/PCbuild/bdist_wininst.vcproj misc/build/Python-2.7.5/P
TargetMachine="17"
/>
<Tool
-diff -u misc/Python-2.7.5/PCbuild/bz2.vcproj misc/build/Python-2.7.5/PCbuild/bz2.vcproj
---- misc/Python-2.7.5/PCbuild/bz2.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.5/PCbuild/bz2.vcproj 2012-07-30 20:59:37.000000000 -0500
-@@ -57,6 +57,7 @@
+diff -u misc/Python-2.7.5/PCbuild/bz2.vcproj misc/build/Python-2.7.5/PCbuild/bz2.vcproj
+--- misc/Python-2.7.5/PCbuild/bz2.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/bz2.vcproj 2012-07-30 20:59:37.000000000 -0500
+@@ -57,6 +57,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1D170000"
@@ -914,7 +914,7 @@ diff -u misc/Python-2.7.5/PCbuild/bz2.vcproj misc/build/Python-2.7.5/PCbuild/bz2
/>
<Tool
Name="VCALinkTool"
-@@ -119,6 +120,7 @@
+@@ -119,6 +120,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1D170000"
@@ -922,7 +922,7 @@ diff -u misc/Python-2.7.5/PCbuild/bz2.vcproj misc/build/Python-2.7.5/PCbuild/bz2
/>
<Tool
Name="VCALinkTool"
-@@ -181,6 +183,7 @@
+@@ -181,6 +183,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1D170000"
@@ -930,7 +930,7 @@ diff -u misc/Python-2.7.5/PCbuild/bz2.vcproj misc/build/Python-2.7.5/PCbuild/bz2
/>
<Tool
Name="VCALinkTool"
-@@ -244,6 +247,7 @@
+@@ -244,6 +247,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1D170000"
@@ -938,7 +938,7 @@ diff -u misc/Python-2.7.5/PCbuild/bz2.vcproj misc/build/Python-2.7.5/PCbuild/bz2
/>
<Tool
Name="VCALinkTool"
-@@ -306,6 +310,7 @@
+@@ -306,6 +310,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1D170000"
@@ -946,7 +946,7 @@ diff -u misc/Python-2.7.5/PCbuild/bz2.vcproj misc/build/Python-2.7.5/PCbuild/bz2
/>
<Tool
Name="VCALinkTool"
-@@ -370,6 +375,7 @@
+@@ -370,6 +375,7 @@
Name="VCLinkerTool"
BaseAddress="0x1D170000"
TargetMachine="17"
@@ -954,7 +954,7 @@ diff -u misc/Python-2.7.5/PCbuild/bz2.vcproj misc/build/Python-2.7.5/PCbuild/bz2
/>
<Tool
Name="VCALinkTool"
-@@ -432,6 +438,7 @@
+@@ -432,6 +438,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1D170000"
@@ -962,7 +962,7 @@ diff -u misc/Python-2.7.5/PCbuild/bz2.vcproj misc/build/Python-2.7.5/PCbuild/bz2
/>
<Tool
Name="VCALinkTool"
-@@ -496,6 +503,7 @@
+@@ -496,6 +503,7 @@
Name="VCLinkerTool"
BaseAddress="0x1D170000"
TargetMachine="17"
@@ -970,10 +970,10 @@ diff -u misc/Python-2.7.5/PCbuild/bz2.vcproj misc/build/Python-2.7.5/PCbuild/bz2
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.5/PCbuild/kill_python.vcproj misc/build/Python-2.7.5/PCbuild/kill_python.vcproj
---- misc/Python-2.7.5/PCbuild/kill_python.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.5/PCbuild/kill_python.vcproj 2012-07-30 20:59:37.000000000 -0500
-@@ -56,6 +56,7 @@
+diff -u misc/Python-2.7.5/PCbuild/kill_python.vcproj misc/build/Python-2.7.5/PCbuild/kill_python.vcproj
+--- misc/Python-2.7.5/PCbuild/kill_python.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/kill_python.vcproj 2012-07-30 20:59:37.000000000 -0500
+@@ -56,6 +56,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName)_d.exe"
SubSystem="1"
@@ -981,7 +981,7 @@ diff -u misc/Python-2.7.5/PCbuild/kill_python.vcproj misc/build/Python-2.7.5/PCb
/>
<Tool
Name="VCALinkTool"
-@@ -117,6 +118,7 @@
+@@ -117,6 +118,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName)_d.exe"
SubSystem="1"
@@ -989,7 +989,7 @@ diff -u misc/Python-2.7.5/PCbuild/kill_python.vcproj misc/build/Python-2.7.5/PCb
/>
<Tool
Name="VCALinkTool"
-@@ -177,6 +179,7 @@
+@@ -177,6 +179,7 @@
<Tool
Name="VCLinkerTool"
SubSystem="1"
@@ -997,7 +997,7 @@ diff -u misc/Python-2.7.5/PCbuild/kill_python.vcproj misc/build/Python-2.7.5/PCb
/>
<Tool
Name="VCALinkTool"
-@@ -238,6 +241,7 @@
+@@ -238,6 +241,7 @@
<Tool
Name="VCLinkerTool"
SubSystem="1"
@@ -1005,10 +1005,10 @@ diff -u misc/Python-2.7.5/PCbuild/kill_python.vcproj misc/build/Python-2.7.5/PCb
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.5/PCbuild/make_buildinfo.vcproj misc/build/Python-2.7.5/PCbuild/make_buildinfo.vcproj
---- misc/Python-2.7.5/PCbuild/make_buildinfo.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.5/PCbuild/make_buildinfo.vcproj 2012-07-30 20:59:37.000000000 -0500
-@@ -61,6 +61,7 @@
+diff -u misc/Python-2.7.5/PCbuild/make_buildinfo.vcproj misc/build/Python-2.7.5/PCbuild/make_buildinfo.vcproj
+--- misc/Python-2.7.5/PCbuild/make_buildinfo.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/make_buildinfo.vcproj 2012-07-30 20:59:37.000000000 -0500
+@@ -61,6 +61,7 @@
OutputFile="$(OutDir)/make_buildinfo.exe"
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
SubSystem="1"
@@ -1016,7 +1016,7 @@ diff -u misc/Python-2.7.5/PCbuild/make_buildinfo.vcproj misc/build/Python-2.7.5/
/>
<Tool
Name="VCALinkTool"
-@@ -119,6 +120,7 @@
+@@ -119,6 +120,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -1024,10 +1024,10 @@ diff -u misc/Python-2.7.5/PCbuild/make_buildinfo.vcproj misc/build/Python-2.7.5/
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.5/PCbuild/make_versioninfo.vcproj misc/build/Python-2.7.5/PCbuild/make_versioninfo.vcproj
---- misc/Python-2.7.5/PCbuild/make_versioninfo.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.5/PCbuild/make_versioninfo.vcproj 2012-07-30 20:59:37.000000000 -0500
-@@ -71,6 +71,7 @@
+diff -u misc/Python-2.7.5/PCbuild/make_versioninfo.vcproj misc/build/Python-2.7.5/PCbuild/make_versioninfo.vcproj
+--- misc/Python-2.7.5/PCbuild/make_versioninfo.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/make_versioninfo.vcproj 2012-07-30 20:59:37.000000000 -0500
+@@ -71,6 +71,7 @@
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
SubSystem="1"
BaseAddress="0x1d000000"
@@ -1035,7 +1035,7 @@ diff -u misc/Python-2.7.5/PCbuild/make_versioninfo.vcproj misc/build/Python-2.7.
/>
<Tool
Name="VCALinkTool"
-@@ -137,6 +138,7 @@
+@@ -137,6 +138,7 @@
<Tool
Name="VCLinkerTool"
OutputFile="$(SolutionDir)make_versioninfo.exe"
@@ -1043,7 +1043,7 @@ diff -u misc/Python-2.7.5/PCbuild/make_versioninfo.vcproj misc/build/Python-2.7.
/>
<Tool
Name="VCALinkTool"
-@@ -214,6 +216,7 @@
+@@ -214,6 +216,7 @@
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
SubSystem="1"
BaseAddress="0x1d000000"
@@ -1051,7 +1051,7 @@ diff -u misc/Python-2.7.5/PCbuild/make_versioninfo.vcproj misc/build/Python-2.7.
/>
<Tool
Name="VCALinkTool"
-@@ -282,6 +285,7 @@
+@@ -282,6 +285,7 @@
Name="VCLinkerTool"
OutputFile="$(SolutionDir)make_versioninfo_d.exe"
TargetMachine="17"
@@ -1059,10 +1059,10 @@ diff -u misc/Python-2.7.5/PCbuild/make_versioninfo.vcproj misc/build/Python-2.7.
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.5/PCbuild/pcbuild.sln misc/build/Python-2.7.5/PCbuild/pcbuild.sln
---- misc/Python-2.7.5/PCbuild/pcbuild.sln 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.5/PCbuild/pcbuild.sln 2012-07-30 21:04:33.000000000 -0500
-@@ -38,17 +38,17 @@
+diff -u misc/Python-2.7.5/PCbuild/pcbuild.sln misc/build/Python-2.7.5/PCbuild/pcbuild.sln
+--- misc/Python-2.7.5/PCbuild/pcbuild.sln 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/pcbuild.sln 2012-07-30 21:04:33.000000000 -0500
+@@ -38,17 +38,17 @@
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
EndProjectSection
EndProject
@@ -1091,7 +1091,7 @@ diff -u misc/Python-2.7.5/PCbuild/pcbuild.sln misc/build/Python-2.7.5/PCbuild/pc
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes_test", "_ctypes_test.vcproj", "{9EC7190A-249F-4180-A900-548FDCF3055F}"
ProjectSection(ProjectDependencies) = postProject
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-@@ -69,12 +69,12 @@
+@@ -69,12 +69,12 @@
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
EndProjectSection
EndProject
@@ -1110,7 +1110,7 @@ diff -u misc/Python-2.7.5/PCbuild/pcbuild.sln misc/build/Python-2.7.5/PCbuild/pc
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ssl", "_ssl.vcproj", "{C6E20F84-3247-4AD6-B051-B073268F73BA}"
ProjectSection(ProjectDependencies) = postProject
{B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}
-@@ -87,16 +87,16 @@
+@@ -87,16 +87,16 @@
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
EndProjectSection
EndProject
@@ -1137,7 +1137,7 @@ diff -u misc/Python-2.7.5/PCbuild/pcbuild.sln misc/build/Python-2.7.5/PCbuild/pc
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "select", "select.vcproj", "{18CAE28C-B454-46C1-87A0-493D91D97F03}"
ProjectSection(ProjectDependencies) = postProject
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-@@ -114,17 +114,17 @@
+@@ -114,17 +114,17 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bdist_wininst", "bdist_wininst.vcproj", "{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}"
EndProject
@@ -1166,10 +1166,10 @@ diff -u misc/Python-2.7.5/PCbuild/pcbuild.sln misc/build/Python-2.7.5/PCbuild/pc
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_multiprocessing", "_multiprocessing.vcproj", "{9E48B300-37D1-11DD-8C41-005056C00008}"
ProjectSection(ProjectDependencies) = postProject
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-diff -u misc/Python-2.7.5/PCbuild/pyexpat.vcproj misc/build/Python-2.7.5/PCbuild/pyexpat.vcproj
---- misc/Python-2.7.5/PCbuild/pyexpat.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.5/PCbuild/pyexpat.vcproj 2012-07-30 20:59:37.000000000 -0500
-@@ -56,6 +56,7 @@
+diff -u misc/Python-2.7.5/PCbuild/pyexpat.vcproj misc/build/Python-2.7.5/PCbuild/pyexpat.vcproj
+--- misc/Python-2.7.5/PCbuild/pyexpat.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/pyexpat.vcproj 2012-07-30 20:59:37.000000000 -0500
+@@ -56,6 +56,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -1177,7 +1177,7 @@ diff -u misc/Python-2.7.5/PCbuild/pyexpat.vcproj misc/build/Python-2.7.5/PCbuild
/>
<Tool
Name="VCALinkTool"
-@@ -117,6 +118,7 @@
+@@ -117,6 +118,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -1185,7 +1185,7 @@ diff -u misc/Python-2.7.5/PCbuild/pyexpat.vcproj misc/build/Python-2.7.5/PCbuild
/>
<Tool
Name="VCALinkTool"
-@@ -178,6 +180,7 @@
+@@ -178,6 +180,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -1193,7 +1193,7 @@ diff -u misc/Python-2.7.5/PCbuild/pyexpat.vcproj misc/build/Python-2.7.5/PCbuild
/>
<Tool
Name="VCALinkTool"
-@@ -240,6 +243,7 @@
+@@ -240,6 +243,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -1201,7 +1201,7 @@ diff -u misc/Python-2.7.5/PCbuild/pyexpat.vcproj misc/build/Python-2.7.5/PCbuild
/>
<Tool
Name="VCALinkTool"
-@@ -301,6 +305,7 @@
+@@ -301,6 +305,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -1209,7 +1209,7 @@ diff -u misc/Python-2.7.5/PCbuild/pyexpat.vcproj misc/build/Python-2.7.5/PCbuild
/>
<Tool
Name="VCALinkTool"
-@@ -364,6 +369,7 @@
+@@ -364,6 +369,7 @@
<Tool
Name="VCLinkerTool"
TargetMachine="17"
@@ -1217,7 +1217,7 @@ diff -u misc/Python-2.7.5/PCbuild/pyexpat.vcproj misc/build/Python-2.7.5/PCbuild
/>
<Tool
Name="VCALinkTool"
-@@ -425,6 +431,7 @@
+@@ -425,6 +431,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -1225,7 +1225,7 @@ diff -u misc/Python-2.7.5/PCbuild/pyexpat.vcproj misc/build/Python-2.7.5/PCbuild
/>
<Tool
Name="VCALinkTool"
-@@ -488,6 +495,7 @@
+@@ -488,6 +495,7 @@
<Tool
Name="VCLinkerTool"
TargetMachine="17"
@@ -1233,10 +1233,10 @@ diff -u misc/Python-2.7.5/PCbuild/pyexpat.vcproj misc/build/Python-2.7.5/PCbuild
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.5/PCbuild/python.vcproj misc/build/Python-2.7.5/PCbuild/python.vcproj
---- misc/Python-2.7.5/PCbuild/python.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.5/PCbuild/python.vcproj 2012-07-30 20:59:37.000000000 -0500
-@@ -66,6 +66,7 @@
+diff -u misc/Python-2.7.5/PCbuild/python.vcproj misc/build/Python-2.7.5/PCbuild/python.vcproj
+--- misc/Python-2.7.5/PCbuild/python.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/python.vcproj 2012-07-30 20:59:37.000000000 -0500
+@@ -66,6 +66,7 @@
SubSystem="1"
StackReserveSize="2000000"
BaseAddress="0x1d000000"
@@ -1244,7 +1244,7 @@ diff -u misc/Python-2.7.5/PCbuild/python.vcproj misc/build/Python-2.7.5/PCbuild/
/>
<Tool
Name="VCALinkTool"
-@@ -139,6 +140,7 @@
+@@ -139,6 +140,7 @@
SubSystem="1"
StackReserveSize="2000000"
BaseAddress="0x1d000000"
@@ -1252,7 +1252,7 @@ diff -u misc/Python-2.7.5/PCbuild/python.vcproj misc/build/Python-2.7.5/PCbuild/
/>
<Tool
Name="VCALinkTool"
-@@ -213,6 +215,7 @@
+@@ -213,6 +215,7 @@
SubSystem="1"
StackReserveSize="2000000"
BaseAddress="0x1d000000"
@@ -1260,7 +1260,7 @@ diff -u misc/Python-2.7.5/PCbuild/python.vcproj misc/build/Python-2.7.5/PCbuild/
/>
<Tool
Name="VCALinkTool"
-@@ -288,6 +291,7 @@
+@@ -288,6 +291,7 @@
SubSystem="1"
StackReserveSize="2100000"
BaseAddress="0x1d000000"
@@ -1268,7 +1268,7 @@ diff -u misc/Python-2.7.5/PCbuild/python.vcproj misc/build/Python-2.7.5/PCbuild/
/>
<Tool
Name="VCALinkTool"
-@@ -361,6 +365,7 @@
+@@ -361,6 +365,7 @@
StackReserveSize="2000000"
BaseAddress="0x1d000000"
ImportLibrary=""
@@ -1276,7 +1276,7 @@ diff -u misc/Python-2.7.5/PCbuild/python.vcproj misc/build/Python-2.7.5/PCbuild/
/>
<Tool
Name="VCALinkTool"
-@@ -436,6 +441,7 @@
+@@ -436,6 +441,7 @@
BaseAddress="0x1d000000"
ImportLibrary=""
TargetMachine="17"
@@ -1284,7 +1284,7 @@ diff -u misc/Python-2.7.5/PCbuild/python.vcproj misc/build/Python-2.7.5/PCbuild/
/>
<Tool
Name="VCALinkTool"
-@@ -509,6 +515,7 @@
+@@ -509,6 +515,7 @@
StackReserveSize="2000000"
BaseAddress="0x1d000000"
ImportLibrary=""
@@ -1292,7 +1292,7 @@ diff -u misc/Python-2.7.5/PCbuild/python.vcproj misc/build/Python-2.7.5/PCbuild/
/>
<Tool
Name="VCALinkTool"
-@@ -584,6 +591,7 @@
+@@ -584,6 +591,7 @@
BaseAddress="0x1d000000"
ImportLibrary=""
TargetMachine="17"
@@ -1300,10 +1300,10 @@ diff -u misc/Python-2.7.5/PCbuild/python.vcproj misc/build/Python-2.7.5/PCbuild/
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.5/PCbuild/pythoncore.vcproj misc/build/Python-2.7.5/PCbuild/pythoncore.vcproj
---- misc/Python-2.7.5/PCbuild/pythoncore.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.5/PCbuild/pythoncore.vcproj 2012-07-30 20:59:37.000000000 -0500
-@@ -69,6 +69,7 @@
+diff -u misc/Python-2.7.5/PCbuild/pythoncore.vcproj misc/build/Python-2.7.5/PCbuild/pythoncore.vcproj
+--- misc/Python-2.7.5/PCbuild/pythoncore.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/pythoncore.vcproj 2012-07-30 20:59:37.000000000 -0500
+@@ -69,6 +69,7 @@
ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"
BaseAddress="0x1e000000"
ImportLibrary="$(OutDir)$(PyDllName).lib"
@@ -1311,7 +1311,7 @@ diff -u misc/Python-2.7.5/PCbuild/pythoncore.vcproj misc/build/Python-2.7.5/PCbu
/>
<Tool
Name="VCALinkTool"
-@@ -144,6 +145,7 @@
+@@ -144,6 +145,7 @@
ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"
BaseAddress="0x1e000000"
ImportLibrary="$(OutDir)$(PyDllName).lib"
@@ -1319,7 +1319,7 @@ diff -u misc/Python-2.7.5/PCbuild/pythoncore.vcproj misc/build/Python-2.7.5/PCbu
/>
<Tool
Name="VCALinkTool"
-@@ -222,6 +224,7 @@
+@@ -222,6 +224,7 @@
ProgramDatabaseFile="$(OutDir)$(PyDllName)_d.pdb"
BaseAddress="0x1e000000"
ImportLibrary="$(OutDir)$(PyDllName)_d.lib"
@@ -1327,7 +1327,7 @@ diff -u misc/Python-2.7.5/PCbuild/pythoncore.vcproj misc/build/Python-2.7.5/PCbu
/>
<Tool
Name="VCALinkTool"
-@@ -300,6 +303,7 @@
+@@ -300,6 +303,7 @@
ProgramDatabaseFile="$(OutDir)$(PyDllName)_d.pdb"
BaseAddress="0x1e000000"
ImportLibrary="$(OutDir)$(PyDllName)_d.lib"
@@ -1335,7 +1335,7 @@ diff -u misc/Python-2.7.5/PCbuild/pythoncore.vcproj misc/build/Python-2.7.5/PCbu
/>
<Tool
Name="VCALinkTool"
-@@ -374,6 +378,7 @@
+@@ -374,6 +378,7 @@
ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"
BaseAddress="0x1e000000"
ImportLibrary="$(OutDirPGI)$(PyDllName).lib"
@@ -1343,7 +1343,7 @@ diff -u misc/Python-2.7.5/PCbuild/pythoncore.vcproj misc/build/Python-2.7.5/PCbu
/>
<Tool
Name="VCALinkTool"
-@@ -450,6 +455,7 @@
+@@ -450,6 +455,7 @@
BaseAddress="0x1e000000"
ImportLibrary="$(OutDirPGI)$(PyDllName).lib"
TargetMachine="17"
@@ -1351,7 +1351,7 @@ diff -u misc/Python-2.7.5/PCbuild/pythoncore.vcproj misc/build/Python-2.7.5/PCbu
/>
<Tool
Name="VCALinkTool"
-@@ -524,6 +530,7 @@
+@@ -524,6 +530,7 @@
ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"
BaseAddress="0x1e000000"
ImportLibrary="$(OutDirPGI)$(PyDllName).lib"
@@ -1359,7 +1359,7 @@ diff -u misc/Python-2.7.5/PCbuild/pythoncore.vcproj misc/build/Python-2.7.5/PCbu
/>
<Tool
Name="VCALinkTool"
-@@ -600,6 +607,7 @@
+@@ -600,6 +607,7 @@
BaseAddress="0x1e000000"
ImportLibrary="$(OutDirPGI)$(PyDllName).lib"
TargetMachine="17"
@@ -1367,17 +1367,17 @@ diff -u misc/Python-2.7.5/PCbuild/pythoncore.vcproj misc/build/Python-2.7.5/PCbu
/>
<Tool
Name="VCALinkTool"
-@@ -1874,4 +1882,4 @@
+@@ -1874,4 +1882,4 @@
</Files>
<Globals>
</Globals>
-</VisualStudioProject>
-\ No newline at end of file
+\ No newline at end of file
+</VisualStudioProject>
-diff -u misc/Python-2.7.5/PCbuild/pythonw.vcproj misc/build/Python-2.7.5/PCbuild/pythonw.vcproj
---- misc/Python-2.7.5/PCbuild/pythonw.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.5/PCbuild/pythonw.vcproj 2012-07-30 20:59:37.000000000 -0500
-@@ -66,6 +66,7 @@
+diff -u misc/Python-2.7.5/PCbuild/pythonw.vcproj misc/build/Python-2.7.5/PCbuild/pythonw.vcproj
+--- misc/Python-2.7.5/PCbuild/pythonw.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/pythonw.vcproj 2012-07-30 20:59:37.000000000 -0500
+@@ -66,6 +66,7 @@
StackReserveSize="2000000"
BaseAddress="0x1d000000"
TargetMachine="1"
@@ -1385,7 +1385,7 @@ diff -u misc/Python-2.7.5/PCbuild/pythonw.vcproj misc/build/Python-2.7.5/PCbuild
/>
<Tool
Name="VCALinkTool"
-@@ -137,6 +138,7 @@
+@@ -137,6 +138,7 @@
OutputFile="$(OutDir)\pythonw_d.exe"
StackReserveSize="2000000"
BaseAddress="0x1d000000"
@@ -1393,7 +1393,7 @@ diff -u misc/Python-2.7.5/PCbuild/pythonw.vcproj misc/build/Python-2.7.5/PCbuild
/>
<Tool
Name="VCALinkTool"
-@@ -208,6 +210,7 @@
+@@ -208,6 +210,7 @@
StackReserveSize="2000000"
BaseAddress="0x1d000000"
TargetMachine="1"
@@ -1401,7 +1401,7 @@ diff -u misc/Python-2.7.5/PCbuild/pythonw.vcproj misc/build/Python-2.7.5/PCbuild
/>
<Tool
Name="VCALinkTool"
-@@ -279,6 +282,7 @@
+@@ -279,6 +282,7 @@
OutputFile="$(OutDir)\pythonw.exe"
StackReserveSize="2000000"
BaseAddress="0x1d000000"
@@ -1409,7 +1409,7 @@ diff -u misc/Python-2.7.5/PCbuild/pythonw.vcproj misc/build/Python-2.7.5/PCbuild
/>
<Tool
Name="VCALinkTool"
-@@ -351,6 +355,7 @@
+@@ -351,6 +355,7 @@
BaseAddress="0x1d000000"
ImportLibrary=""
TargetMachine="1"
@@ -1417,7 +1417,7 @@ diff -u misc/Python-2.7.5/PCbuild/pythonw.vcproj misc/build/Python-2.7.5/PCbuild
/>
<Tool
Name="VCALinkTool"
-@@ -424,6 +429,7 @@
+@@ -424,6 +429,7 @@
BaseAddress="0x1d000000"
ImportLibrary=""
TargetMachine="17"
@@ -1425,7 +1425,7 @@ diff -u misc/Python-2.7.5/PCbuild/pythonw.vcproj misc/build/Python-2.7.5/PCbuild
/>
<Tool
Name="VCALinkTool"
-@@ -496,6 +502,7 @@
+@@ -496,6 +502,7 @@
BaseAddress="0x1d000000"
ImportLibrary=""
TargetMachine="1"
@@ -1433,7 +1433,7 @@ diff -u misc/Python-2.7.5/PCbuild/pythonw.vcproj misc/build/Python-2.7.5/PCbuild
/>
<Tool
Name="VCALinkTool"
-@@ -569,6 +576,7 @@
+@@ -569,6 +576,7 @@
BaseAddress="0x1d000000"
ImportLibrary=""
TargetMachine="17"
@@ -1441,10 +1441,10 @@ diff -u misc/Python-2.7.5/PCbuild/pythonw.vcproj misc/build/Python-2.7.5/PCbuild
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.5/PCbuild/select.vcproj misc/build/Python-2.7.5/PCbuild/select.vcproj
---- misc/Python-2.7.5/PCbuild/select.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.5/PCbuild/select.vcproj 2012-07-30 20:59:37.000000000 -0500
-@@ -57,6 +57,7 @@
+diff -u misc/Python-2.7.5/PCbuild/select.vcproj misc/build/Python-2.7.5/PCbuild/select.vcproj
+--- misc/Python-2.7.5/PCbuild/select.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/select.vcproj 2012-07-30 20:59:37.000000000 -0500
+@@ -57,6 +57,7 @@
AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000"
@@ -1452,7 +1452,7 @@ diff -u misc/Python-2.7.5/PCbuild/select.vcproj misc/build/Python-2.7.5/PCbuild/
/>
<Tool
Name="VCALinkTool"
-@@ -119,6 +120,7 @@
+@@ -119,6 +120,7 @@
AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000"
@@ -1460,7 +1460,7 @@ diff -u misc/Python-2.7.5/PCbuild/select.vcproj misc/build/Python-2.7.5/PCbuild/
/>
<Tool
Name="VCALinkTool"
-@@ -181,6 +183,7 @@
+@@ -181,6 +183,7 @@
AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000"
@@ -1468,7 +1468,7 @@ diff -u misc/Python-2.7.5/PCbuild/select.vcproj misc/build/Python-2.7.5/PCbuild/
/>
<Tool
Name="VCALinkTool"
-@@ -244,6 +247,7 @@
+@@ -244,6 +247,7 @@
AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000"
@@ -1476,7 +1476,7 @@ diff -u misc/Python-2.7.5/PCbuild/select.vcproj misc/build/Python-2.7.5/PCbuild/
/>
<Tool
Name="VCALinkTool"
-@@ -306,6 +310,7 @@
+@@ -306,6 +310,7 @@
AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000"
@@ -1484,7 +1484,7 @@ diff -u misc/Python-2.7.5/PCbuild/select.vcproj misc/build/Python-2.7.5/PCbuild/
/>
<Tool
Name="VCALinkTool"
-@@ -370,6 +375,7 @@
+@@ -370,6 +375,7 @@
IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000"
TargetMachine="17"
@@ -1492,7 +1492,7 @@ diff -u misc/Python-2.7.5/PCbuild/select.vcproj misc/build/Python-2.7.5/PCbuild/
/>
<Tool
Name="VCALinkTool"
-@@ -432,6 +438,7 @@
+@@ -432,6 +438,7 @@
AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000"
@@ -1500,7 +1500,7 @@ diff -u misc/Python-2.7.5/PCbuild/select.vcproj misc/build/Python-2.7.5/PCbuild/
/>
<Tool
Name="VCALinkTool"
-@@ -496,6 +503,7 @@
+@@ -496,6 +503,7 @@
IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000"
TargetMachine="17"
@@ -1508,10 +1508,10 @@ diff -u misc/Python-2.7.5/PCbuild/select.vcproj misc/build/Python-2.7.5/PCbuild/
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.5/PCbuild/sqlite3.vcproj misc/build/Python-2.7.5/PCbuild/sqlite3.vcproj
---- misc/Python-2.7.5/PCbuild/sqlite3.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.5/PCbuild/sqlite3.vcproj 2012-07-30 20:59:37.000000000 -0500
-@@ -56,6 +56,7 @@
+diff -u misc/Python-2.7.5/PCbuild/sqlite3.vcproj misc/build/Python-2.7.5/PCbuild/sqlite3.vcproj
+--- misc/Python-2.7.5/PCbuild/sqlite3.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/sqlite3.vcproj 2012-07-30 20:59:37.000000000 -0500
+@@ -56,6 +56,7 @@
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName)_d.dll"
@@ -1519,7 +1519,7 @@ diff -u misc/Python-2.7.5/PCbuild/sqlite3.vcproj misc/build/Python-2.7.5/PCbuild
/>
<Tool
Name="VCALinkTool"
-@@ -117,6 +118,7 @@
+@@ -117,6 +118,7 @@
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName)_d.dll"
@@ -1527,7 +1527,7 @@ diff -u misc/Python-2.7.5/PCbuild/sqlite3.vcproj misc/build/Python-2.7.5/PCbuild
/>
<Tool
Name="VCALinkTool"
-@@ -178,6 +180,7 @@
+@@ -178,6 +180,7 @@
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).dll"
@@ -1535,7 +1535,7 @@ diff -u misc/Python-2.7.5/PCbuild/sqlite3.vcproj misc/build/Python-2.7.5/PCbuild
/>
<Tool
Name="VCALinkTool"
-@@ -240,6 +243,7 @@
+@@ -240,6 +243,7 @@
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).dll"
@@ -1543,7 +1543,7 @@ diff -u misc/Python-2.7.5/PCbuild/sqlite3.vcproj misc/build/Python-2.7.5/PCbuild
/>
<Tool
Name="VCALinkTool"
-@@ -301,6 +305,7 @@
+@@ -301,6 +305,7 @@
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).dll"
@@ -1551,7 +1551,7 @@ diff -u misc/Python-2.7.5/PCbuild/sqlite3.vcproj misc/build/Python-2.7.5/PCbuild
/>
<Tool
Name="VCALinkTool"
-@@ -362,6 +367,7 @@
+@@ -362,6 +367,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -1559,7 +1559,7 @@ diff -u misc/Python-2.7.5/PCbuild/sqlite3.vcproj misc/build/Python-2.7.5/PCbuild
/>
<Tool
Name="VCALinkTool"
-@@ -423,6 +429,7 @@
+@@ -423,6 +429,7 @@
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).dll"
@@ -1567,7 +1567,7 @@ diff -u misc/Python-2.7.5/PCbuild/sqlite3.vcproj misc/build/Python-2.7.5/PCbuild
/>
<Tool
Name="VCALinkTool"
-@@ -484,6 +491,7 @@
+@@ -484,6 +491,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -1575,10 +1575,10 @@ diff -u misc/Python-2.7.5/PCbuild/sqlite3.vcproj misc/build/Python-2.7.5/PCbuild
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.5/PCbuild/unicodedata.vcproj misc/build/Python-2.7.5/PCbuild/unicodedata.vcproj
---- misc/Python-2.7.5/PCbuild/unicodedata.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.5/PCbuild/unicodedata.vcproj 2012-07-30 20:59:37.000000000 -0500
-@@ -55,6 +55,7 @@
+diff -u misc/Python-2.7.5/PCbuild/unicodedata.vcproj misc/build/Python-2.7.5/PCbuild/unicodedata.vcproj
+--- misc/Python-2.7.5/PCbuild/unicodedata.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/unicodedata.vcproj 2012-07-30 20:59:37.000000000 -0500
+@@ -55,6 +55,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1D120000"
@@ -1586,7 +1586,7 @@ diff -u misc/Python-2.7.5/PCbuild/unicodedata.vcproj misc/build/Python-2.7.5/PCb
/>
<Tool
Name="VCALinkTool"
-@@ -115,6 +116,7 @@
+@@ -115,6 +116,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1D120000"
@@ -1594,7 +1594,7 @@ diff -u misc/Python-2.7.5/PCbuild/unicodedata.vcproj misc/build/Python-2.7.5/PCb
/>
<Tool
Name="VCALinkTool"
-@@ -175,6 +177,7 @@
+@@ -175,6 +177,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1D120000"
@@ -1602,7 +1602,7 @@ diff -u misc/Python-2.7.5/PCbuild/unicodedata.vcproj misc/build/Python-2.7.5/PCb
/>
<Tool
Name="VCALinkTool"
-@@ -236,6 +239,7 @@
+@@ -236,6 +239,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1D120000"
@@ -1610,7 +1610,7 @@ diff -u misc/Python-2.7.5/PCbuild/unicodedata.vcproj misc/build/Python-2.7.5/PCb
/>
<Tool
Name="VCALinkTool"
-@@ -296,6 +300,7 @@
+@@ -296,6 +300,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1D120000"
@@ -1618,7 +1618,7 @@ diff -u misc/Python-2.7.5/PCbuild/unicodedata.vcproj misc/build/Python-2.7.5/PCb
/>
<Tool
Name="VCALinkTool"
-@@ -358,6 +363,7 @@
+@@ -358,6 +363,7 @@
Name="VCLinkerTool"
BaseAddress="0x1D120000"
TargetMachine="17"
@@ -1626,7 +1626,7 @@ diff -u misc/Python-2.7.5/PCbuild/unicodedata.vcproj misc/build/Python-2.7.5/PCb
/>
<Tool
Name="VCALinkTool"
-@@ -418,6 +424,7 @@
+@@ -418,6 +424,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1D120000"
@@ -1634,7 +1634,7 @@ diff -u misc/Python-2.7.5/PCbuild/unicodedata.vcproj misc/build/Python-2.7.5/PCb
/>
<Tool
Name="VCALinkTool"
-@@ -480,6 +487,7 @@
+@@ -480,6 +487,7 @@
Name="VCLinkerTool"
BaseAddress="0x1D120000"
TargetMachine="17"
@@ -1642,10 +1642,10 @@ diff -u misc/Python-2.7.5/PCbuild/unicodedata.vcproj misc/build/Python-2.7.5/PCb
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.5/PCbuild/w9xpopen.vcproj misc/build/Python-2.7.5/PCbuild/w9xpopen.vcproj
---- misc/Python-2.7.5/PCbuild/w9xpopen.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.5/PCbuild/w9xpopen.vcproj 2012-07-30 20:59:37.000000000 -0500
-@@ -59,6 +59,7 @@
+diff -u misc/Python-2.7.5/PCbuild/w9xpopen.vcproj misc/build/Python-2.7.5/PCbuild/w9xpopen.vcproj
+--- misc/Python-2.7.5/PCbuild/w9xpopen.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/w9xpopen.vcproj 2012-07-30 20:59:37.000000000 -0500
+@@ -59,6 +59,7 @@
<Tool
Name="VCLinkerTool"
SubSystem="1"
@@ -1653,7 +1653,7 @@ diff -u misc/Python-2.7.5/PCbuild/w9xpopen.vcproj misc/build/Python-2.7.5/PCbuil
/>
<Tool
Name="VCALinkTool"
-@@ -124,6 +125,7 @@
+@@ -124,6 +125,7 @@
<Tool
Name="VCLinkerTool"
SubSystem="1"
@@ -1661,7 +1661,7 @@ diff -u misc/Python-2.7.5/PCbuild/w9xpopen.vcproj misc/build/Python-2.7.5/PCbuil
/>
<Tool
Name="VCALinkTool"
-@@ -191,6 +193,7 @@
+@@ -191,6 +193,7 @@
Name="VCLinkerTool"
GenerateDebugInformation="false"
SubSystem="1"
@@ -1669,7 +1669,7 @@ diff -u misc/Python-2.7.5/PCbuild/w9xpopen.vcproj misc/build/Python-2.7.5/PCbuil
/>
<Tool
Name="VCALinkTool"
-@@ -259,6 +262,7 @@
+@@ -259,6 +262,7 @@
Name="VCLinkerTool"
GenerateDebugInformation="false"
SubSystem="1"
@@ -1677,7 +1677,7 @@ diff -u misc/Python-2.7.5/PCbuild/w9xpopen.vcproj misc/build/Python-2.7.5/PCbuil
/>
<Tool
Name="VCALinkTool"
-@@ -327,6 +331,7 @@
+@@ -327,6 +331,7 @@
GenerateDebugInformation="false"
SubSystem="1"
ImportLibrary=""
@@ -1685,7 +1685,7 @@ diff -u misc/Python-2.7.5/PCbuild/w9xpopen.vcproj misc/build/Python-2.7.5/PCbuil
/>
<Tool
Name="VCALinkTool"
-@@ -397,6 +402,7 @@
+@@ -397,6 +402,7 @@
SubSystem="1"
ImportLibrary=""
TargetMachine="17"
@@ -1693,7 +1693,7 @@ diff -u misc/Python-2.7.5/PCbuild/w9xpopen.vcproj misc/build/Python-2.7.5/PCbuil
/>
<Tool
Name="VCALinkTool"
-@@ -465,6 +471,7 @@
+@@ -465,6 +471,7 @@
GenerateDebugInformation="false"
SubSystem="1"
ImportLibrary=""
@@ -1701,7 +1701,7 @@ diff -u misc/Python-2.7.5/PCbuild/w9xpopen.vcproj misc/build/Python-2.7.5/PCbuil
/>
<Tool
Name="VCALinkTool"
-@@ -535,6 +542,7 @@
+@@ -535,6 +542,7 @@
SubSystem="1"
ImportLibrary=""
TargetMachine="17"
@@ -1709,10 +1709,10 @@ diff -u misc/Python-2.7.5/PCbuild/w9xpopen.vcproj misc/build/Python-2.7.5/PCbuil
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.5/PCbuild/winsound.vcproj misc/build/Python-2.7.5/PCbuild/winsound.vcproj
---- misc/Python-2.7.5/PCbuild/winsound.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.5/PCbuild/winsound.vcproj 2012-07-30 20:59:37.000000000 -0500
-@@ -55,6 +55,7 @@
+diff -u misc/Python-2.7.5/PCbuild/winsound.vcproj misc/build/Python-2.7.5/PCbuild/winsound.vcproj
+--- misc/Python-2.7.5/PCbuild/winsound.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/winsound.vcproj 2012-07-30 20:59:37.000000000 -0500
+@@ -55,6 +55,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="winmm.lib"
@@ -1720,7 +1720,7 @@ diff -u misc/Python-2.7.5/PCbuild/winsound.vcproj misc/build/Python-2.7.5/PCbuil
/>
<Tool
Name="VCALinkTool"
-@@ -115,6 +116,7 @@
+@@ -115,6 +116,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="winmm.lib"
@@ -1728,7 +1728,7 @@ diff -u misc/Python-2.7.5/PCbuild/winsound.vcproj misc/build/Python-2.7.5/PCbuil
/>
<Tool
Name="VCALinkTool"
-@@ -175,6 +177,7 @@
+@@ -175,6 +177,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="winmm.lib"
@@ -1736,7 +1736,7 @@ diff -u misc/Python-2.7.5/PCbuild/winsound.vcproj misc/build/Python-2.7.5/PCbuil
/>
<Tool
Name="VCALinkTool"
-@@ -236,6 +239,7 @@
+@@ -236,6 +239,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="winmm.lib"
@@ -1744,7 +1744,7 @@ diff -u misc/Python-2.7.5/PCbuild/winsound.vcproj misc/build/Python-2.7.5/PCbuil
/>
<Tool
Name="VCALinkTool"
-@@ -296,6 +300,7 @@
+@@ -296,6 +300,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="winmm.lib"
@@ -1752,7 +1752,7 @@ diff -u misc/Python-2.7.5/PCbuild/winsound.vcproj misc/build/Python-2.7.5/PCbuil
/>
<Tool
Name="VCALinkTool"
-@@ -358,6 +363,7 @@
+@@ -358,6 +363,7 @@
Name="VCLinkerTool"
AdditionalDependencies="winmm.lib"
TargetMachine="17"
@@ -1760,7 +1760,7 @@ diff -u misc/Python-2.7.5/PCbuild/winsound.vcproj misc/build/Python-2.7.5/PCbuil
/>
<Tool
Name="VCALinkTool"
-@@ -418,6 +424,7 @@
+@@ -418,6 +424,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="winmm.lib"
@@ -1768,7 +1768,7 @@ diff -u misc/Python-2.7.5/PCbuild/winsound.vcproj misc/build/Python-2.7.5/PCbuil
/>
<Tool
Name="VCALinkTool"
-@@ -480,6 +487,7 @@
+@@ -480,6 +487,7 @@
Name="VCLinkerTool"
AdditionalDependencies="winmm.lib"
TargetMachine="17"
diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk
index 332c0ca..0fc033e 100644
--- a/solenv/inc/tg_ext.mk
+++ b/solenv/inc/tg_ext.mk
@@ -182,13 +182,7 @@ $(PACKAGE_DIR)/$(PATCH_FLAG_FILE) : $(PACKAGE_DIR)/$(ADD_FILES_FLAG_FILE)
$(COMMAND_ECHO)$(TOUCH) $@
.ELSE # "$(PATCH_FILES)"=="none" || "$(PATCH_FILES)"==""
.IF "$(GUI)"=="WNT"
-# hack to make 4nt version 4,01 work and still get propper
-# errorcodes for versions < 3,00
-#.IF "$(my4ver:s/.//:s/,//)" >= "300"
-# $(COMMAND_ECHO)cd $(PACKAGE_DIR) && ( $(TYPE:s/+//) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d "\015" | patch $(PATCHFLAGS) -p2 ) && $(TOUCH) $(PATCH_FLAG_FILE)
-#.ELSE # "$(my4ver:s/.//:s/,//)" >= "300"
- $(COMMAND_ECHO)cd $(PACKAGE_DIR) && $(TYPE:s/+//) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d "\015" | patch $(PATCHFLAGS) -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
-#.ENDIF # "$(my4ver:s/.//:s/,//)" >= "300"
+ $(COMMAND_ECHO)cd $(PACKAGE_DIR) && $(TYPE:s/+//) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | patch $(PATCHFLAGS) -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
.ELSE # "$(GUI)"=="WNT"
.IF "$(BSCLIENT)"=="TRUE"
$(COMMAND_ECHO)cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | $(GNUPATCH) -f $(PATCHFLAGS) -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
@@ -309,13 +303,7 @@ $(MISC)/$(TARFILE_ROOTDIR).done : $(MISC)/$(TARFILE_MD5)-$(TARFILE_NAME).unpack
$(CONVERT) unix $(foreach,i,$(CONVERTFILES) $(MISC)/$(TARFILE_ROOTDIR)/$i)
.ENDIF # "$(CONVERTFILES)"!=""
.IF "$(GUI)"=="WNT"
-# hack to make 4nt version 4,01 work and still get propper
-# errorcodes for versions < 3,00
-#.IF "$(my4ver:s/.//:s/,//)" >= "300"
-# $(COMMAND_ECHO)cd $(MISC) && ( $(TYPE:s/+//) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d "\015" | patch $(PATCHFLAGS) -p2 )
-#.ELSE # "$(my4ver:s/.//:s/,//)" >= "300"
- $(COMMAND_ECHO)cd $(MISC) && $(TYPE:s/+//) $(MBACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d "\015" | patch $(PATCHFLAGS) -p2
-#.ENDIF # "$(my4ver:s/.//:s/,//)" >= "300"
+ $(COMMAND_ECHO)cd $(MISC) && $(TYPE:s/+//) $(MBACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | patch $(PATCHFLAGS) -p2
.ELSE # "$(GUI)"=="WNT"
.IF "$(BSCLIENT)"=="TRUE"
$(COMMAND_ECHO)cd $(MISC) && $(TYPE) $(MBACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | $(GNUPATCH) -f $(PATCHFLAGS) -p2
commit c15b0362495a8755761990c9284fd0cfb25fe39c
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date: Fri Aug 2 11:33:22 2013 +0000
122937: include needed jars in 'javah' call to enable build with JDK 1.7 under Windows
diff --git a/accessibility/bridge/source/java/makefile.mk b/accessibility/bridge/source/java/makefile.mk
index 4ec98fe..d19f88f 100644
--- a/accessibility/bridge/source/java/makefile.mk
+++ b/accessibility/bridge/source/java/makefile.mk
@@ -61,6 +61,6 @@ SHL1HEADER=$(OUT)$/inc$/WindowsAccessBridgeAdapter.h
$(SLO)$/WindowsAccessBridgeAdapter.obj : $(SHL1HEADER)
$(SHL1HEADER) :
- javah -classpath $(OUT)$/class -o $(SHL1HEADER) org.openoffice.accessibility.WindowsAccessBridgeAdapter
+ javah -classpath "$(OUT)$/class;$(OUTDIR)$/bin/ridl.jar;$(OUTDIR)$/bin/unoil.jar;$(CLASSPATH)" -o $(SHL1HEADER) org.openoffice.accessibility.WindowsAccessBridgeAdapter
.ENDIF # "$(GUI)"=="WNT"
More information about the Libreoffice-commits
mailing list