incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p..@apache.org
Subject svn commit: r1367398 - in /incubator/ooo/trunk/main/python: makefile.mk python-2.7.3-pcbuild.patch python-2.7.3.patch python-solaris.patch
Date Tue, 31 Jul 2012 02:35:12 GMT
Author: pfg
Date: Tue Jul 31 02:35:11 2012
New Revision: 1367398

URL: http://svn.apache.org/viewvc?rev=1367398&view=rev
Log:
Re-sort PCBuild patches in python directory.

Comment out the _sqlite3 module in pcbuild.sln to resolve issues
building with debug support. While here move the patch to the
specific PCbuild file and apply only when we are building on
Windows.

Rename the remaining change in python-2.7.3.patch to a solaris
specific patch.

Original issue reported by alg@ and others.
Solution suggested by Lin Yuan.  

Added:
    incubator/ooo/trunk/main/python/python-solaris.patch
      - copied, changed from r1366579, incubator/ooo/trunk/main/python/python-2.7.3.patch
Removed:
    incubator/ooo/trunk/main/python/python-2.7.3.patch
Modified:
    incubator/ooo/trunk/main/python/makefile.mk
    incubator/ooo/trunk/main/python/python-2.7.3-pcbuild.patch

Modified: incubator/ooo/trunk/main/python/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/python/makefile.mk?rev=1367398&r1=1367397&r2=1367398&view=diff
==============================================================================
--- incubator/ooo/trunk/main/python/makefile.mk (original)
+++ incubator/ooo/trunk/main/python/makefile.mk Tue Jul 31 02:35:11 2012
@@ -44,13 +44,12 @@ all:
 TARFILE_NAME=Python-$(PYVERSION)
 TARFILE_MD5=c57477edd6d18bd9eeca2f21add73919
 PATCH_FILES=\
-	python-$(PYVERSION).patch \
+	python-solaris.patch \
 	python-freebsd.patch \
 	python-md5.patch \
 	python-ssl.patch \
 	python-$(PYVERSION)-sysbase.patch \
-	python-$(PYVERSION)-nohardlink.patch \
-	python-$(PYVERSION)-pcbuild.patch
+	python-$(PYVERSION)-nohardlink.patch
 
 CONFIGURE_DIR=
 
@@ -110,6 +109,8 @@ BUILD_ACTION=$(ENV_BUILD) make && make i
 
 BUILD_DIR=PCbuild
 
+PATCH_FILES=python-$(PYVERSION)-pcbuild.patch
+
 # Build python executable and then runs a minimal script. Running the minimal script
 # ensures that certain *.pyc files are generated which would otherwise be created on
 # solver during registration in insetoo_native

Modified: incubator/ooo/trunk/main/python/python-2.7.3-pcbuild.patch
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/python/python-2.7.3-pcbuild.patch?rev=1367398&r1=1367397&r2=1367398&view=diff
==============================================================================
--- incubator/ooo/trunk/main/python/python-2.7.3-pcbuild.patch (original)
+++ incubator/ooo/trunk/main/python/python-2.7.3-pcbuild.patch Tue Jul 31 02:35:11 2012
@@ -1,6 +1,6 @@
 diff -u misc/Python-2.7.3/PCbuild/_bsddb.vcproj misc/build/Python-2.7.3/PCbuild/_bsddb.vcproj
 --- misc/Python-2.7.3/PCbuild/_bsddb.vcproj	2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.3/PCbuild/_bsddb.vcproj	2012-07-25 18:42:53.000000000 -0500
++++ misc/build/Python-2.7.3/PCbuild/_bsddb.vcproj	2012-07-30 20:59:37.000000000 -0500
 @@ -56,6 +56,7 @@
  			/>
  			<Tool
@@ -67,7 +67,7 @@ diff -u misc/Python-2.7.3/PCbuild/_bsddb
  				TargetMachine="17"
 diff -u misc/Python-2.7.3/PCbuild/_ctypes.vcproj misc/build/Python-2.7.3/PCbuild/_ctypes.vcproj
 --- misc/Python-2.7.3/PCbuild/_ctypes.vcproj	2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.3/PCbuild/_ctypes.vcproj	2012-07-25 18:42:54.000000000 -0500
++++ misc/build/Python-2.7.3/PCbuild/_ctypes.vcproj	2012-07-30 20:59:37.000000000 -0500
 @@ -177,7 +177,7 @@
  			/>
  			<Tool
