Skip to content

C
core
Kaydet (Commit) b22eeebd authored tarafından Norbert Thiebaud's avatar Norbert Thiebaud
Dosyalara gözat
Seçenekler

revert gmk4 mismerge 

Change-Id: I013893c7ca4b9d4364d2d19fdd0440c7dcf08910
üst efc6743b
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 510 deletions
starmath/AllLangResTarget_sm.mk deleted 100644 → 0
Dosyayı görüntüle @ efc6743b
# -*- 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:
starmath/CppunitTest_starmath_qa_cppunit.mk deleted 100644 → 0
Dosyayı görüntüle @ efc6743b
# -*- 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 <dtardon@redhat.com>
# (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:
starmath/JunitTest_sm_unoapi.mk deleted 100644 → 0
Dosyayı görüntüle @ efc6743b
# -*- 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:
starmath/JunitTest_starmath_unoapi.mk deleted 100644 → 0
Dosyayı görüntüle @ efc6743b
# -*- 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. <bjoern.michaelsen@canonical.com>
# 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:
starmath/Library_sm.mk deleted 100644 → 0
Dosyayı görüntüle @ efc6743b
# -*- 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 <nthiebaud@gmail.com> (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:
starmath/Library_smd.mk deleted 100644 → 0
Dosyayı görüntüle @ efc6743b
# -*- 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:
starmath/Module_starmath.mk deleted 100644 → 0
Dosyayı görüntüle @ efc6743b
# -*- 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:
starmath/Package_uiconfig.mk deleted 100644 → 0
Dosyayı görüntüle @ efc6743b
# -*- 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:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment