[Libreoffice-commits] .: 9 commits - configure.in .gitignore instsetoo_native/prj Module_tail_build.mk postprocess/packcomponents postprocess/prj qadevOOo/build.xml qadevOOo/Jar_OOoRunnerLight.mk qadevOOo/Jar_OOoRunner.mk qadevOOo/makefile.mk qadevOOo/Module_qadevOOo.mk qadevOOo/prj qadevOOo/runner RepositoryModule_ooo.mk scp2/source solenv/gbuild swext/Configuration_mediawiki.mk swext/Extension_wiki-publisher.mk swext/Jar_mediawiki.mk swext/Makefile swext/makefile.pmk swext/mediawiki swext/Module_swext.mk swext/prj swext/Zip_mediawiki_develop.mk tail_build/prj testautomation/Makefile testautomation/Module_testautomation.mk testautomation/Package_win.mk testautomation/prj xmerge/build.xml xmerge/Jar_aportisdoc.mk xmerge/Jar_htmlsoff.mk xmerge/Jar_pexcel.mk xmerge/Jar_pocketword.mk xmerge/Jar_XMergeBridge.mk xmerge/Jar_xmerge.mk xmerge/Makefile xmerge/Module_xmerge.mk xmerge/Package_xmergesync.mk xmerge/prj xmerge/source xmerge/util xmerge/workben
Peter Foley
pefoley2 at kemper.freedesktop.org
Fri Oct 7 16:08:19 PDT 2011
.gitignore | 1
Module_tail_build.mk | 3
RepositoryModule_ooo.mk | 5
configure.in | 7
instsetoo_native/prj/build.lst | 2
postprocess/packcomponents/makefile.mk | 2
postprocess/prj/build.lst | 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 | 1
qadevOOo/runner/base/makefile.mk | 52 --
qadevOOo/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 ---
scp2/source/extensions/file_extensions.scp | 4
solenv/gbuild/Jar.mk | 3
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 | 226 ----------
swext/mediawiki/help/makefile.mk | 81 ---
swext/mediawiki/help/wiki.xhp | 12
swext/mediawiki/help/wikiaccount.xhp | 2
swext/mediawiki/help/wikiformats.xhp | 2
swext/mediawiki/help/wikisend.xhp | 2
swext/mediawiki/help/wikisettings.xhp | 4
swext/mediawiki/makefile.mk | 69 ---
swext/mediawiki/src/com/sun/star/wiki/MANIFEST.MF | 1
swext/mediawiki/src/description.xml | 2
swext/mediawiki/src/makefile.mk | 59 --
swext/mediawiki/src/manifest.xml | 51 ++
swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/makefile.mk | 48 --
swext/mediawiki/src/registry/data/org/openoffice/Office/OptionsDialog.xcu | 2
swext/mediawiki/src/registry/data/org/openoffice/Office/makefile.mk | 46 --
swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/makefile.mk | 46 --
swext/mediawiki/src/registry/schema/org/openoffice/Office/Custom/makefile.mk | 46 --
swext/mediawiki/src/uno-extension-manifest.xml | 51 --
swext/prj/build.lst | 9
swext/prj/d.lst | 5
swext/prj/makefile.mk | 1
tail_build/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 | 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 | 1
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 ----
xmerge/source/xmerge/java/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 -----
104 files changed, 1085 insertions(+), 2924 deletions(-)
New commits:
commit eded42ce444318e2a195cc7696d6a4289dd1ed3f
Author: Peter Foley <pefoley2 at verizon.net>
Date: Thu Oct 6 16:37:53 2011 -0400
remove unsupported format from epm list
diff --git a/configure.in b/configure.in
index e664b5f..a5569dd 100644
--- a/configure.in
+++ b/configure.in
@@ -4334,7 +4334,6 @@ if test "$enable_epm" = "yes"; then
AC_MSG_ERROR([unsupported format $i. Supported by EPM are:
aix - AIX software distribution
bsd - FreeBSD, NetBSD, or OpenBSD software distribution
-depot or swinstall - HP-UX software distribution
deb - Debian software distribution
inst or tardist - IRIX software distribution
osx - MacOS X software distribution
commit 624e90aa03583748f210c38fcf68ac38b23848eb
Author: Peter Foley <pefoley2 at verizon.net>
Date: Wed Oct 5 13:57:30 2011 -0400
update external extension names
diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp
index 02c26b6..4397c37 100644
--- a/scp2/source/extensions/file_extensions.scp
+++ b/scp2/source/extensions/file_extensions.scp
@@ -106,7 +106,7 @@ File gid_File_Oxt_LightProof
TXT_FILE_BODY;
Styles = (PACKED, ARCHIVE);
Dir = gid_Brand_Dir_Share_Extensions_LightProof;
- Name (en-US) = "lightproof-en-US.oxt";
+ Name (en-US) = "lightproof-en.oxt";
Name (hu) = "lightproof-hu.oxt";
Name (ru) = "lightproof-ru.oxt";
End
@@ -186,7 +186,7 @@ File gid_File_Oxt_Diagram
TXT_FILE_BODY;
Styles = (PACKED, ARCHIVE);
Dir = gid_Brand_Dir_Share_Extensions_Diagram;
- Name = "Diagram.oxt";
+ Name = "SmART.oxt";
End
#endif
commit b64bc8b4b37edbc06aa0d775832f5537ae691307
Author: Peter Foley <pefoley2 at verizon.net>
Date: Tue Oct 4 19:33:51 2011 -0400
ignore downloaded extensions
diff --git a/.gitignore b/.gitignore
index 57cd362..cd7b44d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -84,6 +84,7 @@
/external/*/*.manifest
/external/*/*.txt
/moz/zipped/*.zip
+/extras/source/extensions
# links to the other repositories
/binfilter
commit 9fe2f5afabce999e9a0d60b641d3b9b9517bf3ad
Author: Peter Foley <pefoley2 at verizon.net>
Date: Tue Oct 4 10:05:28 2011 -0400
quote tr arguments
diff --git a/configure.in b/configure.in
index bde00f6..e664b5f 100644
--- a/configure.in
+++ b/configure.in
@@ -9279,7 +9279,7 @@ PRODUCTNAME=AC_PACKAGE_NAME
AC_MSG_RESULT([$PRODUCTNAME])
AC_SUBST(PRODUCTNAME)
-INSTALLDIRNAME=`echo AC_PACKAGE_NAME | tr [[:upper:]] [[:lower:]]`
+INSTALLDIRNAME=`echo AC_PACKAGE_NAME | tr '[[:upper:]]' '[[:lower:]]'`
AC_MSG_CHECKING([for install dirname])
if test -n "$with_install_dirname" -a "$with_install_dirname" != "no" -a "$with_install_dirname" != "yes" ; then
INSTALLDIRNAME="$with_install_dirname"
commit 1df3426dc9084725dc5d7a8407ee794a6db31b3c
Author: Peter Foley <pefoley2 at verizon.net>
Date: Sun Oct 2 17:48:03 2011 -0400
fix typos
diff --git a/configure.in b/configure.in
index f89089c..bde00f6 100644
--- a/configure.in
+++ b/configure.in
@@ -46,7 +46,7 @@ AC_ARG_ENABLE(ext-languagetool,
AC_ARG_ENABLE(ext-lightproof,
AS_HELP_STRING([--enable-ext-lightproof],
[Enable the Lightproof extension. The enable switch can contain only
- the desired languages: --enable-ligrhtproof="en hu ru"]),
+ the desired languages: --enable-lightproof="en hu ru"]),
[enable_ext_lightproof="$enableval"],
[enable_ext_lightproof=no]
)
@@ -1121,7 +1121,7 @@ AC_ARG_WITH(cl-home,
AC_ARG_WITH(mspdb-path,
AS_HELP_STRING([--with-mspdb-path],
[For Microsoft C/C++ compiler users, please supply the path pointing to
- the mspdb80.dll (if using Visual Studio 2008) or mspdb100.dl (if using
+ the mspdb80.dll (if using Visual Studio 2008) or mspdb100.dll (if using
Visual Studio 2010).])
[
Usage: --with-mspdb-path=<path to
commit f68cb61857c6255fde427964c622e38949228db1
Author: Peter Foley <pefoley2 at verizon.net>
Date: Sun Oct 2 13:31:32 2011 -0400
convert testautomation to gbuild and add to tail_build
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..0997622
--- /dev/null
+++ b/testautomation/prj/makefile.mk
@@ -0,0 +1 @@
+.INCLUDE : gbuildbridge.mk
commit cbe7780544876a77af7de01da13d2943564d0773
Author: Peter Foley <pefoley2 at verizon.net>
Date: Thu Sep 22 12:17:04 2011 -0400
convert qadevOOo to gbuild
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..0997622
--- /dev/null
+++ b/qadevOOo/prj/makefile.mk
@@ -0,0 +1 @@
+.INCLUDE : gbuildbridge.mk
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 2983e8a..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
commit b78a7ae95bac198fb44e0c093061f98dd883a27d
Author: Peter Foley <pefoley2 at verizon.net>
Date: Sat Sep 24 21:40:19 2011 -0400
convert xmerge to gbuild and add to tail_build
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/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 819d7d5..2da7af8 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -249,7 +249,7 @@ my_components += component/framework/util/lomenubar
.IF "$(SOLAR_JAVA)" == "TRUE"
my_components += \
LuceneHelpWrapper \
- XMergeBridge \
+ component/xmerge/source/bridge/XMergeBridge \
component/filter/source/xsltfilter/XSLTFilter.jar \
component/filter/source/xsltvalidate/XSLTValidate \
component/scripting/java/ScriptFramework \
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..35bf4db 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..0997622
--- /dev/null
+++ b/xmerge/prj/makefile.mk
@@ -0,0 +1 @@
+.INCLUDE : gbuildbridge.mk
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 7f51a43..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
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list