@@ -124,7 +124,7 @@ diff -u misc/Python-2.7.3/PCbuild/_ctype
  				TargetMachine="17"
 diff -u misc/Python-2.7.3/PCbuild/_ctypes_test.vcproj misc/build/Python-2.7.3/PCbuild/_ctypes_test.vcproj
 --- misc/Python-2.7.3/PCbuild/_ctypes_test.vcproj	2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.3/PCbuild/_ctypes_test.vcproj	2012-07-25 18:42:54.000000000 -0500
++++ misc/build/Python-2.7.3/PCbuild/_ctypes_test.vcproj	2012-07-30 20:59:37.000000000 -0500
 @@ -54,6 +54,7 @@
  			/>
  			<Tool
@@ -191,7 +191,7 @@ diff -u misc/Python-2.7.3/PCbuild/_ctype
  				Name="VCALinkTool"
 diff -u misc/Python-2.7.3/PCbuild/_elementtree.vcproj misc/build/Python-2.7.3/PCbuild/_elementtree.vcproj
 --- misc/Python-2.7.3/PCbuild/_elementtree.vcproj	2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.3/PCbuild/_elementtree.vcproj	2012-07-25 18:42:54.000000000 -0500
++++ misc/build/Python-2.7.3/PCbuild/_elementtree.vcproj	2012-07-30 20:59:37.000000000 -0500
 @@ -57,6 +57,7 @@
  			<Tool
  				Name="VCLinkerTool"
@@ -258,7 +258,7 @@ diff -u misc/Python-2.7.3/PCbuild/_eleme
  				Name="VCALinkTool"
 diff -u misc/Python-2.7.3/PCbuild/_hashlib.vcproj misc/build/Python-2.7.3/PCbuild/_hashlib.vcproj
 --- misc/Python-2.7.3/PCbuild/_hashlib.vcproj	2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.3/PCbuild/_hashlib.vcproj	2012-07-25 18:42:54.000000000 -0500
++++ misc/build/Python-2.7.3/PCbuild/_hashlib.vcproj	2012-07-30 20:59:37.000000000 -0500
 @@ -58,6 +58,7 @@
  			<Tool
  				Name="VCLinkerTool"
@@ -325,7 +325,7 @@ diff -u misc/Python-2.7.3/PCbuild/_hashl
  				Name="VCALinkTool"
 diff -u misc/Python-2.7.3/PCbuild/_msi.vcproj misc/build/Python-2.7.3/PCbuild/_msi.vcproj
 --- misc/Python-2.7.3/PCbuild/_msi.vcproj	2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.3/PCbuild/_msi.vcproj	2012-07-25 18:42:54.000000000 -0500
++++ misc/build/Python-2.7.3/PCbuild/_msi.vcproj	2012-07-30 20:59:37.000000000 -0500
 @@ -56,6 +56,7 @@
  				Name="VCLinkerTool"
  				AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
@@ -392,7 +392,7 @@ diff -u misc/Python-2.7.3/PCbuild/_msi.v
  				Name="VCALinkTool"
 diff -u misc/Python-2.7.3/PCbuild/_multiprocessing.vcproj misc/build/Python-2.7.3/PCbuild/_multiprocessing.vcproj
 --- misc/Python-2.7.3/PCbuild/_multiprocessing.vcproj	2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.3/PCbuild/_multiprocessing.vcproj	2012-07-25 18:42:54.000000000
-0500
++++ misc/build/Python-2.7.3/PCbuild/_multiprocessing.vcproj	2012-07-30 20:59:37.000000000
-0500
 @@ -56,6 +56,7 @@
  				Name="VCLinkerTool"
  				AdditionalDependencies="ws2_32.lib"
@@ -459,7 +459,7 @@ diff -u misc/Python-2.7.3/PCbuild/_multi
  				Name="VCALinkTool"
 diff -u misc/Python-2.7.3/PCbuild/_socket.vcproj misc/build/Python-2.7.3/PCbuild/_socket.vcproj
 --- misc/Python-2.7.3/PCbuild/_socket.vcproj	2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.3/PCbuild/_socket.vcproj	2012-07-25 18:42:54.000000000 -0500
