diff options
| -rw-r--r-- | vcl/Module_vcl.mk | 2 | ||||
| -rw-r--r-- | vcl/Package_osx.mk | 38 | ||||
| -rw-r--r-- | vcl/Zip_osxres.mk | 106 | ||||
| -rw-r--r-- | vcl/aqua/source/res/delzip | 0 |
4 files changed, 107 insertions, 39 deletions
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk index f9b86ed6fdf5..7ec9395894e1 100644 --- a/vcl/Module_vcl.mk +++ b/vcl/Module_vcl.mk @@ -75,7 +75,7 @@ endif ifeq ($(GUIBASE),aqua) $(eval $(call gb_Module_add_targets,vcl,\ - Package_osx \ + Zip_osxres \ )) endif diff --git a/vcl/Package_osx.mk b/vcl/Package_osx.mk deleted file mode 100644 index 17df37a131f5..000000000000 --- a/vcl/Package_osx.mk +++ /dev/null @@ -1,38 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -#************************************************************************* -# -# 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. -# -#************************************************************************* - -### FIXME: when we have a real ZipTarget mechanism in gbuild replace this mess -$(eval $(call gb_Package_Package,vcl_zip,)) -$(eval $(call gb_Package_add_file,vcl_zip,bin/osxres.zip,$(WORKDIR)/Misc/osxres.zip)) - -/$(WORKDIR)/Misc/osxres.zip: $(SRCDIR)/vcl/aqua/source/res/MainMenu.nib/*.nib $(SRCDIR)/vcl/aqua/source/res/cursors/*.png - cd $(SRCDIR)/vcl/aqua/source/res ; \ - mkdir -p $(dir $@) ; \ - zip $@ MainMenu.nib/*.nib cursors/*.png - -# vim: set noet sw=4 ts=4: diff --git a/vcl/Zip_osxres.mk b/vcl/Zip_osxres.mk new file mode 100644 index 000000000000..212b80255e90 --- /dev/null +++ b/vcl/Zip_osxres.mk @@ -0,0 +1,106 @@ +# -*- 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_Zip_Zip,osxres,$(SRCDIR)/vcl/aqua/source/res)) + +$(eval $(call gb_Zip_add_files,osxres,\ + MainMenu.nib/classes.nib \ + MainMenu.nib/info.nib \ + MainMenu.nib/keyedobjects.nib \ + cursors/airbrush.png \ + cursors/ase.png \ + cursors/asn.png \ + cursors/asne.png \ + cursors/asns.png \ + cursors/asnswe.png \ + cursors/asnw.png \ + cursors/ass.png \ + cursors/asse.png \ + cursors/assw.png \ + cursors/asw.png \ + cursors/aswe.png \ + cursors/chain.png \ + cursors/chainnot.png \ + cursors/chart.png \ + cursors/copydata.png \ + cursors/copydlnk.png \ + cursors/copyf.png \ + cursors/copyf2.png \ + cursors/copyflnk.png \ + cursors/crook.png \ + cursors/crop.png \ + cursors/darc.png \ + cursors/dbezier.png \ + cursors/dcapt.png \ + cursors/dcirccut.png \ + cursors/dconnect.png \ + cursors/dellipse.png \ + cursors/detectiv.png \ + cursors/dfree.png \ + cursors/dline.png \ + cursors/dpie.png \ + cursors/dpolygon.png \ + cursors/drect.png \ + cursors/dtext.png \ + cursors/fill.png \ + cursors/help.png \ + cursors/hourglass.png \ + cursors/hshear.png \ + cursors/linkdata.png \ + cursors/linkf.png \ + cursors/magnify.png \ + cursors/mirror.png \ + cursors/movebw.png \ + cursors/movedata.png \ + cursors/movedlnk.png \ + cursors/movef.png \ + cursors/movef2.png \ + cursors/moveflnk.png \ + cursors/movept.png \ + cursors/neswsize.png \ + cursors/notallow.png \ + cursors/nullptr.png \ + cursors/nwsesize.png \ + cursors/pen.png \ + cursors/pivotcol.png \ + cursors/pivotdel.png \ + cursors/pivotfld.png \ + cursors/pivotrow.png \ + cursors/pntbrsh.png \ + cursors/rotate.png \ + cursors/tblsele.png \ + cursors/tblsels.png \ + cursors/tblselse.png \ + cursors/tblselsw.png \ + cursors/tblselw.png \ + cursors/timemove.png \ + cursors/timesize.png \ + cursors/vshear.png \ + cursors/vtext.png \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/vcl/aqua/source/res/delzip b/vcl/aqua/source/res/delzip deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/vcl/aqua/source/res/delzip +++ /dev/null |