[Libreoffice-commits] .: Branch 'feature/gnumake2.1' - 2 commits - starmath/AllLangResTarget_sm.mk starmath/Library_smd.mk starmath/Library_sm.mk starmath/Makefile starmath/Module_sm.mk starmath/Package_uiconfig.mk starmath/prj starmath/source
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Fri Jan 14 06:05:01 PST 2011
starmath/AllLangResTarget_sm.mk | 44 +++++++++++
starmath/Library_sm.mk | 109 +++++++++++++++++++++++++++
starmath/Library_smd.mk | 56 ++++++++++++++
starmath/Makefile | 33 ++++++++
starmath/Module_sm.mk | 31 +++++++
starmath/Package_uiconfig.mk | 28 +++++++
starmath/prj/gbuild.lst | 3
starmath/source/makefile.mk | 3
starmath/source/menu_tmpl.src | 160 ----------------------------------------
starmath/source/smres.src | 2
10 files changed, 304 insertions(+), 165 deletions(-)
New commits:
commit d02ac8c9871b2324b93c6ca58cd96ffda8e0cc20
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Fri Jan 14 08:02:02 2011 -0600
starmath gmake convertion
diff --git a/starmath/AllLangResTarget_sm.mk b/starmath/AllLangResTarget_sm.mk
new file mode 100644
index 0000000..75f8b1d
--- /dev/null
+++ b/starmath/AllLangResTarget_sm.mk
@@ -0,0 +1,44 @@
+# 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_AllLangResTarget_AllLangResTarget,sm))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,sm,starmath))
+
+$(eval $(call gb_AllLangResTarget_add_srs,sm,\
+ starmath/res \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,starmath/res))
+
+$(eval $(call gb_SrsTarget_set_include,starmath/res,\
+ $$(INCLUDE) \
+ -I$(OUTDIR)/inc \
+ -I$(WORKDIR)/inc/starmath \
+ -I$(SRCDIR)/starmath/inc \
+))
+
+$(eval $(call gb_SrsTarget_add_files,starmath/res,\
+ starmath/source/smres.src \
+ starmath/source/commands.src \
+ starmath/source/symbol.src \
+))
diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk
new file mode 100644
index 0000000..18d2f98
--- /dev/null
+++ b/starmath/Library_sm.mk
@@ -0,0 +1,109 @@
+# 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,sm))
+
+$(eval $(call gb_Library_add_sdi_headers,sm,starmath/sdi/smslots))
+
+$(eval $(call gb_Library_add_precompiled_header,starmath,$(SRCDIR)/sc/inc/pch/precompiled_sc))
+
+$(eval $(call gb_Library_set_include,sm,\
+ -I$(SRCDIR)/starmath/inc/pch \
+ -I$(SRCDIR)/starmath/inc \
+ -I$(WORKDIR)/SdiTarget/starmath/sdi \
+ -I$(WORKDIR)/Misc/starmath/ \
+ $$(INCLUDE) \
+ -I$(OUTDIR)/inc/offuh \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_set_defs,sm,\
+ $$(DEFS) \
+ -DSC_DLLIMPLEMENTATION \
+ -DSC_INFO_OSVERSION=\"$(OS)\" \
+))
+
+$(eval $(call gb_Library_add_linked_libs,sm,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ editeng \
+ i18npaper \
+ sal \
+ sfx \
+ sot \
+ svl \
+ svt \
+ svx \
+ svxcore \
+ tk \
+ tl \
+ utl \
+ vcl \
+ ucbhelper \
+ xo \
+))
+
+$(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/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 \
+ starmath/source/visitors \
+))
+
+
+$(eval $(call gb_Library_add_exception_object,sm,\
+ starmath/source/smdll \
+))
+
+$(eval $(call gb_SdiTarget_SdiTarget,starmath/sdi/scslots,starmath/sdi/smath))
+
+$(eval $(call gb_SdiTarget_set_include,starmath/sdi/smslots,\
+ -I$(SRCDIR)/starmath/inc \
+ -I$(SRCDIR)/starmath/sdi \
+ $$(INCLUDE) \
+ -I$(OUTDIR)/inc \
+))
diff --git a/starmath/Library_smd.mk b/starmath/Library_smd.mk
new file mode 100644
index 0000000..d192825
--- /dev/null
+++ b/starmath/Library_smd.mk
@@ -0,0 +1,56 @@
+# 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,smd))
+
+$(eval $(call gb_Library_add_precompiled_header,smd,$(SRCDIR)/starmath/inc/pch/precompiled_starmath))
+
+$(eval $(call gb_Library_set_include,smd,\
+ -I$(SRCDIR)/starmath/inc/pch \
+ -I$(SRCDIR)/starmath/inc \
+ -I$(WORKDIR)/Misc/sm/ \
+ $$(INCLUDE) \
+ -I$(OUTDIR)/inc/offuh \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_set_defs,smd,\
+ $$(DEFS) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,smd,\
+ cppu \
+ cppuhelper \
+ sal \
+ sfx \
+ sot \
+ svl \
+ svt \
+ tl \
+ ucbhelper \
+ vcl \
+))
+
+$(eval $(call gb_Library_add_exception_objects,smd,\
+ starmath/source/detreg \
+ starmath/source/smdetect \
+ starmath/source/eqnolefilehdr \
+))
diff --git a/starmath/Makefile b/starmath/Makefile
new file mode 100644
index 0000000..de837be
--- /dev/null
+++ b/starmath/Makefile
@@ -0,0 +1,33 @@
+#
+# 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.
+
+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:
diff --git a/starmath/Module_sm.mk b/starmath/Module_sm.mk
new file mode 100644
index 0000000..2452ddb
--- /dev/null
+++ b/starmath/Module_sm.mk
@@ -0,0 +1,31 @@
+#
+# 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_Module_Module,sm))
+
+$(eval $(call gb_Module_add_targets,sm,\
+ AllLangResTarget_sm \
+ Library_sm \
+ Library_smd \
+ Package_uiconfig \
+))
+
diff --git a/starmath/Package_uiconfig.mk b/starmath/Package_uiconfig.mk
new file mode 100644
index 0000000..e312bf4
--- /dev/null
+++ b/starmath/Package_uiconfig.mk
@@ -0,0 +1,28 @@
+# 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_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/toolbar.xml,smath/toolbar/toolbar.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/fullscreenbar.xml,smath/toolbar/fullscreenbar.xml))
+
diff --git a/starmath/prj/gbuild.lst b/starmath/prj/gbuild.lst
new file mode 100644
index 0000000..f2bae57
--- /dev/null
+++ b/starmath/prj/gbuild.lst
@@ -0,0 +1,3 @@
+sm starmath : l10n svx dtrans NULL
+sm starmath\prj nmake - all sm_prj NULL
+
commit e5f616b7ee933b229f5d1fb98d5032fda2b83b22
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Fri Jan 14 08:01:20 2011 -0600
remove obsolete _tmpl construct
diff --git a/starmath/source/makefile.mk b/starmath/source/makefile.mk
index b211903..1289cc4 100644
--- a/starmath/source/makefile.mk
+++ b/starmath/source/makefile.mk
@@ -97,9 +97,6 @@ LIB1OBJFILES = \
# --- Targets -------------------------------------------------------
-LOCALIZE_ME = menu_tmpl.src
-
-
.INCLUDE : target.mk
$(INCCOM)$/dllname.hxx: makefile.mk
diff --git a/starmath/source/menu_tmpl.src b/starmath/source/menu_tmpl.src
deleted file mode 100644
index 70348c7..0000000
--- a/starmath/source/menu_tmpl.src
+++ /dev/null
@@ -1,160 +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.
- *
- ************************************************************************/
-
-
-#ifndef _SFX_HRC //autogen
-#include <sfx2/sfx.hrc>
-#endif
-#ifndef _GLOBLMN_HRC //autogen
-#include <svx/globlmn.hrc>
-#endif
-#ifndef _GLOBALACC_SRC //autogen
-#include <svx/globlac.hrc>
-#endif
-#ifndef _SVX_SVXIDS_HRC //autogen
-#include <svx/svxids.hrc>
-#endif
-
-#ifndef _STARMATH_HRC
-#include "starmath.hrc"
-#endif
-
-#ifndef MN_HELP
-#define MN_HELP
-#endif
-
-/////////////////////////////////////////////////////////////////
-
-/*
-
-The application menu bar resource has become obsolete. You can now find the menu bar definition at:
-<project>/smath/menubar/menubar.xml.
-
-*/
-
-/////////////////////////////////////////////////////////////////
-
-Accelerator RID_SMACCEL
-{
- ItemList =
- {
- AI_UNDO
- AI_REDO
- AcceleratorItem
- {
- Identifier = SID_SELECT ;
- Key = KeyCode
- {
- Code = KEY_A ;
- Modifier1 = TRUE ;
- };
- };
- AcceleratorItem
- {
- Identifier = SID_NEXTMARK ;
- Key = KeyCode
- {
- Code = KEY_F4 ;
- };
- };
- AcceleratorItem
- {
- Identifier = SID_PREVMARK ;
- Key = KeyCode
- {
- Code = KEY_F4 ;
- Shift = TRUE ;
- };
- };
- AcceleratorItem
- {
- Identifier = SID_NEXTERR ;
- Key = KeyCode
- {
- Code = KEY_F3 ;
- };
- };
- AcceleratorItem
- {
- Identifier = SID_PREVERR ;
- Key = KeyCode
- {
- Code = KEY_F3 ;
- Shift = TRUE ;
- };
- };
- AcceleratorItem
- {
- Identifier = SID_DRAW ;
- Key = KeyCode
- {
- Code = KEY_F9 ;
- };
- };
- };
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/starmath/source/smres.src b/starmath/source/smres.src
index 1fb5aea..0918684 100644
--- a/starmath/source/smres.src
+++ b/starmath/source/smres.src
@@ -3309,8 +3309,6 @@ String RID_ERR_RIGHTEXPECTED
Text [ en-US ] = "'RIGHT' expected" ;
};
-#include "menu.src"
-
ToolBox RID_MATH_TOOLBOX
{
HelpId = RID_MATH_TOOLBOX ;
More information about the Libreoffice-commits
mailing list