Merge devgen branch to trunk.

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@743 311d38ba-8fff-0310-9ca6-ca027cbcb966

1 files changed, 40 insertions, 163 deletions

diff --git a/meta/packages/tasks/task-oh-sdk.bb b/meta/packages/tasks/task-oh-sdk.bb
index 84cbdcb5b..c4b8749f9 100644
--- a/meta/packages/tasks/task-oh-sdk.bb
+++ b/meta/packages/tasks/task-oh-sdk.bb
@@ -1,187 +1,64 @@
 DESCRIPTON = "Software Development Tasks for OpenedHand Poky"
 MAINTAINER = "Richard Purdie <richard@openedhand.com>"
-PR = "r8"
-
-PACKAGES = "\
-    task-oh-sdk \
-    task-oh-sdk-base \
-    task-oh-sdk-apps \
-    task-oh-sdk-libs \
-    task-oh-sdk-x11-base \
-    task-oh-sdk-x11-apps \
-    task-oh-sdk-x11-libs \
-    task-oh-sdk-x11-xext \
-    task-oh-sdk-x11-xlibs"
-
+PR = "r10"
+DEPENDS = "task-oh"
 ALLOW_EMPTY = "1"
+PACKAGEFUNCS =+ 'generate_sdk_pkgs'
 
-RDEPENDS_task-oh-sdk := "\
-    task-oh-sdk-base \
-    task-oh-sdk-apps \
-    task-oh-sdk-libs \
-    task-oh-sdk-x11-base \
-    task-oh-sdk-x11-apps \
-    task-oh-sdk-x11-libs \
-    task-oh-sdk-x11-xext \
-    task-oh-sdk-x11-xlibs"
+PACKAGES = "task-oh-sdk"
 
-RDEPENDS_task-oh-sdk-base := "\
+RDEPENDS_task-oh-sdk = "\
     autoconf \
     automake \
     binutils \
     binutils-symlinks \
     gcc \
     gcc-symlinks \
-    glibc-dev \
     make \
     perl-module-re \
     perl-module-text-wrap \
     pkgconfig"
 
-RDEPENDS_task-oh-sdk-apps := "\
-    avahi-dev \
-    binutils-dev \
-    console-tools-dev \
-    db-dev \
-    gdb-dev \
-    udev-dev"
-
-RDEPENDS_task-oh-sdk-libs := "\
-    bzip2-dev \
-    dbus-dev \
-    eds-dbus-dev \
-    glib-2.0-dev \
-    ncurses-dev \
-    zlib-dev"
+python generate_sdk_pkgs () {
+    def packaged(pkg, d):
+        return os.access(bb.data.expand('${STAGING_DIR}/pkgdata/runtime/%s.packaged' % pkg, d), os.R_OK)
 
-RDEPENDS_task-oh-sdk-x11-base := "\
-    atk-dev \
-    cairo-dev \
-    gconf-dbus-dev \
-    gtk+-dev \
-    libmatchbox-dev \
-    matchbox-desktop-dev \
-    pango-dev \
-    startup-notification-dev"
-#    gtk-engines-dev \
-#    libsvg-cairo-dev \
+    ohpkgs = read_pkgdata('task-oh', d)['PACKAGES']
+    pkgs = bb.data.getVar('PACKAGES', d, 1).split()
+    for pkg in ohpkgs.split():
+        newpkg = pkg.replace('task-oh', 'task-oh-sdk')
 
-RDEPENDS_task-oh-sdk-x11-apps := "\
-    dates-dev \
-"
+        # for each of the task packages, add a corresponding sdk task
+        pkgs.append(newpkg)
 
-RDEPENDS_task-oh-sdk-x11-libs := "\
-    gconf-dbus-dev \
-    gnome-vfs-dbus-dev \
-"
+        # for each sdk task, take the rdepends of the non-sdk task, and turn
+        # that into rrecommends upon the -dev versions of those, not unlike
+        # the package depchain code
+        spkgdata = read_subpkgdata(pkg, d)
 
-RDEPENDS_task-oh-sdk-x11-xext := "\
-    compositeext-dev \
-    damageext-dev \
-    fixesext-dev \
-    randrext-dev \
-    recordext-dev \
-    renderext-dev \
-    xcalibrate-dev \
-    xcalibrateext-dev \
-    xextensions-dev \
-    xproto-dev \
-    xtrans-dev"
+        rdepends = explode_deps(spkgdata.get('RDEPENDS_%s' % pkg) or '')
+        rreclist = []
 
-RDEPENDS_task-oh-sdk-x11-xlibs := "\
-    libx11-dev \
-    libxau-dev \
-    libxcursor-dev \
-    libxdmcp-dev \
-    libxext-dev \
-    libxfixes-dev \
-    libxfont-dev \
-    libxft-dev \
-    libxpm-dev \
-    libxrandr-dev \
-    libxrender-dev \
-    libxsettings-client-dev \
-    libxt-dev \
-    libxtst-dev"
-#    libxdamage-dev \
-#    libxcomposite-dev \
+        for depend in rdepends:
+            split_depend = depend.split(' (')
+            name = split_depend[0].strip()
+            if packaged('%s-dev' % name, d):
+                rreclist.append('%s-dev' % name)
+            else:
+                deppkgdata = read_subpkgdata(name, d)
+                rdepends2 = explode_deps(deppkgdata.get('RDEPENDS_%s' % name) or '')
+                for depend in rdepends2:
+                    split_depend = depend.split(' (')
+                    name = split_depend[0].strip()
+                    if packaged('%s-dev' % name, d):
+                        rreclist.append('%s-dev' % name)
 
+            oldrrec = bb.data.getVar('RRECOMMENDS_%s' % newpkg, d) or ''
+            bb.data.setVar('RRECOMMENDS_%s' % newpkg, oldrrec + ' ' + ' '.join(rreclist), d)
+            # bb.note('RRECOMMENDS_%s = "%s"' % (newpkg, bb.data.getVar('RRECOMMENDS_%s' % newpkg, d)))
 
+    # bb.note('pkgs is %s' % pkgs)
+    bb.data.setVar('PACKAGES', ' '.join(pkgs), d)
+}
 
