Kaydet (Commit) ed2f4237 authored tarafından Christian Heimes's avatar Christian Heimes

Bumped up 2.6 to 2.7

üst 213faca2
......@@ -39,15 +39,15 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="getbuildinfo.o"
OutputFile="./python26.dll"
OutputFile="./python27.dll"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
IgnoreDefaultLibraryNames="libc"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\./python26.pdb"
ProgramDatabaseFile=".\./python27.pdb"
SubSystem="2"
BaseAddress="0x1e000000"
ImportLibrary=".\./python26.lib"
ImportLibrary=".\./python27.lib"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"/>
......@@ -99,15 +99,15 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="getbuildinfo.o"
OutputFile="./python26_d.dll"
OutputFile="./python27_d.dll"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
IgnoreDefaultLibraryNames="libc"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\./python26_d.pdb"
ProgramDatabaseFile=".\./python27_d.pdb"
SubSystem="2"
BaseAddress="0x1e000000"
ImportLibrary=".\./python26_d.lib"
ImportLibrary=".\./python27_d.lib"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"/>
......@@ -166,15 +166,15 @@
Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
AdditionalDependencies="getbuildinfo.o"
OutputFile="./python26.dll"
OutputFile="./python27.dll"
LinkIncremental="1"
SuppressStartupBanner="FALSE"
IgnoreDefaultLibraryNames="libc"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\./python26.pdb"
ProgramDatabaseFile=".\./python27.pdb"
SubSystem="2"
BaseAddress="0x1e000000"
ImportLibrary=".\./python26.lib"
ImportLibrary=".\./python27.lib"
TargetMachine="0"/>
<Tool
Name="VCMIDLTool"/>
......@@ -233,15 +233,15 @@
Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK"
AdditionalDependencies="getbuildinfo.o"
OutputFile="./python26.dll"
OutputFile="./python27.dll"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
IgnoreDefaultLibraryNames="libc"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\./python26.pdb"
ProgramDatabaseFile=".\./python27.pdb"
SubSystem="2"
BaseAddress="0x1e000000"
ImportLibrary=".\./python26.lib"
ImportLibrary=".\./python27.lib"
TargetMachine="0"/>
<Tool
Name="VCMIDLTool"/>
......
......@@ -12,7 +12,7 @@ the "Standard" toolbar"), and build the projects.
The proper order to build subprojects:
1) pythoncore (this builds the main Python DLL and library files,
python26.{dll, lib} in Release mode)
python27.{dll, lib} in Release mode)
NOTE: in previous releases, this subproject was
named after the release number, e.g. python20.
......@@ -26,7 +26,7 @@ The proper order to build subprojects:
test slave; see SUBPROJECTS below)
When using the Debug setting, the output files have a _d added to
their name: python26_d.dll, python_d.exe, parser_d.pyd, and so on.
their name: python27_d.dll, python_d.exe, parser_d.pyd, and so on.
SUBPROJECTS
-----------
......
......@@ -38,7 +38,7 @@
/>
<UserMacro
Name="PyDllName"
Value="python26"
Value="python27"
/>
<UserMacro
Name="PythonExe"
......
......@@ -39,7 +39,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/export:initexample"
AdditionalDependencies="odbc32.lib odbccp32.lib python26.lib"
AdditionalDependencies="odbc32.lib odbccp32.lib python27.lib"
OutputFile=".\Release/example.pyd"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
......@@ -105,7 +105,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/export:initexample"
AdditionalDependencies="odbc32.lib odbccp32.lib python26_d.lib"
AdditionalDependencies="odbc32.lib odbccp32.lib python27_d.lib"
OutputFile=".\Debug/example_d.pyd"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
......
......@@ -237,7 +237,7 @@ $(OUT)%$O: %.c
# Output file names
PYTHON_VER= 2.6
PYTHON_LIB= python26
PYTHON_LIB= python27
PYTHON.LIB= $(PYTHON_LIB)_s$A
PYTHON.IMPLIB= $(PYTHON_LIB)$A
ifeq ($(EXEOMF),yes)
......
......@@ -309,7 +309,7 @@ Procedure
to be installed in a directory other than the PYTHONHOME directory, set
the value of the Makefile variable EXE_DIR to the appropriate directory.
3. If you wish the Python core DLL (python26.dll) to be installed in a
3. If you wish the Python core DLL (python27.dll) to be installed in a
directory other than the directory in which the Python executables are
installed (by default, the PYTHONHOME directory), set the value of the
Makefile variable DLL_DIR to the appropriate directory. This DLL must
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment