[Libreoffice-commits] .: animations/Library_animcore.mk animations/Makefile animations/Module_animations.mk animations/Package_inc.mk animations/Package_xml.mk animations/prj animations/source
Matus Kukan
mkukan at kemper.freedesktop.org
Wed Jul 27 04:32:54 PDT 2011
animations/Library_animcore.mk | 57 +++++++++++++++++++++++++
animations/Makefile | 38 ++++++++++++++++
animations/Module_animations.mk | 36 ++++++++++++++++
animations/Package_inc.mk | 32 ++++++++++++++
animations/Package_xml.mk | 32 ++++++++++++++
animations/prj/build.lst | 2
animations/prj/d.lst | 10 ----
animations/prj/makefile.mk | 40 +++++++++++++++++
animations/source/animcore/makefile.mk | 74 ---------------------------------
9 files changed, 236 insertions(+), 85 deletions(-)
New commits:
commit d2d73573bbdec9093abda1aa34bd911dca578535
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Wed Jul 27 13:14:00 2011 +0200
Convert animations to gbuild
diff --git a/animations/Library_animcore.mk b/animations/Library_animcore.mk
new file mode 100644
index 0000000..1ec31c5
--- /dev/null
+++ b/animations/Library_animcore.mk
@@ -0,0 +1,57 @@
+#*************************************************************************
+#
+# 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,animcore))
+
+$(eval $(call gb_Library_add_package_headers,animcore,animations_inc))
+
+$(eval $(call gb_Library_set_componentfile,animcore,animations/source/animcore/animcore))
+
+$(eval $(call gb_Library_set_include,animcore,\
+ $$(INCLUDE) \
+ -I$(realpath $(SRCDIR)/animcore/source/animcore) \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_add_api,animcore,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,animcore,\
+ cppu \
+ cppuhelper \
+ sal \
+))
+
+$(eval $(call gb_Library_add_exception_objects,animcore,\
+ animations/source/animcore/animcore \
+ animations/source/animcore/factreg \
+ animations/source/animcore/targetpropertiescreator \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/animations/Makefile b/animations/Makefile
new file mode 100644
index 0000000..c898975
--- /dev/null
+++ b/animations/Makefile
@@ -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:
diff --git a/animations/Module_animations.mk b/animations/Module_animations.mk
new file mode 100644
index 0000000..c6ed997
--- /dev/null
+++ b/animations/Module_animations.mk
@@ -0,0 +1,36 @@
+#*************************************************************************
+#
+# 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,animations))
+
+$(eval $(call gb_Module_add_targets,animations,\
+ Library_animcore \
+ Package_inc \
+ Package_xml \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/animations/Package_inc.mk b/animations/Package_inc.mk
new file mode 100644
index 0000000..bf6dc2d
--- /dev/null
+++ b/animations/Package_inc.mk
@@ -0,0 +1,32 @@
+#*************************************************************************
+#
+# 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,animations_inc,$(SRCDIR)/animations/inc))
+
+$(eval $(call gb_Package_add_file,animations_inc,inc/animations/animationnodehelper.hxx,animations/animationnodehelper.hxx))
+
+# vim: set noet ts=4 sw=4:
diff --git a/animations/Package_xml.mk b/animations/Package_xml.mk
new file mode 100644
index 0000000..47b945f
--- /dev/null
+++ b/animations/Package_xml.mk
@@ -0,0 +1,32 @@
+#*************************************************************************
+#
+# 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,animations_xml,$(SRCDIR)/animations/source/animcore))
+
+$(eval $(call gb_Package_add_file,animations_xml,xml/animcore.xml,animcore.xml))
+
+# vim: set noet ts=4 sw=4:
diff --git a/animations/prj/build.lst b/animations/prj/build.lst
index ef1b094..65baa77 100644
--- a/animations/prj/build.lst
+++ b/animations/prj/build.lst
@@ -1,3 +1,3 @@
animations animations : cppuhelper comphelper offapi LIBXSLT:libxslt NULL
animations animations usr1 - all animations_mkout NULL
-animations animations\source\animcore nmake - all animations_animcore NULL
+animations animations\prj nmake - all animations_prj NULL
diff --git a/animations/prj/d.lst b/animations/prj/d.lst
index b0e6f3c..e69de29 100644
--- a/animations/prj/d.lst
+++ b/animations/prj/d.lst
@@ -1,10 +0,0 @@
-..\%__SRC%\bin\animcore.dll %_DEST%\bin\animcore.dll
-..\%__SRC%\lib\libanimcore.so %_DEST%\lib\libanimcore.so
-..\%__SRC%\lib\*.dylib %_DEST%\lib\*
-..\source\animcore\animcore.xml %_DEST%\xml\animcore.xml
-
-..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib\lib*static*.dylib
-
-mkdir: %_DEST%\inc\animations
-..\inc\animations\animationnodehelper.hxx %_DEST%\inc\animations\animationnodehelper.hxx
-..\%__SRC%\misc\animcore.component %_DEST%\xml\animcore.component
diff --git a/animations/prj/makefile.mk b/animations/prj/makefile.mk
new file mode 100755
index 0000000..bcb4970
--- /dev/null
+++ b/animations/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) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/animations/source/animcore/makefile.mk b/animations/source/animcore/makefile.mk
deleted file mode 100644
index fac27ba..0000000
--- a/animations/source/animcore/makefile.mk
+++ /dev/null
@@ -1,74 +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=animations
-TARGET=animcore
-ENABLE_EXCEPTIONS=TRUE
-NO_BSYMBOLIC=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-.IF "$(L10N_framework)"==""
-
-# --- Files --------------------------------------------------------
-
-SLOFILES = $(SLO)$/animcore.obj\
- $(SLO)$/factreg.obj\
- $(SLO)$/targetpropertiescreator.obj
-
-SHL1TARGET= $(TARGET)
-SHL1VERSIONMAP=$(SOLARENV)/src/unloadablecomponent.map
-
-SHL1STDLIBS= \
- $(SALLIB) \
- $(CPPULIB) \
- $(CPPUHELPERLIB)
-
-
-SHL1DEPN=
-SHL1IMPLIB= i$(TARGET)
-SHL1LIBS= $(SLB)$/$(TARGET).lib
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME= $(SHL1TARGET)
-
-.ENDIF # L10N_framework
-
-# --- Targets ------------------------------------------------------
-.INCLUDE : target.mk
-
-ALLTAR : $(MISC)/animcore.component
-
-$(MISC)/animcore.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- animcore.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt animcore.component
More information about the Libreoffice-commits
mailing list