-RDEPENDS_task-sdk-unsorted := "\
-    gnome-mime-data-dev \
-    gtk-clearlooks-engine-dev \
-    ipkg-dev \
-    js-dev \
-    kernel-dev \
-    libapm-dev \
-    libcurl-dev \
-    libdaemon-dev \
-    libexpat-dev \
-    libfakekey-dev \
-    libfontconfig-dev \
-    libfreetype-dev \
-    libgcrypt-dev \
-    libglade-2.0-dev \
-    libgmp-dev \
-    libgnutls-dev \
-    libgpg-error-dev \
-    libgtkhtml-2-dev \
-    libice-dev \
-    libiconv-dev \
-    libipkg-dev \
-    libiw-dev \
-    libjpeg-dev \
-    libloudmouth-1-dev \
-    libpcap-dev \
-    libpng-dev \
-    libpng12-dev \
-    libpopt-dev \
-    libreadline-dev \
-    libsm-dev \
-    libstartup-notification-1-dev \
-    libxau-dev \
-    libxcalibrate-dev \
-    libxml2-dev \
-    libxmu-dev \
-    libxmuu-dev \
-    libxsettings-dev \
-    linux-libc-headers-dev \
-    lttng-viewer-dev \
-    matchbox-desktop-dev \
-    ppp-dev \
-    shared-mime-info-dev \
-    sysfsutils-dev \
-    sysvinit-dev \
-    others found \
-    expat-dev \
-    fontconfig-dev \
-    freetype-dev \
-    gstreamer-dev \
-    ice-dev \
-    ipkg-dev \
-    jpeg-dev \
-    libapm-dev \
-    libdisplaymigration-dev \
-    libetpan-dev \
-    libgcrypt-dev \
-    libglade-dev \
-    libgpg-error-dev \ 
-    libidl-dev \
-    libiw-dev \
-    libmimedir-dev \
-    libpcap-dev \
-    libpixman-dev \
-    libpng-dev \
-    libschedule-dev \
-    libsm-dev \
-    libsoundgen-dev \
-    libsvg-dev \
-    libtododb-dev \
-    libts-dev \
-    libxml2-dev \    
-    openobex-dev \
-    popt-dev \
-    readline-dev \
-    sqlite-dev \
-    xmu-dev"
+PACKAGES_DYNAMIC = "task-oh-sdk-*"