Author: pfg
Date: Wed Mar 14 02:30:11 2018
New Revision: 1826694
URL: http://svn.apache.org/viewvc?rev=1826694&view=rev
Log:
python: rename pcbuild to msvs9 in patch names to avoid confusion.
Since r1759046, which updated python to version 2.7.12, we are using
the legacy buildfiles which upstream moved from PCbuild to PC/VS9.0.
We kept the old name for the patches to preserve the history in the
repository but since there is a good chance we may update the required
compiler, and use the updated build files, rename them properly to avoid
confusion.
Consistently use $(PYVERSION) while here.
Note this is untested: being a simple rename there should be no problem.
Added:
openoffice/trunk/main/python/python-2.7.14-msvs9-dir.patch
- copied unchanged from r1826693,
openoffice/trunk/main/python/python-2.7.14-pcbuild-dir.patch
openoffice/trunk/main/python/python-2.7.14-msvs9-no-host-python.patch
- copied unchanged from r1826693,
openoffice/trunk/main/python/python-2.7.14-pcbuild-no-host-python.patch
openoffice/trunk/main/python/python-2.7.14-msvs9-python-path.patch
- copied unchanged from r1826693,
openoffice/trunk/main/python/python-2.7.14-pcbuild-python-path.patch
openoffice/trunk/main/python/python-2.7.14-msvs9-subsystem.patch
- copied unchanged from r1826693,
openoffice/trunk/main/python/python-2.7.14-pcbuild-subsystem.patch
openoffice/trunk/main/python/python-2.7.14-msvs9-win64-target.patch
- copied unchanged from r1826693,
openoffice/trunk/main/python/python-2.7.14-pcbuild-win64-target.patch
openoffice/trunk/main/python/python-2.7.14-msvs9-win64.patch
- copied unchanged from r1826693,
openoffice/trunk/main/python/python-2.7.14-pcbuild-win64.patch
openoffice/trunk/main/python/python-2.7.14-msvs9.patch
- copied unchanged from r1826693,
openoffice/trunk/main/python/python-2.7.14-pcbuild.patch
Removed:
openoffice/trunk/main/python/python-2.7.14-pcbuild-dir.patch
openoffice/trunk/main/python/python-2.7.14-pcbuild-no-host-python.patch
openoffice/trunk/main/python/python-2.7.14-pcbuild-python-path.patch
openoffice/trunk/main/python/python-2.7.14-pcbuild-subsystem.patch
openoffice/trunk/main/python/python-2.7.14-pcbuild-win64-target.patch
openoffice/trunk/main/python/python-2.7.14-pcbuild-win64.patch
openoffice/trunk/main/python/python-2.7.14-pcbuild.patch
Modified:
openoffice/trunk/main/python/makefile.mk
Modified: openoffice/trunk/main/python/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/python/makefile.mk?rev=1826694&r1=1826693&r2=1826694&view=diff
==============================================================================
--- openoffice/trunk/main/python/makefile.mk (original)
+++ openoffice/trunk/main/python/makefile.mk Wed Mar 14 02:30:11 2018
@@ -54,15 +54,15 @@ PATCH_FILES=\
.IF "$(GUI)"=="WNT"
.IF "$(CPUNAME)"=="INTEL"
-PATCH_FILES += python-$(PYVERSION)-pcbuild.patch
+PATCH_FILES += python-$(PYVERSION)-msvs9.patch
.ELIF "$(CPUNAME)"=="X86_64"
PATCH_FILES += \
- python-$(PYVERSION)-pcbuild-win64.patch \
- python-$(PYVERSION)-pcbuild-win64-target.patch \
- python-$(PYVERSION)-pcbuild-subsystem.patch \
- python-2.7.14-pcbuild-dir.patch \
- python-2.7.14-pcbuild-no-host-python.patch \
- python-2.7.14-pcbuild-python-path.patch
+ python-$(PYVERSION)-msvs9-win64.patch \
+ python-$(PYVERSION)-msvs9-win64-target.patch \
+ python-$(PYVERSION)-msvs9-subsystem.patch \
+ python-$(PYVERSION)-msvs9-dir.patch \
+ python-$(PYVERSION)-msvs9-no-host-python.patch \
+ python-$(PYVERSION)-msvs9-python-path.patch
.ENDIF
.ENDIF