++++ misc/build/Python-2.7.3/PCbuild/_socket.vcproj	2012-07-30 20:59:37.000000000 -0500
 @@ -56,6 +56,7 @@
  				Name="VCLinkerTool"
  				AdditionalDependencies="ws2_32.lib"
@@ -526,7 +526,7 @@ diff -u misc/Python-2.7.3/PCbuild/_socke
  				Name="VCALinkTool"
 diff -u misc/Python-2.7.3/PCbuild/_sqlite3.vcproj misc/build/Python-2.7.3/PCbuild/_sqlite3.vcproj
 --- misc/Python-2.7.3/PCbuild/_sqlite3.vcproj	2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.3/PCbuild/_sqlite3.vcproj	2012-07-25 18:42:54.000000000 -0500
++++ misc/build/Python-2.7.3/PCbuild/_sqlite3.vcproj	2012-07-30 20:59:37.000000000 -0500
 @@ -57,6 +57,7 @@
  			<Tool
  				Name="VCLinkerTool"
@@ -593,7 +593,7 @@ diff -u misc/Python-2.7.3/PCbuild/_sqlit
  				Name="VCALinkTool"
 diff -u misc/Python-2.7.3/PCbuild/_ssl.vcproj misc/build/Python-2.7.3/PCbuild/_ssl.vcproj
 --- misc/Python-2.7.3/PCbuild/_ssl.vcproj	2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.3/PCbuild/_ssl.vcproj	2012-07-25 18:51:06.000000000 -0500
++++ misc/build/Python-2.7.3/PCbuild/_ssl.vcproj	2012-07-30 20:59:37.000000000 -0500
 @@ -43,7 +43,7 @@
  			/>
  			<Tool
@@ -748,7 +748,7 @@ diff -u misc/Python-2.7.3/PCbuild/_ssl.v
  			<Tool
 diff -u misc/Python-2.7.3/PCbuild/_testcapi.vcproj misc/build/Python-2.7.3/PCbuild/_testcapi.vcproj
 --- misc/Python-2.7.3/PCbuild/_testcapi.vcproj	2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.3/PCbuild/_testcapi.vcproj	2012-07-25 18:42:54.000000000 -0500
++++ misc/build/Python-2.7.3/PCbuild/_testcapi.vcproj	2012-07-30 20:59:37.000000000 -0500
 @@ -55,6 +55,7 @@
  			<Tool
  				Name="VCLinkerTool"
@@ -815,7 +815,7 @@ diff -u misc/Python-2.7.3/PCbuild/_testc
  				Name="VCALinkTool"
 diff -u misc/Python-2.7.3/PCbuild/_tkinter.vcproj misc/build/Python-2.7.3/PCbuild/_tkinter.vcproj
 --- misc/Python-2.7.3/PCbuild/_tkinter.vcproj	2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.3/PCbuild/_tkinter.vcproj	2012-07-25 18:42:54.000000000 -0500
++++ misc/build/Python-2.7.3/PCbuild/_tkinter.vcproj	2012-07-30 20:59:37.000000000 -0500
 @@ -57,6 +57,7 @@
  			<Tool
  				Name="VCLinkerTool"
@@ -882,7 +882,7 @@ diff -u misc/Python-2.7.3/PCbuild/_tkint
  				Name="VCALinkTool"
 diff -u misc/Python-2.7.3/PCbuild/bdist_wininst.vcproj misc/build/Python-2.7.3/PCbuild/bdist_wininst.vcproj
 --- misc/Python-2.7.3/PCbuild/bdist_wininst.vcproj	2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.3/PCbuild/bdist_wininst.vcproj	2012-07-25 18:42:54.000000000 -0500
++++ misc/build/Python-2.7.3/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"
@@ -905,7 +905,7 @@ diff -u misc/Python-2.7.3/PCbuild/bdist_
  			<Tool
 diff -u misc/Python-2.7.3/PCbuild/bz2.vcproj misc/build/Python-2.7.3/PCbuild/bz2.vcproj
 --- misc/Python-2.7.3/PCbuild/bz2.vcproj	2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.3/PCbuild/bz2.vcproj	2012-07-25 18:42:54.000000000 -0500
++++ misc/build/Python-2.7.3/PCbuild/bz2.vcproj	2012-07-30 20:59:37.000000000 -0500
 @@ -57,6 +57,7 @@
  			<Tool
  				Name="VCLinkerTool"
@@ -972,7 +972,7 @@ diff -u misc/Python-2.7.3/PCbuild/bz2.vc
  				Name="VCALinkTool"
 diff -u misc/Python-2.7.3/PCbuild/kill_python.vcproj misc/build/Python-2.7.3/PCbuild/kill_python.vcproj
 --- misc/Python-2.7.3/PCbuild/kill_python.vcproj	2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.3/PCbuild/kill_python.vcproj	2012-07-25 18:42:54.000000000 -0500
++++ misc/build/Python-2.7.3/PCbuild/kill_python.vcproj	2012-07-30 20:59:37.000000000 -0500
 @@ -56,6 +56,7 @@
  				Name="VCLinkerTool"
  				OutputFile="$(OutDir)\$(ProjectName)_d.exe"
@@ -1007,7 +1007,7 @@ diff -u misc/Python-2.7.3/PCbuild/kill_p
  				Name="VCALinkTool"
 diff -u misc/Python-2.7.3/PCbuild/make_buildinfo.vcproj misc/build/Python-2.7.3/PCbuild/make_buildinfo.vcproj
 --- misc/Python-2.7.3/PCbuild/make_buildinfo.vcproj	2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.3/PCbuild/make_buildinfo.vcproj	2012-07-25 18:42:54.000000000 -0500
++++ misc/build/Python-2.7.3/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"
@@ -1026,7 +1026,7 @@ diff -u misc/Python-2.7.3/PCbuild/make_b
  				Name="VCALinkTool"
 diff -u misc/Python-2.7.3/PCbuild/make_versioninfo.vcproj misc/build/Python-2.7.3/PCbuild/make_versioninfo.vcproj
 --- misc/Python-2.7.3/PCbuild/make_versioninfo.vcproj	2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.3/PCbuild/make_versioninfo.vcproj	2012-07-25 18:42:54.000000000
-0500
++++ misc/build/Python-2.7.3/PCbuild/make_versioninfo.vcproj	2012-07-30 20:59:37.000000000
-0500
 @@ -71,6 +71,7 @@
  				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
  				SubSystem="1"
@@ -1059,9 +1059,116 @@ diff -u misc/Python-2.7.3/PCbuild/make_v
  			/>
  			<Tool
  				Name="VCALinkTool"
