From 3e0b2299ecbd7e532771a32af55a8f7910ba6688 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Wed, 2 May 2012 20:16:10 +0200 Subject: gbuild conversion l10ntools module Change-Id: I Iea9a77f19856dd870eb72fa57249f959cdd7000c --- l10ntools/Executable_cfgex.mk | 50 +++++++++++ l10ntools/Executable_gsicheck.mk | 43 +++++++++ l10ntools/Executable_helpex.mk | 50 +++++++++++ l10ntools/Executable_helpindexer.mk | 50 +++++++++++ l10ntools/Executable_helplinker.mk | 50 +++++++++++ l10ntools/Executable_localize.mk | 37 ++++++++ l10ntools/Executable_transex3.mk | 50 +++++++++++ l10ntools/Executable_ulfex.mk | 47 ++++++++++ l10ntools/Executable_xrmex.mk | 50 +++++++++++ l10ntools/Jar_FCFGMerge.mk | 48 ++++++++++ l10ntools/Library_helplinker.mk | 68 ++++++++++++++ l10ntools/Makefile | 7 ++ l10ntools/Module_l10ntools.mk | 46 ++++++++++ l10ntools/Package_inc.mk | 40 +++++++++ l10ntools/Package_scripts.mk | 38 ++++++++ l10ntools/StaticLibrary_transex.mk | 42 +++++++++ l10ntools/inc/l10ntools/HelpLinker.hxx | 107 +++++++++++++++++++++++ l10ntools/inc/makefile.mk | 40 --------- l10ntools/prj/build.lst | 8 +- l10ntools/prj/d.lst | 59 ------------- l10ntools/prj/dmake | 0 l10ntools/source/cfglex.l | 23 ++--- l10ntools/source/cfgmerge.cxx | 2 +- l10ntools/source/export.cxx | 4 +- l10ntools/source/filter/merge/makefile.mk | 79 ----------------- l10ntools/source/filter/utils/makefile.mk | 53 ----------- l10ntools/source/help/HelpLinker.cxx | 99 +++------------------ l10ntools/source/help/HelpLinker_main.cxx | 51 +++++++++++ l10ntools/source/help/helplinker.pmk | 31 ------- l10ntools/source/help/makefile.mk | 116 ------------------------ l10ntools/source/makefile.mk | 141 ------------------------------ l10ntools/source/srclex.l | 28 +++--- l10ntools/source/xrmlex.l | 38 ++++---- l10ntools/source/xrmmerge.cxx | 4 +- 34 files changed, 939 insertions(+), 660 deletions(-) create mode 100644 l10ntools/Executable_cfgex.mk create mode 100644 l10ntools/Executable_gsicheck.mk create mode 100644 l10ntools/Executable_helpex.mk create mode 100644 l10ntools/Executable_helpindexer.mk create mode 100644 l10ntools/Executable_helplinker.mk create mode 100644 l10ntools/Executable_localize.mk create mode 100644 l10ntools/Executable_transex3.mk create mode 100644 l10ntools/Executable_ulfex.mk create mode 100644 l10ntools/Executable_xrmex.mk create mode 100644 l10ntools/Jar_FCFGMerge.mk create mode 100644 l10ntools/Library_helplinker.mk create mode 100644 l10ntools/Makefile create mode 100644 l10ntools/Module_l10ntools.mk create mode 100644 l10ntools/Package_inc.mk create mode 100644 l10ntools/Package_scripts.mk create mode 100644 l10ntools/StaticLibrary_transex.mk create mode 100644 l10ntools/inc/l10ntools/HelpLinker.hxx delete mode 100644 l10ntools/inc/makefile.mk delete mode 100644 l10ntools/prj/dmake delete mode 100644 l10ntools/source/filter/merge/makefile.mk delete mode 100644 l10ntools/source/filter/utils/makefile.mk create mode 100644 l10ntools/source/help/HelpLinker_main.cxx delete mode 100644 l10ntools/source/help/helplinker.pmk delete mode 100644 l10ntools/source/help/makefile.mk delete mode 100644 l10ntools/source/makefile.mk (limited to 'l10ntools') diff --git a/l10ntools/Executable_cfgex.mk b/l10ntools/Executable_cfgex.mk new file mode 100644 index 000000000000..82506196cbe6 --- /dev/null +++ b/l10ntools/Executable_cfgex.mk @@ -0,0 +1,50 @@ +# -*- 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 David Ostrovsky (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_Executable_Executable,cfgex)) + +$(eval $(call gb_Executable_set_include,cfgex,\ + -I$(SRCDIR)/l10ntools/inc \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Executable_use_libraries,cfgex,\ + sal \ +)) + +$(eval $(call gb_Executable_add_scanners,cfgex,\ + l10ntools/source/cfglex \ +)) + +$(eval $(call gb_Executable_use_static_libraries,cfgex,\ + transex \ +)) + +$(eval $(call gb_Executable_add_cxxobjects,cfgex,\ + l10ntools/source/cfgmerge \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/l10ntools/Executable_gsicheck.mk b/l10ntools/Executable_gsicheck.mk new file mode 100644 index 000000000000..06151d36a452 --- /dev/null +++ b/l10ntools/Executable_gsicheck.mk @@ -0,0 +1,43 @@ +# -*- 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 David Ostrovsky (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_Executable_Executable,gsicheck)) + +$(eval $(call gb_Executable_set_include,gsicheck,\ + -I$(SRCDIR)/l10ntools/inc \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Executable_use_libraries,gsicheck,\ + sal \ +)) + +$(eval $(call gb_Executable_add_cxxobjects,gsicheck,\ + l10ntools/source/gsicheck \ + l10ntools/source/tagtest \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/l10ntools/Executable_helpex.mk b/l10ntools/Executable_helpex.mk new file mode 100644 index 000000000000..42779bf83e35 --- /dev/null +++ b/l10ntools/Executable_helpex.mk @@ -0,0 +1,50 @@ +# -*- 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 David Ostrovsky (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_Executable_Executable,helpex)) + +$(eval $(call gb_Executable_set_include,helpex,\ + -I$(SRCDIR)/l10ntools/inc \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Executable_use_libraries,helpex,\ + sal \ +)) + +$(eval $(call gb_Executable_use_external,helpex,expat_utf8)) + +$(eval $(call gb_Executable_use_static_libraries,helpex,\ + transex \ +)) + +$(eval $(call gb_Executable_add_cxxobjects,helpex,\ + l10ntools/source/helpex \ + l10ntools/source/xmlparse \ + l10ntools/source/helpmerge \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/l10ntools/Executable_helpindexer.mk b/l10ntools/Executable_helpindexer.mk new file mode 100644 index 000000000000..71e73e78a801 --- /dev/null +++ b/l10ntools/Executable_helpindexer.mk @@ -0,0 +1,50 @@ +# -*- 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 David Ostrovsky (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_Executable_Executable,HelpIndexer)) + +$(eval $(call gb_Executable_use_package,HelpIndexer,\ + l10ntools_inc \ +)) + +$(eval $(call gb_Executable_use_libraries,HelpIndexer,\ + sal \ + helplinker \ +)) + +$(eval $(call gb_Executable_use_externals,HelpIndexer,\ + expat_utf8 \ + libxslt \ + libxml2 \ + berkeleydb \ + clucene \ +)) + +$(eval $(call gb_Executable_add_cxxobjects,HelpIndexer,\ + l10ntools/source/help/HelpIndexer_main \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/l10ntools/Executable_helplinker.mk b/l10ntools/Executable_helplinker.mk new file mode 100644 index 000000000000..443a82152b1c --- /dev/null +++ b/l10ntools/Executable_helplinker.mk @@ -0,0 +1,50 @@ +# -*- 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 David Ostrovsky (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_Executable_Executable,HelpLinker)) + +$(eval $(call gb_Executable_use_package,HelpLinker,\ + l10ntools_inc \ +)) + +$(eval $(call gb_Executable_use_libraries,HelpLinker,\ + sal \ + helplinker \ +)) + +$(eval $(call gb_Executable_use_externals,HelpLinker,\ + expat_utf8 \ + libxslt \ + libxml2 \ + berkeleydb \ + clucene \ +)) + +$(eval $(call gb_Executable_add_cxxobjects,HelpLinker,\ + l10ntools/source/help/HelpLinker_main \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/l10ntools/Executable_localize.mk b/l10ntools/Executable_localize.mk new file mode 100644 index 000000000000..57d0c719a732 --- /dev/null +++ b/l10ntools/Executable_localize.mk @@ -0,0 +1,37 @@ +# -*- 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 David Ostrovsky (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_Executable_Executable,localize)) + +$(eval $(call gb_Executable_use_libraries,localize,\ + sal \ +)) + +$(eval $(call gb_Executable_add_cxxobjects,localize,\ + l10ntools/source/localize \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/l10ntools/Executable_transex3.mk b/l10ntools/Executable_transex3.mk new file mode 100644 index 000000000000..b94b2b4a5c73 --- /dev/null +++ b/l10ntools/Executable_transex3.mk @@ -0,0 +1,50 @@ +# -*- 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 David Ostrovsky (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_Executable_Executable,transex3)) + +$(eval $(call gb_Executable_set_include,transex3,\ + -I$(SRCDIR)/l10ntools/inc \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Executable_use_libraries,transex3,\ + sal \ +)) + +$(eval $(call gb_Executable_add_scanners,transex3,\ + l10ntools/source/srclex \ +)) + +$(eval $(call gb_Executable_use_static_libraries,transex3,\ + transex \ +)) + +$(eval $(call gb_Executable_add_cxxobjects,transex3,\ + l10ntools/source/export \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/l10ntools/Executable_ulfex.mk b/l10ntools/Executable_ulfex.mk new file mode 100644 index 000000000000..9dad3591c1ba --- /dev/null +++ b/l10ntools/Executable_ulfex.mk @@ -0,0 +1,47 @@ +# -*- 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 David Ostrovsky (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_Executable_Executable,ulfex)) + +$(eval $(call gb_Executable_set_include,ulfex,\ + -I$(SRCDIR)/l10ntools/inc \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Executable_use_libraries,ulfex,\ + sal \ +)) + +$(eval $(call gb_Executable_use_static_libraries,ulfex,\ + transex \ +)) + +$(eval $(call gb_Executable_add_cxxobjects,ulfex,\ + l10ntools/source/lngmerge \ + l10ntools/source/lngex \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/l10ntools/Executable_xrmex.mk b/l10ntools/Executable_xrmex.mk new file mode 100644 index 000000000000..36760551be9c --- /dev/null +++ b/l10ntools/Executable_xrmex.mk @@ -0,0 +1,50 @@ +# -*- 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 David Ostrovsky (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_Executable_Executable,xrmex)) + +$(eval $(call gb_Executable_set_include,xrmex,\ + -I$(SRCDIR)/l10ntools/inc \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Executable_use_libraries,xrmex,\ + sal \ +)) + +$(eval $(call gb_Executable_add_scanners,xrmex,\ + l10ntools/source/xrmlex \ +)) + +$(eval $(call gb_Executable_use_static_libraries,xrmex,\ + transex \ +)) + +$(eval $(call gb_Executable_add_cxxobjects,xrmex,\ + l10ntools/source/xrmmerge \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/l10ntools/Jar_FCFGMerge.mk b/l10ntools/Jar_FCFGMerge.mk new file mode 100644 index 000000000000..7719f5f0d014 --- /dev/null +++ b/l10ntools/Jar_FCFGMerge.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 David Ostrovsky (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_Jar_Jar,FCFGMerge)) + +$(eval $(call gb_Jar_set_packageroot,FCFGMerge,com)) + +$(eval $(call gb_Jar_set_manifest,FCFGMerge,$(SRCDIR)/l10ntools/source/filter/merge/Manifest.mf)) + +$(eval $(call gb_Jar_add_sourcefiles,FCFGMerge,\ + l10ntools/source/filter/merge/FCFGMerge \ + l10ntools/source/filter/merge/Merger \ + l10ntools/source/filter/utils/AnalyzeStartupLog \ + l10ntools/source/filter/utils/Cache \ + l10ntools/source/filter/utils/ConfigHelper \ + l10ntools/source/filter/utils/FileHelper \ + l10ntools/source/filter/utils/Logger \ + l10ntools/source/filter/utils/MalformedCommandLineException \ + l10ntools/source/filter/utils/XMLHelper \ +)) + +$(eval $(call gb_Jar_add_packagefile,FCFGMerge,\ + com/sun/star/filter/config/tools/merge/FCFGMerge.cfg,\ + $(SRCDIR)/l10ntools/source/filter/merge/FCFGMerge.cfg \ +)) diff --git a/l10ntools/Library_helplinker.mk b/l10ntools/Library_helplinker.mk new file mode 100644 index 000000000000..8cabe50768aa --- /dev/null +++ b/l10ntools/Library_helplinker.mk @@ -0,0 +1,68 @@ +# -*- 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 David Ostrovsky (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_Library_Library,helplinker)) + +$(eval $(call gb_Library_use_package,helplinker,\ + l10ntools_inc\ +)) + +$(eval $(call gb_Library_add_defs,helplinker,\ + -DL10N_DLLIMPLEMENTATION \ + -DHELPLINKER_DLLIMPLEMENTATION \ +)) + +$(eval $(call gb_Library_use_libraries,helplinker,\ + sal \ +)) + +$(eval $(call gb_Library_use_externals,helplinker,\ + berkeleydb \ + expat_utf8 \ + libxslt \ + libxml2 \ + clucene \ +)) + +$(eval $(call gb_Library_add_exception_objects,helplinker,\ + l10ntools/source/help/HelpCompiler \ + l10ntools/source/help/LuceneHelper \ + l10ntools/source/help/HelpIndexer \ + l10ntools/source/help/HelpSearch \ +)) + +ifeq ($(strip $(OS)$(CPU)$(COM)),MACOSXPGCC) +$(eval $(call gb_Library_add_cxxobjects,helplinker,\ + l10ntools/source/help/HelpLinker \ + , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ +)) +else +$(eval $(call gb_Library_add_exception_objects,helplinker,\ + l10ntools/source/help/HelpLinker \ +)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/l10ntools/Makefile b/l10ntools/Makefile new file mode 100644 index 000000000000..ccb1c85a04da --- /dev/null +++ b/l10ntools/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/l10ntools/Module_l10ntools.mk b/l10ntools/Module_l10ntools.mk new file mode 100644 index 000000000000..e34896fb28d2 --- /dev/null +++ b/l10ntools/Module_l10ntools.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 David Ostrovsky (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_Module_Module,l10ntools)) + +$(eval $(call gb_Module_add_targets,l10ntools,\ + Executable_helpex \ + Executable_ulfex \ + Executable_gsicheck \ + Executable_cfgex \ + Executable_xrmex \ + Executable_localize \ + Executable_transex3 \ + Executable_helpindexer \ + Executable_helplinker \ + StaticLibrary_transex \ + Library_helplinker \ + Package_inc \ + Package_scripts \ + Jar_FCFGMerge \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/l10ntools/Package_inc.mk b/l10ntools/Package_inc.mk new file mode 100644 index 000000000000..025a6767d6cc --- /dev/null +++ b/l10ntools/Package_inc.mk @@ -0,0 +1,40 @@ +# -*- 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 David Ostrovsky (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_Package_Package,l10ntools_inc,$(SRCDIR)/l10ntools)) + +$(eval $(call gb_Package_add_file,l10ntools_inc,inc/l10ntools/export.hxx,inc/export.hxx)) +$(eval $(call gb_Package_add_file,l10ntools_inc,inc/l10ntools/dllapi.h,inc/l10ntools/dllapi.h)) +$(eval $(call gb_Package_add_file,l10ntools_inc,inc/l10ntools/directory.hxx,inc/l10ntools/directory.hxx)) +$(eval $(call gb_Package_add_file,l10ntools_inc,inc/l10ntools/file.hxx,inc/l10ntools/file.hxx)) +$(eval $(call gb_Package_add_file,l10ntools_inc,inc/l10ntools/HelpIndexer.hxx,inc/l10ntools/HelpIndexer.hxx)) +$(eval $(call gb_Package_add_file,l10ntools_inc,inc/l10ntools/HelpLinker.hxx,inc/l10ntools/HelpLinker.hxx)) +$(eval $(call gb_Package_add_file,l10ntools_inc,inc/l10ntools/HelpSearch.hxx,inc/l10ntools/HelpSearch.hxx)) +$(eval $(call gb_Package_add_file,l10ntools_inc,inc/l10ntools/FCFGMerge.cfg,source/filter/merge/FCFGMerge.cfg)) +$(eval $(call gb_Package_add_file,l10ntools_inc,inc/l10ntools/compilehelp.hxx,source/help/compilehelp.hxx)) + + +# vim: set noet sw=4 ts=4: diff --git a/l10ntools/Package_scripts.mk b/l10ntools/Package_scripts.mk new file mode 100644 index 000000000000..1ce93271ba32 --- /dev/null +++ b/l10ntools/Package_scripts.mk @@ -0,0 +1,38 @@ +# -*- 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 David Ostrovsky (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_Package_Package,l10ntools_scripts,$(SRCDIR)/l10ntools/scripts)) + +$(eval $(call gb_Package_add_file,l10ntools_scripts,bin/localize,localize)) +$(eval $(call gb_Package_add_file,l10ntools_scripts,bin/fast_merge.pl,fast_merge.pl)) +$(eval $(call gb_Package_add_file,l10ntools_scripts,bin/keyidGen.pl,keyidGen.pl)) +$(eval $(call gb_Package_add_file,l10ntools_scripts,bin/addkeyid2pot.pl,addkeyid2pot.pl)) +$(eval $(call gb_Package_add_file,l10ntools_scripts,bin/po2lo,po2lo)) +$(eval $(call gb_Package_add_file,l10ntools_scripts,bin/propex,propex)) +$(eval $(call gb_Package_add_file,l10ntools_scripts,bin/propmerge,propmerge)) + + +# vim: set noet sw=4 ts=4: diff --git a/l10ntools/StaticLibrary_transex.mk b/l10ntools/StaticLibrary_transex.mk new file mode 100644 index 000000000000..e8c84b7d3662 --- /dev/null +++ b/l10ntools/StaticLibrary_transex.mk @@ -0,0 +1,42 @@ +# -*- Mode: makefile; 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 David Ostrovsky (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_StaticLibrary_StaticLibrary,transex)) + +$(eval $(call gb_StaticLibrary_set_include,transex,\ + -I$(SRCDIR)/l10ntools/inc \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_StaticLibrary_add_exception_objects,transex,\ + l10ntools/source/export2 \ + l10ntools/source/merge \ + l10ntools/source/file \ + l10ntools/source/directory \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/l10ntools/inc/l10ntools/HelpLinker.hxx b/l10ntools/inc/l10ntools/HelpLinker.hxx new file mode 100644 index 000000000000..b718623154c3 --- /dev/null +++ b/l10ntools/inc/l10ntools/HelpLinker.hxx @@ -0,0 +1,107 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef HELPLINKER_HXX +#define HELPLINKER_HXX + +#include +#include + +#ifdef AIX +# undef _THREAD_SAFE +#endif + +#define DBHELP_ONLY + +class L10N_DLLPUBLIC IndexerPreProcessor +{ +private: + std::string m_aModuleName; + fs::path m_fsIndexBaseDir; + fs::path m_fsCaptionFilesDirName; + fs::path m_fsContentFilesDirName; + + xsltStylesheetPtr m_xsltStylesheetPtrCaption; + xsltStylesheetPtr m_xsltStylesheetPtrContent; + +public: + IndexerPreProcessor( const std::string& aModuleName, const fs::path& fsIndexBaseDir, + const fs::path& idxCaptionStylesheet, const fs::path& idxContentStylesheet ); + ~IndexerPreProcessor(); + + void processDocument( xmlDocPtr doc, const std::string& EncodedDocPath ); +}; + +class L10N_DLLPUBLIC HelpLinker +{ +public: + void main(std::vector &args, + std::string* pExtensionPath = NULL, + std::string* pDestination = NULL, + const rtl::OUString* pOfficeHelpPath = NULL ) + + throw( HelpProcessingException ); + + HelpLinker() + : init(true) + , m_pIndexerPreProcessor(NULL) + {} + ~HelpLinker() + { delete m_pIndexerPreProcessor; } + +private: + int locCount, totCount; + Stringtable additionalFiles; + HashSet helpFiles; + fs::path sourceRoot; + fs::path embeddStylesheet; + fs::path idxCaptionStylesheet; + fs::path idxContentStylesheet; + fs::path zipdir; + fs::path outputFile; + std::string extsource; + std::string extdestination; + std::string module; + std::string lang; + std::string extensionPath; + std::string extensionDestination; + bool bExtensionMode; + fs::path indexDirName; + fs::path indexDirParentName; + bool init; + IndexerPreProcessor* m_pIndexerPreProcessor; + void initIndexerPreProcessor(); + void link() throw( HelpProcessingException ); + void addBookmark( DB* dbBase, FILE* pFile_DBHelp, std::string thishid, + const std::string& fileB, const std::string& anchorB, + const std::string& jarfileB, const std::string& titleB ); +}; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/l10ntools/inc/makefile.mk b/l10ntools/inc/makefile.mk deleted file mode 100644 index 8d628b14e43a..000000000000 --- a/l10ntools/inc/makefile.mk +++ /dev/null @@ -1,40 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=.. - -PRJNAME=l10ntools -TARGET=inc - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/l10ntools/prj/build.lst b/l10ntools/prj/build.lst index 372fcfe98c1b..c1e47969eddb 100644 --- a/l10ntools/prj/build.lst +++ b/l10ntools/prj/build.lst @@ -1,7 +1,3 @@ tr l10ntools : BERKELEYDB:berkeleydb EXPAT:expat LIBXSLT:libxslt CLUCENE:clucene sal NULL -tr l10ntools usr1 - all tr_mkout NULL -tr l10ntools\inc nmake - all tr_inc NULL -tr l10ntools\source nmake - all tr_src tr_inc NULL -tr l10ntools\source\help nmake - all tr_bla_help NULL -tr l10ntools\source\filter\utils nmake - all tr_bla_utils NULL -tr l10ntools\source\filter\merge nmake - all tr_bla_merge tr_bla_utils NULL +tr l10ntools usr1 - all tr_mkout NULL +tr l10ntools\prj nmake - all tr_prj NULL diff --git a/l10ntools/prj/d.lst b/l10ntools/prj/d.lst index e9329dc93855..e69de29bb2d1 100644 --- a/l10ntools/prj/d.lst +++ b/l10ntools/prj/d.lst @@ -1,59 +0,0 @@ -mkdir: %_DEST%\inc\l10ntools -mkdir: %_DEST%\bin -mkdir: %_DEST%\bin\help -mkdir: %_DEST%\bin\help\com -mkdir: %_DEST%\bin\help\com\sun -mkdir: %_DEST%\bin\help\com\sun\star -mkdir: %_DEST%\bin\help\com\sun\star\help - -..\%__SRC%\bin\cfgex.exe %_DEST%\bin\cfgex.exe -..\%__SRC%\bin\cfgex %_DEST%\bin\cfgex -..\%__SRC%\bin\transex3.exe %_DEST%\bin\transex3.exe -..\%__SRC%\bin\transex3 %_DEST%\bin\transex3 -..\%__SRC%\bin\lngex.exe %_DEST%\bin\lngex.exe -..\%__SRC%\bin\lngex %_DEST%\bin\lngex -..\%__SRC%\bin\localize.exe %_DEST%\bin\localize.exe -..\%__SRC%\bin\localize %_DEST%\bin\localize -..\%__SRC%\bin\xrmex.exe %_DEST%\bin\xrmex.exe -..\%__SRC%\bin\xrmex %_DEST%\bin\xrmex -..\%__SRC%\bin\gsicheck.exe %_DEST%\bin\gsicheck.exe -..\%__SRC%\bin\gsicheck %_DEST%\bin\gsicheck -..\%__SRC%\bin\helpex.exe %_DEST%\bin\helpex.exe -..\%__SRC%\bin\helpex %_DEST%\bin\helpex -..\%__SRC%\bin\ulfex.exe %_DEST%\bin\ulfex.exe -..\%__SRC%\bin\ulfex %_DEST%\bin\ulfex -..\%__SRC%\bin\txtconv.exe %_DEST%\bin\txtconv.exe -..\%__SRC%\bin\txtconv %_DEST%\bin\txtconv -..\%__SRC%\bin\ulfconv %_DEST%\bin\ulfconv -..\%__SRC%\class\FCFGMerge.jar %_DEST%\bin\FCFGMerge.jar -..\%__SRC%\bin\HelpCompiler %_DEST%\bin\HelpCompiler -..\%__SRC%\bin\HelpCompiler.exe %_DEST%\bin\HelpCompiler.exe -..\%__SRC%\bin\HelpLinker %_DEST%\bin\HelpLinker -..\%__SRC%\bin\HelpLinker.exe %_DEST%\bin\HelpLinker.exe -..\%__SRC%\bin\HelpLinker* %_DEST%\bin -..\%__SRC%\bin\HelpIndexer %_DEST%\bin\HelpIndexer -..\%__SRC%\bin\HelpIndexer.exe %_DEST%\bin\HelpIndexer.exe -..\%__SRC%\bin\HelpIndexer* %_DEST%\bin - -..\scripts\localize %_DEST%\bin\localize -..\scripts\fast_merge.pl %_DEST%\bin\fast_merge.pl -..\scripts\keyidGen.pl %_DEST%\bin\keyidGen.pl -..\scripts\addkeyid2pot.pl %_DEST%\bin\addkeyid2pot.pl -..\scripts\po2lo %_DEST%\bin\po2lo -..\scripts\propex %_DEST%\bin\propex -..\scripts\propex.bat %_DEST%\bin\propex.bat -..\scripts\propmerge %_DEST%\bin\propmerge -..\inc\export.hxx %_DEST%\inc\l10ntools\export.hxx -..\inc\l10ntools\dllapi.h %_DEST%\inc\l10ntools\dllapi.h -..\inc\l10ntools\directory.hxx %_DEST%\inc\l10ntools\directory.hxx -..\inc\l10ntools\file.hxx %_DEST%\inc\l10ntools\file.hxx -..\inc\l10ntools\HelpIndexer.hxx %_DEST%\inc\l10ntools\HelpIndexer.hxx -..\inc\l10ntools\HelpSearch.hxx %_DEST%\inc\l10ntools\HelpSearch.hxx -..\source\filter\merge\FCFGMerge.cfg %_DEST%\inc\l10ntools\FCFGMerge.cfg - -..\%__SRC%\lib\transex.lib %_DEST%\lib\transex.lib -..\%__SRC%\lib\libtransex.a %_DEST%\lib\libtransex.a - -..\source\help\compilehelp.hxx %_DEST%\inc\l10ntools\compilehelp.hxx -..\%__SRC%\lib\* %_DEST%\lib\* -..\%__SRC%\class\com\sun\star\help\* %_DEST%\bin\help\com\sun\star\help\* diff --git a/l10ntools/prj/dmake b/l10ntools/prj/dmake deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/l10ntools/source/cfglex.l b/l10ntools/source/cfglex.l index a8a01adb69a0..63860eea4fad 100644 --- a/l10ntools/source/cfglex.l +++ b/l10ntools/source/cfglex.l @@ -3,7 +3,7 @@ * lexer for parsing cfg source files * */ - +#define YY_NEVER_INTERACTIVE 1 /* enlarge token buffer to tokenize whole strings */ #undef YYLMAX @@ -25,7 +25,11 @@ #include "sal/main.h" #if defined __GNUC__ -#pragma GCC system_header +#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)) +#pragma GCC diagnostic ignored "-Wunused-function" +#pragma GCC diagnostic ignored "-Wunused-label" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" +#endif #elif defined __SINPRO_CC #pragma disable_warn #elif defined _MSC_VER @@ -35,9 +39,9 @@ int yycolumn = 1; #define YY_USER_ACTION yycolumn += yyleng; -/* external functions (C++ code, declared as extren "C" */ -extern void workOnTokenSet( int, char* ); -extern FILE * init(int, char **); +/* external functions (C++ code, declared as extern "C" */ +extern "C" void workOnTokenSet( int, char* ); +extern "C" FILE * init(int, char **); int bText=0; %} @@ -76,7 +80,7 @@ int bText=0; \<\!\-\- { - char c1 = 0, c2 = 0, c3 = input(); + char c1 = 0, c2 = 0, c3 = yyinput(); char pChar[2]; pChar[1] = 0x00; pChar[0] = c3; @@ -91,7 +95,8 @@ int bText=0; break; c1 = c2; c2 = c3; - c3 = input(); + c3 = yyinput(); + pChar[0] = c3; workOnTokenSet( COMMEND, pChar ); } @@ -138,11 +143,7 @@ void YYWarning( const char *s ) } /*****************************************************************************/ -#ifdef GCC -void yyerror ( const char *s, ... ) -#else void yyerror ( const char *s ) -#endif /*****************************************************************************/ { /* write error to stderr */ diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx index b8f6c19c0d54..faaa6d52071c 100644 --- a/l10ntools/source/cfgmerge.cxx +++ b/l10ntools/source/cfgmerge.cxx @@ -41,7 +41,7 @@ #include "cfgmerge.hxx" #include "tokens.h" -extern "C" { int yyerror(char const *); } +void yyerror(char const *); namespace { diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx index ed63e4ca5b8d..398083600334 100644 --- a/l10ntools/source/export.cxx +++ b/l10ntools/source/export.cxx @@ -41,8 +41,8 @@ #include #include -extern "C" { int yyerror( const char * ); } -extern "C" { int YYWarning( const char * ); } +void yyerror( const char * ); +void YYWarning( const char * ); namespace { diff --git a/l10ntools/source/filter/merge/makefile.mk b/l10ntools/source/filter/merge/makefile.mk deleted file mode 100644 index 8ef73debd743..000000000000 --- a/l10ntools/source/filter/merge/makefile.mk +++ /dev/null @@ -1,79 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ = ..$/..$/.. -TARGET = FCFGMerge -PRJNAME = l10ntools -PACKAGE = com$/sun$/star$/filter$/config$/tools$/merge - -# --- Settings ----------------------------------------------------- - -.INCLUDE: settings.mk - -#----- compile .java files ----------------------------------------- - -OWNCOPY = \ - $(MISC)$/$(TARGET)_copied.done - -CFGFILES = \ - FCFGMerge.cfg - -JAVACLASSFILES = \ - $(CLASSDIR)$/$(PACKAGE)$/Merger.class \ - $(CLASSDIR)$/$(PACKAGE)$/FCFGMerge.class - -CUSTOMMANIFESTFILE = \ - Manifest.mf - -MAXLINELENGTH = 100000 - -#----- make a jar from compiled files ------------------------------ - -JARCLASSDIRS = \ - com$/sun$/star$/filter$/config$/tools$/utils \ - com$/sun$/star$/filter$/config$/tools$/merge - -JARTARGET = $(TARGET).jar - -JARCOMPRESS = TRUE - -# --- targets ----------------------------------------------------- - -.INCLUDE : target.mk - -.IF "$(SOLAR_JAVA)" != "" -ALLTAR : $(OWNCOPY) - -.IF "$(JARTARGETN)" != "" -$(JARTARGETN) : $(OWNCOPY) -.ENDIF - -$(OWNCOPY) : $(CFGFILES) - -$(MKDIRHIER) $(CLASSDIR)$/$(PACKAGE) - $(COPY) $? $(CLASSDIR)$/$(PACKAGE) && $(TOUCH) $@ - -.ENDIF # "$(SOLAR_JAVA)" != "" diff --git a/l10ntools/source/filter/utils/makefile.mk b/l10ntools/source/filter/utils/makefile.mk deleted file mode 100644 index 43a28d57ee9e..000000000000 --- a/l10ntools/source/filter/utils/makefile.mk +++ /dev/null @@ -1,53 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ = ..$/..$/.. -TARGET = FCFGUtils -PRJNAME = l10ntools -PACKAGE = com$/sun$/star$/filter$/config$/tools$/utils - -# --- Settings ----------------------------------------------------- - -.INCLUDE: settings.mk - -#----- compile .java files ----------------------------------------- - - -JAVACLASSFILES = \ - $(CLASSDIR)$/$(PACKAGE)$/AnalyzeStartupLog.class \ - $(CLASSDIR)$/$(PACKAGE)$/ConfigHelper.class \ - $(CLASSDIR)$/$(PACKAGE)$/Logger.class \ - $(CLASSDIR)$/$(PACKAGE)$/FileHelper.class \ - $(CLASSDIR)$/$(PACKAGE)$/MalformedCommandLineException.class \ - $(CLASSDIR)$/$(PACKAGE)$/Cache.class \ - $(CLASSDIR)$/$(PACKAGE)$/XMLHelper.class - -MAXLINELENGTH = 100000 - -# --- targets ----------------------------------------------------- - -.INCLUDE : target.mk diff --git a/l10ntools/source/help/HelpLinker.cxx b/l10ntools/source/help/HelpLinker.cxx index 0103f43f8674..8c0d510ddb32 100644 --- a/l10ntools/source/help/HelpLinker.cxx +++ b/l10ntools/source/help/HelpLinker.cxx @@ -26,11 +26,8 @@ * ************************************************************************/ -#ifdef AIX -# undef _THREAD_SAFE -#endif - #include "HelpCompiler.hxx" +#include "l10ntools/HelpLinker.hxx" #include @@ -38,7 +35,6 @@ #include #include -#include #include #include #include @@ -50,26 +46,17 @@ #include -#define DBHELP_ONLY - -class IndexerPreProcessor +namespace lucene { -private: - std::string m_aModuleName; - fs::path m_fsIndexBaseDir; - fs::path m_fsCaptionFilesDirName; - fs::path m_fsContentFilesDirName; - - xsltStylesheetPtr m_xsltStylesheetPtrCaption; - xsltStylesheetPtr m_xsltStylesheetPtrContent; - -public: - IndexerPreProcessor( const std::string& aModuleName, const fs::path& fsIndexBaseDir, - const fs::path& idxCaptionStylesheet, const fs::path& idxContentStylesheet ); - ~IndexerPreProcessor(); - - void processDocument( xmlDocPtr doc, const std::string& EncodedDocPath ); -}; +namespace document +{ +class Document; +} +namespace util +{ +class Reader; +} +} IndexerPreProcessor::IndexerPreProcessor ( const std::string& aModuleName, const fs::path& fsIndexBaseDir, @@ -97,7 +84,6 @@ IndexerPreProcessor::~IndexerPreProcessor() xsltFreeStylesheet( m_xsltStylesheetPtrContent ); } - std::string getEncodedPath( const std::string& Path ) { rtl::OString aOStr_Path( Path.c_str() ); @@ -260,51 +246,6 @@ public: } }; -class HelpLinker -{ -public: - void main(std::vector &args, - std::string* pExtensionPath = NULL, - std::string* pDestination = NULL, - const rtl::OUString* pOfficeHelpPath = NULL ) - - throw( HelpProcessingException ); - - HelpLinker() - : init(true) - , m_pIndexerPreProcessor(NULL) - {} - ~HelpLinker() - { delete m_pIndexerPreProcessor; } - -private: - int locCount, totCount; - Stringtable additionalFiles; - HashSet helpFiles; - fs::path sourceRoot; - fs::path embeddStylesheet; - fs::path idxCaptionStylesheet; - fs::path idxContentStylesheet; - fs::path zipdir; - fs::path outputFile; - std::string extsource; - std::string extdestination; - std::string module; - std::string lang; - std::string extensionPath; - std::string extensionDestination; - bool bExtensionMode; - fs::path indexDirName; - fs::path indexDirParentName; - bool init; - IndexerPreProcessor* m_pIndexerPreProcessor; - void initIndexerPreProcessor(); - void link() throw( HelpProcessingException ); - void addBookmark( DB* dbBase, FILE* pFile_DBHelp, std::string thishid, - const std::string& fileB, const std::string& anchorB, - const std::string& jarfileB, const std::string& titleB ); -}; - namespace URLEncoder { static std::string encode(const std::string &rIn) @@ -1024,24 +965,6 @@ void HelpLinker::main( std::vector &args, link(); } -SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) { - std::vector args; - for (int i = 1; i < argc; ++i) - args.push_back(std::string(argv[i])); - try - { - HelpLinker* pHelpLinker = new HelpLinker(); - pHelpLinker->main( args ); - delete pHelpLinker; - } - catch( const HelpProcessingException& e ) - { - std::cerr << e.m_aErrorMsg; - exit(1); - } - return 0; -} - // Variable to set an exception in "C" StructuredXMLErrorFunction static const HelpProcessingException* GpXMLParsingException = NULL; diff --git a/l10ntools/source/help/HelpLinker_main.cxx b/l10ntools/source/help/HelpLinker_main.cxx new file mode 100644 index 000000000000..fae24bcebf0b --- /dev/null +++ b/l10ntools/source/help/HelpLinker_main.cxx @@ -0,0 +1,51 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#include "HelpCompiler.hxx" +#include "l10ntools/HelpLinker.hxx" + +#include + +SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) { + std::vector args; + for (int i = 1; i < argc; ++i) + args.push_back(std::string(argv[i])); + try + { + HelpLinker* pHelpLinker = new HelpLinker(); + pHelpLinker->main( args ); + delete pHelpLinker; + } + catch( const HelpProcessingException& e ) + { + std::cerr << e.m_aErrorMsg; + exit(1); + } + return 0; +} + diff --git a/l10ntools/source/help/helplinker.pmk b/l10ntools/source/help/helplinker.pmk deleted file mode 100644 index 6e99d322f434..000000000000 --- a/l10ntools/source/help/helplinker.pmk +++ /dev/null @@ -1,31 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -# define HELPLINKER_DLLIMPLEMENTATION (see @ inc/xmlhelp/helplinkerdllapi.h) -CDEFS += -DHELPLINKER_DLLIMPLEMENTATION - -VISIBILITY_HIDDEN=TRUE diff --git a/l10ntools/source/help/makefile.mk b/l10ntools/source/help/makefile.mk deleted file mode 100644 index f3019f415b6f..000000000000 --- a/l10ntools/source/help/makefile.mk +++ /dev/null @@ -1,116 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ = ..$/.. -PRJNAME = l10ntools -TARGET = HelpLinker -LIBBASENAME = helplinker -TARGETTYPE=CUI -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : helplinker.pmk - -CFLAGS+=-DL10N_DLLIMPLEMENTATION - -.IF "$(SYSTEM_LIBXSLT)" == "YES" -CFLAGS+= $(LIBXSLT_CFLAGS) -.ELSE -LIBXSLTINCDIR=external$/libxslt -CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXSLTINCDIR) -.ENDIF - -CFLAGS+= $(SYSTEM_DB_CFLAGS) - -.IF "$(SYSTEM_EXPAT)" == "YES" -CFLAGS+=-DSYSTEM_EXPAT -.ENDIF - -.IF "$(SYSTEM_CLUCENE)" == "YES" -CFLAGS+= $(CLUCENE_CFLAGS) -.ENDIF - -OBJFILES=\ - $(OBJ)$/HelpLinker.obj \ - $(OBJ)$/HelpCompiler.obj \ - $(OBJ)$/HelpIndexer.obj \ - $(OBJ)$/HelpIndexer_main.obj \ - $(OBJ)$/HelpSearch.obj \ - $(OBJ)$/LuceneHelper.obj - -SLOFILES=\ - $(SLO)$/HelpLinker.obj \ - $(SLO)$/HelpCompiler.obj \ - $(SLO)$/LuceneHelper.obj \ - $(SLO)$/HelpIndexer.obj \ - $(SLO)$/HelpSearch.obj - -.IF "$(OS)" == "MACOSX" && "$(CPU)" == "P" && "$(COM)" == "GCC" -# There appears to be a GCC 4.0.1 optimization error causing _file:good() to -# report true right before the call to writeOut at HelpLinker.cxx:1.12 l. 954 -# but out.good() to report false right at the start of writeOut at -# HelpLinker.cxx:1.12 l. 537: -NOOPTFILES=\ - $(OBJ)$/HelpLinker.obj \ - $(SLO)$/HelpLinker.obj -.ENDIF - -APP1TARGET= $(TARGET) -APP1OBJS=\ - $(OBJ)$/HelpLinker.obj \ - $(OBJ)$/HelpCompiler.obj -APP1RPATH = NONE -APP1STDLIBS+=$(SALLIB) $(BERKELEYLIB) $(XSLTLIB) $(EXPATASCII3RDLIB) - -APP2TARGET=HelpIndexer -APP2OBJS=\ - $(OBJ)$/LuceneHelper.obj \ - $(OBJ)$/HelpIndexer.obj \ - $(OBJ)$/HelpIndexer_main.obj -APP2RPATH = NONE -APP2STDLIBS+=$(SALLIB) $(CLUCENELIB) - -SHL1TARGET =$(LIBBASENAME)$(DLLPOSTFIX) -SHL1LIBS= $(SLB)$/$(TARGET).lib -.IF "$(COM)" == "MSC" -SHL1IMPLIB =i$(LIBBASENAME) -.ELSE -SHL1IMPLIB =$(LIBBASENAME)$(DLLPOSTFIX) -.ENDIF -SHL1DEF =$(MISC)$/$(SHL1TARGET).def -SHL1STDLIBS =$(SALLIB) $(BERKELEYLIB) $(XSLTLIB) $(EXPATASCII3RDLIB) $(CLUCENELIB) -SHL1USE_EXPORTS =ordinal - -DEF1NAME =$(SHL1TARGET) -DEFLIB1NAME =$(TARGET) - - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/l10ntools/source/makefile.mk b/l10ntools/source/makefile.mk deleted file mode 100644 index db60289be394..000000000000 --- a/l10ntools/source/makefile.mk +++ /dev/null @@ -1,141 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=.. - -INCPRE=$(MISC) - -PRJNAME=l10ntools -TARGET=transex -TARGETTYPE=CUI -LIBTARGET=no - -# --- Settings ----------------------------------------------------- - -ENABLE_EXCEPTIONS=TRUE - -.INCLUDE : settings.mk - -CDEFS+= -DYY_NEVER_INTERACTIVE=1 - -.IF "$(SYSTEM_EXPAT)" == "YES" -CFLAGS+=-DSYSTEM_EXPAT -.ENDIF - - -# --- Files -------------------------------------------------------- - -OBJFILES= \ - $(OBJ)$/export.obj \ - $(OBJ)$/export2.obj \ - $(OBJ)$/merge.obj \ - $(OBJ)$/xmlparse.obj \ - $(OBJ)$/helpmerge.obj \ - $(OBJ)$/helpex.obj \ - $(OBJ)$/file.obj \ - $(OBJ)$/directory.obj - - -LIB1TARGET= $(LB)$/$(TARGET).lib -LIB1ARCHIV= $(LB)$/libtransex.a -LIB1OBJFILES= $(OBJ)$/export.obj \ - $(OBJ)$/export2.obj \ - $(OBJ)$/merge.obj \ - $(OBJ)$/file.obj \ - $(OBJ)$/directory.obj - -APP1VERSIONMAP=exports.map - -# extractor and merger for *.src and *.hrc -APP1TARGET= transex3 -APP1OBJS= $(OBJ)$/src_yy_wrapper.obj -APP1RPATH= NONE -APP1STDLIBS+= \ - $(SALLIB) - -APP1LIBS+= $(LB)$/$(TARGET).lib -APP1DEPN= $(OBJ)$/src_yy_wrapper.obj $(LB)$/$(TARGET).lib - -APP2TARGET= helpex -APP2OBJS= $(OBJ)$/helpmerge.obj $(OBJ)$/xmlparse.obj $(OBJ)$/export2.obj $(OBJ)$/merge.obj $(OBJ)$/helpex.obj -APP2RPATH= NONE -APP2STDLIBS+= \ - $(EXPATASCII3RDLIB) \ - $(SALLIB) - -# extractor and merger for *.lng and *.lng -APP3TARGET= ulfex -APP3OBJS= $(OBJ)$/lngmerge.obj $(OBJ)$/merge.obj $(OBJ)$/export2.obj $(OBJ)$/lngex.obj -APP3RPATH= NONE -APP3STDLIBS+= \ - $(SALLIB) - -# tag checker for *.gsi -APP5TARGET= gsicheck -APP5OBJS= $(OBJ)$/gsicheck.obj $(OBJ)$/tagtest.obj -APP5RPATH= NONE -APP5STDLIBS+= \ - $(SALLIB) - -# extractor and merger for *.cfg -APP6TARGET= cfgex -APP6OBJS= $(OBJ)$/cfgmerge.obj $(OBJ)$/cfg_yy_wrapper.obj $(OBJ)$/merge.obj $(OBJ)$/export2.obj -APP6RPATH= NONE -APP6STDLIBS+= \ - $(SALLIB) - -# extractor and merger for *.xrm -APP7TARGET= xrmex -APP7OBJS= $(OBJ)$/xrmmerge.obj $(OBJ)$/xrm_yy_wrapper.obj $(OBJ)$/merge.obj $(OBJ)$/export2.obj -APP7RPATH= NONE -APP7STDLIBS+= \ - $(SALLIB) - -# localizer for l10n framework -APP9TARGET= localize -EXCEPTIONSFILES= \ - $(OBJ)$/localize.obj -APP9OBJS= $(OBJ)$/localize.obj -APP9RPATH= NONE -APP9STDLIBS+= \ - $(SALLIB) - -DEPOBJFILES=$(APP1OBJS) $(APP2OBJS) $(APP3OBJS) $(APP4OBJS) $(APP5OBJS) $(APP6OBJS) $(APP7OBJS) $(APP8OBJS) $(APP9OBJS) - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -$(MISC)$/%_yy.c : %lex.l - flex -l -w -8 -o$@ $< - -# Helper to suppress warnings in lex generated c code, see #i57362# - -$(OBJ)$/src_yy_wrapper.obj: $(MISC)$/src_yy.c -$(OBJ)$/cfg_yy_wrapper.obj: $(MISC)$/cfg_yy.c -$(OBJ)$/xrm_yy_wrapper.obj: $(MISC)$/xrm_yy.c - diff --git a/l10ntools/source/srclex.l b/l10ntools/source/srclex.l index 814e236e98a4..ccde01be0a42 100644 --- a/l10ntools/source/srclex.l +++ b/l10ntools/source/srclex.l @@ -4,7 +4,7 @@ * lexer for parsing ressource source files (*.src) * */ - +#define YY_NEVER_INTERACTIVE 1 /* enlarge token buffer to tokenize whole strings */ #undef YYLMAX @@ -26,19 +26,23 @@ #include "sal/main.h" #if defined __GNUC__ -#pragma GCC system_header +#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)) +#pragma GCC diagnostic ignored "-Wunused-function" +#pragma GCC diagnostic ignored "-Wunused-label" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" +#endif #elif defined __SINPRO_CC #pragma disable_warn #elif defined _MSC_VER #pragma warning(push, 1) #endif -/* external functions (C++ code, declared as extren "C" */ -extern int WorkOnTokenSet( int, char* ); -extern FILE * init(int, char **); -extern int SetError(); -extern int GetError(); -extern void Close(); +/* external functions (C++ code, declared as extern "C" */ +extern "C" int WorkOnTokenSet( int, char* ); +extern "C" FILE * init(int, char **); +extern "C" int SetError(); +extern "C" int GetError(); +extern "C" void Close(); /* forwards */ void YYWarning(); @@ -69,7 +73,7 @@ void YYWarning(); WorkOnTokenSet( IGNOREDTOKENS, yytext ); } "/*" { - char c1 = 0, c2 = input(); + char c1 = 0,c2 = yyinput(); char pChar[2]; pChar[1] = 0x00; pChar[0] = c2; @@ -82,7 +86,7 @@ void YYWarning(); if ( c1 == '*' && c2 == '/' ) break; c1 = c2; - c2 = input(); + c2 = yyinput(); pChar[0] = c2; WorkOnTokenSet( COMMEND, pChar ); } @@ -216,7 +220,7 @@ int yywrap(void) } /*****************************************************************************/ -void YYWarning( char *s ) +void YYWarning( const char *s ) /*****************************************************************************/ { /* write warning to stderr */ @@ -224,7 +228,7 @@ void YYWarning( char *s ) } /*****************************************************************************/ -void yyerror( char *s ) +void yyerror( const char *s ) /*****************************************************************************/ { /* write error to stderr */ diff --git a/l10ntools/source/xrmlex.l b/l10ntools/source/xrmlex.l index 5a2170f11e97..56d43d356d3b 100644 --- a/l10ntools/source/xrmlex.l +++ b/l10ntools/source/xrmlex.l @@ -3,7 +3,7 @@ * lexer for parsing xml-property source files (*.xml) * */ - +#define YY_NEVER_INTERACTIVE 1 /* enlarge token buffer to tokenize whole strings */ #undef YYLMAX @@ -25,24 +25,28 @@ #include "sal/main.h" #if defined __GNUC__ -#pragma GCC system_header +#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)) +#pragma GCC diagnostic ignored "-Wunused-function" +#pragma GCC diagnostic ignored "-Wunused-label" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" +#endif #elif defined __SINPRO_CC #pragma disable_warn #elif defined _MSC_VER #pragma warning(push, 1) #endif -/* external functions (C++ code, declared as extren "C" */ -extern int WorkOnTokenSet( int, char* ); -extern int Argument( char * ); -extern int InitXrmExport( char * , char * ); -extern int EndXrmExport(); -extern int GetError(); -extern int SetError(); -extern char *GetOutputFile( int argc, char* argv[]); -extern FILE *GetXrmFile(); -extern int isQuiet(); -extern char* getFilename(); +/* external functions (C++ code, declared as extern "C" */ +extern "C" int WorkOnTokenSet( int, char* ); +extern "C" int Argument( char * ); +extern "C" int InitXrmExport( char * , char * ); +extern "C" int EndXrmExport(); +extern "C" int GetError(); +extern "C" int SetError(); +extern "C" char *GetOutputFile( int argc, char* argv[]); +extern "C" FILE *GetXrmFile(); +extern "C" int isQuiet(); +extern "C" char* getFilename(); /* forwards */ void YYWarning(); @@ -131,7 +135,7 @@ int bText=0; "