starmath/AllLangResTarget_sm.mk | 59 ++++++-------- starmath/CppunitTest_starmath_qa_cppunit.mk | 6 - starmath/JunitTest_sm_unoapi.mk | 53 ------------- starmath/JunitTest_starmath_unoapi.mk | 8 + starmath/Library_sm.mk | 114 ++++++++++++++-------------- starmath/Library_smd.mk | 64 +++++++-------- starmath/Module_starmath.mk | 60 ++++++-------- starmath/Package_uiconfig.mk | 42 ++++------ 8 files changed, 164 insertions(+), 242 deletions(-)
New commits: commit b22c28c26b97ee782bd69efd92896009fa00611c Author: Norbert Thiebaud <[email protected]> Date: Fri Jun 15 19:31:22 2012 -0500 tweak to capture recent changes in starmath and gbuild Change-Id: I1e7fb1ae0da02a60f1ee3655a09693c11108f61d diff --git a/starmath/AllLangResTarget_sm.mk b/starmath/AllLangResTarget_sm.mk index 96af0c1..ce5e5e0 100644 --- a/starmath/AllLangResTarget_sm.mk +++ b/starmath/AllLangResTarget_sm.mk @@ -26,22 +26,28 @@ $(eval $(call gb_AllLangResTarget_AllLangResTarget,sm)) $(eval $(call gb_AllLangResTarget_set_reslocation,sm,starmath)) $(eval $(call gb_AllLangResTarget_add_srs,sm,\ - starmath/res \ + sm/res \ )) -$(eval $(call gb_SrsTarget_SrsTarget,starmath/res)) +$(eval $(call gb_SrsTarget_SrsTarget,sm/res)) -$(eval $(call gb_SrsTarget_set_include,starmath/res,\ - $$(INCLUDE) \ - -I$(OUTDIR)/inc \ - -I$(WORKDIR)/inc/starmath \ +$(eval $(call gb_SrsTarget_set_include,sm/res,\ -I$(SRCDIR)/starmath/inc \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_SrsTarget_use_packages,sm/res,\ + editeng_inc \ + sfx2_inc \ + svl_inc \ + svx_globlmn_hrc \ )) -$(eval $(call gb_SrsTarget_add_files,starmath/res,\ +$(eval $(call gb_SrsTarget_add_files,sm/res,\ starmath/source/smres.src \ starmath/source/commands.src \ starmath/source/symbol.src \ + starmath/source/toolbox.src \ )) # vim: set noet sw=4 ts=4: diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk b/starmath/CppunitTest_starmath_qa_cppunit.mk index e8cbc6d..b065032 100644 --- a/starmath/CppunitTest_starmath_qa_cppunit.mk +++ b/starmath/CppunitTest_starmath_qa_cppunit.mk @@ -1,3 +1,4 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # Version: MPL 1.1 / GPLv3+ / LGPLv3+ # # The contents of this file are subject to the Mozilla Public License Version @@ -10,12 +11,11 @@ # for the specific language governing rights and limitations under the # License. # -# The Initial Developer of the Original Code is -# David Tardon, Red Hat Inc. <[email protected]> -# Portions created by the Initial Developer are Copyright (C) 2010 the -# Initial Developer. All Rights Reserved. -# # Major Contributor(s): +# Copyright (C) 2010 Red Hat, Inc., David Tardon <[email protected]> +# (initial developer) +# +# All Rights Reserved. # # For minor contributions see the git repository. # @@ -29,34 +29,27 @@ $(eval $(call gb_CppunitTest_CppunitTest,starmath_qa_cppunit)) $(eval $(call gb_CppunitTest_set_include,starmath_qa_cppunit,\ $$(INCLUDE) \ - -I$(realpath $(SRCDIR)/starmath/inc) \ - -I$(realpath $(SRCDIR)/starmath/inc/pch) \ - -I$(OUTDIR)/inc \ + -I$(SRCDIR)/starmath/inc \ )) -$(eval $(call gb_CppunitTest_add_api,starmath_qa_cppunit,\ +$(eval $(call gb_CppunitTest_use_api,starmath_qa_cppunit,\ offapi \ udkapi \ )) -$(eval $(call gb_CppunitTest_set_defs,starmath_qa_cppunit,\ - $$(DEFS) \ - -DSMDLL \ -)) - -$(eval $(call gb_CppunitTest_add_library_objects,starmath_qa_cppunit,\ +$(eval $(call gb_CppunitTest_use_library_objects,starmath_qa_cppunit,\ sm \ )) $(call gb_CxxObject_get_target,starmath/qa/cppunit/test_starmath): $(WORKDIR)/AllLangRes/sm -$(eval $(call gb_CppunitTest_add_linked_libs,starmath_qa_cppunit,\ +$(eval $(call gb_CppunitTest_use_libraries,starmath_qa_cppunit,\ comphelper \ cppu \ cppuhelper \ editeng \ i18nisolang1 \ - i18npaper \ + i18nutil \ sal \ sfx \ sot \ @@ -77,42 +70,22 @@ $(eval $(call gb_CppunitTest_add_exception_objects,starmath_qa_cppunit,\ starmath/qa/cppunit/test_starmath \ )) -$(eval $(call gb_CppunitTest_uses_ure,starmath_qa_cppunit)) - -$(eval $(call gb_CppunitTest_add_type_rdbs,starmath_qa_cppunit,\ - types \ -)) - -$(eval $(call gb_CppunitTest_add_service_rdbs,starmath_qa_cppunit,\ - starmath_qa_cppunit \ -)) - -$(eval $(call gb_CppunitTest_set_args,starmath_qa_cppunit,\ - --headless \ - --invisible \ - --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ -)) - -$(eval $(call gb_RdbTarget_RdbTarget,starmath_qa_cppunit)) +$(eval $(call gb_CppunitTest_use_ure,starmath_qa_cppunit)) -$(eval $(call gb_RdbTarget_add_components,starmath_qa_cppunit,\ +$(eval $(call gb_CppunitTest_use_components,starmath_qa_cppunit,\ + configmgr/source/configmgr \ + dtrans/util/mcnttype \ framework/util/fwk \ i18npool/util/i18npool \ toolkit/util/tk \ sfx2/util/sfx \ )) -$(eval $(call gb_RdbTarget_add_old_components,starmath_qa_cppunit,\ - configmgr \ - mcnttype \ - vcl \ -)) - ifeq ($(strip $(OS)),WNT) -$(eval $(call gb_RdbTarget_add_old_components,starmath_qa_cppunit,\ - ftransl \ - sysdtrans \ +$(eval $(call gb_CppunitTest_use_components,starmath_qa_cppunit,\ + dtrans/util/ftransl \ + dtrans/util/sysdtrans \ )) endif -# vim: set noet sw=4: +# vim: set noet sw=4 ts=4: diff --git a/starmath/JunitTest_starmath_unoapi.mk b/starmath/JunitTest_starmath_unoapi.mk index 8fc9ea5..c5c778e 100644 --- a/starmath/JunitTest_starmath_unoapi.mk +++ b/starmath/JunitTest_starmath_unoapi.mk @@ -35,7 +35,7 @@ $(eval $(call gb_JunitTest_set_defs,starmath_unoapi,\ -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/starmath/qa/unoapi/testdocuments \ )) -$(eval $(call gb_JunitTest_add_jars,starmath_unoapi,\ +$(eval $(call gb_JunitTest_use_jars,starmath_unoapi,\ $(OUTDIR)/bin/OOoRunner.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/test.jar \ @@ -43,6 +43,10 @@ $(eval $(call gb_JunitTest_add_jars,starmath_unoapi,\ $(OUTDIR)/bin/jurt.jar \ )) +$(eval $(call gb_JunitTest_add_sourcefiles,starmath_unoapi,\ + starmath/qa/unoapi/Test \ +)) + $(eval $(call gb_JunitTest_add_classes,starmath_unoapi,\ org.openoffice.test.UnoApiTest \ )) diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk index 5a2ec91..6546f5f 100644 --- a/starmath/Library_sm.mk +++ b/starmath/Library_sm.mk @@ -24,37 +24,27 @@ $(eval $(call gb_Library_Library,sm)) $(eval $(call gb_Library_add_sdi_headers,sm,starmath/sdi/smslots)) -$(eval $(call gb_Library_add_precompiled_header,sm,$(SRCDIR)/starmath/inc/pch/precompiled_starmath)) - $(eval $(call gb_Library_set_componentfile,sm,starmath/util/sm)) $(eval $(call gb_Library_set_include,sm,\ - -I$(SRCDIR)/starmath/inc/pch \ -I$(SRCDIR)/starmath/inc \ -I$(WORKDIR)/SdiTarget/starmath/sdi \ - -I$(WORKDIR)/Misc/starmath/ \ $$(INCLUDE) \ - -I$(OUTDIR)/inc \ -)) - -$(eval $(call gb_Library_set_defs,sm,\ - $$(DEFS) \ - -DSMDLL \ - -DSC_INFO_OSVERSION=\"$(OS)\" \ )) -$(eval $(call gb_Library_add_api,sm,\ +$(eval $(call gb_Library_use_api,sm,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,sm,\ +$(eval $(call gb_Library_use_libraries,sm,\ comphelper \ cppu \ cppuhelper \ editeng \ - i18npaper \ + i18nutil \ msfilter \ + oox \ sal \ sax \ sfx \ @@ -67,8 +57,8 @@ $(eval $(call gb_Library_add_linked_libs,sm,\ tl \ utl \ vcl \ - ucbhelper \ - xo \ + xo \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,sm,\ @@ -86,10 +76,12 @@ $(eval $(call gb_Library_add_exception_objects,sm,\ starmath/source/mathmlimport \ starmath/source/mathtype \ starmath/source/node \ + starmath/source/ooxmlexport \ + starmath/source/ooxmlimport \ starmath/source/parse \ starmath/source/rect \ starmath/source/register \ - starmath/source/smdll \ + starmath/source/smdll \ starmath/source/smmod \ starmath/source/symbol \ starmath/source/toolbox \ @@ -109,7 +101,6 @@ $(eval $(call gb_SdiTarget_set_include,starmath/sdi/smslots,\ -I$(SRCDIR)/starmath/inc \ -I$(SRCDIR)/starmath/sdi \ $$(INCLUDE) \ - -I$(OUTDIR)/inc \ )) # vim: set noet sw=4 ts=4: diff --git a/starmath/Library_smd.mk b/starmath/Library_smd.mk index fe933ca..e47a547 100644 --- a/starmath/Library_smd.mk +++ b/starmath/Library_smd.mk @@ -22,28 +22,19 @@ $(eval $(call gb_Library_Library,smd)) -$(eval $(call gb_Library_add_precompiled_header,smd,$(SRCDIR)/starmath/inc/pch/precompiled_starmath)) - $(eval $(call gb_Library_set_componentfile,smd,starmath/util/smd)) $(eval $(call gb_Library_set_include,smd,\ - -I$(SRCDIR)/starmath/inc/pch \ -I$(SRCDIR)/starmath/inc \ - -I$(WORKDIR)/Misc/sm/ \ $$(INCLUDE) \ - -I$(OUTDIR)/inc \ -)) - -$(eval $(call gb_Library_set_defs,smd,\ - $$(DEFS) \ )) -$(eval $(call gb_Library_add_api,smd,\ +$(eval $(call gb_Library_use_api,smd,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,smd,\ +$(eval $(call gb_Library_use_libraries,smd,\ cppu \ cppuhelper \ sal \ @@ -54,6 +45,7 @@ $(eval $(call gb_Library_add_linked_libs,smd,\ tl \ ucbhelper \ vcl \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,smd,\ diff --git a/starmath/Module_starmath.mk b/starmath/Module_starmath.mk index 4b3463c..cbee845 100644 --- a/starmath/Module_starmath.mk +++ b/starmath/Module_starmath.mk @@ -30,9 +30,9 @@ $(eval $(call gb_Module_add_targets,sm,\ Package_uiconfig \ )) -$(eval $(call gb_Module_add_check_targets,sm,\ - CppunitTest_starmath_qa_cppunit \ -)) +#$(eval $(call gb_Module_add_check_targets,sm,\ +# CppunitTest_starmath_qa_cppunit \ +#)) $(eval $(call gb_Module_add_subsequentcheck_targets,sm,\ JunitTest_starmath_unoapi \ commit c2a1c7c40e4b5ef2ad7f2334fac699ce83b18d8a Author: Norbert Thiebaud <[email protected]> Date: Wed Jun 13 23:48:31 2012 -0500 hook for calling from .docx filter to starmath for writting formulas Cherry-picked from 2e5e29471f9ac61ec454bf90a985525a0ad5cb1c Change-Id: I32f8b03da4edf54e5622096d932dbc2b368f45ff diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk index a93bcfb..5a2ec91 100644 --- a/starmath/Library_sm.mk +++ b/starmath/Library_sm.mk @@ -53,8 +53,10 @@ $(eval $(call gb_Library_add_linked_libs,sm,\ cppu \ cppuhelper \ editeng \ - i18npaper \ + i18npaper \ + msfilter \ sal \ + sax \ sfx \ sot \ svl \ commit a3c2d619c2e13f547e50c4073b24e55dfa96f8d2 Author: Norbert Thiebaud <[email protected]> Date: Wed Jun 13 23:45:41 2012 -0500 convert i18npool to gbuild Cherry picked from 2674376ddff9370988fe1fcad0ec519d1e68e869 Change-Id: I882f6b516f617f37f2b966cb2e8c78718895e305 diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk b/starmath/CppunitTest_starmath_qa_cppunit.mk index 78440f8..e8cbc6d 100644 --- a/starmath/CppunitTest_starmath_qa_cppunit.mk +++ b/starmath/CppunitTest_starmath_qa_cppunit.mk @@ -97,13 +97,13 @@ $(eval $(call gb_RdbTarget_RdbTarget,starmath_qa_cppunit)) $(eval $(call gb_RdbTarget_add_components,starmath_qa_cppunit,\ framework/util/fwk \ + i18npool/util/i18npool \ toolkit/util/tk \ sfx2/util/sfx \ )) $(eval $(call gb_RdbTarget_add_old_components,starmath_qa_cppunit,\ configmgr \ - i18npool \ mcnttype \ vcl \ )) commit d7a4c3cbd866292889f4895f2f6528fccb1b7597 Author: Norbert Thiebaud <[email protected]> Date: Wed Jun 13 23:42:49 2012 -0500 Add consistent Emacs and vim mode lines cherry-picked from 24b6225f93ea5d22d727e0b03bc468bc5cc21af3 Change-Id: Ic0624618591285544e3fe4032ba9ac12a96ee003 diff --git a/starmath/AllLangResTarget_sm.mk b/starmath/AllLangResTarget_sm.mk index 75f8b1d..96af0c1 100644 --- a/starmath/AllLangResTarget_sm.mk +++ b/starmath/AllLangResTarget_sm.mk @@ -1,3 +1,4 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # Version: MPL 1.1 / GPLv3+ / LGPLv3+ # # The contents of this file are subject to the Mozilla Public License Version @@ -42,3 +43,5 @@ $(eval $(call gb_SrsTarget_add_files,starmath/res,\ starmath/source/commands.src \ starmath/source/symbol.src \ )) + +# vim: set noet sw=4 ts=4: diff --git a/starmath/JunitTest_starmath_unoapi.mk b/starmath/JunitTest_starmath_unoapi.mk index 8d26a56..8fc9ea5 100644 --- a/starmath/JunitTest_starmath_unoapi.mk +++ b/starmath/JunitTest_starmath_unoapi.mk @@ -1,3 +1,4 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # Version: MPL 1.1 / GPLv3+ / LGPLv3+ # # The contents of this file are subject to the Mozilla Public License Version @@ -15,8 +16,8 @@ # Portions created by the Initial Developer are Copyright (C) 2010 the # Initial Developer. All Rights Reserved. # -# Major Contributor(s): -# +# Major Contributor(s): +# # For minor contributions see the git repository. # # Alternatively, the contents of this file may be used under the terms of diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk index 0e01458..a93bcfb 100644 --- a/starmath/Library_sm.mk +++ b/starmath/Library_sm.mk @@ -1,3 +1,4 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # Version: MPL 1.1 / GPLv3+ / LGPLv3+ # # The contents of this file are subject to the Mozilla Public License Version @@ -108,3 +109,5 @@ $(eval $(call gb_SdiTarget_set_include,starmath/sdi/smslots,\ $$(INCLUDE) \ -I$(OUTDIR)/inc \ )) + +# vim: set noet sw=4 ts=4: diff --git a/starmath/Library_smd.mk b/starmath/Library_smd.mk index 843463a..fe933ca 100644 --- a/starmath/Library_smd.mk +++ b/starmath/Library_smd.mk @@ -1,3 +1,4 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # Version: MPL 1.1 / GPLv3+ / LGPLv3+ # # The contents of this file are subject to the Mozilla Public License Version @@ -60,3 +61,5 @@ $(eval $(call gb_Library_add_exception_objects,smd,\ starmath/source/smdetect \ starmath/source/eqnolefilehdr \ )) + +# vim: set noet sw=4 ts=4: diff --git a/starmath/Module_starmath.mk b/starmath/Module_starmath.mk index d9bc48d..4b3463c 100644 --- a/starmath/Module_starmath.mk +++ b/starmath/Module_starmath.mk @@ -1,3 +1,4 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # # Version: MPL 1.1 / GPLv3+ / LGPLv3+ # @@ -36,3 +37,5 @@ $(eval $(call gb_Module_add_check_targets,sm,\ $(eval $(call gb_Module_add_subsequentcheck_targets,sm,\ JunitTest_starmath_unoapi \ )) + +# vim: set noet sw=4 ts=4: diff --git a/starmath/Package_uiconfig.mk b/starmath/Package_uiconfig.mk index e312bf4..589f111 100644 --- a/starmath/Package_uiconfig.mk +++ b/starmath/Package_uiconfig.mk @@ -1,3 +1,4 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # Version: MPL 1.1 / GPLv3+ / LGPLv3+ # # The contents of this file are subject to the Mozilla Public License Version @@ -26,3 +27,4 @@ $(eval $(call gb_Package_add_file,sm_uiconfig,xml/uiconfig/modules/smath/toolbar $(eval $(call gb_Package_add_file,sm_uiconfig,xml/uiconfig/modules/smath/toolbar/standardbar.xml,smath/toolbar/standardbar.xml)) $(eval $(call gb_Package_add_file,sm_uiconfig,xml/uiconfig/modules/smath/toolbar/fullscreenbar.xml,smath/toolbar/fullscreenbar.xml)) +# vim: set noet sw=4 ts=4: commit 0c3efcbd18707057703b2e81d635987b72b2a485 Author: Norbert Thiebaud <[email protected]> Date: Wed Jun 13 23:34:54 2012 -0500 gb_Library_PLAINEXT->gb_Library_DLLEXT Cherry picked from 405454c88a44f0f881d67b4c707a5714cfc1d53c Change-Id: I18bb06ff9dfffcdb2dd958c736b6e81af0b2b4ca diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk b/starmath/CppunitTest_starmath_qa_cppunit.mk index abb894f..78440f8 100644 --- a/starmath/CppunitTest_starmath_qa_cppunit.mk +++ b/starmath/CppunitTest_starmath_qa_cppunit.mk @@ -90,7 +90,7 @@ $(eval $(call gb_CppunitTest_add_service_rdbs,starmath_qa_cppunit,\ $(eval $(call gb_CppunitTest_set_args,starmath_qa_cppunit,\ --headless \ --invisible \ - --protector unoexceptionprotector$(gb_Library_PLAINEXT) unoexceptionprotector \ + --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ )) $(eval $(call gb_RdbTarget_RdbTarget,starmath_qa_cppunit)) commit c6af47653756ab2bbcb637f8952605d069c83b7b Author: Caolán McNamara <[email protected]> Date: Thu Jun 30 16:17:52 2011 +0100 add modified unoexceptionprotector for better error msgs from exceptions diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk b/starmath/CppunitTest_starmath_qa_cppunit.mk index 3fd301d..abb894f 100644 --- a/starmath/CppunitTest_starmath_qa_cppunit.mk +++ b/starmath/CppunitTest_starmath_qa_cppunit.mk @@ -90,6 +90,7 @@ $(eval $(call gb_CppunitTest_add_service_rdbs,starmath_qa_cppunit,\ $(eval $(call gb_CppunitTest_set_args,starmath_qa_cppunit,\ --headless \ --invisible \ + --protector unoexceptionprotector$(gb_Library_PLAINEXT) unoexceptionprotector \ )) $(eval $(call gb_RdbTarget_RdbTarget,starmath_qa_cppunit)) commit 004073aef0c0c93aad05075b3f8fc2d1faf11ca7 Author: David Tardon <[email protected]> Date: Mon May 30 18:48:02 2011 +0200 remove all traces of offuh from makefiles diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk b/starmath/CppunitTest_starmath_qa_cppunit.mk index 2d03bbb..3fd301d 100644 --- a/starmath/CppunitTest_starmath_qa_cppunit.mk +++ b/starmath/CppunitTest_starmath_qa_cppunit.mk @@ -32,7 +32,11 @@ $(eval $(call gb_CppunitTest_set_include,starmath_qa_cppunit,\ -I$(realpath $(SRCDIR)/starmath/inc) \ -I$(realpath $(SRCDIR)/starmath/inc/pch) \ -I$(OUTDIR)/inc \ - -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_CppunitTest_add_api,starmath_qa_cppunit,\ + offapi \ + udkapi \ )) $(eval $(call gb_CppunitTest_set_defs,starmath_qa_cppunit,\ diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk index 2b7bffb..0e01458 100644 --- a/starmath/Library_sm.mk +++ b/starmath/Library_sm.mk @@ -33,7 +33,6 @@ $(eval $(call gb_Library_set_include,sm,\ -I$(WORKDIR)/SdiTarget/starmath/sdi \ -I$(WORKDIR)/Misc/starmath/ \ $$(INCLUDE) \ - -I$(OUTDIR)/inc/offuh \ -I$(OUTDIR)/inc \ )) @@ -43,6 +42,11 @@ $(eval $(call gb_Library_set_defs,sm,\ -DSC_INFO_OSVERSION=\"$(OS)\" \ )) +$(eval $(call gb_Library_add_api,sm,\ + offapi \ + udkapi \ +)) + $(eval $(call gb_Library_add_linked_libs,sm,\ comphelper \ cppu \ diff --git a/starmath/Library_smd.mk b/starmath/Library_smd.mk index 2a0016e..843463a 100644 --- a/starmath/Library_smd.mk +++ b/starmath/Library_smd.mk @@ -30,7 +30,6 @@ $(eval $(call gb_Library_set_include,smd,\ -I$(SRCDIR)/starmath/inc \ -I$(WORKDIR)/Misc/sm/ \ $$(INCLUDE) \ - -I$(OUTDIR)/inc/offuh \ -I$(OUTDIR)/inc \ )) @@ -38,6 +37,11 @@ $(eval $(call gb_Library_set_defs,smd,\ $$(DEFS) \ )) +$(eval $(call gb_Library_add_api,smd,\ + offapi \ + udkapi \ +)) + $(eval $(call gb_Library_add_linked_libs,smd,\ cppu \ cppuhelper \ commit 00e5cd83627835997e705cee23185a09f1625252 Author: Norbert Thiebaud <[email protected]> Date: Fri Apr 29 03:55:19 2011 -0500 ugly fix to a dependency problem in starmath_qa_ccpunit diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk b/starmath/CppunitTest_starmath_qa_cppunit.mk index 8d6a95e..2d03bbb 100644 --- a/starmath/CppunitTest_starmath_qa_cppunit.mk +++ b/starmath/CppunitTest_starmath_qa_cppunit.mk @@ -44,6 +44,8 @@ $(eval $(call gb_CppunitTest_add_library_objects,starmath_qa_cppunit,\ sm \ )) +$(call gb_CxxObject_get_target,starmath/qa/cppunit/test_starmath): $(WORKDIR)/AllLangRes/sm + $(eval $(call gb_CppunitTest_add_linked_libs,starmath_qa_cppunit,\ comphelper \ cppu \ commit ee0902b50d5043e4b377cbf4556bb8ed39efd6b1 Author: Norbert Thiebaud <[email protected]> Date: Thu Apr 28 21:53:29 2011 -0500 avoid object double include in starmath diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk index 92571a4..2b7bffb 100644 --- a/starmath/Library_sm.mk +++ b/starmath/Library_sm.mk @@ -74,7 +74,6 @@ $(eval $(call gb_Library_add_exception_objects,sm,\ starmath/source/dialog \ starmath/source/document \ starmath/source/edit \ - starmath/source/eqnolefilehdr \ starmath/source/format \ starmath/source/mathmlexport \ starmath/source/mathmlimport \ commit 48cb39aa6d34cbdd2903f64e2b27f01e7c33b6ce Author: Norbert Thiebaud <[email protected]> Date: Wed Jun 13 23:26:15 2012 -0500 reenable unit test cherry-picked from 95357d3144b817726507758c1314a82303c25157 Change-Id: I1d403859091a6e59b1045126c5db2bf2ffd573e1 diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk b/starmath/CppunitTest_starmath_qa_cppunit.mk new file mode 100644 index 0000000..8d6a95e --- /dev/null +++ b/starmath/CppunitTest_starmath_qa_cppunit.mk @@ -0,0 +1,111 @@ +# 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 +# David Tardon, Red Hat Inc. <[email protected]> +# Portions created by the Initial Developer are Copyright (C) 2010 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_CppunitTest_CppunitTest,starmath_qa_cppunit)) + +$(eval $(call gb_CppunitTest_set_include,starmath_qa_cppunit,\ + $$(INCLUDE) \ + -I$(realpath $(SRCDIR)/starmath/inc) \ + -I$(realpath $(SRCDIR)/starmath/inc/pch) \ + -I$(OUTDIR)/inc \ + -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_CppunitTest_set_defs,starmath_qa_cppunit,\ + $$(DEFS) \ + -DSMDLL \ +)) + +$(eval $(call gb_CppunitTest_add_library_objects,starmath_qa_cppunit,\ + sm \ +)) + +$(eval $(call gb_CppunitTest_add_linked_libs,starmath_qa_cppunit,\ + comphelper \ + cppu \ + cppuhelper \ + editeng \ + i18nisolang1 \ + i18npaper \ + sal \ + sfx \ + sot \ + svl \ + svt \ + svxcore \ + svx \ + tk \ + tl \ + utl \ + vcl \ + xo \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_CppunitTest_add_exception_objects,starmath_qa_cppunit,\ + starmath/qa/cppunit/test_nodetotextvisitors \ + starmath/qa/cppunit/test_starmath \ +)) + +$(eval $(call gb_CppunitTest_uses_ure,starmath_qa_cppunit)) + +$(eval $(call gb_CppunitTest_add_type_rdbs,starmath_qa_cppunit,\ + types \ +)) + +$(eval $(call gb_CppunitTest_add_service_rdbs,starmath_qa_cppunit,\ + starmath_qa_cppunit \ +)) + +$(eval $(call gb_CppunitTest_set_args,starmath_qa_cppunit,\ + --headless \ + --invisible \ +)) + +$(eval $(call gb_RdbTarget_RdbTarget,starmath_qa_cppunit)) + +$(eval $(call gb_RdbTarget_add_components,starmath_qa_cppunit,\ + framework/util/fwk \ + toolkit/util/tk \ + sfx2/util/sfx \ +)) + +$(eval $(call gb_RdbTarget_add_old_components,starmath_qa_cppunit,\ + configmgr \ + i18npool \ + mcnttype \ + vcl \ +)) + +ifeq ($(strip $(OS)),WNT) +$(eval $(call gb_RdbTarget_add_old_components,starmath_qa_cppunit,\ + ftransl \ + sysdtrans \ +)) +endif + +# vim: set noet sw=4: diff --git a/starmath/Module_starmath.mk b/starmath/Module_starmath.mk index 9f7de2d..d9bc48d 100644 --- a/starmath/Module_starmath.mk +++ b/starmath/Module_starmath.mk @@ -29,6 +29,10 @@ $(eval $(call gb_Module_add_targets,sm,\ Package_uiconfig \ )) +$(eval $(call gb_Module_add_check_targets,sm,\ + CppunitTest_starmath_qa_cppunit \ +)) + $(eval $(call gb_Module_add_subsequentcheck_targets,sm,\ JunitTest_starmath_unoapi \ )) commit fa9cc5f30b62a55237ef3171a23f0deb11a46f05 Author: David Tardon <[email protected]> Date: Tue Mar 29 17:22:12 2011 +0200 move UNO API test to subsequentchecks diff --git a/starmath/Module_starmath.mk b/starmath/Module_starmath.mk index d508f06..9f7de2d 100644 --- a/starmath/Module_starmath.mk +++ b/starmath/Module_starmath.mk @@ -27,6 +27,8 @@ $(eval $(call gb_Module_add_targets,sm,\ Library_sm \ Library_smd \ Package_uiconfig \ - JunitTest_starmath_unoapi \ )) +$(eval $(call gb_Module_add_subsequentcheck_targets,sm,\ + JunitTest_starmath_unoapi \ +)) commit 08f666ec9921be82caa0bf46d5347373de2259c9 Author: Norbert Thiebaud <[email protected]> Date: Wed Jun 13 23:22:25 2012 -0500 migrate starmath subsequenttests to gbuild cherry-picked from 969d60a477742d24afe370fae70db057d2db9341 Change-Id: I074f2f024624aafea4456304295d747318755ffd diff --git a/starmath/JunitTest_starmath_unoapi.mk b/starmath/JunitTest_starmath_unoapi.mk new file mode 100644 index 0000000..8d26a56 --- /dev/null +++ b/starmath/JunitTest_starmath_unoapi.mk @@ -0,0 +1,49 @@ +# 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 +# Bjoern Michaelsen, Canonical Ltd. <[email protected]> +# Portions created by the Initial Developer are Copyright (C) 2010 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_JunitTest_JunitTest,starmath_unoapi)) + +$(eval $(call gb_JunitTest_set_defs,starmath_unoapi,\ + $$(DEFS) \ + -Dorg.openoffice.test.arg.sce=$(SRCDIR)/starmath/qa/unoapi/sm.sce \ + -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/starmath/qa/unoapi/knownissues.xcl \ + -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/starmath/qa/unoapi/testdocuments \ +)) + +$(eval $(call gb_JunitTest_add_jars,starmath_unoapi,\ + $(OUTDIR)/bin/OOoRunner.jar \ + $(OUTDIR)/bin/ridl.jar \ + $(OUTDIR)/bin/test.jar \ + $(OUTDIR)/bin/unoil.jar \ + $(OUTDIR)/bin/jurt.jar \ +)) + +$(eval $(call gb_JunitTest_add_classes,starmath_unoapi,\ + org.openoffice.test.UnoApiTest \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/starmath/Module_starmath.mk b/starmath/Module_starmath.mk index 2452ddb..d508f06 100644 --- a/starmath/Module_starmath.mk +++ b/starmath/Module_starmath.mk @@ -23,9 +23,10 @@ $(eval $(call gb_Module_Module,sm)) $(eval $(call gb_Module_add_targets,sm,\ - AllLangResTarget_sm \ - Library_sm \ - Library_smd \ - Package_uiconfig \ + AllLangResTarget_sm \ + Library_sm \ + Library_smd \ + Package_uiconfig \ + JunitTest_starmath_unoapi \ )) commit c4bfd9044e348ce44097db37fb035c8f40558776 Author: Norbert Thiebaud <[email protected]> Date: Wed Jun 13 23:18:10 2012 -0500 convert starmath to gnumake cherry-pick from da5f126844fab3c647c3d95cdf613aaf2e22ceed Change-Id: I1e462668270f33f7f7f2082b20c12c18d0ad8042 diff --git a/starmath/AllLangResTarget_sm.mk b/starmath/AllLangResTarget_sm.mk new file mode 100644 index 0000000..75f8b1d --- /dev/null +++ b/starmath/AllLangResTarget_sm.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. 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 +# Norbert Thiebaud <[email protected]> (C) 2010, All Rights Reserved. +# +# 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_AllLangResTarget_AllLangResTarget,sm)) + +$(eval $(call gb_AllLangResTarget_set_reslocation,sm,starmath)) + +$(eval $(call gb_AllLangResTarget_add_srs,sm,\ + starmath/res \ +)) + +$(eval $(call gb_SrsTarget_SrsTarget,starmath/res)) + +$(eval $(call gb_SrsTarget_set_include,starmath/res,\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc \ + -I$(WORKDIR)/inc/starmath \ + -I$(SRCDIR)/starmath/inc \ +)) + +$(eval $(call gb_SrsTarget_add_files,starmath/res,\ + starmath/source/smres.src \ + starmath/source/commands.src \ + starmath/source/symbol.src \ +)) diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk new file mode 100644 index 0000000..92571a4 --- /dev/null +++ b/starmath/Library_sm.mk @@ -0,0 +1,107 @@ +# 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. 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 +# Norbert Thiebaud <[email protected]> (C) 2010, All Rights Reserved. +# +# 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_Library_Library,sm)) + +$(eval $(call gb_Library_add_sdi_headers,sm,starmath/sdi/smslots)) + +$(eval $(call gb_Library_add_precompiled_header,sm,$(SRCDIR)/starmath/inc/pch/precompiled_starmath)) + +$(eval $(call gb_Library_set_componentfile,sm,starmath/util/sm)) + +$(eval $(call gb_Library_set_include,sm,\ + -I$(SRCDIR)/starmath/inc/pch \ + -I$(SRCDIR)/starmath/inc \ + -I$(WORKDIR)/SdiTarget/starmath/sdi \ + -I$(WORKDIR)/Misc/starmath/ \ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc \ +)) + +$(eval $(call gb_Library_set_defs,sm,\ + $$(DEFS) \ + -DSMDLL \ + -DSC_INFO_OSVERSION=\"$(OS)\" \ +)) + +$(eval $(call gb_Library_add_linked_libs,sm,\ + comphelper \ + cppu \ + cppuhelper \ + editeng \ + i18npaper \ + sal \ + sfx \ + sot \ + svl \ + svt \ + svx \ + svxcore \ + tk \ + tl \ + utl \ + vcl \ + ucbhelper \ + xo \ +)) + +$(eval $(call gb_Library_add_exception_objects,sm,\ + starmath/source/accessibility \ + starmath/source/action \ + starmath/source/caret \ + starmath/source/cfgitem \ + starmath/source/config \ + starmath/source/cursor \ + starmath/source/dialog \ + starmath/source/document \ + starmath/source/edit \ + starmath/source/eqnolefilehdr \ + starmath/source/format \ + starmath/source/mathmlexport \ + starmath/source/mathmlimport \ + starmath/source/mathtype \ + starmath/source/node \ + starmath/source/parse \ + starmath/source/rect \ + starmath/source/register \ + starmath/source/smdll \ + starmath/source/smmod \ + starmath/source/symbol \ + starmath/source/toolbox \ + starmath/source/typemap \ + starmath/source/types \ + starmath/source/unodoc \ + starmath/source/unomodel \ + starmath/source/utility \ + starmath/source/view \ + starmath/source/visitors \ +)) + + +$(eval $(call gb_SdiTarget_SdiTarget,starmath/sdi/smslots,starmath/sdi/smath)) + +$(eval $(call gb_SdiTarget_set_include,starmath/sdi/smslots,\ + -I$(SRCDIR)/starmath/inc \ + -I$(SRCDIR)/starmath/sdi \ + $$(INCLUDE) \ + -I$(OUTDIR)/inc \ +)) diff --git a/starmath/Library_smd.mk b/starmath/Library_smd.mk new file mode 100644 index 0000000..2a0016e --- /dev/null +++ b/starmath/Library_smd.mk @@ -0,0 +1,58 @@ +# 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. 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 +# Norbert Thiebaud <[email protected]> (C) 2010, All Rights Reserved. +# +# 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_Library_Library,smd)) + +$(eval $(call gb_Library_add_precompiled_header,smd,$(SRCDIR)/starmath/inc/pch/precompiled_starmath)) + +$(eval $(call gb_Library_set_componentfile,smd,starmath/util/smd)) + +$(eval $(call gb_Library_set_include,smd,\ + -I$(SRCDIR)/starmath/inc/pch \ + -I$(SRCDIR)/starmath/inc \ + -I$(WORKDIR)/Misc/sm/ \ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc \ +)) + +$(eval $(call gb_Library_set_defs,smd,\ + $$(DEFS) \ +)) + +$(eval $(call gb_Library_add_linked_libs,smd,\ + cppu \ + cppuhelper \ + sal \ + sfx \ + sot \ + svl \ + svt \ + tl \ + ucbhelper \ + vcl \ +)) + +$(eval $(call gb_Library_add_exception_objects,smd,\ + starmath/source/detreg \ + starmath/source/smdetect \ + starmath/source/eqnolefilehdr \ +)) diff --git a/starmath/Module_starmath.mk b/starmath/Module_starmath.mk new file mode 100644 index 0000000..2452ddb --- /dev/null +++ b/starmath/Module_starmath.mk @@ -0,0 +1,31 @@ +# +# 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. 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 +# Norbert Thiebaud <[email protected]> (C) 2010, All Rights Reserved. +# +# 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,sm)) + +$(eval $(call gb_Module_add_targets,sm,\ + AllLangResTarget_sm \ + Library_sm \ + Library_smd \ + Package_uiconfig \ +)) + diff --git a/starmath/Package_uiconfig.mk b/starmath/Package_uiconfig.mk new file mode 100644 index 0000000..e312bf4 --- /dev/null +++ b/starmath/Package_uiconfig.mk @@ -0,0 +1,28 @@ +# 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. 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 +# Norbert Thiebaud <[email protected]> (C) 2010, All Rights Reserved. +# +# 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,sm_uiconfig,$(SRCDIR)/starmath/uiconfig)) +$(eval $(call gb_Package_add_file,sm_uiconfig,xml/uiconfig/modules/smath/menubar/menubar.xml,smath/menubar/menubar.xml)) +$(eval $(call gb_Package_add_file,sm_uiconfig,xml/uiconfig/modules/smath/statusbar/statusbar.xml,smath/statusbar/statusbar.xml)) +$(eval $(call gb_Package_add_file,sm_uiconfig,xml/uiconfig/modules/smath/toolbar/toolbar.xml,smath/toolbar/toolbar.xml)) +$(eval $(call gb_Package_add_file,sm_uiconfig,xml/uiconfig/modules/smath/toolbar/standardbar.xml,smath/toolbar/standardbar.xml)) +$(eval $(call gb_Package_add_file,sm_uiconfig,xml/uiconfig/modules/smath/toolbar/fullscreenbar.xml,smath/toolbar/fullscreenbar.xml)) + commit b22eeebd2c0fa2dfecc7f3b958a6ad350b0d7c60 Author: Norbert Thiebaud <[email protected]> Date: Wed Jun 13 23:12:55 2012 -0500 revert gmk4 mismerge Change-Id: I013893c7ca4b9d4364d2d19fdd0440c7dcf08910 diff --git a/starmath/AllLangResTarget_sm.mk b/starmath/AllLangResTarget_sm.mk deleted file mode 100644 index a89c924..0000000 --- a/starmath/AllLangResTarget_sm.mk +++ /dev/null @@ -1,58 +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_AllLangResTarget_AllLangResTarget,sm)) - -$(eval $(call gb_AllLangResTarget_add_srs,sm,\ - sm/res \ -)) - -$(eval $(call gb_AllLangResTarget_set_reslocation,sm,starmath)) - -$(eval $(call gb_SrsTarget_SrsTarget,sm/res)) - -$(eval $(call gb_SrsTarget_use_packages,sm/res,\ - editeng_inc \ - sfx2_inc \ - svl_inc \ - svx_globlmn_hrc \ -)) - -$(eval $(call gb_SrsTarget_set_include,sm/res,\ - $$(INCLUDE) \ - -I$(SRCDIR)/starmath/inc \ -)) - -$(eval $(call gb_SrsTarget_add_files,sm/res,\ - starmath/source/commands.src \ - starmath/source/smres.src \ - starmath/source/symbol.src \ - starmath/source/toolbox.src \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk b/starmath/CppunitTest_starmath_qa_cppunit.mk deleted file mode 100644 index 356a916..0000000 --- a/starmath/CppunitTest_starmath_qa_cppunit.mk +++ /dev/null @@ -1,97 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# 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. -# -# Major Contributor(s): -# Copyright (C) 2010 Red Hat, Inc., David Tardon <[email protected]> -# (initial developer) -# -# All Rights Reserved. -# -# 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_CppunitTest_CppunitTest,starmath_qa_cppunit)) - -$(eval $(call gb_CppunitTest_set_include,starmath_qa_cppunit,\ - $$(INCLUDE) \ - -I$(SRCDIR)/starmath/inc \ -)) - -$(eval $(call gb_CppunitTest_use_api,starmath_qa_cppunit,\ - offapi \ - udkapi \ -)) - -$(eval $(call gb_CppunitTest_set_defs,starmath_qa_cppunit,\ - $$(DEFS) \ - -DSMDLL \ -)) - -$(eval $(call gb_CppunitTest_use_library_objects,starmath_qa_cppunit,\ - sm \ -)) - -$(call gb_CxxObject_get_target,starmath/qa/cppunit/test_starmath): $(WORKDIR)/AllLangRes/sm - -$(eval $(call gb_CppunitTest_use_libraries,starmath_qa_cppunit,\ - comphelper \ - cppu \ - cppuhelper \ - editeng \ - i18nisolang1 \ - i18nutil \ - sal \ - sfx \ - sot \ - svl \ - svt \ - svxcore \ - svx \ - tk \ - tl \ - utl \ - vcl \ - xo \ - $(gb_STDLIBS) \ -)) - -$(eval $(call gb_CppunitTest_add_exception_objects,starmath_qa_cppunit,\ - starmath/qa/cppunit/test_nodetotextvisitors \ - starmath/qa/cppunit/test_starmath \ -)) - -$(eval $(call gb_CppunitTest_use_ure,starmath_qa_cppunit)) - -$(eval $(call gb_CppunitTest_use_components,starmath_qa_cppunit,\ - configmgr/source/configmgr \ - dtrans/util/mcnttype \ - framework/util/fwk \ - i18npool/util/i18npool \ - toolkit/util/tk \ - sfx2/util/sfx \ - vcl/vcl \ -)) - -ifeq ($(strip $(OS)),WNT) -$(eval $(call gb_CppunitTest_use_components,starmath_qa_cppunit,\ - dtrans/util/ftransl \ - dtrans/util/sysdtrans \ -)) -endif - -# vim: set noet sw=4 ts=4: diff --git a/starmath/JunitTest_sm_unoapi.mk b/starmath/JunitTest_sm_unoapi.mk deleted file mode 100644 index b021c50..0000000 --- a/starmath/JunitTest_sm_unoapi.mk +++ /dev/null @@ -1,53 +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,sm_unoapi)) - -$(eval $(call gb_JunitTest_set_defs,sm_unoapi,\ - $$(DEFS) \ - -Dorg.openoffice.test.arg.sce=$(SRCDIR)/starmath/qa/unoapi/sm.sce \ - -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/starmath/qa/unoapi/knownissues.xcl \ -)) - -$(eval $(call gb_JunitTest_use_jars,sm_unoapi,\ - $(OUTDIR)/bin/OOoRunner.jar \ - $(OUTDIR)/bin/ridl.jar \ - $(OUTDIR)/bin/test.jar \ - $(OUTDIR)/bin/unoil.jar \ - $(OUTDIR)/bin/jurt.jar \ -)) - -$(eval $(call gb_JunitTest_add_sourcefiles,sm_unoapi,\ - starmath/qa/unoapi/Test \ -)) - -$(eval $(call gb_JunitTest_add_classes,sm_unoapi,\ - org.openoffice.starmath.qa.unoapi.Test \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/starmath/JunitTest_starmath_unoapi.mk b/starmath/JunitTest_starmath_unoapi.mk deleted file mode 100644 index 13194ad..0000000 --- a/starmath/JunitTest_starmath_unoapi.mk +++ /dev/null @@ -1,50 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# 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 -# Bjoern Michaelsen, Canonical Ltd. <[email protected]> -# Portions created by the Initial Developer are Copyright (C) 2010 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_JunitTest_JunitTest,starmath_unoapi)) - -$(eval $(call gb_JunitTest_set_defs,starmath_unoapi,\ - $$(DEFS) \ - -Dorg.openoffice.test.arg.sce=$(SRCDIR)/starmath/qa/unoapi/sm.sce \ - -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/starmath/qa/unoapi/knownissues.xcl \ - -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/starmath/qa/unoapi/testdocuments \ -)) - -$(eval $(call gb_JunitTest_use_jars,starmath_unoapi,\ - $(OUTDIR)/bin/OOoRunner.jar \ - $(OUTDIR)/bin/ridl.jar \ - $(OUTDIR)/bin/test.jar \ - $(OUTDIR)/bin/unoil.jar \ - $(OUTDIR)/bin/jurt.jar \ -)) - -$(eval $(call gb_JunitTest_add_classes,starmath_unoapi,\ - org.openoffice.test.UnoApiTest \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk deleted file mode 100644 index bd13669..0000000 --- a/starmath/Library_sm.mk +++ /dev/null @@ -1,106 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# 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. 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 -# Norbert Thiebaud <[email protected]> (C) 2010, All Rights Reserved. -# -# 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_Library_Library,sm)) - -$(eval $(call gb_Library_add_sdi_headers,sm,starmath/sdi/smslots)) - -$(eval $(call gb_Library_set_componentfile,sm,starmath/util/sm)) - -$(eval $(call gb_Library_set_include,sm,\ - -I$(SRCDIR)/starmath/inc \ - -I$(WORKDIR)/SdiTarget/starmath/sdi \ - $$(INCLUDE) \ -)) - -$(eval $(call gb_Library_use_api,sm,\ - offapi \ - udkapi \ -)) - -$(eval $(call gb_Library_use_libraries,sm,\ - comphelper \ - cppu \ - cppuhelper \ - editeng \ - i18nutil \ - msfilter \ - oox \ - sal \ - sax \ - sfx \ - sot \ - svl \ - svt \ - svx \ - svxcore \ - tk \ - tl \ - utl \ - vcl \ - xo \ - $(gb_STDLIBS) \ -)) - -$(eval $(call gb_Library_add_exception_objects,sm,\ - starmath/source/accessibility \ - starmath/source/action \ - starmath/source/caret \ - starmath/source/cfgitem \ - starmath/source/config \ - starmath/source/cursor \ - starmath/source/dialog \ - starmath/source/document \ - starmath/source/edit \ - starmath/source/format \ - starmath/source/mathmlexport \ - starmath/source/mathmlimport \ - starmath/source/mathtype \ - starmath/source/node \ - starmath/source/ooxmlexport \ - starmath/source/ooxmlimport \ - starmath/source/parse \ - starmath/source/rect \ - starmath/source/register \ - starmath/source/smdll \ - starmath/source/smmod \ - starmath/source/symbol \ - starmath/source/toolbox \ - starmath/source/typemap \ - starmath/source/types \ - starmath/source/unodoc \ - starmath/source/unomodel \ - starmath/source/utility \ - starmath/source/view \ - starmath/source/visitors \ -)) - - -$(eval $(call gb_SdiTarget_SdiTarget,starmath/sdi/smslots,starmath/sdi/smath)) - -$(eval $(call gb_SdiTarget_set_include,starmath/sdi/smslots,\ - -I$(SRCDIR)/starmath/inc \ - -I$(SRCDIR)/starmath/sdi \ - $$(INCLUDE) \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/starmath/Library_smd.mk b/starmath/Library_smd.mk deleted file mode 100644 index 3e36ddf..0000000 --- a/starmath/Library_smd.mk +++ /dev/null @@ -1,63 +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,smd)) - -$(eval $(call gb_Library_set_componentfile,smd,starmath/util/smd)) - -$(eval $(call gb_Library_set_include,smd,\ - $$(INCLUDE) \ - -I$(SRCDIR)/starmath/inc \ -)) - -$(eval $(call gb_Library_use_api,smd,\ - offapi \ - udkapi \ -)) - -$(eval $(call gb_Library_use_libraries,smd,\ - cppu \ - cppuhelper \ - sal \ - sfx \ - sot \ - svl \ - svt \ - tl \ - ucbhelper \ - vcl \ - $(gb_STDLIBS) \ -)) - -$(eval $(call gb_Library_add_exception_objects,smd,\ - starmath/source/detreg \ - starmath/source/smdetect \ - starmath/source/eqnolefilehdr \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/starmath/Module_starmath.mk b/starmath/Module_starmath.mk deleted file mode 100644 index 7f8554c..0000000 --- a/starmath/Module_starmath.mk +++ /dev/null @@ -1,47 +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,starmath)) - -$(eval $(call gb_Module_add_targets,starmath,\ - AllLangResTarget_sm \ - Library_sm \ - Library_smd \ - Package_uiconfig \ -)) - -# was this missing accidentally? -#$(eval $(call gb_Module_add_check_targets,starmath,\ - CppunitTest_starmath_qa_cppunit \ -)) - -$(eval $(call gb_Module_add_subsequentcheck_targets,starmath,\ - JunitTest_sm_unoapi \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/starmath/Package_uiconfig.mk b/starmath/Package_uiconfig.mk deleted file mode 100644 index 46a0d3f..0000000 --- a/starmath/Package_uiconfig.mk +++ /dev/null @@ -1,36 +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,sm_uiconfig,$(SRCDIR)/starmath/uiconfig)) -$(eval $(call gb_Package_add_file,sm_uiconfig,xml/uiconfig/modules/smath/menubar/menubar.xml,smath/menubar/menubar.xml)) -$(eval $(call gb_Package_add_file,sm_uiconfig,xml/uiconfig/modules/smath/statusbar/statusbar.xml,smath/statusbar/statusbar.xml)) -$(eval $(call gb_Package_add_file,sm_uiconfig,xml/uiconfig/modules/smath/toolbar/fullscreenbar.xml,smath/toolbar/fullscreenbar.xml)) -$(eval $(call gb_Package_add_file,sm_uiconfig,xml/uiconfig/modules/smath/toolbar/standardbar.xml,smath/toolbar/standardbar.xml)) -$(eval $(call gb_Package_add_file,sm_uiconfig,xml/uiconfig/modules/smath/toolbar/toolbar.xml,smath/toolbar/toolbar.xml)) - -# vim: set noet sw=4 ts=4:
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