+diff -u misc/Python-2.7.3/PCbuild/pcbuild.sln misc/build/Python-2.7.3/PCbuild/pcbuild.sln
+--- misc/Python-2.7.3/PCbuild/pcbuild.sln	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.3/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
+-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb", "_bsddb.vcproj", "{B4D38F3F-68FB-42EC-A45D-E00657BB3627}"
+-	ProjectSection(ProjectDependencies) = postProject
+-		{6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}
+-		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
+-	EndProjectSection
+-EndProject
+-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes", "_ctypes.vcproj", "{0E9791DB-593A-465F-98BC-681011311618}"
+-	ProjectSection(ProjectDependencies) = postProject
+-		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
+-	EndProjectSection
+-EndProject
++#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb", "_bsddb.vcproj", "{B4D38F3F-68FB-42EC-A45D-E00657BB3627}"
++#	ProjectSection(ProjectDependencies) = postProject
++#		{6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}
++#		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
++#	EndProjectSection
++#EndProject
++#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes", "_ctypes.vcproj", "{0E9791DB-593A-465F-98BC-681011311618}"
++#	ProjectSection(ProjectDependencies) = postProject
++#		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
++#	EndProjectSection
++#EndProject
+ 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 @@
+ 		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
+ 	EndProjectSection
+ EndProject
+-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_sqlite3", "_sqlite3.vcproj", "{13CECB97-4119-4316-9D42-8534019A5A44}"
+-	ProjectSection(ProjectDependencies) = postProject
+-		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
+-		{A1A295E5-463C-437F-81CA-1F32367685DA} = {A1A295E5-463C-437F-81CA-1F32367685DA}
+-	EndProjectSection
+-EndProject
++#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_sqlite3", "_sqlite3.vcproj", "{13CECB97-4119-4316-9D42-8534019A5A44}"
++#	ProjectSection(ProjectDependencies) = postProject
++#		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
++#		{A1A295E5-463C-437F-81CA-1F32367685DA} = {A1A295E5-463C-437F-81CA-1F32367685DA}
++#	EndProjectSection
++#EndProject
+ 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 @@
+ 		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
+ 	EndProjectSection
+ EndProject
+-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_tkinter", "_tkinter.vcproj", "{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}"
+-	ProjectSection(ProjectDependencies) = postProject
+-		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
+-	EndProjectSection
+-EndProject
+-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bz2", "bz2.vcproj", "{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}"
+-	ProjectSection(ProjectDependencies) = postProject
+-		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
+-	EndProjectSection
+-EndProject
++#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_tkinter", "_tkinter.vcproj", "{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}"
++#	ProjectSection(ProjectDependencies) = postProject
++#		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
++#	EndProjectSection
++#EndProject
++#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bz2", "bz2.vcproj", "{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}"
++#	ProjectSection(ProjectDependencies) = postProject
++#		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
++#	EndProjectSection
++#EndProject
+ 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 @@
+ EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bdist_wininst", "bdist_wininst.vcproj",
"{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}"
+ EndProject
+-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_hashlib", "_hashlib.vcproj", "{447F05A8-F581-4CAC-A466-5AC7936E207E}"
+-	ProjectSection(ProjectDependencies) = postProject
+-		{B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}
+-		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
+-	EndProjectSection
+-EndProject
+-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "sqlite3.vcproj", "{A1A295E5-463C-437F-81CA-1F32367685DA}"
+-	ProjectSection(ProjectDependencies) = postProject
+-		{6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}
+-	EndProjectSection
+-EndProject
++#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_hashlib", "_hashlib.vcproj", "{447F05A8-F581-4CAC-A466-5AC7936E207E}"
++#	ProjectSection(ProjectDependencies) = postProject
++#		{B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}
++#		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
++#	EndProjectSection
++#EndProject
++#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "sqlite3.vcproj", "{A1A295E5-463C-437F-81CA-1F32367685DA}"
++#	ProjectSection(ProjectDependencies) = postProject
++#		{6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}
++#	EndProjectSection
++#EndProject
+ 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.3/PCbuild/pyexpat.vcproj misc/build/Python-2.7.3/PCbuild/pyexpat.vcproj
 --- misc/Python-2.7.3/PCbuild/pyexpat.vcproj	2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.3/PCbuild/pyexpat.vcproj	2012-07-25 18:42:54.000000000 -0500
++++ misc/build/Python-2.7.3/PCbuild/pyexpat.vcproj	2012-07-30 20:59:37.000000000 -0500
 @@ -56,6 +56,7 @@
  			/>
  			<Tool
@@ -1128,7 +1235,7 @@ diff -u misc/Python-2.7.3/PCbuild/pyexpa
  				Name="VCALinkTool"
 diff -u misc/Python-2.7.3/PCbuild/python.vcproj misc/build/Python-2.7.3/PCbuild/python.vcproj
 --- misc/Python-2.7.3/PCbuild/python.vcproj	2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.3/PCbuild/python.vcproj	2012-07-25 18:42:54.000000000 -0500
++++ misc/build/Python-2.7.3/PCbuild/python.vcproj	2012-07-30 20:59:37.000000000 -0500
 @@ -66,6 +66,7 @@
  				SubSystem="1"
  				StackReserveSize="2000000"
@@ -1195,7 +1302,7 @@ diff -u misc/Python-2.7.3/PCbuild/python
  				Name="VCALinkTool"
 diff -u misc/Python-2.7.3/PCbuild/pythoncore.vcproj misc/build/Python-2.7.3/PCbuild/pythoncore.vcproj
 --- misc/Python-2.7.3/PCbuild/pythoncore.vcproj	2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.3/PCbuild/pythoncore.vcproj	2012-07-25 18:42:54.000000000 -0500
++++ misc/build/Python-2.7.3/PCbuild/pythoncore.vcproj	2012-07-30 20:59:37.000000000 -0500
 @@ -69,6 +69,7 @@
  				ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"
  				BaseAddress="0x1e000000"
@@ -1269,7 +1376,7 @@ diff -u misc/Python-2.7.3/PCbuild/python
 +</VisualStudioProject>
 diff -u misc/Python-2.7.3/PCbuild/pythonw.vcproj misc/build/Python-2.7.3/PCbuild/pythonw.vcproj
 --- misc/Python-2.7.3/PCbuild/pythonw.vcproj	2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.3/PCbuild/pythonw.vcproj	2012-07-25 18:42:54.000000000 -0500
