From e755317aca5487dbcb35f4eabdaa2041de693797 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Mon, 29 Oct 2012 13:35:24 +0100 Subject: l10ntools: add missing dependency on sal headers Change-Id: Iced89d43299767a30d31d1c5e3abf3e8c91f76cc --- l10ntools/StaticLibrary_transex.mk | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'l10ntools') diff --git a/l10ntools/StaticLibrary_transex.mk b/l10ntools/StaticLibrary_transex.mk index e8c84b7d3662..b437be9deb71 100644 --- a/l10ntools/StaticLibrary_transex.mk +++ b/l10ntools/StaticLibrary_transex.mk @@ -32,6 +32,11 @@ $(eval $(call gb_StaticLibrary_set_include,transex,\ $$(INCLUDE) \ )) +$(eval $(call gb_StaticLibrary_use_packages,transex,\ + sal_generated \ + sal_inc \ +)) + $(eval $(call gb_StaticLibrary_add_exception_objects,transex,\ l10ntools/source/export2 \ l10ntools/source/merge \ -- cgit From f09e4ae2737acb4b3e309e7342162439904939a1 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sat, 27 Oct 2012 16:57:10 +0200 Subject: add missing deps on sal headers Change-Id: I815ef8abaf4cd998e7b91fbadad56ddf0a7087ba --- l10ntools/StaticLibrary_transex.mk | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'l10ntools') diff --git a/l10ntools/StaticLibrary_transex.mk b/l10ntools/StaticLibrary_transex.mk index b437be9deb71..4996b05f0342 100644 --- a/l10ntools/StaticLibrary_transex.mk +++ b/l10ntools/StaticLibrary_transex.mk @@ -27,6 +27,11 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,transex)) +$(eval $(call gb_StaticLibrary_use_packages,transex,\ + sal_generated \ + sal_inc \ +)) + $(eval $(call gb_StaticLibrary_set_include,transex,\ -I$(SRCDIR)/l10ntools/inc \ $$(INCLUDE) \ -- cgit From c1b4077d1ffa57d325bf1149ac198d91cf981e3b Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Sat, 3 Nov 2012 00:35:14 +0100 Subject: escape quotes, unescape double escaped quotes fdo#56648 Change-Id: Id4135db2ec40865cddab533da15b2705dc7b73d5 --- l10ntools/source/lngmerge.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'l10ntools') diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx index b0282f5fb4d7..00a58d25a0ad 100644 --- a/l10ntools/source/lngmerge.cxx +++ b/l10ntools/source/lngmerge.cxx @@ -264,7 +264,8 @@ sal_Bool LngParser::Merge( rtl::OString sText1( sLang ); sText1 += " = \""; - sText1 += sNewText; + // escape quotes, unescape double escaped quotes fdo#56648 + sText1 += sNewText.replaceAll("\"","\\\"").replaceAll("\\\\\"","\\\""); sText1 += "\""; *pLine = sText1; Text[ sLang ] = sNewText; @@ -299,7 +300,8 @@ sal_Bool LngParser::Merge( rtl::OString sLine; sLine += sCur; sLine += " = \""; - sLine += sNewText; + // escape quotes, unescape double escaped quotes fdo#56648 + sLine += sNewText.replaceAll("\"","\\\"").replaceAll("\\\\\"","\\\""); sLine += "\""; nLastLangPos++; -- cgit From 4aed4f436cf8e4b0f3f034dfb1d1025b05a61f0a Mon Sep 17 00:00:00 2001 From: Alia Almusaireae Date: Mon, 5 Nov 2012 13:47:35 +0300 Subject: add a README files Change-Id: I4bd9a7d00df220e2a3deae3cc1b7b0f4a1098e24 Reviewed-on: https://gerrit.libreoffice.org/989 Reviewed-by: Michael Meeks Tested-by: Michael Meeks --- l10ntools/README | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 l10ntools/README (limited to 'l10ntools') diff --git a/l10ntools/README b/l10ntools/README new file mode 100644 index 000000000000..192064aaf030 --- /dev/null +++ b/l10ntools/README @@ -0,0 +1,5 @@ +l10ntools is scanners module during gbuild'fication. +l10ntools delivers some header files and scripts as well. To +handle these, you should create two Packages, one for the headers and +other for the scripts. +l10ntools module has three lexer files \ No newline at end of file -- cgit From ed7d5822c0008a7416bd9cc19d6b0c0e58a352ae Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Mon, 5 Nov 2012 12:30:34 +0000 Subject: cleanup README files. Convert DOS -> unix newlines. Cleanup and clarify several files. --- l10ntools/README | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'l10ntools') diff --git a/l10ntools/README b/l10ntools/README index 192064aaf030..4d2f19184adb 100644 --- a/l10ntools/README +++ b/l10ntools/README @@ -1,5 +1,2 @@ -l10ntools is scanners module during gbuild'fication. -l10ntools delivers some header files and scripts as well. To -handle these, you should create two Packages, one for the headers and -other for the scripts. -l10ntools module has three lexer files \ No newline at end of file +l10ntools contains a number of tools that handle internationalisation(i18n) during the build. + -- cgit From 74abeff02b750fb22fc3d56299abc2cd12d357d3 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Wed, 7 Nov 2012 23:31:44 +0100 Subject: integrate librelogo to the build Change-Id: I4cd29f6a893d72a49233bb53d19701d0bdd0e078 --- l10ntools/source/localize.cxx | 1 + 1 file changed, 1 insertion(+) (limited to 'l10ntools') diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx index 3700efea5fd9..8dfb8ec4835d 100644 --- a/l10ntools/source/localize.cxx +++ b/l10ntools/source/localize.cxx @@ -297,6 +297,7 @@ bool includeProject(rtl::OUString const & project) { "framework", "helpcontent2", "instsetoo_native", + "librelogo", "mysqlc", "nlpsolver", "officecfg", -- cgit From de1030f2bc6609d8fe0a914f708fb6e1ede94af4 Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Sat, 10 Nov 2012 09:53:26 -0500 Subject: l10ntools needs boost Change-Id: Ie4b697b6549e300dcf8c0d788e6c9c0f50e677c2 --- l10ntools/Executable_cfgex.mk | 2 ++ l10ntools/Executable_gsicheck.mk | 2 ++ l10ntools/Executable_helpex.mk | 1 + l10ntools/Executable_uiex.mk | 2 ++ l10ntools/Executable_ulfex.mk | 2 ++ l10ntools/Executable_xrmex.mk | 2 ++ 6 files changed, 11 insertions(+) (limited to 'l10ntools') diff --git a/l10ntools/Executable_cfgex.mk b/l10ntools/Executable_cfgex.mk index 7dc23275da14..5531606abc86 100644 --- a/l10ntools/Executable_cfgex.mk +++ b/l10ntools/Executable_cfgex.mk @@ -35,6 +35,8 @@ $(eval $(call gb_Executable_use_libraries,cfgex,\ sal \ )) +$(eval $(call gb_Executable_use_unpacked,cfgex,boost)) + $(eval $(call gb_Executable_add_scanners,cfgex,\ l10ntools/source/cfglex \ )) diff --git a/l10ntools/Executable_gsicheck.mk b/l10ntools/Executable_gsicheck.mk index 917c00fc5866..829a0296939f 100644 --- a/l10ntools/Executable_gsicheck.mk +++ b/l10ntools/Executable_gsicheck.mk @@ -35,6 +35,8 @@ $(eval $(call gb_Executable_use_libraries,gsicheck,\ sal \ )) +$(eval $(call gb_Executable_use_unpacked,gsicheck,boost)) + $(eval $(call gb_Executable_add_exception_objects,gsicheck,\ l10ntools/source/gsicheck \ l10ntools/source/tagtest \ diff --git a/l10ntools/Executable_helpex.mk b/l10ntools/Executable_helpex.mk index 470bd4c89d2c..f1d447c92bed 100644 --- a/l10ntools/Executable_helpex.mk +++ b/l10ntools/Executable_helpex.mk @@ -36,6 +36,7 @@ $(eval $(call gb_Executable_use_libraries,helpex,\ )) $(eval $(call gb_Executable_use_external,helpex,expat_utf8)) +$(eval $(call gb_Executable_use_unpacked,helpex,boost)) $(eval $(call gb_Executable_use_static_libraries,helpex,\ transex \ diff --git a/l10ntools/Executable_uiex.mk b/l10ntools/Executable_uiex.mk index ca4d7266423a..03699f67a505 100644 --- a/l10ntools/Executable_uiex.mk +++ b/l10ntools/Executable_uiex.mk @@ -18,6 +18,8 @@ $(eval $(call gb_Executable_use_libraries,uiex,\ sal \ )) +$(eval $(call gb_Executable_use_unpacked,uiex,boost)) + $(eval $(call gb_Executable_use_static_libraries,uiex,\ transex \ )) diff --git a/l10ntools/Executable_ulfex.mk b/l10ntools/Executable_ulfex.mk index e82c9b8ee812..c045eb11e4a9 100644 --- a/l10ntools/Executable_ulfex.mk +++ b/l10ntools/Executable_ulfex.mk @@ -35,6 +35,8 @@ $(eval $(call gb_Executable_use_libraries,ulfex,\ sal \ )) +$(eval $(call gb_Executable_use_unpacked,ulfex,boost)) + $(eval $(call gb_Executable_use_static_libraries,ulfex,\ transex \ )) diff --git a/l10ntools/Executable_xrmex.mk b/l10ntools/Executable_xrmex.mk index 33255f4eb7e1..1aeef2121b7a 100644 --- a/l10ntools/Executable_xrmex.mk +++ b/l10ntools/Executable_xrmex.mk @@ -35,6 +35,8 @@ $(eval $(call gb_Executable_use_libraries,xrmex,\ sal \ )) +$(eval $(call gb_Executable_use_unpacked,xrmex,boost)) + $(eval $(call gb_Executable_add_scanners,xrmex,\ l10ntools/source/xrmlex \ )) -- cgit