[ooo-build-commit] .: patches/dev300
Thorsten Behrens
thorsten at kemper.freedesktop.org
Mon Feb 15 17:10:44 PST 2010
patches/dev300/apply | 4
patches/dev300/python-win32-buildfix.diff | 387 ++++++++++++++++++++++++++++++
2 files changed, 391 insertions(+)
New commits:
commit 999f5c3177a28bd70e819d8e555faf62ea5825ed
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Tue Feb 16 02:05:45 2010 +0100
Make python build properly on win32
* patches/dev300/apply: added patch
* patches/dev300/python-win32-buildfix.diff: something for dev300
code line only - make python-2.6.1 build nicely for various
msvs flavors
diff --git a/patches/dev300/apply b/patches/dev300/apply
index c8060f1..abf3587 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3574,6 +3574,10 @@ connectivity-build-fix.diff, i#107957, fridrich
# Allow oowintool to detect java sdk 1.6.x
oowintool-java6.diff, fridrich
+[ BuildBits > dev300-m70 ]
+# make python build properly on win32
+python-win32-buildfix.diff, thorsten
+
[ Netbook ]
vcl-netbook.diff, rodo
framework-netbook.diff, rodo
diff --git a/patches/dev300/python-win32-buildfix.diff b/patches/dev300/python-win32-buildfix.diff
new file mode 100644
index 0000000..7c9587e
--- /dev/null
+++ b/patches/dev300/python-win32-buildfix.diff
@@ -0,0 +1,387 @@
+diff --git a/python/Python-2.6.1.patch b/python/Python-2.6.1.patch
+old mode 100644
+new mode 100755
+--- python/Python-2.6.1.patch
++++ python/Python-2.6.1.patch
+@@ -120,6 +120,180 @@
+ 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}
++--- misc/Python-2.6.1/PC/VS7.1/pcbuild.sln 2007-06-10 23:01:17.000000000 +0200
+++++ misc/build/Python-2.6.1/PC/VS7.1/pcbuild.sln 2010-02-16 01:49:18.810375000 +0100
++@@ -1,36 +1,36 @@
++ Microsoft Visual Studio Solution File, Format Version 8.00
++-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb", "_bsddb.vcproj", "{E1DBB220-D64B-423D-A545-539A55AA7FE2}"
++- ProjectSection(ProjectDependencies) = postProject
++- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
++- EndProjectSection
++-EndProject
+++#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb", "_bsddb.vcproj", "{E1DBB220-D64B-423D-A545-539A55AA7FE2}"
+++# ProjectSection(ProjectDependencies) = postProject
+++# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
+++# EndProjectSection
+++#EndProject
++ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_socket", "_socket.vcproj", "{324F66C2-44D0-4D50-B979-F9DAE7FD36DB}"
++ ProjectSection(ProjectDependencies) = postProject
++ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
++ EndProjectSection
++ EndProject
++-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ssl", "_ssl.vcproj", "{8E85BA54-8A47-4C8B-B72E-8E17579CC6D7}"
++- ProjectSection(ProjectDependencies) = postProject
++- {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}
++- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
++- {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058} = {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}
++- EndProjectSection
++-EndProject
+++#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ssl", "_ssl.vcproj", "{8E85BA54-8A47-4C8B-B72E-8E17579CC6D7}"
+++# ProjectSection(ProjectDependencies) = postProject
+++# {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}
+++# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
+++# {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058} = {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}
+++# EndProjectSection
+++#EndProject
++ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testcapi", "_testcapi.vcproj", "{59CBF474-9E06-4C50-9142-C44A118BB447}"
++ ProjectSection(ProjectDependencies) = postProject
++ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
++ EndProjectSection
++ EndProject
++-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_tkinter", "_tkinter.vcproj", "{5B51DFF7-5DC0-41F8-8791-A4AB7114A151}"
++- ProjectSection(ProjectDependencies) = postProject
++- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
++- EndProjectSection
++-EndProject
++-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bz2", "bz2.vcproj", "{AC557788-6354-43F7-BE05-C9C8C59A344A}"
++- ProjectSection(ProjectDependencies) = postProject
++- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
++- EndProjectSection
++-EndProject
+++#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_tkinter", "_tkinter.vcproj", "{5B51DFF7-5DC0-41F8-8791-A4AB7114A151}"
+++# ProjectSection(ProjectDependencies) = postProject
+++# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
+++# EndProjectSection
+++#EndProject
+++#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bz2", "bz2.vcproj", "{AC557788-6354-43F7-BE05-C9C8C59A344A}"
+++# ProjectSection(ProjectDependencies) = postProject
+++# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
+++# EndProjectSection
+++#EndProject
++ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_versioninfo", "make_versioninfo.vcproj", "{F0E0541E-F17D-430B-97C4-93ADF0DD284E}"
++ ProjectSection(ProjectDependencies) = postProject
++ EndProjectSection
++@@ -99,11 +99,11 @@
++ {F22F40F4-D318-40DC-96B3-88DC81CE0894} = {F22F40F4-D318-40DC-96B3-88DC81CE0894}
++ EndProjectSection
++ EndProject
++-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_sqlite3", "_sqlite3.vcproj", "{2FF0A312-22F9-4C34-B070-842916DE27A9}"
++- ProjectSection(ProjectDependencies) = postProject
++- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
++- EndProjectSection
++-EndProject
+++#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_sqlite3", "_sqlite3.vcproj", "{2FF0A312-22F9-4C34-B070-842916DE27A9}"
+++# ProjectSection(ProjectDependencies) = postProject
+++# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
+++# EndProjectSection
+++#EndProject
++ Global
++ GlobalSection(SolutionConfiguration) = preSolution
++ Debug = Debug
++--- misc/Python-2.6.1/PC/VS8.0/pcbuild.sln 2008-09-02 23:17:05.000000000 +0200
+++++ misc/build/Python-2.6.1/PC/VS8.0/pcbuild.sln 2010-02-16 01:33:51.185375000 +0100
++@@ -38,12 +38,12 @@
++ {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}") = "_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}
++@@ -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}
+ --- misc/Python-2.6.1/Lib/test/test_threading.py.bak 2009-03-12 07:59:17.000000000 +0000
+ +++ misc/build/Python-2.6.1/Lib/test/test_threading.py 2009-03-12 10:48:04.000000000 +0000
+ @@ -382,7 +382,7 @@
+diff --git a/python/Python-ssl.patch b/python/Python-ssl.patch
+old mode 100644
+new mode 100755
+--- python/Python-ssl.patch
++++ python/Python-ssl.patch
+@@ -208,3 +208,165 @@
+
+
+ # SGI IRIX specific modules -- off by default.
++--- misc/Python-2.6.1/PC/VS7.1/build_ssl.py 2007-12-31 15:59:26.000000000 +0100
+++++ misc/build/Python-2.6.1/PC/VS7.1/build_ssl.py 2010-02-16 01:43:48.872875000 +0100
++@@ -178,4 +178,4 @@
++ sys.exit(rc)
++
++ if __name__=='__main__':
++- main()
+++ sys.exit(0)
++--- misc/Python-2.6.1/PC/VS8.0/_ssl.vcproj 2008-06-14 00:38:33.000000000 +0200
+++++ misc/build/Python-2.6.1/PC/VS8.0/_ssl.vcproj 2010-02-16 01:38:22.044750000 +0100
++@@ -43,7 +43,7 @@
++ />
++ <Tool
++ Name="VCCLCompilerTool"
++- AdditionalIncludeDirectories="$(opensslDir)\inc32"
+++ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
++ />
++ <Tool
++ Name="VCManagedResourceCompilerTool"
++@@ -57,7 +57,7 @@
++ />
++ <Tool
++ Name="VCLinkerTool"
++- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
+++ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
++ />
++ <Tool
++ Name="VCALinkTool"
++@@ -106,7 +106,7 @@
++ />
++ <Tool
++ Name="VCCLCompilerTool"
++- AdditionalIncludeDirectories="$(opensslDir)\inc64"
+++ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
++ />
++ <Tool
++ Name="VCManagedResourceCompilerTool"
++@@ -120,7 +120,7 @@
++ />
++ <Tool
++ Name="VCLinkerTool"
++- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
+++ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
++ />
++ <Tool
++ Name="VCALinkTool"
++@@ -169,7 +169,7 @@
++ />
++ <Tool
++ Name="VCCLCompilerTool"
++- AdditionalIncludeDirectories="$(opensslDir)\inc32"
+++ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
++ />
++ <Tool
++ Name="VCManagedResourceCompilerTool"
++@@ -183,7 +183,7 @@
++ />
++ <Tool
++ Name="VCLinkerTool"
++- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
+++ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
++ />
++ <Tool
++ Name="VCALinkTool"
++@@ -233,7 +233,7 @@
++ />
++ <Tool
++ Name="VCCLCompilerTool"
++- AdditionalIncludeDirectories="$(opensslDir)\inc64"
+++ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
++ />
++ <Tool
++ Name="VCManagedResourceCompilerTool"
++@@ -247,7 +247,7 @@
++ />
++ <Tool
++ Name="VCLinkerTool"
++- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
+++ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
++ />
++ <Tool
++ Name="VCALinkTool"
++@@ -296,7 +296,7 @@
++ />
++ <Tool
++ Name="VCCLCompilerTool"
++- AdditionalIncludeDirectories="$(opensslDir)\inc32"
+++ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
++ />
++ <Tool
++ Name="VCManagedResourceCompilerTool"
++@@ -310,7 +310,7 @@
++ />
++ <Tool
++ Name="VCLinkerTool"
++- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
+++ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
++ />
++ <Tool
++ Name="VCALinkTool"
++@@ -360,7 +360,7 @@
++ />
++ <Tool
++ Name="VCCLCompilerTool"
++- AdditionalIncludeDirectories="$(opensslDir)\inc64"
+++ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
++ />
++ <Tool
++ Name="VCManagedResourceCompilerTool"
++@@ -374,7 +374,7 @@
++ />
++ <Tool
++ Name="VCLinkerTool"
++- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
+++ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
++ TargetMachine="17"
++ />
++ <Tool
++@@ -424,7 +424,7 @@
++ />
++ <Tool
++ Name="VCCLCompilerTool"
++- AdditionalIncludeDirectories="$(opensslDir)\inc32"
+++ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
++ />
++ <Tool
++ Name="VCManagedResourceCompilerTool"
++@@ -438,7 +438,7 @@
++ />
++ <Tool
++ Name="VCLinkerTool"
++- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
+++ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
++ />
++ <Tool
++ Name="VCALinkTool"
++@@ -488,7 +488,7 @@
++ />
++ <Tool
++ Name="VCCLCompilerTool"
++- AdditionalIncludeDirectories="$(opensslDir)\inc64"
+++ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
++ />
++ <Tool
++ Name="VCManagedResourceCompilerTool"
++@@ -502,7 +502,7 @@
++ />
++ <Tool
++ Name="VCLinkerTool"
++- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
+++ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
++ TargetMachine="17"
++ />
++ <Tool
++--- misc/Python-2.6.1/PC/VS8.0/build_ssl.py 2008-01-02 18:43:40.000000000 +0100
+++++ misc/build/Python-2.6.1/PC/VS8.0/build_ssl.py 2010-02-16 01:40:40.560375000 +0100
++@@ -247,4 +247,4 @@
++ sys.exit(rc)
++
++ if __name__=='__main__':
++- main()
+++ sys.exit(0)
+diff --git a/python/makefile.mk b/python/makefile.mk
+old mode 100644
+new mode 100755
+--- python/makefile.mk
++++ python/makefile.mk
+@@ -113,16 +113,20 @@
+ #.ENDIF #"$(WINDOWS_VISTA_PSDK)"!=""
+ #.ENDIF
+
++.IF "$(CCNUMVER)" >= "001500000000"
+ BUILD_DIR=PCbuild
++.ELIF "$(CCNUMVER)" >= "001400000000"
++BUILD_DIR=PC/VS8.0
++.ELIF "$(CCNUMVER)" >= "001310000000"
++BUILD_DIR=PC/VS7.1
++.ELSE
++BUILD_DIR=PC/VC6
++.ENDIF
+
+ # 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
+-.IF "$(SYSBASE)" != ""
+ BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe -useenv pcbuild.sln "Release|Win32"
+-.ELSE
+-BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe pcbuild.sln "Release|Win32"
+-.ENDIF # "$(SYSBASE)" != ""
+ .ENDIF
+ .ENDIF
+
More information about the ooo-build-commit
mailing list