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.
23245352 Move dbus-python 1.2.0 to Userland
authorAlan Coopersmith <Alan.Coopersmith@Oracle.COM>
Tue, 15 Nov 2016 15:00:17 -0800
changeset 7332 50a475baa0cd
parent 7331 a36c61e047b0
child 7333 85747fa32c93
23245352 Move dbus-python 1.2.0 to Userland
components/desktop/dbus-python/Makefile file | annotate | diff | comparison | revisions
components/desktop/dbus-python/dbus-python-GENFRAG.p5m file | annotate | diff | comparison | revisions
components/desktop/dbus-python/dbus-python-PYVER.p5m file | annotate | diff | comparison | revisions
components/desktop/dbus-python/test/results-py2.master file | annotate | diff | comparison | revisions
components/desktop/dbus-python/test/results-py3.master file | annotate | diff | comparison | revisions
components/desktop/pidgin/Makefile file | annotate | diff | comparison | revisions
components/meta-packages/history/history file | annotate | diff | comparison | revisions
components/meta-packages/incorporation-cache file | annotate | diff | comparison | revisions
tools/.gnupg/pubring.gpg file | annotate | diff | comparison | revisions 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/dbus-python/Makefile	Tue Nov 15 15:00:17 2016 -0800
@@ -0,0 +1,102 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+BUILD_BITS =		64_and_32
+COMPILER =		gcc
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		dbus-python
+COMPONENT_VERSION=	1.2.0
+COMPONENT_PROJECT_URL=	http://dbus.freedesktop.org
+COMPONENT_ARCHIVE_HASH= \
+    sha256:e12c6c8b2bf3a9302f75166952cbe41d6b38c3441bbc6767dbd498942316c6df
+COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)/releases/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)
+COMPONENT_SIG_URL=	$(COMPONENT_ARCHIVE_URL).asc
+COMPONENT_BUGDB=	library/dbus
+
+TPNO=			25524
+
+# replicated from $(WS_MAKE_RULES)/setup.py.mk since this uses configure instead
+CONFIGURE_64 = $(PYTHON_VERSIONS:%=$(BUILD_DIR)/$(MACH64)-%/.configured)
+BUILD_64     = $(PYTHON_VERSIONS:%=$(BUILD_DIR)/$(MACH64)-%/.built)
+INSTALL_64   = $(PYTHON_VERSIONS:%=$(BUILD_DIR)/$(MACH64)-%/.installed)
+TEST_64	     = $(PYTHON_VERSIONS:%=$(BUILD_DIR)/$(MACH64)-%/.tested-and-compared)
+
+$(foreach pyver, $(PYTHON_VERSIONS), \
+  $(eval $(BUILD_DIR)/%-$(pyver)/.configured:          PYTHON_VERSION=$(pyver)) \
+  $(eval $(BUILD_DIR)/%-$(pyver)/.built:               PYTHON_VERSION=$(pyver)) \
+  $(eval $(BUILD_DIR)/%-$(pyver)/.installed:           PYTHON_VERSION=$(pyver)) \
+  $(eval $(BUILD_DIR)/%-$(pyver)/.tested-and-compared: PYTHON_VERSION=$(pyver)) \
+)
+
+$(BUILD_DIR)/$(MACH64)-%/.configured:		BITS=64
+$(BUILD_DIR)/$(MACH64)-%/.built:		BITS=64
+$(BUILD_DIR)/$(MACH64)-%/.installed:		BITS=64
+$(BUILD_DIR)/$(MACH64)-%/.tested-and-compared:	BITS=64
+
+PYTHON_MAJOR = $(basename $(PYTHON_VERSION))
+
+COMPONENT_TEST_OUTPUT = \
+    $(COMPONENT_TEST_BUILD_DIR)/test-$(PYTHON_VERSION)-$(BITS)-results
+COMPONENT_TEST_DIFFS = \
+    $(COMPONENT_TEST_BUILD_DIR)/test-$(PYTHON_VERSION)-$(BITS)-diffs
+COMPONENT_TEST_SNAPSHOT = \
+    $(COMPONENT_TEST_BUILD_DIR)/results-$(PYTHON_VERSION)-$(BITS).snapshot
+COMPONENT_TEST_TRANSFORM_CMD = \
+    $(COMPONENT_TEST_BUILD_DIR)/transform-$(PYTHON_VERSION)-$(BITS)-results
+COMPONENT_TEST_MASTER = \
+    $(COMPONENT_TEST_RESULTS_DIR)/results-py$(PYTHON_MAJOR).master
+
+include $(WS_MAKE_RULES)/common.mk
+
+# Need to replace the py-compile in the 1.2.0 tarball with the one from a
+# newer version of automake in order to output *pyc to the right paths for
+# Python 3.4 & 3.5
+COMPONENT_PREP_ACTION += (cd $(@D); rm -f py-compile ; autoreconf -fiv);
+
+CONFIGURE_OPTIONS += PYTHON="$(PYTHON)"
+
+# Ensure Python modules are installed into vendor package directories.
+CONFIGURE_ENV += am_cv_python_pythondir=$(PYTHON_VENDOR_PACKAGES.32)
+CONFIGURE_ENV += am_cv_python_pyexecdir=$(PYTHON.$(PYTHON_VERSION).VENDOR_PACKAGES)
+
+COMPONENT_TEST_ENV +=   PYTHONPATH=$(PROTO_DIR)$(PYTHON_VENDOR_PACKAGES.32)
+
+# Needed for "gmake test" to work successfully.
+unexport SHELLOPTS
+
+# Standard automake test framework results transform
+COMPONENT_TEST_TRANSFORMS += \
+        '-n ' \
+        '-e "/TOTAL/p" ' \
+        '-e "/SKIP/p" ' \
+        '-e "/PASS/p" ' \
+        '-e "/FAIL/p" ' \
+        '-e "/ERROR/p" '
+
+REQUIRED_PACKAGES += library/glib2
+REQUIRED_PACKAGES += runtime/python-27
+REQUIRED_PACKAGES += runtime/python-34
+REQUIRED_PACKAGES += runtime/python-35
+REQUIRED_PACKAGES += system/library/libdbus
+REQUIRED_PACKAGES += system/library/libdbus-glib
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/dbus-python/dbus-python-GENFRAG.p5m	Tue Nov 15 15:00:17 2016 -0800
@@ -0,0 +1,35 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+file path=usr/include/dbus-1.0/dbus/dbus-python.h
+file path=usr/lib/$(MACH64)/pkgconfig/dbus-python.pc
+file path=usr/lib/pkgconfig/dbus-python.pc
+file path=usr/share/doc/dbus-python/API_CHANGES.txt
+file path=usr/share/doc/dbus-python/HACKING.txt
+file path=usr/share/doc/dbus-python/NEWS
+file path=usr/share/doc/dbus-python/PY3PORT.txt
+file path=usr/share/doc/dbus-python/README
+file path=usr/share/doc/dbus-python/tutorial.txt
+license COPYING license=MIT
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/dbus-python/dbus-python-PYVER.p5m	Tue Nov 15 15:00:17 2016 -0800
@@ -0,0 +1,64 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python/dbus-python-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Python $(PYVER) bindings for D-Bus"
+set name=com.oracle.info.description value="Python bindings for D-Bus"
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+    value=org.opensolaris.category.2008:System/Libraries
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=LSARC/2006/368 value=LSARC/2007/063
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file usr/lib/python$(PYVER)/vendor-packages/64/_dbus_bindings.so \
+    path=usr/lib/python$(PYVER)/vendor-packages/64/_dbus_bindings.so
+file usr/lib/python$(PYVER)/vendor-packages/64/_dbus_glib_bindings.so \
+    path=usr/lib/python$(PYVER)/vendor-packages/64/_dbus_glib_bindings.so
+file usr/lib/python$(PYVER)/vendor-packages/_dbus_bindings.so \
+    path=usr/lib/python$(PYVER)/vendor-packages/_dbus_bindings.so
+file usr/lib/python$(PYVER)/vendor-packages/_dbus_glib_bindings.so \
+    path=usr/lib/python$(PYVER)/vendor-packages/_dbus_glib_bindings.so
+file path=usr/lib/python$(PYVER)/vendor-packages/dbus/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dbus/_compat.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dbus/_dbus.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dbus/_expat_introspect_parser.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dbus/_version.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dbus/bus.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dbus/connection.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dbus/decorators.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dbus/exceptions.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dbus/gi_service.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dbus/glib.py
+$(PYTHON_2.7_ONLY)file path=usr/lib/python$(PYVER)/vendor-packages/dbus/gobject_service.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dbus/lowlevel.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dbus/mainloop/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dbus/mainloop/glib.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dbus/proxies.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dbus/server.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dbus/service.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dbus/types.py
+license COPYING license=MIT
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/dbus-python/test/results-py2.master	Tue Nov 15 15:00:17 2016 -0800
@@ -0,0 +1,9 @@
+FAIL: run-test.sh
+PASS: test-import-repeatedly
+# TOTAL: 2
+# PASS:  1
+# SKIP:  0
+# XFAIL: 0
+# FAIL:  1
+# XPASS: 0
+# ERROR: 0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/dbus-python/test/results-py3.master	Tue Nov 15 15:00:17 2016 -0800
@@ -0,0 +1,9 @@
+PASS: run-test.sh
+PASS: test-import-repeatedly
+# TOTAL: 2
+# PASS:  2
+# SKIP:  0
+# XFAIL: 0
+# FAIL:  0
+# XPASS: 0
+# ERROR: 0
--- a/components/desktop/pidgin/Makefile	Wed Nov 16 18:51:32 2016 -0800
+++ b/components/desktop/pidgin/Makefile	Tue Nov 15 15:00:17 2016 -0800
@@ -129,6 +129,8 @@
 REQUIRED_PACKAGES += library/ncurses
 REQUIRED_PACKAGES += library/nspr
 REQUIRED_PACKAGES += library/perl-5/xml-parser
