diff options
| -rw-r--r-- | Makefile.top | 2 | ||||
| -rw-r--r-- | Module_tail_build.mk | 1 | ||||
| -rw-r--r-- | RepositoryExternal.mk | 5 | ||||
| -rw-r--r-- | RepositoryModule_ooo.mk | 1 | ||||
| -rw-r--r-- | i18npool/CppunitTest_i18npool_test_languagetag.mk | 2 | ||||
| -rw-r--r-- | liblangtag/CustomTarget_langtag.mk | 19 | ||||
| -rw-r--r-- | liblangtag/ExternalPackage_langtag.mk | 27 | ||||
| -rw-r--r-- | liblangtag/ExternalPackage_langtag_data.mk | 46 | ||||
| -rw-r--r-- | liblangtag/ExternalProject_langtag.mk | 34 | ||||
| -rw-r--r-- | liblangtag/Makefile | 7 | ||||
| -rw-r--r-- | liblangtag/Module_liblangtag.mk | 24 | ||||
| -rw-r--r-- | liblangtag/UnpackedTarball_langtag.mk | 48 | ||||
| -rw-r--r-- | liblangtag/Zip_liblangtag_data.mk | 48 | ||||
| -rw-r--r-- | liblangtag/liblangtag-0.4.0-msvcprojects.patch | 679 | ||||
| -rw-r--r-- | liblangtag/makefile.mk | 156 | ||||
| -rw-r--r-- | liblangtag/prj/d.lst | 25 | ||||
| -rw-r--r-- | liblangtag/prj/dmake | 0 | ||||
| -rw-r--r-- | solenv/gbuild/TargetLocations.mk | 1 | ||||
| -rw-r--r-- | tail_build/prj/build.lst | 2 |
19 files changed, 265 insertions, 862 deletions
diff --git a/Makefile.top b/Makefile.top index 1842c55a4bba..66a19bf6dc2a 100644 --- a/Makefile.top +++ b/Makefile.top @@ -109,6 +109,7 @@ lcms2\ libcdr\ libcmis\ libexttextcat\ +liblangtag\ libmspub\ liborcus\ libpng\ @@ -224,7 +225,6 @@ external\ helpcontent2 \ icu\ instsetoo_native\ -liblangtag\ libxml2\ libxmlsec\ libxslt\ diff --git a/Module_tail_build.mk b/Module_tail_build.mk index 6fe3b673cd20..36b9b779ea3e 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -97,6 +97,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ libcdr \ libcmis \ $(call gb_Helper_optional,LIBEXTTEXTCAT,libexttextcat) \ + $(call gb_Helper_optional,LIBLANGTAG,liblangtag) \ libmspub \ liborcus \ librelogo \ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 019f0bed5c7c..734ed1f1cfd0 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -620,6 +620,11 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ )) define gb_LinkTarget__use_liblangtag +$(call gb_LinkTarget_use_unpacked,$(1),langtag) +$(call gb_LinkTarget_set_include,$(1),\ + -I$(call gb_UnpackedTarball_get_dir,langtag) \ + $$(INCLUDE) \ +) $(call gb_LinkTarget_use_libraries,$(1),\ langtag \ ) diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk index 68140781722e..4c13de354182 100644 --- a/RepositoryModule_ooo.mk +++ b/RepositoryModule_ooo.mk @@ -106,6 +106,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ libcdr \ libcmis \ $(call gb_Helper_optional,LIBEXTTEXTCAT,libexttextcat) \ + $(call gb_Helper_optional,LIBLANGTAG,liblangtag) \ libmspub \ liborcus \ libpng \ diff --git a/i18npool/CppunitTest_i18npool_test_languagetag.mk b/i18npool/CppunitTest_i18npool_test_languagetag.mk index c6493303111a..02aae4126859 100644 --- a/i18npool/CppunitTest_i18npool_test_languagetag.mk +++ b/i18npool/CppunitTest_i18npool_test_languagetag.mk @@ -32,6 +32,8 @@ $(eval $(call gb_CppunitTest_add_defs,i18npool_test_languagetag,-DENABLE_LIBLANG ifeq ($(SYSTEM_LIBLANGTAG),YES) $(eval $(call gb_CppunitTest_add_defs,i18npool_test_languagetag,-DSYSTEM_LIBLANGTAG)) +else +$(eval $(call gb_CppunitTest_use_package,i18npool_test_languagetag,langtag_data)) endif endif diff --git a/liblangtag/CustomTarget_langtag.mk b/liblangtag/CustomTarget_langtag.mk new file mode 100644 index 000000000000..811628dfe0e3 --- /dev/null +++ b/liblangtag/CustomTarget_langtag.mk @@ -0,0 +1,19 @@ +# -*- 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_CustomTarget_CustomTarget,liblangtag/langtag)) + +$(call gb_CustomTarget_get_target,liblangtag/langtag) : $(call gb_Zip_get_target,liblangtag_data) + rm -rf $(OUTDIR)/share/liblangtag \ + && mkdir -p $(OUTDIR)/share/liblangtag \ + && unzip $< -d $(OUTDIR)/share/liblangtag \ + && touch $(call gb_CustomTarget_get_workdir,liblangtag/langtag)/.dir + + +# vim: set noet sw=4 ts=4: diff --git a/liblangtag/ExternalPackage_langtag.mk b/liblangtag/ExternalPackage_langtag.mk new file mode 100644 index 000000000000..4b883fd23d90 --- /dev/null +++ b/liblangtag/ExternalPackage_langtag.mk @@ -0,0 +1,27 @@ +# -*- 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_ExternalPackage_ExternalPackage,langtag,langtag)) +$(eval $(call gb_ExternalPackage_use_external_project,langtag,langtag)) +ifeq ($(GUI),WNT) +ifeq ($(COM),GCC) +$(eval $(call gb_ExternalPackage_add_file,langtag,lib/liblangtag-1.dll,liblangtag/.libs/liblangtag-1.dll)) +$(eval $(call gb_ExternalPackage_add_file,langtag,lib/liblangtag.dll.a,liblangtag/.libs/liblangtag.dll.a)) +else +$(eval $(call gb_ExternalPackage_add_file,langtag,lib/langtag.lib,liblangtag/.libs/langtag.lib)) +endif +else +ifeq ($(OS),MACOSX) +$(eval $(call gb_ExternalPackage_add_file,langtag,lib/liblangtag.1.0.0.dylib,liblangtag/.libs/liblangtag.1.0.0.dylib)) +else +$(eval $(call gb_ExternalPackage_add_file,langtag,lib/liblangtag.so.1.0.0,liblangtag/.libs/liblangtag.so.1.0.0)) +endif +endif + +# vim: set noet sw=4 ts=4: diff --git a/liblangtag/ExternalPackage_langtag_data.mk b/liblangtag/ExternalPackage_langtag_data.mk new file mode 100644 index 000000000000..4b9fb2516235 --- /dev/null +++ b/liblangtag/ExternalPackage_langtag_data.mk @@ -0,0 +1,46 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_ExternalPackage_ExternalPackage,langtag_data,langtag)) + +$(eval $(call gb_ExternalPackage_add_files,langtag_data,share/liblangtag,data/language-subtag-registry.xml)) +$(eval $(call gb_ExternalPackage_add_files,langtag_data,share/liblangtag/common/bcp47,\ + data/common/bcp47/calendar.xml \ + data/common/bcp47/collation.xml \ + data/common/bcp47/currency.xml \ + data/common/bcp47/number.xml \ + data/common/bcp47/timezone.xml \ + data/common/bcp47/transform.xml \ + data/common/bcp47/transform_ime.xml \ + data/common/bcp47/transform_keyboard.xml \ + data/common/bcp47/transform_mt.xml \ + data/common/bcp47/transform_private_use.xml \ + data/common/bcp47/variant.xml \ +)) +$(eval $(call gb_ExternalPackage_add_files,langtag_data,share/liblangtag/common/supplemental,data/common/supplemental/likelySubtags.xml)) + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/liblangtag/ExternalProject_langtag.mk b/liblangtag/ExternalProject_langtag.mk new file mode 100644 index 000000000000..301c3fdebb77 --- /dev/null +++ b/liblangtag/ExternalProject_langtag.mk @@ -0,0 +1,34 @@ +# -*- 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_ExternalProject_ExternalProject,langtag)) + +$(eval $(call gb_ExternalProject_use_unpacked,langtag,langtag)) + +$(eval $(call gb_ExternalProject_register_targets,langtag,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,langtag,build): + cd $(EXTERNAL_WORKDIR) \ + $(if $(filter MSC,$(COM)),&& export LIB="$(ILIB)") \ + && ./configure --disable-modules --disable-test --disable-introspection \ + $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + $(if $(filter NO,$(SYSTEM_LIBXML)),LIBXML2_CFLAGS="-I$(OUTDIR)/external" \ + $(if $(filter MSC,$(COM)),LIBXML2_LIBS="$(OUTDIR)/lib/libxml2.lib",LIBXML2_LIBS="-L$(OUTDIR)/lib -lxml2"),\ + $(if $(filter MACOSX,$(OS)),LIBXML2_CFLAGS="$(LIBXML_CFLAGS)" LIBXML2_LIBS="$(LIBXML_LIBS)")) \ + $(if $(filter MSC,$(COM)),CC="$(CC) -MD -nologo \ + $(if $(filter TRUE,$(ENABLE_DEBUG)),-Zi)") \ + $(if $(filter MSC,$(COM)),CFLAGS="$(SOLARINC)") \ + $(if $(filter-out LINUX FREEBSD,$(OS)),,LDFLAGS="-Wl,-z,origin -Wl,-rpath,$$ORIGIN:$$ORIGIN/../ure-link/lib") \ + $(if $(filter-out SOLARIS,$(OS)),,LDFLAGS="-Wl,-z,origin -Wl,-R,$$ORIGIN:$$ORIGIN/../ure-link/lib") \ + $(if $(filter-out WNTGCC,$(GUI)$(COM)),,LDFLAGS="-Wl,--enable-runtime-pseudo-reloc-v2") \ + && $(MAKE) \ + && touch $@ +# vim: set noet sw=4 ts=4: diff --git a/liblangtag/Makefile b/liblangtag/Makefile new file mode 100644 index 000000000000..ccb1c85a04da --- /dev/null +++ b/liblangtag/Makefile @@ -0,0 +1,7 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- + +module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) + +include $(module_directory)/../solenv/gbuild/partial_build.mk + +# vim: set noet sw=4 ts=4: diff --git a/liblangtag/Module_liblangtag.mk b/liblangtag/Module_liblangtag.mk new file mode 100644 index 000000000000..98c1c3b56279 --- /dev/null +++ b/liblangtag/Module_liblangtag.mk @@ -0,0 +1,24 @@ +# -*- 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_Module_Module,liblangtag)) + +ifeq ($(ENABLE_LIBLANGTAG),YES) +ifeq ($(SYSTEM_LIBLANGTAG),NO) +$(eval $(call gb_Module_add_targets,liblangtag,\ + UnpackedTarball_langtag \ + ExternalPackage_langtag \ + ExternalPackage_langtag_data \ + ExternalProject_langtag \ + Zip_liblangtag_data \ +)) +endif +endif + +# vim: set noet sw=4 ts=4: diff --git a/liblangtag/UnpackedTarball_langtag.mk b/liblangtag/UnpackedTarball_langtag.mk new file mode 100644 index 000000000000..1deea1327665 --- /dev/null +++ b/liblangtag/UnpackedTarball_langtag.mk @@ -0,0 +1,48 @@ +# -*- 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_UnpackedTarball_UnpackedTarball,langtag)) + +$(eval $(call gb_UnpackedTarball_set_tarball,langtag,$(LIBLANGTAG_TARBALL))) + +ifeq ($(OS),MACOSX) +$(eval $(call gb_UnpackedTarball_add_patches,langtag,\ + liblangtag/liblangtag-0.4.0-mac.patch \ + liblangtag/liblangtag-0.4.0-configure-atomic-cflag-pollution.patch \ +)) +else +$(eval $(call gb_UnpackedTarball_add_patches,langtag,\ + liblangtag/liblangtag-0.4.0-msvc-warning.patch \ + liblangtag/liblangtag-0.4.0-configure-atomic-cflag-pollution.patch \ + liblangtag/liblangtag-0.4.0-windows.patch \ + liblangtag/liblangtag-0.4.0-reg2xml-encoding-problem.patch \ + liblangtag/liblangtag-0.4.0-windows2.patch \ + liblangtag/liblangtag-0.4.0-msvcprojects.patch \ +)) +endif + +ifeq ($(CROSS_COMPILING),YES) +$(eval $(call gb_UnpackedTarball_add_patches,langtag,\ + liblangtag/liblangtag-0.4.0-cross.patch \ +)) +endif + +ifeq ($(GUI),WNT) +ifeq ($(COM),GCC) +$(eval $(call gb_UnpackedTarball_add_patches,langtag,\ + liblangtag/liblangtag-0.4.0-mingw.patch \ +)) +else +$(eval $(call gb_UnpackedTarball_add_patches,langtag,\ + liblangtag/liblangtag-0.4.0-msc-configure.patch \ + liblangtag/liblangtag-0.4.0-cross.patch \ +)) +endif +endif +# vim: set noet sw=4 ts=4: diff --git a/liblangtag/Zip_liblangtag_data.mk b/liblangtag/Zip_liblangtag_data.mk new file mode 100644 index 000000000000..382a2547633c --- /dev/null +++ b/liblangtag/Zip_liblangtag_data.mk @@ -0,0 +1,48 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Zip_Zip,liblangtag_data,$(call gb_UnpackedTarball_get_dir,langtag/data))) + +$(eval $(call gb_Zip_use_unpacked,liblangtag_data,langtag)) + +$(eval $(call gb_Zip_add_files,liblangtag_data,\ + language-subtag-registry.xml \ + common/bcp47/calendar.xml \ + common/bcp47/collation.xml \ + common/bcp47/currency.xml \ + common/bcp47/number.xml \ + common/bcp47/timezone.xml \ + common/bcp47/transform.xml \ + common/bcp47/transform_ime.xml \ + common/bcp47/transform_keyboard.xml \ + common/bcp47/transform_mt.xml \ + common/bcp47/transform_private_use.xml \ + common/bcp47/variant.xml \ + common/supplemental/likelySubtags.xml \ +)) + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/liblangtag/liblangtag-0.4.0-msvcprojects.patch b/liblangtag/liblangtag-0.4.0-msvcprojects.patch index 026a8bc26d5a..190d11796b77 100644 --- a/liblangtag/liblangtag-0.4.0-msvcprojects.patch +++ b/liblangtag/liblangtag-0.4.0-msvcprojects.patch @@ -21,682 +21,3 @@ #include "lt-messages.h" #include "lt-utils.h" ---- misc/liblangtag-0.4.0/msvs2008/liblangtag.sln 2012-11-06 23:10:33.138941754 +0100 -+++ misc/build/liblangtag-0.4.0/msvs2008/liblangtag.sln 2012-11-06 23:14:12.516267264 +0100 -@@ -1 +1,20 @@ --dummy -+ -+Microsoft Visual Studio Solution File, Format Version 10.00 -+# Visual Studio 2008 -+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblangtag", "liblangtag.vcproj", "{8991ACE9-2B73-4C10-BBC8-F16787132D98}" -+EndProject -+Global -+ GlobalSection(SolutionConfigurationPlatforms) = preSolution -+ Debug|Win32 = Debug|Win32 -+ Release|Win32 = Release|Win32 -+ EndGlobalSection -+ GlobalSection(ProjectConfigurationPlatforms) = postSolution -+ {8991ACE9-2B73-4C10-BBC8-F16787132D98}.Debug|Win32.ActiveCfg = Debug|Win32 -+ {8991ACE9-2B73-4C10-BBC8-F16787132D98}.Debug|Win32.Build.0 = Debug|Win32 -+ {8991ACE9-2B73-4C10-BBC8-F16787132D98}.Release|Win32.ActiveCfg = Release|Win32 -+ {8991ACE9-2B73-4C10-BBC8-F16787132D98}.Release|Win32.Build.0 = Release|Win32 -+ EndGlobalSection -+ GlobalSection(SolutionProperties) = preSolution -+ HideSolutionNode = FALSE -+ EndGlobalSection -+EndGlobal ---- misc/liblangtag-0.4.0/msvs2008/liblangtag.vcproj 2012-11-06 23:10:33.148941542 +0100 -+++ misc/build/liblangtag-0.4.0/msvs2008/liblangtag.vcproj 2012-11-06 23:14:12.516267264 +0100 -@@ -1 +1,452 @@ --dummy -+<?xml version="1.0" encoding="Windows-1252"?> -+<VisualStudioProject -+ ProjectType="Visual C++" -+ Version="9.00" -+ Name="liblangtag" -+ ProjectGUID="{8991ACE9-2B73-4C10-BBC8-F16787132D98}" -+ RootNamespace="liblangtag" -+ TargetFrameworkVersion="0" -+ > -+ <Platforms> -+ <Platform -+ Name="Win32" -+ /> -+ </Platforms> -+ <ToolFiles> -+ </ToolFiles> -+ <Configurations> -+ <Configuration -+ Name="Release|Win32" -+ OutputDirectory=".\Release" -+ IntermediateDirectory=".\Release" -+ ConfigurationType="4" -+ UseOfMFC="0" -+ ATLMinimizesCRunTimeLibraryUsage="false" -+ > -+ <Tool -+ Name="VCPreBuildEventTool" -+ /> -+ <Tool -+ Name="VCCustomBuildTool" -+ /> -+ <Tool -+ Name="VCXMLDataGeneratorTool" -+ /> -+ <Tool -+ Name="VCWebServiceProxyGeneratorTool" -+ /> -+ <Tool -+ Name="VCMIDLTool" -+ /> -+ <Tool -+ Name="VCCLCompilerTool" -+ Optimization="2" -+ InlineFunctionExpansion="1" -+ AdditionalIncludeDirectories="..;$(LIBXML_INCLUDE_DIR)" -+ PreprocessorDefinitions="NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;__LANGTAG_COMPILATION;REGDATADIR=\".\"ALIGNOF_VOID_P=8" -+ StringPooling="true" -+ RuntimeLibrary="2" -+ EnableFunctionLevelLinking="true" -+ TreatWChar_tAsBuiltInType="false" -+ RuntimeTypeInfo="true" -+ PrecompiledHeaderFile=".\Release/liblangtag.pch" -+ AssemblerListingLocation=".\Release/" -+ ObjectFile=".\Release/" -+ ProgramDataBaseFileName=".\Release/" -+ WarningLevel="3" -+ SuppressStartupBanner="true" -+ /> -+ <Tool -+ Name="VCManagedResourceCompilerTool" -+ /> -+ <Tool -+ Name="VCResourceCompilerTool" -+ /> -+ <Tool -+ Name="VCPreLinkEventTool" -+ /> -+ <Tool -+ Name="VCLibrarianTool" -+ OutputFile=".\Release\lib\liblangtag.lib" -+ SuppressStartupBanner="true" -+ /> -+ <Tool -+ Name="VCALinkTool" -+ /> -+ <Tool -+ Name="VCXDCMakeTool" -+ /> -+ <Tool -+ Name="VCBscMakeTool" -+ SuppressStartupBanner="true" -+ OutputFile=".\Release/liblangtag.bsc" -+ /> -+ <Tool -+ Name="VCFxCopTool" -+ /> -+ <Tool -+ Name="VCPostBuildEventTool" -+ /> -+ </Configuration> -+ <Configuration -+ Name="Debug|Win32" -+ OutputDirectory=".\Debug" -+ IntermediateDirectory=".\Debug" -+ ConfigurationType="4" -+ UseOfMFC="0" -+ ATLMinimizesCRunTimeLibraryUsage="false" -+ > -+ <Tool -+ Name="VCPreBuildEventTool" -+ /> -+ <Tool -+ Name="VCCustomBuildTool" -+ /> -+ <Tool -+ Name="VCXMLDataGeneratorTool" -+ /> -+ <Tool -+ Name="VCWebServiceProxyGeneratorTool" -+ /> -+ <Tool -+ Name="VCMIDLTool" -+ /> -+ <Tool -+ Name="VCCLCompilerTool" -+ Optimization="0" -+ AdditionalIncludeDirectories="..;$(LIBXML_INCLUDE_DIR)" -+ PreprocessorDefinitions="DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;__LANGTAG_COMPILATION;REGDATADIR=\".\"ALIGNOF_VOID_P=8" -+ BasicRuntimeChecks="3" -+ RuntimeLibrary="3" -+ TreatWChar_tAsBuiltInType="false" -+ RuntimeTypeInfo="true" -+ PrecompiledHeaderFile=".\Debug/liblangtag.pch" -+ AssemblerListingLocation=".\Debug/" -+ ObjectFile=".\Debug/" -+ ProgramDataBaseFileName=".\Debug/" -+ WarningLevel="3" -+ SuppressStartupBanner="true" -+ DebugInformationFormat="4" -+ /> -+ <Tool -+ Name="VCManagedResourceCompilerTool" -+ /> -+ <Tool -+ Name="VCResourceCompilerTool" -+ /> -+ <Tool -+ Name="VCPreLinkEventTool" -+ /> -+ <Tool -+ Name="VCLibrarianTool" -+ OutputFile=".\Debug\lib\liblangtag.lib" -+ SuppressStartupBanner="true" -+ /> -+ <Tool -+ Name="VCALinkTool" -+ /> -+ <Tool -+ Name="VCXDCMakeTool" -+ /> -+ <Tool -+ Name="VCBscMakeTool" -+ SuppressStartupBanner="true" -+ OutputFile=".\Debug/liblangtag.bsc" -+ /> -+ <Tool -+ Name="VCFxCopTool" -+ /> -+ <Tool -+ Name="VCPostBuildEventTool" -+ /> -+ </Configuration> -+ </Configurations> -+ <References> -+ </References> -+ <Files> -+ <Filter -+ Name="Source Files" -+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -+ > -+ <File -+ RelativePath="..\liblangtag\lt-database.c" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-error.c" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-ext-module-data.c" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-ext-module.c" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-extension.c" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-extlang-db.c" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-extlang.c" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-grandfathered-db.c" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-grandfathered.c" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-lang-db.c" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-lang.c" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-list.c" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-mem.c" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-messages.c" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-redundant-db.c" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-redundant.c" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-region-db.c" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-region.c" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-script-db.c" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-script.c" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-string.c" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-tag.c" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-trie.c" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-utils.c" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-variant-db.c" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-variant.c" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-xml.c" -+ > -+ </File> -+ </Filter> -+ <Filter -+ Name="Header Files" -+ Filter="h;hpp;hxx;hm;inl" -+ > -+ <File -+ RelativePath="..\liblangtag\langtag.h" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-atomic.h" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-database.h" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-error.h" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-ext-module-data.h" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-ext-module-private.h" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-ext-module.h" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-extension-private.h" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-extension.h" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-extlang-db.h" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-extlang-private.h" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-extlang.h" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-grandfathered-db.h" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-grandfathered-private.h" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-grandfathered.h" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-lang-db.h" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-lang-private.h" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-lang.h" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-list.h" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-localealias.h" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-macros.h" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-mem.h" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-messages.h" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-redundant-db.h" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-redundant-private.h" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-redundant.h" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-region-db.h" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-region-private.h" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-region.h" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-script-db.h" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-script-private.h" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-script.h" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-string.h" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-tag-private.h" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-tag.h" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-trie.h" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-utils.h" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-variant-db.h" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-variant-private.h" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-variant.h" -+ > -+ </File> -+ <File -+ RelativePath="..\liblangtag\lt-xml.h" -+ > -+ </File> -+ </Filter> -+ </Files> -+ <Globals> -+ </Globals> -+</VisualStudioProject> ---- misc/liblangtag-0.4.0/msvs2010/liblangtag.sln 2012-11-06 23:10:33.162941243 +0100 -+++ misc/build/liblangtag-0.4.0/msvs2010/liblangtag.sln 2012-11-06 23:14:20.905088613 +0100 -@@ -1 +1,19 @@ --dummy -+Microsoft Visual Studio Solution File, Format Version 11.00 -+# Visual Studio 2010 -+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblangtag", "liblangtag.vcxproj", "{8991ACE9-2B73-4C10-BBC8-F16787132D98}" -+EndProject -+Global -+ GlobalSection(SolutionConfigurationPlatforms) = preSolution -+ Debug|Win32 = Debug|Win32 -+ Release|Win32 = Release|Win32 -+ EndGlobalSection -+ GlobalSection(ProjectConfigurationPlatforms) = postSolution -+ {8991ACE9-2B73-4C10-BBC8-F16787132D98}.Debug|Win32.ActiveCfg = Debug|Win32 -+ {8991ACE9-2B73-4C10-BBC8-F16787132D98}.Debug|Win32.Build.0 = Debug|Win32 -+ {8991ACE9-2B73-4C10-BBC8-F16787132D98}.Release|Win32.ActiveCfg = Release|Win32 -+ {8991ACE9-2B73-4C10-BBC8-F16787132D98}.Release|Win32.Build.0 = Release|Win32 -+ EndGlobalSection -+ GlobalSection(SolutionProperties) = preSolution -+ HideSolutionNode = FALSE -+ EndGlobalSection -+EndGlobal ---- misc/liblangtag-0.4.0/msvs2010/liblangtag.vcxproj 2012-11-06 23:10:33.176940944 +0100 -+++ misc/build/liblangtag-0.4.0/msvs2010/liblangtag.vcxproj 2012-11-06 23:14:20.906088591 +0100 -@@ -1 +1,171 @@ --dummy -+<?xml version="1.0" encoding="utf-8"?> -+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> -+ <ItemGroup Label="ProjectConfigurations"> -+ <ProjectConfiguration Include="Debug|Win32"> -+ <Configuration>Debug</Configuration> -+ <Platform>Win32</Platform> -+ </ProjectConfiguration> -+ <ProjectConfiguration Include="Release|Win32"> -+ <Configuration>Release</Configuration> -+ <Platform>Win32</Platform> -+ </ProjectConfiguration> -+ </ItemGroup> -+ <PropertyGroup Label="Globals"> -+ <ProjectGuid>{8991ACE9-2B73-4C10-BBC8-F16787132D98}</ProjectGuid> -+ <RootNamespace>liblangtag</RootNamespace> -+ </PropertyGroup> -+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> -+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> -+ <ConfigurationType>StaticLibrary</ConfigurationType> -+ <UseOfMfc>false</UseOfMfc> -+ </PropertyGroup> -+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> -+ <ConfigurationType>StaticLibrary</ConfigurationType> -+ <UseOfMfc>false</UseOfMfc> -+ </PropertyGroup> -+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> -+ <ImportGroup Label="ExtensionSettings"> -+ </ImportGroup> -+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> -+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> -+ </ImportGroup> -+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> -+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> -+ </ImportGroup> -+ <PropertyGroup Label="UserMacros" /> -+ <PropertyGroup> -+ <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion> -+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir> -+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir> -+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir> -+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir> -+ </PropertyGroup> -+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> -+ <ClCompile> -+ <Optimization>MaxSpeed</Optimization> -+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> -+ <AdditionalIncludeDirectories>..;$(LIBXML_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> -+ <PreprocessorDefinitions>NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;__LANGTAG_COMPILATION;REGDATADIR="."ALIGNOF_VOID_P=8;%(PreprocessorDefinitions)</PreprocessorDefinitions> -+ <StringPooling>true</StringPooling> -+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> -+ <FunctionLevelLinking>true</FunctionLevelLinking> -+ <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType> -+ <RuntimeTypeInfo>true</RuntimeTypeInfo> -+ <PrecompiledHeaderOutputFile>.\Release/liblangtag.pch</PrecompiledHeaderOutputFile> -+ <AssemblerListingLocation>.\Release/</AssemblerListingLocation> -+ <ObjectFileName>.\Release/</ObjectFileName> -+ <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName> -+ <WarningLevel>Level3</WarningLevel> -+ <SuppressStartupBanner>true</SuppressStartupBanner> -+ </ClCompile> -+ <Lib> -+ <OutputFile>.\Release\lib\liblangtag.lib</OutputFile> -+ <SuppressStartupBanner>true</SuppressStartupBanner> -+ </Lib> -+ <Bscmake> -+ <SuppressStartupBanner>true</SuppressStartupBanner> -+ <OutputFile>.\Release/liblangtag.bsc</OutputFile> -+ </Bscmake> -+ </ItemDefinitionGroup> -+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> -+ <ClCompile> -+ <Optimization>Disabled</Optimization> -+ <AdditionalIncludeDirectories>..;$(LIBXML_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> -+ <PreprocessorDefinitions>DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;__LANGTAG_COMPILATION;REGDATADIR="."ALIGNOF_VOID_P=8;%(PreprocessorDefinitions)</PreprocessorDefinitions> -+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> -+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> -+ <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType> -+ <RuntimeTypeInfo>true</RuntimeTypeInfo> -+ <PrecompiledHeaderOutputFile>.\Debug/liblangtag.pch</PrecompiledHeaderOutputFile> -+ <AssemblerListingLocation>.\Debug/</AssemblerListingLocation> -+ <ObjectFileName>.\Debug/</ObjectFileName> -+ <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName> -+ <WarningLevel>Level3</WarningLevel> -+ <SuppressStartupBanner>true</SuppressStartupBanner> -+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat> -+ </ClCompile> -+ <Lib> -+ <OutputFile>.\Debug\lib\liblangtag.lib</OutputFile> -+ <SuppressStartupBanner>true</SuppressStartupBanner> -+ </Lib> -+ <Bscmake> -+ <SuppressStartupBanner>true</SuppressStartupBanner> -+ <OutputFile>.\Debug/liblangtag.bsc</OutputFile> -+ </Bscmake> -+ </ItemDefinitionGroup> -+ <ItemGroup> -+ <ClCompile Include="..\liblangtag\lt-database.c" /> -+ <ClCompile Include="..\liblangtag\lt-error.c" /> -+ <ClCompile Include="..\liblangtag\lt-ext-module-data.c" /> -+ <ClCompile Include="..\liblangtag\lt-ext-module.c" /> -+ <ClCompile Include="..\liblangtag\lt-extension.c" /> -+ <ClCompile Include="..\liblangtag\lt-extlang-db.c" /> -+ <ClCompile Include="..\liblangtag\lt-extlang.c" /> -+ <ClCompile Include="..\liblangtag\lt-grandfathered-db.c" /> -+ <ClCompile Include="..\liblangtag\lt-grandfathered.c" /> -+ <ClCompile Include="..\liblangtag\lt-lang-db.c" /> -+ <ClCompile Include="..\liblangtag\lt-lang.c" /> -+ <ClCompile Include="..\liblangtag\lt-list.c" /> -+ <ClCompile Include="..\liblangtag\lt-mem.c" /> -+ <ClCompile Include="..\liblangtag\lt-messages.c" /> -+ <ClCompile Include="..\liblangtag\lt-redundant-db.c" /> -+ <ClCompile Include="..\liblangtag\lt-redundant.c" /> -+ <ClCompile Include="..\liblangtag\lt-region-db.c" /> -+ <ClCompile Include="..\liblangtag\lt-region.c" /> -+ <ClCompile Include="..\liblangtag\lt-script-db.c" /> -+ <ClCompile Include="..\liblangtag\lt-script.c" /> -+ <ClCompile Include="..\liblangtag\lt-string.c" /> -+ <ClCompile Include="..\liblangtag\lt-tag.c" /> -+ <ClCompile Include="..\liblangtag\lt-trie.c" /> -+ <ClCompile Include="..\liblangtag\lt-utils.c" /> -+ <ClCompile Include="..\liblangtag\lt-variant-db.c" /> -+ <ClCompile Include="..\liblangtag\lt-variant.c" /> -+ <ClCompile Include="..\liblangtag\lt-xml.c" /> -+ </ItemGroup> -+ <ItemGroup> -+ <ClInclude Include="..\liblangtag\langtag.h" /> -+ <ClInclude Include="..\liblangtag\lt-atomic.h" /> -+ <ClInclude Include="..\liblangtag\lt-database.h" /> -+ <ClInclude Include="..\liblangtag\lt-error.h" /> -+ <ClInclude Include="..\liblangtag\lt-ext-module-data.h" /> -+ <ClInclude Include="..\liblangtag\lt-ext-module-private.h" /> -+ <ClInclude Include="..\liblangtag\lt-ext-module.h" /> -+ <ClInclude Include="..\liblangtag\lt-extension-private.h" /> -+ <ClInclude Include="..\liblangtag\lt-extension.h" /> -+ <ClInclude Include="..\liblangtag\lt-extlang-db.h" /> -+ <ClInclude Include="..\liblangtag\lt-extlang-private.h" /> -+ <ClInclude Include="..\liblangtag\lt-extlang.h" /> -+ <ClInclude Include="..\liblangtag\lt-grandfathered-db.h" /> -+ <ClInclude Include="..\liblangtag\lt-grandfathered-private.h" /> -+ <ClInclude Include="..\liblangtag\lt-grandfathered.h" /> -+ <ClInclude Include="..\liblangtag\lt-lang-db.h" /> -+ <ClInclude Include="..\liblangtag\lt-lang-private.h" /> -+ <ClInclude Include="..\liblangtag\lt-lang.h" /> -+ <ClInclude Include="..\liblangtag\lt-list.h" /> -+ <ClInclude Include="..\liblangtag\lt-localealias.h" /> -+ <ClInclude Include="..\liblangtag\lt-macros.h" /> -+ <ClInclude Include="..\liblangtag\lt-mem.h" /> -+ <ClInclude Include="..\liblangtag\lt-messages.h" /> -+ <ClInclude Include="..\liblangtag\lt-redundant-db.h" /> -+ <ClInclude Include="..\liblangtag\lt-redundant-private.h" /> -+ <ClInclude Include="..\liblangtag\lt-redundant.h" /> -+ <ClInclude Include="..\liblangtag\lt-region-db.h" /> -+ <ClInclude Include="..\liblangtag\lt-region-private.h" /> -+ <ClInclude Include="..\liblangtag\lt-region.h" /> -+ <ClInclude Include="..\liblangtag\lt-script-db.h" /> -+ <ClInclude Include="..\liblangtag\lt-script-private.h" /> -+ <ClInclude Include="..\liblangtag\lt-script.h" /> -+ <ClInclude Include="..\liblangtag\lt-string.h" /> -+ <ClInclude Include="..\liblangtag\lt-tag-private.h" /> -+ <ClInclude Include="..\liblangtag\lt-tag.h" /> -+ <ClInclude Include="..\liblangtag\lt-trie.h" /> -+ <ClInclude Include="..\liblangtag\lt-utils.h" /> -+ <ClInclude Include="..\liblangtag\lt-variant-db.h" /> -+ <ClInclude Include="..\liblangtag\lt-variant-private.h" /> -+ <ClInclude Include="..\liblangtag\lt-variant.h" /> -+ <ClInclude Include="..\liblangtag\lt-xml.h" /> -+ </ItemGroup> -+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> -+ <ImportGroup Label="ExtensionTargets"> -+ </ImportGroup> -+</Project> -\ No newline at end of file diff --git a/liblangtag/makefile.mk b/liblangtag/makefile.mk deleted file mode 100644 index 6c4db055cd5b..000000000000 --- a/liblangtag/makefile.mk +++ /dev/null @@ -1,156 +0,0 @@ -# -# Copyright 2012 LibreOffice contributors. -# -# 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/. -# - -PRJ=. - -PRJNAME=liblangtag -TARGET=liblangtag - -LIBLANGTAG_MAJOR=0 -LIBLANGTAG_MINOR=4 -LIBLANGTAG_MICRO=0 -# Currently liblangtag.so.0.1.0 is generated instead of 0.2.0, presumably a bug? -# For new versions adapt symlink in prj/d.lst -# Version is currently hardcoded in scp2/source/ooo/file_library_ooo.scp -# section gid_File_Lib_Langtag, adapt for new versions, or introduce -# LIBLANGTAG_M* in configure! - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -.IF "$(ENABLE_LIBLANGTAG)" != "YES" || "$(SYSTEM_LIBLANGTAG)" == "YES" -@all: - @echo "Not building liblangtag." -.ENDIF - -TARFILE_NAME=liblangtag-$(LIBLANGTAG_MAJOR).$(LIBLANGTAG_MINOR).$(LIBLANGTAG_MICRO) -TARFILE_MD5=54e578c91b1b68e69c72be22adcb2195 - -ADDITIONAL_FILES=\ - msvs2008$/liblangtag.sln msvs2008$/liblangtag.vcproj \ - msvs2010$/liblangtag.sln msvs2010$/liblangtag.vcxproj - -PATCH_FILES=liblangtag-0.4.0-msvc-warning.patch -PATCH_FILES+=liblangtag-0.4.0-configure-atomic-cflag-pollution.patch -PATCH_FILES+=liblangtag-0.4.0-windows.patch -PATCH_FILES+=liblangtag-0.4.0-reg2xml-encoding-problem.patch -PATCH_FILES+=liblangtag-0.4.0-windows2.patch -PATCH_FILES+=liblangtag-0.4.0-msvcprojects.patch -.IF "$(OS)" == "MACOSX" -PATCH_FILES=liblangtag-0.4.0-mac.patch -PATCH_FILES+=liblangtag-0.4.0-configure-atomic-cflag-pollution.patch -.END -CONFIGURE_DIR=. -BUILD_DIR=$(CONFIGURE_DIR) -CONFIGURE_FLAGS= --disable-modules --disable-test - -.IF "$(OS)" == "MACOSX" -my_prefix = @.__________________________________________________$(EXTRPATH) -.ELSE -my_prefix = install-liblangtag -.END -my_misc = $(shell @pwd)/$(MISC) -my_install_sub = install -my_destdir = $(my_misc)/$(my_install_sub) -my_install = $(my_destdir)/$(my_prefix) -# relative to $(MISC)/build/liblangtag/ for OUT2LIB, OUT2INC -my_install_relative = ../../$(my_install_sub)/$(my_prefix) -my_data = $(my_install)/share/liblangtag - -CONFIGURE_FLAGS+= --prefix='/$(my_prefix)' --libdir='/$(my_prefix)/lib' - -# g-ir-scanner is dumb enough to turn CC=ccache gcc into trying -# to execve an app literal of "ccache gcc" including the space. -CONFIGURE_FLAGS+= --disable-introspection - -.IF "$(SYSTEM_LIBXML)"!="YES" -CONFIGURE_FLAGS+= LIBXML2_CFLAGS='-I$(SOLARINCDIR)/external' -.IF "$(GUI)"=="WNT" && "$(COM)"!="GCC" -CONFIGURE_FLAGS+= LIBXML2_LIBS='$(SOLARLIBDIR)/libxml2.lib' -CC!:=$(CC) -MD -nologo -.IF "$(debug)"=="TRUE" -CC!:=$(CC) -Zi -.ENDIF -.ELSE -CONFIGURE_FLAGS+= LIBXML2_LIBS='-L$(SOLARLIBDIR) -lxml2' -.ENDIF -.ELSE -.IF "$(OS)" == "MACOSX" -CONFIGURE_FLAGS+= LIBXML2_CFLAGS='$(LIBXML_CFLAGS)' LIBXML2_LIBS='$(LIBXML_LIBS)' --disable-modules -.ENDIF -.ENDIF - -CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) ./configure - -BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) $(eq,$(VERBOSE),TRUE V=1) && \ - $(AUGMENT_LIBRARY_PATH) $(GNUMAKE) install DESTDIR=$(my_destdir) - -.IF "$(SYSTEM_LIBXML)"!="YES" -.IF "$(OS)"=="FREEBSD" || "$(OS)"=="LINUX" -CONFIGURE_FLAGS+= \ - LDFLAGS=-Wl,-z,origin\ -Wl,-rpath,\'\$$\$$ORIGIN:\$$\$$ORIGIN/../ure-link/lib\' -.ELIF "$(OS)"=="SOLARIS" -CONFIGURE_FLAGS+= LDFLAGS=-Wl,-R\'\$$\$$ORIGIN:\$$\$$ORIGIN/../ure-link/lib\' -.END -.END - -.IF "$(GUI)"=="WNT" -.IF "$(COM)"=="GCC" - -CONFIGURE_FLAGS+= LDFLAGS=-Wl,--enable-runtime-pseudo-reloc-v2 - -PATCH_FILES+=liblangtag-0.4.0-mingw.patch - -.ELSE # "$(COM)"=="GCC" - -PATCH_FILES+=liblangtag-0.4.0-msc-configure.patch -PATCH_FILES+=liblangtag-0.4.0-cross.patch - -.ENDIF # "$(COM)"=="GCC" -.ENDIF # "$(GUI)"=="WNT" - -.IF "$(CROSS_COMPILING)"=="YES" -# There's a tool used only at build time to create the .xml file, and this does not work -# with cross-compiling. The file for this case is from a normal (non-cross) build. -PATCH_FILES+=liblangtag-0.4.0-cross.patch -CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) -.ENDIF - -OUT2INC += $(my_install_relative)/include/liblangtag/* - -.IF "$(GUI)"=="WNT" -.IF "$(COM)"=="GCC" -OUT2BIN += $(my_install_relative)/bin/liblangtag-1.dll -OUT2LIB += $(my_install_relative)/lib/liblangtag.dll.a -.ELSE -OUT2LIB += $(my_install_relative)/lib/langtag.lib* -.ENDIF -.ELSE -.IF "$(OS)" == "MACOSX" -OUT2LIB += $(my_install_relative)/lib/liblangtag*.dylib -.ELSE -OUT2LIB += $(my_install_relative)/lib/liblangtag.so* -.ENDIF -.ENDIF - - -# --- Targets ------------------------------------------------------ - -ALLTAR: $(MISC)/liblangtag_data.zip - -.INCLUDE : set_ext.mk -.INCLUDE : target.mk -.INCLUDE : tg_ext.mk - -$(MISC)/liblangtag_data.zip: $(PACKAGE_DIR)/$(PREDELIVER_FLAG_FILE) - @-rm -f $@ - @echo creating $@ - $(COMMAND_ECHO)cd $(my_data) && zip $(ZIP_VERBOSITY) -r $(my_misc)/$(@:f) * diff --git a/liblangtag/prj/d.lst b/liblangtag/prj/d.lst index eb9b32c4c19b..e69de29bb2d1 100644 --- a/liblangtag/prj/d.lst +++ b/liblangtag/prj/d.lst @@ -1,25 +0,0 @@ -mkdir: %_DEST%\inc\liblangtag - -..\%__SRC%\inc\* %_DEST%\inc\liblangtag\ -..\%__SRC%\bin\liblangtag-*.dll %_DEST%\bin\ -..\%__SRC%\lib\liblangtag.so* %_DEST%\lib\ -..\%__SRC%\lib\langtag.lib* %_DEST%\lib\ -..\%__SRC%\lib\liblangtag*.dylib %_DEST%\lib\ -..\%__SRC%\lib\liblangtag.dll.a %_DEST%\lib\ -..\%__SRC%\misc\liblangtag_data.zip %_DEST%\pck\ - -symlink: %_DEST%\lib\liblangtag.so.1.0.0 %_DEST%\lib\liblangtag.so.1 -symlink: %_DEST%\lib\liblangtag.so.1.0.0 %_DEST%\lib\liblangtag.so - -# Unpacked data needed for test_languagetag in i18npool. -mkdir: %_DEST%\share -mkdir: %_DEST%\share\liblangtag -mkdir: %_DEST%\share\liblangtag\common -mkdir: %_DEST%\share\liblangtag\common\bcp47 -mkdir: %_DEST%\share\liblangtag\common\supplemental -..\%__SRC%\misc\install\install-liblangtag\share\liblangtag\* %_DEST%\share\liblangtag\ -..\%__SRC%\misc\install\install-liblangtag\share\liblangtag\common\bcp47\* %_DEST%\share\liblangtag\common\bcp47\ -..\%__SRC%\misc\install\install-liblangtag\share\liblangtag\common\supplemental\* %_DEST%\share\liblangtag\common\supplemental\ -..\%__SRC%\misc\install\@.__________________________________________________OOO\share\liblangtag\* %_DEST%\share\liblangtag\ -..\%__SRC%\misc\install\@.__________________________________________________OOO\share\liblangtag\common\bcp47\* %_DEST%\share\liblangtag\common\bcp47\ -..\%__SRC%\misc\install\@.__________________________________________________OOO\share\liblangtag\common\supplemental\* %_DEST%\share\liblangtag\common\supplemental\ diff --git a/liblangtag/prj/dmake b/liblangtag/prj/dmake deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/liblangtag/prj/dmake +++ /dev/null diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 85fd67825195..488664294628 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -45,6 +45,7 @@ gb_PackagePart_get_destinations = \ $(OUTDIR)/par \ $(OUTDIR)/pck \ $(OUTDIR)/rdb \ + $(OUTDIR)/share \ $(OUTDIR)/unittest \ $(OUTDIR)/xml \ diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst index 383136ce0678..653adf9a9d76 100644 --- a/tail_build/prj/build.lst +++ b/tail_build/prj/build.lst @@ -1,2 +1,2 @@ -tb tail_build : BERKELEYDB:berkeleydb CAIRO:cairo CPPUNIT:cppunit EXPAT:expat ICU:icu JPEG:jpeg LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt MOZ:moz NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland XPDF:xpdf ZLIB:zlib external solenv soltools NULL +tb tail_build : BERKELEYDB:berkeleydb CAIRO:cairo CPPUNIT:cppunit EXPAT:expat ICU:icu JPEG:jpeg LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt MOZ:moz NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland XPDF:xpdf ZLIB:zlib external solenv soltools NULL tb tail_build\prj nmake - all tb_prj NULL |