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

List:       kde-commits
Subject:    koffice/kexi/kexiutils
From:       Jarosław Staniek <staniek () kde ! org>
Date:       2010-03-07 17:45:35
Message-ID: 1267983935.323182.342.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1100519 by staniek:

KexiUtils
*Simplified build of the transliteration table. Backported from libpredicate.

(reported by Michael Thaler, thanks)

CCMAIL:michael.thaler@physik.tu-muenchen.de
CCMAIL:koffice-devel@kde.org



 M  +1 -9      CMakeLists.txt  
 M  +4 -2      generate_transliteration_table.sh  
 A             transliteration_table.cpp   \
branches/work/predicate/Predicate/tools/transliteration/transliteration_table.cpp#1100497 \
[License: GENERATED FILE]  D             transliteration_table.cpp.bz2  
 A             transliteration_table.cpp.orig.bz2   \
branches/work/predicate/Predicate/tools/transliteration/transliteration_table.cpp.orig.bz2#1100497
  D             transliteration_table.cpp.patch  
 M  +9 -13     transliteration_table.readme  


--- trunk/koffice/kexi/kexiutils/CMakeLists.txt #1100518:1100519
@@ -8,20 +8,12 @@
 set(kexiutils_LIB_SRCS identifier.cpp validator.cpp utils.cpp debuggui.cpp 
   styleproxy.cpp longlongvalidator.cpp InternalPropertyMap.cpp
   SmallToolButton.cpp FlowLayout.cpp
-  ${CMAKE_CURRENT_BINARY_DIR}/transliteration_table.cpp)
+  transliteration_table.cpp)
 
 kde4_add_library(kexiutils SHARED ${kexiutils_LIB_SRCS})
 target_link_libraries(kexiutils  ${KDE4_KIO_LIBS} ${KDE4_KDE3SUPPORT_LIBS} )
 target_link_libraries(kexiutils  LINK_INTERFACE_LIBRARIES ${KDE4_KIO_LIBS} \
${KDE4_KDE3SUPPORT_LIBS})  
-add_custom_command(
-  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/transliteration_table.cpp
-  COMMAND ${BZIP2_EXECUTABLE} ARGS -dc -k \
${CMAKE_CURRENT_SOURCE_DIR}/transliteration_table.cpp.bz2 > \
                ${CMAKE_CURRENT_BINARY_DIR}/transliteration_table.cpp
-  DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/transliteration_table.cpp.bz2
-)
-
-macro_additional_clean_files( ${CMAKE_CURRENT_BINARY_DIR}/transliteration_table.cpp \
                )
-
 set_target_properties(kexiutils PROPERTIES
     VERSION ${GENERIC_KOFFICE_LIB_VERSION} SOVERSION \
${GENERIC_KOFFICE_LIB_SOVERSION}  )
--- trunk/koffice/kexi/kexiutils/generate_transliteration_table.sh #1100518:1100519
@@ -20,10 +20,10 @@
 #   Boston, MA 02110-1301, USA.
 
 #
-# Generates a transliteration_table.{h|cpp} files using recode's "flat" character \
set +# Generates a transliteration_table.h and transliteration_table.cpp.orig.bz2 \
files using recode's "flat" character set  #
 
-out_cpp="transliteration_table.cpp"
+out_cpp="transliteration_table.cpp.orig"
 out_h="transliteration_table.h"
 max=65534
 
@@ -73,3 +73,5 @@
 done >> $out_cpp
 
 echo "0};" >> $out_cpp;
+
+bzip2 -9 $out_cpp || exit 1
--- trunk/koffice/kexi/kexiutils/transliteration_table.readme #1100518:1100519
@@ -29,26 +29,22 @@
 For each item, the table (basically a table of c-strings) contains:
 - a NULL string it the resulting conversion have to be "_" string;
 - a c-string of size 1 or more containing a valid transliteration 
-   as described in 1;
+   as described in 1.;
 - an empty string "" if the transliteration should return empty string
   (can be useful e.g. for soft signs in Cyrillic)
 
 4. Fixes: Because iconv/recode tools are not fully implemented in regards 
-to transliteration to latin-1 (e.g. no good support 
-for Greek and Cyrillic/Serbian characters), 
-the transliteration_table.cpp file is patched with 
-transliteration_table.cpp.patch which provides fixes written by hand.
+to transliteration to latin-1 (e.g. no good support for Greek and 
+Cyrillic/Serbian characters), the transliteration_table.cpp file is patched.
+The original table computer-generated table is available in
+transliteration_table.cpp.orig.bz2 file.
 
-If you find invalid or missing transliterations:
- a) edit transliteration_table.cpp (using UTF-8-compliant text editor!)
-   - if transliteration_table.cpp file does not exist, 
-   extract it from transliteration_table.bz2 archive
- b) run update_transliteration_table_patch.sh shell script,
-   what will update the transliteration_table.cpp.patch file
- c) send the transliteration_table.cpp.patch file to the Kexi team
+If you find invalid or missing transliterations, please edit
+transliteration_table.cpp (using UTF-8-compliant text editor, e.g. Kate).
+Then please send the transliteration_table.cpp file to the Kexi Team.
 
 5. Credits
- Jarosław Staniek <staniek at kde.org>
+ Jaroslaw Staniek <staniek at kde.org>
  Michael Drueing <michael at drueing.de>
  Chusslove Illich <caslav.ilic at gmx.net>
  Michal Svec <rebel at atrey.karlin.mff.cuni.cz>


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