From 4478b739ddade09425d496cbddee1542fdfd5e9b Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Sun, 18 Sep 2011 10:40:37 -0400 Subject: convert bean to gbuild and add to tail_build --- bean/prj/build.lst | 10 +--------- bean/prj/d.lst | 5 ----- bean/prj/makefile.mk | 40 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 14 deletions(-) create mode 100644 bean/prj/makefile.mk (limited to 'bean/prj') diff --git a/bean/prj/build.lst b/bean/prj/build.lst index 91d443344555..94ee4aae60ac 100644 --- a/bean/prj/build.lst +++ b/bean/prj/build.lst @@ -1,10 +1,2 @@ ob bean : javaunohelper jurt ridljar unoil offapi udkapi NULL -ob bean\com\sun\star\comp\beans nmake - all ob_beanjava NULL -ob bean\com\sun\star\beans nmake - all ob_legacybeanjava ob_beanjava NULL -ob bean\native\win32 nmake - n ob_beanwin32 NULL -ob bean\native\unix nmake - u ob_beanunix NULL -ob bean\util nmake - all ob_util ob_beanjava ob_legacybeanjava ob_beanwin32.n ob_beanunix.u NULL - -# complex tests compileable but fail at runtime -# ob bean\qa\complex\bean nmake - all ob_qa_complex ob_util NULL - +ob bean\prj nmake - all ob_prj NULL diff --git a/bean/prj/d.lst b/bean/prj/d.lst index f3154b68b17c..e69de29bb2d1 100644 --- a/bean/prj/d.lst +++ b/bean/prj/d.lst @@ -1,5 +0,0 @@ -..\%__SRC%\class\officebean.jar %_DEST%\bin\officebean.jar - -..\%__SRC%\bin\officebean.dll %_DEST%\bin\officebean.dll -..\%__SRC%\lib\libofficebean.so %_DEST%\lib\libofficebean.so -..\%__SRC%\lib\*officebean.dylib %_DEST%\lib\*officebean.dylib diff --git a/bean/prj/makefile.mk b/bean/prj/makefile.mk new file mode 100644 index 000000000000..85b25665cc83 --- /dev/null +++ b/bean/prj/makefile.mk @@ -0,0 +1,40 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +PRJ=.. +TARGET=prj + +.INCLUDE : settings.mk + +.IF "$(VERBOSE)"!="" +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF + +all: + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog -- cgit labora/cp-4.2'>distro/collabora/cp-4.2 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-11-19 14:14:50 +0100
committerStephan Bergmann <sbergman@redhat.com>2012-11-19 14:17:33 +0100
commit6f9c3bc8edc93be07273d9de13dda19ea6c1da4a (patch)
tree339997374cef7fc5a77c152e1e35caa2167541a3 /desktop
parentaafe2fcbcb754b2fff8d7c3bf1f61781df259b67 (diff)
fdo#57224: Preserve disabled-state across reinstallDeployedExtensions
Change-Id: I8d65b76fd93b63b51db88b7b09902ba64732dd97