[Libreoffice] cppunit test and smoketest failures
Peter Foley
pefoley2 at verizon.net
Sun Oct 2 11:49:14 PDT 2011
I'm getting the below test failures while building libreoffice.
I don't know enough about cppunit or smoketest to figure out what the
problem is.
I've attached the gbuild patches that I'm currently working on in case
one of them trigers this failure.
Help would be appreciated.
Peter
[ build CUT ] sc_filters_test
/bin/sh: line 1: 31155 Aborted LD_LIBRARY_PATH=$O/lib STAR_RESOURCEPATH=$O/bin/ $O/bin/cppunit/cppunittester $W/LinkTarget/CppunitTest/libtest_sc_filters_test.so --protector unoexceptionprotector.so unoexceptionprotector -env:OOO_CONFIG_REGISTRY_DIR=file://$O/xml/registry "-env:UNO_TYPES= file://$O/bin/udkapi.rdb file://$O/bin/types.rdb" "-env:UNO_SERVICES=file://$O/xml/ure/services.rdb file://$W/RdbTarget/sc_filters_test.rdb" -env:URE_INTERNAL_LIB_DIR=file://$O/lib -env:OOO_BASE_DIR=file://$O/lib -env:BRAND_BASE_DIR=file://$O/lib > $W/CppunitTest/sc_filters_test.test.log 2>&1
An uncaught exception of type com.sun.star.container.NoSuchElementException
Exception Message was: Paths/Work
terminate called after throwing an instance of 'com::sun::star::container::NoSuchElementException'
make[1]: *** [/root/libreoffice/workdir/unxlngx6.pro/CppunitTest/sc_filters_test.test] Error 1
: && LD_LIBRARY_PATH=/root/libreoffice/smoketestoo_native/unxlngx6.pro/lib:/root/libreoffice/solver/unxlngx6.pro/lib${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} /root/libreoffice/solver/unxlngx6.pro/bin/cppunit/cppunittester \
-env:UNO_SERVICES=file:///root/libreoffice/solver/unxlngx6.pro/xml/ure/services.rdb \
-env:UNO_TYPES=file:///root/libreoffice/solver/unxlngx6.pro/bin/types.rdb \
-env:arg-soffice=path:/root/libreoffice/solver/unxlngx6.pro/installation/opt/program/soffice -env:arg-user=./unxlngx6.pro/misc/smoketest/user \
-env:arg-env=LD_LIBRARY_PATH"${LD_LIBRARY_PATH+=$LD_LIBRARY_PATH}" -env:arg-testarg.smoketest.doc=./unxlngx6.pro/bin/smoketestdoc.sxw --protector \
/root/libreoffice/solver/unxlngx6.pro/lib/unoexceptionprotector.so \
unoexceptionprotector ./unxlngx6.pro/lib/libsmoketest.so
officeconnection.cxx:142:Assertion
Test name: N12_GLOBAL__N_14TestE::test
setUp() failed
- equality assertion failed
- Expected: 2
- Actual : 0
officeconnection.cxx:171:Assertion
Test name: N12_GLOBAL__N_14TestE::test
tearDown() failed
- equality assertion failed
- Expected: 0
- Actual : 77
Failures !!!
Run: 1 Failure total: 2 Failures: 2 Errors: 0
-------------- next part --------------
From 8194585400914c1cbecd37d8632739fd6ebf9559 Mon Sep 17 00:00:00 2001
From: Peter Foley <pefoley2 at verizon.net>
Date: Wed, 21 Sep 2011 15:38:53 -0400
Subject: [PATCH 1/5] convert swext to gbuild and add to tail_build
---
Module_tail_build.mk | 1 +
RepositoryModule_ooo.mk | 1 +
postprocess/prj/build.lst | 2 +-
swext/Configuration_mediawiki.mk | 50 +++++
swext/Extension_wiki-publisher.mk | 62 ++++++
swext/Jar_mediawiki.mk | 72 ++++++
swext/Makefile | 38 ++++
swext/Module_swext.mk | 39 ++++
swext/Zip_mediawiki_develop.mk | 60 +++++
swext/makefile.pmk | 37 ----
swext/mediawiki/build.xml | 227 --------------------
swext/mediawiki/help/component.txt | 2 +-
swext/mediawiki/help/makefile.mk | 87 --------
swext/mediawiki/help/wiki.xhp | 30 ++--
swext/mediawiki/help/wikiaccount.xhp | 2 +-
swext/mediawiki/help/wikiformats.xhp | 4 +-
swext/mediawiki/help/wikisend.xhp | 2 +-
swext/mediawiki/help/wikisettings.xhp | 6 +-
swext/mediawiki/makefile.mk | 69 ------
swext/mediawiki/src/com/sun/star/wiki/MANIFEST.MF | 1 +
swext/mediawiki/src/description.xml | 4 +-
swext/mediawiki/src/makefile.mk | 54 -----
swext/mediawiki/src/manifest.xml | 53 +++++
.../org/openoffice/Office/Custom/WikiExtension.xcu | 2 +-
.../data/org/openoffice/Office/Custom/makefile.mk | 48 ----
.../data/org/openoffice/Office/OptionsDialog.xcu | 2 +-
.../data/org/openoffice/Office/makefile.mk | 46 ----
.../data/org/openoffice/TypeDetection/makefile.mk | 46 ----
.../org/openoffice/Office/Custom/makefile.mk | 46 ----
swext/mediawiki/src/uno-extension-manifest.xml | 53 -----
swext/prj/build.lst | 9 +-
swext/prj/d.lst | 5 -
swext/prj/makefile.mk | 40 ++++
tail_build/prj/build.lst | 2 +-
34 files changed, 447 insertions(+), 755 deletions(-)
create mode 100644 swext/Configuration_mediawiki.mk
create mode 100644 swext/Extension_wiki-publisher.mk
create mode 100644 swext/Jar_mediawiki.mk
create mode 100644 swext/Makefile
create mode 100644 swext/Module_swext.mk
create mode 100644 swext/Zip_mediawiki_develop.mk
delete mode 100644 swext/makefile.pmk
delete mode 100644 swext/mediawiki/build.xml
delete mode 100644 swext/mediawiki/help/makefile.mk
delete mode 100644 swext/mediawiki/makefile.mk
create mode 100644 swext/mediawiki/src/com/sun/star/wiki/MANIFEST.MF
delete mode 100644 swext/mediawiki/src/makefile.mk
create mode 100644 swext/mediawiki/src/manifest.xml
delete mode 100644 swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/makefile.mk
delete mode 100644 swext/mediawiki/src/registry/data/org/openoffice/Office/makefile.mk
delete mode 100644 swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/makefile.mk
delete mode 100644 swext/mediawiki/src/registry/schema/org/openoffice/Office/Custom/makefile.mk
delete mode 100644 swext/mediawiki/src/uno-extension-manifest.xml
create mode 100644 swext/prj/makefile.mk
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 4840c44..7066789 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -52,6 +52,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
slideshow \
starmath \
sw \
+ swext \
unoxml \
uui \
vbahelper \
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index e0935ea..66162d9 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -80,6 +80,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
svtools \
svx \
sw \
+ swext \
twain \
toolkit \
tools \
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index 0834cd0..a52c918 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po postprocess :: accessibility BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n dtrans embeddedobj embedserv EPM:epm DESKTOP:extensions extras fpicker HELP:helpcontent2 io LIBRSVG:librsvg lingucomponent ODK:odk officecfg package psprint_config remotebridges scaddins scp2 DESKTOP:setup_native sysui testtools ucb UnoControls ure wizards xmerge MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt tail_build NULL
+po postprocess :: accessibility BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n dtrans embeddedobj embedserv EPM:epm DESKTOP:extensions extras fpicker HELP:helpcontent2 io LIBRSVG:librsvg lingucomponent ODK:odk officecfg package psprint_config remotebridges scaddins scp2 DESKTOP:setup_native sysui testtools ucb UnoControls ure wizards xmerge MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt tail_build NULL
po postprocess usr1 - all po_mkout NULL
po postprocess\checkxml nmake - all po_checkxml NULL
po postprocess\checkdeliver nmake - all po_checkdlv NULL
diff --git a/swext/Configuration_mediawiki.mk b/swext/Configuration_mediawiki.mk
new file mode 100644
index 0000000..9ece045
--- /dev/null
+++ b/swext/Configuration_mediawiki.mk
@@ -0,0 +1,50 @@
+#
+# 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.
+#
+# The Initial Developer of the Original Code is
+# Peter Foley <pefoley2 at verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# 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_Configuration_Configuration,mediawiki,SRCDIR))
+
+$(eval $(call gb_Configuration_add_datas,mediawiki,swext/mediawiki/src/registry/data,\
+ org/openoffice/Office/Addons.xcu \
+ org/openoffice/Office/OptionsDialog.xcu \
+ org/openoffice/Office/ProtocolHandler.xcu \
+ org/openoffice/Office/Paths.xcu \
+ org/openoffice/Office/Custom/WikiExtension.xcu \
+ org/openoffice/TypeDetection/Filter.xcu \
+ org/openoffice/TypeDetection/Types.xcu \
+))
+
+$(eval $(call gb_Configuration_add_localized_datas,mediawiki,swext/mediawiki/src/registry/data,\
+ org/openoffice/Office/Addons.xcu \
+ org/openoffice/Office/OptionsDialog.xcu \
+ org/openoffice/Office/Custom/WikiExtension.xcu \
+))
+
+$(eval $(call gb_Configuration_add_schemas,mediawiki,swext/mediawiki/src/registry/schema,\
+ org/openoffice/Office/Custom/WikiExtension.xcs \
+))
diff --git a/swext/Extension_wiki-publisher.mk b/swext/Extension_wiki-publisher.mk
new file mode 100644
index 0000000..20460a9
--- /dev/null
+++ b/swext/Extension_wiki-publisher.mk
@@ -0,0 +1,62 @@
+#
+# 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.
+#
+# The Initial Developer of the Original Code is
+# Peter Foley <pefoley2 at verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# 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.
+#
+
+WIKISRC := $(SRCDIR)/swext/mediawiki
+
+$(eval $(call gb_Extension_Extension,wiki-publisher,swext/mediawiki/src))
+
+$(eval $(call gb_Extension_add_file,wiki-publisher,commons-codec-1.3.jar,$(OUTDIR)/bin/commons-codec-1.3.jar))
+$(eval $(call gb_Extension_add_file,wiki-publisher,commons-httpclient-3.1.jar,$(OUTDIR)/bin/commons-httpclient-3.1.jar))
+$(eval $(call gb_Extension_add_file,wiki-publisher,commons-lang-2.3.jar,$(OUTDIR)/bin/commons-lang-2.3.jar))
+$(eval $(call gb_Extension_add_file,wiki-publisher,commons-logging-1.1.1.jar,$(OUTDIR)/bin/commons-logging-1.1.1.jar))
+$(eval $(call gb_Extension_add_file,wiki-publisher,Addons.xcu,$(WIKISRC)/src/registry/data/org/openoffice/Office/Addons.xcu))
+$(eval $(call gb_Extension_add_file,wiki-publisher,Filter.xcu,$(WIKISRC)/src/registry/data/org/openoffice/TypeDetection/Filter.xcu))
+$(eval $(call gb_Extension_add_file,wiki-publisher,OptionsDialog.xcu,$(WIKISRC)/src/registry/data/org/openoffice/Office/OptionsDialog.xcu))
+$(eval $(call gb_Extension_add_file,wiki-publisher,Paths.xcu,$(WIKISRC)/src/registry/data/org/openoffice/Office/Paths.xcu))
+$(eval $(call gb_Extension_add_file,wiki-publisher,ProtocolHandler.xcu,$(WIKISRC)/src/registry/data/org/openoffice/Office/ProtocolHandler.xcu))
+$(eval $(call gb_Extension_add_file,wiki-publisher,Types.xcu,$(WIKISRC)/src/registry/data/org/openoffice/TypeDetection/Types.xcu))
+$(eval $(call gb_Extension_add_file,wiki-publisher,WikiExtension.xcs,$(WIKISRC)/src/registry/schema/org/openoffice/Office/Custom/WikiExtension.xcs))
+$(eval $(call gb_Extension_add_file,wiki-publisher,WikiExtension.xcu,$(WIKISRC)/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu))
+$(eval $(call gb_Extension_add_file,wiki-publisher,mediawiki.jar,$(OUTDIR)/bin/mediawiki.jar))
+$(eval $(call gb_Extension_add_file,wiki-publisher,WikiEditor/EditSetting.xdl,$(WIKISRC)/dialogs/EditSetting.xdl))
+$(eval $(call gb_Extension_add_file,wiki-publisher,WikiEditor/Settings.xdl,$(WIKISRC)/dialogs/Settings.xdl))
+$(eval $(call gb_Extension_add_file,wiki-publisher,WikiEditor/Module1.xba,$(WIKISRC)/dialogs/Module1.xba))
+$(eval $(call gb_Extension_add_file,wiki-publisher,WikiEditor/script.xlb,$(WIKISRC)/dialogs/script.xlb))
+$(eval $(call gb_Extension_add_file,wiki-publisher,WikiEditor/dialog.xlb,$(WIKISRC)/dialogs/dialog.xlb))
+$(eval $(call gb_Extension_add_file,wiki-publisher,WikiEditor/SendToMediaWiki.xdl,$(WIKISRC)/dialogs/SendToMediaWiki.xdl))
+$(eval $(call gb_Extension_add_file,wiki-publisher,filter/odt2mediawiki.xsl,$(WIKISRC)/src/filter/odt2mediawiki.xsl))
+$(eval $(call gb_Extension_add_file,wiki-publisher,help/component.txt,$(WIKISRC)/help/component.txt))
+$(eval $(call gb_Extension_add_file,wiki-publisher,help/en-US/com.sun.wiki-publisher/wikisend.xhp,$(WIKISRC)/help/wikisend.xhp))
+$(eval $(call gb_Extension_add_file,wiki-publisher,help/en-US/com.sun.wiki-publisher/wikiformats.xhp,$(WIKISRC)/help/wikiformats.xhp))
+$(eval $(call gb_Extension_add_file,wiki-publisher,help/en-US/com.sun.wiki-publisher/wikiaccount.xhp,$(WIKISRC)/help/wikiaccount.xhp))
+$(eval $(call gb_Extension_add_file,wiki-publisher,help/en-US/com.sun.wiki-publisher/wiki.xhp,$(WIKISRC)/help/wiki.xhp))
+$(eval $(call gb_Extension_add_file,wiki-publisher,help/en-US/com.sun.wiki-publisher/wikisettings.xhp,$(WIKISRC)/help/wikisettings.xhp))
+$(eval $(call gb_Extension_add_file,wiki-publisher,license/THIRDPARTYLICENSEREADME.html,$(WIKISRC)/src/THIRDPARTYLICENSEREADME.html))
+$(eval $(call gb_Extension_add_file,wiki-publisher,templates/MediaWiki/mediawiki.ott,$(WIKISRC)/src/filter/mediawiki.ott))
+
diff --git a/swext/Jar_mediawiki.mk b/swext/Jar_mediawiki.mk
new file mode 100644
index 0000000..acafa86
--- /dev/null
+++ b/swext/Jar_mediawiki.mk
@@ -0,0 +1,72 @@
+#
+# 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.
+#
+# The Initial Developer of the Original Code is
+# Peter Foley <pefoley2 at verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# 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,mediawiki,SRCDIR))
+
+$(eval $(call gb_Jar_set_packageroot,mediawiki,com))
+
+$(eval $(call gb_Jar_set_manifest,mediawiki,$(SRCDIR)/swext/mediawiki/src/com/sun/star/wiki/MANIFEST.MF))
+
+$(eval $(call gb_Jar_set_jarclasspath,mediawiki,\
+ commons-codec-1.3.jar \
+ commons-lang-2.3.jar \
+ commons-httpclient-3.1.jar \
+ commons-logging-1.1.1.jar \
+))
+
+$(eval $(call gb_Jar_add_jars,mediawiki,\
+ $(OUTDIR)/bin/juh.jar \
+ $(OUTDIR)/bin/jurt.jar \
+ $(OUTDIR)/bin/ridl.jar \
+ $(OUTDIR)/bin/unoil.jar \
+))
+
+ifneq ($(SYSTEM_APACHE_COMMONS),YES)
+$(eval $(call gb_Jar_add_jars,mediawiki,\
+ $(OUTDIR)/bin/commons-codec-1.3.jar \
+ $(OUTDIR)/bin/commons-lang-2.3.jar \
+ $(OUTDIR)/bin/commons-httpclient-3.1.jar \
+ $(OUTDIR)/bin/commons-logging-1.1.1.jar \
+))
+endif
+
+$(eval $(call gb_Jar_add_sourcefiles,mediawiki,\
+ swext/mediawiki/src/com/sun/star/wiki/EditPageParser \
+ swext/mediawiki/src/com/sun/star/wiki/Helper \
+ swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor \
+ swext/mediawiki/src/com/sun/star/wiki/Settings \
+ swext/mediawiki/src/com/sun/star/wiki/WikiArticle \
+ swext/mediawiki/src/com/sun/star/wiki/WikiCancelException \
+ swext/mediawiki/src/com/sun/star/wiki/WikiDialog \
+ swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl \
+ swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog \
+ swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl \
+ swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog \
+ swext/mediawiki/src/com/sun/star/wiki/WikiProtocolSocketFactory \
+))
diff --git a/swext/Makefile b/swext/Makefile
new file mode 100644
index 0000000..5bedaf0
--- /dev/null
+++ b/swext/Makefile
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 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/swext/Module_swext.mk b/swext/Module_swext.mk
new file mode 100644
index 0000000..00229f8
--- /dev/null
+++ b/swext/Module_swext.mk
@@ -0,0 +1,39 @@
+#
+# 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.
+#
+# The Initial Developer of the Original Code is
+# Peter Foley <pefoley2 at verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# 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,swext))
+
+ifeq ($(ENABLE_MEDIAWIKI),YES)
+$(eval $(call gb_Module_add_targets,swext,\
+ Jar_mediawiki \
+ Configuration_mediawiki \
+ Zip_mediawiki_develop \
+ Extension_wiki-publisher \
+))
+endif
diff --git a/swext/Zip_mediawiki_develop.mk b/swext/Zip_mediawiki_develop.mk
new file mode 100644
index 0000000..9605e70
--- /dev/null
+++ b/swext/Zip_mediawiki_develop.mk
@@ -0,0 +1,60 @@
+#
+# 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.
+#
+# The Initial Developer of the Original Code is
+# Peter Foley <pefoley2 at verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# 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.
+#
+
+WIKISRC := $(SRCDIR)/swext/mediawiki
+
+$(eval $(call gb_Zip_Zip,mediawiki_develop,$(WORKDIR)/Zip/mediawiki_develop))
+
+$(eval $(call gb_Zip_add_file,mediawiki_develop,Addons.xcu,$(WIKISRC)/src/registry/data/org/openoffice/Office/Addons.xcu))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,Filter.xcu,$(WIKISRC)/src/registry/data/org/openoffice/TypeDetection/Filter.xcu))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,OptionsDialog.xcu,$(WIKISRC)/src/registry/data/org/openoffice/Office/OptionsDialog.xcu))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,Paths.xcu,$(WIKISRC)/src/registry/data/org/openoffice/Office/Paths.xcu))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,ProtocolHandler.xcu,$(WIKISRC)/src/registry/data/org/openoffice/Office/ProtocolHandler.xcu))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,Types.xcu,$(WIKISRC)/src/registry/data/org/openoffice/TypeDetection/Types.xcu))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,WikiExtension.xcs,$(WIKISRC)/src/registry/schema/org/openoffice/Office/Custom/WikiExtension.xcs))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,WikiExtension.xcu,$(WIKISRC)/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,description.xml,$(WIKISRC)/src/description.xml))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,mediawiki.jar,$(OUTDIR)/bin/mediawiki.jar))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,META-INF/manifest.xml,$(WIKISRC)/src/manifest.xml))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,WikiEditor/EditSetting.xdl,$(WIKISRC)/dialogs/EditSetting.xdl))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,WikiEditor/Settings.xdl,$(WIKISRC)/dialogs/Settings.xdl))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,WikiEditor/Module1.xba,$(WIKISRC)/dialogs/Module1.xba))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,WikiEditor/script.xlb,$(WIKISRC)/dialogs/script.xlb))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,WikiEditor/dialog.xlb,$(WIKISRC)/dialogs/dialog.xlb))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,WikiEditor/SendToMediaWiki.xdl,$(WIKISRC)/dialogs/SendToMediaWiki.xdl))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,filter/odt2mediawiki.xsl,$(WIKISRC)/src/filter/odt2mediawiki.xsl))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,help/component.txt,$(WIKISRC)/help/component.txt))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,help/en-US/com.sun.wiki-publisher/wikisend.xhp,$(WIKISRC)/help/wikisend.xhp))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,help/en-US/com.sun.wiki-publisher/wikiformats.xhp,$(WIKISRC)/help/wikiformats.xhp))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,help/en-US/com.sun.wiki-publisher/wikiaccount.xhp,$(WIKISRC)/help/wikiaccount.xhp))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,help/en-US/com.sun.wiki-publisher/wiki.xhp,$(WIKISRC)/help/wiki.xhp))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,help/en-US/com.sun.wiki-publisher/wikisettings.xhp,$(WIKISRC)/help/wikisettings.xhp))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,license/THIRDPARTYLICENSEREADME.html,$(WIKISRC)/src/THIRDPARTYLICENSEREADME.html))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,templates/MediaWiki/mediawiki.ott,$(WIKISRC)/src/filter/mediawiki.ott))
+
diff --git a/swext/makefile.pmk b/swext/makefile.pmk
deleted file mode 100644
index 8e43f2f..0000000
--- a/swext/makefile.pmk
+++ /dev/null
@@ -1,37 +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
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-XSLDIR=$(SOLARXMLDIR)$/processing
-XCSROOT=$(SOLARXMLDIR)
-ABSXCSROOT=$(SOLARXMLDIR)
-DTDDIR=$(SOLARXMLDIR)
-PROCESSOUT=$(MISC)$/$(CUSTID)
-PROCESSORDIR=$(SOLARBINDIR)
-
-# no validation by inspector class
-NO_INSPECTION=TRUE
-
diff --git a/swext/mediawiki/build.xml b/swext/mediawiki/build.xml
deleted file mode 100644
index b121985..0000000
--- a/swext/mediawiki/build.xml
+++ /dev/null
@@ -1,227 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--***********************************************************************
- *
- 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
- <http://www.openoffice.org/license.html>
- for a copy of the LGPLv3 License.
-
- ************************************************************************ -->
-<project default="all">
- <target name="init">
- <property environment="env"/>
- <property name="ext" value="oxt"/>
- <property name="officeroot" value="/export/home/mav/OFFICES/OOG680/m5_netbeans_pro"/>
- <property name="office.home" value="${officeroot}"/>
-
- <!-- fallbacks for locations, when solenv is not used -->
- <condition property="target" value="wikiaddon">
- <not><isset property="target"/></not>
- </condition>
- <condition property="out" value="./build">
- <not><isset property="out"/></not>
- </condition>
- <condition property="solar.jar" value="${officeroot}/program/classes">
- <not><isset property="solar.jar"/></not>
- </condition>
-
- <!-- locations used throughout the build -->
- <property name="name" value="wiki-publisher"/>
- <property name="dist" value="${out}/bin"/>
- <property name="classes" value="${out}/class"/>
- <property name="classes.test" value="${out}/class-test"/>
- <property name="officeclasses" value="${solar.jar}"/>
-
- <!-- build options -->
- <property name="sourcelevel" value="1.4"/>
- <property name="verbose" value="false"/>
- <property name="debug" value="${antdebug}"/>
-
- <!-- build classpath -->
- <path id="classpath">
- <pathelement location="${officeclasses}/juh.jar"/>
- <pathelement location="${officeclasses}/jurt.jar"/>
- <pathelement location="${officeclasses}/ridl.jar"/>
- <pathelement location="${officeclasses}/unoil.jar"/>
- <!-- 3rd party libs -->
- <pathelement location="${commons-codec-jar}"/>
- <pathelement location="${commons-httpclient-jar}"/>
- <pathelement location="${commons-lang-jar}"/>
- <pathelement location="${commons-logging-jar}"/>
- </path>
-
- <!-- create output directories -->
- <mkdir dir="${classes}"/>
- <mkdir dir="${classes.test}"/>
- <mkdir dir="${dist}"/>
- </target>
-
- <target name="compile" depends="init">
- <javac debug="${debug}" debuglevel="lines,vars,source" destdir="${classes}" classpathref="classpath"
- source="${sourcelevel}" verbose="${verbose}">
- <src path="src"/>
- </javac>
- </target>
-
- <target name="xcucheck" depends="init">
- <condition property="no.merge.present">
- <not>
- <available file="${out}/misc/${target}/merge/org/openoffice/Office/Custom/WikiExtension.xcu" type="file"/>
- </not>
- </condition>
- </target>
-
- <target name="xcumerge" depends="xcucheck, init" if="no.merge.present">
- <copy todir="${out}/misc/${target}/merge">
- <fileset dir="${out}/misc/${target}/registry/data" includes="**/*.xcu" casesensitive="yes"/>
- </copy>
- </target>
-
- <target name="jar" depends="compile, init">
- <jar basedir="${classes}" compress="true" jarfile="${dist}/${target}.jar">
- <manifest>
- <!-- FIXME: Set Class-Path correctly for the system case !-->
- <attribute name="Class-Path" value="commons-codec-1.3.jar commons-lang-2.3.jar commons-httpclient-3.1.jar commons-logging-1.1.1.jar"/>
- <attribute name="RegistrationClassName" value="com.sun.star.wiki.WikiEditorImpl"/>
- </manifest>
- </jar>
- </target>
-
- <target name="tmpdir" depends="xcumerge, jar, init">
- <copy todir="${out}/misc/${target}/package_tmp" overwrite="true" encoding="UTF-8">
- <fileset dir="${out}/misc/${target}" includes="description.xml" casesensitive="yes"/>
- <fileset dir="${out}/misc/${target}/registry/schema/org/openoffice/Office/Custom" includes="*.xcs" casesensitive="yes"/>
- <fileset dir="${out}/misc/${target}/registry/data/org/openoffice/Office" includes="ProtocolHandler.xcu,Paths.xcu" casesensitive="yes"/>
- <fileset dir="${out}/misc/${target}/merge/org/openoffice/Office/Custom" includes="*.xcu" casesensitive="yes"/>
- <fileset dir="${out}/misc/${target}/merge/org/openoffice/Office" includes="*.xcu" casesensitive="yes"/>
- <!-- FIXME: currently the build xcu files can not be used since the tag containing x-default attribute is thrown away, issue 99378
- <fileset dir="${out}/misc/${target}/merge/org/openoffice/TypeDetection" includes="*.xcu" casesensitive="yes"/>
- -->
- <fileset dir="src/registry/data/org/openoffice/TypeDetection" includes="*.xcu" casesensitive="yes"/>
- <fileset dir="${out}/misc/${target}" includes="help/component.txt" casesensitive="yes"/>
- <filterset>
- <filter token="WIKIEXTENSIONPRODUCTNAME" value="Wiki Publisher"/>
- <filter token="WIKIEXTENSIONID" value="com.sun.wiki-publisher"/>
- <filter token="WIKIEXTENSIONFILENAME" value="${name}"/>
- </filterset>
- </copy>
- </target>
-
- <target name="uno-package" depends="tmpdir, xcumerge, jar, init">
- <delete file="${dist}/${name}.${ext}"/>
- <zip destfile="${dist}/${name}.${ext}">
- <fileset dir="${out}/misc/${target}/package_tmp" casesensitive="yes"/>
- <fileset dir="${dist}" includes="${target}.jar" casesensitive="yes"/>
- <fileset file="${commons-codec-jar}" casesensitive="yes"/>
- <fileset file="${commons-httpclient-jar}" casesensitive="yes"/>
- <fileset file="${commons-lang-jar}" casesensitive="yes"/>
- <fileset file="${commons-logging-jar}" casesensitive="yes"/>
- <zipfileset file="src/filter/odt2mediawiki.xsl" casesensitive="yes" fullpath="filter/odt2mediawiki.xsl"/>
- <zipfileset file="src/filter/mediawiki.ott" casesensitive="yes" fullpath="templates/MediaWiki/mediawiki.ott"/>
- <zipfileset dir="${solar.bin}/xslt/export/xsltml" casesensitive="yes" prefix="filter/math"/>
- <zipfileset dir="src" includes="uno-extension-manifest.xml" casesensitive="yes" fullpath="META-INF/manifest.xml"/>
- <zipfileset dir="dialogs" includes="**/*.xdl,**/*.xba,**/*.xlb" casesensitive="yes" prefix="WikiEditor"/>
- <zipfileset dir="${out}/misc/${target}/help" includes="**/*.idxl/*,**/*.*_,**/*.jar" casesensitive="yes" prefix="help"/>
- <zipfileset dir="${out}/misc/${target}/help" includes="**/*.xhp" casesensitive="yes" prefix="help"/>
- <zipfileset dir="src" includes="THIRDPARTYLICENSEREADME.html" casesensitive="yes" prefix="license"/>
- </zip>
- </target>
-
- <target name="development-package" depends="jar, init">
- <delete file="${dist}/${target}_develop.zip"/>
- <zip destfile="${dist}/${target}_develop.zip">
- <zipfileset dir="${dist}" includes="${target}.jar" casesensitive="yes" filemode="664" dirmode="775"/>
- <zipfileset dir="${out}/misc/${target}" includes="description.xml" casesensitive="yes" filemode="664" dirmode="775"/>
- <zipfileset dir="${out}/misc/${target}/registry/schema/org/openoffice/Office/Custom" includes="*.xcs" casesensitive="yes" filemode="664" dirmode="775"/>
- <zipfileset dir="${out}/misc/${target}/registry/data/org/openoffice/Office" includes="ProtocolHandler.xcu,Paths.xcu" casesensitive="yes" filemode="664" dirmode="775"/>
- <zipfileset dir="${out}/misc/${target}/merge/org/openoffice/Office/Custom" includes="*.xcu" casesensitive="yes" filemode="664" dirmode="775"/>
- <zipfileset dir="${out}/misc/${target}/merge/org/openoffice/Office" includes="*.xcu" excludes="**/ProtocolHandler.xcu,**/Paths.xcu" casesensitive="yes" filemode="664" dirmode="775"/>
- <!-- FIXME: currently the build xcu files can not be used since the tag containing x-default attribute is thrown away, issue 99378
- <fileset dir="${out}/misc/${target}/merge/org/openoffice/TypeDetection" includes="*.xcu" casesensitive="yes" filemode="664" dirmode="775"/>
- -->
- <zipfileset dir="src/registry/data/org/openoffice/TypeDetection" includes="*.xcu" casesensitive="yes" filemode="664" dirmode="775"/>
- <zipfileset file="src/filter/odt2mediawiki.xsl" casesensitive="yes" fullpath="filter/odt2mediawiki.xsl" filemode="664" dirmode="775"/>
- <zipfileset file="src/filter/mediawiki.ott" casesensitive="yes" fullpath="templates/MediaWiki/mediawiki.ott" filemode="664" dirmode="775"/>
- <zipfileset dir="${out}/misc/${target}/help" includes="component.txt" casesensitive="yes" prefix="help" filemode="664" dirmode="775"/>
- <zipfileset dir="${out}/misc/${target}_merge/help" includes="**/*.xhp" casesensitive="yes" prefix="help" filemode="664" dirmode="775"/>
- <zipfileset dir="dialogs" includes="**/*.xdl,**/*.xba,**/*.xlb" casesensitive="yes" prefix="WikiEditor" filemode="664" dirmode="775"/>
- <zipfileset dir="src" includes="uno-extension-manifest.xml" casesensitive="yes" fullpath="META-INF/manifest.xml" filemode="664" dirmode="775"/>
- <zipfileset dir="src" includes="THIRDPARTYLICENSEREADME.html" casesensitive="yes" prefix="license" filemode="664" dirmode="775"/>
- </zip>
- </target>
-
- <target depends="init, jar, uno-package, development-package" description="Build everything." name="all">
- <echo message="${name} built."/>
- </target>
-
- <target depends="init" description="Clean all build products." name="clean">
- <delete dir="${classes}/com/sun/star/wiki"/>
- <delete dir="${out}/misc/${target}"/>
- <delete dir="${dist}/${target}.jar"/>
- <delete dir="${dist}/${name}.${ext}"/>
- <delete dir="${dist}/${target}_develop.zip"/>
- </target>
-
- <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-
- <target name="uno-deploy" description="Deploys UNO extension package" depends="uno-package">
- <echo message="deploying UNO extension package ..."/>
- <echo message="${office.unopkg} add -f ${uno.package.name}"/>
- <exec executable="${office.unopkg}" dir="${office.program.dir}" failonerror="true">
- <arg value="add"/>
- <arg value="-f"/>
- <arg file="${uno.package.name}"/>
- </exec>
- </target>
-
- <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-
- <target name="uno-debug" description="Debugss UNO extension package in Target Office" depends="uno-package">
- <!-- security fail for executing this without netbeans -->
- <fail unless="netbeans.home">This target can only run inside the NetBeans IDE.</fail>
- <!-- start debugger and get connection address jpda.address -->
- <nbjpdastart name="Debug Office" addressproperty="jpda.address" transport="dt_socket">
- <classpath path="${build.classes.dir}"/>
- <sourcepath path="${src.dir}"/>
- </nbjpdastart>
- <!-- register component in temporaary user installation -->
- <echo message="debugging UNO extension package ..."/>
- <echo message="wait until preparation is finished."/>
- <echo message=" deploying UNO extension package for debugging ..."/>
- <echo message=" ${office.unopkg} add -f ${uno.package.name}"/>
- <exec executable="${office.unopkg}" dir="${office.program.dir}">
- <arg value="add"/>
- <arg value="-f"/>
- <arg file="${uno.package.name}"/>
- <env key="UserInstallation" value="${office.debug.user.directory}"/>
- </exec>
- <!-- start Office with debug Java and user installation -->
- <echo message=" starting the Office with ..."/>
- <echo message=" user installation: ${office.debug.user.directory}"/>
- <echo message=" debug options: "-Xdebug" "-Xrunjdwp:transport=dt_socket,address=${jpda.address}""/>
- <echo message=" ${office.soffice}"/>
- <echo message="preparation finished."/>
- <exec executable="${office.soffice}" dir="${office.program.dir}" failonerror="true">
- <env key="UserInstallation" value="${office.debug.user.directory}"/>
- <env key="JAVA_TOOL_OPTIONS" value=""-Xdebug" "-Xrunjdwp:transport=dt_socket,address=${jpda.address}""/>
- </exec>
- </target>
-</project>
diff --git a/swext/mediawiki/help/component.txt b/swext/mediawiki/help/component.txt
index c5ac1de..d993ce1 100755
--- a/swext/mediawiki/help/component.txt
+++ b/swext/mediawiki/help/component.txt
@@ -1 +1 @@
-The @WIKIEXTENSIONPRODUCTNAME@ enables you to create Wiki articles on MediaWiki servers without having to know the syntax of the MediaWiki markup language. Publish your new and existing documents transparently with the Writer to a wiki page.
+The Wiki Publisher enables you to create Wiki articles on MediaWiki servers without having to know the syntax of the MediaWiki markup language. Publish your new and existing documents transparently with the Writer to a wiki page.
diff --git a/swext/mediawiki/help/makefile.mk b/swext/mediawiki/help/makefile.mk
deleted file mode 100644
index 1804ec2..0000000
--- a/swext/mediawiki/help/makefile.mk
+++ /dev/null
@@ -1,87 +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
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJNAME=swext
-TARGET=$(PRJNAME)_help
-
-.INCLUDE : settings.mk
-
-.IF "$(WITH_LANG)"!=""
-# workaround for the problem in help, the help uses en instead of en-US
-MEDIAWIKI_LANG=$(uniq en $(alllangiso))
-aux_alllangiso:=$(MEDIAWIKI_LANG)
-.ELSE # "$(WITH_LANG)"!=""
-aux_alllangiso:=$(defaultlangiso)
-MEDIAWIKI_LANG=$(uniq en $(alllangiso))
-.ENDIF # "$(WITH_LANG)"!=""
-
-.IF "$(ENABLE_MEDIAWIKI)" != "YES"
-all:
- @echo Building mediawiki disabled...
-.ELSE # "$(ENABLE_MEDIAWIKI)" != "YES"
-
-PACKAGE=com.sun.wiki-publisher
-
-OUT_MEDIAWIKI:=$(MISC)$/mediawiki
-
-LINKNAME:=help
-XHPLINKSRC:=$(OUT_MEDIAWIKI)/help
-
-XHPDEST=$(OUT_MEDIAWIKI)_merge/help
-
-XHPFILES= \
- wiki.xhp\
- wikiaccount.xhp\
- wikiformats.xhp\
- wikisend.xhp\
- wikisettings.xhp
-
-LINKLINKFILES= \
- $(PACKAGE)/{$(XHPFILES)}
-
-# define with own language set
-HLANGXHPFILES=$(foreach,i,$(XHPFILES) $(foreach,j,$(MEDIAWIKI_LANG) $(XHPDEST)$/$j$/$(PACKAGE)$/$(i:f)))
-
-.INCLUDE : target.mk
-.INCLUDE : tg_help.mk
-.INCLUDE : extension_helplink.mk
-
-ALLTAR : $(OUT_MEDIAWIKI)/help/component.txt
-
-$(OUT_MEDIAWIKI)/help/component.txt : component.txt
- @-$(MKDIRHIER) $(@:d)
- $(COMMAND_ECHO)$(COPY) component.txt $@
-
-$(OUT_MEDIAWIKI)/help/%.xhp : $(OUT_MEDIAWIKI)_merge/help/%.xhp
- @-$(MKDIRHIER) $(@:d)
- $(COMMAND_ECHO)cat $< | sed -e 's/@WIKIEXTENSIONPRODUCTNAME@/Wiki Publisher/g' | \
- sed 's/@WIKIEXTENSIONID@/com.sun.wiki-publisher/g' | \
- sed 's/@WIKIEXTENSIONFILENAME@/wiki-publisher/g' > $@
-
-.ENDIF # "$(ENABLE_MEDIAWIKI)" != "YES"
-
diff --git a/swext/mediawiki/help/wiki.xhp b/swext/mediawiki/help/wiki.xhp
index 22f9727..8d49b13 100644
--- a/swext/mediawiki/help/wiki.xhp
+++ b/swext/mediawiki/help/wiki.xhp
@@ -29,8 +29,8 @@
<helpdocument version="1.0">
<meta>
<topic id="comsunstarwikiMediaWikiwikixml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">@WIKIEXTENSIONPRODUCTNAME@</title>
-<filename>/@WIKIEXTENSIONID@/wiki.xhp</filename>
+<title id="tit" xml-lang="en-US">Wiki Publisher</title>
+<filename>/com.sun.wiki-publisher/wiki.xhp</filename>
</topic>
<history>
<created date="2008-02-08T12:13:25"/>
@@ -39,12 +39,12 @@
</meta>
<body>
<bookmark xml-lang="en-US" branch="hid/vnd.com.sun.star.wiki:aboutbox" id="bm_id3159252" localize="false"/>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3154408"><bookmark_value>Wiki;@WIKIEXTENSIONPRODUCTNAME@</bookmark_value>
-<bookmark_value>@WIKIEXTENSIONPRODUCTNAME@</bookmark_value>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3154408"><bookmark_value>Wiki;Wiki Publisher</bookmark_value>
+<bookmark_value>Wiki Publisher</bookmark_value>
<bookmark_value>extensions;MediaWiki</bookmark_value>
</bookmark>
-<paragraph role="heading" id="hd_id5993530" xml-lang="en-US" level="1" l10n="NEW">@WIKIEXTENSIONPRODUCTNAME@</paragraph>
-<paragraph role="paragraph" id="par_id9647511" xml-lang="en-US" l10n="NEW"><ahelp hid=".">By using the @WIKIEXTENSIONPRODUCTNAME@ you can upload your current Writer text document to a MediaWiki server. After uploading, all Wiki users can read your document on the Wiki.</ahelp></paragraph>
+<paragraph role="heading" id="hd_id5993530" xml-lang="en-US" level="1" l10n="NEW">Wiki Publisher</paragraph>
+<paragraph role="paragraph" id="par_id9647511" xml-lang="en-US" l10n="NEW"><ahelp hid=".">By using the Wiki Publisher you can upload your current Writer text document to a MediaWiki server. After uploading, all Wiki users can read your document on the Wiki.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/vnd.com.sun.star.wiki:send" id="bm_id3159253" localize="false"/>
<paragraph role="paragraph" id="par_id6468703" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Choose <item type="menuitem">File - Send - To MediaWiki</item> to upload the current Writer document to a MediaWiki server.</ahelp></paragraph>
<paragraph role="heading" id="hd_id4554582" xml-lang="en-US" level="2" l10n="NEW">System Requirements</paragraph>
@@ -62,9 +62,9 @@
<paragraph role="paragraph" id="par_id7387615" xml-lang="en-US" l10n="NEW">A Wiki account on a supported <link href="http://www.mediawiki.org/wiki/MediaWiki">MediaWiki</link> server</paragraph>
</listitem>
</list>
-<paragraph role="heading" id="hd_id8047120" xml-lang="en-US" level="2" l10n="NEW">Installing @WIKIEXTENSIONPRODUCTNAME@</paragraph>
-<paragraph role="paragraph" id="par_id4277169" xml-lang="en-US" l10n="NEW">Before you install the @WIKIEXTENSIONPRODUCTNAME@, ensure that %PRODUCTNAME uses a Java Runtime Environment (JRE). To check the status of the JRE, choose <item type="menuitem">Tools - Options - %PRODUCTNAME - Java</item>. Ensure that "Use a Java runtime environment" is marked and that a Java runtime folder is selected in the big listbox. If no JRE was activated, then activate a JRE 1.4 or later and restart %PRODUCTNAME.</paragraph>
-<paragraph role="heading" id="hd_id567339" xml-lang="en-US" level="3" l10n="NEW">To Install the @WIKIEXTENSIONPRODUCTNAME@</paragraph>
+<paragraph role="heading" id="hd_id8047120" xml-lang="en-US" level="2" l10n="NEW">Installing Wiki Publisher</paragraph>
+<paragraph role="paragraph" id="par_id4277169" xml-lang="en-US" l10n="NEW">Before you install the Wiki Publisher, ensure that %PRODUCTNAME uses a Java Runtime Environment (JRE). To check the status of the JRE, choose <item type="menuitem">Tools - Options - %PRODUCTNAME - Java</item>. Ensure that "Use a Java runtime environment" is marked and that a Java runtime folder is selected in the big listbox. If no JRE was activated, then activate a JRE 1.4 or later and restart %PRODUCTNAME.</paragraph>
+<paragraph role="heading" id="hd_id567339" xml-lang="en-US" level="3" l10n="NEW">To Install the Wiki Publisher</paragraph>
<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_id1732230" xml-lang="en-US" l10n="NEW">In a Writer window, choose <item type="menuitem">Tools - Extension Manager</item>.</paragraph>
@@ -73,7 +73,7 @@
<paragraph role="paragraph" id="par_id4338511" xml-lang="en-US" l10n="NEW">In the Extension Manager dialog, click Add.</paragraph>
</listitem>
<listitem>
-<paragraph role="paragraph" id="par_id5882442" xml-lang="en-US" l10n="NEW">Locate the @WIKIEXTENSIONFILENAME at .oxt file, click Open, and then click Close. </paragraph>
+<paragraph role="paragraph" id="par_id5882442" xml-lang="en-US" l10n="NEW">Locate the wiki-publisher.oxt file, click Open, and then click Close. </paragraph>
</listitem>
<listitem>
<paragraph role="paragraph" id="par_id4008911" xml-lang="en-US" l10n="NEW">Close %PRODUCTNAME, and close also the Quickstarter if enabled.</paragraph>
@@ -82,7 +82,7 @@
<paragraph role="paragraph" id="par_id265511" xml-lang="en-US" l10n="NEW">Restart the software, open a text document, then choose <item type="menuitem">Tools - Options - Internet - MediaWiki</item> to enter your Wiki settings. See "To Connect To a Wiki" below.</paragraph>
</listitem>
</list>
-<paragraph role="heading" id="hd_id3569444" xml-lang="en-US" level="3" l10n="NEW">To Remove the @WIKIEXTENSIONPRODUCTNAME@</paragraph>
+<paragraph role="heading" id="hd_id3569444" xml-lang="en-US" level="3" l10n="NEW">To Remove the Wiki Publisher</paragraph>
<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_id2655110" xml-lang="en-US" l10n="NEW">In a Writer window, choose <item type="menuitem">Tools - Extension Manager</item>.</paragraph>
@@ -102,10 +102,10 @@
<paragraph role="paragraph" id="par_id9533677" xml-lang="en-US" l10n="NEW">Open a Writer document, and choose <item type="menuitem">Tools - Options - Internet - MediaWiki</item>.</paragraph>
</listitem>
<listitem>
-<paragraph role="paragraph" id="par_id368968" xml-lang="en-US" l10n="NEW">In the <link href="@WIKIEXTENSIONID@/wikisettings.xhp">Options</link> dialog, click Add.</paragraph>
+<paragraph role="paragraph" id="par_id368968" xml-lang="en-US" l10n="NEW">In the <link href="com.sun.wiki-publisher/wikisettings.xhp">Options</link> dialog, click Add.</paragraph>
</listitem>
<listitem>
-<paragraph role="paragraph" id="par_id6962187" xml-lang="en-US" l10n="NEW">In the <link href="@WIKIEXTENSIONID@/wikiaccount.xhp">MediaWiki</link> dialog, enter the account information for the Wiki.</paragraph>
+<paragraph role="paragraph" id="par_id6962187" xml-lang="en-US" l10n="NEW">In the <link href="com.sun.wiki-publisher/wikiaccount.xhp">MediaWiki</link> dialog, enter the account information for the Wiki.</paragraph>
</listitem>
</list>
<list type="ordered">
@@ -128,13 +128,13 @@
<paragraph role="paragraph" id="par_id3514206" xml-lang="en-US" l10n="NEW">Open a Writer document.</paragraph>
</listitem>
<listitem>
-<paragraph role="paragraph" id="par_id944853" xml-lang="en-US" l10n="NEW">Write the content of the Wiki page. You can use formatting like text formats, headings, footnotes, and more. See the <link href="@WIKIEXTENSIONID@/wikiformats.xhp">list of supported formats</link>.</paragraph>
+<paragraph role="paragraph" id="par_id944853" xml-lang="en-US" l10n="NEW">Write the content of the Wiki page. You can use formatting like text formats, headings, footnotes, and more. See the <link href="com.sun.wiki-publisher/wikiformats.xhp">list of supported formats</link>.</paragraph>
</listitem>
<listitem>
<paragraph role="paragraph" id="par_id4566484" xml-lang="en-US" l10n="NEW">Choose <item type="menuitem">File - Send - To MediaWiki</item>.</paragraph>
</listitem>
<listitem>
-<paragraph role="paragraph" id="par_id228278" xml-lang="en-US" l10n="NEW">In the <link href="@WIKIEXTENSIONID@/wikisend.xhp">Send to MediaWiki</link> dialog, specify the settings for your entry.</paragraph>
+<paragraph role="paragraph" id="par_id228278" xml-lang="en-US" l10n="NEW">In the <link href="com.sun.wiki-publisher/wikisend.xhp">Send to MediaWiki</link> dialog, specify the settings for your entry.</paragraph>
</listitem>
</list>
<paragraph role="paragraph" id="par_id2564165" xml-lang="en-US" l10n="NEW">
diff --git a/swext/mediawiki/help/wikiaccount.xhp b/swext/mediawiki/help/wikiaccount.xhp
index 8d1d57b..3254de7 100644
--- a/swext/mediawiki/help/wikiaccount.xhp
+++ b/swext/mediawiki/help/wikiaccount.xhp
@@ -30,7 +30,7 @@
<meta>
<topic id="comsunstarwikiMediaWikiwikiaccountxml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">MediaWiki</title>
-<filename>/@WIKIEXTENSIONID@/wikiaccount.xhp</filename>
+<filename>/com.sun.wiki-publisher/wikiaccount.xhp</filename>
</topic>
<history>
<created date="2008-02-08T12:13:25"/>
diff --git a/swext/mediawiki/help/wikiformats.xhp b/swext/mediawiki/help/wikiformats.xhp
index fd9c98e..86db68d 100644
--- a/swext/mediawiki/help/wikiformats.xhp
+++ b/swext/mediawiki/help/wikiformats.xhp
@@ -30,7 +30,7 @@
<meta>
<topic id="comsunstarwikiMediaWikiwikiformatsxml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">MediaWiki Formats</title>
-<filename>/@WIKIEXTENSIONID@/wikiformats.xhp</filename>
+<filename>/com.sun.wiki-publisher/wikiformats.xhp</filename>
</topic>
<history>
<created date="2008-02-08T12:13:25"/>
@@ -40,7 +40,7 @@
<body>
<bookmark branch="hid/vnd.com.sun.star.wiki:formats" id="bm_id7021088" localize="false"/>
<paragraph role="heading" id="hd_id3743095" xml-lang="en-US" level="1" l10n="NEW">MediaWiki Formats</paragraph>
-<paragraph role="paragraph" id="par_id8654133" xml-lang="en-US" l10n="NEW">The following list gives an overview of the text formats that the @WIKIEXTENSIONPRODUCTNAME@ can upload to the Wiki server.</paragraph>
+<paragraph role="paragraph" id="par_id8654133" xml-lang="en-US" l10n="NEW">The following list gives an overview of the text formats that the Wiki Publisher can upload to the Wiki server.</paragraph>
<paragraph role="paragraph" id="par_id5630664" xml-lang="en-US" l10n="NEW">The OpenDocument format used by Writer and the WikiMedia format are quite different. Only a subset of all features can be transformed from one format to the other.</paragraph>
<paragraph role="heading" id="hd_id7178868" xml-lang="en-US" level="2" l10n="NEW">Headings</paragraph>
<paragraph role="paragraph" id="par_id508133" xml-lang="en-US" l10n="NEW">Apply a heading paragraph style to the headings in your Writer document. The Wiki will show the heading styles of the same outline level, formatted as defined by the Wiki engine.</paragraph>
diff --git a/swext/mediawiki/help/wikisend.xhp b/swext/mediawiki/help/wikisend.xhp
index f9a5613..f34b0e5 100644
--- a/swext/mediawiki/help/wikisend.xhp
+++ b/swext/mediawiki/help/wikisend.xhp
@@ -30,7 +30,7 @@
<meta>
<topic id="comsunstarwikiMediaWikiwikisendxml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Send to MediaWiki</title>
-<filename>/@WIKIEXTENSIONID@/wikisend.xhp</filename>
+<filename>/com.sun.wiki-publisher/wikisend.xhp</filename>
</topic>
<history>
<created date="2008-02-08T12:13:25"/>
diff --git a/swext/mediawiki/help/wikisettings.xhp b/swext/mediawiki/help/wikisettings.xhp
index 22611a2..d7994e0 100644
--- a/swext/mediawiki/help/wikisettings.xhp
+++ b/swext/mediawiki/help/wikisettings.xhp
@@ -30,7 +30,7 @@
<meta>
<topic id="comsunstarwikiMediaWikiwikisettingsxml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">MediaWiki Options</title>
-<filename>/@WIKIEXTENSIONID@/wikisettings.xhp</filename>
+<filename>/com.sun.wiki-publisher/wikisettings.xhp</filename>
</topic>
<history>
<created date="2008-02-08T12:13:25"/>
@@ -40,7 +40,7 @@
<body>
<bookmark branch="hid/vnd.com.sun.star.wiki:settings" id="bm_id7021088" localize="false"/>
<paragraph role="heading" id="hd_id6425672" xml-lang="en-US" level="1" l10n="NEW">MediaWiki Options</paragraph>
-<paragraph role="paragraph" id="par_id1188390" xml-lang="en-US" l10n="NEW">You can add, edit and remove MediaWiki servers. Open the dialog by <item type="menuitem">Tools - Options - Internet - MediaWiki</item>. Alternatively, choose <item type="menuitem">Tools - Extension Manager</item>, select the @WIKIEXTENSIONPRODUCTNAME@, and click the Options button.</paragraph><comment>Listbox</comment>
+<paragraph role="paragraph" id="par_id1188390" xml-lang="en-US" l10n="NEW">You can add, edit and remove MediaWiki servers. Open the dialog by <item type="menuitem">Tools - Options - Internet - MediaWiki</item>. Alternatively, choose <item type="menuitem">Tools - Extension Manager</item>, select the Wiki Publisher, and click the Options button.</paragraph><comment>Listbox</comment>
<bookmark xml-lang="en-US" branch="hid/com.sun.star.wiki.MediaWiki.Settings.WikiList" id="bm_id6402783" localize="false"/>
<paragraph role="paragraph" id="par_id300607" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click Add to add a new Wiki server.<br/>Select an entry and click Edit to edit the account settings.<br/>Select an entry and click Remove to remove the entry from the list.</ahelp></paragraph><comment>Add button</comment>
<bookmark xml-lang="en-US" branch="hid/com.sun.star.wiki.MediaWiki.Settings.AddButton" id="bm_id6067384" localize="false"/>
@@ -49,6 +49,6 @@
<paragraph role="paragraph" id="par_id3386333" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Opens the MediaWiki dialog to edit the selected entry.</ahelp></paragraph><comment>Remove button</comment>
<bookmark xml-lang="en-US" branch="hid/com.sun.star.wiki.MediaWiki.Settings.RemoveButton" id="bm_id6067386" localize="false"/>
<paragraph role="paragraph" id="par_id7285073" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Removes the selected entry from the list.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id1029084" xml-lang="en-US" l10n="NEW">When you click Add or Edit, the <link href="@WIKIEXTENSIONID@/wikiaccount.xhp">MediaWiki</link> dialog opens.</paragraph>
+<paragraph role="paragraph" id="par_id1029084" xml-lang="en-US" l10n="NEW">When you click Add or Edit, the <link href="com.sun.wiki-publisher/wikiaccount.xhp">MediaWiki</link> dialog opens.</paragraph>
</body>
</helpdocument>
diff --git a/swext/mediawiki/makefile.mk b/swext/mediawiki/makefile.mk
deleted file mode 100644
index 52d9900..0000000
--- a/swext/mediawiki/makefile.mk
+++ /dev/null
@@ -1,69 +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
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-PRJNAME=swext
-TARGET=mediawiki
-.IF "$(L10N_framework)"==""
-.IF "$(ENABLE_MEDIAWIKI)" == "YES"
-.INCLUDE : ant.mk
-
-.IF "$(SYSTEM_APACHE_COMMONS)" != "YES"
-COMMONS_CODEC_JAR=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/commons-codec-1.3.jar
-COMMONS_LANG_JAR=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/commons-lang-2.3.jar
-COMMONS_HTTPCLIENT_JAR=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/commons-httpclient-3.1.jar
-COMMONS_LOGGING_JAR=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/commons-logging-1.1.1.jar
-.ELSE
-COMP=fix_system_commons
-.ENDIF
-
-.IF defined(debug) || defined(DEBUG)
-ANTDEBUG=true
-.ELSE
-ANTDEBUG=off
-.ENDIF
-
-ANT_FLAGS+=-Dcommons-codec-jar=$(COMMONS_CODEC_JAR) -Dcommons-lang-jar=$(COMMONS_LANG_JAR) -Dcommons-httpclient-jar=$(COMMONS_HTTPCLIENT_JAR) -Dcommons-logging-jar=$(COMMONS_LOGGING_JAR) -Dantdebug=$(ANTDEBUG)
-
-# creates two files wiki-publisher.oxt and mediawiki_develop.zip, the second one might be used in further build process
-ALLTAR: $(COMP) ANTBUILD
-
-fix_system_commons:
- @echo "Fix Java Class-Path entry for Apache Commons libraries from system."
- @$(SED) -r -e "s#(name=\"Class-Path\" value=\").*\"#\1file://$(COMMONS_CODEC_JAR) file://$(COMMONS_LANG_JAR) \
-file://$(COMMONS_HTTPCLIENT_JAR) file://$(COMMONS_LOGGING_JAR)\"#" -i build.xml
- @echo "Unbundle Apache Commons libraries from Mediawiki Presentation extension."
- @$(SED) '/file="..commons/d' -i build.xml
-
-.ELSE
- at all:
- @echo "MediaWiki Publisher extension disabled."
-.ENDIF
-
-.ELSE
-pesudo:
-.ENDIF
diff --git a/swext/mediawiki/src/com/sun/star/wiki/MANIFEST.MF b/swext/mediawiki/src/com/sun/star/wiki/MANIFEST.MF
new file mode 100644
index 0000000..6f900e2
--- /dev/null
+++ b/swext/mediawiki/src/com/sun/star/wiki/MANIFEST.MF
@@ -0,0 +1 @@
+RegistrationClassName: com.sun.star.wiki.WikiEditorImpl
diff --git a/swext/mediawiki/src/description.xml b/swext/mediawiki/src/description.xml
index 55d6148..d8d1ad4 100644
--- a/swext/mediawiki/src/description.xml
+++ b/swext/mediawiki/src/description.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<description xmlns="http://openoffice.org/extensions/description/2006" xmlns:d="http://openoffice.org/extensions/description/2006" xmlns:xlink="http://www.w3.org/1999/xlink">
<version value="1.1.1"/>
- <identifier value="@WIKIEXTENSIONID@"/>
+ <identifier value="com.sun.wiki-publisher"/>
<display-name>
- <name lang="en-US">@WIKIEXTENSIONPRODUCTNAME@</name>
+ <name lang="en-US">Wiki Publisher</name>
</display-name>
<dependencies>
<OpenOffice.org-minimal-version value="3.0" d:name="OpenOffice.org 3.0 or StarOffice 9"/>
diff --git a/swext/mediawiki/src/makefile.mk b/swext/mediawiki/src/makefile.mk
deleted file mode 100644
index 8d920ab..0000000
--- a/swext/mediawiki/src/makefile.mk
+++ /dev/null
@@ -1,54 +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
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJNAME=swext
-TARGET=mediawiki
-GEN_HID=FALSE
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-
-DESCRIPTION:=$(MISC)$/$(TARGET)$/description.xml
-
-common_build_zip=
-
-.INCLUDE : target.mk
-
-ALLTAR: $(DESCRIPTION)
-
-.INCLUDE .IGNORE : $(MISC)$/$(TARGET)_lang_track.mk
-.IF "$(LAST_WITH_LANG)"!="$(WITH_LANG)"
-PHONYDESC=.PHONY
-.ENDIF # "$(LAST_WITH_LANG)"!="$(WITH_LANG)"
-$(DESCRIPTION) $(PHONYDESC) : $$(@:f)
- @@-$(MKDIRHIER) $(@:d)
- $(PERL) $(SOLARENV)$/bin$/licinserter.pl description.xml license/LICENSE_xxx $@
- @echo LAST_WITH_LANG=$(WITH_LANG) > $(MISC)$/$(TARGET)_lang_track.mk
diff --git a/swext/mediawiki/src/manifest.xml b/swext/mediawiki/src/manifest.xml
new file mode 100644
index 0000000..f3d9a0e
--- /dev/null
+++ b/swext/mediawiki/src/manifest.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--***********************************************************************
+
+ 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
+ <http://www.openoffice.org/license.html>
+ for a copy of the LGPLv3 License.
+
+ ************************************************************************ -->
+<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-component;type=Java"
+ manifest:full-path="mediawiki.jar"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+ manifest:full-path="Addons.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+ manifest:full-path="ProtocolHandler.xcu"/>
+ <manifest:file-entry manifest:full-path="WikiEditor/"
+ manifest:media-type="application/vnd.sun.star.basic-library"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-schema"
+ manifest:full-path="WikiExtension.xcs"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+ manifest:full-path="WikiExtension.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+ manifest:full-path="OptionsDialog.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+ manifest:full-path="Filter.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+ manifest:full-path="Types.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+ manifest:full-path="Paths.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.help"
+ manifest:full-path="help"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.package-bundle-description"
+ manifest:full-path="help/component.txt"/>
+</manifest:manifest>
diff --git a/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu b/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu
index 8dbde90..6888448 100644
--- a/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu
+++ b/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu
@@ -144,7 +144,7 @@
<value xml:lang="en-US">~Save password</value>
</prop>
<prop oor:name="Dlg_MediaWiki_Extension_String">
- <value xml:lang="en-US">@WIKIEXTENSIONPRODUCTNAME@</value>
+ <value xml:lang="en-US">Wiki Publisher</value>
</prop>
<prop oor:name="Dlg_WikiPageExists_Label1">
<value xml:lang="en-US">A wiki article with the title '$ARG1' already exists. Do you want to replace the current article with your article? </value>
diff --git a/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/makefile.mk b/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/makefile.mk
deleted file mode 100644
index 82f8303..0000000
--- a/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/makefile.mk
+++ /dev/null
@@ -1,48 +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
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..$/..$/..$/..$/..
-PRJNAME=swext
-CUSTID=mediawiki
-TARGET=mediawiki_registry_data_Custom
-PACKAGE=org.openoffice.Office.Custom
-
-.INCLUDE : settings.mk
-.INCLUDE : ${PRJ}$/makefile.pmk
-
-ABSXCSROOT=$(PWD)$/$(MISC)$/$(CUSTID)
-XCSROOT=$(MISC)$/$(CUSTID)
-
-.IF "$(ENABLE_MEDIAWIKI)" == "YES"
-LOCALIZEDFILES= WikiExtension.xcu
-
-MODULEFILES=
-
-XCUFILES = WikiExtension.xcu
-.ENDIF
-
-.INCLUDE : target.mk
diff --git a/swext/mediawiki/src/registry/data/org/openoffice/Office/OptionsDialog.xcu b/swext/mediawiki/src/registry/data/org/openoffice/Office/OptionsDialog.xcu
index f6498c5..5ae52ce 100644
--- a/swext/mediawiki/src/registry/data/org/openoffice/Office/OptionsDialog.xcu
+++ b/swext/mediawiki/src/registry/data/org/openoffice/Office/OptionsDialog.xcu
@@ -31,7 +31,7 @@
<node oor:name="Leaves">
<node oor:name="com.sun.star.wiki.options" oor:op="fuse">
<prop oor:name="Id">
- <value>@WIKIEXTENSIONID@</value>
+ <value>com.sun.wiki-publisher</value>
</prop>
<prop oor:name="Label">
<value xml:lang="en-US">MediaWiki</value>
diff --git a/swext/mediawiki/src/registry/data/org/openoffice/Office/makefile.mk b/swext/mediawiki/src/registry/data/org/openoffice/Office/makefile.mk
deleted file mode 100644
index 3d14098..0000000
--- a/swext/mediawiki/src/registry/data/org/openoffice/Office/makefile.mk
+++ /dev/null
@@ -1,46 +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
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..$/..$/..$/..
-PRJNAME=swext
-CUSTID=mediawiki
-TARGET=mediawiki_registry_data_office
-PACKAGE=org.openoffice.Office
-
-.INCLUDE : settings.mk
-.INCLUDE : ${PRJ}$/makefile.pmk
-
-.IF "$(ENABLE_MEDIAWIKI)" == "YES"
-LOCALIZEDFILES= Addons.xcu OptionsDialog.xcu
-
-MODULEFILES=
-
-XCUFILES = Addons.xcu OptionsDialog.xcu ProtocolHandler.xcu Paths.xcu
-.ENDIF
-
-.INCLUDE : target.mk
-
diff --git a/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/makefile.mk b/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/makefile.mk
deleted file mode 100644
index 3224851..0000000
--- a/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/makefile.mk
+++ /dev/null
@@ -1,46 +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
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..$/..$/..$/..
-PRJNAME=swext
-CUSTID=mediawiki
-TARGET=mediawiki_registry_data_typedetection
-PACKAGE=org.openoffice.TypeDetection
-
-.INCLUDE : settings.mk
-.INCLUDE : ${PRJ}$/makefile.pmk
-
-.IF "$(ENABLE_MEDIAWIKI)" == "YES"
-LOCALIZEDFILES=
-
-MODULEFILES=
-
-XCUFILES = Filter.xcu Types.xcu
-.ENDIF
-
-.INCLUDE : target.mk
-
diff --git a/swext/mediawiki/src/registry/schema/org/openoffice/Office/Custom/makefile.mk b/swext/mediawiki/src/registry/schema/org/openoffice/Office/Custom/makefile.mk
deleted file mode 100644
index bbbb9c6..0000000
--- a/swext/mediawiki/src/registry/schema/org/openoffice/Office/Custom/makefile.mk
+++ /dev/null
@@ -1,46 +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
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..$/..$/..$/..$/..
-PRJNAME=swext
-CUSTID=mediawiki
-TARGET=mediawiki_registry_schema_custom
-PACKAGE=org.openoffice.Office.Custom
-
-.INCLUDE : settings.mk
-.INCLUDE : ${PRJ}$/makefile.pmk
-
-.IF "$(ENABLE_MEDIAWIKI)" == "YES"
-LOCALIZEDFILES=
-
-MODULEFILES=
-
-XCSFILES = WikiExtension.xcs
-.ENDIF
-
-.INCLUDE : target.mk
-
diff --git a/swext/mediawiki/src/uno-extension-manifest.xml b/swext/mediawiki/src/uno-extension-manifest.xml
deleted file mode 100644
index f3d9a0e..0000000
--- a/swext/mediawiki/src/uno-extension-manifest.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--***********************************************************************
-
- 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
- <http://www.openoffice.org/license.html>
- for a copy of the LGPLv3 License.
-
- ************************************************************************ -->
-<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-component;type=Java"
- manifest:full-path="mediawiki.jar"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
- manifest:full-path="Addons.xcu"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
- manifest:full-path="ProtocolHandler.xcu"/>
- <manifest:file-entry manifest:full-path="WikiEditor/"
- manifest:media-type="application/vnd.sun.star.basic-library"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-schema"
- manifest:full-path="WikiExtension.xcs"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
- manifest:full-path="WikiExtension.xcu"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
- manifest:full-path="OptionsDialog.xcu"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
- manifest:full-path="Filter.xcu"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
- manifest:full-path="Types.xcu"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
- manifest:full-path="Paths.xcu"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.help"
- manifest:full-path="help"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.package-bundle-description"
- manifest:full-path="help/component.txt"/>
-</manifest:manifest>
diff --git a/swext/prj/build.lst b/swext/prj/build.lst
index 0bac744..314cbd8 100644
--- a/swext/prj/build.lst
+++ b/swext/prj/build.lst
@@ -1,10 +1,3 @@
swext swext : officecfg TRANSLATIONS:translations DESKTOP:l10ntools javaunohelper ridljar unoil jurt APACHE_COMMONS:apache-commons readlicense_oo xsltml xmlhelp NULL
-swext swext usr1 - all swext_mkout NULL
-swext swext\mediawiki\help nmake - all swext_mwhelp NULL
-swext swext\mediawiki\src\registry\schema\org\openoffice\Office\Custom nmake - all swext_mwschema NULL
-swext swext\mediawiki\src\registry\data\org\openoffice\Office\Custom nmake - all swext_mwcustomdata swext_mwschema NULL
-swext swext\mediawiki\src\registry\data\org\openoffice\Office nmake - all swext_mwofficedata NULL
-swext swext\mediawiki\src\registry\data\org\openoffice\TypeDetection nmake - all swext_mwtypedetection NULL
-swext swext\mediawiki\src nmake - all swext_mwlicense NULL
-swext swext\mediawiki nmake - all swext_mw swext_mwhelp swext_mwschema swext_mwcustomdata swext_mwofficedata swext_mwlicense swext_mwtypedetection NULL
+swext swext\prj nmake - all swext_prj NULL
diff --git a/swext/prj/d.lst b/swext/prj/d.lst
index 7f7ff29..e69de29 100644
--- a/swext/prj/d.lst
+++ b/swext/prj/d.lst
@@ -1,5 +0,0 @@
-mkdir: %_DEST%\bin\swext
-..\%__SRC%\bin\wiki-publisher.oxt %_DEST%\bin\swext\wiki-publisher.oxt
-..\%__SRC%\bin\wiki-publisher.oxt %_DEST%\bin\wiki-publisher.oxt
-..\%__SRC%\bin\mediawiki_develop.zip %_DEST%\bin\swext\mediawiki_develop.zip
-
diff --git a/swext/prj/makefile.mk b/swext/prj/makefile.mk
new file mode 100644
index 0000000..85b2566
--- /dev/null
+++ b/swext/prj/makefile.mk
@@ -0,0 +1,40 @@
+#*************************************************************************
+#
+# 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
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+all:
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 1a2b852..16a4f27 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb tail_build : BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost DESKTOP:l10ntools LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf avmedia basegfx basic bridges canvas comphelper connectivity cppcanvas cppu cppuhelper fpicker javaunohelper jurt jvmaccess offapi officecfg oovbaapi package qadevOOo DESKTOP:rdbmaker rhino ridljar sal sax sfx2 solenv soltools sot stoc svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools ure vcl xmlhelp xmloff xmlscript NULL
+tb tail_build : APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost DESKTOP:l10ntools LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf avmedia basegfx basic bridges canvas comphelper connectivity cppcanvas cppu cppuhelper fpicker javaunohelper jurt jvmaccess offapi officecfg oovbaapi package qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal sax sfx2 solenv soltools sot stoc svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools ure vcl xmlhelp xmloff xmlscript xsltml NULL
tb tail_build\prj nmake - all tb_prj NULL
--
1.7.6.1
-------------- next part --------------
From fbf89134aa52e86a4425b4d783b9e75af2fe9bbc Mon Sep 17 00:00:00 2001
From: Peter Foley <pefoley2 at verizon.net>
Date: Sat, 24 Sep 2011 21:40:19 -0400
Subject: [PATCH 2/5] convert xmerge to gbuild and add to tail_build
---
Module_tail_build.mk | 1 +
RepositoryModule_ooo.mk | 1 +
postprocess/prj/build.lst | 2 +-
solenv/gbuild/Jar.mk | 1 +
xmerge/Jar_XMergeBridge.mk | 52 ++++++++
xmerge/Jar_aportisdoc.mk | 42 ++++++
xmerge/Jar_htmlsoff.mk | 37 ++++++
xmerge/Jar_pexcel.mk | 44 +++++++
xmerge/Jar_pocketword.mk | 42 ++++++
xmerge/Jar_xmerge.mk | 54 ++++++++
xmerge/Makefile | 38 ++++++
xmerge/Module_xmerge.mk | 39 ++++++
xmerge/Package_xmergesync.mk | 34 +++++
xmerge/build.xml | 88 -------------
xmerge/prj/build.lst | 11 +--
xmerge/prj/d.lst | 12 --
xmerge/prj/makefile.mk | 40 ++++++
xmerge/source/aportisdoc/build.xml | 76 -----------
xmerge/source/aportisdoc/makefile.mk | 35 -----
xmerge/source/bridge/antcall.txt | 19 ---
xmerge/source/bridge/build.xml | 78 -----------
xmerge/source/bridge/makefile.mk | 43 ------
xmerge/source/bridge/manifest.mf | 1 -
xmerge/source/htmlsoff/build.xml | 67 ----------
xmerge/source/htmlsoff/makefile.mk | 35 -----
xmerge/source/inc/antbuild.properties | 12 --
xmerge/source/inc/antbuild.xml | 2 -
xmerge/source/minicalc/minicalc.mf | 3 +
xmerge/source/pexcel/build.xml | 76 -----------
xmerge/source/pexcel/makefile.mk | 35 -----
xmerge/source/pocketword/build.xml | 76 -----------
xmerge/source/pocketword/makefile.mk | 35 -----
xmerge/source/xmerge/build.xml | 92 -------------
.../org/openoffice/xmerge/util/registry/build.xml | 135 --------------------
xmerge/source/xmerge/makefile.mk | 34 -----
xmerge/source/xmerge/xmerge.mf | 6 +
xmerge/util/build.xml | 94 --------------
xmerge/util/makefile.mk | 34 -----
xmerge/util/minicalc.mf | 3 -
xmerge/util/xmerge.mf | 8 -
xmerge/workben/build.xml | 128 -------------------
41 files changed, 436 insertions(+), 1229 deletions(-)
create mode 100644 xmerge/Jar_XMergeBridge.mk
create mode 100644 xmerge/Jar_aportisdoc.mk
create mode 100644 xmerge/Jar_htmlsoff.mk
create mode 100644 xmerge/Jar_pexcel.mk
create mode 100644 xmerge/Jar_pocketword.mk
create mode 100644 xmerge/Jar_xmerge.mk
create mode 100644 xmerge/Makefile
create mode 100644 xmerge/Module_xmerge.mk
create mode 100644 xmerge/Package_xmergesync.mk
delete mode 100644 xmerge/build.xml
create mode 100644 xmerge/prj/makefile.mk
delete mode 100644 xmerge/source/aportisdoc/build.xml
delete mode 100644 xmerge/source/aportisdoc/makefile.mk
delete mode 100644 xmerge/source/bridge/antcall.txt
delete mode 100644 xmerge/source/bridge/build.xml
delete mode 100644 xmerge/source/bridge/makefile.mk
delete mode 100644 xmerge/source/htmlsoff/build.xml
delete mode 100644 xmerge/source/htmlsoff/makefile.mk
delete mode 100644 xmerge/source/inc/antbuild.properties
delete mode 100644 xmerge/source/inc/antbuild.xml
create mode 100644 xmerge/source/minicalc/minicalc.mf
delete mode 100644 xmerge/source/pexcel/build.xml
delete mode 100644 xmerge/source/pexcel/makefile.mk
delete mode 100644 xmerge/source/pocketword/build.xml
delete mode 100644 xmerge/source/pocketword/makefile.mk
delete mode 100644 xmerge/source/xmerge/build.xml
delete mode 100644 xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/build.xml
delete mode 100644 xmerge/source/xmerge/makefile.mk
create mode 100644 xmerge/source/xmerge/xmerge.mf
delete mode 100644 xmerge/util/build.xml
delete mode 100644 xmerge/util/makefile.mk
delete mode 100644 xmerge/util/minicalc.mf
delete mode 100644 xmerge/util/xmerge.mf
delete mode 100644 xmerge/workben/build.xml
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 7066789..558c6b2 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -59,6 +59,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
wizards \
writerfilter \
writerperfect \
+ xmerge \
xmlsecurity \
))
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 66162d9..f823b0c 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -94,6 +94,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
wizards \
writerfilter \
writerperfect \
+ xmerge \
xml2cmp \
xmloff \
xmlreader \
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index a52c918..400cc85 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po postprocess :: accessibility BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n dtrans embeddedobj embedserv EPM:epm DESKTOP:extensions extras fpicker HELP:helpcontent2 io LIBRSVG:librsvg lingucomponent ODK:odk officecfg package psprint_config remotebridges scaddins scp2 DESKTOP:setup_native sysui testtools ucb UnoControls ure wizards xmerge MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt tail_build NULL
+po postprocess :: accessibility BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n dtrans embeddedobj embedserv EPM:epm DESKTOP:extensions extras fpicker HELP:helpcontent2 io LIBRSVG:librsvg lingucomponent ODK:odk officecfg package psprint_config remotebridges scaddins scp2 DESKTOP:setup_native sysui testtools ucb UnoControls ure wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt tail_build NULL
po postprocess usr1 - all po_mkout NULL
po postprocess\checkxml nmake - all po_checkxml NULL
po postprocess\checkdeliver nmake - all po_checkdlv NULL
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index 659c9ae..8589df1 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -108,6 +108,7 @@ define gb_Jar_add_packagefile
$(call gb_Jar_get_target,$(1)) : PACKAGEFILES += $(2)
$(call gb_Jar_get_target,$(1)) : $(call gb_Jar_get_workdir,$(1))/$(strip $(2))
$(call gb_Jar_get_workdir,$(1))/$(strip $(2)) : $(3) $(call gb_JavaClassSet_get_target,$(call gb_Jar_get_classsetname,$(1)))
+ mkdir -p $$(dir $$@)
cp -f $(3) $$@
endef
diff --git a/xmerge/Jar_XMergeBridge.mk b/xmerge/Jar_XMergeBridge.mk
new file mode 100644
index 0000000..858b0e4
--- /dev/null
+++ b/xmerge/Jar_XMergeBridge.mk
@@ -0,0 +1,52 @@
+#
+# 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.
+#
+# The Initial Developer of the Original Code is
+# Peter Foley <pefoley2 at verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# 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,XMergeBridge,SRCDIR))
+
+$(eval $(call gb_Jar_set_componentfile,XMergeBridge,xmerge/source/bridge/XMergeBridge,OOO))
+
+$(eval $(call gb_Jar_set_manifest,XMergeBridge,$(SRCDIR)/xmerge/source/bridge/manifest.mf))
+
+$(eval $(call gb_Jar_set_packageroot,XMergeBridge,*.class))
+
+$(eval $(call gb_Jar_set_jarclasspath,XMergeBridge,\
+ xmerge.jar \
+))
+
+$(eval $(call gb_Jar_add_jars,XMergeBridge,\
+ $(OUTDIR)/bin/xmerge.jar \
+ $(OUTDIR)/bin/unoil.jar \
+ $(OUTDIR)/bin/ridl.jar \
+ $(OUTDIR)/bin/jurt.jar \
+ $(OUTDIR)/bin/juh.jar \
+))
+
+$(eval $(call gb_Jar_add_sourcefiles,XMergeBridge,\
+ xmerge/source/bridge/java/XMergeBridge \
+))
diff --git a/xmerge/Jar_aportisdoc.mk b/xmerge/Jar_aportisdoc.mk
new file mode 100644
index 0000000..f9a13e8
--- /dev/null
+++ b/xmerge/Jar_aportisdoc.mk
@@ -0,0 +1,42 @@
+#
+# 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.
+#
+# The Initial Developer of the Original Code is
+# Peter Foley <pefoley2 at verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# 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,aportisdoc,SRCDIR))
+
+$(eval $(call gb_Jar_add_packagefile,aportisdoc,META-INF/converter.xml,$(SRCDIR)/xmerge/source/aportisdoc/converter.xml))
+
+$(eval $(call gb_Jar_set_packageroot,aportisdoc,org))
+
+$(eval $(call gb_Jar_add_jars,aportisdoc,\
+ $(OUTDIR)/bin/xmerge.jar \
+))
+
+$(eval $(call gb_Jar_add_sourcefiles,aportisdoc,\
+ xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/* \
+))
diff --git a/xmerge/Jar_htmlsoff.mk b/xmerge/Jar_htmlsoff.mk
new file mode 100644
index 0000000..501e774
--- /dev/null
+++ b/xmerge/Jar_htmlsoff.mk
@@ -0,0 +1,37 @@
+#
+# 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.
+#
+# The Initial Developer of the Original Code is
+# Peter Foley <pefoley2 at verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# 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,htmlsoff,SRCDIR))
+
+$(eval $(call gb_Jar_add_packagefile,htmlsoff,META-INF/converter.xml,$(SRCDIR)/xmerge/source/htmlsoff/converter.xml))
+$(eval $(call gb_Jar_add_packagefile,htmlsoff,htmltosoff.xsl,$(SRCDIR)/xmerge/source/htmlsoff/htmltosoff.xsl))
+$(eval $(call gb_Jar_add_packagefile,htmlsoff,sofftohtml.xsl,$(SRCDIR)/xmerge/source/htmlsoff/sofftohtml.xsl))
+
+$(eval $(call gb_Jar_set_packageroot,htmlsoff,*.xsl))
+
diff --git a/xmerge/Jar_pexcel.mk b/xmerge/Jar_pexcel.mk
new file mode 100644
index 0000000..8f18b33
--- /dev/null
+++ b/xmerge/Jar_pexcel.mk
@@ -0,0 +1,44 @@
+#
+# 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.
+#
+# The Initial Developer of the Original Code is
+# Peter Foley <pefoley2 at verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# 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,pexcel,SRCDIR))
+
+$(eval $(call gb_Jar_add_packagefile,pexcel,META-INF/converter.xml,$(SRCDIR)/xmerge/source/pexcel/converter.xml))
+
+$(eval $(call gb_Jar_set_packageroot,pexcel,org))
+
+$(eval $(call gb_Jar_add_jars,pexcel,\
+ $(OUTDIR)/bin/xmerge.jar \
+))
+
+$(eval $(call gb_Jar_add_sourcefiles,pexcel,\
+ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/* \
+ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/* \
+ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/* \
+))
diff --git a/xmerge/Jar_pocketword.mk b/xmerge/Jar_pocketword.mk
new file mode 100644
index 0000000..ecbfe8e
--- /dev/null
+++ b/xmerge/Jar_pocketword.mk
@@ -0,0 +1,42 @@
+#
+# 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.
+#
+# The Initial Developer of the Original Code is
+# Peter Foley <pefoley2 at verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# 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,pocketword,SRCDIR))
+
+$(eval $(call gb_Jar_add_packagefile,pocketword,META-INF/converter.xml,$(SRCDIR)/xmerge/source/pocketword/converter.xml))
+
+$(eval $(call gb_Jar_set_packageroot,pocketword,org))
+
+$(eval $(call gb_Jar_add_jars,pocketword,\
+ $(OUTDIR)/bin/xmerge.jar \
+))
+
+$(eval $(call gb_Jar_add_sourcefiles,pocketword,\
+ xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/* \
+))
diff --git a/xmerge/Jar_xmerge.mk b/xmerge/Jar_xmerge.mk
new file mode 100644
index 0000000..943f8b5
--- /dev/null
+++ b/xmerge/Jar_xmerge.mk
@@ -0,0 +1,54 @@
+#
+# 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.
+#
+# The Initial Developer of the Original Code is
+# Peter Foley <pefoley2 at verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# 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,xmerge,SRCDIR))
+
+$(eval $(call gb_Jar_set_manifest,xmerge,$(SRCDIR)/xmerge/source/xmerge/xmerge.mf))
+
+$(eval $(call gb_Jar_add_jars,xmerge,\
+ $(OUTDIR)/bin/unoil.jar \
+ $(OUTDIR)/bin/ridl.jar \
+ $(OUTDIR)/bin/jurt.jar \
+ $(OUTDIR)/bin/juh.jar \
+))
+
+$(eval $(call gb_Jar_set_jarclasspath,xmerge,\
+ xml-apis.jar \
+ xercesImpl.jar \
+ serializer.jar \
+))
+
+$(eval $(call gb_Jar_set_packageroot,xmerge,org))
+
+$(eval $(call gb_Jar_add_sourcefiles,xmerge,\
+ xmerge/source/xmerge/java/org/openoffice/xmerge/* \
+ xmerge/source/xmerge/java/org/openoffice/xmerge/*/* \
+ xmerge/source/xmerge/java/org/openoffice/xmerge/*/*/* \
+ xmerge/source/xmerge/java/org/openoffice/xmerge/*/*/*/* \
+))
diff --git a/xmerge/Makefile b/xmerge/Makefile
new file mode 100644
index 0000000..5bedaf0
--- /dev/null
+++ b/xmerge/Makefile
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 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/xmerge/Module_xmerge.mk b/xmerge/Module_xmerge.mk
new file mode 100644
index 0000000..b5ef278
--- /dev/null
+++ b/xmerge/Module_xmerge.mk
@@ -0,0 +1,39 @@
+#
+# 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.
+#
+# The Initial Developer of the Original Code is
+# Peter Foley <pefoley2 at verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# 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,xmerge))
+
+$(eval $(call gb_Module_add_targets,xmerge,\
+ Jar_aportisdoc \
+ Jar_htmlsoff \
+ Jar_pexcel \
+ Jar_pocketword \
+ Jar_xmerge \
+ Jar_XMergeBridge \
+ Package_xmergesync \
+))
diff --git a/xmerge/Package_xmergesync.mk b/xmerge/Package_xmergesync.mk
new file mode 100644
index 0000000..fbeead5
--- /dev/null
+++ b/xmerge/Package_xmergesync.mk
@@ -0,0 +1,34 @@
+#
+# 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.
+#
+# The Initial Developer of the Original Code is
+# Peter Foley <pefoley2 at verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# 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,xmergesync,$(SRCDIR)/xmerge/source/activesync/BIN))
+
+ifeq ($(GUI),WNT)
+$(eval $(call gb_Package_add_file,xmergesync,bin/xmergesync.dll,xmergesync.dll))
+endif
diff --git a/xmerge/build.xml b/xmerge/build.xml
deleted file mode 100644
index 5878c1a..0000000
--- a/xmerge/build.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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
- <http://www.openoffice.org/license.html>
- for a copy of the LGPLv3 License.
-
--->
-<project name="xmerge" default="main" basedir=".">
-
- <property environment="env"/>
- <property name="solar.platform" value="${env.COMP_ENV}${env.PROEXT}"/>
- <property name="out" location="${basedir}/${solar.platform}"/>
- <property name="solar.jar" location="${env.SOLARVER}/${solar.platform}/bin${env.UPDMINOREXT}"/>
- <property name="debug" value="yes"/>
- <property name="optimize" value="no"/>
-
- <target name="init">
- <echoproperties prefix="solar"/>
- <mkdir dir="${out}"/>
- <mkdir dir="${out}/class"/>
- </target>
-
- <target name="xmerge" depends="init">
- <ant dir="source/xmerge" target="all"/>
- </target>
-
- <target name="bridge" depends="xmerge, init">
- <ant dir="source/bridge" target="all"/>
- </target>
-
- <target name="aportisdoc" depends="xmerge, init">
- <ant dir="source/aportisdoc" target="all"/>
- </target>
-
- <target name="pexcel" depends="xmerge, init">
- <ant dir="source/pexcel" target="all"/>
- </target>
-
- <target name="pocketword" depends="xmerge, init">
- <ant dir="source/pocketword" target="all"/>
- </target>
-
- <target name="htmlsoff" depends="init">
- <ant dir="source/htmlsoff" target="all"/>
- </target>
-
- <target name="wordsmith" depends="xmerge">
- <echo>wordsmith filter is not supported</echo>
- <ant dir="source/wordsmith" target="all"/>
- </target>
-
- <target name="minicalc" depends="xmerge">
- <echo>minicalc filter is not supported</echo>
- <ant dir="source/minicalc" target="all"/>
- </target>
-
- <target name="util" depends="xmerge, bridge, aportisdoc, pexcel, pocketword, htmlsoff">
- <ant dir="util" target="all"/>
- </target>
-
- <target name="all" depends="xmerge, bridge, aportisdoc, pexcel, pocketword, htmlsoff, util">
- </target>
-
- <target name="clean">
- <delete dir="${out}" />
- </target>
-
-</project>
-
diff --git a/xmerge/prj/build.lst b/xmerge/prj/build.lst
index 39cde42..35bf4db7 100644
--- a/xmerge/prj/build.lst
+++ b/xmerge/prj/build.lst
@@ -1,11 +1,2 @@
xmrg xmerge : solenv unoil javaunohelper LIBXSLT:libxslt NULL
-xmrg xmerge usr1 - all xmrg_mkout NULL
-xmrg xmerge\inc nmake - all xmrg_inc NULL
-xmrg xmerge\source\xmerge nmake - all xmrg_xmerge xmrg_inc NULL
-xmrg xmerge\source\bridge nmake - all xmrg_bridge xmrg_xmerge xmrg_inc NULL
-xmrg xmerge\source\aportisdoc nmake - all xmrg_aportis xmrg_xmerge xmrg_inc NULL
-xmrg xmerge\source\pexcel nmake - all xmrg_pexcel xmrg_xmerge xmrg_inc NULL
-xmrg xmerge\source\pocketword nmake - all xmrg_pword xmrg_xmerge xmrg_inc NULL
-xmrg xmerge\source\htmlsoff nmake - all xmrg_htmlsoff xmrg_inc NULL
-xmrg xmerge\source\activesync nmake - all xmrg_activesync xmrg_inc NULL
-xmrg xmerge\util nmake - all xmrg_util xmrg_xmerge xmrg_bridge xmrg_aportis xmrg_pexcel xmrg_pword NULL
+xmrg xmerge\prj nmake - all xmrg_prj NULL
diff --git a/xmerge/prj/d.lst b/xmerge/prj/d.lst
index c0f2df9..e69de29 100644
--- a/xmerge/prj/d.lst
+++ b/xmerge/prj/d.lst
@@ -1,12 +0,0 @@
-..\%__SRC%\class\xmerge.jar %_DEST%\bin\xmerge.jar
-..\%__SRC%\class\pexcel.jar %_DEST%\bin\pexcel.jar
-..\%__SRC%\class\htmlsoff.jar %_DEST%\bin\htmlsoff.jar
-..\%__SRC%\class\aportisdoc.jar %_DEST%\bin\aportisdoc.jar
-..\%__SRC%\class\XMergeBridge.jar %_DEST%\bin\XMergeBridge.jar
-..\%__SRC%\class\pocketword.jar %_DEST%\bin\pocketword.jar
-..\%__SRC%\bin\xmergesync.dll %_DEST%\bin\xmergesync.dll
-mkdir: %_DEST%\doc\xmerge
-..\%__SRC%\doc\javadoc\package-list %_DEST%\doc\xmerge\package-list
-..\%__SRC%\doc\xmerge_javadoc.zip %_DEST%\doc\xmerge_javadoc.zip
-..\%__SRC%\doc\writer2latex_javadoc.zip %_DEST%\doc\writer2latex_javadoc.zip
-..\%__SRC%\misc\XMergeBridge.component %_DEST%\xml\XMergeBridge.component
diff --git a/xmerge/prj/makefile.mk b/xmerge/prj/makefile.mk
new file mode 100644
index 0000000..85b2566
--- /dev/null
+++ b/xmerge/prj/makefile.mk
@@ -0,0 +1,40 @@
+#*************************************************************************
+#
+# 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
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+all:
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/xmerge/source/aportisdoc/build.xml b/xmerge/source/aportisdoc/build.xml
deleted file mode 100644
index 6e9d22b..0000000
--- a/xmerge/source/aportisdoc/build.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- #*************************************************************************
- #
- 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
- <http://www.openoffice.org/license.html>
- for a copy of the LGPLv3 License.
-
- #*************************************************************************
- -->
-
-<project name="aportisdoc" default="all" basedir=".">
-
- <property file="../inc/antbuild.properties"/>
-
- <path id="classpath">
- <pathelement location="${build.dir}/xmerge.jar"/>
- </path>
-
-
- <target name="init" >
- <mkdir dir="${target.dir}"/>
- </target>
-
- <!-- compile java sources in ${package} -->
- <target name="compile" depends="init">
- <javac srcdir="${src.dir}"
- destdir="${target.dir}"
- debug="${debug}"
- deprecation="${deprecation}"
- optimize="${optimize}">
- <classpath refid="classpath"/>
- </javac>
- </target>
-
- <!-- package to jar -->
- <target name="jar" depends="compile">
- <jar destfile="${target.jar}">
- <fileset dir="${target.dir}"
- includes="**/*.class" />
- <metainf dir="${basedir}">
- <filename name="converter.xml"/>
- </metainf>
- </jar>
- </target>
-
- <!-- clean up -->
- <target name="clean">
- <delete dir="${class.dir}"/>
- <delete file="${target.jar}"/>
- </target>
-
- <target name="all" depends="jar">
- </target>
-
-</project>
-
diff --git a/xmerge/source/aportisdoc/makefile.mk b/xmerge/source/aportisdoc/makefile.mk
deleted file mode 100644
index dad48f9..0000000
--- a/xmerge/source/aportisdoc/makefile.mk
+++ /dev/null
@@ -1,35 +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
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-TARGET=aportisdoc
-PRJ=../..
-PRJNAME=xmerge
-
-.INCLUDE : ant.mk
-.IF "$(L10N_framework)"==""
-ALLTAR: ANTBUILD
-.ENDIF
diff --git a/xmerge/source/bridge/antcall.txt b/xmerge/source/bridge/antcall.txt
deleted file mode 100644
index 96abc7b..0000000
--- a/xmerge/source/bridge/antcall.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-r:\btools\apache-ant-1.6.1\bin\ant
--Dprj=../..
--Dprjname=
--Ddebug=off
--Doptimize=on
--Dtarget=xmrg_bridge
--Dsolar.update=on
--Dout=../..\wntmsci10.pro
--Dinpath=wntmsci10.pro
--Dproext=".pro"
--Dsolar.bin=Y:\so-cwsserv03\lo8\SRC680\wntmsci10.pro\bin.m105
--Dsolar.jar=Y:\so-cwsserv03\lo8\SRC680\wntmsci10.pro\bin.m105
--Dsolar.doc=Y:\so-cwsserv03\lo8\SRC680\wntmsci10.pro\doc.m105
--Dcommon.jar=Y:\so-cwsserv03\lo8\SRC680\common.pro\bin.m105
--Dcommon.doc=Y:\so-cwsserv03\lo8\SRC680\common.pro\doc.m105
--f build.xml
--emacs
-
-Buildfile: build.xml
diff --git a/xmerge/source/bridge/build.xml b/xmerge/source/bridge/build.xml
deleted file mode 100644
index 5a2a225..0000000
--- a/xmerge/source/bridge/build.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- #*************************************************************************
- #
- 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
- <http://www.openoffice.org/license.html>
- for a copy of the LGPLv3 License.
-
- #*************************************************************************
- -->
-
-<project name="XMergeBridge" default="all" basedir=".">
-
- <property file="../inc/antbuild.properties"/>
-
- <path id="classpath">
- <pathelement location="${build.dir}/xmerge.jar"/>
- <pathelement location="${solar.jar}/unoil.jar"/>
- <pathelement location="${solar.jar}/ridl.jar"/>
- <pathelement location="${solar.jar}/jurt.jar"/>
- <pathelement location="${solar.jar}/juh.jar"/>
- </path>
-
-
- <target name="init" >
- <mkdir dir="${target.dir}"/>
- </target>
-
- <!-- compile java sources in ${package} -->
- <target name="compile" depends="init">
- <javac srcdir="${src.dir}"
- destdir="${target.dir}"
- debug="${debug}"
- deprecation="${deprecation}"
- optimize="${optimize}">
- <classpath refid="classpath"/>
- </javac>
- </target>
-
- <!-- package to jar -->
- <target name="jar" depends="compile">
- <jar destfile="${target.jar}"
- manifest="manifest.mf">
- <fileset dir="${target.dir}"
- includes="**/*.class" />
- </jar>
- </target>
-
- <!-- clean up -->
- <target name="clean">
- <delete dir="${class.dir}"/>
- <delete file="${target.jar}"/>
- </target>
-
- <target name="all" depends="jar">
- </target>
-
-</project>
-
diff --git a/xmerge/source/bridge/makefile.mk b/xmerge/source/bridge/makefile.mk
deleted file mode 100644
index 05fa5a7..0000000
--- a/xmerge/source/bridge/makefile.mk
+++ /dev/null
@@ -1,43 +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
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-TARGET=XMergeBridge
-PRJ=../..
-PRJNAME=xmerge
-
-.INCLUDE : ant.mk
-.IF "$(L10N_framework)"==""
-ALLTAR: ANTBUILD
-.ENDIF
-
-ALLTAR : $(MISC)/XMergeBridge.component
-
-$(MISC)/XMergeBridge.component .ERRREMOVE : \
- $(SOLARENV)/bin/createcomponent.xslt XMergeBridge.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_JAVA)XMergeBridge.jar' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt XMergeBridge.component
diff --git a/xmerge/source/bridge/manifest.mf b/xmerge/source/bridge/manifest.mf
index 167082c..1c63d9e 100644
--- a/xmerge/source/bridge/manifest.mf
+++ b/xmerge/source/bridge/manifest.mf
@@ -1,3 +1,2 @@
-Class-Path: xmerge.jar
RegistrationClassName: XMergeBridge
UNO-Type-Path:
diff --git a/xmerge/source/htmlsoff/build.xml b/xmerge/source/htmlsoff/build.xml
deleted file mode 100644
index 90cbcbb..0000000
--- a/xmerge/source/htmlsoff/build.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- #*************************************************************************
- #
- 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
- <http://www.openoffice.org/license.html>
- for a copy of the LGPLv3 License.
-
- #*************************************************************************
- -->
-
-<project name="htmlsoff" default="all" basedir=".">
-
- <property file="../inc/antbuild.properties"/>
-
- <path id="classpath">
- <pathelement location="${build.dir}/xmerge.jar"/>
- </path>
-
-
- <target name="init" >
- </target>
-
- <!-- compile java sources in ${package} -->
- <target name="compile" depends="init">
- </target>
-
- <!-- package to jar -->
- <target name="jar" depends="compile">
- <jar destfile="${target.jar}">
- <fileset dir="${basedir}"
- includes="*.xsl" />
- <metainf dir="${basedir}">
- <filename name="converter.xml"/>
- </metainf>
- </jar>
- </target>
-
- <!-- clean up -->
- <target name="clean">
- <delete file="${target.jar}"/>
- </target>
-
- <target name="all" depends="jar">
- </target>
-
-</project>
-
diff --git a/xmerge/source/htmlsoff/makefile.mk b/xmerge/source/htmlsoff/makefile.mk
deleted file mode 100644
index 204b3ff..0000000
--- a/xmerge/source/htmlsoff/makefile.mk
+++ /dev/null
@@ -1,35 +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
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-TARGET=htmlsoff
-PRJ=../..
-PRJNAME=xmerge
-
-.INCLUDE : ant.mk
-.IF "$(L10N_framework)"==""
-ALLTAR: ANTBUILD
-.ENDIF
diff --git a/xmerge/source/inc/antbuild.properties b/xmerge/source/inc/antbuild.properties
deleted file mode 100644
index a027bbb..0000000
--- a/xmerge/source/inc/antbuild.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-# define how to handle CLASSPATH environment
-# x-no-translate
-build.sysclasspath=ignore
-
-# set wether we want to compile with or without deprecation
-deprecation=on
-
-src.dir=${basedir}/java
-
-build.dir=${out}/class
-target.dir=${build.dir}/${ant.project.name}
-target.jar=${build.dir}/${ant.project.name}.jar
\ No newline at end of file
diff --git a/xmerge/source/inc/antbuild.xml b/xmerge/source/inc/antbuild.xml
deleted file mode 100644
index 4598ae2..0000000
--- a/xmerge/source/inc/antbuild.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0"?>
-
diff --git a/xmerge/source/minicalc/minicalc.mf b/xmerge/source/minicalc/minicalc.mf
new file mode 100644
index 0000000..1f0a0e3
--- /dev/null
+++ b/xmerge/source/minicalc/minicalc.mf
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path: jmc.jar
+
diff --git a/xmerge/source/pexcel/build.xml b/xmerge/source/pexcel/build.xml
deleted file mode 100644
index caaf8ce..0000000
--- a/xmerge/source/pexcel/build.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- #*************************************************************************
- #
- 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
- <http://www.openoffice.org/license.html>
- for a copy of the LGPLv3 License.
-
- #*************************************************************************
- -->
-
-<project name="pexcel" default="all" basedir=".">
-
- <property file="../inc/antbuild.properties"/>
-
- <path id="classpath">
- <pathelement location="${build.dir}/xmerge.jar"/>
- </path>
-
-
- <target name="init" >
- <mkdir dir="${target.dir}"/>
- </target>
-
- <!-- compile java sources in ${package} -->
- <target name="compile" depends="init">
- <javac srcdir="${src.dir}"
- destdir="${target.dir}"
- debug="${debug}"
- deprecation="${deprecation}"
- optimize="${optimize}">
- <classpath refid="classpath"/>
- </javac>
- </target>
-
- <!-- package to jar -->
- <target name="jar" depends="compile">
- <jar destfile="${target.jar}">
- <fileset dir="${target.dir}"
- includes="**/*.class" />
- <metainf dir="${basedir}">
- <filename name="converter.xml"/>
- </metainf>
- </jar>
- </target>
-
- <!-- clean up -->
- <target name="clean">
- <delete dir="${class.dir}"/>
- <delete file="${target.jar}"/>
- </target>
-
- <target name="all" depends="jar">
- </target>
-
-</project>
-
diff --git a/xmerge/source/pexcel/makefile.mk b/xmerge/source/pexcel/makefile.mk
deleted file mode 100644
index 7f51a43e..0000000
--- a/xmerge/source/pexcel/makefile.mk
+++ /dev/null
@@ -1,35 +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
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-TARGET=pexcel
-PRJ=../..
-PRJNAME=xmerge
-
-.INCLUDE : ant.mk
-.IF "$(L10N_framework)"==""
-ALLTAR: ANTBUILD
-.ENDIF
diff --git a/xmerge/source/pocketword/build.xml b/xmerge/source/pocketword/build.xml
deleted file mode 100644
index 51b198c..0000000
--- a/xmerge/source/pocketword/build.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- #*************************************************************************
- #
- 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
- <http://www.openoffice.org/license.html>
- for a copy of the LGPLv3 License.
-
- #*************************************************************************
- -->
-
-<project name="pocketword" default="all" basedir=".">
-
- <property file="../inc/antbuild.properties"/>
-
- <path id="classpath">
- <pathelement location="${build.dir}/xmerge.jar"/>
- </path>
-
-
- <target name="init" >
- <mkdir dir="${target.dir}"/>
- </target>
-
- <!-- compile java sources in ${package} -->
- <target name="compile" depends="init">
- <javac srcdir="${src.dir}"
- destdir="${target.dir}"
- debug="${debug}"
- deprecation="${deprecation}"
- optimize="${optimize}">
- <classpath refid="classpath"/>
- </javac>
- </target>
-
- <!-- package to jar -->
- <target name="jar" depends="compile">
- <jar destfile="${target.jar}">
- <fileset dir="${target.dir}"
- includes="**/*.class" />
- <metainf dir="${basedir}">
- <filename name="converter.xml"/>
- </metainf>
- </jar>
- </target>
-
- <!-- clean up -->
- <target name="clean">
- <delete dir="${class.dir}"/>
- <delete file="${target.jar}"/>
- </target>
-
- <target name="all" depends="jar">
- </target>
-
-</project>
-
diff --git a/xmerge/source/pocketword/makefile.mk b/xmerge/source/pocketword/makefile.mk
deleted file mode 100644
index 9db2d15..0000000
--- a/xmerge/source/pocketword/makefile.mk
+++ /dev/null
@@ -1,35 +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
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-TARGET=pocketword
-PRJ=../..
-PRJNAME=xmerge
-
-.INCLUDE : ant.mk
-.IF "$(L10N_framework)"==""
-ALLTAR: ANTBUILD
-.ENDIF
diff --git a/xmerge/source/xmerge/build.xml b/xmerge/source/xmerge/build.xml
deleted file mode 100644
index 8c46b46..0000000
--- a/xmerge/source/xmerge/build.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- #*************************************************************************
- #
- 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
- <http://www.openoffice.org/license.html>
- for a copy of the LGPLv3 License.
-
- #*************************************************************************
- -->
-
-<project name="xmerge" default="all" basedir=".">
-
- <property file="../inc/antbuild.properties"/>
-
- <property environment="env"/>
- <property name="env.XML_APIS_JAR" value="${solar.jar}/xml-apis.jar"/>
- <property name="env.XERCES_JAR" value="${solar.jar}/xercesImpl.jar"/>
-
- <path id="classpath">
- <pathelement location="${env.XML_APIS_JAR}"/>
- <pathelement location="${env.XERCES_JAR}"/>
- <pathelement location="${solar.jar}/unoil.jar"/>
- <pathelement location="${solar.jar}/ridl.jar"/>
- <pathelement location="${solar.jar}/jurt.jar"/>
- <pathelement location="${solar.jar}/juh.jar"/>
- </path>
-
-
- <target name="init" >
- <mkdir dir="${target.dir}"/>
- </target>
-
- <!-- compile java sources in ${package} -->
- <target name="compile" depends="init">
- <javac srcdir="${src.dir}"
- destdir="${target.dir}"
- debug="${debug}"
- deprecation="${deprecation}"
- optimize="${optimize}">
- <classpath refid="classpath"/>
- </javac>
- </target>
-
- <!-- package to jar -->
- <target name="jar" depends="compile">
- <jar destfile="${target.jar}">
- <fileset dir="${target.dir}"
- includes="**/*.class" />
- <fileset dir="${src.dir}"
- includes="**/*.properties" />
- <manifest>
- <attribute name="Main-Class" value="org.openoffice.xmerge.test.Driver"/>
- <attribute name="Specification-Title" value="OpenOffice XMerge Framework"/>
- <attribute name="Specification-Vendor" value="OpenOffice.org"/>
- <attribute name="Specification-Version" value="0.6.0"/>
- <attribute name="Implementation-Version" value="#IMPL-VERSION#"/>
- <attribute name="Class-Path" value="xml-apis.jar xercesImpl.jar serializer.jar"/>
- </manifest>
- </jar>
- </target>
-
- <!-- clean up -->
- <target name="clean">
- <delete dir="${class.dir}"/>
- <delete file="${target.jar}"/>
- </target>
-
- <target name="all" depends="jar">
- </target>
-
-</project>
-
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/build.xml b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/build.xml
deleted file mode 100644
index 525546d..0000000
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/build.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- #*************************************************************************
- #
- 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
- <http://www.openoffice.org/license.html>
- for a copy of the LGPLv3 License.
-
- #*************************************************************************
- -->
-<project name="xmrg_jooxu_registry" default="main" basedir=".">
-
- <!-- ================================================================= -->
- <!-- settings -->
- <!-- ================================================================= -->
-
- <!-- project prefix, used for targets and build.lst -->
- <property name="prj.prefix" value="xmrg"/>
-
- <!-- name of this sub target used in recursive builds -->
- <property name="target" value="xmrg_jooxu_registry"/>
-
- <!-- relative path to project directory -->
- <property name="prj" value="../../../../../.."/>
-
- <!-- start of java source code package structure -->
- <property name="java.dir" value="${prj}/java"/>
-
- <!-- path component for current java package -->
- <property name="package" value="org/openoffice/xmerge/util/registry"/>
-
- <!-- define how to handle CLASSPATH environment -->
- <property name="build.sysclasspath" value="ignore"/>
-
- <property environment="env"/>
- <property name="env.XML_APIS_JAR" value="${solar.jar}/xml-apis.jar"/>
- <property name="env.XERCES_JAR" value="${solar.jar}/xercesImpl.jar"/>
-
- <!-- classpath settings for javac tasks -->
- <path id="classpath">
- <pathelement location="${build.class}"/>
- <pathelement location="${env.XML_APIS_JAR}"/>
- <pathelement location="${env.XERCES_JAR}"/>
- </path>
-
- <!-- set whether we want to compile with or without deprecation -->
- <property name="deprecation" value="on"/>
-
- <!-- ================================================================= -->
- <!-- solar build environment targets -->
- <!-- ================================================================= -->
-
- <target name="build_dir" unless="build.dir">
- <property name="build.dir" value="${out}"/>
- </target>
-
- <target name="solar" depends="build_dir" if="solar.update">
- <property name="solar.properties"
- value="${solar.bin}/solar.properties"/>
- </target>
-
- <target name="init" depends="solar">
- <property name="build.compiler" value="classic"/>
- <property file="${solar.properties}"/>
- <property file="${build.dir}/class/solar.properties"/>
- </target>
-
- <target name="info">
- <echo message="--------------------"/>
- <echo message="${target}"/>
- <echo message="--------------------"/>
- </target>
-
-
- <!-- ================================================================= -->
- <!-- custom targets -->
- <!-- ================================================================= -->
-
- <!-- the main target, called in recursive builds -->
- <target name="main" depends="info,prepare,compile"/>
-
- <!-- prepare output directories -->
- <target name="prepare" depends="init" if="build.class">
- <mkdir dir="${build.dir}"/>
- <mkdir dir="${build.class}"/>
- </target>
-
- <!-- compile java sources in ${package} -->
- <target name="compile" depends="prepare" if="build.class">
- <javac srcdir="${java.dir}"
- destdir="${build.class}"
- debug="${debug}"
- deprecation="${deprecation}"
- optimize="${optimize}">
- <classpath refid="classpath"/>
- <include name="${package}/ConverterInfo.java"/>
- <include name="${package}/ConverterInfoMgr.java"/>
- <include name="${package}/ConverterInfoReader.java"/>
- <include name="${package}/RegistryException.java"/>
- <include name="${package}/UnoBridgeConverterInfo.java"/>
- </javac>
- </target>
-
- <!-- clean up -->
- <target name="clean" depends="prepare">
- <delete includeEmptyDirs="true">
- <fileset dir="${build.class}">
- <patternset>
- <include name="${package}/*.class"/>
- </patternset>
- </fileset>
- </delete>
- </target>
-
-</project>
-
diff --git a/xmerge/source/xmerge/makefile.mk b/xmerge/source/xmerge/makefile.mk
deleted file mode 100644
index 8ff18ad..0000000
--- a/xmerge/source/xmerge/makefile.mk
+++ /dev/null
@@ -1,34 +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
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-TARGET=xmerge
-PRJ=../..
-
-.INCLUDE : ant.mk
-.IF "$(L10N_framework)"==""
-ALLTAR: ANTBUILD
-.ENDIF
diff --git a/xmerge/source/xmerge/xmerge.mf b/xmerge/source/xmerge/xmerge.mf
new file mode 100644
index 0000000..58afc82
--- /dev/null
+++ b/xmerge/source/xmerge/xmerge.mf
@@ -0,0 +1,6 @@
+Main-Class: org.openoffice.xmerge.test.Driver
+Specification-Title: OpenOffice XMerge Framework
+Specification-Vendor: OpenOffice.org
+Specification-Version: 0.6.0
+Implementation-Version: #IMPL-VERSION#
+
diff --git a/xmerge/util/build.xml b/xmerge/util/build.xml
deleted file mode 100644
index f15ad3a..0000000
--- a/xmerge/util/build.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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
- <http://www.openoffice.org/license.html>
- for a copy of the LGPLv3 License.
-
--->
-<project name="xmrg_util" default="main" basedir=".">
-
- <property file="../source/inc/antbuild.properties"/>
-
- <property name="javadoc.dir" location="${build.dir}/javadoc"/>
-
- <property environment="env"/>
- <property name="env.XML_APIS_JAR" value="${solar.jar}/xml-apis.jar"/>
- <property name="env.XERCES_JAR" value="${solar.jar}/xercesImpl.jar"/>
-
- <path id="classpath">
- <pathelement location="${env.XML_APIS_JAR}"/>
- <pathelement location="${env.XERCES_JAR}"/>
- <pathelement location="${solar.jar}/unoil.jar"/>
- <pathelement location="${solar.jar}/ridl.jar"/>
- <pathelement location="${solar.jar}/jurt.jar"/>
- <pathelement location="${solar.jar}/juh.jar"/>
- <pathelement location="${build.dir}/xmerge.jar"/>
- </path>
-
- <target name="init">
- <mkdir dir="${javadoc.dir}"/>
- </target>
-
- <!-- build javadoc -->
- <target name="javadoc" depends="init">
- <javadoc destdir="${javadoc.dir}"
- verbose="false"
- author="false"
- nodeprecated="true"
- nodeprecatedlist="true"
- use="true"
- Doctitle="OpenOffice XMerge API"
- windowtitle="OpenOffice XMerge API"
- classpathref="classpath">
- <fileset dir="../source/bridge" defaultexcludes="yes">
- <include name="**/*.java"/>
- </fileset>
- <fileset dir="../source/xmerge" defaultexcludes="yes">
- <include name="**/*.java"/>
- </fileset>
- <fileset dir="../source/aportisdoc" defaultexcludes="yes">
- <include name="**/*.java"/>
- </fileset>
- <fileset dir="../source/pexcel" defaultexcludes="yes">
- <include name="**/*.java"/>
- </fileset>
- <fileset dir="../source/pocketword" defaultexcludes="yes">
- <include name="**/*.java"/>
- </fileset>
- <link offline="true" href="http://java.sun.com/j2se/1.3/docs/api" packagelistLoc="${solar.doc}/jdk13"/>
- <bottom><![CDATA[<i>Copyright © 2002 OpenOffice.org</i>]]></bottom>
- <header><![CDATA[<b>OpenOffice.org<br>XMerge API</b>]]></header>
- </javadoc>
- </target>
-
- <target name="main" depends="javadoc">
- </target>
-
- <target name="all" depends="javadoc">
- </target>
-
- <target name="clean">
- <delete file="${javadoc.dir}"/>
- </target>
-
-</project>
-
diff --git a/xmerge/util/makefile.mk b/xmerge/util/makefile.mk
deleted file mode 100644
index 54ed16e..0000000
--- a/xmerge/util/makefile.mk
+++ /dev/null
@@ -1,34 +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
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#***************************************************************************
-
-TARGET=xmrg_util
-PRJ=..
-
-.INCLUDE : ant.mk
-.IF "$(L10N_framework)"==""
-ALLTAR: ANTBUILD
-.ENDIF
diff --git a/xmerge/util/minicalc.mf b/xmerge/util/minicalc.mf
deleted file mode 100644
index 1f0a0e3..0000000
--- a/xmerge/util/minicalc.mf
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: jmc.jar
-
diff --git a/xmerge/util/xmerge.mf b/xmerge/util/xmerge.mf
deleted file mode 100644
index 89d942f..0000000
--- a/xmerge/util/xmerge.mf
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Main-Class: org.openoffice.xmerge.test.Driver
-Class-Path: xml-apis.jar xercesImpl.jar serializer.jar
-Specification-Title: OpenOffice XMerge Framework
-Specification-Vendor: OpenOffice.org
-Specification-Version: 0.6.0
-Implementation-Version: #IMPL-VERSION#
-
diff --git a/xmerge/workben/build.xml b/xmerge/workben/build.xml
deleted file mode 100644
index ed8da0c..0000000
--- a/xmerge/workben/build.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
- <http://www.openoffice.org/license.html>
- for a copy of the LGPLv3 License.
-
--->
-<project name="xmrg_workben" default="main" basedir=".">
-
- <!-- ================================================================= -->
- <!-- settings -->
- <!-- ================================================================= -->
-
- <!-- project prefix, used for targets and build.lst -->
- <property name="prj.prefix" value="xmrg"/>
-
- <!-- name of this sub target used in recursive builds -->
- <property name="target" value="xmrg_workben"/>
-
- <!-- relative path to project directory -->
- <property name="prj" value=".."/>
-
- <!-- start of java source code package structure -->
- <property name="java.dir" value="${prj}/workben"/>
-
- <!-- path component for current java package -->
- <property name="package" value="."/>
-
- <!-- define how to handle CLASSPATH environment -->
- <property name="build.sysclasspath" value="ignore"/>
-
- <property environment="env"/>
- <property name="env.XML_APIS_JAR" value="${solar.jar}/xml-apis.jar"/>
- <property name="env.XERCES_JAR" value="${solar.jar}/xercesImpl.jar"/>
-
- <!-- classpath settings for javac tasks -->
- <path id="classpath">
- <pathelement location="${build.class}"/>
- <pathelement location="${env.XML_APIS_JAR}"/>
- <pathelement location="${env.XERCES_JAR}"/>
- </path>
-
- <!-- set wether we want to compile with or without deprecation -->
- <property name="deprecation" value="on"/>
-
- <!-- ================================================================= -->
- <!-- solar build environment targets -->
- <!-- ================================================================= -->
-
- <target name="build_dir" unless="build.dir">
- <property name="build.dir" value="${out}"/>
- </target>
-
- <target name="solar" depends="build_dir" if="solar.update">
- <property name="solar.properties"
- value="${solar.bin}/solar.properties"/>
- </target>
-
- <target name="init" depends="solar">
- <property name="build.compiler" value="classic"/>
- <property file="${solar.properties}"/>
- <property file="${build.dir}/class/solar.properties"/>
- </target>
-
- <target name="info">
- <echo message="--------------------"/>
- <echo message="${target}"/>
- <echo message="--------------------"/>
- </target>
-
-
- <!-- ================================================================= -->
- <!-- custom targets -->
- <!-- ================================================================= -->
-
- <!-- the main target, called in recursive builds -->
- <target name="main" depends="info,prepare,compile"/>
-
- <!-- prepare output directories -->
- <target name="prepare" depends="init" if="build.class">
- <mkdir dir="${build.dir}"/>
- <mkdir dir="${build.class}"/>
- </target>
-
- <!-- compile java sources in ${package} and sub packages -->
- <target name="compile" depends="prepare" if="build.class">
- <javac srcdir="${java.dir}"
- destdir="${build.class}"
- debug="${debug}"
- deprecation="${deprecation}"
- optimize="${optimize}">
- <classpath refid="classpath"/>
- <include name="XmlDiff.java"/>
- </javac>
- </target>
-
- <!-- clean up -->
- <target name="clean" depends="prepare">
- <delete includeEmptyDirs="true">
- <fileset dir="${build.class}">
- <patternset>
- <include name="${package}/**/*.class"/>
- </patternset>
- </fileset>
- </delete>
- </target>
-
-</project>
--
1.7.6.1
-------------- next part --------------
From 616a470425ce75030cacd5e5208e2b624d8c4eee Mon Sep 17 00:00:00 2001
From: Peter Foley <pefoley2 at verizon.net>
Date: Thu, 22 Sep 2011 12:17:04 -0400
Subject: [PATCH 3/5] convert qadevOOo to gbuild
---
RepositoryModule_ooo.mk | 2 +-
qadevOOo/Jar_OOoRunner.mk | 74 +++++++++++++++++
qadevOOo/Jar_OOoRunnerLight.mk | 67 +++++++++++++++
qadevOOo/Module_qadevOOo.mk | 7 ++
qadevOOo/build.xml | 52 ------------
qadevOOo/makefile.mk | 51 ------------
qadevOOo/prj/build.lst | 4 +-
qadevOOo/prj/d.lst | 1 -
qadevOOo/prj/makefile.mk | 40 +++++++++
qadevOOo/runner/base/makefile.mk | 52 ------------
.../runner/basicrunner/basichelper/makefile.mk | 47 -----------
qadevOOo/runner/basicrunner/makefile.mk | 46 ----------
qadevOOo/runner/complexlib/makefile.mk | 49 -----------
qadevOOo/runner/convwatch/makefile.mk | 86 -------------------
qadevOOo/runner/graphical/makefile.mk | 76 -----------------
qadevOOo/runner/helper/makefile.mk | 65 ---------------
qadevOOo/runner/lib/makefile.mk | 58 -------------
qadevOOo/runner/makefile.mk | 60 --------------
qadevOOo/runner/manifest | 1 -
qadevOOo/runner/org/openoffice/makefile.mk | 46 ----------
qadevOOo/runner/share/makefile.mk | 52 ------------
qadevOOo/runner/stats/makefile.mk | 59 -------------
qadevOOo/runner/util/compare/makefile.mk | 54 ------------
qadevOOo/runner/util/makefile.mk | 87 --------------------
solenv/gbuild/Jar.mk | 2 +-
25 files changed, 191 insertions(+), 947 deletions(-)
create mode 100644 qadevOOo/Jar_OOoRunner.mk
create mode 100644 qadevOOo/Jar_OOoRunnerLight.mk
delete mode 100755 qadevOOo/build.xml
delete mode 100755 qadevOOo/makefile.mk
create mode 100644 qadevOOo/prj/makefile.mk
delete mode 100644 qadevOOo/runner/base/makefile.mk
delete mode 100644 qadevOOo/runner/basicrunner/basichelper/makefile.mk
delete mode 100644 qadevOOo/runner/basicrunner/makefile.mk
delete mode 100644 qadevOOo/runner/complexlib/makefile.mk
delete mode 100644 qadevOOo/runner/convwatch/makefile.mk
delete mode 100644 qadevOOo/runner/graphical/makefile.mk
delete mode 100644 qadevOOo/runner/helper/makefile.mk
delete mode 100644 qadevOOo/runner/lib/makefile.mk
delete mode 100644 qadevOOo/runner/makefile.mk
delete mode 100644 qadevOOo/runner/org/openoffice/makefile.mk
delete mode 100644 qadevOOo/runner/share/makefile.mk
delete mode 100644 qadevOOo/runner/stats/makefile.mk
delete mode 100644 qadevOOo/runner/util/compare/makefile.mk
delete mode 100644 qadevOOo/runner/util/makefile.mk
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index f823b0c..a12733a 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -64,6 +64,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
oox \
padmin \
psprint_config \
+ qadevOOo \
regexp \
reportdesign \
sane \
@@ -104,7 +105,6 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
# these have only migrated subsequentcheck for now
$(eval $(call gb_Module_add_moduledirs,ooo,\
configmgr \
- qadevOOo \
sal \
ucb \
))
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
new file mode 100644
index 0000000..4434033
--- /dev/null
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -0,0 +1,74 @@
+#
+# 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.
+#
+# The Initial Developer of the Original Code is
+# Peter Foley <pefoley2 at verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# 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.
+#
+
+#force debug information for OOoRunner
+gb_JavaClassSet_JAVACDEBUG:= -g
+
+$(eval $(call gb_Jar_Jar,OOoRunner,SRCDIR))
+
+$(eval $(call gb_Jar_set_jarclasspath,OOoRunner,\
+ ridl.jar \
+ unoil.jar \
+))
+
+$(eval $(call gb_Jar_set_manifest,OOoRunner,$(SRCDIR)/qadevOOo/runner/manifest))
+
+$(eval $(call gb_Jar_add_jars,OOoRunner,\
+ $(OUTDIR)/bin/ridl.jar \
+ $(OUTDIR)/bin/unoil.jar \
+ $(OUTDIR)/bin/jurt.jar \
+ $(OUTDIR)/bin/juh.jar \
+ $(OUTDIR)/bin/java_uno.jar \
+))
+
+$(eval $(call gb_Jar_set_packageroot,OOoRunner,\
+ base \
+ basicrunner \
+ complex \
+ complexlib \
+ convwatch \
+ graphical \
+ helper \
+ ifc \
+ lib \
+ mod \
+ org \
+ share \
+ stats \
+ util \
+))
+
+$(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
+ qadevOOo/runner/*/* \
+ qadevOOo/runner/*/*/* \
+ qadevOOo/tests/java/*/*/* \
+ qadevOOo/tests/java/*/*/*/* \
+))
+
+$(eval $(call gb_Jar_add_packagefile,OOoRunner,objdsc,$(SRCDIR)/qadevOOo/objdsc))
diff --git a/qadevOOo/Jar_OOoRunnerLight.mk b/qadevOOo/Jar_OOoRunnerLight.mk
new file mode 100644
index 0000000..687b123
--- /dev/null
+++ b/qadevOOo/Jar_OOoRunnerLight.mk
@@ -0,0 +1,67 @@
+#
+# 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.
+#
+# The Initial Developer of the Original Code is
+# Peter Foley <pefoley2 at verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# 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.
+#
+
+#force debug information for OOoRunnerLight
+gb_JavaClassSet_JAVACDEBUG := -g
+
+$(eval $(call gb_Jar_Jar,OOoRunnerLight,SRCDIR))
+
+$(eval $(call gb_Jar_set_jarclasspath,OOoRunnerLight,\
+ ridl.jar \
+ unoil.jar \
+))
+
+$(eval $(call gb_Jar_set_manifest,OOoRunnerLight,$(SRCDIR)/qadevOOo/runner/manifest))
+
+$(eval $(call gb_Jar_add_jars,OOoRunnerLight,\
+ $(OUTDIR)/bin/ridl.jar \
+ $(OUTDIR)/bin/unoil.jar \
+ $(OUTDIR)/bin/jurt.jar \
+ $(OUTDIR)/bin/juh.jar \
+ $(OUTDIR)/bin/java_uno.jar \
+))
+
+$(eval $(call gb_Jar_set_packageroot,OOoRunnerLight,\
+ base \
+ basicrunner \
+ complexlib \
+ convwatch \
+ graphical \
+ helper \
+ lib \
+ org \
+ share \
+ stats \
+ util \
+))
+
+$(eval $(call gb_Jar_add_sourcefiles,OOoRunnerLight,\
+ qadevOOo/runner/*/* \
+ qadevOOo/runner/*/*/* \
+))
diff --git a/qadevOOo/Module_qadevOOo.mk b/qadevOOo/Module_qadevOOo.mk
index 53612f3..f65ad29 100644
--- a/qadevOOo/Module_qadevOOo.mk
+++ b/qadevOOo/Module_qadevOOo.mk
@@ -28,6 +28,13 @@
$(eval $(call gb_Module_Module,qadevOOo))
+ifeq ($(SOLAR_JAVA),TRUE)
+$(eval $(call gb_Module_add_targets,qadevOOo,\
+ Jar_OOoRunnerLight \
+ Jar_OOoRunner \
+))
+endif
+
$(eval $(call gb_Module_add_subsequentcheck_targets,qadevOOo,\
JunitTest_qadevOOo_unoapi \
))
diff --git a/qadevOOo/build.xml b/qadevOOo/build.xml
deleted file mode 100755
index 027b083..0000000
--- a/qadevOOo/build.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<project name="qadevOOo" default="main" basedir=".">
- <description>
- Build file for qadevOOo project
- </description>
-
- <!-- set global properties for this build -->
- <property name="qadevOOo.output" location="${out}"/>
- <property name="qadevOOo.class" location="${qadevOOo.output}/class"/>
- <property name="qadevOOo.runner" location="${prj}/runner"/>
- <property name="qadevOOo.tests" location="${prj}/tests/java"/>
- <property name="qadevOOo.office_jars" location="${solar.jar}"/>
-
- <!-- ================================================================================== -->
-
- <!-- the main target -->
- <target name="main" depends="qadevOOo_tests_build,qadevOOo_runner_build"/>
-
- <!-- ================================================================================== -->
-
- <!-- target for building the runner -->
- <target name="qadevOOo_runner_build">
- <javac srcdir="${qadevOOo.runner}" destdir="${qadevOOo.class}" includes="**/*.java" debug="${debug}" source="${build.source}" encoding="utf-8" fork="true" includeantruntime="false">
- <classpath>
- <pathelement location="${qadevOOo.class}"/>
- <fileset dir="${qadevOOo.office_jars}">
- <include name="**/ridl.jar"/>
- <include name="**/unoil.jar"/>
- <include name="**/jurt.jar"/>
- <include name="**/juh.jar"/>
- <include name="**/java_uno.jar"/>
- </fileset>
- </classpath>
- </javac>
- </target>
-
- <!-- target for building the tests -->
- <target name="qadevOOo_tests_build" depends="qadevOOo_runner_build">
- <javac srcdir="${qadevOOo.tests}" destdir="${qadevOOo.class}" includes="**/*.java" debug="${debug}" source="${build.source}" includeantruntime="false">
- <classpath>
- <pathelement location="${qadevOOo.class}"/>
- <fileset dir="${qadevOOo.office_jars}">
- <include name="**/ridl.jar"/>
- <include name="**/unoil.jar"/>
- <include name="**/jurt.jar"/>
- <include name="**/juh.jar"/>
- <include name="**/java_uno.jar"/>
- </fileset>
- </classpath>
- </javac>
- </target>
-
-</project>
diff --git a/qadevOOo/makefile.mk b/qadevOOo/makefile.mk
deleted file mode 100755
index 612b866..0000000
--- a/qadevOOo/makefile.mk
+++ /dev/null
@@ -1,51 +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
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#***************************************************************************
-
-
-PRJNAME = OOoRunner
-TARGET=qadevOOo
-PRJ=.
-
-# ------------------------------------------------
-# NEVER REMOVE THIS!
-# The OOoRunner.jar and OOoRunnerLight.jar should build with debug information all the time, also in the .pro builds.
-# If you have any questions about this, ask the qadevOOo Maintainer.
-debug=true
-# ------------------------------------------------
-
-.INCLUDE : ant.mk
-TST:
- echo $(SOLAR_JAVA)
-
-.IF "$(SOLAR_JAVA)"=="TRUE"
-.IF "$(ANT_HOME)"!="NO_ANT_HOME"
-ANT_FLAGS+=-Dbuild.source=$(JAVA_SOURCE_VER)
-.IF "$(L10N_framework)"==""
-ALLTAR: ANTBUILD
-.ENDIF
-.ENDIF
-.ENDIF
diff --git a/qadevOOo/prj/build.lst b/qadevOOo/prj/build.lst
index 73092ca..19eb854 100644
--- a/qadevOOo/prj/build.lst
+++ b/qadevOOo/prj/build.lst
@@ -1,4 +1,2 @@
qa qadevOOo : javaunohelper jurt ridljar unoil NULL
-qa qadevOOo usr1 - all qa_mkout NULL
-qa qadevOOo nmake - all qa_runner_ant_build NULL
-qa qadevOOo\runner nmake - all qa_make_package qa_runner_ant_build NULL
+qa qadevOOo\prj nmake - all qa_prj NULL
diff --git a/qadevOOo/prj/d.lst b/qadevOOo/prj/d.lst
index 8615359..e69de29 100644
--- a/qadevOOo/prj/d.lst
+++ b/qadevOOo/prj/d.lst
@@ -1 +0,0 @@
-..\%__SRC%\class\OOoRunner*.jar %_DEST%\bin
diff --git a/qadevOOo/prj/makefile.mk b/qadevOOo/prj/makefile.mk
new file mode 100644
index 0000000..85b2566
--- /dev/null
+++ b/qadevOOo/prj/makefile.mk
@@ -0,0 +1,40 @@
+#*************************************************************************
+#
+# 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
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+all:
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/qadevOOo/runner/base/makefile.mk b/qadevOOo/runner/base/makefile.mk
deleted file mode 100644
index 17fb497..0000000
--- a/qadevOOo/runner/base/makefile.mk
+++ /dev/null
@@ -1,52 +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
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME = OOoRunner
-PACKAGE = base
-TARGET = runner_base
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-JARFILES = ridl.jar jurt.jar unoil.jar
-JAVAFILES = TestBase.java \
- java_complex.java \
- java_fat.java \
- java_fat_service.java \
- java_cmp.java \
- basic_fat.java
-
-JAVACLASSFILES= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/qadevOOo/runner/basicrunner/basichelper/makefile.mk b/qadevOOo/runner/basicrunner/basichelper/makefile.mk
deleted file mode 100644
index cc45b00..0000000
--- a/qadevOOo/runner/basicrunner/basichelper/makefile.mk
+++ /dev/null
@@ -1,47 +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
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME = OOoRunner
-PACKAGE = basicrunner$/basichelper
-TARGET = runner_basichelper
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-JARFILES = ridl.jar jurt.jar unoil.jar
-JAVAFILES = AttributeList.java DocumentHandler.java Filter.java \
- Connector.java DispatchProviderInterceptor.java \
- ThreadRunner.java
-JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/qadevOOo/runner/basicrunner/makefile.mk b/qadevOOo/runner/basicrunner/makefile.mk
deleted file mode 100644
index 6259845..0000000
--- a/qadevOOo/runner/basicrunner/makefile.mk
+++ /dev/null
@@ -1,46 +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
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME = OOoRunner
-PACKAGE = basicrunner
-TARGET = runner_basicrunner
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-JARFILES = ridl.jar jurt.jar unoil.jar
-JAVAFILES = BasicException.java BasicIfcTest.java BasicHandler.java BasicTestCase.java BasicHandlerProvider.java
-JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/qadevOOo/runner/complexlib/makefile.mk b/qadevOOo/runner/complexlib/makefile.mk
deleted file mode 100644
index 7af5141..0000000
--- a/qadevOOo/runner/complexlib/makefile.mk
+++ /dev/null
@@ -1,49 +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
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME = OOoRunner
-PACKAGE = complexlib
-TARGET = runner_complexlib
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-
-# --- Files --------------------------------------------------------
-
-JARFILES = ridl.jar jurt.jar unoil.jar
-
-JAVAFILES = ComplexTestCase.java MethodThread.java ShowTargets.java
-
-JAVACLASSFILES= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/qadevOOo/runner/convwatch/makefile.mk b/qadevOOo/runner/convwatch/makefile.mk
deleted file mode 100644
index aed1532..0000000
--- a/qadevOOo/runner/convwatch/makefile.mk
+++ /dev/null
@@ -1,86 +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
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME = OOoRunner
-PACKAGE = convwatch
-TARGET = runner_convwatch
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar
-JAVAFILES = \
- TriState.java \
- IniFile.java \
- BuildID.java \
- GfxCompare.java \
- FilenameHelper.java \
- NameHelper.java \
- HTMLOutputter.java \
- LISTOutputter.java \
- INIOutputter.java \
- PropertyName.java \
- StatusHelper.java \
- ConvWatchException.java \
- ConvWatchCancelException.java \
- OfficePrint.java \
- PRNCompare.java \
- FileHelper.java \
- OSHelper.java \
- PixelCounter.java \
- ImageHelper.java \
- BorderRemover.java \
- ConvWatch.java \
- DirectoryHelper.java \
- ConvWatchStarter.java \
- ReferenceBuilder.java \
- EnhancedComplexTestCase.java \
- MSOfficePrint.java \
- GraphicalTestArguments.java \
- GraphicalDifferenceCheck.java \
- DocumentConverter.java\
- DBHelper.java\
- DB.java\
- ValueNotFoundException.java \
- GlobalLogWriter.java \
- CrashLoopTest.java \
- ReportDesignerTest.java \
- DateHelper.java \
- TimeHelper.java
-
-
-
-
-JAVACLASSFILES= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/qadevOOo/runner/graphical/makefile.mk b/qadevOOo/runner/graphical/makefile.mk
deleted file mode 100644
index 4e1b0e9..0000000
--- a/qadevOOo/runner/graphical/makefile.mk
+++ /dev/null
@@ -1,76 +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
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME = OOoRunner
-PACKAGE = convwatch
-TARGET = runner_convwatch
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar
-JAVAFILES = \
-BuildID.java \
-DateHelper.java \
-DirectoryHelper.java \
-EnhancedComplexTestCase.java \
-FileHelper.java \
-GlobalLogWriter.java \
-HTMLResult.java \
-IDocument.java \
-IOffice.java \
-ImageHelper.java \
-IniFile.java \
-JPEGComparator.java \
-JPEGCreator.java \
-JPEGEvaluator.java \
-MSOfficePostscriptCreator.java \
-Office.java \
-OfficeException.java \
-OpenOfficeDatabaseReportExtractor.java \
-OpenOfficePostscriptCreator.java \
-ParameterHelper.java \
-PerformanceContainer.java \
-PixelCounter.java \
-PostscriptCreator.java \
-PropertyName.java \
-TimeHelper.java \
-WrongEnvironmentException.java \
-WrongSuffixException.java \
-Tolerance.java
-
-# GraphicalComparator.java
-
-JAVACLASSFILES= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/qadevOOo/runner/helper/makefile.mk b/qadevOOo/runner/helper/makefile.mk
deleted file mode 100644
index f5ad34c..0000000
--- a/qadevOOo/runner/helper/makefile.mk
+++ /dev/null
@@ -1,65 +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
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME = OOoRunner
-PACKAGE = helper
-TARGET = runner_helper
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-JARFILES = ridl.jar jurt.jar juh.jar unoil.jar
-
-JAVAFILES = APIDescGetter.java \
- ConfigurationRead.java \
- StreamSimulator.java \
- AppProvider.java \
- URLHelper.java \
- CfgParser.java \
- SimpleMailSender.java \
- WindowListener.java \
- ClParser.java \
- OfficeWatcher.java \
- OfficeProvider.java \
- ComplexDescGetter.java \
- InetTools.java \
- ProcessHandler.java \
- ContextMenuInterceptor.java \
- UnoProvider.java\
- PropertyHelper.java\
- FileTools.java
-
-JAVACLASSFILES= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/qadevOOo/runner/lib/makefile.mk b/qadevOOo/runner/lib/makefile.mk
deleted file mode 100644
index 4807416..0000000
--- a/qadevOOo/runner/lib/makefile.mk
+++ /dev/null
@@ -1,58 +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
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME = OOoRunner
-PACKAGE = lib
-TARGET = runner_lib
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-JARFILES = ridl.jar jurt.jar unoil.jar
-
-JAVAFILES = DynamicClassLoader.java \
- SimpleStatus.java \
- TestEnvironment.java \
- ExceptionStatus.java \
- Status.java \
- MultiMethodTest.java \
- StatusException.java \
- TestParameters.java \
- TestResult.java \
- MultiPropertyTest.java \
- TestCase.java
-
-JAVACLASSFILES= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/qadevOOo/runner/makefile.mk b/qadevOOo/runner/makefile.mk
deleted file mode 100644
index c18d77f..0000000
--- a/qadevOOo/runner/makefile.mk
+++ /dev/null
@@ -1,60 +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
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ = ..
-PRJNAME = OOoRunner
-TARGET = $(PRJNAME)
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE: settings.mk
-
-SUBDIRS_TESTS = mod ifc complex
-SUBDIRS_RUNNER = util share stats lib complexlib helper basicrunner \
- base org$/openoffice convwatch graphical
-
-JARCOMMANDS_TESTS = $(foreach,i,$(SUBDIRS_TESTS) -C $(CLASSDIR) $i)
-JARCOMMANDS_RUNNER = $(foreach,i,$(SUBDIRS_RUNNER) -C $(CLASSDIR) $i)
-
-# --- Targets ------------------------------------------------------
-.IF "$(SOLAR_JAVA)"=="TRUE" && "$(L10N_framework)"==""
-OWNJAR: ALLTAR
-
-
-.INCLUDE : target.mk
-
-# LLA: parameter v is only verbose, need too long!
-OWNJAR: LIGHT
- jar cfm $(CLASSDIR)$/$(TARGET).jar manifest -C $(PRJ) objdsc $(JARCOMMANDS_TESTS) $(JARCOMMANDS_RUNNER)
-
-# LLA: parameter v is only verbose, need too long!
-LIGHT:
- jar cfm $(CLASSDIR)$/$(TARGET)Light.jar manifest $(JARCOMMANDS_RUNNER)
-
-.ELSE
-all:
- @echo "no java"
-.ENDIF
diff --git a/qadevOOo/runner/manifest b/qadevOOo/runner/manifest
index 7b905b7..9bebd71 100644
--- a/qadevOOo/runner/manifest
+++ b/qadevOOo/runner/manifest
@@ -1,3 +1,2 @@
-Class-Path: ridl.jar unoil.jar
RegistrationClassName: org.openoffice.RunnerService
diff --git a/qadevOOo/runner/org/openoffice/makefile.mk b/qadevOOo/runner/org/openoffice/makefile.mk
deleted file mode 100644
index e3ba3b4..0000000
--- a/qadevOOo/runner/org/openoffice/makefile.mk
+++ /dev/null
@@ -1,46 +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
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME = OOoRunner
-PACKAGE = org$/openoffice
-TARGET = runner_org_openoffice
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-JARFILES = ridl.jar jurt.jar unoil.jar
-JAVAFILES = Runner.java RunnerService.java
-JAVACLASSFILES= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/qadevOOo/runner/share/makefile.mk b/qadevOOo/runner/share/makefile.mk
deleted file mode 100644
index ff780b1..0000000
--- a/qadevOOo/runner/share/makefile.mk
+++ /dev/null
@@ -1,52 +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
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME = OOoRunner
-PACKAGE = share
-TARGET = runner_share
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-JARFILES = ridl.jar jurt.jar unoil.jar
-
-JAVAFILES = DescEntry.java \
- DescGetter.java \
- LogWriter.java \
- ComplexTest.java \
- Watcher.java
-
-JAVACLASSFILES= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/qadevOOo/runner/stats/makefile.mk b/qadevOOo/runner/stats/makefile.mk
deleted file mode 100644
index af503a2..0000000
--- a/qadevOOo/runner/stats/makefile.mk
+++ /dev/null
@@ -1,59 +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
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME = OOoRunner
-PACKAGE = stats
-TARGET = runner_stats
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-JARFILES = ridl.jar jurt.jar unoil.jar
-
-JAVAFILES = \
- DataBaseOutProducer.java \
- ComplexDataBaseOutProducer.java \
- FatDataBaseOutProducer.java \
- FileLogWriter.java \
- OutProducerFactory.java \
- SQLExecution.java \
- SimpleOutProducer.java \
- SimpleFileOutProducer.java \
- SimpleLogWriter.java \
- Summarizer.java \
- InternalLogWriter.java
-
-JAVACLASSFILES= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/qadevOOo/runner/util/compare/makefile.mk b/qadevOOo/runner/util/compare/makefile.mk
deleted file mode 100644
index 2983e8aa..0000000
--- a/qadevOOo/runner/util/compare/makefile.mk
+++ /dev/null
@@ -1,54 +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
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..$/..
-
-PRJNAME = OOoRunner
-PACKAGE = util.compare
-TARGET = runner_util_compare
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar
-JAVAFILES = \
- DocComparatorFactory.java \
- DocComparator.java \
- GraphicalComparator.java \
- PDFComparator.java
-
-# doesn't implement yet.
-# PDFComparator.java \
-# XMLComparator.java
-
-JAVACLASSFILES= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/qadevOOo/runner/util/makefile.mk b/qadevOOo/runner/util/makefile.mk
deleted file mode 100644
index 7b4d723..0000000
--- a/qadevOOo/runner/util/makefile.mk
+++ /dev/null
@@ -1,87 +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
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME = OOoRunner
-PACKAGE = util
-TARGET = runner_util
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-JARFILES = ridl.jar jurt.jar unoil.jar
-
-JAVAFILES = AccessibilityTools.java \
- BasicMacroTools.java \
- BookmarkDsc.java \
- ControlDsc.java \
- dbg.java \
- DBTools.java \
- DefaultDsc.java \
- DesktopTools.java \
- DrawTools.java \
- DynamicClassLoader.java \
- FootnoteDsc.java \
- FormTools.java \
- FrameDsc.java \
- InstCreator.java \
- InstDescr.java \
- ParagraphDsc.java \
- ReferenceMarkDsc.java \
- RegistryTools.java \
- ShapeDsc.java \
- SOfficeFactory.java \
- StyleFamilyDsc.java \
- PropertyName.java \
- SysUtils.java \
- TableDsc.java \
- TextSectionDsc.java \
- XLayerImpl.java \
- XLayerHandlerImpl.java \
- XSchemaHandlerImpl.java \
- UITools.java \
- utils.java \
- ValueChanger.java \
- ValueComparer.java \
- WaitUnreachable.java \
- WriterTools.java \
- XInstCreator.java \
- XMLTools.java
-
-JAVACLASSFILES= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-# --- Targets ------------------------------------------------------
-
-
-.INCLUDE : target.mk
-
-TST:
- @echo $(JAVACLASSFILES)
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index 8589df1..244e7e8 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -109,7 +109,7 @@ $(call gb_Jar_get_target,$(1)) : PACKAGEFILES += $(2)
$(call gb_Jar_get_target,$(1)) : $(call gb_Jar_get_workdir,$(1))/$(strip $(2))
$(call gb_Jar_get_workdir,$(1))/$(strip $(2)) : $(3) $(call gb_JavaClassSet_get_target,$(call gb_Jar_get_classsetname,$(1)))
mkdir -p $$(dir $$@)
- cp -f $(3) $$@
+ cp -rf $(3) $$@
endef
--
1.7.6.1
-------------- next part --------------
From 39eca9f599b3e1de7655c723a6937cf879def99e Mon Sep 17 00:00:00 2001
From: Peter Foley <pefoley2 at verizon.net>
Date: Sun, 2 Oct 2011 13:31:32 -0400
Subject: [PATCH 4/5] convert testautomation to gbuild and add to tail_build
---
Module_tail_build.mk | 1 +
RepositoryModule_ooo.mk | 1 +
instsetoo_native/prj/build.lst | 2 +-
testautomation/Makefile | 38 +++++++++++++++++++
testautomation/Module_testautomation.mk | 34 +++++++++++++++++
testautomation/Package_win.mk | 61 +++++++++++++++++++++++++++++++
testautomation/prj/build.lst | 1 +
testautomation/prj/d.lst | 4 --
testautomation/prj/makefile.mk | 40 ++++++++++++++++++++
9 files changed, 177 insertions(+), 5 deletions(-)
create mode 100644 testautomation/Makefile
create mode 100644 testautomation/Module_testautomation.mk
create mode 100644 testautomation/Package_win.mk
create mode 100644 testautomation/prj/makefile.mk
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 558c6b2..167d251 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -53,6 +53,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
starmath \
sw \
swext \
+ testautomation \
unoxml \
uui \
vbahelper \
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index a12733a..451cb77 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -82,6 +82,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
svx \
sw \
swext \
+ testautomation \
twain \
toolkit \
tools \
diff --git a/instsetoo_native/prj/build.lst b/instsetoo_native/prj/build.lst
index 5f3912d..1347e36 100644
--- a/instsetoo_native/prj/build.lst
+++ b/instsetoo_native/prj/build.lst
@@ -1,4 +1,4 @@
-oon instsetoo_native :: TRANSLATIONS:translations postprocess packimages testautomation NULL
+oon instsetoo_native :: TRANSLATIONS:translations postprocess packimages NULL
oon instsetoo_native usr1 - all oon_mkout NULL
oon instsetoo_native\inc_openoffice\unix nmake - u oon_unix NULL
oon instsetoo_native\inc_openoffice\windows\msi_languages nmake - all oon_msilang NULL
diff --git a/testautomation/Makefile b/testautomation/Makefile
new file mode 100644
index 0000000..5bedaf0
--- /dev/null
+++ b/testautomation/Makefile
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 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/testautomation/Module_testautomation.mk b/testautomation/Module_testautomation.mk
new file mode 100644
index 0000000..1a19cb1
--- /dev/null
+++ b/testautomation/Module_testautomation.mk
@@ -0,0 +1,34 @@
+#
+# 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.
+#
+# The Initial Developer of the Original Code is
+# Peter Foley <pefoley2 at verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# 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,testautomation))
+
+$(eval $(call gb_Module_add_targets,testautomation,\
+ Package_win \
+))
diff --git a/testautomation/Package_win.mk b/testautomation/Package_win.mk
new file mode 100644
index 0000000..152bdc9
--- /dev/null
+++ b/testautomation/Package_win.mk
@@ -0,0 +1,61 @@
+#
+# 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.
+#
+# The Initial Developer of the Original Code is
+# Peter Foley <pefoley2 at verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# 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,testautomation_win,$(SRCDIR)/testautomation/global/win))
+
+$(eval $(call gb_Package_add_file,testautomation_win,bin/win/bars.win,bars.win))
+$(eval $(call gb_Package_add_file,testautomation_win,bin/win/dial_a_c.win,dial_a_c.win))
+$(eval $(call gb_Package_add_file,testautomation_win,bin/win/dial_d_h.win,dial_d_h.win))
+$(eval $(call gb_Package_add_file,testautomation_win,bin/win/dial_i_o.win,dial_i_o.win))
+$(eval $(call gb_Package_add_file,testautomation_win,bin/win/dial_p_s.win,dial_p_s.win))
+$(eval $(call gb_Package_add_file,testautomation_win,bin/win/dial_t_z.win,dial_t_z.win))
+$(eval $(call gb_Package_add_file,testautomation_win,bin/win/dokument.win,dokument.win))
+$(eval $(call gb_Package_add_file,testautomation_win,bin/win/e_mathop.win,e_mathop.win))
+$(eval $(call gb_Package_add_file,testautomation_win,bin/win/edia_a_c.win,edia_a_c.win))
+$(eval $(call gb_Package_add_file,testautomation_win,bin/win/edia_d_h.win,edia_d_h.win))
+$(eval $(call gb_Package_add_file,testautomation_win,bin/win/edia_i_o.win,edia_i_o.win))
+$(eval $(call gb_Package_add_file,testautomation_win,bin/win/edia_p_s.win,edia_p_s.win))
+$(eval $(call gb_Package_add_file,testautomation_win,bin/win/edia_t_z.win,edia_t_z.win))
+$(eval $(call gb_Package_add_file,testautomation_win,bin/win/etab_a_d.win,etab_a_d.win))
+$(eval $(call gb_Package_add_file,testautomation_win,bin/win/etab_e_g.win,etab_e_g.win))
+$(eval $(call gb_Package_add_file,testautomation_win,bin/win/etab_h_o.win,etab_h_o.win))
+$(eval $(call gb_Package_add_file,testautomation_win,bin/win/etab_p_s.win,etab_p_s.win))
+$(eval $(call gb_Package_add_file,testautomation_win,bin/win/etab_t_z.win,etab_t_z.win))
+$(eval $(call gb_Package_add_file,testautomation_win,bin/win/etoolbox.win,etoolbox.win))
+$(eval $(call gb_Package_add_file,testautomation_win,bin/win/mathop.win,mathop.win))
+$(eval $(call gb_Package_add_file,testautomation_win,bin/win/piloten.win,piloten.win))
+$(eval $(call gb_Package_add_file,testautomation_win,bin/win/reportdesigner.win,reportdesigner.win))
+$(eval $(call gb_Package_add_file,testautomation_win,bin/win/spadmin.win,spadmin.win))
+$(eval $(call gb_Package_add_file,testautomation_win,bin/win/sys_dial.win,sys_dial.win))
+$(eval $(call gb_Package_add_file,testautomation_win,bin/win/tab_a_d.win,tab_a_d.win))
+$(eval $(call gb_Package_add_file,testautomation_win,bin/win/tab_e_g.win,tab_e_g.win))
+$(eval $(call gb_Package_add_file,testautomation_win,bin/win/tab_h_o.win,tab_h_o.win))
+$(eval $(call gb_Package_add_file,testautomation_win,bin/win/tab_p_s.win,tab_p_s.win))
+$(eval $(call gb_Package_add_file,testautomation_win,bin/win/tab_t_z.win,tab_t_z.win))
+$(eval $(call gb_Package_add_file,testautomation_win,bin/win/w_autop.win,w_autop.win))
diff --git a/testautomation/prj/build.lst b/testautomation/prj/build.lst
index db73b43..a7d9e1a 100644
--- a/testautomation/prj/build.lst
+++ b/testautomation/prj/build.lst
@@ -1 +1,2 @@
ta testautomation : NULL
+ta testautomation\prj nmake - all ta_all NULL
diff --git a/testautomation/prj/d.lst b/testautomation/prj/d.lst
index 87e6004..e69de29 100644
--- a/testautomation/prj/d.lst
+++ b/testautomation/prj/d.lst
@@ -1,4 +0,0 @@
-mkdir: %COMMON_DEST%\bin\win
-
-..\global\win\*.win %COMMON_DEST%\bin\win\*.win
-
diff --git a/testautomation/prj/makefile.mk b/testautomation/prj/makefile.mk
new file mode 100644
index 0000000..85b2566
--- /dev/null
+++ b/testautomation/prj/makefile.mk
@@ -0,0 +1,40 @@
+#*************************************************************************
+#
+# 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
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+all:
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
--
1.7.6.1
More information about the LibreOffice
mailing list