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.
23132162 Upgrade scons to 2.5.0
authorRich Burridge <rich.burridge@oracle.com>
Fri, 29 Apr 2016 05:11:11 -0700
changeset 5879 6c5ab2c43a8c
parent 5878 85ea3e08eed7
child 5880 caab292318a0
23132162 Upgrade scons to 2.5.0
components/scons/Makefile file | annotate | diff | comparison | revisions
components/scons/scons-PYVER.p5m file | annotate | diff | comparison | revisions 
--- a/components/scons/Makefile	Thu Apr 28 02:10:15 2016 -0700
+++ b/components/scons/Makefile	Fri Apr 29 05:11:11 2016 -0700
@@ -26,13 +26,13 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		scons
-COMPONENT_VERSION=	2.3.4
+COMPONENT_VERSION=	2.5.0
 COMPONENT_PROJECT_URL=	http://www.scons.org/
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:4b57d72066fed3b6ff65a7dd9f73633c9b1c09f87520e9b3aae84b3e4864b441
+    sha256:eb296b47f23c20aec7d87d35cfa386d3508e01d1caa3040ea6f5bbab2292ace9
 COMPONENT_ARCHIVE_URL=	http://sourceforge.net/projects/$(COMPONENT_NAME)/files/$(COMPONENT_NAME)/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)/download
 
-TPNO=			22207
+TPNO=			28026
 
 # Per Q1.1.4 of the SCons FAQ, SCons is written to work with any Python
 # version >= 2.4 and < 3.0. Versions 3.0 and above are not supported at
@@ -47,13 +47,13 @@
 # '#!/usr/bin/env python' so turn it into '#!/usr/bin/python$(PYTHON_VERSION)'
 COMPONENT_POST_INSTALL_ACTION += \
 	$(GSED) -i -e 's?env python?python$(PYTHON_VERSION)?' \
-		$(PROTOUSRBINDIR)/scons-2.3.4;
+		$(PROTOUSRBINDIR)/scons-$(COMPONENT_VERSION);
 COMPONENT_POST_INSTALL_ACTION += \
 	$(GSED) -i -e 's?env python?python$(PYTHON_VERSION)?' \
-		$(PROTOUSRBINDIR)/scons-time-2.3.4;
+		$(PROTOUSRBINDIR)/scons-time-$(COMPONENT_VERSION);
 COMPONENT_POST_INSTALL_ACTION += \
 	$(GSED) -i -e 's?env python?python$(PYTHON_VERSION)?' \
-		$(PROTOUSRBINDIR)/sconsign-2.3.4;
+		$(PROTOUSRBINDIR)/sconsign-$(COMPONENT_VERSION);
 
 PKG_PROTO_DIRS +=	$(PROTO_DIR)/$(PYTHON_VENDOR_PACKAGES)
 
--- a/components/scons/scons-PYVER.p5m	Thu Apr 28 02:10:15 2016 -0700
+++ b/components/scons/scons-PYVER.p5m	Fri Apr 29 05:11:11 2016 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
@@ -82,6 +82,7 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/SCons/Scanner/LaTeX.py
 file path=usr/lib/python$(PYVER)/vendor-packages/SCons/Scanner/Prog.py
 file path=usr/lib/python$(PYVER)/vendor-packages/SCons/Scanner/RC.py
+file path=usr/lib/python$(PYVER)/vendor-packages/SCons/Scanner/SWIG.py
 file path=usr/lib/python$(PYVER)/vendor-packages/SCons/Scanner/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/SCons/Script/Interactive.py
 file path=usr/lib/python$(PYVER)/vendor-packages/SCons/Script/Main.py
@@ -227,13 +228,7 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/SCons/Warnings.py
 file path=usr/lib/python$(PYVER)/vendor-packages/SCons/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/SCons/compat/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/SCons/compat/_scons_builtins.py
-file path=usr/lib/python$(PYVER)/vendor-packages/SCons/compat/_scons_collections.py
 file path=usr/lib/python$(PYVER)/vendor-packages/SCons/compat/_scons_dbm.py
-file path=usr/lib/python$(PYVER)/vendor-packages/SCons/compat/_scons_hashlib.py
-file path=usr/lib/python$(PYVER)/vendor-packages/SCons/compat/_scons_io.py
-file path=usr/lib/python$(PYVER)/vendor-packages/SCons/compat/_scons_sets.py
-file path=usr/lib/python$(PYVER)/vendor-packages/SCons/compat/_scons_subprocess.py
 file path=usr/lib/python$(PYVER)/vendor-packages/SCons/cpp.py
 file path=usr/lib/python$(PYVER)/vendor-packages/SCons/dblite.py
 file path=usr/lib/python$(PYVER)/vendor-packages/SCons/exitfuncs.py
upstream/oracle/userland-gate