[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Bkdepim/4=2E6=5D_mobile=3A_messages_extraction=3A_gr?=
From:       Torgny Nyblom <kde () nyblom ! org>
Date:       2011-04-27 12:52:46
Message-ID: 20110427125246.C7019A60A4 () git ! kde ! org
[Download RAW message or body]

Git commit 46f721d3e5740e34980ff760b75641a78be0c7e1 by Torgny Nyblom, on behalf of \
Pino Toscano. Committed on 27/04/2011 at 14:36.
Pushed by tnyblom into branch '4.6'.

messages extraction: group the positive conditions, so the -and exclusion works

M  +1    -1    mobile/calendar/Messages.sh     
M  +1    -1    mobile/contacts/Messages.sh     
M  +1    -1    mobile/lib/Messages.sh     
M  +1    -1    mobile/mail/Messages.sh     
M  +1    -1    mobile/notes/Messages.sh     
M  +1    -1    mobile/tasks/Messages.sh     

http://commits.kde.org/kdepim/46f721d3e5740e34980ff760b75641a78be0c7e1

diff --git a/mobile/calendar/Messages.sh b/mobile/calendar/Messages.sh
index 841fcaa..7d5b262 100644
--- a/mobile/calendar/Messages.sh
+++ b/mobile/calendar/Messages.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-$EXTRACTRC --ignore-no-input `find . -name '*.ui' -or -name '*.rc' -or -name \
'*.kcfg' -or -name '*.kcfg.cmake' -and -not -name '*-mobile.rc'` >> rc.cpp || exit 11 \
+$EXTRACTRC --ignore-no-input `find . \( -name '*.ui' -or -name '*.rc' -or -name \
'*.kcfg' -or -name '*.kcfg.cmake' \) -and -not -name '*-mobile.rc'` >> rc.cpp || exit \
11  $XGETTEXT -ktranslate `find -name '*.cpp' -o -name '*.h'` -o \
$podir/korganizer-mobile.pot  $XGETTEXT -ktranslate `find . -name '*.qml'` -j -L Java \
-o $podir/korganizer-mobile.pot  rm -f rc.cpp
diff --git a/mobile/contacts/Messages.sh b/mobile/contacts/Messages.sh
index 2586642..a2afa3f 100644
--- a/mobile/contacts/Messages.sh
+++ b/mobile/contacts/Messages.sh
@@ -1,4 +1,4 @@
 #! /bin/sh
-$EXTRACTRC --ignore-no-input `find . -name '*.ui' -or -name '*.rc' -or -name \
'*.kcfg' -or -name '*.kcfg.cmake' -and -not -name '*-mobile.rc'` >> rc.cpp || exit 11 \
+$EXTRACTRC --ignore-no-input `find . \( -name '*.ui' -or -name '*.rc' -or -name \
'*.kcfg' -or -name '*.kcfg.cmake' \) -and -not -name '*-mobile.rc'` >> rc.cpp || exit \
11  $XGETTEXT -ktranslate `find -name '*.cpp' -o -name '*.h' -o -name '*.qml'` -o \
$podir/kaddressbook-mobile.pot  rm -f rc.cpp
diff --git a/mobile/lib/Messages.sh b/mobile/lib/Messages.sh
index 169c001..b7e7382 100644
--- a/mobile/lib/Messages.sh
+++ b/mobile/lib/Messages.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-$EXTRACTRC --ignore-no-input `find . -name '*.ui' -or -name '*.rc' -or -name \
'*.kcfg' -or -name '*.kcfg.cmake' -and -not -name '*-mobile.rc'` >> rc.cpp || exit 11 \
+$EXTRACTRC --ignore-no-input `find . \( -name '*.ui' -or -name '*.rc' -or -name \
'*.kcfg' -or -name '*.kcfg.cmake' \) -and -not -name '*-mobile.rc'` >> rc.cpp || exit \
11  $XGETTEXT -ktranslate `find . -name '*.cpp' -o -name '*.h'` -o \
$podir/libkdepimmobileui.pot  $XGETTEXT -ktranslate `find . -name '*.qml'` -j -L Java \
-o $podir/libkdepimmobileui.pot  rm -f rc.cpp
diff --git a/mobile/mail/Messages.sh b/mobile/mail/Messages.sh
index 19c29fb..c2a7600 100644
--- a/mobile/mail/Messages.sh
+++ b/mobile/mail/Messages.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-$EXTRACTRC --ignore-no-input `find . -name '*.ui' -or -name '*.rc' -or -name \
'*.kcfg' -or -name '*.kcfg.cmake' -and -not -name '*-mobile.rc'` >> rc.cpp || exit 11 \
+$EXTRACTRC --ignore-no-input `find . \( -name '*.ui' -or -name '*.rc' -or -name \
'*.kcfg' -or -name '*.kcfg.cmake' \) -and -not -name '*-mobile.rc'` >> rc.cpp || exit \
11  $XGETTEXT -ktranslate `find -name '*.cpp' -o -name '*.h'` -o \
$podir/kmail-mobile.pot  $XGETTEXT -ktranslate `find . -name '*.qml'` -j -L Java -o \
$podir/kmail-mobile.pot  rm -f rc.cpp
diff --git a/mobile/notes/Messages.sh b/mobile/notes/Messages.sh
index 60ebdbf..28c8dab 100644
--- a/mobile/notes/Messages.sh
+++ b/mobile/notes/Messages.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-$EXTRACTRC --ignore-no-input `find . -name '*.ui' -or -name '*.rc' -or -name \
'*.kcfg' -or -name '*.kcfg.cmake' -and -not -name '*-mobile.rc'` >> rc.cpp || exit 11 \
+$EXTRACTRC --ignore-no-input `find . \( -name '*.ui' -or -name '*.rc' -or -name \
'*.kcfg' -or -name '*.kcfg.cmake' \) -and -not -name '*-mobile.rc'` >> rc.cpp || exit \
11  $XGETTEXT -ktranslate `find -name '*.cpp' -o -name '*.h'` -o \
$podir/notes-mobile.pot  $XGETTEXT -ktranslate `find . -name '*.qml'` -j -L Java -o \
$podir/notes-mobile.pot  rm -f rc.cpp
diff --git a/mobile/tasks/Messages.sh b/mobile/tasks/Messages.sh
index 6901da1..d47ff00 100644
--- a/mobile/tasks/Messages.sh
+++ b/mobile/tasks/Messages.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-$EXTRACTRC --ignore-no-input `find . -name '*.ui' -or -name '*.rc' -or -name \
'*.kcfg' -or -name '*.kcfg.cmake' -and -not -name '*-mobile.rc'` >> rc.cpp || exit 11 \
+$EXTRACTRC --ignore-no-input `find . \( -name '*.ui' -or -name '*.rc' -or -name \
'*.kcfg' -or -name '*.kcfg.cmake' \) -and -not -name '*-mobile.rc'` >> rc.cpp || exit \
11  $XGETTEXT -ktranslate `find -name '*.cpp' -o -name '*.h'` -o \
$podir/tasks-mobile.pot  $XGETTEXT -ktranslate `find . -name '*.qml'` -j -L Java -o \
$podir/tasks-mobile.pot  rm -f rc.cpp


[prev in list] [next in list] [prev in thread] [next in thread]