Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3674

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/74/3674/1

ditch libi18nlangtagicu again

Thanks to Fridrich for finding the real cause for why I thought this was
necessary..

Change-Id: I77934b17c2b994a03cae5440253b165704de2fa4
---
M Library_merged.mk
M Repository.mk
M i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk
M i18nlangtag/Library_i18nlangtag.mk
D i18nlangtag/Library_i18nlangtagicu.mk
M i18nlangtag/Module_i18nlangtag.mk
M i18npool/Library_i18npool.mk
M include/i18nlangtag/languagetagicu.hxx
M lotuswordpro/Library_lwpft.mk
9 files changed, 10 insertions(+), 43 deletions(-)



diff --git a/Library_merged.mk b/Library_merged.mk
index 4603bda..2d5ef60 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -33,7 +33,6 @@
        cppu \
        cppuhelper \
        i18nlangtag \
-       i18nlangtagicu \
        $(if $(filter TRUE,$(SOLAR_JAVA)), \
                jvmaccess \
                jvmfwk) \
diff --git a/Repository.mk b/Repository.mk
index 2094721a..0ccc03d 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -469,7 +469,6 @@
        deployment \
        fileacc \
        i18nlangtag \
-       i18nlangtagicu \
        i18nutil \
        mcnttype \
        package2 \
diff --git a/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk 
b/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk
index a1f2943..f001717 100644
--- a/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk
+++ b/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk
@@ -14,9 +14,8 @@
        offapi \
 ))
 
-$(eval $(call gb_CppunitTest_use_library_objects,i18nlangtag_test_languagetag,i18nlangtag))
-
 $(eval $(call gb_CppunitTest_use_libraries,i18nlangtag_test_languagetag,\
+       i18nlangtag \
        cppu \
        cppuhelper \
        sal \
diff --git a/i18nlangtag/Library_i18nlangtag.mk b/i18nlangtag/Library_i18nlangtag.mk
index 3faacc4..c88b852 100644
--- a/i18nlangtag/Library_i18nlangtag.mk
+++ b/i18nlangtag/Library_i18nlangtag.mk
@@ -39,11 +39,17 @@
        $(gb_UWINAPI) \
 ))
 
+$(eval $(call gb_Library_use_externals,i18nlangtag,\
+       icu_headers \
+       icuuc \
+))
+
 $(eval $(call gb_Library_add_exception_objects,i18nlangtag,\
        i18nlangtag/source/isolang/insys \
        i18nlangtag/source/isolang/isolang \
        i18nlangtag/source/isolang/mslangid \
        i18nlangtag/source/languagetag/languagetag \
+       i18nlangtag/source/languagetag/languagetagicu \
 ))
 
 
diff --git a/i18nlangtag/Library_i18nlangtagicu.mk b/i18nlangtag/Library_i18nlangtagicu.mk
deleted file mode 100644
index d1def1b..0000000
--- a/i18nlangtag/Library_i18nlangtagicu.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-$(eval $(call gb_Library_Library,i18nlangtagicu))
-
-$(eval $(call gb_Library_use_sdk_api,i18nlangtagicu))
-
-$(eval $(call gb_Library_add_defs,i18nlangtagicu,\
-       -DI18NLANGTAG_DLLIMPLEMENTATION \
-))
-
-$(eval $(call gb_Library_use_libraries,i18nlangtagicu,\
-       sal \
-       i18nlangtag \
-       $(gb_UWINAPI) \
-))
-
-$(eval $(call gb_Library_use_externals,i18nlangtagicu,\
-       icu_headers \
-       icuuc \
-))
-
-$(eval $(call gb_Library_add_exception_objects,i18nlangtagicu,\
-       i18nlangtag/source/languagetag/languagetagicu \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/i18nlangtag/Module_i18nlangtag.mk b/i18nlangtag/Module_i18nlangtag.mk
index 22b8a7f..edd2e1d 100644
--- a/i18nlangtag/Module_i18nlangtag.mk
+++ b/i18nlangtag/Module_i18nlangtag.mk
@@ -10,7 +10,6 @@
 
 $(eval $(call gb_Module_add_targets,i18nlangtag,\
        Library_i18nlangtag \
-       Library_i18nlangtagicu \
 ))
 
 $(eval $(call gb_Module_add_check_targets,i18nlangtag,\
diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk
index 5fe9e2c..955579f 100644
--- a/i18npool/Library_i18npool.mk
+++ b/i18npool/Library_i18npool.mk
@@ -42,7 +42,6 @@
        cppu \
        cppuhelper \
        i18nlangtag \
-       i18nlangtagicu \
        i18nutil \
        sal \
        $(gb_UWINAPI) \
diff --git a/include/i18nlangtag/languagetagicu.hxx b/include/i18nlangtag/languagetagicu.hxx
index 2fc9db3..094f077 100644
--- a/include/i18nlangtag/languagetagicu.hxx
+++ b/include/i18nlangtag/languagetagicu.hxx
@@ -20,10 +20,9 @@
 
 /** Interface LanguageTag to ICU's icu::Locale
 
-    Separated from LanguageTag into its own library to not pollute the entire
-    code base with ICU header file inclusion and linkage, only the few code
-    actually using this needs to link against ICU libraries, which it did
-    anyway.
+    Separated from LanguageTag to not pollute the entire code base (and thus
+    makefiles) with ICU header file inclusion, only the few code actually using
+    this needs to know about ICU, which it did anyway.
 */
 class I18NLANGTAG_DLLPUBLIC LanguageTagIcu
 {
diff --git a/lotuswordpro/Library_lwpft.mk b/lotuswordpro/Library_lwpft.mk
index 7673eb3..f01261d 100644
--- a/lotuswordpro/Library_lwpft.mk
+++ b/lotuswordpro/Library_lwpft.mk
@@ -17,7 +17,6 @@
     cppuhelper \
     sal \
        i18nlangtag \
-       i18nlangtagicu \
     sfx \
     sot \
     svt \

-- 
To view, visit https://gerrit.libreoffice.org/3674
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I77934b17c2b994a03cae5440253b165704de2fa4
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Eike Rathke <erack@redhat.com>


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.