You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2012/11/14 23:45:56 UTC
svn commit: r1409491 - in /incubator/ooo/branches/gbuild/main: ./
postprocess/packcomponents/ starmath/ starmath/prj/ starmath/source/
Author: arist
Date: Wed Nov 14 22:45:53 2012
New Revision: 1409491
URL: http://svn.apache.org/viewvc?rev=1409491&view=rev
Log:
gnumake4_008_c78ac9eacee5.patch
# HG changeset patch
# User mba
# Date 1298483059 -3600
# Node ID c78ac9eacee5bfa9c5c317d638aec9a26a7e4f20
# Parent 3edfabbd146e6687217f83b9ffc28b56ca89364b
CWS gnumake4: convert starmath to new build system
Added:
incubator/ooo/branches/gbuild/main/starmath/AllLangResTarget_sm.mk
incubator/ooo/branches/gbuild/main/starmath/JunitTest_sm_unoapi.mk
incubator/ooo/branches/gbuild/main/starmath/Library_sm.mk
incubator/ooo/branches/gbuild/main/starmath/Library_smd.mk
incubator/ooo/branches/gbuild/main/starmath/Makefile
incubator/ooo/branches/gbuild/main/starmath/Module_starmath.mk
incubator/ooo/branches/gbuild/main/starmath/Package_uiconfig.mk
incubator/ooo/branches/gbuild/main/starmath/prj/makefile.mk
Modified:
incubator/ooo/branches/gbuild/main/Module_ooo.mk
incubator/ooo/branches/gbuild/main/Repository.mk
incubator/ooo/branches/gbuild/main/postprocess/packcomponents/makefile.mk
incubator/ooo/branches/gbuild/main/starmath/prj/build.lst
incubator/ooo/branches/gbuild/main/starmath/prj/d.lst
incubator/ooo/branches/gbuild/main/starmath/source/detreg.cxx
incubator/ooo/branches/gbuild/main/starmath/source/eqnolefilehdr.hxx
incubator/ooo/branches/gbuild/main/starmath/source/register.cxx
incubator/ooo/branches/gbuild/main/starmath/source/smdetect.cxx
Modified: incubator/ooo/branches/gbuild/main/Module_ooo.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/Module_ooo.mk?rev=1409491&r1=1409490&r2=1409491&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/Module_ooo.mk (original)
+++ incubator/ooo/branches/gbuild/main/Module_ooo.mk Wed Nov 14 22:45:53 2012
@@ -35,6 +35,7 @@ $(eval $(call gb_Module_add_moduledirs,o
padmin \
sfx2 \
sot \
+ starmath \
svgio \
svl \
svtools \
Modified: incubator/ooo/branches/gbuild/main/Repository.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/Repository.mk?rev=1409491&r1=1409490&r2=1409491&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/Repository.mk (original)
+++ incubator/ooo/branches/gbuild/main/Repository.mk Wed Nov 14 22:45:53 2012
@@ -64,6 +64,8 @@ $(eval $(call gb_Helper_register_librari
sax \
sb \
sfx \
+ sm \
+ smd \
sot \
spa \
svl \
Modified: incubator/ooo/branches/gbuild/main/postprocess/packcomponents/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/postprocess/packcomponents/makefile.mk?rev=1409491&r1=1409490&r2=1409491&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/postprocess/packcomponents/makefile.mk (original)
+++ incubator/ooo/branches/gbuild/main/postprocess/packcomponents/makefile.mk Wed Nov 14 22:45:53 2012
@@ -61,6 +61,8 @@ my_components = \
component/sfx2/util/sfx \
component/sot/util/sot \
component/svgio/svgio \
+ component/starmath/util/sm \
+ component/starmath/util/smd \
component/svl/source/fsstor/fsstorage \
component/svl/source/passwordcontainer/passwordcontainer \
component/svl/util/svl \
@@ -143,8 +145,6 @@ my_components = \
sdd \
simplecanvas \
slideshow \
- sm \
- smd \
spl \
srtrs1 \
stringresource \
Added: incubator/ooo/branches/gbuild/main/starmath/AllLangResTarget_sm.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/starmath/AllLangResTarget_sm.mk?rev=1409491&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/starmath/AllLangResTarget_sm.mk (added)
+++ incubator/ooo/branches/gbuild/main/starmath/AllLangResTarget_sm.mk Wed Nov 14 22:45:53 2012
@@ -0,0 +1,48 @@
+#*************************************************************************
+#
+# 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_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 \
+))
Added: incubator/ooo/branches/gbuild/main/starmath/JunitTest_sm_unoapi.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/starmath/JunitTest_sm_unoapi.mk?rev=1409491&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/starmath/JunitTest_sm_unoapi.mk (added)
+++ incubator/ooo/branches/gbuild/main/starmath/JunitTest_sm_unoapi.mk Wed Nov 14 22:45:53 2012
@@ -0,0 +1,52 @@
+#*************************************************************************
+#
+# 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_add_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,sw_unoapi,\
+ org.openoffice.sw.qa.unoapi.Test \
+))
+
+# vim: set noet sw=4 ts=4:
Added: incubator/ooo/branches/gbuild/main/starmath/Library_sm.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/starmath/Library_sm.mk?rev=1409491&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/starmath/Library_sm.mk (added)
+++ incubator/ooo/branches/gbuild/main/starmath/Library_sm.mk Wed Nov 14 22:45:53 2012
@@ -0,0 +1,112 @@
+#*************************************************************************
+#
+# 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,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_add_api,sm,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_set_include,sm,\
+ -I$(SRCDIR)/starmath/inc/pch \
+ -I$(SRCDIR)/starmath/inc \
+ -I$(WORKDIR)/SdiTarget/starmath/sdi \
+ $$(INCLUDE) \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_set_defs,sm,\
+ $$(DEFS) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,sm,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ editeng \
+ i18npaper \
+ sal \
+ sfx \
+ sot \
+ stl \
+ 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/cfgitem \
+ starmath/source/config \
+ 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 \
+))
+
+$(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:
Added: incubator/ooo/branches/gbuild/main/starmath/Library_smd.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/starmath/Library_smd.mk?rev=1409491&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/starmath/Library_smd.mk (added)
+++ incubator/ooo/branches/gbuild/main/starmath/Library_smd.mk Wed Nov 14 22:45:53 2012
@@ -0,0 +1,69 @@
+#*************************************************************************
+#
+# 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_add_precompiled_header,sm,$(SRCDIR)/starmath/inc/pch/precompiled_starmath))
+
+$(eval $(call gb_Library_set_componentfile,smd,starmath/util/smd))
+
+$(eval $(call gb_Library_add_api,smd,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_set_include,smd,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/starmath/inc \
+ -I$(SRCDIR)/starmath/inc/pch \
+))
+
+$(eval $(call gb_Library_set_defs,smd,\
+ $$(DEFS) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,smd,\
+ cppu \
+ cppuhelper \
+ sal \
+ sfx \
+ sm \
+ sot \
+ svl \
+ svt \
+ tl \
+ ucbhelper \
+ vcl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,smd,\
+ starmath/source/detreg \
+ starmath/source/smdetect \
+))
+
+# vim: set noet sw=4 ts=4:
Added: incubator/ooo/branches/gbuild/main/starmath/Makefile
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/starmath/Makefile?rev=1409491&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/starmath/Makefile (added)
+++ incubator/ooo/branches/gbuild/main/starmath/Makefile Wed Nov 14 22:45:53 2012
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
Added: incubator/ooo/branches/gbuild/main/starmath/Module_starmath.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/starmath/Module_starmath.mk?rev=1409491&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/starmath/Module_starmath.mk (added)
+++ incubator/ooo/branches/gbuild/main/starmath/Module_starmath.mk Wed Nov 14 22:45:53 2012
@@ -0,0 +1,41 @@
+#*************************************************************************
+#
+# 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 \
+))
+
+$(eval $(call gb_Module_add_subsequentcheck_targets,starmath,\
+ JunitTest_sm_unoapi \
+))
+
+# vim: set noet ts=4 sw=4:
Added: incubator/ooo/branches/gbuild/main/starmath/Package_uiconfig.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/starmath/Package_uiconfig.mk?rev=1409491&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/starmath/Package_uiconfig.mk (added)
+++ incubator/ooo/branches/gbuild/main/starmath/Package_uiconfig.mk Wed Nov 14 22:45:53 2012
@@ -0,0 +1,33 @@
+#*************************************************************************
+#
+# 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))
Modified: incubator/ooo/branches/gbuild/main/starmath/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/starmath/prj/build.lst?rev=1409491&r1=1409490&r2=1409491&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/starmath/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/starmath/prj/build.lst Wed Nov 14 22:45:53 2012
@@ -1,9 +1,2 @@
sm starmath : LIBXSLT:libxslt L10N:l10n svx NULL
-sm starmath usr1 - all sm_mkout NULL
-sm starmath\inc nmake - all sm_inc NULL
-sm starmath\prj get - all sm_prj NULL
-sm starmath\res get - all sm_res NULL
-sm starmath\sdi nmake - all sm_sdi NULL
-sm starmath\source nmake - all sm_sorce sm_sdi sm_inc NULL
-sm starmath\util nmake - all sm_util sm_sorce NULL
-sm starmath\qa\unoapi nmake - all sm_qa_unoapi NULL
+sm starmath\prj nmake - all sm_prj NULL
Modified: incubator/ooo/branches/gbuild/main/starmath/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/starmath/prj/d.lst?rev=1409491&r1=1409490&r2=1409491&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/starmath/prj/d.lst (original)
+++ incubator/ooo/branches/gbuild/main/starmath/prj/d.lst Wed Nov 14 22:45:53 2012
@@ -1,23 +0,0 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
-mkdir: %_DEST%\xml%_EXT%\uiconfig
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\smath
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\smath\menubar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\smath\toolbar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\smath\statusbar
-
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.*
-..\%__SRC%\misc\*.map %_DEST%\bin%_EXT%\*.map
-..\xml\*.xml %_DEST%\xml%_EXT%\*.xml
-..\%__SRC%\bin\sm?????.dll %_DEST%\bin%_EXT%\sm?????.dll
-..\%__SRC%\bin\smd?????.dll %_DEST%\bin%_EXT%\smd?????.dll
-..\%__SRC%\bin\sm*.res %_DEST%\bin%_EXT%\sm*.res
-..\%__SRC%\bin\sm?????.sym %_DEST%\bin%_EXT%\sm?????.sym
-mkdir: %_DEST%\inc%_EXT%\starmath
-
-..\uiconfig\smath\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\smath\menubar\*.xml
-..\uiconfig\smath\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\smath\toolbar\*.xml
-..\uiconfig\smath\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\smath\statusbar\*.xml
-..\%__SRC%\misc\sm.component %_DEST%\xml%_EXT%\sm.component
-..\%__SRC%\misc\smd.component %_DEST%\xml%_EXT%\smd.component
Added: incubator/ooo/branches/gbuild/main/starmath/prj/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/starmath/prj/makefile.mk?rev=1409491&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/starmath/prj/makefile.mk (added)
+++ incubator/ooo/branches/gbuild/main/starmath/prj/makefile.mk Wed Nov 14 22:45:53 2012
@@ -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) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
Modified: incubator/ooo/branches/gbuild/main/starmath/source/detreg.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/starmath/source/detreg.cxx?rev=1409491&r1=1409490&r2=1409491&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/starmath/source/detreg.cxx (original)
+++ incubator/ooo/branches/gbuild/main/starmath/source/detreg.cxx Wed Nov 14 22:45:53 2012
@@ -37,14 +37,14 @@ using namespace ::com::sun::star::lang;
extern "C" {
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char** ppEnvironmentTypeName,
uno_Environment** /*ppEnvironment*/ )
{
*ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
}
-void* SAL_CALL component_getFactory( const sal_Char* pImplementationName,
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName,
void* pServiceManager,
void* /*pRegistryKey*/ )
{
Modified: incubator/ooo/branches/gbuild/main/starmath/source/eqnolefilehdr.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/starmath/source/eqnolefilehdr.hxx?rev=1409491&r1=1409490&r2=1409491&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/starmath/source/eqnolefilehdr.hxx (original)
+++ incubator/ooo/branches/gbuild/main/starmath/source/eqnolefilehdr.hxx Wed Nov 14 22:45:53 2012
@@ -53,7 +53,7 @@ public:
void Write(SvStorageStream *pS);
};
-sal_Bool GetMathTypeVersion( SotStorage* pStor, sal_uInt8 &nVersion );
+SAL_DLLPUBLIC_EXPORT sal_Bool GetMathTypeVersion( SotStorage* pStor, sal_uInt8 &nVersion );
#endif
Modified: incubator/ooo/branches/gbuild/main/starmath/source/register.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/starmath/source/register.cxx?rev=1409491&r1=1409490&r2=1409491&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/starmath/source/register.cxx (original)
+++ incubator/ooo/branches/gbuild/main/starmath/source/register.cxx Wed Nov 14 22:45:53 2012
@@ -107,14 +107,14 @@ extern Reference< XInterface > SAL_CALL
extern "C" {
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char** ppEnvironmentTypeName,
uno_Environment** /*ppEnvironment*/ )
{
*ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
}
-void* SAL_CALL component_getFactory( const sal_Char* pImplementationName,
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName,
void* pServiceManager,
void* /*pRegistryKey*/ )
{
Modified: incubator/ooo/branches/gbuild/main/starmath/source/smdetect.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/starmath/source/smdetect.cxx?rev=1409491&r1=1409490&r2=1409491&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/starmath/source/smdetect.cxx (original)
+++ incubator/ooo/branches/gbuild/main/starmath/source/smdetect.cxx Wed Nov 14 22:45:53 2012
@@ -25,17 +25,13 @@
#include "precompiled_starmath.hxx"
#include "smdetect.hxx"
-
-//#include <framework/interaction.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/awt/XWindow.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX
#include <comphelper/processfactory.hxx>
-#endif
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/task/XInteractionHandler.hpp>
@@ -45,12 +41,8 @@
#include <com/sun/star/ucb/XContent.hpp>
#include <com/sun/star/packages/zip/ZipIOException.hpp>
#include <framework/interaction.hxx>
-
-#ifndef _TOOLKIT_UNOHLP_HXX
#include <toolkit/helper/vclunohelper.hxx>
-#endif
#include <ucbhelper/simpleinteractionrequest.hxx>
-
#include <rtl/ustring.h>
#include <rtl/logfile.hxx>
#include <svl/itemset.hxx>
@@ -72,8 +64,8 @@
#include <sfx2/brokenpackageint.hxx>
#include "document.hxx"
-#include "eqnolefilehdr.hxx"
+extern sal_Bool GetMathTypeVersion( SotStorage* pStor, sal_uInt8 &nVersion );
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;