Skip to content

Commit

Permalink
More automated version replacement.
Browse files Browse the repository at this point in the history
  • Loading branch information
birkenfeld committed Feb 20, 2011
1 parent 3ebb6b3 commit fa2c61a
Show file tree
Hide file tree
Showing 21 changed files with 864 additions and 864 deletions.
4 changes: 2 additions & 2 deletions PC/VC6/pythoncore.dsp

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions PC/VC6/readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ and build the projects.
The proper order to build subprojects:

1) pythoncore (this builds the main Python DLL and library files,
python32.{dll, lib} in Release mode)
python33.{dll, lib} in Release mode)

2) python (this builds the main Python executable,
python.exe in Release mode)
Expand All @@ -23,7 +23,7 @@ The proper order to build subprojects:
to the subsystems they implement; see SUBPROJECTS below)

When using the Debug setting, the output files have a _d added to
their name: python32_d.dll, python_d.exe, pyexpat_d.pyd, and so on.
their name: python33_d.dll, python_d.exe, pyexpat_d.pyd, and so on.

SUBPROJECTS
-----------
Expand Down
24 changes: 12 additions & 12 deletions PC/VS7.1/pythoncore.vcproj
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="getbuildinfo.o"
OutputFile="./python32.dll"
OutputFile="./python33.dll"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
IgnoreDefaultLibraryNames="libc"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\./python32.pdb"
ProgramDatabaseFile=".\./python33.pdb"
SubSystem="2"
BaseAddress="0x1e000000"
ImportLibrary=".\./python32.lib"
ImportLibrary=".\./python33.lib"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"/>
Expand Down Expand Up @@ -99,15 +99,15 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="getbuildinfo.o"
OutputFile="./python32_d.dll"
OutputFile="./python33_d.dll"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
IgnoreDefaultLibraryNames="libc"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\./python32_d.pdb"
ProgramDatabaseFile=".\./python33_d.pdb"
SubSystem="2"
BaseAddress="0x1e000000"
ImportLibrary=".\./python32_d.lib"
ImportLibrary=".\./python33_d.lib"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"/>
Expand Down Expand Up @@ -166,15 +166,15 @@
Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
AdditionalDependencies="getbuildinfo.o"
OutputFile="./python32.dll"
OutputFile="./python33.dll"
LinkIncremental="1"
SuppressStartupBanner="FALSE"
IgnoreDefaultLibraryNames="libc"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\./python32.pdb"
ProgramDatabaseFile=".\./python33.pdb"
SubSystem="2"
BaseAddress="0x1e000000"
ImportLibrary=".\./python32.lib"
ImportLibrary=".\./python33.lib"
TargetMachine="0"/>
<Tool
Name="VCMIDLTool"/>
Expand Down Expand Up @@ -233,15 +233,15 @@
Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK"
AdditionalDependencies="getbuildinfo.o"
OutputFile="./python32.dll"
OutputFile="./python33.dll"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
IgnoreDefaultLibraryNames="libc"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\./python32.pdb"
ProgramDatabaseFile=".\./python33.pdb"
SubSystem="2"
BaseAddress="0x1e000000"
ImportLibrary=".\./python32.lib"
ImportLibrary=".\./python33.lib"
TargetMachine="0"/>
<Tool
Name="VCMIDLTool"/>
Expand Down
4 changes: 2 additions & 2 deletions PC/VS7.1/readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
python33.{dll, lib} in Release mode)
NOTE: in previous releases, this subproject was
named after the release number, e.g. python20.

Expand All @@ -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: python33_d.dll, python_d.exe, parser_d.pyd, and so on.

SUBPROJECTS
-----------
Expand Down
4 changes: 2 additions & 2 deletions PC/VS8.0/build_ssl.bat
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
if not defined HOST_PYTHON (
if %1 EQU Debug (
set HOST_PYTHON=python_d.exe
if not exist python32_d.dll exit 1
if not exist python33_d.dll exit 1
) ELSE (
set HOST_PYTHON=python.exe
if not exist python32.dll exit 1
if not exist python33.dll exit 1
)
)
%HOST_PYTHON% build_ssl.py %1 %2 %3
Expand Down
2 changes: 1 addition & 1 deletion PC/VS8.0/kill_python.c
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ main(int argc, char **argv)
/*
* XXX TODO: if we really wanted to be fancy, we could check the
* modules for all processes (not just the python[_d].exe ones)
* and see if any of our DLLs are loaded (i.e. python32[_d].dll),
* and see if any of our DLLs are loaded (i.e. python33[_d].dll),
* as that would also inhibit our ability to rebuild the solution.
* Not worth loosing sleep over though; for now, a simple check
* for just the python executable should be sufficient.
Expand Down
2 changes: 1 addition & 1 deletion PC/VS8.0/pyproject.vsprops
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
/>
<UserMacro
Name="PyDllName"
Value="python32"
Value="python33"
/>
<UserMacro
Name="PythonExe"
Expand Down
4 changes: 2 additions & 2 deletions PC/example_nt/example.vcproj
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/export:initexample"
AdditionalDependencies="odbc32.lib odbccp32.lib python26.lib"
AdditionalDependencies="odbc32.lib odbccp32.lib python33.lib"
OutputFile=".\Release/example.pyd"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
Expand Down Expand Up @@ -105,7 +105,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/export:initexample"
AdditionalDependencies="odbc32.lib odbccp32.lib python26_d.lib"
AdditionalDependencies="odbc32.lib odbccp32.lib python33_d.lib"
OutputFile=".\Debug/example_d.pyd"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
Expand Down
2 changes: 1 addition & 1 deletion PC/os2emx/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ $(OUT)%$O: %.c

# Output file names
PYTHON_VER= 2.6
PYTHON_LIB= python26
PYTHON_LIB= python33
PYTHON.LIB= $(PYTHON_LIB)_s$A
PYTHON.IMPLIB= $(PYTHON_LIB)$A
ifeq ($(EXEOMF),yes)
Expand Down
2 changes: 1 addition & 1 deletion PC/os2emx/README.os2emx
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,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 (python33.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
Expand Down
Loading

0 comments on commit fa2c61a

Please sign in to comment.