Hello community,
here is the log from the commit of package yast2-devtools
checked in at Fri Feb 1 20:19:35 CET 2008.
--------
--- yast2-devtools/yast2-devtools.changes 2007-12-03 10:02:39.000000000 +0100
+++ yast2-devtools/yast2-devtools.changes 2008-02-01 17:12:56.000000000 +0100
@@ -1,0 +2,31 @@
+Fri Feb 1 17:09:30 CET 2008 - mvidner@suse.cz
+
+- Require autotools, gettext-tools, recommend cmake (bnc#356996).
+- y2makepot: look for gettext() in addition to _() and __() (bnc#354678).
+- prefixbuild: cmake fixes, small fixes for individual modules
+- 2.16.4
+
+-------------------------------------------------------------------
+Thu Jan 24 14:07:52 CET 2008 - mzugec@suse.de
+
+- replace deprecated NetworkDevices by NetworkInterfaces (from yast2)
+
+-------------------------------------------------------------------
+Thu Jan 24 13:57:49 CET 2008 - sh@suse.de
+
+- In cmake-based projects, use @HEADERCOMMENT@ instead of
+ @HEADER-COMMENT@ (the "-" seems to be an illegal character)
+
+-------------------------------------------------------------------
+Fri Jan 18 13:35:21 CET 2008 - locilka@suse.cz
+
+- Recommends: doxygen (needed by ydoxygen).
+
+-------------------------------------------------------------------
+Thu Dec 20 13:23:44 CET 2007 - sh@suse.de
+
+- Added support for cmake-based projects to y2makeall
+ (Not just completely out of tree like libzypp, even subdirs
+ in the normal yast2 SVN tree)
+
+-------------------------------------------------------------------
Old:
----
yast2-devtools-2.16.3.tar.bz2
New:
----
yast2-devtools-2.16.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-devtools.spec ++++++
--- /var/tmp/diff_new_pack.Q30958/_old 2008-02-01 20:16:25.000000000 +0100
+++ /var/tmp/diff_new_pack.Q30958/_new 2008-02-01 20:16:25.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package yast2-devtools (Version 2.16.3)
+# spec file for package yast2-devtools (Version 2.16.4)
#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-devtools
-Version: 2.16.3
-Release: 2
+Version: 2.16.4
+Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-devtools-2.16.3.tar.bz2
+Source0: yast2-devtools-2.16.4.tar.bz2
Prefix: /usr
BuildRequires: docbook-xsl-stylesheets gcc-c++ libxslt perl-XML-Writer pkgconfig sgml-skel
Requires: perl
@@ -24,6 +24,11 @@
Requires: libxslt
# we install our .pc under $prefix/share
Requires: pkgconfig >= 0.16
+Requires: automake autoconf
+Requires: gettext-tools
+Recommends: cmake
+# /usr/lib/YaST2/bin/ydoxygen needs it
+Recommends: doxygen
Provides: ycpdoc ydoc
Obsoletes: ycpdoc ydoc
Provides: yast2-config-newmodule yast2-trans-newmodule
@@ -48,7 +53,7 @@
Michal Svec
%prep
-%setup -n yast2-devtools-2.16.3
+%setup -n yast2-devtools-2.16.4
%build
autoreconf --force --install
++++++ yast2-devtools-2.16.3.tar.bz2 -> yast2-devtools-2.16.4.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-devtools-2.16.3/configure new/yast2-devtools-2.16.4/configure
--- old/yast2-devtools-2.16.3/configure 2007-12-02 21:37:10.000000000 +0100
+++ new/yast2-devtools-2.16.4/configure 2008-02-01 17:13:52.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-devtools 2.16.3.
+# Generated by GNU Autoconf 2.61 for yast2-devtools 2.16.4.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -728,8 +728,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-devtools'
PACKAGE_TARNAME='yast2-devtools'
-PACKAGE_VERSION='2.16.3'
-PACKAGE_STRING='yast2-devtools 2.16.3'
+PACKAGE_VERSION='2.16.4'
+PACKAGE_STRING='yast2-devtools 2.16.4'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1449,7 +1449,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-devtools 2.16.3 to adapt to many kinds of systems.
+\`configure' configures yast2-devtools 2.16.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1520,7 +1520,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-devtools 2.16.3:";;
+ short | recursive ) echo "Configuration of yast2-devtools 2.16.4:";;
esac
cat <<\_ACEOF
@@ -1629,7 +1629,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-devtools configure 2.16.3
+yast2-devtools configure 2.16.4
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1643,7 +1643,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-devtools $as_me 2.16.3, which was
+It was created by yast2-devtools $as_me 2.16.4, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2464,7 +2464,7 @@
# Define the identity of the package.
PACKAGE='yast2-devtools'
- VERSION='2.16.3'
+ VERSION='2.16.4'
cat >>confdefs.h <<_ACEOF
@@ -2692,7 +2692,7 @@
-VERSION="2.16.3"
+VERSION="2.16.4"
RPMNAME="yast2-devtools"
MAINTAINER="Martin Vidner "
@@ -2943,8 +2943,8 @@
if test -z "$XGETTEXT" ; then
- { { echo "$as_me:$LINENO: error: xgettext is missing; please install gettext-devel." >&5
-echo "$as_me: error: xgettext is missing; please install gettext-devel." >&2;}
+ { { echo "$as_me:$LINENO: error: xgettext is missing; please install gettext-tools." >&5
+echo "$as_me: error: xgettext is missing; please install gettext-tools." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -20654,7 +20654,7 @@
ac_config_files="$ac_config_files devtools/bin/version"
-ac_config_files="$ac_config_files Makefile devtools/bin/Makefile devtools/admin/po/Makefile devtools/admin/copyright/yast/Makefile devtools/admin/copyright/gpl/Makefile devtools/admin/copyright/Makefile devtools/admin/aclocal/Makefile devtools/admin/aminclude/Makefile devtools/admin/Makefile devtools/skeletons/Makefile devtools/doc/skeletons/config/Makefile devtools/doc/skeletons/Makefile devtools/doc/Makefile devtools/data/Makefile devtools/cmake/modules/Makefile devtools/cmake/Makefile devtools/Makefile docbook/stylesheets/Makefile docbook/css/Makefile docbook/images/navig/Makefile docbook/images/admon/Makefile docbook/images/Makefile docbook/Makefile doxygen/Makefile scrdoc/doc/Makefile scrdoc/src/Makefile scrdoc/Makefile y2logview/y2log_ana/Makefile y2logview/Makefile yast2/check_ycp/doc/Makefile yast2/check_ycp/Makefile yast2/Makefile ycpdoc/doc/example/Makefile ycpdoc/doc/Makefile ycpdoc/src/Makefile ycpdoc/testsuite/Makefile ycpdoc/Makefile ydoc/doc/Makefile ydoc/src/Makefile ydoc/po-tools/Makefile ydoc/Makefile"
+ac_config_files="$ac_config_files Makefile devtools/bin/Makefile devtools/admin/po/Makefile devtools/admin/copyright/yast/Makefile devtools/admin/copyright/gpl/Makefile devtools/admin/copyright/Makefile devtools/admin/aclocal/Makefile devtools/admin/aminclude/Makefile devtools/admin/Makefile devtools/skeletons/Makefile devtools/doc/skeletons/config/Makefile devtools/doc/skeletons/Makefile devtools/doc/Makefile devtools/data/Makefile devtools/cmake/modules/Makefile devtools/cmake/Makefile devtools/Makefile docbook/stylesheets/Makefile docbook/css/Makefile docbook/images/navig/Makefile docbook/images/admon/Makefile docbook/images/Makefile docbook/Makefile doxygen/Makefile scrdoc/doc/Makefile scrdoc/src/Makefile scrdoc/Makefile yast2/check_ycp/doc/Makefile yast2/check_ycp/Makefile yast2/Makefile ycpdoc/doc/example/Makefile ycpdoc/doc/Makefile ycpdoc/src/Makefile ycpdoc/testsuite/Makefile ycpdoc/Makefile ydoc/doc/Makefile ydoc/src/Makefile ydoc/po-tools/Makefile ydoc/Makefile y2logview/y2log_ana/Makefile y2logview/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -21138,7 +21138,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-devtools $as_me 2.16.3, which was
+This file was extended by yast2-devtools $as_me 2.16.4, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21185,7 +21185,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-devtools config.status 2.16.3
+yast2-devtools config.status 2.16.4
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -21319,8 +21319,6 @@
"scrdoc/doc/Makefile") CONFIG_FILES="$CONFIG_FILES scrdoc/doc/Makefile" ;;
"scrdoc/src/Makefile") CONFIG_FILES="$CONFIG_FILES scrdoc/src/Makefile" ;;
"scrdoc/Makefile") CONFIG_FILES="$CONFIG_FILES scrdoc/Makefile" ;;
- "y2logview/y2log_ana/Makefile") CONFIG_FILES="$CONFIG_FILES y2logview/y2log_ana/Makefile" ;;
- "y2logview/Makefile") CONFIG_FILES="$CONFIG_FILES y2logview/Makefile" ;;
"yast2/check_ycp/doc/Makefile") CONFIG_FILES="$CONFIG_FILES yast2/check_ycp/doc/Makefile" ;;
"yast2/check_ycp/Makefile") CONFIG_FILES="$CONFIG_FILES yast2/check_ycp/Makefile" ;;
"yast2/Makefile") CONFIG_FILES="$CONFIG_FILES yast2/Makefile" ;;
@@ -21333,6 +21331,8 @@
"ydoc/src/Makefile") CONFIG_FILES="$CONFIG_FILES ydoc/src/Makefile" ;;
"ydoc/po-tools/Makefile") CONFIG_FILES="$CONFIG_FILES ydoc/po-tools/Makefile" ;;
"ydoc/Makefile") CONFIG_FILES="$CONFIG_FILES ydoc/Makefile" ;;
+ "y2logview/y2log_ana/Makefile") CONFIG_FILES="$CONFIG_FILES y2logview/y2log_ana/Makefile" ;;
+ "y2logview/Makefile") CONFIG_FILES="$CONFIG_FILES y2logview/Makefile" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-devtools-2.16.3/configure.in new/yast2-devtools-2.16.4/configure.in
--- old/yast2-devtools-2.16.3/configure.in 2007-12-02 21:37:03.000000000 +0100
+++ new/yast2-devtools-2.16.4/configure.in 2008-02-01 17:13:39.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-devtools
dnl
-dnl -- This file is generated by y2autoconf 2.16.2 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.16.3 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-devtools, 2.16.3, http://bugs.opensuse.org/, yast2-devtools)
+AC_INIT(yast2-devtools, 2.16.4, http://bugs.opensuse.org/, yast2-devtools)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.16.3"
+VERSION="2.16.4"
RPMNAME="yast2-devtools"
MAINTAINER="Martin Vidner "
@@ -117,7 +117,7 @@
dnl no need for AC_ARG_VAR
AC_PATH_PROG(XGETTEXT, xgettext)
if test -z "$XGETTEXT" ; then
- AC_MSG_ERROR(xgettext is missing; please install gettext-devel.)
+ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.)
fi
Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools`
@@ -211,8 +211,6 @@
scrdoc/doc/Makefile
scrdoc/src/Makefile
scrdoc/Makefile
-y2logview/y2log_ana/Makefile
-y2logview/Makefile
yast2/check_ycp/doc/Makefile
yast2/check_ycp/Makefile
yast2/Makefile
@@ -224,6 +222,8 @@
ydoc/doc/Makefile
ydoc/src/Makefile
ydoc/po-tools/Makefile
-ydoc/Makefile)
+ydoc/Makefile
+y2logview/y2log_ana/Makefile
+y2logview/Makefile)
AC_OUTPUT
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-devtools-2.16.3/devtools/admin/all-packages new/yast2-devtools-2.16.4/devtools/admin/all-packages
--- old/yast2-devtools-2.16.3/devtools/admin/all-packages 2007-12-02 20:13:14.000000000 +0100
+++ new/yast2-devtools-2.16.4/devtools/admin/all-packages 2008-01-14 16:52:40.000000000 +0100
@@ -1,5 +1,5 @@
# All yast2 packages
-# $Id: all-packages 40051 2007-08-07 08:55:47Z locilka $
+# $Id: all-packages 43248 2007-12-30 20:42:52Z varkoly $
#
# Use TABS to delimit fields.
# where fields:
@@ -70,6 +70,7 @@
yast2-xml inst-sys xml agent (autoinst)
# config packages
+yast2-autofs default autofs
yast2-backup default backup
yast2-bluetooth default bluetooth
yast2-bootloader default bootloader
@@ -95,7 +96,6 @@
yast2-ldap-client default ldap client
yast2-ldap-server default LDAP server
yast2-mail default mail
-yast2-mail-server default mail server
yast2-mouse default mouse
yast2-network default network
yast2-nfs-client default nfs client
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-devtools-2.16.3/devtools/bin/gettextdomains new/yast2-devtools-2.16.4/devtools/bin/gettextdomains
--- old/yast2-devtools-2.16.3/devtools/bin/gettextdomains 2007-12-02 20:13:14.000000000 +0100
+++ new/yast2-devtools-2.16.4/devtools/bin/gettextdomains 2008-01-31 13:52:16.000000000 +0100
@@ -16,6 +16,7 @@
# search for sourcecode-files
SRCFILES=`find $SRCDIR -type d -name testsuite -prune , \
+ -type d -name .svn -prune , \
-type f -name "*.ycp" \
-o -name "*.pm" \
-o -name "*.c" \
@@ -37,7 +38,7 @@
# - uncaught _( at line beginning
MATCH=`perl -n -e 'print "$ARGV: $_" if not /(\/\/|#)/' $F | \
perl -n -e 'print "$_" if not /\/\*/../\*\//' | \
- perl -n -e 'print "$_" if /[^[:alnum:]_"<]_{1,2}\(/../\)/'`
+ perl -n -e 'print "$_" if /[^[:alnum:]_"<](_|__|gettext)\(/../\)/'`
if [ -n "$MATCH" ]; then
TR_FILES="$F $TR_FILES" ;
fi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-devtools-2.16.3/devtools/bin/showy2log new/yast2-devtools-2.16.4/devtools/bin/showy2log
--- old/yast2-devtools-2.16.3/devtools/bin/showy2log 2007-12-02 20:13:14.000000000 +0100
+++ new/yast2-devtools-2.16.4/devtools/bin/showy2log 2007-09-18 16:55:51.000000000 +0200
@@ -41,7 +41,7 @@
my $debuglvl = 0;
my $vcs_id = '$Id: showy2log 40869 2007-09-12 11:50:09Z dfiser $';
-my $vcs_date = '$Date: 2007-09-12 13:50:09 +0200 (Mi, 12 Sep 2007) $';
+my $vcs_date = '$Date: 2007-09-12 13:50:09 +0200 (St, 12 zář 2007) $';
$vcs_id =~ /^\$[[:alpha:]]+: [^ ]+ ([^ ]+ [^ ]+ [^ ]+) [^ ]+.*$/;
my $version = $1;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-devtools-2.16.3/devtools/bin/version new/yast2-devtools-2.16.4/devtools/bin/version
--- old/yast2-devtools-2.16.3/devtools/bin/version 2007-12-02 21:37:20.000000000 +0100
+++ new/yast2-devtools-2.16.4/devtools/bin/version 2008-02-01 17:14:11.000000000 +0100
@@ -1,5 +1,5 @@
#!/bin/bash
-echo 2.16.3
+echo 2.16.4
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-devtools-2.16.3/devtools/bin/y2autoconf new/yast2-devtools-2.16.4/devtools/bin/y2autoconf
--- old/yast2-devtools-2.16.3/devtools/bin/y2autoconf 2007-12-02 20:13:14.000000000 +0100
+++ new/yast2-devtools-2.16.4/devtools/bin/y2autoconf 2008-02-01 17:08:20.000000000 +0100
@@ -28,7 +28,7 @@
# Michal Svec
# Martin Vidner
#
-# $Id: y2autoconf 41320 2007-10-10 12:34:16Z mvidner $
+# $Id: y2autoconf 44112 2008-02-01 16:08:20Z mvidner $
if ($#ARGV >= 0 && ($ARGV[0] eq "-h" || $ARGV[0] eq "--help"))
{
@@ -233,7 +233,7 @@
dnl no need for AC_ARG_VAR
AC_PATH_PROG(XGETTEXT, xgettext)
if test -z "$XGETTEXT" ; then
- AC_MSG_ERROR(xgettext is missing; please install gettext-devel.)
+ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.)
fi
Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools`
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-devtools-2.16.3/devtools/bin/y2makeall new/yast2-devtools-2.16.4/devtools/bin/y2makeall
--- old/yast2-devtools-2.16.3/devtools/bin/y2makeall 2007-12-02 20:13:14.000000000 +0100
+++ new/yast2-devtools-2.16.4/devtools/bin/y2makeall 2008-01-14 16:52:40.000000000 +0100
@@ -72,10 +72,11 @@
);
-my $work_root = $ENV{'PWD'};
-my $build_root = $work_root . "/build";
-my $make_log = $work_root . "/make.log";
-my $failed_log = $work_root . "/failed-packages.log";
+my $work_root = $ENV{'PWD'};
+my $build_root = $work_root . "/build";
+my $make_log = $work_root . "/make.log";
+my $failed_log = $work_root . "/failed-packages.log";
+my $cmake_build_dir = "build"; # relative to project directory
#
@@ -92,8 +93,6 @@
my $libzypp_prefix = "/usr";
my $icecream_prefix = "/opt/icecream";
my $jobs = 8;
-
-# cmake defines
my $zypp_defines = "";
# Verbosity values
@@ -233,13 +232,13 @@
#
# Build libzypp if necessary and
# make sure we have exactly one version of libzypp installed
- #
+ #
make_libzypp_build() if $build_libzypp;
check_libzypp() unless $ignore_libzypp;
#
- # disable icecream_prefix if we don't need it
+ # disable icecream_prefix if we don't need it
#
$icecream_prefix = "" unless $enable_icecream;
@@ -860,19 +859,6 @@
#-----------------------------------------------------------------------------
-# Build libzypp
-
-sub make_libzypp_build()
-{
- # zypp cmake defines
-
- my $zypp_defines = "-DCMAKE_INSTALL_PREFIX=$libzypp_prefix";
-
- cmake( $libzypp_source, $zypp_defines );
-
-}
-
-#-----------------------------------------------------------------------------
# Build in build order
@@ -916,92 +902,157 @@
}
}
+
#-----------------------------------------------------------------------------
-# Make cmake package.
+# Make one package.
#
# Parameters:
-# $dir source dir
-# $defines cmake build defines
+# $pkg package to build (from $work)
-sub cmake()
+sub make()
{
- my( $pkg_dir, $defines ) = @_;
+ my( $pkg_dir ) = @_;
my $error = 0;
- my $pkg = basename( $pkg_dir );
chdir $work_root;
+ chdir $pkg_dir;
- log_progress( "Building", $pkg );
- log_progress( "\tcreate temp. build dir" );
- system_int( "mkdir -p $build_root/$pkg >>$make_log 2>&1" );
+ # Check if this is a CMake-based project.
- if ( $CHILD_ERROR )
- {
- log_error( "'mkdir -p $build_root/$pkg' failed for $pkg: $!" );
- $error = 1;
- }
+ my $is_cmake_project = 0;
+ $is_cmake_project = 1 if -f "CMakeLists.txt" && ! ( -f "configure.in.in" || -f "configure.in" );
#
- # cmake in build dir
+ # Display progress
#
- if ( ! $error )
- {
- chdir "$build_root/$pkg";
+ log_progress( "Building", basename( $pkg_dir ),
+ $is_cmake_project ? "(cmake based)" : "" );
- log_progress( "\tcmake build in $pkg_dir" );
- system_int( "cmake $defines $pkg_dir >>$make_log 2>&1" );
+ #
+ # Prepare make environment
+ #
+
+ my $path = "$prefix/bin:\$PATH";
+ $path = "$icecream_prefix/bin:$path" if $icecream_prefix;
+
+ my $ld_library_path =
+ "$libzypp_prefix/lib64"
+ . ":$libzypp_prefix/lib"
+ ;
+
+ my $pkg_config_path =
+ "$libzypp_prefix/lib64/pkgconfig"
+ . ":$libzypp_prefix/lib/pkgconfig"
+ . ":$prefix/lib64/pkgconfig"
+ . ":$prefix/lib/pkgconfig"
+ . ":$prefix/share/pkgconfig"
+ ;
+
+ my $perllib =
+ "$prefix/lib/perl5/5.8.8/x86_64-linux-thread-multi"
+ . ":$prefix/lib/perl5/5.8.8"
+ . ":$prefix/lib/perl5/vendor_perl/5.8.8/x86_64-linux-thread-multi"
+ . ":$prefix/lib/perl5/vendor_perl/5.8.8"
+ . ":$prefix/lib/perl5/vendor_perl"
+ ;
+
+ my $make_env =
+ "PATH=\"$path\""
+ . " YCPC_Y2DIR=$prefix/share/YaST2"
+ . " PREFIX=$prefix"
+ . " PKG_CONFIG_PATH=\"$pkg_config_path\$PKG_CONFIG_PATH\""
+ . " YCPC_LD_LIBRARY_PATH=\"$ld_library_path\""
+ . " PERLLIB=\"$perllib\""
+ ;
+
+
+ # Check if "make -f Makefile.cvs" must be performed.
+ # Even if command line option "-f" (fast mode - sets $disable_make_makefile_cvs)
+ # is given, it still needs to be done if there is no toplevel Makefile.
+
+ my $do_make_makefile_cvs = 1;
+ $do_make_makefile_cvs = 0 if $disable_make_makefile_cvs;
+ my $toplevel_makefile = $is_cmake_project ? "$cmake_build_dir/Makefile" : "Makefile";
+ $do_make_makefile_cvs = 1 unless -f $toplevel_makefile;
+
+ #
+ # make -f Makefile.cvs
+ #
+
+ if ( $do_make_makefile_cvs )
+ {
+ log_info( "\trm -rf autom4te.cache" );
+ system_int( "rm -rf autom4te.cache >>$make_log 2>&1" ) unless $dry_run;
+
+ log_progress( "\tmake -f Makefile.cvs" );
+ system_int( "$make_env make -e -f Makefile.cvs >>$make_log 2>&1" ) unless $dry_run;
if ( $CHILD_ERROR )
{
- log_error( "'cmake $defines $pkg_dir' failed for $pkg" );
+ log_error( "'make -f Makefile.cvs' failed for $pkg_dir" );
$error = 1;
}
}
+
#
# make
#
+ if ( $is_cmake_project )
+ {
+ chdir( $cmake_build_dir );
+ my $dir = basename( $pkg_dir );
+ log_progress( "\tcd $dir/$cmake_build_dir" );
+ # system_int( "pwd" );
+ }
+
if ( ! $error )
{
- log_progress ( "\tmake $pkg" );
- system_int( "make -C $build_root/$pkg -j$jobs $make_target >>$make_log 2>&1" );
+ log_progress( "\tmake $make_target" );
+ system_int( "$make_env make -e -j$jobs $make_target >>$make_log 2>&1" ) unless $dry_run;
if ( $CHILD_ERROR )
{
- log_error( "'make -C $build_root/$pkg -j$jobs $make_target' failed for $pkg" );
+ log_error( "'make -j$jobs $make_target' failed for $pkg_dir" );
$error = 1;
}
}
+
#
# sudo make install
#
if ( $make_target eq "" && ! $error )
{
- log_progress( "\t$sudo_cmd make -C $build_root/$pkg install" );
- sudo_system_int( "make -C $build_root/$pkg install >>$make_log 2>&1" );
+ log_progress( "\t$sudo_cmd make install" );
+ sudo_system_int( "make install >>$make_log 2>&1" ) unless $dry_run;
if ( $CHILD_ERROR )
{
- log_error( "'$sudo_cmd make -C $build_root/$pkg install' failed for $pkg" );
+ log_error( "'$sudo_cmd make install' failed for $pkg_dir" );
$error = 1;
}
}
+
#
# Summary
#
if ( $error )
{
- push( @failed_dirs, $pkg );
- print FAILED_LOG "$pkg\n";
+ my $dir = basename( $pkg_dir );
+ push( @failed_dirs, $dir );
+ my $rpm = $rpm_names{ $dir };
+ my $msg = "$dir";
+ $msg .= "\t\t\t(base package)" if defined( $base_rpms{ $rpm } );
+ print FAILED_LOG "$msg\n";
}
else
{
@@ -1012,131 +1063,108 @@
chdir $work_root;
}
-#-----------------------------------------------------------------------------
-
-# Make one package.
-#
-# Parameters:
-# $pkg package to build (from $work)
-
-sub make()
-{
- my( $pkg_dir ) = @_;
- my $error = 0;
- chdir $work_root;
- chdir $pkg_dir;
+#-----------------------------------------------------------------------------
- log_progress( "Building", basename( $pkg_dir ) );
- my $make_env = "";
- my $path = "";
- my $pkg_config_path = "";
- my $ld_library_path = "";
- my $perllib = "";
+# Build libzypp
- #
- # prepare make environment
- #
+sub make_libzypp_build()
+{
+ # zypp cmake defines
- # libzypp pkgconfig path
- $ld_library_path = "$libzypp_prefix/lib64:$libzypp_prefix/lib";
- $pkg_config_path = "$libzypp_prefix/lib64/pkgconfig:$libzypp_prefix/lib/pkgconfig:";
+ my $zypp_defines = "-DCMAKE_INSTALL_PREFIX=$libzypp_prefix";
- # YaST pkgconfig path
+ non_y2_cmake( $libzypp_source, $zypp_defines );
+}
- $pkg_config_path .= "$prefix/lib64/pkgconfig:$prefix/lib/pkgconfig:$prefix/share/pkgconfig:";
- # perl libs
- $perllib = "$prefix/lib/perl5/5.8.8/x86_64-linux-thread-multi:$prefix/lib/perl5/5.8.8:" .
- "$prefix/lib/perl5/vendor_perl/5.8.8/x86_64-linux-thread-multi:$prefix/lib/perl5/vendor_perl/5.8.8:" .
- "$prefix/lib/perl5/vendor_perl";
+#-----------------------------------------------------------------------------
- # PATH
-
- $path = "$prefix/bin:\$PATH";
- $path = "$icecream_prefix/bin:" . $path if $icecream_prefix;
+# Make a non-YaST2 project that is based on cmake.
+#
+# Parameters:
+# $dir source dir
+# $defines cmake build defines
- # install prefix and PKG_CONFIG_PATH
+sub non_y2_cmake()
+{
+ my( $pkg_dir, $defines ) = @_;
+ my $error = 0;
+ my $pkg = basename( $pkg_dir );
- $make_env = "YCPC_Y2DIR=$prefix/share/YaST2 PREFIX=$prefix PKG_CONFIG_PATH=\"$pkg_config_path\$PKG_CONFIG_PATH\" PATH=\"$path\" YCPC_LD_LIBRARY_PATH=\"$ld_library_path\" PERLLIB=\"$perllib\"";
+ chdir $work_root;
+ log_progress( "Building", $pkg );
+ log_progress( "\tcreate temp. build dir" );
- # Check if "make -f Makefile.cvs" must be performed.
- # Even if command line option "-f" (fast mode - sets $disable_make_makefile_cvs)
- # is given, it still needs to be done if there is no toplevel Makefile.
+ system_int( "mkdir -p $build_root/$pkg >>$make_log 2>&1" );
- my $do_make_makefile_cvs = 1;
- $do_make_makefile_cvs = 0 if $disable_make_makefile_cvs;
- $do_make_makefile_cvs = 1 unless -f "Makefile";
+ if ( $CHILD_ERROR )
+ {
+ log_error( "'mkdir -p $build_root/$pkg' failed for $pkg: $!" );
+ $error = 1;
+ }
#
- # make -f Makefile.cvs
+ # cmake in build dir
#
- if ( $do_make_makefile_cvs )
+ if ( ! $error )
{
+ chdir "$build_root/$pkg";
- log_info( "\trm -rf autom4te.cache" );
- system_int( "rm -rf autom4te.cache >>$make_log 2>&1" ) unless $dry_run;
+ log_progress( "\tcmake build in $pkg_dir" );
- log_progress( "\tmake -f Makefile.cvs" );
- system_int( "$make_env make -e -f Makefile.cvs >>$make_log 2>&1" ) unless $dry_run;
+ system_int( "cmake $defines $pkg_dir >>$make_log 2>&1" );
if ( $CHILD_ERROR )
{
- log_error( "'make -f Makefile.cvs' failed for $pkg_dir" );
+ log_error( "'cmake $defines $pkg_dir' failed for $pkg" );
$error = 1;
}
}
-
#
# make
#
if ( ! $error )
{
- log_progress( "\tmake $make_target" );
- system_int( "$make_env make -e -j$jobs $make_target >>$make_log 2>&1" ) unless $dry_run;
+ log_progress ( "\tmake $pkg" );
+ system_int( "make -C $build_root/$pkg -j$jobs $make_target >>$make_log 2>&1" );
if ( $CHILD_ERROR )
{
- log_error( "'make -j$jobs $make_target' failed for $pkg_dir" );
+ log_error( "'make -C $build_root/$pkg -j$jobs $make_target' failed for $pkg" );
$error = 1;
}
}
-
#
# sudo make install
#
if ( $make_target eq "" && ! $error )
{
- log_progress( "\t$sudo_cmd make install" );
- sudo_system_int( "make install >>$make_log 2>&1" ) unless $dry_run;
+ log_progress( "\t$sudo_cmd make -C $build_root/$pkg install" );
+ sudo_system_int( "make -C $build_root/$pkg install >>$make_log 2>&1" );
if ( $CHILD_ERROR )
{
- log_error( "'$sudo_cmd make install' failed for $pkg_dir" );
+ log_error( "'$sudo_cmd make -C $build_root/$pkg install' failed for $pkg" );
$error = 1;
}
}
-
#
# Summary
#
if ( $error )
{
- my $dir = basename( $pkg_dir );
- push( @failed_dirs, $dir );
- my $rpm = $rpm_names{ $dir };
- my $msg = "$dir";
- $msg .= "\t\t\t(base package)" if defined( $base_rpms{ $rpm } );
- print FAILED_LOG "$msg\n";
+ push( @failed_dirs, $pkg );
+ print FAILED_LOG "$pkg\n";
}
else
{
@@ -1376,7 +1404,7 @@
--build-libzypp build libzypp, too
--libzypp-source <dir> libzypp source directory, required for building libzypp
- --libzypp-prefix <prefix> use <prefix> instead of /usr
+ --libzypp-prefix <prefix> use <prefix> instead of /usr
--dump-build-order only dump the build order to stdout and log
--dump-dependencies only dump package dependencies to stdout and log
@@ -1384,7 +1412,7 @@
--ignore-libzypp do not complain if multiple versions of libzypp are installed
--icecream build on icecream
- --icecream-prefix <prefix> use <prefix> instead of /opt/icecream
+ --icecream-prefix <prefix> use <prefix> instead of /opt/icecream
--jobs Specifies the number of jobs to run simultaneously (default 8)
-v (--verbose) verbose output
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-devtools-2.16.3/devtools/cmake/Makefile.in new/yast2-devtools-2.16.4/devtools/cmake/Makefile.in
--- old/yast2-devtools-2.16.3/devtools/cmake/Makefile.in 2007-12-02 21:37:12.000000000 +0100
+++ new/yast2-devtools-2.16.4/devtools/cmake/Makefile.in 2008-02-01 17:13:54.000000000 +0100
@@ -37,7 +37,7 @@
host_triplet = @host@
target_triplet = @target@
subdir = devtools/cmake
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in TODO
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/configure.in
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-devtools-2.16.3/devtools/cmake/modules/YastCommon.cmake new/yast2-devtools-2.16.4/devtools/cmake/modules/YastCommon.cmake
--- old/yast2-devtools-2.16.3/devtools/cmake/modules/YastCommon.cmake 2007-12-02 20:13:10.000000000 +0100
+++ new/yast2-devtools-2.16.4/devtools/cmake/modules/YastCommon.cmake 2008-01-31 14:05:17.000000000 +0100
@@ -18,7 +18,7 @@
####################################################################
MESSAGE(STATUS "Writing spec file...")
-SET(HEADER-COMMENT
+SET(HEADERCOMMENT
"#
# spec file for package ${RPMNAME} (Version ${VERSION})
#
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-devtools-2.16.3/devtools/cmake/TODO new/yast2-devtools-2.16.4/devtools/cmake/TODO
--- old/yast2-devtools-2.16.3/devtools/cmake/TODO 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-devtools-2.16.4/devtools/cmake/TODO 2008-01-31 14:05:17.000000000 +0100
@@ -0,0 +1,8 @@
+- when doing "make srcpackage", create package/ subdir if it doesn't exist
+ (the tarball will become a file named "package" then and copying the .changes
+ file to package/ will fail)
+
+- make sure to recreate the .spec file upon "make srcpackage"
+ (.spec.in might have changed since the last "cmake" call)
+
+- make sure to use the latest VERSION file upon "make srcpackage"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-devtools-2.16.3/devtools/doc/skeletons/config/index.html new/yast2-devtools-2.16.4/devtools/doc/skeletons/config/index.html
--- old/yast2-devtools-2.16.3/devtools/doc/skeletons/config/index.html 2007-12-03 10:03:09.000000000 +0100
+++ new/yast2-devtools-2.16.4/devtools/doc/skeletons/config/index.html 2008-02-01 17:20:03.000000000 +0100
@@ -124,10 +124,10 @@
</tr>
<tr>
<td>
- <a href="XXPkgXX.html#Modified">Modified ()</a>
+ <a href="complex.html#Modified">Modified ()</a>
</td>
<td>
- <a href="XXPkgXX.html">XXPkgXX.ycp</a>
+ <a href="complex.html">complex.ycp</a>
</td>
</tr>
<tr>
@@ -140,10 +140,10 @@
</tr>
<tr>
<td>
- <a href="complex.html#Modified">Modified ()</a>
+ <a href="XXPkgXX.html#Modified">Modified ()</a>
</td>
<td>
- <a href="complex.html">complex.ycp</a>
+ <a href="XXPkgXX.html">XXPkgXX.ycp</a>
</td>
</tr>
<tr>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-devtools-2.16.3/Makefile.am new/yast2-devtools-2.16.4/Makefile.am
--- old/yast2-devtools-2.16.3/Makefile.am 2007-12-02 21:37:03.000000000 +0100
+++ new/yast2-devtools-2.16.4/Makefile.am 2008-02-01 17:13:40.000000000 +0100
@@ -214,4 +214,4 @@
test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo
# test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo make-pox
# No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am
-SUBDIRS = devtools docbook doxygen scrdoc y2logview yast2 ycpdoc ydoc
+SUBDIRS = devtools docbook doxygen scrdoc yast2 ycpdoc ydoc y2logview
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-devtools-2.16.3/Makefile.in new/yast2-devtools-2.16.4/Makefile.in
--- old/yast2-devtools-2.16.3/Makefile.in 2007-12-02 21:37:14.000000000 +0100
+++ new/yast2-devtools-2.16.4/Makefile.in 2008-02-01 17:13:57.000000000 +0100
@@ -279,7 +279,7 @@
TAGVERSION = $(Y2TOOL) tagversion
# test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo make-pox
# No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am
-SUBDIRS = devtools docbook doxygen scrdoc y2logview yast2 ycpdoc ydoc
+SUBDIRS = devtools docbook doxygen scrdoc yast2 ycpdoc ydoc y2logview
all: all-recursive
.SUFFIXES:
@@ -551,10 +551,6 @@
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
-dist-lzma: distdir
- tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
- $(am__remove_distdir)
-
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
@@ -581,8 +577,6 @@
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
- *.tar.lzma*) \
- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
@@ -740,20 +734,20 @@
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am am--refresh check check-am clean clean-generic \
clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
- dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-zip \
- distcheck distclean distclean-generic distclean-libtool \
- distclean-tags distcleancheck distdir distuninstallcheck dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-data-local install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pkgconfigDATA \
- install-pkgconfigdataDATA install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- installdirs-am maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
- ps ps-am tags tags-recursive uninstall uninstall-am \
- uninstall-pkgconfigDATA uninstall-pkgconfigdataDATA
+ dist-gzip dist-hook dist-shar dist-tarZ dist-zip distcheck \
+ distclean distclean-generic distclean-libtool distclean-tags \
+ distcleancheck distdir distuninstallcheck dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-data-local install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-pkgconfigDATA install-pkgconfigdataDATA \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+ uninstall uninstall-am uninstall-pkgconfigDATA \
+ uninstall-pkgconfigdataDATA
Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-devtools-2.16.3/VERSION new/yast2-devtools-2.16.4/VERSION
--- old/yast2-devtools-2.16.3/VERSION 2007-12-02 20:13:15.000000000 +0100
+++ new/yast2-devtools-2.16.4/VERSION 2008-02-01 17:12:39.000000000 +0100
@@ -1 +1 @@
-2.16.3
+2.16.4
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org