mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tools: just generate the complete reversemap.cxx

Browse Source 
This makes tools pch ready.

Change-Id: I8d5d5fcbb417f3790749aeb9d9c947f739ecb30f
This commit is contained in:
Thomas Arnhold
2014-05-21 09:38:38 +02:00
parent 8449225508
commit d3041640a0
4 changed files with 11 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/CustomTarget_reversemap.mk
View File

@@ -6,14 +6,14 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
# #
$(eval $(call gb_CustomTarget_CustomTarget,tools/reversemap)) $(eval $(call gb_CustomTarget_CustomTarget,tools/string))
$(call gb_CustomTarget_get_target,tools/reversemap) : \ $(call gb_CustomTarget_get_target,tools/string) : \
$(call gb_CustomTarget_get_workdir,tools/reversemap)/reversemap.hxx $(call gb_CustomTarget_get_workdir,tools/string)/reversemap.cxx
$(call gb_CustomTarget_get_workdir,tools/reversemap)/reversemap.hxx : \ $(call gb_CustomTarget_get_workdir,tools/string)/reversemap.cxx : \
$(call gb_Executable_get_runtime_dependencies,bestreversemap) \ $(call gb_Executable_get_runtime_dependencies,bestreversemap) \
| $(call gb_CustomTarget_get_workdir,tools/reversemap)/.dir | $(call gb_CustomTarget_get_workdir,tools/string)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),BRM,1) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),BRM,1)
$(call gb_Helper_execute,bestreversemap > $@) $(call gb_Helper_execute,bestreversemap > $@)

7
tools/Library_tl.mk
View File

@@ -19,8 +19,6 @@
$(eval $(call gb_Library_Library,tl)) $(eval $(call gb_Library_Library,tl))
$(eval $(call gb_Library_use_custom_headers,tl,tools/reversemap))
$(eval $(call gb_Library_set_include,tl,\ $(eval $(call gb_Library_set_include,tl,\
-I$(SRCDIR)/tools/inc \ -I$(SRCDIR)/tools/inc \
$$(INCLUDE) \ $$(INCLUDE) \
@@ -83,10 +81,13 @@ $(eval $(call gb_Library_add_exception_objects,tl,\
tools/source/stream/strmsys \ tools/source/stream/strmsys \
tools/source/stream/vcompat \ tools/source/stream/vcompat \
tools/source/string/tenccvt \ tools/source/string/tenccvt \
tools/source/string/reversemap \
tools/source/zcodec/zcodec \ tools/source/zcodec/zcodec \
)) ))
$(eval $(call gb_Library_add_generated_exception_objects,tl,\
CustomTarget/tools/string/reversemap \
))
$(eval $(call gb_Library_use_externals,tl,\ $(eval $(call gb_Library_use_externals,tl,\
boost_headers \ boost_headers \
zlib \ zlib \

2
tools/source/reversemap/bestreversemap.cxx
View File

@@ -80,6 +80,8 @@ int main()
}; };
printf("//Do not edit manually, generated from bestreversemap.cxx\n"); printf("//Do not edit manually, generated from bestreversemap.cxx\n");
printf("#include <rtl/textenc.h>\n");
printf("#include <tools/tenccvt.hxx>\n");
printf("rtl_TextEncoding getBestMSEncodingByChar(sal_Unicode c)\n"); printf("rtl_TextEncoding getBestMSEncodingByChar(sal_Unicode c)\n");
printf("{\n"); printf("{\n");

17
tools/source/string/reversemap.cxx
View File

@@ -1,17 +0,0 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* 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/.
*/
#include <rtl/textenc.h>
#include <tools/tenccvt.hxx>
//Use reverse map generated at buildtime via bestreversemap
#include "reversemap.hxx"
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */