[Libreoffice-commits] .: starmath/prj starmath/sdi starmath/source starmath/util
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Sat Apr 23 19:14:52 PDT 2011
starmath/prj/build.lst | 9 ---
starmath/prj/d.lst | 23 -------
starmath/prj/gbuild.lst | 2
starmath/sdi/makefile.mk | 58 --------------------
starmath/source/makefile.mk | 113 ---------------------------------------
starmath/util/makefile.mk | 127 --------------------------------------------
6 files changed, 1 insertion(+), 331 deletions(-)
New commits:
commit 1cf1bb888246fa515c65876406f4937fecc1e206
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Apr 23 20:51:59 2011 -0500
toggle starmath to gbuild make by default
diff --git a/starmath/prj/build.lst b/starmath/prj/build.lst
index 4afbef9..da2383e 100644
--- a/starmath/prj/build.lst
+++ b/starmath/prj/build.lst
@@ -1,9 +1,2 @@
sm starmath : LIBXSLT:libxslt TRANSLATIONS:translations svx ure 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\cppunit nmake - u sm_qa_cppunit sm_util NULL
+sm starmath\prj nmake - all sm_prj NULL
diff --git a/starmath/prj/d.lst b/starmath/prj/d.lst
index 78bae57..e69de29 100644
--- a/starmath/prj/d.lst
+++ b/starmath/prj/d.lst
@@ -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
diff --git a/starmath/prj/gbuild.lst b/starmath/prj/gbuild.lst
deleted file mode 100644
index da2383e..0000000
--- a/starmath/prj/gbuild.lst
+++ /dev/null
@@ -1,2 +0,0 @@
-sm starmath : LIBXSLT:libxslt TRANSLATIONS:translations svx ure NULL
-sm starmath\prj nmake - all sm_prj NULL
diff --git a/starmath/sdi/makefile.mk b/starmath/sdi/makefile.mk
deleted file mode 100644
index a2d965b..0000000
--- a/starmath/sdi/makefile.mk
+++ /dev/null
@@ -1,58 +0,0 @@
-#*************************************************************************
-#
-# 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=..
-
-PRJNAME=starmath
-TARGET=smslots
-SDI1EXPORT=smath
-SVSDIINC=$(PRJ)$/inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.IF "$(L10N_framework)"==""
-# --- Files --------------------------------------------------------
-
-
-SDI1NAME=$(TARGET)
-
-SVSDI1DEPEND= \
- $(SOLARINCXDIR)$/sfx2/sfx.sdi \
- $(SOLARINCXDIR)$/sfx2/sfxitems.sdi \
- $(SOLARINCXDIR)$/svx/svx.sdi \
- $(SOLARINCXDIR)$/svx/svxitems.sdi \
- $(SOLARINCXDIR)$/svx/xoitems.sdi \
- smath.sdi \
- smslots.sdi \
- $(SVSDIINC)$/starmath.hrc
-
-# --- Targets -------------------------------------------------------
-.ENDIF
-
-.INCLUDE : target.mk
-
diff --git a/starmath/source/makefile.mk b/starmath/source/makefile.mk
deleted file mode 100755
index 520708b..0000000
--- a/starmath/source/makefile.mk
+++ /dev/null
@@ -1,113 +0,0 @@
-#*************************************************************************
-#
-# 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=..
-
-PRJNAME=starmath
-TARGET=starmath
-
-LIBTARGET=NO
-
-# --- Settings -----------------------------------------------------
-
-ENABLE_EXCEPTIONS=TRUE
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-SMDLL=TRUE
-
-SRS2NAME =smres
-SRC2FILES = smres.src \
- symbol.src \
- toolbox.src \
- commands.src
-
-SLO1FILES = \
- $(SLO)$/accessibility.obj \
- $(SLO)$/caret.obj \
- $(SLO)$/cursor.obj \
- $(SLO)$/edit.obj \
- $(SLO)$/eqnolefilehdr.obj \
- $(SLO)$/mathmlexport.obj \
- $(SLO)$/mathmlimport.obj \
- $(SLO)$/symbol.obj \
- $(SLO)$/types.obj \
- $(SLO)$/unodoc.obj \
- $(SLO)$/action.obj \
- $(SLO)$/cfgitem.obj \
- $(SLO)$/config.obj \
- $(SLO)$/dialog.obj \
- $(SLO)$/document.obj \
- $(SLO)$/format.obj \
- $(SLO)$/mathtype.obj \
- $(SLO)$/node.obj \
- $(SLO)$/parse.obj \
- $(SLO)$/register.obj \
- $(SLO)$/smdll.obj \
- $(SLO)$/toolbox.obj \
- $(SLO)$/typemap.obj \
- $(SLO)$/smmod.obj \
- $(SLO)$/utility.obj \
- $(SLO)$/rect.obj \
- $(SLO)$/unomodel.obj \
- $(SLO)$/view.obj \
- $(SLO)$/visitors.obj
-
-SLO2FILES = \
- $(SLO)$/register.obj \
- $(SLO)$/detreg.obj
-
-SLOFILES = \
- $(SLO)$/smdetect.obj \
- $(SLO1FILES) \
- $(SLO2FILES)
-
-LIB1TARGET = \
- $(SLB)$/$(TARGET).lib
-
-LIB1OBJFILES = \
- $(SLO1FILES)
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
-
-$(INCCOM)$/dllname.hxx: makefile.mk
-.IF "$(GUI)"=="UNX"
- $(RM) $@
- echo \#define DLL_NAME \"$(DLLPRE)sm$(DLLPOSTFIX)$(DLLPOST)\" >$@
-.ELSE
- echo $(EMQ)#define DLL_NAME $(EMQ)"$(DLLPRE)sm$(DLLPOSTFIX)$(DLLPOST)$(EMQ)" >$@
-.ENDIF
-
-$(SRS)$/smres.srs: $(SOLARINCDIR)$/svx$/globlmn.hrc
-
-
-$(SRS)$/$(SRS2NAME).srs : $(LOCALIZE_ME_DEST)
-
diff --git a/starmath/util/makefile.mk b/starmath/util/makefile.mk
deleted file mode 100644
index 09fedb5..0000000
--- a/starmath/util/makefile.mk
+++ /dev/null
@@ -1,127 +0,0 @@
-#*************************************************************************
-#
-# 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=..
-
-PRJNAME=starmath
-TARGET=smath3
-LIBTARGET=NO
-GEN_HID=TRUE
-GEN_HID_OTHER=TRUE
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-RESLIB1NAME=sm
-RESLIB1IMAGES=$(PRJ)$/res
-RESLIB1SRSFILES=\
- $(SRS)$/smres.srs
-
-SHL1TARGET= sm$(DLLPOSTFIX)
-SHL1IMPLIB= smimp
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-DEF1NAME= $(SHL1TARGET)
-
-SHL1STDLIBS= \
- $(EDITENGLIB) \
- $(SVXCORELIB) \
- $(SVXLIB) \
- $(SFX2LIB) \
- $(XMLOFFLIB) \
- $(SVTOOLLIB) \
- $(TKLIB) \
- $(VCLLIB) \
- $(SVLLIB) \
- $(I18NPAPERLIB) \
- $(SOTLIB) \
- $(UNOTOOLSLIB) \
- $(TOOLSLIB) \
- $(COMPHELPERLIB) \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(SALLIB)
-
-SHL2TARGET= smd$(DLLPOSTFIX)
-SHL2IMPLIB= smdimp
-SHL2VERSIONMAP=$(SOLARENV)/src/component.map
-SHL2DEF=$(MISC)$/$(SHL2TARGET).def
-DEF2NAME= $(SHL2TARGET)
-
-SHL2STDLIBS= \
- $(SFX2LIB) \
- $(SVTOOLLIB) \
- $(SVLLIB) \
- $(VCLLIB) \
- $(SOTLIB) \
- $(TOOLSLIB) \
- $(UCBHELPERLIB) \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(SALLIB)
-
-SHL2DEPN= makefile.mk
-SHL2VERSIONMAP=$(SOLARENV)/src/component.map
-SHL2OBJS= $(SLO)$/smdetect.obj \
- $(SLO)$/detreg.obj \
- $(SLO)$/eqnolefilehdr.obj
-
-SHL1DEPN= makefile.mk
-SHL1LIBS= $(SLB)$/starmath.lib
-
-.IF "$(GUI)" != "UNX"
-.IF "$(GUI)$(COM)" != "WNTGCC"
-SHL1OBJS= $(SLO)$/smdll.obj
-.ENDIF
-.ENDIF # ! UNX
-
-.IF "$(GUI)" == "WNT"
-SHL1RES= $(RCTARGET)
-.ENDIF # WNT
-
-# --- Targets -------------------------------------------------------------
-
-.INCLUDE : target.mk
-
-
-ALLTAR : $(MISC)/sm.component $(MISC)/smd.component
-
-$(MISC)/sm.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- sm.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt sm.component
-
-$(MISC)/smd.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- smd.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt smd.component
More information about the Libreoffice-commits
mailing list