dbaccess/JunitTest_dbaccess_complex.mk | 105 +++++++++++----------------------
dbaccess/JunitTest_dbaccess_unoapi.mk | 10 +--
unotools/JunitTest_unotools_complex.mk | 61 ++++++-------------
xmlscript/Library_xcr.mk | 85 ++++++++++----------------
xmlscript/Module_xmlscript.mk | 32 +---------
xmlscript/Package_dtd.mk | 35 -----------
xmlscript/Package_inc.mk | 48 +++++----------
7 files changed, 121 insertions(+), 255 deletions(-)
New commits:
commit 0db1b46a45694a735d0f33f5c5a1facede58e653
Author: Norbert Thiebaud <nthieb...@gmail.com>
Date: Sat Jun 16 20:58:28 2012 -0500
gbuildify xmlscript
Change-Id: Ia3704b4a7813d45c87e9f7107945fedd73622339
diff --git a/xmlscript/Library_xcr.mk b/xmlscript/Library_xcr.mk
new file mode 100644
index 0000000..d3aa642
--- /dev/null
+++ b/xmlscript/Library_xcr.mk
@@ -0,0 +1,58 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Library_Library,xcr))
+
+$(eval $(call gb_Library_use_package,xcr,xmlscript_inc))
+
+$(eval $(call gb_Library_set_componentfile,xcr,xmlscript/util/xcr))
+
+$(eval $(call gb_Library_use_api,xcr,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_use_libraries,xcr,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_set_include,xcr,\
+ -I$(SRCDIR)/xmlscript/source/inc \
+ $$(INCLUDE) \
+))
+
+
+$(eval $(call gb_Library_add_defs,xcr,\
+ -DXCR_DLLIMPLEMENTATION \
+))
+
+
+$(eval $(call gb_Library_add_exception_objects,xcr,\
+ xmlscript/source/misc/unoservices \
+ xmlscript/source/xml_helper/xml_byteseq \
+ xmlscript/source/xml_helper/xml_element \
+ xmlscript/source/xml_helper/xml_impctx \
+ xmlscript/source/xmldlg_imexp/xmldlg_addfunc \
+ xmlscript/source/xmldlg_imexp/xmldlg_expmodels \
+ xmlscript/source/xmldlg_imexp/xmldlg_export \
+ xmlscript/source/xmldlg_imexp/xmldlg_impmodels \
+ xmlscript/source/xmldlg_imexp/xmldlg_import \
+ xmlscript/source/xmlflat_imexp/xmlbas_export \
+ xmlscript/source/xmlflat_imexp/xmlbas_import \
+ xmlscript/source/xmllib_imexp/xmllib_export \
+ xmlscript/source/xmllib_imexp/xmllib_import \
+ xmlscript/source/xmlmod_imexp/xmlmod_export \
+ xmlscript/source/xmlmod_imexp/xmlmod_import \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/xmlscript/Module_xmlscript.mk b/xmlscript/Module_xmlscript.mk
new file mode 100644
index 0000000..d1072c7
--- /dev/null
+++ b/xmlscript/Module_xmlscript.mk
@@ -0,0 +1,17 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Module_Module,xmlscript))
+
+$(eval $(call gb_Module_add_targets,xmlscript,\
+ Library_xcr \
+ Package_inc \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/xmlscript/Package_inc.mk b/xmlscript/Package_inc.mk
new file mode 100644
index 0000000..bb4419c
--- /dev/null
+++ b/xmlscript/Package_inc.mk
@@ -0,0 +1,26 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,xmlscript_inc,$(SRCDIR)/xmlscript))
+
+# headers
+$(eval $(call
gb_Package_add_file,xmlscript_inc,inc/xmlscript/xcrdllapi.h,inc/xmlscript/xcrdllapi.h))
+$(eval $(call
gb_Package_add_file,xmlscript_inc,inc/xmlscript/xml_helper.hxx,inc/xmlscript/xml_helper.hxx))
+$(eval $(call
gb_Package_add_file,xmlscript_inc,inc/xmlscript/xmldlg_imexp.hxx,inc/xmlscript/xmldlg_imexp.hxx))
+$(eval $(call
gb_Package_add_file,xmlscript_inc,inc/xmlscript/xmllib_imexp.hxx,inc/xmlscript/xmllib_imexp.hxx))
+$(eval $(call
gb_Package_add_file,xmlscript_inc,inc/xmlscript/xmlmod_imexp.hxx,inc/xmlscript/xmlmod_imexp.hxx))
+$(eval $(call
gb_Package_add_file,xmlscript_inc,inc/xmlscript/xmlns.h,inc/xmlscript/xmlns.h))
+
+# dtds
+$(eval $(call gb_Package_add_file,xmlscript_inc,bin/dialog.dtd,dtd/dialog.dtd))
+$(eval $(call
gb_Package_add_file,xmlscript_inc,bin/libraries.dtd,dtd/libraries.dtd))
+$(eval $(call
gb_Package_add_file,xmlscript_inc,bin/library.dtd,dtd/library.dtd))
+$(eval $(call gb_Package_add_file,xmlscript_inc,bin/module.dtd,dtd/module.dtd))
+
+# vim: set noet sw=4 ts=4:
commit 3ffb36f4d07ce54255184fa97d6574c20ae6b802
Author: Norbert Thiebaud <nthieb...@gmail.com>
Date: Sat Jun 16 20:58:08 2012 -0500
revert gmk4
Change-Id: I613d6953c786f581a9a7cb16f47aa3351834c41c
diff --git a/xmlscript/Library_xcr.mk b/xmlscript/Library_xcr.mk
deleted file mode 100644
index 91f46ee..0000000
--- a/xmlscript/Library_xcr.mk
+++ /dev/null
@@ -1,75 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-$(eval $(call gb_Library_Library,xcr))
-
-$(eval $(call gb_Library_use_package,xcr,xmlscript_inc))
-
-$(eval $(call gb_Library_set_componentfile,xcr,xmlscript/util/xcr))
-
-$(eval $(call gb_Library_set_include,xcr,\
- -I$(SRCDIR)/xmlscript/source/inc \
- $$(INCLUDE) \
-))
-
-$(eval $(call gb_Library_use_api,xcr,\
- offapi \
- udkapi \
-))
-
-$(eval $(call gb_Library_add_defs,xcr,\
- -DXCR_DLLIMPLEMENTATION \
-))
-
-$(eval $(call gb_Library_use_libraries,xcr,\
- comphelper \
- cppu \
- cppuhelper \
- sal \
- $(gb_STDLIBS) \
-))
-
-$(eval $(call gb_Library_add_exception_objects,xcr,\
- xmlscript/source/xmldlg_imexp/xmldlg_impmodels \
- xmlscript/source/xmldlg_imexp/xmldlg_import \
- xmlscript/source/xmldlg_imexp/xmldlg_addfunc \
- xmlscript/source/xmldlg_imexp/xmldlg_export \
- xmlscript/source/xmldlg_imexp/xmldlg_expmodels \
- xmlscript/source/misc/unoservices \
- xmlscript/source/xml_helper/xml_byteseq \
- xmlscript/source/xml_helper/xml_impctx \
- xmlscript/source/xml_helper/xml_element \
- xmlscript/source/xmlflat_imexp/xmlbas_import \
- xmlscript/source/xmlflat_imexp/xmlbas_export \
- xmlscript/source/xmllib_imexp/xmllib_import \
- xmlscript/source/xmllib_imexp/xmllib_export \
- xmlscript/source/xmlmod_imexp/xmlmod_import \
- xmlscript/source/xmlmod_imexp/xmlmod_export \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/xmlscript/Module_xmlscript.mk b/xmlscript/Module_xmlscript.mk
deleted file mode 100644
index ce46bf5..0000000
--- a/xmlscript/Module_xmlscript.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-$(eval $(call gb_Module_Module,xmlscript))
-
-$(eval $(call gb_Module_add_targets,xmlscript,\
- Library_xcr \
- Package_inc \
- Package_dtd \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/xmlscript/Package_dtd.mk b/xmlscript/Package_dtd.mk
deleted file mode 100644
index bd9cdf4..0000000
--- a/xmlscript/Package_dtd.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-$(eval $(call gb_Package_Package,xmlscript_inc,$(SRCDIR)/xmlscript/dtd))
-$(eval $(call gb_Package_add_file,xmlscript_inc,bin/dialog.dtd,dialog.dtd))
-$(eval $(call
gb_Package_add_file,xmlscript_inc,bin/libraries.dtd,libraries.dtd))
-$(eval $(call gb_Package_add_file,xmlscript_inc,bin/library.dtd,library.dtd))
-$(eval $(call gb_Package_add_file,xmlscript_inc,bin/module.dtd,module.dtd))
-
-# vim: set noet sw=4 ts=4:
diff --git a/xmlscript/Package_inc.mk b/xmlscript/Package_inc.mk
deleted file mode 100644
index 5bba0c7..0000000
--- a/xmlscript/Package_inc.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-$(eval $(call gb_Package_Package,xmlscript_inc,$(SRCDIR)/xmlscript/inc))
-
-$(eval $(call
gb_Package_add_file,xmlscript_inc,inc/xmlscript/xmldlg_imexp.hxx,xmlscript/xmldlg_imexp.hxx))
-$(eval $(call
gb_Package_add_file,xmlscript_inc,inc/xmlscript/xml_helper.hxx,xmlscript/xml_helper.hxx))
-$(eval $(call
gb_Package_add_file,xmlscript_inc,inc/xmlscript/xmllib_imexp.hxx,xmlscript/xmllib_imexp.hxx))
-$(eval $(call
gb_Package_add_file,xmlscript_inc,inc/xmlscript/xmlmod_imexp.hxx,xmlscript/xmlmod_imexp.hxx))
-$(eval $(call
gb_Package_add_file,xmlscript_inc,inc/xmlscript/xmlns.h,xmlscript/xmlns.h))
-$(eval $(call
gb_Package_add_file,xmlscript_inc,inc/xmlscript/xcrdllapi.h,xmlscript/xcrdllapi.h))
-
-# vim: set noet sw=4 ts=4:
commit 0ce74a3baad30fbcbc65f8234b4f077c75d7bdc5
Author: Norbert Thiebaud <nthieb...@gmail.com>
Date: Sat Jun 16 20:47:29 2012 -0500
targeted clean-up
Change-Id: I57d56ece9fd59a93d5081a394c3fe8d212290198
diff --git a/dbaccess/JunitTest_dbaccess_complex.mk
b/dbaccess/JunitTest_dbaccess_complex.mk
new file mode 100644
index 0000000..411ad95
--- /dev/null
+++ b/dbaccess/JunitTest_dbaccess_complex.mk
@@ -0,0 +1,52 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_JunitTest_JunitTest,dba_ju_complex))
+
+$(eval $(call gb_JunitTest_use_jars,dba_ju_complex,\
+ $(OUTDIR)/bin/ConnectivityTools.jar \
+ $(OUTDIR)/bin/OOoRunner.jar \
+ $(OUTDIR)/bin/jurt.jar \
+ $(OUTDIR)/bin/ridl.jar \
+ $(OUTDIR)/bin/test.jar \
+ $(OUTDIR)/bin/unoil.jar \
+))
+
+$(eval $(call gb_JunitTest_set_defs,dba_ju_complex,\
+ $$(DEFS) \
+ -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/dbaccess/qa/dbaccess \
+))
+
+$(eval $(call gb_JunitTest_add_classes,dba_ju_complex,\
+ complex.dbaccess.Beamer \
+ complex.dbaccess.PropertyBag \
+))
+
+$(eval $(call gb_JunitTest_add_sourcefiles,dba_ju_complex,\
+ dbaccess/qa/complex/dbaccess/ApplicationController \
+ dbaccess/qa/complex/dbaccess/Beamer \
+ dbaccess/qa/complex/dbaccess/CRMBasedTestCase \
+ dbaccess/qa/complex/dbaccess/CopyTableInterActionHandler \
+ dbaccess/qa/complex/dbaccess/CopyTableWizard \
+ dbaccess/qa/complex/dbaccess/DataSource \
+ dbaccess/qa/complex/dbaccess/DatabaseApplication \
+ dbaccess/qa/complex/dbaccess/DatabaseDocument \
+ dbaccess/qa/complex/dbaccess/FileHelper \
+ dbaccess/qa/complex/dbaccess/Parser \
+ dbaccess/qa/complex/dbaccess/PropertyBag \
+ dbaccess/qa/complex/dbaccess/Query \
+ dbaccess/qa/complex/dbaccess/QueryInQuery \
+ dbaccess/qa/complex/dbaccess/RowSet \
+ dbaccess/qa/complex/dbaccess/RowSetEventListener \
+ dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer \
+ dbaccess/qa/complex/dbaccess/TestCase \
+ dbaccess/qa/complex/dbaccess/UISettings \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/dbaccess/JunitTest_dbaccess_unoapi.mk
b/dbaccess/JunitTest_dbaccess_unoapi.mk
index 369b66f..6ca0c11 100644
--- a/dbaccess/JunitTest_dbaccess_unoapi.mk
+++ b/dbaccess/JunitTest_dbaccess_unoapi.mk
@@ -26,24 +26,24 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_JunitTest_JunitTest,dbaccess_unoapi))
+$(eval $(call gb_JunitTest_JunitTest,dba_ju_unoapi))
-$(eval $(call gb_JunitTest_set_defs,dbaccess_unoapi,\
+$(eval $(call gb_JunitTest_set_defs,dba_ju_unoapi,\
$$(DEFS) \
-Dorg.openoffice.test.arg.sce=$(SRCDIR)/dbaccess/qa/unoapi/dbaccess.sce \
-Dorg.openoffice.test.arg.xcl=$(SRCDIR)/dbaccess/qa/unoapi/knownissues.xcl
\
-Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/dbaccess/qa/unoapi/testdocuments \
))
-$(eval $(call gb_JunitTest_use_jars,dbaccess_unoapi,\
+$(eval $(call gb_JunitTest_use_jars,dba_ju_unoapi,\
$(OUTDIR)/bin/OOoRunner.jar \
+ $(OUTDIR)/bin/jurt.jar \
$(OUTDIR)/bin/ridl.jar \
$(OUTDIR)/bin/test.jar \
$(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/jurt.jar \
))
-$(eval $(call gb_JunitTest_add_classes,dbaccess_unoapi,\
+$(eval $(call gb_JunitTest_add_classes,dba_ju_unoapi,\
org.openoffice.test.UnoApiTest \
))
commit 4651069697ca71bca1ecc3deb43c294228155cba
Author: Norbert Thiebaud <nthieb...@gmail.com>
Date: Sat Jun 16 20:47:07 2012 -0500
revert gmk4
Change-Id: I0c1f0495358bba6889d48d8bc500f880f7d5179c
diff --git a/dbaccess/JunitTest_dbaccess_complex.mk
b/dbaccess/JunitTest_dbaccess_complex.mk
deleted file mode 100644
index ad39394..0000000
--- a/dbaccess/JunitTest_dbaccess_complex.mk
+++ /dev/null
@@ -1,83 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-$(eval $(call gb_JunitTest_JunitTest,dbaccess_complex))
-
-$(eval $(call gb_JunitTest_set_defs,dbaccess_complex,\
- $$(DEFS) \
- -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/dbaccess/qa/dbaccess \
-))
-
-$(eval $(call gb_JunitTest_add_sourcefiles,dbaccess_complex,\
- dbaccess/qa/complex/dbaccess/ApplicationController \
- dbaccess/qa/complex/dbaccess/Beamer \
- dbaccess/qa/complex/dbaccess/DataSource \
- dbaccess/qa/complex/dbaccess/DatabaseDocument \
- dbaccess/qa/complex/dbaccess/Parser \
- dbaccess/qa/complex/dbaccess/PropertyBag \
- dbaccess/qa/complex/dbaccess/Query \
- dbaccess/qa/complex/dbaccess/QueryInQuery \
- dbaccess/qa/complex/dbaccess/RowSet \
- dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer \
- dbaccess/qa/complex/dbaccess/UISettings \
- dbaccess/qa/complex/dbaccess/CopyTableWizard \
- dbaccess/qa/complex/dbaccess/CRMBasedTestCase \
- dbaccess/qa/complex/dbaccess/CopyTableInterActionHandler \
- dbaccess/qa/complex/dbaccess/DatabaseApplication \
- dbaccess/qa/complex/dbaccess/FileHelper \
- dbaccess/qa/complex/dbaccess/RowSetEventListener \
- dbaccess/qa/complex/dbaccess/TestCase \
-))
-
-$(eval $(call gb_JunitTest_use_jars,dbaccess_complex,\
- $(OUTDIR)/bin/OOoRunner.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/test.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/jurt.jar \
- $(OUTDIR)/bin/ConnectivityTools.jar \
-))
-
-$(eval $(call gb_JunitTest_add_classes,dbaccess_complex,\
- complex.dbaccess.Beamer \
- complex.dbaccess.PropertyBag \
-))
-# complex.dbaccess.DatabaseDocument \
-# deactivated since sb123;
-# apparently most of these fail because OOo does not find JVM?
-# complex.dbaccess.ApplicationController \
- complex.dbaccess.DataSource \
- complex.dbaccess.Parser \
- complex.dbaccess.Query \
- complex.dbaccess.QueryInQuery \
- complex.dbaccess.RowSet \
- complex.dbaccess.SingleSelectQueryComposer \
- complex.dbaccess.UISettings \
- complex.dbaccess.CopyTableWizard \
-
-# vim: set noet sw=4 ts=4:
commit 6aeeca56daa9065f607cc7056e7d86d237c84a99
Author: Norbert Thiebaud <nthieb...@gmail.com>
Date: Sat Jun 16 20:26:22 2012 -0500
Junit test for unotools
Change-Id: I7f3e6ed57fa40e9c7804c42c37c10023eefcc022
diff --git a/unotools/JunitTest_unotools_complex.mk
b/unotools/JunitTest_unotools_complex.mk
new file mode 100644
index 0000000..44671ce
--- /dev/null
+++ b/unotools/JunitTest_unotools_complex.mk
@@ -0,0 +1,37 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_JunitTest_JunitTest,unotools_complex))
+
+$(eval $(call gb_JunitTest_use_jars,unotools_complex,\
+ $(OUTDIR)/bin/OOoRunner.jar \
+ $(OUTDIR)/bin/jurt.jar \
+ $(OUTDIR)/bin/ridl.jar \
+ $(OUTDIR)/bin/test-tools.jar \
+ $(OUTDIR)/bin/test.jar \
+ $(OUTDIR)/bin/unoil.jar \
+))
+
+$(eval $(call gb_JunitTest_set_defs,unotools_complex,\
+ $$(DEFS) \
+))
+
+$(eval $(call gb_JunitTest_add_classes,unotools_complex,\
+ complex.tempfile.TempFileUnitTest \
+))
+
+$(eval $(call gb_JunitTest_add_sourcefiles,unotools_complex,\
+ unotools/qa/complex/tempfile/TempFileTest \
+ unotools/qa/complex/tempfile/TempFileUnitTest \
+ unotools/qa/complex/tempfile/Test01 \
+ unotools/qa/complex/tempfile/Test02 \
+ unotools/qa/complex/tempfile/TestHelper \
+))
+
+# vim: set noet sw=4 ts=4:
commit 72a8d28df58c1368811035a0acab63d443fc94e0
Author: Norbert Thiebaud <nthieb...@gmail.com>
Date: Sat Jun 16 20:26:02 2012 -0500
revert gmk4
Change-Id: Ib91e193d55d38abd77a6b4c0849c1f13c37cc7f2
diff --git a/unotools/JunitTest_unotools_complex.mk
b/unotools/JunitTest_unotools_complex.mk
deleted file mode 100644
index 065ebcc..0000000
--- a/unotools/JunitTest_unotools_complex.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-$(eval $(call gb_JunitTest_JunitTest,unotools_complex))
-
-$(eval $(call gb_JunitTest_set_defs,unotools_complex,\
- $$(DEFS) \
-))
-
-$(eval $(call gb_JunitTest_use_jars,unotools_complex,\
- $(OUTDIR)/bin/OOoRunner.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/test.jar \
- $(OUTDIR)/bin/test-tools.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/jurt.jar \
-))
-
-$(eval $(call gb_JunitTest_add_sourcefiles,unotools_complex,\
- unotools/qa/complex/tempfile/TempFileTest \
- unotools/qa/complex/tempfile/TempFileUnitTest \
- unotools/qa/complex/tempfile/Test01 \
- unotools/qa/complex/tempfile/Test02 \
- unotools/qa/complex/tempfile/TestHelper \
-))
-
-$(eval $(call gb_JunitTest_add_classes,unotools_complex,\
- complex.tempfile.TempFileUnitTest \
-))
-
-# vim: set noet sw=4 ts=4:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
