[Libreoffice-commits] .: Branch 'feature/gnumake2' - 3 commits - chart2/source sc/Library_scd.mk sc/Library_scfilt.mk sc/Module_sc.mk sc/prj sc/source sc/util
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Mon Jan 10 17:01:25 PST 2011
chart2/source/controller/makefile.mk | 3
sc/Library_scd.mk | 55 +++++++++++
sc/Library_scfilt.mk | 166 +++++++++++++++++++++++++++++++++++
sc/Module_sc.mk | 2
sc/prj/gbuild.lst | 2
sc/prj/makefile.mk | 40 ++++++++
sc/source/filter/ftools/ftools.cxx | 2
sc/util/makefile.mk | 3
8 files changed, 268 insertions(+), 5 deletions(-)
New commits:
commit 2fd48a97bd93674ce80b8f20a11e356a9e000051
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Mon Jan 10 18:53:09 2011 -0600
debug the gnumake sc build. build, install and run well on Linux
diff --git a/sc/Library_scd.mk b/sc/Library_scd.mk
new file mode 100644
index 0000000..9da5aaf
--- /dev/null
+++ b/sc/Library_scd.mk
@@ -0,0 +1,55 @@
+# 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 at 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,scd))
+
+$(eval $(call gb_Library_add_precompiled_header,scd,$(SRCDIR)/sc/inc/pch/precompiled_sc))
+
+$(eval $(call gb_Library_set_include,scd,\
+ -I$(SRCDIR)/sc/inc/pch \
+ -I$(SRCDIR)/sc/inc \
+ -I$(WORKDIR)/Misc/sc/ \
+ $$(INCLUDE) \
+ -I$(OUTDIR)/inc/offuh \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_set_defs,scd,\
+ $$(DEFS) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,scd,\
+ cppu \
+ cppuhelper \
+ sal \
+ sfx \
+ sot \
+ svl \
+ svt \
+ tl \
+ ucbhelper \
+ vcl \
+))
+
+$(eval $(call gb_Library_add_exception_objects,scd,\
+ sc/source/ui/unoobj/detreg \
+ sc/source/ui/unoobj/scdetect \
+))
diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk
new file mode 100644
index 0000000..ad9df6e
--- /dev/null
+++ b/sc/Library_scfilt.mk
@@ -0,0 +1,166 @@
+# 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 at 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,scfilt))
+
+$(eval $(call gb_Library_add_precompiled_header,sc,$(SRCDIR)/sc/source/filter/inc/filt_pch))
+
+$(eval $(call gb_Library_set_include,scfilt,\
+ -I$(SRCDIR)/sc/source/core/inc \
+ -I$(SRCDIR)/sc/source/filter/inc \
+ -I$(SRCDIR)/sc/source/ui/inc \
+ -I$(SRCDIR)/sc/inc \
+ -I$(SRCDIR)/sc/inc/pch \
+ -I$(WORKDIR)/Misc/sc/ \
+ $$(INCLUDE) \
+ -I$(OUTDIR)/inc/offuh \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_set_defs,scfilt,\
+ $$(DEFS) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,scfilt,\
+ basegfx \
+ comphelper \
+ cppu \
+ cppuhelper \
+ drawinglayer \
+ editeng \
+ for \
+ msfilter \
+ oox \
+ sal \
+ sax \
+ sb \
+ sc \
+ sfx \
+ sot \
+ svl \
+ svt \
+ svx \
+ svxcore \
+ tk \
+ tl \
+ utl \
+ vcl \
+))
+
+$(eval $(call gb_Library_add_exception_objects,scfilt,\
+ sc/source/filter/dif/difexp \
+ sc/source/filter/dif/difimp \
+ sc/source/filter/excel/colrowst \
+ sc/source/filter/excel/excdoc \
+ sc/source/filter/excel/excel \
+ sc/source/filter/excel/excform \
+ sc/source/filter/excel/excform8 \
+ sc/source/filter/excel/excimp8 \
+ sc/source/filter/excel/excrecds \
+ sc/source/filter/excel/exctools \
+ sc/source/filter/excel/expop2 \
+ sc/source/filter/excel/fontbuff \
+ sc/source/filter/excel/frmbase \
+ sc/source/filter/excel/impop \
+ sc/source/filter/excel/namebuff \
+ sc/source/filter/excel/read \
+ sc/source/filter/excel/tokstack \
+ sc/source/filter/excel/xechart \
+ sc/source/filter/excel/xecontent \
+ sc/source/filter/excel/xeescher \
+ sc/source/filter/excel/xeformula \
+ sc/source/filter/excel/xehelper \
+ sc/source/filter/excel/xelink \
+ sc/source/filter/excel/xename \
+ sc/source/filter/excel/xepage \
+ sc/source/filter/excel/xepivot \
+ sc/source/filter/excel/xerecord \
+ sc/source/filter/excel/xeroot \
+ sc/source/filter/excel/xestream \
+ sc/source/filter/excel/xestring \
+ sc/source/filter/excel/xestyle \
+ sc/source/filter/excel/xetable \
+ sc/source/filter/excel/xeview \
+ sc/source/filter/excel/xichart \
+ sc/source/filter/excel/xicontent \
+ sc/source/filter/excel/xiescher \
+ sc/source/filter/excel/xiformula \
+ sc/source/filter/excel/xihelper \
+ sc/source/filter/excel/xilink \
+ sc/source/filter/excel/xiname \
+ sc/source/filter/excel/xipage \
+ sc/source/filter/excel/xipivot \
+ sc/source/filter/excel/xiroot \
+ sc/source/filter/excel/xistream \
+ sc/source/filter/excel/xistring \
+ sc/source/filter/excel/xistyle \
+ sc/source/filter/excel/xiview \
+ sc/source/filter/excel/xladdress \
+ sc/source/filter/excel/xlchart \
+ sc/source/filter/excel/xlescher \
+ sc/source/filter/excel/xlformula \
+ sc/source/filter/excel/xlpage \
+ sc/source/filter/excel/xlpivot \
+ sc/source/filter/excel/xlroot \
+ sc/source/filter/excel/xlstyle \
+ sc/source/filter/excel/xltoolbar \
+ sc/source/filter/excel/xltools \
+ sc/source/filter/excel/xltracer \
+ sc/source/filter/excel/xlview \
+ sc/source/filter/ftools/fapihelper \
+ sc/source/filter/ftools/fprogressbar \
+ sc/source/filter/ftools/ftools \
+ sc/source/filter/html/htmlexp \
+ sc/source/filter/html/htmlexp2 \
+ sc/source/filter/html/htmlimp \
+ sc/source/filter/html/htmlpars \
+ sc/source/filter/lotus/expop \
+ sc/source/filter/lotus/export \
+ sc/source/filter/lotus/filter \
+ sc/source/filter/lotus/lotattr \
+ sc/source/filter/lotus/lotform \
+ sc/source/filter/lotus/lotimpop \
+ sc/source/filter/lotus/lotread \
+ sc/source/filter/lotus/lotus \
+ sc/source/filter/lotus/memory \
+ sc/source/filter/lotus/op \
+ sc/source/filter/lotus/tool \
+ sc/source/filter/qpro/biff \
+ sc/source/filter/qpro/qpro \
+ sc/source/filter/qpro/qproform \
+ sc/source/filter/qpro/qprostyle \
+ sc/source/filter/rtf/eeimpars \
+ sc/source/filter/rtf/expbase \
+ sc/source/filter/rtf/rtfexp \
+ sc/source/filter/rtf/rtfimp \
+ sc/source/filter/rtf/rtfparse \
+ sc/source/filter/starcalc/scflt \
+ sc/source/filter/starcalc/scfobj \
+ sc/source/filter/xcl97/XclExpChangeTrack \
+ sc/source/filter/xcl97/XclImpChangeTrack \
+ sc/source/filter/xcl97/xcl97esc \
+ sc/source/filter/xcl97/xcl97rec \
+))
+
+$(eval $(call gb_Library_add_cxxobjects,scfilt,\
+ sc/source/filter/lotus/optab \
+))
+
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 3d451a1..6f9117b 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -25,6 +25,8 @@ $(eval $(call gb_Module_Module,sc))
$(eval $(call gb_Module_add_targets,sc,\
AllLangResTarget_sc \
Library_sc \
+ Library_scd \
+ Library_scfilt \
Library_scui \
Library_vbaobj \
Package_uiconfig \
diff --git a/sc/source/filter/ftools/ftools.cxx b/sc/source/filter/ftools/ftools.cxx
index 772f386..08ceb30 100644
--- a/sc/source/filter/ftools/ftools.cxx
+++ b/sc/source/filter/ftools/ftools.cxx
@@ -398,7 +398,7 @@ ScFormatFilterPluginImpl::ScFormatFilterPluginImpl()
{
}
-ScFormatFilterPlugin * SAL_CALL ScFilterCreate(void)
+SAL_DLLPUBLIC_EXPORT ScFormatFilterPlugin * SAL_CALL ScFilterCreate(void)
{
return new ScFormatFilterPluginImpl();
}
diff --git a/sc/util/makefile.mk b/sc/util/makefile.mk
index 5b9c165..f49ef37 100644
--- a/sc/util/makefile.mk
+++ b/sc/util/makefile.mk
@@ -50,8 +50,7 @@ RESLIB1LIST=\
$(SRS)$/formdlgs.srs \
$(SRS)$/pagedlg.srs \
$(SRS)$/navipi.srs \
- $(SRS)$/cctrl.srs \
- $(SOLARCOMMONRESDIR)$/sfx.srs
+ $(SRS)$/cctrl.srs
RESLIB1NAME=sc
RESLIB1IMAGES=\
commit 1753a5984c19690ed92e64230af97cbe5c73e1fd
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Mon Jan 10 01:26:52 2011 -0600
fix some srs dependencies
diff --git a/chart2/source/controller/makefile.mk b/chart2/source/controller/makefile.mk
index b8a2561..2895d85 100644
--- a/chart2/source/controller/makefile.mk
+++ b/chart2/source/controller/makefile.mk
@@ -112,8 +112,7 @@ DEF1NAME= $(SHL1TARGET)
# sfx.srs is needed for the strings for UNDO and REDO in the UndoCommandDispatch
RESLIB1LIST=\
$(SRS)$/chcdialogs.srs \
- $(SRS)$/chcmenus.srs \
- $(SOLARCOMMONRESDIR)$/sfx.srs
+ $(SRS)$/chcmenus.srs
RESLIB1NAME= $(TARGET)
RESLIB1IMAGES=$(PRJ)$/res
commit 4c93d475d18e4e94922f92a2004edc3dad3df6ee
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Mon Jan 10 01:07:05 2011 -0600
support build.pl with gmake
diff --git a/sc/prj/gbuild.lst b/sc/prj/gbuild.lst
new file mode 100644
index 0000000..6a63701
--- /dev/null
+++ b/sc/prj/gbuild.lst
@@ -0,0 +1,2 @@
+sc sc : filter l10n vbahelper oovbaapi svx uui stoc BOOST:boost formula MDDS:mdds oox NULL
+sc sc\prj nmake - all sc_prj NULL
diff --git a/sc/prj/makefile.mk b/sc/prj/makefile.mk
new file mode 100644
index 0000000..c677d2b
--- /dev/null
+++ b/sc/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
+# <http://www.openoffice.org/license.html>
+# 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$(MAXPROCESS) $(gb_MAKETARGET)
More information about the Libreoffice-commits
mailing list