Author: damjan
Date: Wed Aug 15 07:01:42 2018
New Revision: 1838068
URL: http://svn.apache.org/viewvc?rev=1838068&view=rev
Log:
Port main/xmlhelp to gbuild.
Patch by: me
Added:
openoffice/trunk/main/xmlhelp/Ant_LuceneHelpWrapper.mk
openoffice/trunk/main/xmlhelp/Library_tvhlp1.mk
openoffice/trunk/main/xmlhelp/Library_ucpchelp1.mk
openoffice/trunk/main/xmlhelp/Makefile (with props)
openoffice/trunk/main/xmlhelp/Module_xmlhelp.mk
openoffice/trunk/main/xmlhelp/Package_xml.mk
openoffice/trunk/main/xmlhelp/Package_xsl.mk
openoffice/trunk/main/xmlhelp/Zip_helpxsl.mk
openoffice/trunk/main/xmlhelp/java/
openoffice/trunk/main/xmlhelp/java/LuceneHelpWrapper/
openoffice/trunk/main/xmlhelp/java/LuceneHelpWrapper/LuceneHelpWrapper.component
- copied unchanged from r1838047,
openoffice/trunk/main/xmlhelp/source/com/sun/star/help/LuceneHelpWrapper.component
openoffice/trunk/main/xmlhelp/java/LuceneHelpWrapper/MANIFEST.MF
- copied unchanged from r1838047,
openoffice/trunk/main/xmlhelp/source/com/sun/star/help/MANIFEST.MF
openoffice/trunk/main/xmlhelp/java/LuceneHelpWrapper/build.xml (with
props)
openoffice/trunk/main/xmlhelp/java/LuceneHelpWrapper/src/
openoffice/trunk/main/xmlhelp/java/LuceneHelpWrapper/src/main/
openoffice/trunk/main/xmlhelp/java/LuceneHelpWrapper/src/main/java/
openoffice/trunk/main/xmlhelp/java/LuceneHelpWrapper/src/main/java/com/
- copied from r1838067, openoffice/trunk/main/xmlhelp/source/com/
openoffice/trunk/main/xmlhelp/prj/makefile.mk
Removed:
openoffice/trunk/main/xmlhelp/inc/makefile.mk
openoffice/trunk/main/xmlhelp/java/LuceneHelpWrapper/src/main/java/com/sun/star/help/LuceneHelpWrapper.component
openoffice/trunk/main/xmlhelp/java/LuceneHelpWrapper/src/main/java/com/sun/star/help/MANIFEST.MF
openoffice/trunk/main/xmlhelp/java/LuceneHelpWrapper/src/main/java/com/sun/star/help/helplinker.pmk
openoffice/trunk/main/xmlhelp/java/LuceneHelpWrapper/src/main/java/com/sun/star/help/makefile.mk
openoffice/trunk/main/xmlhelp/source/com/
openoffice/trunk/main/xmlhelp/source/cxxhelp/provider/makefile.mk
openoffice/trunk/main/xmlhelp/source/cxxhelp/qe/makefile.mk
openoffice/trunk/main/xmlhelp/source/cxxhelp/util/makefile.mk
openoffice/trunk/main/xmlhelp/util/makefile.mk
Modified:
openoffice/trunk/main/Module_ooo.mk
openoffice/trunk/main/Repository.mk
openoffice/trunk/main/postprocess/packcomponents/makefile.mk
openoffice/trunk/main/solenv/ant/externals.xml
openoffice/trunk/main/xmlhelp/prj/build.lst
openoffice/trunk/main/xmlhelp/prj/d.lst
openoffice/trunk/main/xmlhelp/source/cxxhelp/provider/services.cxx
openoffice/trunk/main/xmlhelp/source/treeview/tvfactory.cxx
Modified: openoffice/trunk/main/Module_ooo.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/Module_ooo.mk?rev=1838068&r1=1838067&r2=1838068&view=diff
==============================================================================
--- openoffice/trunk/main/Module_ooo.mk (original)
+++ openoffice/trunk/main/Module_ooo.mk Wed Aug 15 07:01:42 2018
@@ -103,6 +103,7 @@ $(eval $(call gb_Module_add_moduledirs,o
writerfilter \
x11_extensions \
xml2cmp \
+ xmlhelp \
xmloff \
xmlreader \
xmlscript \
Modified: openoffice/trunk/main/Repository.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/Repository.mk?rev=1838068&r1=1838067&r2=1838068&view=diff
==============================================================================
--- openoffice/trunk/main/Repository.mk (original)
+++ openoffice/trunk/main/Repository.mk Wed Aug 15 07:01:42 2018
@@ -153,6 +153,8 @@ $(eval $(call gb_Helper_register_librari
textconversiondlgs \
ootk \
tl \
+ tvhlp1 \
+ ucpchelp1 \
utl \
unordf \
unoxml \
Modified: openoffice/trunk/main/postprocess/packcomponents/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/postprocess/packcomponents/makefile.mk?rev=1838068&r1=1838067&r2=1838068&view=diff
==============================================================================
--- openoffice/trunk/main/postprocess/packcomponents/makefile.mk (original)
+++ openoffice/trunk/main/postprocess/packcomponents/makefile.mk Wed Aug 15
07:01:42 2018
@@ -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/sou
.IF "$(SOLAR_JAVA)" == "TRUE"
my_components += \
- LuceneHelpWrapper \
+ component/xmlhelp/java/LuceneHelpWrapper/LuceneHelpWrapper \
ScriptFramework \
ScriptProviderForJava \
XMergeBridge \
Modified: openoffice/trunk/main/solenv/ant/externals.xml
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/ant/externals.xml?rev=1838068&r1=1838067&r2=1838068&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/ant/externals.xml (original)
+++ openoffice/trunk/main/solenv/ant/externals.xml Wed Aug 15 07:01:42 2018
@@ -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>
Added: openoffice/trunk/main/xmlhelp/Ant_LuceneHelpWrapper.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/xmlhelp/Ant_LuceneHelpWrapper.mk?rev=1838068&view=auto
==============================================================================
--- openoffice/trunk/main/xmlhelp/Ant_LuceneHelpWrapper.mk (added)
+++ openoffice/trunk/main/xmlhelp/Ant_LuceneHelpWrapper.mk Wed Aug 15 07:01:42
2018
@@ -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_Ant_Ant,LuceneHelpWrapper,$(SRCDIR)/xmlhelp/java/LuceneHelpWrapper/build.xml))
+
+$(eval $(call
gb_Ant_set_componentfile,LuceneHelpWrapper,xmlhelp/java/LuceneHelpWrapper/LuceneHelpWrapper,OOO))
+
+# vim: set noet sw=4 ts=4:
+
Added: openoffice/trunk/main/xmlhelp/Library_tvhlp1.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/xmlhelp/Library_tvhlp1.mk?rev=1838068&view=auto
==============================================================================
--- openoffice/trunk/main/xmlhelp/Library_tvhlp1.mk (added)
+++ openoffice/trunk/main/xmlhelp/Library_tvhlp1.mk Wed Aug 15 07:01:42 2018
@@ -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:
Added: openoffice/trunk/main/xmlhelp/Library_ucpchelp1.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/xmlhelp/Library_ucpchelp1.mk?rev=1838068&view=auto
==============================================================================
--- openoffice/trunk/main/xmlhelp/Library_ucpchelp1.mk (added)
+++ openoffice/trunk/main/xmlhelp/Library_ucpchelp1.mk Wed Aug 15 07:01:42 2018
@@ -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:
Added: openoffice/trunk/main/xmlhelp/Makefile
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/xmlhelp/Makefile?rev=1838068&view=auto
==============================================================================
--- openoffice/trunk/main/xmlhelp/Makefile (added)
+++ openoffice/trunk/main/xmlhelp/Makefile Wed Aug 15 07:01:42 2018
@@ -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:
Propchange: openoffice/trunk/main/xmlhelp/Makefile
------------------------------------------------------------------------------
svn:eol-style = native
Added: openoffice/trunk/main/xmlhelp/Module_xmlhelp.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/xmlhelp/Module_xmlhelp.mk?rev=1838068&view=auto
==============================================================================
--- openoffice/trunk/main/xmlhelp/Module_xmlhelp.mk (added)
+++ openoffice/trunk/main/xmlhelp/Module_xmlhelp.mk Wed Aug 15 07:01:42 2018
@@ -0,0 +1,37 @@
+#**************************************************************
+#
+# 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_Module_Module,xmlhelp))
+
+$(eval $(call gb_Module_add_targets,xmlhelp,\
+ Ant_LuceneHelpWrapper \
+ Library_tvhlp1 \
+ Library_ucpchelp1 \
+ Package_xml \
+ Package_xsl \
+ Zip_helpxsl \
+))
+
+
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/xmlhelp/Package_xml.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/xmlhelp/Package_xml.mk?rev=1838068&view=auto
==============================================================================
--- openoffice/trunk/main/xmlhelp/Package_xml.mk (added)
+++ openoffice/trunk/main/xmlhelp/Package_xml.mk Wed Aug 15 07:01:42 2018
@@ -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))
Added: openoffice/trunk/main/xmlhelp/Package_xsl.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/xmlhelp/Package_xsl.mk?rev=1838068&view=auto
==============================================================================
--- openoffice/trunk/main/xmlhelp/Package_xsl.mk (added)
+++ openoffice/trunk/main/xmlhelp/Package_xsl.mk Wed Aug 15 07:01:42 2018
@@ -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))
Added: openoffice/trunk/main/xmlhelp/Zip_helpxsl.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/xmlhelp/Zip_helpxsl.mk?rev=1838068&view=auto
==============================================================================
--- openoffice/trunk/main/xmlhelp/Zip_helpxsl.mk (added)
+++ openoffice/trunk/main/xmlhelp/Zip_helpxsl.mk Wed Aug 15 07:01:42 2018
@@ -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:
Added: openoffice/trunk/main/xmlhelp/java/LuceneHelpWrapper/build.xml
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/xmlhelp/java/LuceneHelpWrapper/build.xml?rev=1838068&view=auto
==============================================================================
--- openoffice/trunk/main/xmlhelp/java/LuceneHelpWrapper/build.xml (added)
+++ openoffice/trunk/main/xmlhelp/java/LuceneHelpWrapper/build.xml Wed Aug 15
07:01:42 2018
@@ -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>
+
Propchange: openoffice/trunk/main/xmlhelp/java/LuceneHelpWrapper/build.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: openoffice/trunk/main/xmlhelp/java/LuceneHelpWrapper/build.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: openoffice/trunk/main/xmlhelp/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/xmlhelp/prj/build.lst?rev=1838068&r1=1838067&r2=1838068&view=diff
==============================================================================
--- openoffice/trunk/main/xmlhelp/prj/build.lst (original)
+++ openoffice/trunk/main/xmlhelp/prj/build.lst Wed Aug 15 07:01:42 2018
@@ -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
Modified: openoffice/trunk/main/xmlhelp/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/xmlhelp/prj/d.lst?rev=1838068&r1=1838067&r2=1838068&view=diff
==============================================================================
--- openoffice/trunk/main/xmlhelp/prj/d.lst (original)
+++ openoffice/trunk/main/xmlhelp/prj/d.lst Wed Aug 15 07:01:42 2018
@@ -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
Added: openoffice/trunk/main/xmlhelp/prj/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/xmlhelp/prj/makefile.mk?rev=1838068&view=auto
==============================================================================
--- openoffice/trunk/main/xmlhelp/prj/makefile.mk (added)
+++ openoffice/trunk/main/xmlhelp/prj/makefile.mk Wed Aug 15 07:01:42 2018
@@ -0,0 +1,44 @@
+#**************************************************************
+#
+# 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=..
+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
Modified: openoffice/trunk/main/xmlhelp/source/cxxhelp/provider/services.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/xmlhelp/source/cxxhelp/provider/services.cxx?rev=1838068&r1=1838067&r2=1838068&view=diff
==============================================================================
--- openoffice/trunk/main/xmlhelp/source/cxxhelp/provider/services.cxx
(original)
+++ openoffice/trunk/main/xmlhelp/source/cxxhelp/provider/services.cxx Wed Aug
15 07:01:42 2018
@@ -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*/ )
Modified: openoffice/trunk/main/xmlhelp/source/treeview/tvfactory.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/xmlhelp/source/treeview/tvfactory.cxx?rev=1838068&r1=1838067&r2=1838068&view=diff
==============================================================================
--- openoffice/trunk/main/xmlhelp/source/treeview/tvfactory.cxx (original)
+++ openoffice/trunk/main/xmlhelp/source/treeview/tvfactory.cxx Wed Aug 15
07:01:42 2018
@@ -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_getIm
}
//=========================================================================
-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;
