Hello community,
here is the log from the commit of package limal-devtools
checked in at Fri May 4 17:43:13 CEST 2007.
--------
--- limal-devtools/limal-devtools.changes 2006-11-28 14:07:54.000000000 +0100
+++ /mounts/work_src_done/NOARCH/limal-devtools/limal-devtools.changes 2007-05-04 14:50:01.000000000 +0200
@@ -1,0 +2,14 @@
+Fri May 4 14:35:13 CEST 2007 - mt@suse.de
+
+- Fixed to avoid __ prefixes in include guard constants
+ in perl2cpp generated code.
+- Added logging of a deprecated message from perl2cpp
+ generated code to syslog and the current blocxx logger.
+
+-------------------------------------------------------------------
+Fri Apr 27 13:06:39 CEST 2007 - mc@suse.de
+
+- remove perl2cpp wrapper from documentation.
+ It is not longer supported.
+
+-------------------------------------------------------------------
Old:
----
limal-devtools-1.2.5.tar.bz2
New:
----
limal-devtools-1.2.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ limal-devtools.spec ++++++
--- /var/tmp/diff_new_pack.Eu8917/_old 2007-05-04 17:42:39.000000000 +0200
+++ /var/tmp/diff_new_pack.Eu8917/_new 2007-05-04 17:42:39.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package limal-devtools (Version 1.2.5)
+# spec file for package limal-devtools (Version 1.2.6)
#
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 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.
#
@@ -12,13 +12,13 @@
Name: limal-devtools
URL: http://forge.novell.com/modules/xfmod/project/?limal
-Version: 1.2.5
+Version: 1.2.6
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArchitectures: noarch
-Source0: limal-devtools-1.2.5.tar.bz2
+Source0: limal-devtools-1.2.6.tar.bz2
prefix: /usr
%define swiglibdir %(swig -swiglib)
BuildRequires: docbook-xsl-stylesheets gcc-c++ libxslt perl-XML-Writer pkgconfig sgml-skel swig
@@ -28,6 +28,7 @@
Requires: gettext gettext-devel recode
Requires: autoconf automake libtool
Requires: pkgconfig swig
+Requires: openssl-devel
# cvs required by autopoint
Requires: cvs
%if 0%{?suse_version}
@@ -57,7 +58,7 @@
Stefan Schubert
%prep
-%setup -n limal-devtools-1.2.5
+%setup -n limal-devtools-1.2.6
%build
autoreconf --force --install --verbose
@@ -85,7 +86,15 @@
%{_prefix}/share/pkgconfig/limal-devtools.pc
%doc %{_prefix}/share/doc/packages/limal-devtools
-%changelog -n limal-devtools
+%changelog
+* Fri May 04 2007 - mt@suse.de
+- Fixed to avoid __ prefixes in include guard constants
+ in perl2cpp generated code.
+- Added logging of a deprecated message from perl2cpp
+ generated code to syslog and the current blocxx logger.
+* Fri Apr 27 2007 - mc@suse.de
+- remove perl2cpp wrapper from documentation.
+ It is not longer supported.
* Tue Nov 28 2006 - mc@suse.de
- version 1.2.5
- tagversion support for new branch naming
++++++ limal-devtools-1.2.5.tar.bz2 -> limal-devtools-1.2.6.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-devtools-1.2.5/configure new/limal-devtools-1.2.6/configure
--- old/limal-devtools-1.2.5/configure 2006-11-28 14:03:28.000000000 +0100
+++ new/limal-devtools-1.2.6/configure 2007-05-04 14:39:47.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for limal-devtools 1.2.5.
+# Generated by GNU Autoconf 2.60 for limal-devtools 1.2.6.
#
# Report bugs to http://www.suse.de/feedback.
#
@@ -713,8 +713,8 @@
# Identity of this package.
PACKAGE_NAME='limal-devtools'
PACKAGE_TARNAME='limal-devtools'
-PACKAGE_VERSION='1.2.5'
-PACKAGE_STRING='limal-devtools 1.2.5'
+PACKAGE_VERSION='1.2.6'
+PACKAGE_STRING='limal-devtools 1.2.6'
PACKAGE_BUGREPORT='http://www.suse.de/feedback'
ac_unique_file="RPMNAME"
@@ -1411,7 +1411,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 limal-devtools 1.2.5 to adapt to many kinds of systems.
+\`configure' configures limal-devtools 1.2.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1482,7 +1482,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of limal-devtools 1.2.5:";;
+ short | recursive ) echo "Configuration of limal-devtools 1.2.6:";;
esac
cat <<\_ACEOF
@@ -1585,7 +1585,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-limal-devtools configure 1.2.5
+limal-devtools configure 1.2.6
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1599,7 +1599,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by limal-devtools $as_me 1.2.5, which was
+It was created by limal-devtools $as_me 1.2.6, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2400,7 +2400,7 @@
# Define the identity of the package.
PACKAGE='limal-devtools'
- VERSION='1.2.5'
+ VERSION='1.2.6'
cat >>confdefs.h <<_ACEOF
@@ -2627,7 +2627,7 @@
-VERSION="1.2.5"
+VERSION="1.2.6"
RPMNAME="limal-devtools"
RPMARCH="noarch"
RPMLIB="devtools"
@@ -21342,7 +21342,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by limal-devtools $as_me 1.2.5, which was
+This file was extended by limal-devtools $as_me 1.2.6, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21389,7 +21389,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-limal-devtools config.status 1.2.5
+limal-devtools config.status 1.2.6
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-devtools-1.2.5/configure.in new/limal-devtools-1.2.6/configure.in
--- old/limal-devtools-1.2.5/configure.in 2006-11-28 14:03:16.000000000 +0100
+++ new/limal-devtools-1.2.6/configure.in 2007-05-04 14:39:35.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by limalautoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(limal-devtools, 1.2.5, http://www.suse.de/feedback, limal-devtools)
+AC_INIT(limal-devtools, 1.2.6, http://www.suse.de/feedback, limal-devtools)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important LiMaL variables
-VERSION="1.2.5"
+VERSION="1.2.6"
RPMNAME="limal-devtools"
RPMARCH="noarch"
RPMLIB="devtools"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-devtools-1.2.5/devtools/admin/aclocal/Makefile.in new/limal-devtools-1.2.6/devtools/admin/aclocal/Makefile.in
--- old/limal-devtools-1.2.5/devtools/admin/aclocal/Makefile.in 2006-11-28 14:03:30.000000000 +0100
+++ new/limal-devtools-1.2.6/devtools/admin/aclocal/Makefile.in 2007-05-04 14:39:53.000000000 +0200
@@ -216,9 +216,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu devtools/admin/aclocal/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign devtools/admin/aclocal/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu devtools/admin/aclocal/Makefile
+ $(AUTOMAKE) --foreign devtools/admin/aclocal/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-devtools-1.2.5/devtools/admin/copyright/gpl/Makefile.in new/limal-devtools-1.2.6/devtools/admin/copyright/gpl/Makefile.in
--- old/limal-devtools-1.2.5/devtools/admin/copyright/gpl/Makefile.in 2006-11-28 14:03:30.000000000 +0100
+++ new/limal-devtools-1.2.6/devtools/admin/copyright/gpl/Makefile.in 2007-05-04 14:39:53.000000000 +0200
@@ -219,9 +219,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu devtools/admin/copyright/gpl/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign devtools/admin/copyright/gpl/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu devtools/admin/copyright/gpl/Makefile
+ $(AUTOMAKE) --foreign devtools/admin/copyright/gpl/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-devtools-1.2.5/devtools/admin/copyright/Makefile.in new/limal-devtools-1.2.6/devtools/admin/copyright/Makefile.in
--- old/limal-devtools-1.2.5/devtools/admin/copyright/Makefile.in 2006-11-28 14:03:30.000000000 +0100
+++ new/limal-devtools-1.2.6/devtools/admin/copyright/Makefile.in 2007-05-04 14:39:53.000000000 +0200
@@ -211,9 +211,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu devtools/admin/copyright/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign devtools/admin/copyright/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu devtools/admin/copyright/Makefile
+ $(AUTOMAKE) --foreign devtools/admin/copyright/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-devtools-1.2.5/devtools/admin/Makefile.in new/limal-devtools-1.2.6/devtools/admin/Makefile.in
--- old/limal-devtools-1.2.5/devtools/admin/Makefile.in 2006-11-28 14:03:29.000000000 +0100
+++ new/limal-devtools-1.2.6/devtools/admin/Makefile.in 2007-05-04 14:39:53.000000000 +0200
@@ -224,9 +224,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu devtools/admin/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign devtools/admin/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu devtools/admin/Makefile
+ $(AUTOMAKE) --foreign devtools/admin/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-devtools-1.2.5/devtools/bin/Makefile.in new/limal-devtools-1.2.6/devtools/bin/Makefile.in
--- old/limal-devtools-1.2.5/devtools/bin/Makefile.in 2006-11-28 14:03:30.000000000 +0100
+++ new/limal-devtools-1.2.6/devtools/bin/Makefile.in 2007-05-04 14:39:53.000000000 +0200
@@ -220,9 +220,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu devtools/bin/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign devtools/bin/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu devtools/bin/Makefile
+ $(AUTOMAKE) --foreign devtools/bin/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-devtools-1.2.5/devtools/bin/version new/limal-devtools-1.2.6/devtools/bin/version
--- old/limal-devtools-1.2.5/devtools/bin/version 2006-11-28 14:03:44.000000000 +0100
+++ new/limal-devtools-1.2.6/devtools/bin/version 2007-05-04 14:40:10.000000000 +0200
@@ -1,5 +1,5 @@
#!/bin/bash
-echo 1.2.5
+echo 1.2.6
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-devtools-1.2.5/devtools/Makefile.in new/limal-devtools-1.2.6/devtools/Makefile.in
--- old/limal-devtools-1.2.5/devtools/Makefile.in 2006-11-28 14:03:29.000000000 +0100
+++ new/limal-devtools-1.2.6/devtools/Makefile.in 2007-05-04 14:39:53.000000000 +0200
@@ -211,9 +211,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu devtools/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign devtools/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu devtools/Makefile
+ $(AUTOMAKE) --foreign devtools/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-devtools-1.2.5/devtools/skeletons/Makefile.in new/limal-devtools-1.2.6/devtools/skeletons/Makefile.in
--- old/limal-devtools-1.2.5/devtools/skeletons/Makefile.in 2006-11-28 14:03:30.000000000 +0100
+++ new/limal-devtools-1.2.6/devtools/skeletons/Makefile.in 2007-05-04 14:39:54.000000000 +0200
@@ -202,9 +202,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu devtools/skeletons/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign devtools/skeletons/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu devtools/skeletons/Makefile
+ $(AUTOMAKE) --foreign devtools/skeletons/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-devtools-1.2.5/doc/limal-devtools.xml new/limal-devtools-1.2.6/doc/limal-devtools.xml
--- old/limal-devtools-1.2.5/doc/limal-devtools.xml 2006-07-25 15:37:53.000000000 +0200
+++ new/limal-devtools-1.2.6/doc/limal-devtools.xml 2007-05-03 14:32:49.000000000 +0200
@@ -8,7 +8,6 @@
<!ENTITY packaging SYSTEM "package_handle.xml">
<!ENTITY docu SYSTEM "documentation.xml">
<!ENTITY test SYSTEM "testsuite.xml">
-<!ENTITY perl SYSTEM "perl.xml">
<!ENTITY date "Januar 2005">
<!ENTITY ext_interface SYSTEM "external_interface.xml">
<!ENTITY utils SYSTEM "utilities.xml">
@@ -18,7 +17,7 @@
<bookinfo>
<title>LiMaL Development Guide
</title>
- <releaseinfo>$LastChangedDate: 2006-02-16 10:10:45 +0100 (Do, 16 Feb 2006) $</releaseinfo>
+ <releaseinfo>$LastChangedDate: 2007-04-27 13:08:13 +0200 (Fr, 27 Apr 2007) $</releaseinfo>
<copyright>
<year>2005</year>
<holder>SUSE LINUX Products GmbH</holder>
@@ -163,8 +162,6 @@
&utils;
- &perl;
-
&docu;
&test;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-devtools-1.2.5/doc/Makefile.in new/limal-devtools-1.2.6/doc/Makefile.in
--- old/limal-devtools-1.2.5/doc/Makefile.in 2006-11-28 14:03:30.000000000 +0100
+++ new/limal-devtools-1.2.6/doc/Makefile.in 2007-05-04 14:39:54.000000000 +0200
@@ -250,9 +250,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu doc/Makefile
+ $(AUTOMAKE) --foreign doc/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-devtools-1.2.5/doc/perl.xml new/limal-devtools-1.2.6/doc/perl.xml
--- old/limal-devtools-1.2.5/doc/perl.xml 2006-07-25 15:37:53.000000000 +0200
+++ new/limal-devtools-1.2.6/doc/perl.xml 1970-01-01 01:00:00.000000000 +0100
@@ -1,405 +0,0 @@
-<?xml version="1.0" encoding='ISO-8859-1'?>
-<section id = "perl">
- <title>Programming Pluglibs in Perl</title>
- <section id="whyperl">
- <title>Why using perl for pluglibs</title>
- <para>
- Perl is a very common programming language if it comes to parsing
- textfiles. In the past, huge parts in the YaST framework were
- written in Perl, so the LiMaL development team wants to support that
- language as good as possible. That means:
- </para>
- <para>
- <itemizedlist>
- <listitem>
- <para>
- It should be possible to write LiMaL pluglibs in Perl and to get
- the needed C++ Interface with as few effort as possible
- </para>
- </listitem>
- <listitem>
- <para>
- Pluglibs written in Perl must have access to the common LiMaL
- functions like the locking/logging/... functionality, without
- to have to deal with C++
- </para>
- </listitem>
- <listitem>
- <para>
- Even if one is writing the pluglib in C++, he shall be able to use
- Perl code he already has if he wants to.
- </para>
- </listitem>
- </itemizedlist>
- </para>
- </section>
-
- <section id="writingperl">
- <title>Writing LiMaL Plugins in Perl</title>
- <para>
-
- With LiMaL, we nailed the Interface to C++. So if one is writing a
- pluglib, he must either do it in C++ or he has to provide an
- interface to C++ strictly keeping on the conditions of the LiMaL
- framework. For Perl that would mean you have to deal with the perl
- internal data structures and convert them to the datatypes used in
- the C++ LiMaL framework. To help perl pluglib programmers to do
- this, we created an automatism. All the perl pluglib developer has
- to do, is to provide a little IDL file, that describes his
- interface. Not one line of C++ code is needs to be written.
-
- <screen>
-<![CDATA[
-Examples:
-
-Function:
-
- ($year,$month,$day) = Date::Calc::Add_Delta_Days($year,$month,$day,$Dd);
-
-
-IDL Ini-Files Section::
-
- [_GENERAL_]
- FILENAME = DateCalc
- INCLUDE =<<EOT
- <deque>
- EOT
-
- [Add_Delta_Days]
- PNAME = Date::Calc::Add_Delta_Days
- RETURN = cpp_deque,cpp_int
- PARAMS =<<EOT
- cpp_int
- cpp_int
- cpp_int
- cpp_int
- EOT
-
-
-C++ Code to use the Function::
-
- std::deque<int> r; // return values
- int y = 2003;
- int m = 5;
- int d = 15;
- int dd = 22;
-
- r=Add_Delta_Days(y,m,d,dd);
-
- std::deque<int>::iterator it;
- for( it=r.begin(); it != r.end(); it++ ) {
- std::cout << (*it) << " ";
- }
-
-Discussion:::
-
- [_GENERAL_]
- FILENAME = DateCalc
-
-The code generator will create DateCalc.{cpp,h} files::
-
- INCLUDE =<<EOT
- <deque>
- EOT
-
-Not all of the dependencies are resolved. Here you can add
- files that must be included.::
-
- [Add_Delta_Days]
- PNAME = Date::Calc::Add_Delta_Days
-
-The name of the Function in Perl. To use the Function on perl,
- you would call Date::Calc::Add_Delta_Days::
-
- RETURN = cpp_deque,cpp_int
-
-As return Value we will get three integers. Since we are not able
- to return 3 values in C++, we tell the Code generator that we expect
- a C++ array of integers (3 Integers as return value is an array - even in perl).
- cpp_deque,cpp_int will be wrapped to std::deque<int>::
-
- PARAMS =<<EOT
- cpp_int
- cpp_int
- cpp_int
- cpp_int
- EOT
-
-Other than the return value, we can pass multiple parameters. The
- function expects 4 integer values and that's what we configure here.
- Another variation of this can be::
-
- PARAMS =<<EOT
- cpp_deque,cpp_int
- EOT
-
-Then we have to pass std::deque<int> which would work too but we would
- loose a little bit type safeness, because then it would be possible to
- pass only one integer or even 27 integers.
-
-**Net::LDAP Class**
-
-Function::
-
- my $ldap = new Net::LDAP($host, %OPTIONS_HASH);
-
-The options hash is optional
-
-IDL Ini-Files section::
-
- [_GENERAL_]
- INCLUDE =<<EOT
- "NetLDAPMessage.h"
- "NetLDAPSearch.h"
- EOT
- FILENAME = NetLDAP
- CPPCLASS = NetLDAP
-
- [NetLDAPc1]
- CPPNAME = NetLDAP
- PNAME = Net::LDAP::new
- PPACKAGE = Net::LDAP
- RETURN = cpp_class_NetLDAP
- PARAMS =<<EOT
- cpp_string
- cpp_map,cpp_string
- EOT
-
- [NetLDAPc2]
- CPPNAME = NetLDAP
- PNAME = Net::LDAP::new
- PPACKAGE = Net::LDAP
- RETURN = cpp_class_NetLDAP
- PARAMS =<<EOT
- cpp_string
- EOT
-
- [ldap_bind]
- PNAME = bind
- CPPNAME = bind
- CPPCLASS = NetLDAP
- METHOD = 1
- RETURN = cpp_class_NetLDAPMessage
-
-
-C++ Code to use the function::
-
- // equivalent perl Code
- // my $host = "localhost";
- // my $ldap = new Net::LDAP($host);
- // if( not ref($ldap) ) {
- // print "creating perl object failed\n";
- // exit(1);
- // }
- // $ldap->bind();
- //
- std::string host("localhost");
- NetLDAP ldap(host);
- if( ! ldap.perlObjectOK() ) {
- std::cout << "creating perl object failed" << std::endl;
- exit(1);
- }
- ldap.bind();
-
-Discussion:::
-
- [_GENERAL_]
- ...
- CPPCLASS = NetLDAP
-
-we want to wrap a perl class here. The code generator will
- do this by creating a C++ class and that Class is called
- "NetLDAP".::
-
- [NetLDAPc1]
- CPPNAME = NetLDAP
-
-The function will be called NetLDAP in C++. Since this is
- the constructor for the class, you don't have too many choices
- here. You have to call the constructor like the class itself is
- called.::
-
- PNAME = Net::LDAP::new
-
-The function you would call on the perl side.::
-
- PPACKAGE = Net::LDAP
-
-The perl namespace::
-
- RETURN = cpp_class_NetLDAP
-
-Since this is the constructor, we return a "cpp_class_"
- thing here. There can be other functions that return classes
- too but are no constructors.
- If you remember, a constructor is marked by a CPPNAME that
- is the same like the CPPCLASS.::
-
- PARAMS =<<EOT
- cpp_string
- cpp_map,cpp_string
- EOT
-
-we will pass a cpp_string (std::string) and
- a std::map<std::string,std::string> as parameters. The map
- is optional on the perl side, that's the reason why we'll
- create a second constructor now.::
-
- [NetLDAPc2]
- CPPNAME = NetLDAP
-
-We have a second constructor with different parameters.::
-
- PNAME = Net::LDAP::new
-
-The function you would call on the perl side.::
-
- PPACKAGE = Net::LDAP
-
-The perl namespace::
-
- RETURN = cpp_class_NetLDAP
-
-Since this is the constructor, we return a "cpp_class_"::
-
- PARAMS =<<EOT
- cpp_string
- EOT
-
-like above, but without a std::map<....>::
-
- [ldap_bind]
- PNAME = bind
-
-bind is a method of a NetLDAP object. It's used like
- $ldap->bind() on the perl side.::
-
- CPPNAME = bind
-
-we call it bind too on the C++ side::
-
- METHOD = 1
-
-It's a method that and so an object is required.::
-
- RETURN = cpp_class_NetLDAPMessage
-
-This method will return another C++ class object called
- NetLDAPMessage. This class MUST provide a constructor like
- this: NetLDAPMessage(SV* o);
- Classes that are created with the codegen script, will have
- such a constructor.
-
-
-
-Keys in ini-file
-
- [_GENERAL_]
-
- * FILENAME = The FILENAME.{cpp,h} that will be created
- This is a must have
-
- * CPPCLASS = If this is a wrapper for a perl class, you have to
- configure the C++ class name here.
- This is a must have for wrapping perl classes but
- it's not needed if you just wrap simple perl functions
- like in Date::Calc
-
- * INCLUDE = It's a multiline value and you can configure include
- files here, that will be loaded in FILENAME.h
-
- * DOCUMENTATION = You can enter a text here that will appear in the
- created header file. Either you enter the text
- directly or you use the "file://" prefix to point
- to a file that contains the documentation and
- shall be inserted into the header file.
-
- [FUNCTIONS]
-
- * PNAME = The name of the function in the Perl Namespace.
- If this key does not exist, the section name will be used.
-
- * PPACKAGE = Only used for constructors. It's the Perl Namespace of
- the "new" function.
- $object = new PPACKAGE(..)
-
- * RETURN = The return value of the C++ function/method
-
- * PCONTEXT = will be autodetected in most cases
- Can be: ARRAY or SCARAL or VOID
- but should not be necessary to set
-
- * PARAMS = The parameterlist for the function. This can be a
- multiline value for more than one parameter.
- If there are no parameters, you don't need this key
-
- * METHOD = can be 0 or 1 (default is 0)
- If this is a method, the the value must be set to 1
- You can say, it must always be 1, if the perl code
- would look like "$object->PNAME(...)"
-
- * EXCEPTION = a name of a perl package that must contain at least one
- function named "throw". There is already such a perl package
- for the STL, BlocXX and one for LiMaL will follow. The "throw"
- function must return a string containing C++ code that will be
- executed if the called perl code dies. The message that perl
- dies with is in SvPV(ERRSV, PL_na).
- Look at ExceptionCPP.pm for a very simple example.
-
- * DOCUMENTATION = You can enter a text here that will appear in the
- created header file above the function/method.
- Either you enter the text directly or you use
- the "file://" prefix to point to a file that
- contains the documentation and shall be inserted
- into the header file.
-
-
-]]>
- </screen>
-
- </para>
- </section>
-
- <section id="perlmodules">
- <title>Using existing Perl Modules</title>
- <para>
- Of course the same mechanism can be used to wrap existing perl
- code for the usage in a C++ LiMaL interface. So with just a little
- perl knowledge, it's possible to use the famous Date::Calc module for
- example.
- </para>
- <para>
- Well, unfortunately there are restrictions of the perl code that can
- be wrapped automatically. Data structures that are completely mixed up
- can not be wrapped. For example a hash that can have strings and hash
- references as values at the same time, can not be wrapped at the
- moment because there is no direct C++ equivalent to::
- </para>
- <para>
- <screen width="80">
- %hash = (
- STRINGVAL => "this is a atring",
- HASHVAL => {
- NESTED_HASH_KEY => "val"
- },
- STRINGVAL2 => "yet another string",
- ANARRAY => [ 'and', 'an', 'array' ],
- );
- </screen>
- </para>
- <para>
- Fortunately such kind of mixed datatypes are not so commonly used and
- they can be avoided easily if one writes a perl pluglib from scratch.
- </para>
- </section>
-
- <section id="perlbinding">
- <title>Perl Bindings to LiMaL</title>
- <para>
- There will be SWIG Bindings to use LiMaL Log/Lock/... functions.
- This makes is possible to do the same logging in perl pluglibs like
- you would do in C++ pluglibs.
- </para>
- </section>
-
-</section>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-devtools-1.2.5/docbook/css/Makefile.in new/limal-devtools-1.2.6/docbook/css/Makefile.in
--- old/limal-devtools-1.2.5/docbook/css/Makefile.in 2006-11-28 14:03:31.000000000 +0100
+++ new/limal-devtools-1.2.6/docbook/css/Makefile.in 2007-05-04 14:39:54.000000000 +0200
@@ -214,9 +214,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docbook/css/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign docbook/css/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu docbook/css/Makefile
+ $(AUTOMAKE) --foreign docbook/css/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-devtools-1.2.5/docbook/images/admon/Makefile.in new/limal-devtools-1.2.6/docbook/images/admon/Makefile.in
--- old/limal-devtools-1.2.5/docbook/images/admon/Makefile.in 2006-11-28 14:03:31.000000000 +0100
+++ new/limal-devtools-1.2.6/docbook/images/admon/Makefile.in 2007-05-04 14:39:54.000000000 +0200
@@ -216,9 +216,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docbook/images/admon/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign docbook/images/admon/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu docbook/images/admon/Makefile
+ $(AUTOMAKE) --foreign docbook/images/admon/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-devtools-1.2.5/docbook/images/Makefile.in new/limal-devtools-1.2.6/docbook/images/Makefile.in
--- old/limal-devtools-1.2.5/docbook/images/Makefile.in 2006-11-28 14:03:31.000000000 +0100
+++ new/limal-devtools-1.2.6/docbook/images/Makefile.in 2007-05-04 14:39:54.000000000 +0200
@@ -224,9 +224,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docbook/images/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign docbook/images/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu docbook/images/Makefile
+ $(AUTOMAKE) --foreign docbook/images/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-devtools-1.2.5/docbook/images/navig/Makefile.in new/limal-devtools-1.2.6/docbook/images/navig/Makefile.in
--- old/limal-devtools-1.2.5/docbook/images/navig/Makefile.in 2006-11-28 14:03:31.000000000 +0100
+++ new/limal-devtools-1.2.6/docbook/images/navig/Makefile.in 2007-05-04 14:39:55.000000000 +0200
@@ -213,9 +213,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docbook/images/navig/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign docbook/images/navig/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu docbook/images/navig/Makefile
+ $(AUTOMAKE) --foreign docbook/images/navig/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-devtools-1.2.5/docbook/Makefile.in new/limal-devtools-1.2.6/docbook/Makefile.in
--- old/limal-devtools-1.2.5/docbook/Makefile.in 2006-11-28 14:03:30.000000000 +0100
+++ new/limal-devtools-1.2.6/docbook/Makefile.in 2007-05-04 14:39:54.000000000 +0200
@@ -211,9 +211,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docbook/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign docbook/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu docbook/Makefile
+ $(AUTOMAKE) --foreign docbook/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-devtools-1.2.5/docbook/stylesheets/Makefile.in new/limal-devtools-1.2.6/docbook/stylesheets/Makefile.in
--- old/limal-devtools-1.2.5/docbook/stylesheets/Makefile.in 2006-11-28 14:03:31.000000000 +0100
+++ new/limal-devtools-1.2.6/docbook/stylesheets/Makefile.in 2007-05-04 14:39:55.000000000 +0200
@@ -214,9 +214,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docbook/stylesheets/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign docbook/stylesheets/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu docbook/stylesheets/Makefile
+ $(AUTOMAKE) --foreign docbook/stylesheets/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-devtools-1.2.5/doxygen/Makefile.in new/limal-devtools-1.2.6/doxygen/Makefile.in
--- old/limal-devtools-1.2.5/doxygen/Makefile.in 2006-11-28 14:03:31.000000000 +0100
+++ new/limal-devtools-1.2.6/doxygen/Makefile.in 2007-05-04 14:39:55.000000000 +0200
@@ -219,9 +219,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doxygen/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doxygen/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu doxygen/Makefile
+ $(AUTOMAKE) --foreign doxygen/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-devtools-1.2.5/limal-devtools.spec.in new/limal-devtools-1.2.6/limal-devtools.spec.in
--- old/limal-devtools-1.2.5/limal-devtools.spec.in 2006-09-29 12:06:48.000000000 +0200
+++ new/limal-devtools-1.2.6/limal-devtools.spec.in 2007-05-03 14:32:49.000000000 +0200
@@ -8,6 +8,7 @@
Requires: gettext gettext-devel recode
Requires: autoconf automake libtool
Requires: pkgconfig swig
+Requires: openssl-devel
# cvs required by autopoint
Requires: cvs
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-devtools-1.2.5/misc/Makefile.in new/limal-devtools-1.2.6/misc/Makefile.in
--- old/limal-devtools-1.2.5/misc/Makefile.in 2006-11-28 14:03:32.000000000 +0100
+++ new/limal-devtools-1.2.6/misc/Makefile.in 2007-05-04 14:39:55.000000000 +0200
@@ -212,9 +212,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu misc/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign misc/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu misc/Makefile
+ $(AUTOMAKE) --foreign misc/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-devtools-1.2.5/perl2cpp/Class.pm new/limal-devtools-1.2.6/perl2cpp/Class.pm
--- old/limal-devtools-1.2.5/perl2cpp/Class.pm 2006-07-25 15:37:49.000000000 +0200
+++ new/limal-devtools-1.2.6/perl2cpp/Class.pm 2007-05-03 18:01:05.000000000 +0200
@@ -46,8 +46,8 @@
my $this = shift;
my $ret = "";
- $ret .= "#ifndef __".lc($this->{CPPCLASS})."_included__\n";
- $ret .= "#define __".lc($this->{CPPCLASS})."_included__\n";
+ $ret .= "#ifndef perl2cpp__".lc($this->{CPPCLASS})."_included\n";
+ $ret .= "#define perl2cpp__".lc($this->{CPPCLASS})."_included\n";
foreach my $i ( Function::Includes() ) { $ret .= "#include $i\n"; }
foreach my $i ( @{$this->{INCLUDE}} ) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-devtools-1.2.5/perl2cpp/codegen.pl new/limal-devtools-1.2.6/perl2cpp/codegen.pl
--- old/limal-devtools-1.2.5/perl2cpp/codegen.pl 2006-07-25 15:37:49.000000000 +0200
+++ new/limal-devtools-1.2.6/perl2cpp/codegen.pl 2007-05-04 14:25:50.000000000 +0200
@@ -6,7 +6,11 @@
use Config::IniFiles;
use Getopt::Long;
-GetOptions ();
+my $project = "";
+
+GetOptions (
+ "project=s" => \$project
+) or die;
if( not $ARGV[0] ) {
usage();
@@ -68,6 +72,13 @@
}
open(FILE, ">$fn.cpp") or die("$fn: $!");
+
+ print FILE "#include \n";
+ print FILE "#include \n";
+ print FILE "#include \n";
+ print FILE "#include \n";
+ print FILE "namespace { void perl2cpp_warn_deprecated(); }\n";
+
foreach my $c ( keys(%cppclasses) ) {
print FILE $cppclasses{$c}->getImplementation();
}
@@ -86,6 +97,30 @@
print FILE $c->getString();
}
}
+ print FILE "namespace // anonymous\n";
+ print FILE "{\n";
+ print FILE "\tblocxx::OnceFlag perl2cpp_warn_once_guard = BLOCXX_ONCE_INIT;\n";
+ print FILE "\tvoid perl2cpp_warn_deprecated_once()\n";
+ print FILE "\t{\n";
+ print FILE "\t\tblocxx::String component(\"", (length($project) > 0 ? $project : $fn), "\");\n";
+ print FILE "\t\tblocxx::String message;\n";
+ print FILE "\t\tmessage.format(\"Deprecated limal perl2cpp generated \"\n",
+ "\t\t \"code in use by %s (%s:%d)\",\n",
+ "\t\t component.c_str(), __FILE__, __LINE__);\n";
+ print FILE "\t\t// don't open, log with current (or default) settings\n";
+ print FILE "\t\tsyslog(LOG_INFO, \"%s\", message.c_str());\n";
+ print FILE "#if BLOCXX_LIBRARY_VERSION >= 5\n";
+ print FILE "\t\tblocxx::LoggerRef logger(new blocxx::Logger(component));\n";
+ print FILE "#else\n";
+ print FILE "\t\tblocxx::LoggerRef logger(blocxx::Logger::getCurrentLogger());\n";
+ print FILE "#endif\n";
+ print FILE "\t\tlogger->logMessage(\"INFO\", message);\n";
+ print FILE "\t}\n";
+ print FILE "\tvoid perl2cpp_warn_deprecated()\n";
+ print FILE "\t{\n";
+ print FILE "\t\tblocxx::callOnce(perl2cpp_warn_once_guard, perl2cpp_warn_deprecated_once);\n";
+ print FILE "\t}\n";
+ print FILE "} // end of anonymous namespace\n";
close(FILE);
open(FILE, ">$fn.h") or die("$fn: $!");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-devtools-1.2.5/perl2cpp/Function.pm new/limal-devtools-1.2.6/perl2cpp/Function.pm
--- old/limal-devtools-1.2.5/perl2cpp/Function.pm 2006-07-25 15:37:49.000000000 +0200
+++ new/limal-devtools-1.2.6/perl2cpp/Function.pm 2007-05-04 14:29:35.000000000 +0200
@@ -166,6 +166,7 @@
}
$ret .= "\tENTER;\n\tSAVETMPS;\n";
# ensure the module is loaded
+ $ret .= "\tperl2cpp_warn_deprecated();\n";
if( $pkgname ) {
$ret .= "\tload_module (PERL_LOADMOD_NOIMPORT, newSVpvn (\"$pkgname\", $pkgname_len), 0);\n";
}
@@ -330,8 +331,8 @@
my $ret;
my $inc = shift;
- $ret .= "#ifndef __converter_included__\n";
- $ret .= "#define __converter_included__\n";
+ $ret .= "#ifndef perl2cpp__converter_included\n";
+ $ret .= "#define perl2cpp__converter_included\n";
my @inc;
foreach my $k ( keys(%createdFunctions) ) {
foreach my $i ( $createdFunctions{$k}->getIncludes() ) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-devtools-1.2.5/perl2cpp/Makefile.in new/limal-devtools-1.2.6/perl2cpp/Makefile.in
--- old/limal-devtools-1.2.5/perl2cpp/Makefile.in 2006-11-28 14:03:32.000000000 +0100
+++ new/limal-devtools-1.2.6/perl2cpp/Makefile.in 2007-05-04 14:39:55.000000000 +0200
@@ -221,9 +221,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu perl2cpp/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign perl2cpp/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu perl2cpp/Makefile
+ $(AUTOMAKE) --foreign perl2cpp/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-devtools-1.2.5/po-tools/Makefile.in new/limal-devtools-1.2.6/po-tools/Makefile.in
--- old/limal-devtools-1.2.5/po-tools/Makefile.in 2006-11-28 14:03:32.000000000 +0100
+++ new/limal-devtools-1.2.6/po-tools/Makefile.in 2007-05-04 14:39:55.000000000 +0200
@@ -207,9 +207,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po-tools/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po-tools/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu po-tools/Makefile
+ $(AUTOMAKE) --foreign po-tools/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-devtools-1.2.5/po-tools/po-mergeback new/limal-devtools-1.2.6/po-tools/po-mergeback
--- old/limal-devtools-1.2.5/po-tools/po-mergeback 2006-07-25 15:37:53.000000000 +0200
+++ new/limal-devtools-1.2.6/po-tools/po-mergeback 2007-05-03 14:32:49.000000000 +0200
@@ -368,7 +368,7 @@
my $cpp_file;
my $basename;
- foreach $cpp_file ( `find $cpp_base_path \\( -name "*.cpp" -o -name "*.h" -o -name "*.hpp" -o -name "*.c" -o -name "*.pm" -o -name "*.cc" -o -name "*.glade" \\) -print` )
+ foreach $cpp_file ( `find $cpp_base_path \\( -name "*.cpp" -o -name "*.h" -o -name "*.hpp" -o -name "*.c" -o -name "*.pm" -o -name "*.cc" -o -name "*.glade" -o -name "*.i" \\) -print` )
{
chomp $cpp_file;
@@ -427,6 +427,7 @@
my $norm_msg;
my $line;
my $is_glade_file = 0;
+ my $is_swig_file = 0;
# check if the source file is a *.glade file
my $file_extension = (reverse( split( /\./, $cpp_file ) ))[0];
@@ -459,6 +460,10 @@
"\n\nThe changes made to this part will be stored as a diff file ($cpp_file.diff)\n" );
}
+ if( $src !~ /_\(/ )
+ {
+ $is_swig_file = 1;
+ }
# parse input file
@@ -467,7 +472,11 @@
# split src at first message beginning: _("
- if ( ! $is_glade_file )
+ if ( $is_swig_file )
+ {
+ ( $head, $src ) = split ( /limal::gettext\(\s*"/ms, $src, 2 ); # ") for emacs
+ }
+ elsif ( ! $is_glade_file )
{
( $head, $src ) = split ( /_\(\s*"/ms, $src, 2 ); # ") for emacs
}
@@ -545,7 +554,11 @@
deb ( "\nNormalized: \n\"" . $norm_msg . "\"\n\n" );
}
- if ( ! $is_glade_file )
+ if ( $is_swig_file )
+ {
+ print OUT 'limal::gettext("' . $msg . '")';
+ }
+ elsif ( ! $is_glade_file )
{
print OUT '_("' . $msg . '")';
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-devtools-1.2.5/VERSION new/limal-devtools-1.2.6/VERSION
--- old/limal-devtools-1.2.5/VERSION 2006-11-28 14:02:22.000000000 +0100
+++ new/limal-devtools-1.2.6/VERSION 2007-05-04 14:37:47.000000000 +0200
@@ -1 +1 @@
-1.2.5
+1.2.6
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org