++++ misc/build/Python-2.7.3/PCbuild/pythonw.vcproj	2012-07-30 20:59:37.000000000 -0500
 @@ -66,6 +66,7 @@
  				StackReserveSize="2000000"
  				BaseAddress="0x1d000000"
@@ -1336,7 +1443,7 @@ diff -u misc/Python-2.7.3/PCbuild/python
  				Name="VCALinkTool"
 diff -u misc/Python-2.7.3/PCbuild/select.vcproj misc/build/Python-2.7.3/PCbuild/select.vcproj
 --- misc/Python-2.7.3/PCbuild/select.vcproj	2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.3/PCbuild/select.vcproj	2012-07-25 18:42:54.000000000 -0500
++++ misc/build/Python-2.7.3/PCbuild/select.vcproj	2012-07-30 20:59:37.000000000 -0500
 @@ -57,6 +57,7 @@
  				AdditionalDependencies="ws2_32.lib"
  				IgnoreDefaultLibraryNames="libc"
@@ -1403,7 +1510,7 @@ diff -u misc/Python-2.7.3/PCbuild/select
  				Name="VCALinkTool"
 diff -u misc/Python-2.7.3/PCbuild/sqlite3.vcproj misc/build/Python-2.7.3/PCbuild/sqlite3.vcproj
 --- misc/Python-2.7.3/PCbuild/sqlite3.vcproj	2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.3/PCbuild/sqlite3.vcproj	2012-07-25 18:42:54.000000000 -0500
++++ misc/build/Python-2.7.3/PCbuild/sqlite3.vcproj	2012-07-30 20:59:37.000000000 -0500
 @@ -56,6 +56,7 @@
  			<Tool
  				Name="VCLinkerTool"
@@ -1470,7 +1577,7 @@ diff -u misc/Python-2.7.3/PCbuild/sqlite
  				Name="VCALinkTool"
 diff -u misc/Python-2.7.3/PCbuild/unicodedata.vcproj misc/build/Python-2.7.3/PCbuild/unicodedata.vcproj
 --- misc/Python-2.7.3/PCbuild/unicodedata.vcproj	2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.3/PCbuild/unicodedata.vcproj	2012-07-25 18:42:54.000000000 -0500
++++ misc/build/Python-2.7.3/PCbuild/unicodedata.vcproj	2012-07-30 20:59:37.000000000 -0500
 @@ -55,6 +55,7 @@
  			<Tool
  				Name="VCLinkerTool"
@@ -1537,7 +1644,7 @@ diff -u misc/Python-2.7.3/PCbuild/unicod
  				Name="VCALinkTool"
 diff -u misc/Python-2.7.3/PCbuild/w9xpopen.vcproj misc/build/Python-2.7.3/PCbuild/w9xpopen.vcproj
 --- misc/Python-2.7.3/PCbuild/w9xpopen.vcproj	2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.3/PCbuild/w9xpopen.vcproj	2012-07-25 18:42:54.000000000 -0500
++++ misc/build/Python-2.7.3/PCbuild/w9xpopen.vcproj	2012-07-30 20:59:37.000000000 -0500
 @@ -59,6 +59,7 @@
  			<Tool
  				Name="VCLinkerTool"
@@ -1604,7 +1711,7 @@ diff -u misc/Python-2.7.3/PCbuild/w9xpop
  				Name="VCALinkTool"
 diff -u misc/Python-2.7.3/PCbuild/winsound.vcproj misc/build/Python-2.7.3/PCbuild/winsound.vcproj
 --- misc/Python-2.7.3/PCbuild/winsound.vcproj	2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.3/PCbuild/winsound.vcproj	2012-07-25 18:42:54.000000000 -0500
++++ misc/build/Python-2.7.3/PCbuild/winsound.vcproj	2012-07-30 20:59:37.000000000 -0500
 @@ -55,6 +55,7 @@
  			<Tool
  				Name="VCLinkerTool"

Copied: incubator/ooo/trunk/main/python/python-solaris.patch (from r1366579, incubator/ooo/trunk/main/python/python-2.7.3.patch)
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/python/python-solaris.patch?p2=incubator/ooo/trunk/main/python/python-solaris.patch&p1=incubator/ooo/trunk/main/python/python-2.7.3.patch&r1=1366579&r2=1367398&rev=1367398&view=diff
==============================================================================
--- incubator/ooo/trunk/main/python/python-2.7.3.patch (original)
+++ incubator/ooo/trunk/main/python/python-solaris.patch Tue Jul 31 02:35:11 2012
@@ -1,4 +1,3 @@
-diff -ru misc/Python-2.7.3/Include/pyport.h misc/build/Python-2.7.3/Include/pyport.h
 --- misc/Python-2.7.3/Include/pyport.h	2012-04-09 18:07:29.000000000 -0500
 +++ misc/build/Python-2.7.3/Include/pyport.h	2012-07-24 18:19:52.000000000 -0500
 @@ -603,11 +603,6 @@
@@ -13,93 +12,3 @@ diff -ru misc/Python-2.7.3/Include/pypor
  #ifdef __BEOS__
  /* Unchecked */
  /* It's in the libs, but not the headers... - [cjh] */
-Only in misc/build/Python-2.7.3/Include: pyport.h.orig
-diff -ru misc/Python-2.7.3/PCbuild/pcbuild.sln misc/build/Python-2.7.3/PCbuild/pcbuild.sln
---- misc/Python-2.7.3/PCbuild/pcbuild.sln	2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.3/PCbuild/pcbuild.sln	2012-07-24 22:31:19.000000000 -0500
-@@ -38,17 +38,17 @@
- 		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
- 	EndProjectSection
- EndProject
--Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb", "_bsddb.vcproj", "{B4D38F3F-68FB-42EC-A45D-E00657BB3627}"
--	ProjectSection(ProjectDependencies) = postProject
--		{6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}
--		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
--	EndProjectSection
--EndProject
--Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes", "_ctypes.vcproj", "{0E9791DB-593A-465F-98BC-681011311618}"
--	ProjectSection(ProjectDependencies) = postProject
--		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
--	EndProjectSection
--EndProject
-+#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb", "_bsddb.vcproj", "{B4D38F3F-68FB-42EC-A45D-E00657BB3627}"
-+#	ProjectSection(ProjectDependencies) = postProject
-+#		{6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}
-+#		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-+#	EndProjectSection
-+#EndProject
-+#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes", "_ctypes.vcproj", "{0E9791DB-593A-465F-98BC-681011311618}"
-+#	ProjectSection(ProjectDependencies) = postProject
-+#		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-+#	EndProjectSection
-+#EndProject
- 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}
-@@ -87,16 +87,16 @@
- 		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
- 	EndProjectSection
- EndProject
--Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_tkinter", "_tkinter.vcproj", "{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}"
--	ProjectSection(ProjectDependencies) = postProject
--		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
--	EndProjectSection
--EndProject
--Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bz2", "bz2.vcproj", "{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}"
--	ProjectSection(ProjectDependencies) = postProject
--		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
--	EndProjectSection
--EndProject
-+#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_tkinter", "_tkinter.vcproj", "{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}"
-+#	ProjectSection(ProjectDependencies) = postProject
-+#		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-+#	EndProjectSection
-+#EndProject
-+#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bz2", "bz2.vcproj", "{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}"
-+#	ProjectSection(ProjectDependencies) = postProject
-+#		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-+#	EndProjectSection
-+#EndProject
- 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 @@
- EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bdist_wininst", "bdist_wininst.vcproj",
"{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}"
- EndProject
--Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_hashlib", "_hashlib.vcproj", "{447F05A8-F581-4CAC-A466-5AC7936E207E}"
--	ProjectSection(ProjectDependencies) = postProject
--		{B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}
--		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
--	EndProjectSection
--EndProject
--Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "sqlite3.vcproj", "{A1A295E5-463C-437F-81CA-1F32367685DA}"
--	ProjectSection(ProjectDependencies) = postProject
--		{6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}
--	EndProjectSection
--EndProject
-+#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_hashlib", "_hashlib.vcproj", "{447F05A8-F581-4CAC-A466-5AC7936E207E}"
-+#	ProjectSection(ProjectDependencies) = postProject
-+#		{B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}
-+#		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-+#	EndProjectSection
-+#EndProject
-+#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "sqlite3.vcproj", "{A1A295E5-463C-437F-81CA-1F32367685DA}"
-+#	ProjectSection(ProjectDependencies) = postProject
-+#		{6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}
-+#	EndProjectSection
-+#EndProject
- 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}
-Only in misc/build/Python-2.7.3/PCbuild: pcbuild.sln.orig



Mime
View raw message