diff options
| -rw-r--r-- | Makefile.top | 2 | ||||
| -rw-r--r-- | solenv/CustomTarget_gdb.mk | 40 | ||||
| -rw-r--r-- | solenv/CustomTarget_versionlist.mk | 45 | ||||
| -rw-r--r-- | solenv/Makefile | 7 | ||||
| -rw-r--r-- | solenv/Module_solenv.mk | 42 | ||||
| -rw-r--r-- | solenv/Package_gdb.mk | 40 | ||||
| -rw-r--r-- | solenv/Package_inc.mk (renamed from solenv/gdb/makefile.mk) | 16 | ||||
| -rw-r--r-- | solenv/makefile.mk | 42 | ||||
| -rw-r--r-- | solenv/prj/build.lst | 2 | ||||
| -rw-r--r-- | solenv/prj/d.lst | 5 | ||||
| -rw-r--r-- | solenv/prj/dmake | 0 |
11 files changed, 179 insertions, 62 deletions
diff --git a/Makefile.top b/Makefile.top index bee84e25bf60..1396514b3327 100644 --- a/Makefile.top +++ b/Makefile.top @@ -110,6 +110,7 @@ sdext\ sfx2\ slideshow\ smoketest\ +solenv\ sot\ starmath\ stoc\ @@ -230,7 +231,6 @@ saxon\ scp2\ setup_native\ shell\ -solenv\ soltools\ stax\ stlport\ diff --git a/solenv/CustomTarget_gdb.mk b/solenv/CustomTarget_gdb.mk new file mode 100644 index 000000000000..0be8cdffc3a6 --- /dev/null +++ b/solenv/CustomTarget_gdb.mk @@ -0,0 +1,40 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# 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 or as specified alternatively below. 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. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# 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_CustomTarget_CustomTarget,solenv/gdb)) + +$(call gb_CustomTarget_get_target,solenv/gdb) : \ + $(SRCDIR)/solenv/bin/install-gdb-printers \ + $(SRCDIR)/solenv/gdb/autoload.template \ + | $(call gb_CustomTarget_get_workdir,solenv/gdb)/.dir + +$(call gb_CustomTarget_get_target,solenv/gdb) : + $(call gb_Output_announce,solenv/gdb,$(true),SH ,1) + install-gdb-printers -a $(call gb_CustomTarget_get_workdir,solenv/gdb) -f && \ + touch $@ + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/solenv/CustomTarget_versionlist.mk b/solenv/CustomTarget_versionlist.mk new file mode 100644 index 000000000000..f7706ac839fe --- /dev/null +++ b/solenv/CustomTarget_versionlist.mk @@ -0,0 +1,45 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# 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 or as specified alternatively below. 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. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# 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_CustomTarget_CustomTarget,solenv/versionlist)) + +include $(SRCDIR)/solenv/inc/minor.mk + +$(call gb_CustomTarget_get_target,solenv/versionlist) : $(call gb_CustomTarget_get_workdir,solenv/versionlist)/versionlist.hrc + +$(call gb_CustomTarget_get_workdir,solenv/versionlist)/versionlist.hrc : \ + $(SRCDIR)/solenv/inc/minor.mk \ + | $(call gb_CustomTarget_get_workdir,solenv/versionlist)/.dir + +$(call gb_CustomTarget_get_workdir,solenv/versionlist)/versionlist.hrc : + $(call gb_Output_announce,solenv/versionlist,$(true),ECH,1) + echo '#define VERSION $(VERSIONMAJOR)' > $@ && \ + echo '#define SUBVERSION $(VERSIONMINOR)' >> $@ && \ + echo '#define MICROVERSION $(VERSIONMICRO)' >> $@ && \ + echo '#define VER_YEARRANGE $(COPYRIGHTYEARRANGE)' >> $@ + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/solenv/Makefile b/solenv/Makefile new file mode 100644 index 000000000000..ccb1c85a04da --- /dev/null +++ b/solenv/Makefile @@ -0,0 +1,7 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- + +module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) + +include $(module_directory)/../solenv/gbuild/partial_build.mk + +# vim: set noet sw=4 ts=4: diff --git a/solenv/Module_solenv.mk b/solenv/Module_solenv.mk new file mode 100644 index 000000000000..136d78bb6e28 --- /dev/null +++ b/solenv/Module_solenv.mk @@ -0,0 +1,42 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# 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 or as specified alternatively below. 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. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# 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,solenv)) + +$(eval $(call gb_Module_add_targets,solenv,\ + CustomTarget_versionlist \ + Package_inc \ +)) + +ifeq ($(GUI),UNX) +$(eval $(call gb_Module_add_targets,solenv,\ + CustomTarget_gdb \ + Package_gdb \ +)) +endif + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/solenv/Package_gdb.mk b/solenv/Package_gdb.mk new file mode 100644 index 000000000000..a516a08d1c66 --- /dev/null +++ b/solenv/Package_gdb.mk @@ -0,0 +1,40 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# 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 or as specified alternatively below. 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. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# 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,solenv_gdb,$(call gb_CustomTarget_get_workdir,solenv/gdb))) + +$(eval $(call gb_Package_add_files,solenv_gdb,lib,\ + $(call gb_Library_get_runtime_filename,cppu).3-gdb.py \ + $(call gb_Library_get_runtime_filename,sal).3-gdb.py \ + $(call gb_Library_get_runtime_filename,svl)-gdb.py \ + $(call gb_Library_get_runtime_filename,sw)-gdb.py \ + $(call gb_Library_get_runtime_filename,tl)-gdb.py \ +)) + +$(call gb_Package_get_preparation_target,solenv_gdb) : $(call gb_CustomTarget_get_target,solenv/gdb) + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/solenv/gdb/makefile.mk b/solenv/Package_inc.mk index 0c8df242bfbf..00a6f56e8dbc 100644 --- a/solenv/gdb/makefile.mk +++ b/solenv/Package_inc.mk @@ -12,7 +12,7 @@ # License. # # Major Contributor(s): -# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> # (initial developer) # # All Rights Reserved. @@ -25,16 +25,8 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -PRJ=.. -PRJNAME=solenv -TARGET=gdb +$(eval $(call gb_Package_Package,solenv_inc,$(call gb_CustomTarget_get_workdir,solenv/versionlist))) -.INCLUDE : settings.mk -.INCLUDE : target.mk +$(eval $(call gb_Package_add_file,solenv_inc,inc/versionlist.hrc,versionlist.hrc)) -ALLTAR : $(MISC)/autoloaders.flag - -$(MISC)/autoloaders.flag : autoload.template - install-gdb-printers -a $(MISC) -f && touch $@ - -# vim:set shiftwidth=4 softtabstop=4 expandtab: +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/solenv/makefile.mk b/solenv/makefile.mk deleted file mode 100644 index 4d806057f1f4..000000000000 --- a/solenv/makefile.mk +++ /dev/null @@ -1,42 +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=solenv -TARGET=init - -# --- Settings ---------------------------------- -.INCLUDE : settings.mk -.INCLUDE : target.mk - -ALLTAR : $(INCCOM)/versionlist.hrc - -$(INCCOM)/versionlist.hrc : ./inc/minor.mk - $(COMMAND_ECHO)echo "#define VERSION $(VERSIONMAJOR)" > $@ - $(COMMAND_ECHO)echo "#define SUBVERSION $(VERSIONMINOR)" >> $@ - $(COMMAND_ECHO)echo "#define MICROVERSION $(VERSIONMICRO)" >> $@ - $(COMMAND_ECHO)echo "#define VER_YEARRANGE $(COPYRIGHTYEARRANGE)" >> $@ diff --git a/solenv/prj/build.lst b/solenv/prj/build.lst index 8f3f9b055c79..91d08d93ad53 100644 --- a/solenv/prj/build.lst +++ b/solenv/prj/build.lst @@ -1,4 +1,2 @@ sn solenv : NULL sn solenv usr1 - all sn_mkout NULL -sn solenv nmake - all sn_init NULL -sn solenv\gdb nmake - all sn_gdb sn_init NULL diff --git a/solenv/prj/d.lst b/solenv/prj/d.lst index 14b66d1572d8..e69de29bb2d1 100644 --- a/solenv/prj/d.lst +++ b/solenv/prj/d.lst @@ -1,5 +0,0 @@ -mkdir: %_DEST%\bin -mkdir: %_DEST%\inc -mkdir: %_DEST%\lib -..\%__SRC%\inc\versionlist.hrc %_DEST%\inc\versionlist.hrc -..\%__SRC%\misc\*-gdb.py %_DEST%\lib\*-gdb.py diff --git a/solenv/prj/dmake b/solenv/prj/dmake deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/solenv/prj/dmake +++ /dev/null |