Module_ooo.mk
| 1
Repository.mk
| 2
postprocess/packcomponents/makefile.mk
| 6
solenv/ant/externals.xml
| 12 +
xmlhelp/Ant_LuceneHelpWrapper.mk
| 23 --
xmlhelp/Library_tvhlp1.mk
| 61 ++++++
xmlhelp/Library_ucpchelp1.mk
| 81 +++++++++
xmlhelp/Makefile
| 32 +++
xmlhelp/Module_xmlhelp.mk
| 28 +--
xmlhelp/Package_xml.mk
| 26 ++
xmlhelp/Package_xsl.mk
| 29 +++
xmlhelp/Zip_helpxsl.mk
| 32 +++
xmlhelp/java/LuceneHelpWrapper/build.xml
| 56 ++++++
xmlhelp/java/LuceneHelpWrapper/src/main/java/com/sun/star/help/HelpSearch.java
| 4
xmlhelp/java/LuceneHelpWrapper/src/main/java/com/sun/star/help/LuceneHelpWrapper.component
| 33 +++
xmlhelp/java/LuceneHelpWrapper/src/main/java/com/sun/star/help/MANIFEST.MF
| 1
xmlhelp/prj/build.lst
| 9 -
xmlhelp/prj/d.lst
| 12 -
xmlhelp/prj/makefile.mk
| 41 ++--
xmlhelp/source/cxxhelp/provider/makefile.mk
| 89 ----------
xmlhelp/source/cxxhelp/provider/services.cxx
| 4
xmlhelp/source/treeview/tvfactory.cxx
| 4
xmlhelp/util/makefile.mk
| 87 ---------
23 files changed, 410 insertions(+), 263 deletions(-)
New commits:
commit 2fa4d8e29facad1fef72835a81c1acb33592b8a0
Author: Damjan Jovanovic <dam...@apache.org>
AuthorDate: Wed Aug 15 07:01:42 2018 +0000
Commit: Damjan Jovanovic <dam...@apache.org>
CommitDate: Wed Aug 15 07:01:42 2018 +0000
Port main/xmlhelp to gbuild.
Patch by: me
diff --git a/Module_ooo.mk b/Module_ooo.mk
index 67cea532ba17..ff41468b3ef3 100644
--- a/Module_ooo.mk
+++ b/Module_ooo.mk
@@ -103,6 +103,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
writerfilter \
x11_extensions \
xml2cmp \
+ xmlhelp \
xmloff \
xmlreader \
xmlscript \
diff --git a/Repository.mk b/Repository.mk
index 066bd2f1b6ff..51efa03c0438 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -153,6 +153,8 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
textconversiondlgs \
ootk \
tl \
+ tvhlp1 \
+ ucpchelp1 \
utl \
unordf \
unoxml \
diff --git a/postprocess/packcomponents/makefile.mk
b/postprocess/packcomponents/makefile.mk
index b8d543148c1a..4c0044c95c58 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -141,6 +141,8 @@ my_components = \
component/unoxml/source/rdf/unordf \
component/unoxml/source/service/unoxml \
component/writerfilter/util/writerfilter \
+ component/xmlhelp/source/treeview/tvhlp1 \
+ component/xmlhelp/util/ucpchelp1 \
component/xmloff/source/transform/xof \
component/xmloff/util/xo \
component/xmlscript/util/xcr \
@@ -184,8 +186,6 @@ my_components = \
svgfilter \
syssh \
t602filter \
- tvhlp1 \
- ucpchelp1 \
updatefeed \
updchk \
vbaevents \
@@ -275,7 +275,7 @@ my_components +=
component/slideshow/source/engine/OGLTrans/ogltrans
.IF "$(SOLAR_JAVA)" == "TRUE"
my_components += \
- LuceneHelpWrapper \
+ component/xmlhelp/java/LuceneHelpWrapper/LuceneHelpWrapper \
ScriptFramework \
ScriptProviderForJava \
XMergeBridge \
diff --git a/solenv/ant/externals.xml b/solenv/ant/externals.xml
index 8965778e6875..0dafa892159b 100644
--- a/solenv/ant/externals.xml
+++ b/solenv/ant/externals.xml
@@ -73,4 +73,16 @@
system-path="${COMMONS_LOGGING_JAR}"
internal-filename="commons-logging-1.1.3.jar"/>
+ <define-external
+ name="lucene-core"
+ system-test="${SYSTEM_LUCENE}"
+ system-path="${LUCENE_CORE_JAR}"
+ internal-filename="lucene-core-2.9.4-dev.jar"/>
+
+ <define-external
+ name="lucene-analyzers"
+ system-test="${SYSTEM_LUCENE}"
+ system-path="${LUCENE_ANALYZERS_JAR}"
+ internal-filename="lucene-analyzers-2.9.4-dev.jar"/>
+
</project>
diff --git a/xmlhelp/source/cxxhelp/util/makefile.mk
b/xmlhelp/Ant_LuceneHelpWrapper.mk
similarity index 72%
rename from xmlhelp/source/cxxhelp/util/makefile.mk
rename to xmlhelp/Ant_LuceneHelpWrapper.mk
index e41bf2b105c8..565d77702552 100644
--- a/xmlhelp/source/cxxhelp/util/makefile.mk
+++ b/xmlhelp/Ant_LuceneHelpWrapper.mk
@@ -21,26 +21,9 @@
-PRJ=..$/..$/..
+$(eval $(call
gb_Ant_Ant,LuceneHelpWrapper,$(SRCDIR)/xmlhelp/java/LuceneHelpWrapper/build.xml))
-PRJNAME= xmlhelp
-TARGET= jautil
-AUTOSEG= TRUE
+$(eval $(call
gb_Ant_set_componentfile,LuceneHelpWrapper,xmlhelp/java/LuceneHelpWrapper/LuceneHelpWrapper,OOO))
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-.IF "$(GUI)"=="WNT"
-CFLAGS+=-GR
-.ENDIF
-
-SLOFILES=\
- $(SLO)$/Decompressor.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
+# vim: set noet sw=4 ts=4:
diff --git a/xmlhelp/Library_tvhlp1.mk b/xmlhelp/Library_tvhlp1.mk
new file mode 100644
index 000000000000..cceae74278d1
--- /dev/null
+++ b/xmlhelp/Library_tvhlp1.mk
@@ -0,0 +1,61 @@
+#**************************************************************
+#
+# 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
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,tvhlp1))
+
+$(eval $(call
gb_Library_add_precompiled_header,tvhlp1,$(SRCDIR)/xmlhelp/inc/pch/precompiled_xmlhelp))
+
+$(eval $(call
gb_Library_set_componentfile,tvhlp1,xmlhelp/source/treeview/tvhlp1))
+
+$(eval $(call gb_Library_set_include,tvhlp1,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/xmlhelp/inc \
+ -I$(SRCDIR)/xmlhelp/inc/pch \
+ -I$(SRCDIR)/solenv/inc \
+ -I$(OUTDIR)/inc/stl \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_add_api,tvhlp1,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,tvhlp1,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+$(call gb_Library_use_externals,tvhlp1,\
+ expat_utf8 \
+)
+
+$(eval $(call gb_Library_add_exception_objects,tvhlp1,\
+ xmlhelp/source/treeview/tvfactory \
+ xmlhelp/source/treeview/tvread \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/xmlhelp/Library_ucpchelp1.mk b/xmlhelp/Library_ucpchelp1.mk
new file mode 100644
index 000000000000..d9746a314f75
--- /dev/null
+++ b/xmlhelp/Library_ucpchelp1.mk
@@ -0,0 +1,81 @@
+#**************************************************************
+#
+# 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
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,ucpchelp1))
+
+$(eval $(call
gb_Library_add_precompiled_header,ucpchelp1,$(SRCDIR)/xmlhelp/inc/pch/precompiled_xmlhelp))
+
+$(eval $(call gb_Library_set_componentfile,ucpchelp1,xmlhelp/util/ucpchelp1))
+
+$(eval $(call gb_Library_set_include,ucpchelp1,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/xmlhelp/inc \
+ -I$(SRCDIR)/xmlhelp/inc/pch \
+ -I$(SRCDIR)/xmlhelp/source/cxxhelp/inc \
+ -I$(SRCDIR)/solenv/inc \
+ -I$(OUTDIR)/inc/stl \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_add_api,ucpchelp1,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_defs,ucpchelp1,\
+ -DHAVE_EXPAT_H \
+))
+
+$(eval $(call gb_Library_add_linked_libs,ucpchelp1,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ ucbhelper \
+ $(gb_STDLIBS) \
+))
+
+$(call gb_Library_use_externals,ucpchelp1,\
+ expat_utf8 \
+ libxslt \
+)
+
+$(eval $(call gb_Library_add_exception_objects,ucpchelp1,\
+ xmlhelp/source/cxxhelp/provider/bufferedinputstream \
+ xmlhelp/source/cxxhelp/provider/content \
+ xmlhelp/source/cxxhelp/provider/contentcaps \
+ xmlhelp/source/cxxhelp/provider/databases \
+ xmlhelp/source/cxxhelp/provider/db \
+ xmlhelp/source/cxxhelp/provider/inputstream \
+ xmlhelp/source/cxxhelp/provider/provider \
+ xmlhelp/source/cxxhelp/provider/resultset \
+ xmlhelp/source/cxxhelp/provider/resultsetbase \
+ xmlhelp/source/cxxhelp/provider/resultsetforroot \
+ xmlhelp/source/cxxhelp/provider/resultsetforquery \
+ xmlhelp/source/cxxhelp/provider/services \
+ xmlhelp/source/cxxhelp/provider/urlparameter \
+ xmlhelp/source/cxxhelp/qe/DocGenerator \
+ xmlhelp/source/cxxhelp/util/Decompressor \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/xmlhelp/Makefile b/xmlhelp/Makefile
new file mode 100644
index 000000000000..c1d144cbd4c9
--- /dev/null
+++ b/xmlhelp/Makefile
@@ -0,0 +1,32 @@
+#**************************************************************
+#
+# 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
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath
$(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/xmlhelp/source/cxxhelp/qe/makefile.mk b/xmlhelp/Module_xmlhelp.mk
similarity index 73%
rename from xmlhelp/source/cxxhelp/qe/makefile.mk
rename to xmlhelp/Module_xmlhelp.mk
index d80fa55a714e..1cf9b0dd2245 100644
--- a/xmlhelp/source/cxxhelp/qe/makefile.mk
+++ b/xmlhelp/Module_xmlhelp.mk
@@ -21,25 +21,17 @@
-PRJ=..$/..$/..
+$(eval $(call gb_Module_Module,xmlhelp))
-PRJNAME= xmlhelp
-TARGET= jaqe
-AUTOSEG= TRUE
+$(eval $(call gb_Module_add_targets,xmlhelp,\
+ Ant_LuceneHelpWrapper \
+ Library_tvhlp1 \
+ Library_ucpchelp1 \
+ Package_xml \
+ Package_xsl \
+ Zip_helpxsl \
+))
-ENABLE_EXCEPTIONS=TRUE
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-.IF "$(GUI)"=="WNT"
-CFLAGS+=-GR
-.ENDIF
-
-SLOFILES=$(SLO)$/DocGenerator.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
+# vim: set noet sw=4 ts=4:
diff --git a/xmlhelp/Package_xml.mk b/xmlhelp/Package_xml.mk
new file mode 100644
index 000000000000..3206cfad3d1c
--- /dev/null
+++ b/xmlhelp/Package_xml.mk
@@ -0,0 +1,26 @@
+###############################################################
+#
+# 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
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+###############################################################
+
+
+
+$(eval $(call gb_Package_Package,xmlhelp_xml,$(SRCDIR)/xmlhelp))
+
+$(eval $(call
gb_Package_add_file,xmlhelp_xml,xml/ucpchelp.xml,util/ucpchelp.xml))
diff --git a/xmlhelp/Package_xsl.mk b/xmlhelp/Package_xsl.mk
new file mode 100644
index 000000000000..4a00682828d4
--- /dev/null
+++ b/xmlhelp/Package_xsl.mk
@@ -0,0 +1,29 @@
+###############################################################
+#
+# 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
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+###############################################################
+
+
+
+$(eval $(call gb_Package_Package,xmlhelp_xsl,$(SRCDIR)/xmlhelp))
+
+$(eval $(call gb_Package_add_file,xmlhelp_xsl,bin/embed.xsl,util/embed.xsl))
+$(eval $(call
gb_Package_add_file,xmlhelp_xsl,bin/idxcaption.xsl,util/idxcaption.xsl))
+$(eval $(call
gb_Package_add_file,xmlhelp_xsl,bin/idxcontent.xsl,util/idxcontent.xsl))
+$(eval $(call
gb_Package_add_file,xmlhelp_xsl,bin/main_transform.xsl,util/main_transform.xsl))
diff --git a/xmlhelp/Zip_helpxsl.mk b/xmlhelp/Zip_helpxsl.mk
new file mode 100644
index 000000000000..333b8a7db82a
--- /dev/null
+++ b/xmlhelp/Zip_helpxsl.mk
@@ -0,0 +1,32 @@
+###############################################################
+#
+# 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
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+###############################################################
+
+
+
+$(eval $(call gb_Zip_Zip,helpxsl,$(SRCDIR)/xmlhelp/util))
+
+$(eval $(call gb_Zip_add_files,helpxsl,\
+ idxcaption.xsl \
+ idxcontent.xsl \
+ main_transform.xsl \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/xmlhelp/source/com/sun/star/help/LuceneHelpWrapper.component
b/xmlhelp/java/LuceneHelpWrapper/LuceneHelpWrapper.component
similarity index 100%
rename from xmlhelp/source/com/sun/star/help/LuceneHelpWrapper.component
rename to xmlhelp/java/LuceneHelpWrapper/LuceneHelpWrapper.component
diff --git a/xmlhelp/source/com/sun/star/help/MANIFEST.MF
b/xmlhelp/java/LuceneHelpWrapper/MANIFEST.MF
similarity index 100%
rename from xmlhelp/source/com/sun/star/help/MANIFEST.MF
rename to xmlhelp/java/LuceneHelpWrapper/MANIFEST.MF
diff --git a/xmlhelp/java/LuceneHelpWrapper/build.xml
b/xmlhelp/java/LuceneHelpWrapper/build.xml
new file mode 100644
index 000000000000..8639d6361e15
--- /dev/null
+++ b/xmlhelp/java/LuceneHelpWrapper/build.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--***********************************************************
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ ***********************************************************-->
+
+
+<project name="LuceneHelpWrapper" default="main">
+
+ <property file="../../../ant.properties"/>
+ <import file="${SRC_ROOT}/solenv/ant/aoo-ant.xml"/>
+
+ <target name="init-project">
+
+ <property name="jar.classpath"
value="${external.lucene-core.jarclasspath}
${external.lucene-analyzers.jarclasspath}"/>
+ <property name="jar.manifest"
value="${SRC_ROOT}/xmlhelp/java/LuceneHelpWrapper/MANIFEST.MF"/>
+
+ <path id="main.classpath">
+ <pathelement location="${OUTDIR}/bin/juh.jar"/>
+ <pathelement location="${OUTDIR}/bin/jurt.jar"/>
+ <pathelement location="${OUTDIR}/bin/ridl.jar"/>
+ <pathelement location="${OUTDIR}/bin/unoil.jar"/>
+ <pathelement location="${external.lucene-core.path}"/>
+ <pathelement location="${external.lucene-analyzers.path}"/>
+ <pathelement location="${OUTDIR}/bin/help"/>
+ </path>
+
+ </target>
+
+
+ <target name="import-helpindexer" extensionOf="pre-compile"
depends="prepare">
+
+ <copy todir="${main.build.dir}">
+ <fileset dir="${OUTDIR}/bin/help" includes="**/*.class"/>
+ </copy>
+
+ </target>
+
+</project>
+
diff --git a/xmlhelp/source/com/sun/star/help/HelpComponent.java
b/xmlhelp/java/LuceneHelpWrapper/src/main/java/com/sun/star/help/HelpComponent.java
similarity index 100%
rename from xmlhelp/source/com/sun/star/help/HelpComponent.java
rename to
xmlhelp/java/LuceneHelpWrapper/src/main/java/com/sun/star/help/HelpComponent.java
diff --git a/xmlhelp/source/com/sun/star/help/HelpIndexer.java
b/xmlhelp/java/LuceneHelpWrapper/src/main/java/com/sun/star/help/HelpIndexer.java
similarity index 100%
rename from xmlhelp/source/com/sun/star/help/HelpIndexer.java
rename to
xmlhelp/java/LuceneHelpWrapper/src/main/java/com/sun/star/help/HelpIndexer.java
diff --git a/xmlhelp/source/com/sun/star/help/HelpSearch.java
b/xmlhelp/java/LuceneHelpWrapper/src/main/java/com/sun/star/help/HelpSearch.java
similarity index 99%
rename from xmlhelp/source/com/sun/star/help/HelpSearch.java
rename to
xmlhelp/java/LuceneHelpWrapper/src/main/java/com/sun/star/help/HelpSearch.java
index a95fd9165ff9..cc0bffb5691c 100644
--- a/xmlhelp/source/com/sun/star/help/HelpSearch.java
+++
b/xmlhelp/java/LuceneHelpWrapper/src/main/java/com/sun/star/help/HelpSearch.java
@@ -204,8 +204,8 @@ public class HelpSearch
// Command line interface for testing
private static String[] doQuery( Object[] args, Object[]
aScoreOutArray ) throws Exception
{
- String aLanguageStr = "";
- String aIndexStr = "";
+ String aLanguageStr = "";
+ String aIndexStr = "";
String aQueryStr = "";
boolean bCaptionOnly = false;
diff --git
a/xmlhelp/java/LuceneHelpWrapper/src/main/java/com/sun/star/help/LuceneHelpWrapper.component
b/xmlhelp/java/LuceneHelpWrapper/src/main/java/com/sun/star/help/LuceneHelpWrapper.component
new file mode 100644
index 000000000000..019b50b664a1
--- /dev/null
+++
b/xmlhelp/java/LuceneHelpWrapper/src/main/java/com/sun/star/help/LuceneHelpWrapper.component
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--***********************************************************
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ ***********************************************************-->
+
+
+
+<component loader="com.sun.star.loader.Java2"
+ xmlns="http://openoffice.org/2010/uno-components";>
+ <implementation name="com.sun.star.help.HelpIndexer">
+ <service name="com.sun.star.help.HelpIndexer"/>
+ </implementation>
+ <implementation name="com.sun.star.help.HelpSearch$_HelpSearch">
+ <service name="com.sun.star.help.HelpSearch"/>
+ </implementation>
+</component>
diff --git
a/xmlhelp/java/LuceneHelpWrapper/src/main/java/com/sun/star/help/MANIFEST.MF
b/xmlhelp/java/LuceneHelpWrapper/src/main/java/com/sun/star/help/MANIFEST.MF
new file mode 100644
index 000000000000..a4c5d50fde5c
--- /dev/null
+++ b/xmlhelp/java/LuceneHelpWrapper/src/main/java/com/sun/star/help/MANIFEST.MF
@@ -0,0 +1 @@
+RegistrationClassName: com.sun.star.help.HelpComponent
diff --git a/xmlhelp/source/com/sun/star/help/helplinker.pmk
b/xmlhelp/java/LuceneHelpWrapper/src/main/java/com/sun/star/help/helplinker.pmk
similarity index 100%
rename from xmlhelp/source/com/sun/star/help/helplinker.pmk
rename to
xmlhelp/java/LuceneHelpWrapper/src/main/java/com/sun/star/help/helplinker.pmk
diff --git a/xmlhelp/source/com/sun/star/help/makefile.mk
b/xmlhelp/java/LuceneHelpWrapper/src/main/java/com/sun/star/help/makefile.mk
similarity index 100%
rename from xmlhelp/source/com/sun/star/help/makefile.mk
rename to
xmlhelp/java/LuceneHelpWrapper/src/main/java/com/sun/star/help/makefile.mk
diff --git a/xmlhelp/prj/build.lst b/xmlhelp/prj/build.lst
index 13ca8b3e6180..58fdb011a9bb 100644
--- a/xmlhelp/prj/build.lst
+++ b/xmlhelp/prj/build.lst
@@ -1,9 +1,2 @@
xh xmlhelp : comphelper ucbhelper LIBXSLT:libxslt unoil
LUCENE:lucene javaunohelper l10ntools NULL
-xh xmlhelp
usr1 - all xh_mkout NULL
-xh xmlhelp\inc
nmake - all xh_inc NULL
-xh xmlhelp\source\treeview nmake -
all xh_treeview xh_inc NULL
-xh xmlhelp\source\com\sun\star\help nmake - all
xh_help xh_inc NULL
-xh xmlhelp\source\cxxhelp\util nmake -
all xh_cutil xh_inc NULL
-xh xmlhelp\source\cxxhelp\qe nmake -
all xh_qe xh_inc NULL
-xh xmlhelp\source\cxxhelp\provider nmake - all
xh_provider xh_inc NULL
-xh xmlhelp\util nmake -
all xh_util xh_cutil xh_qe xh_provider NULL
+xh xmlhelp\prj
nmake - all xh_prj NULL
diff --git a/xmlhelp/prj/d.lst b/xmlhelp/prj/d.lst
index 740ff554ee34..e69de29bb2d1 100644
--- a/xmlhelp/prj/d.lst
+++ b/xmlhelp/prj/d.lst
@@ -1,12 +0,0 @@
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.*
-..\%__SRC%\bin\HelpLinker* %_DEST%\bin%_EXT%
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.*
-..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.*
-..\util\ucpchelp.xml %_DEST%\xml%_EXT%\ucpchelp.xml
-..\util\*.xsl %_DEST%\bin%_EXT%\*.*
-..\%__SRC%\lib\ihelplinker.lib %_DEST%\lib%_EXT%\ihelplinker.lib
-..\%__SRC%\bin\helpxsl.zip %_DEST%\pck%_EXT%\helpxsl.zip
-..\%__SRC%\misc\LuceneHelpWrapper.component
%_DEST%\xml%_EXT%\LuceneHelpWrapper.component
-..\%__SRC%\misc\tvhlp1.component %_DEST%\xml%_EXT%\tvhlp1.component
-..\%__SRC%\misc\ucpchelp1.component %_DEST%\xml%_EXT%\ucpchelp1.component
diff --git a/xmlhelp/inc/makefile.mk b/xmlhelp/prj/makefile.mk
similarity index 69%
rename from xmlhelp/inc/makefile.mk
rename to xmlhelp/prj/makefile.mk
index 479df6f6ac6a..c62c6a657d16 100644
--- a/xmlhelp/inc/makefile.mk
+++ b/xmlhelp/prj/makefile.mk
@@ -20,24 +20,25 @@
#**************************************************************
-PRJ=..
-
-PRJNAME=xmlhelp
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
- $(SLO)$/precompiled.pch \
- $(SLO)$/precompiled_ex.pch
-
-.ENDIF # "$(ENABLE_PCH)"!=""
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
+all:
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET)
$(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/xmlhelp/source/cxxhelp/provider/makefile.mk
b/xmlhelp/source/cxxhelp/provider/makefile.mk
deleted file mode 100644
index baf7ad54ee92..000000000000
--- a/xmlhelp/source/cxxhelp/provider/makefile.mk
+++ /dev/null
@@ -1,89 +0,0 @@
-#**************************************************************
-#
-# 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
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-
-PRJ=..$/..$/..
-PRJNAME=xmlhelp
-TARGET=chelp
-
-ENABLE_EXCEPTIONS=TRUE
-USE_DEFFILE=TRUE
-NO_BSYMBOLIC=TRUE
-
-
-# --- Settings ---------------------------------------------------------
-
-.INCLUDE: settings.mk
-
-# GCC versions 4.2.x introduced a warning "allocating zero-element array"
-# Allocating zero-element arrays is an allowed if not somewhat dubious
-# technique though, so this warning is plain wrong and has been fixed
-# in gcc 4.3. Unfortunately there is no way at all to suppress this warning.
-# Some files in this directory use zero allocated arrays, we need to
-# disable the WaE mechanism for the GCC 4.2.x series.
-.IF "$(COM)"=="GCC"
-.IF "$(CCNUMVER)">="000400020000" && "$(CCNUMVER)"<="000400020003"
-CFLAGSWERRCXX:=
-.ENDIF # "$(CCNUMVER)">="000400020000" && "$(CCNUMVER)"<="000400020003"
-.ENDIF # "$(COM)"=="GCC"
-
-CFLAGS += -DHAVE_EXPAT_H
-
-.IF "$(SYSTEM_LIBXML)" == "YES"
-CFLAGS+= $(LIBXML_CFLAGS)
-.ELSE
-LIBXMLINCDIR=external$/libxml
-CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXMLINCDIR)
-.ENDIF
-
-.IF "$(SYSTEM_LIBXSLT)" == "YES"
-CFLAGS+= $(LIBXSLT_CFLAGS)
-.ELSE
-LIBXSLTINCDIR=external$/libxslt
-CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXSLTINCDIR)
-.ENDIF
-
-.IF "$(GUI)"=="WNT"
-CFLAGS+=-GR
-.ENDIF
-
-# --- General -----------------------------------------------------
-
-SLOFILES=\
- $(SLO)$/db.obj \
- $(SLO)$/databases.obj \
- $(SLO)$/services.obj \
- $(SLO)$/resultset.obj \
- $(SLO)$/resultsetbase.obj \
- $(SLO)$/resultsetforroot.obj \
- $(SLO)$/resultsetforquery.obj \
- $(SLO)$/contentcaps.obj \
- $(SLO)$/provider.obj \
- $(SLO)$/content.obj \
- $(SLO)$/urlparameter.obj \
- $(SLO)$/inputstream.obj \
- $(SLO)$/bufferedinputstream.obj
-
-# --- Targets ----------------------------------------------------------
-
-.INCLUDE: target.mk
-
diff --git a/xmlhelp/source/cxxhelp/provider/services.cxx
b/xmlhelp/source/cxxhelp/provider/services.cxx
index 4eb37f259d3a..8a385b0375a6 100644
--- a/xmlhelp/source/cxxhelp/provider/services.cxx
+++ b/xmlhelp/source/cxxhelp/provider/services.cxx
@@ -32,14 +32,14 @@
using namespace com::sun::star;
//=========================================================================
-extern "C" void SAL_CALL component_getImplementationEnvironment(
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL
component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
//=========================================================================
-extern "C" void * SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName,
void * pServiceManager,
void * /*pRegistryKey*/ )
diff --git a/xmlhelp/source/treeview/tvfactory.cxx
b/xmlhelp/source/treeview/tvfactory.cxx
index 08c63574244e..e0cf8e3dc497 100644
--- a/xmlhelp/source/treeview/tvfactory.cxx
+++ b/xmlhelp/source/treeview/tvfactory.cxx
@@ -252,7 +252,7 @@ TVFactory::CreateInstance(
}
//=========================================================================
-extern "C" void SAL_CALL component_getImplementationEnvironment(
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL
component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv )
{
(void)ppEnv;
@@ -261,7 +261,7 @@ extern "C" void SAL_CALL
component_getImplementationEnvironment(
}
//=========================================================================
-extern "C" void * SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName,void * pServiceManager,void * pRegistryKey )
{
(void)pRegistryKey;
diff --git a/xmlhelp/util/makefile.mk b/xmlhelp/util/makefile.mk
deleted file mode 100644
index 275f2412198f..000000000000
--- a/xmlhelp/util/makefile.mk
+++ /dev/null
@@ -1,87 +0,0 @@
-#**************************************************************
-#
-# 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
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-
-UCP_VERSION=1
-UCP_NAME=chelp
-
-PRJ=..
-PRJNAME=xmlhelp
-TARGET=ucp$(UCP_NAME)
-UCPHELP_MAJOR=1
-
-ENABLE_EXCEPTIONS=TRUE
-USE_DEFFILE=TRUE
-NO_BSYMBOLIC=TRUE
-
-# --- Settings ---------------------------------------------------------
-
-.INCLUDE: settings.mk
-
-.IF "$(GUI)"=="WNT"
-CFLAGS+=-GR
-.ENDIF
-
-# --- Shared-Library ---------------------------------------------------
-
-SHL1TARGET=$(TARGET)$(UCP_VERSION)
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-SHL1IMPLIB=i$(TARGET)
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-# Add additional libs here.
-SHL1STDLIBS= \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(COMPHELPERLIB) \
- $(SALLIB) \
- $(EXPATASCII3RDLIB) \
- $(UCBHELPERLIB) \
- $(XSLTLIB)
-
-SHL1LIBS = \
- $(SLB)$/jaqe.lib \
- $(SLB)$/jautil.lib \
- $(SLB)$/chelp.lib
-
-# --- Def-File ---------------------------------------------------------
-
-DEF1NAME=$(SHL1TARGET)
-
-# --- Targets ----------------------------------------------------------
-
-ZIP1TARGET=helpxsl
-ZIP1FLAGS= -u -r
-#ZIP1DIR=$(PRJ)$/source$/auxiliary
-ZIP1LIST=main_transform*.xsl idxcaption.xsl idxcontent.xsl
-
-
-.INCLUDE: target.mk
-
-
-ALLTAR : $(MISC)/ucpchelp1.component
-
-$(MISC)/ucpchelp1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- ucpchelp1.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt ucpchelp1.component
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
