| doc/testing.txt | ●●●●● patch | view | raw | blame | history | |
| make-rules/ips.mk | ●●●●● patch | view | raw | blame | history | |
| make-rules/setup.py.mk | ●●●●● patch | view | raw | blame | history | |
| make-rules/shared-macros.mk | ●●●●● patch | view | raw | blame | history |
doc/testing.txt
@@ -67,8 +67,6 @@ 2.7: components/python/<component-name>/test/results-2.7-32.master 2.7: components/python/<component-name>/test/results-2.7-64.master 3.4: components/python/<component-name>/test/results-3.4-32.master 3.4: components/python/<component-name>/test/results-3.4-64.master 3.5: components/python/<component-name>/test/results-3.5-64.master depending upon which versions of Python this component supports. make-rules/ips.mk
@@ -129,7 +129,6 @@ -D COMPONENT_CLASSIFICATION="org.opensolaris.category.2008:$(strip $(COMPONENT_CLASSIFICATION))" PKG_MACROS += PYTHON_2.7_ONLY=\# PKG_MACROS += PYTHON_3.4_ONLY=\# PKG_MACROS += PYTHON_3.5_ONLY=\# PKG_MACROS += PYTHON_32_ONLY=
@@ -23,28 +23,24 @@ $(BUILD_DIR)/%-2.6/.built: PYTHON_VERSION=2.6 $(BUILD_DIR)/%-2.7/.built: PYTHON_VERSION=2.7 $(BUILD_DIR)/%-3.4/.built: PYTHON_VERSION=3.4 $(BUILD_DIR)/%-3.5/.built: PYTHON_VERSION=3.5 $(BUILD_DIR)/$(MACH32)-%/.built: BITS=32 $(BUILD_DIR)/$(MACH64)-%/.built: BITS=64 $(BUILD_DIR)/%-2.6/.installed: PYTHON_VERSION=2.6 $(BUILD_DIR)/%-2.7/.installed: PYTHON_VERSION=2.7 $(BUILD_DIR)/%-3.4/.installed: PYTHON_VERSION=3.4 $(BUILD_DIR)/%-3.5/.installed: PYTHON_VERSION=3.5 $(BUILD_DIR)/$(MACH32)-%/.installed: BITS=32 $(BUILD_DIR)/$(MACH64)-%/.installed: BITS=64 $(BUILD_DIR)/%-2.6/.tested: PYTHON_VERSION=2.6 $(BUILD_DIR)/%-2.7/.tested: PYTHON_VERSION=2.7 $(BUILD_DIR)/%-3.4/.tested: PYTHON_VERSION=3.4 $(BUILD_DIR)/%-3.5/.tested: PYTHON_VERSION=3.5 $(BUILD_DIR)/$(MACH32)-%/.tested: BITS=32 $(BUILD_DIR)/$(MACH64)-%/.tested: BITS=64 $(BUILD_DIR)/%-2.6/.tested-and-compared: PYTHON_VERSION=2.6 $(BUILD_DIR)/%-2.7/.tested-and-compared: PYTHON_VERSION=2.7 $(BUILD_DIR)/%-3.4/.tested-and-compared: PYTHON_VERSION=3.4 $(BUILD_DIR)/%-3.5/.tested-and-compared: PYTHON_VERSION=3.5 $(BUILD_DIR)/$(MACH32)-%/.tested-and-compared: BITS=32 $(BUILD_DIR)/$(MACH64)-%/.tested-and-compared: BITS=64 @@ -74,13 +70,9 @@ # Reset arguments specified as environmnent variables COMPONENT_BUILD_ARGS = # If we are building Python 3.4 or 3.5 support, build them and install them # If we are building Python 3.5 support, build it and install it # before Python 2.7, so 2.7 is installed last and is the canonical version. # When we change the default, the new default should go last. ifneq ($(findstring 3.4,$(PYTHON_VERSIONS)),) $(BUILD_DIR)/%-2.7/.built: $(BUILD_DIR)/%-3.4/.built $(BUILD_DIR)/%-2.7/.installed: $(BUILD_DIR)/%-3.4/.installed endif ifneq ($(findstring 3.5,$(PYTHON_VERSIONS)),) $(BUILD_DIR)/%-2.7/.built: $(BUILD_DIR)/%-3.5/.built $(BUILD_DIR)/%-2.7/.installed: $(BUILD_DIR)/%-3.5/.installed make-rules/shared-macros.mk
@@ -166,7 +166,7 @@ PYTHON2_VERSION = 2.7 PYTHON2_RUNTIME_PKG = runtime/python-$(subst .,,$(PYTHON2_VERSION)) PYTHON3_VERSIONS = 3.4 3.5 3.7 PYTHON3_VERSIONS = 3.5 3.7 PYTHON3_VERSION = 3.5 PYTHON3_RUNTIME_PKG = runtime/python-$(subst .,,$(PYTHON3_VERSION)) @@ -679,10 +679,6 @@ PYTHON.2.7.VENDOR_PACKAGES.64 = /usr/lib/python2.7/vendor-packages/64 PYTHON.2.7.VENDOR_PACKAGES = $(PYTHON.2.7.VENDOR_PACKAGES.$(BITS)) PYTHON.3.4.VENDOR_PACKAGES.32 = /usr/lib/python3.4/vendor-packages PYTHON.3.4.VENDOR_PACKAGES.64 = /usr/lib/python3.4/vendor-packages/64 PYTHON.3.4.VENDOR_PACKAGES = $(PYTHON.3.4.VENDOR_PACKAGES.$(BITS)) PYTHON.3.5.VENDOR_PACKAGES.64 = /usr/lib/python3.5/vendor-packages PYTHON.3.5.VENDOR_PACKAGES.32 = /usr/lib/python3.5/vendor-packages PYTHON.3.5.VENDOR_PACKAGES = $(PYTHON.3.5.VENDOR_PACKAGES.$(BITS)) @@ -735,9 +731,6 @@ PYTHON.2.7.32 = /usr/bin/python2.7 PYTHON.2.7.64 = /usr/bin/$(MACH64)/python2.7 PYTHON.3.4.32 = /usr/bin/python3.4 PYTHON.3.4.64 = /usr/bin/$(MACH64)/python3.4 PYTHON.3.5.32 = /usr/bin/python3.5 PYTHON.3.5.64 = /usr/bin/python3.5