+REQUIRED_PACKAGES += library/python/dbus-python-27
+# Remove once all build machines are upgraded to dbus-python-27:
 REQUIRED_PACKAGES += library/python/python-dbus-27
 REQUIRED_PACKAGES += library/security/nss
 REQUIRED_PACKAGES += $(PERL_PKG)
--- a/components/meta-packages/history/history	Wed Nov 16 18:51:32 2016 -0800
+++ b/components/meta-packages/history/history	Tue Nov 15 15:00:17 2016 -0800
@@ -1068,6 +1068,7 @@
 library/python/[email protected] library/python/[email protected] incorporate=consolidation/desktop/gnome-incorporation
 library/python/[email protected],5.12-5.12.0.0.0.112.0 incorporate=consolidation/desktop/gnome-incorporation
 library/python/[email protected],5.12-5.12.0.0.0.90.0
+library/python/[email protected],5.12-5.12.0.0.0.113.0 library/python/dbus-python-27
 library/python/[email protected]
 library/python/[email protected],5.12-5.12.0.0.0.112.0 incorporate=consolidation/desktop/gnome-incorporation
 library/python/[email protected]
--- a/components/meta-packages/incorporation-cache	Wed Nov 16 18:51:32 2016 -0800
+++ b/components/meta-packages/incorporation-cache	Tue Nov 15 15:00:17 2016 -0800
@@ -64,7 +64,6 @@
 consolidation/userland/userland-incorporation:image/library/[email protected]
 consolidation/userland/userland-incorporation:library/[email protected]
 consolidation/userland/userland-incorporation:library/[email protected]
-consolidation/userland/userland-incorporation:library/python/[email protected]
 consolidation/userland/userland-incorporation:library/python/[email protected]
 consolidation/userland/userland-incorporation:library/python/[email protected]
 consolidation/userland/userland-incorporation:library/speech/[email protected]
Binary file tools/.gnupg/pubring.gpg has changed
upstream/oracle/userland-gate