Mailinglist Archive: yast-commit (815 mails)

[mvidner@xxxxxxxxxxxxxxxx]

Author: mvidner
Date: Wed Aug 22 17:52:21 2007
New Revision: 40419

URL: http://svn.opensuse.org/viewcvs/yast?rev=40419&view=rev
Log:
Accomodate for libzypp:
- building it and zypper, using cmake
- relinking language bindings with it

Modified:
    trunk/devtools/package/yast2-devtools.changes
    trunk/devtools/prefixbuild/recreate

Modified: trunk/devtools/package/yast2-devtools.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/package/yast2-devtools.changes?rev=40419&r1=40418&r2=40419&view=diff
==============================================================================
--- trunk/devtools/package/yast2-devtools.changes (original)
+++ trunk/devtools/package/yast2-devtools.changes Wed Aug 22 17:52:21 2007
@@ -1,4 +1,9 @@
 -------------------------------------------------------------------
+Wed Aug 22 17:51:45 CEST 2007 - mvidner@xxxxxxx
+
+- prefixbuild/recreate: Accomodate for libzypp
+
+-------------------------------------------------------------------
 Wed Aug 15 18:40:15 CEST 2007 - mvidner@xxxxxxx
 
 - Fixed spec creation for non-trans packages.

Modified: trunk/devtools/prefixbuild/recreate
URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/prefixbuild/recreate?rev=40419&r1=40418&r2=40419&view=diff
==============================================================================
--- trunk/devtools/prefixbuild/recreate (original)
+++ trunk/devtools/prefixbuild/recreate Wed Aug 22 17:52:21 2007
@@ -67,23 +67,17 @@
     exit 1
 fi
 
-# $1 package directory
-# configure arguments are take from MODULE_ARGUMENTS_$1
-function build_module() {
+function init_cmake() {
+    local MODULE="$1"; shift
+
+    mkdir -p _build
+    cd _build
+
+    PATH=/opt/icecream/bin:$PATH cmake -DCMAKE_INSTALL_PREFIX=$PREFIX -DZYPP_PREFIX=$PREFIX  -DSYSCONFDIR=$PREFIX/etc -DMANDIR=$PREFIX/share/man -DCMAKE_BUILD_TYPE=Debug ..
+}
+
+function init_autotools() {
     local MODULE="$1"; shift
-    if $SKIP_RECENT; then
-       T=$(mktemp /tmp/skip_recent.XXXXXX) || exit
-       touch -d '12 hours ago' $T
-       BYE=0
-       test "$MODULE"/.recreated -nt $T && BYE=1
-       rm $T
-       if [ "$BYE" = 1 ]; then
-           echo "Module $MODULE was recently recreated, skipping"
-           return
-       fi
-    fi
-    $NETWORK && condup "$MODULE"
-    pushd "$MODULE"
 
     if $AUTORECONF || ! test -x ./configure; then
        if $YAST; then
@@ -112,6 +106,37 @@
        # pfx ./configure $CACHE "${MODULE_ARGUMENTS_foo[@]-$PFX}"
        eval pfx ./configure \$CACHE "\"\${${MODULE_ARGUMENTS_r}[@]-\$PFX}\""
     fi
+}
+# $1 package directory
+# configure arguments are take from MODULE_ARGUMENTS_$1
+function build_module() {
+    local MODULE="$1"; shift
+    if $SKIP_RECENT; then
+       T=$(mktemp /tmp/skip_recent.XXXXXX) || exit
+       touch -d '12 hours ago' $T
+       BYE=0
+       test "$MODULE"/.recreated -nt $T && BYE=1
+       rm $T
+       if [ "$BYE" = 1 ]; then
+           echo "Module $MODULE was recently recreated, skipping"
+           return
+       fi
+    fi
+    $NETWORK && condup "$MODULE"
+
+    pushd "$MODULE"
+
+    case "$MODULE" in
+       zypper|libzypp) init_cmake "$MODULE";;
+       *) init_autotools "$MODULE";;
+    esac
+
+    # special case not to drag in old libzypp: force linking from scratch
+    case "$MODULE" in
+       pkg-bindings) : ;;
+       *-bindings) find -name \*.la | xargs rm -v ;;
+    esac
+
     pfx $MAKE
     pfx make install
 

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx