From b22c28c26b97ee782bd69efd92896009fa00611c Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Fri, 15 Jun 2012 19:31:22 -0500 Subject: tweak to capture recent changes in starmath and gbuild Change-Id: I1e7fb1ae0da02a60f1ee3655a09693c11108f61d --- starmath/AllLangResTarget_sm.mk | 20 +++++---- starmath/CppunitTest_starmath_qa_cppunit.mk | 63 +++++++++-------------------- starmath/JunitTest_starmath_unoapi.mk | 6 ++- starmath/Library_sm.mk | 27 +++++-------- starmath/Library_smd.mk | 14 ++----- starmath/Module_starmath.mk | 6 +-- 6 files changed, 51 insertions(+), 85 deletions(-) diff --git a/starmath/AllLangResTarget_sm.mk b/starmath/AllLangResTarget_sm.mk index 96af0c193851..ce5e5e0ae5b7 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 e8cbc6dff101..b065032cf96c 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. -# 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 +# (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 8fc9ea5df1e2..c5c778ec915a 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 5a2ec9140cb0..6546f5fd9f68 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 fe933ca67abd..e47a54746c67 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 4b3463ce3cdd..cbee84545631 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 \ -- cgit