helpcompiler: remove Package_inc

Change-Id: Iddafa9068edcc20135c08ed205b8fb7fb5382eba

13 files changed, 14 insertions, 281 deletions

diff --git a/helpcompiler/Executable_helpindexer.mk b/helpcompiler/Executable_helpindexer.mk
index b3caa8e07e26..5fee9f7a64f4 100644
--- a/helpcompiler/Executable_helpindexer.mk
+++ b/helpcompiler/Executable_helpindexer.mk
@@ -9,13 +9,9 @@
 
 $(eval $(call gb_Executable_Executable,HelpIndexer))
 
-$(eval $(call gb_Executable_use_package,HelpIndexer,\
-    helpcompiler_inc \
-))
-
 $(eval $(call gb_Executable_use_libraries,HelpIndexer,\
     sal \
-    helplinker \
+	helplinker \
 ))
 
 $(eval $(call gb_Executable_use_externals,HelpIndexer,\
diff --git a/helpcompiler/Executable_helplinker.mk b/helpcompiler/Executable_helplinker.mk
index 2aac463fdb2f..2825aadf3b2e 100644
--- a/helpcompiler/Executable_helplinker.mk
+++ b/helpcompiler/Executable_helplinker.mk
@@ -9,8 +9,9 @@
 
 $(eval $(call gb_Executable_Executable,HelpLinker))
 
-$(eval $(call gb_Executable_use_package,HelpLinker,\
-    helpcompiler_inc \
+$(eval $(call gb_Executable_set_include,HelpLinker,\
+	-I$(SRCDIR)/helpcompiler/inc \
+	$$(INCLUDE) \
 ))
 
 $(eval $(call gb_Executable_use_libraries,HelpLinker,\
diff --git a/helpcompiler/Library_helplinker.mk b/helpcompiler/Library_helplinker.mk
index 4487d95f370f..80c2d189438e 100644
--- a/helpcompiler/Library_helplinker.mk
+++ b/helpcompiler/Library_helplinker.mk
@@ -9,8 +9,9 @@
 
 $(eval $(call gb_Library_Library,helplinker))
 
-$(eval $(call gb_Library_use_package,helplinker,\
-    helpcompiler_inc\
+$(eval $(call gb_Library_set_include,helplinker,\
+	-I$(SRCDIR)/helpcompiler/inc \
+	$$(INCLUDE) \
 ))
 
 $(eval $(call gb_Library_add_defs,helplinker,\
diff --git a/helpcompiler/Module_helpcompiler.mk b/helpcompiler/Module_helpcompiler.mk
index d6ec0651ed08..f4e0923a50db 100644
--- a/helpcompiler/Module_helpcompiler.mk
+++ b/helpcompiler/Module_helpcompiler.mk
@@ -13,7 +13,6 @@ $(eval $(call gb_Module_add_targets,helpcompiler,\
     Executable_helpindexer \
     Executable_helplinker \
     Library_helplinker \
-    Package_inc \
 ))
 
 # vim:set noet sw=4 ts=4:
diff --git a/helpcompiler/Package_inc.mk b/helpcompiler/Package_inc.mk
deleted file mode 100644
index e532d951a0fc..000000000000
--- a/helpcompiler/Package_inc.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# 
-
-$(eval $(call gb_Package_Package,helpcompiler_inc,$(SRCDIR)/helpcompiler))
-
-$(eval $(call gb_Package_add_file,helpcompiler_inc,inc/helpcompiler/dllapi.h,inc/dllapi.h))
-$(eval $(call gb_Package_add_file,helpcompiler_inc,inc/helpcompiler/compilehelp.hxx,inc/compilehelp.hxx))
-$(eval $(call gb_Package_add_file,helpcompiler_inc,inc/helpcompiler/HelpCompiler.hxx,inc/HelpCompiler.hxx))
-$(eval $(call gb_Package_add_file,helpcompiler_inc,inc/helpcompiler/HelpIndexer.hxx,inc/HelpIndexer.hxx))
-$(eval $(call gb_Package_add_file,helpcompiler_inc,inc/helpcompiler/HelpLinker.hxx,inc/HelpLinker.hxx))
-$(eval $(call gb_Package_add_file,helpcompiler_inc,inc/helpcompiler/HelpSearch.hxx,inc/HelpSearch.hxx))
-$(eval $(call gb_Package_add_file,helpcompiler_inc,inc/helpcompiler/BasCodeTagger.hxx,inc/BasCodeTagger.hxx))
-
-# vim: set noet sw=4 ts=4:
diff --git a/helpcompiler/inc/HelpIndexer.hxx b/helpcompiler/inc/HelpIndexer.hxx
deleted file mode 100644
index 4be40eb827ce..000000000000
--- a/helpcompiler/inc/HelpIndexer.hxx
+++ /dev/null
@@ -1,89 +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/.
- */
-
-#ifndef HELPINDEXER_HXX
-#define HELPINDEXER_HXX
-
-#include <helpcompiler/dllapi.h>
-
-#include <rtl/ustring.hxx>
-#include <set>
-
-// I assume that TCHAR is defined as wchar_t throughout
-
-namespace lucene
-{
-namespace document
-{
-class Document;
-}
-namespace util
-{
-class Reader;
-}
-}
-
-class L10N_DLLPUBLIC HelpIndexer {
-	private:
-                OUString d_lang;
-                OUString d_module;
-                OUString d_captionDir;
-                OUString d_contentDir;
-                OUString d_indexDir;
-                OUString d_error;
-                std::set<OUString> d_files;
-
-	public:
-
-	/**
-	 * @param lang Help files language.
-	 * @param module The module of the helpfiles.
-	 * @param srcDir The help directory to index
-	 * @param outDir The directory to write the "module".idxl directory to
-	 */
-        HelpIndexer(OUString const &lang, OUString const &module,
-            OUString const &srcDir, OUString const &outDir);
-
-	/**
-	 * Run the indexer.
-	 * @return true if index successfully generated.
-	 */
-	bool indexDocuments();
-
-	/**
-	 * Get the error string (empty if no error occurred).
-	 */
-        OUString const & getErrorMessage();
-
-	private:
-
-	/**
-	 * Scan the caption & contents directories for help files.
-	 */
-	bool scanForFiles();
-
-	/**
-	 * Scan for files in the given directory.
-	 */
-        bool scanForFiles(OUString const &path);
-
-	/**
-	 * Fill the Document with information on the given help file.
-	 */
-        bool helpDocument(OUString const & fileName, lucene::document::Document *doc);
-
-	/**
-	 * Create a reader for the given file, and create an "empty" reader in case the file doesn't exist.
-	 */
-        lucene::util::Reader *helpFileReader(OUString const & path);
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/helpcompiler/inc/HelpSearch.hxx b/helpcompiler/inc/HelpSearch.hxx
deleted file mode 100644
index a28af890ceb7..000000000000
--- a/helpcompiler/inc/HelpSearch.hxx
+++ /dev/null
@@ -1,44 +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/.
- */
-
-#ifndef HELPSEARCH_HXX
-#define HELPSEARCH_HXX
-
-#include <helpcompiler/dllapi.h>
-
-#include <rtl/ustring.hxx>
-#include <vector>
-
-class L10N_DLLPUBLIC HelpSearch{
-	private:
-                OUString d_lang;
-                OString d_indexDir;
-
-	public:
-
-	/**
-	 * @param lang Help files language.
-	 * @param indexDir The directory where the index files are stored.
-	 */
-        HelpSearch(OUString const &lang, OUString const &indexDir);
-
-	/**
-	 * Query the index for a certain query string.
-	 * @param queryStr The query.
-	 * @param captionOnly Set to true to search in the caption, not the content.
-	 * @param rDocuments Vector to write the paths of the found documents.
-	 * @param rScores Vector to write the scores to.
-	 */
-        bool query(OUString const &queryStr, bool captionOnly,
-            std::vector<OUString> &rDocuments, std::vector<float> &rScores);
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/helpcompiler/inc/compilehelp.hxx b/helpcompiler/inc/compilehelp.hxx
deleted file mode 100644
index 4ef706d32388..000000000000
--- a/helpcompiler/inc/compilehelp.hxx
+++ /dev/null
@@ -1,71 +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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef COMPILE_HXX
-#define COMPILE_HXX
-
-#include "sal/types.h"
-
-#if defined(HELPLINKER_DLLIMPLEMENTATION)
-#define HELPLINKER_DLLPUBLIC  SAL_DLLPUBLIC_EXPORT
-#else
-#define HELPLINKER_DLLPUBLIC  SAL_DLLPUBLIC_IMPORT
-#endif
-#define HELPLINKER_DLLPRIVATE SAL_DLLPRIVATE
-
-#include <rtl/ustring.hxx>
-
-enum HelpProcessingErrorClass
-{
-    HELPPROCESSING_NO_ERROR,
-    HELPPROCESSING_GENERAL_ERROR,       // Missing files, options etc.
-    HELPPROCESSING_INTERNAL_ERROR,      // Unexpected problems
-    HELPPROCESSING_XMLPARSING_ERROR     // Errors thrown by libxml
-};
-
-struct HelpProcessingErrorInfo
-{
-    HelpProcessingErrorClass        m_eErrorClass;
-    OUString                   m_aErrorMsg;
-    OUString                   m_aXMLParsingFile;
-    sal_Int32                       m_nXMLParsingLine;
-
-    HelpProcessingErrorInfo( void )
-        : m_eErrorClass( HELPPROCESSING_NO_ERROR )
-        , m_nXMLParsingLine( -1 )
-    {}
-
-    HelpProcessingErrorInfo& operator=( const struct HelpProcessingException& e );
-};
-
-
-// Returns true in case of success, false in case of error
-HELPLINKER_DLLPUBLIC bool compileExtensionHelp
-(
-     const OUString& aOfficeHelpPath,
-    const OUString& aExtensionName,
-    const OUString& aExtensionLanguageRoot,
-    sal_Int32 nXhpFileCount, const OUString* pXhpFiles,
-    const OUString& aDestination,
-    HelpProcessingErrorInfo& o_rHelpProcessingErrorInfo
-);
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/helpcompiler/inc/dllapi.h b/helpcompiler/inc/dllapi.h
deleted file mode 100644
index c82395272134..000000000000
--- a/helpcompiler/inc/dllapi.h
+++ /dev/null
@@ -1,40 +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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef _L10N_DLLAPI_H
-#define _L10N_DLLAPI_H
-
-#include "sal/config.h"
-#include "sal/types.h"
-
-#if defined L10N_DLLIMPLEMENTATION
-#define L10N_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
-#else
-#define L10N_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
-#endif
-
-#if defined UNX && ! defined MACOS
-#define L10N_PLUGIN_PUBLIC L10N_DLLPUBLIC
-#else
-#define L10N_PLUGIN_PUBLIC SAL_DLLPRIVATE
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/helpcompiler/source/BasCodeTagger.cxx b/helpcompiler/source/BasCodeTagger.cxx
index fdc81db83c67..d394e1aad531 100644
--- a/helpcompiler/source/BasCodeTagger.cxx
+++ b/helpcompiler/source/BasCodeTagger.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <helpcompiler/BasCodeTagger.hxx>
+#include <BasCodeTagger.hxx>
 
 LibXmlTreeWalker::LibXmlTreeWalker( xmlDocPtr doc )
 {
diff --git a/helpcompiler/source/HelpCompiler.cxx b/helpcompiler/source/HelpCompiler.cxx
index 628560508910..1abcfbac6d3c 100644
--- a/helpcompiler/source/HelpCompiler.cxx
+++ b/helpcompiler/source/HelpCompiler.cxx
@@ -18,8 +18,8 @@
  */
 
 
-#include <helpcompiler/HelpCompiler.hxx>
-#include <helpcompiler/BasCodeTagger.hxx>
+#include <HelpCompiler.hxx>
+#include <BasCodeTagger.hxx>
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/helpcompiler/source/HelpLinker.cxx b/helpcompiler/source/HelpLinker.cxx
index e122feeb62ea..b50b2ce301f3 100644
--- a/helpcompiler/source/HelpLinker.cxx
+++ b/helpcompiler/source/HelpLinker.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <helpcompiler/HelpCompiler.hxx>
-#include <helpcompiler/HelpLinker.hxx>
+#include <HelpCompiler.hxx>
+#include <HelpLinker.hxx>
 
 #include <map>
 
diff --git a/helpcompiler/source/HelpLinker_main.cxx b/helpcompiler/source/HelpLinker_main.cxx
index 8542a761f5df..83906830b21c 100644
--- a/helpcompiler/source/HelpLinker_main.cxx
+++ b/helpcompiler/source/HelpLinker_main.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <helpcompiler/HelpCompiler.hxx>
-#include <helpcompiler/HelpLinker.hxx>
+#include <HelpCompiler.hxx>
+#include <HelpLinker.hxx>
 #include <iostream>
 #include <sal/main.h>