Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Implement support for builds with multiple versions of python.
authorDanek Duvall <danek.duvall@oracle.com>
Wed, 25 Aug 2010 11:58:58 -0700
changeset 31 90e0c3ea3281
parent 30 440b6ca0641d
child 32 280a7444e782
Implement support for builds with multiple versions of python.
components/pycups/pycups.p5m file | annotate | diff | comparison | revisions
make-rules/setup.py.mk file | annotate | diff | comparison | revisions
make-rules/shared-macros.mk file | annotate | diff | comparison | revisions 
--- a/components/pycups/pycups.p5m	Wed Aug 11 09:18:07 2010 -0700
+++ b/components/pycups/pycups.p5m	Wed Aug 25 11:58:58 2010 -0700
@@ -32,6 +32,11 @@
 license COPYING license="GPLv2"
 dir path=usr
 dir path=usr/lib
+dir path=usr/lib/python2.4
+dir path=usr/lib/python2.4/vendor-packages
+dir path=usr/lib/python2.4/vendor-packages/64
+file path=usr/lib/python2.4/vendor-packages/64/cups.so variant.arch=$(ARCH)
+file path=usr/lib/python2.4/vendor-packages/cups.so variant.arch=$(ARCH)
 dir path=usr/lib/python2.6
 dir path=usr/lib/python2.6/vendor-packages
 dir path=usr/lib/python2.6/vendor-packages/64
--- a/make-rules/setup.py.mk	Wed Aug 11 09:18:07 2010 -0700
+++ b/make-rules/setup.py.mk	Wed Aug 25 11:58:58 2010 -0700
@@ -21,11 +21,21 @@
 # Copyright (c) 2010, Oracle and/or it's affiliates.  All rights reserved.
 #
 
-$(COMPONENT_SRC)/build-$(MACH32)/.built:	BITS=32
-$(COMPONENT_SRC)/build-$(MACH64)/.built:	BITS=64
-$(COMPONENT_SRC)/build-$(MACH32)/.installed:	BITS=32
-$(COMPONENT_SRC)/build-$(MACH64)/.installed:	BITS=64
+$(COMPONENT_SRC)/build-%-2.6/.built:		PYTHON_VERSION=2.6
+$(COMPONENT_SRC)/build-%-2.4/.built:		PYTHON_VERSION=2.4
+$(COMPONENT_SRC)/build-$(MACH32)-%/.built:	BITS=32
+$(COMPONENT_SRC)/build-$(MACH64)-%/.built:	BITS=64
 
+$(COMPONENT_SRC)/build-%-2.6/.installed:	PYTHON_VERSION=2.6
+$(COMPONENT_SRC)/build-%-2.4/.installed:	PYTHON_VERSION=2.4
+$(COMPONENT_SRC)/build-$(MACH32)-%/.installed:	BITS=32
+$(COMPONENT_SRC)/build-$(MACH64)-%/.installed:	BITS=64
+
+BUILD_32 = $(PYTHON_VERSIONS:%=$(COMPONENT_SRC)/build-$(MACH32)-%/.built)
+BUILD_64 = $(PYTHON_VERSIONS:%=$(COMPONENT_SRC)/build-$(MACH64)-%/.built)
+
+INSTALL_32 = $(PYTHON_VERSIONS:%=$(COMPONENT_SRC)/build-$(MACH32)-%/.installed)
+INSTALL_64 = $(PYTHON_VERSIONS:%=$(COMPONENT_SRC)/build-$(MACH64)-%/.installed)
 
 # build the configured source
 $(COMPONENT_SRC)/build-%/.built:	$(COMPONENT_SRC)/.prep
--- a/make-rules/shared-macros.mk	Wed Aug 11 09:18:07 2010 -0700
+++ b/make-rules/shared-macros.mk	Wed Aug 25 11:58:58 2010 -0700
@@ -36,6 +36,7 @@
 COMPILER =		studio
 BITS =			32
 PYTHON_VERSION =	2.6
+PYTHON_VERSIONS =	2.4 2.6
 
 TOOLS =		$(WS_TOP)/tools
 WS_LOGS =	$(WS_TOP)/logs
upstream/oracle/userland-gate