Standardize installation of gnustep-gui Images, Sounds and Themes (should also automatically fix installation issue on Solaris 7)

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@28608 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
nicola 2009-09-04 14:58:04 +00:00
parent c58675d94f
commit f3f4d09344
7 changed files with 146 additions and 388 deletions

View file

@ -1,3 +1,16 @@
2009-09-04 Nicola <nicola.pero@meta-innovation.com>
* Images/GNUmakefile: Rewritten using the standard
resource-set.make instead of duplicating resource installation
code in every makefile. resource-set.make also has a lots of
additional features and provides robust, portable code.
* Sounds/GNUmakefile: Same change.
* Themes/GNUmakefile: Same change (this should also fix installing
gnustep-gui on Sun Solaris 7).
* Images/GNUmakefile.postamble: Removed.
* Sounds/GNUmakefile.postamble: Removed.
* Themes/GNUmakefile.postamble: Removed.
2009-09-01 19:45-EDT Gregory John Casamento <greg.casamento@gmail.com>
* Images/common_ToolbarCustomizeToolbarItem.tiff: Minor cleanup

View file

@ -1,9 +1,9 @@
#
# Images makefile for GNUstep GUI Library
# Copyright (C) 1997 Free Software Foundation, Inc.
# Copyright (C) 2009 Free Software Foundation, Inc.
#
# Author: Scott Christley <scottc@net-community.com>
# Date: September 1997
# Author: Nicola Pero <nicola.pero@meta-innovation.com>
# Date: September 2009
#
# This file is part of the GNUstep GUI Library.
#
@ -29,114 +29,107 @@ include $(GNUSTEP_MAKEFILES)/common.make
include ../Version
imagedir = $(GNUSTEP_LIBRARY)/Images
RESOURCE_SET_NAME = Images
Images_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Images
Images_RESOURCE_FILES = \
GNUstep.tiff \
GNUstepMenuImage.tiff \
GSSearch.tiff \
GSStop.tiff \
LogoGNUstep.tiff \
MagnifyGlass.tiff \
NSComboArrow.tiff \
NSRatingLevelIndicator.tiff \
common_2DCheckMark.tiff \
common_2DDash.tiff \
common_3DArrowDown.tiff \
common_3DArrowLeft.tiff \
common_3DArrowRight.tiff \
common_3DArrowRightH.tiff \
common_3DArrowUp.tiff \
common_ArrowDown.tiff \
common_ArrowDownH.tiff \
common_ArrowLeft.tiff \
common_ArrowLeftH.tiff \
common_ArrowRight.tiff \
common_ArrowRightH.tiff \
common_ArrowUp.tiff \
common_ArrowUpH.tiff \
common_CenterTabStop.tiff \
common_Close.tiff \
common_CloseBroken.tiff \
common_CloseBrokenH.tiff \
common_CloseH.tiff \
common_ClosedHandCursor.tiff \
common_ColorSwatch.tiff \
common_ComboBoxEllipsis.tiff \
common_DecimalTabStop.tiff \
common_Diamond.tiff \
common_Dimple.tiff \
common_DimpleHoriz.tiff \
common_DownArrowSmall.tiff \
common_Folder.tiff \
common_HelpCursor.tiff \
common_Home.tiff \
common_HomeDirectory.tiff \
common_LeftTabStop.tiff \
common_MiniWindowTile.tiff \
common_Miniaturize.tiff \
common_MiniaturizeH.tiff \
common_Mount.tiff \
common_Nibble.tiff \
common_OpenHandCursor.tiff \
common_Printer.tiff \
common_RadioOff.tiff \
common_RadioOn.tiff \
common_Right.tiff \
common_RightH.tiff \
common_RightTabStop.tiff \
common_Root_Apple.tiff \
common_Root_PC.tiff \
common_Root_SGI.tiff \
common_Root_Sparc.tiff \
common_Root_Sparc2.tiff \
common_SliderHoriz.tiff \
common_SliderVert.tiff \
common_SwitchOff.tiff \
common_SwitchOn.tiff \
common_TabDownSelectedLeft.tiff \
common_TabDownSelectedRight.tiff \
common_TabDownSelectedToUnSelectedJunction.tiff \
common_TabDownUnSelectedJunction.tiff \
common_TabDownUnSelectedLeft.tiff \
common_TabDownUnSelectedRight.tiff \
common_TabDownUnSelectedToSelectedJunction.tiff \
common_TabSelectedLeft.tiff \
common_TabSelectedRight.tiff \
common_TabSelectedToUnSelectedJunction.tiff \
common_TabUnSelectToSelectedJunction.tiff \
common_TabUnSelectedJunction.tiff \
common_TabUnSelectedLeft.tiff \
common_TabUnSelectedRight.tiff \
common_Tile.tiff \
common_ToolbarClippedItemsMark.tiff \
common_ToolbarCustomizeToolbarItem.tiff \
common_ToolbarSeparatorItem.tiff \
common_ToolbarShowColorsItem.tiff \
common_ToolbarShowFontsItem.tiff \
common_ToolbarSpaceItem.tiff \
common_Unknown.tiff \
common_UnknownApplication.tiff \
common_UnknownTool.tiff \
common_Unmount.tiff \
common_UpAndDownArrowSmall.tiff \
common_copyCursor.tiff \
common_linkCursor.tiff \
common_noCursor.tiff \
common_outlineCollapsed.tiff \
common_outlineExpanded.tiff \
common_outlineUnexpandable.tiff \
common_ret.tiff \
common_retH.tiff \
nsmapping.strings \
page_landscape.tiff \
page_portrait.tiff
IMAGE_FILES = \
LogoGNUstep.tiff \
common_3DArrowUp.tiff \
common_3DArrowLeft.tiff \
common_3DArrowDown.tiff \
common_ArrowDown.tiff \
common_ArrowDownH.tiff \
common_ArrowUp.tiff \
common_ArrowUpH.tiff \
common_ArrowRight.tiff \
common_ArrowRightH.tiff \
common_3DArrowRight.tiff \
common_ArrowLeft.tiff \
common_ArrowLeftH.tiff \
common_3DArrowRightH.tiff \
common_2DCheckMark.tiff \
common_Close.tiff \
common_CloseH.tiff \
common_CloseBroken.tiff \
common_CloseBrokenH.tiff \
common_ColorSwatch.tiff \
common_2DDash.tiff \
common_HelpCursor.tiff \
common_Home.tiff \
common_HomeDirectory.tiff \
common_Mount.tiff \
common_Miniaturize.tiff \
common_MiniaturizeH.tiff \
common_MiniWindowTile.tiff \
common_Unmount.tiff \
common_RadioOn.tiff \
common_RadioOff.tiff \
common_Right.tiff \
common_RightH.tiff \
common_SwitchOn.tiff \
common_SwitchOff.tiff \
common_SliderHoriz.tiff \
common_SliderVert.tiff \
common_TabDownSelectedLeft.tiff \
common_TabDownSelectedRight.tiff \
common_TabDownSelectedToUnSelectedJunction.tiff \
common_TabDownUnSelectedJunction.tiff \
common_TabDownUnSelectedLeft.tiff \
common_TabDownUnSelectedRight.tiff \
common_TabDownUnSelectedToSelectedJunction.tiff \
common_TabSelectedLeft.tiff \
common_TabSelectedRight.tiff \
common_TabSelectedToUnSelectedJunction.tiff \
common_TabUnSelectToSelectedJunction.tiff \
common_TabUnSelectedJunction.tiff \
common_TabUnSelectedLeft.tiff \
common_TabUnSelectedRight.tiff \
common_Tile.tiff \
common_UpAndDownArrowSmall.tiff \
common_DownArrowSmall.tiff \
common_Nibble.tiff \
common_Dimple.tiff \
common_DimpleHoriz.tiff \
common_ret.tiff \
common_retH.tiff \
common_Unknown.tiff \
common_UnknownApplication.tiff \
common_UnknownTool.tiff \
common_Folder.tiff \
common_Root_PC.tiff \
common_Root_SGI.tiff \
common_Root_Sparc.tiff \
common_Root_Sparc2.tiff \
common_Root_Apple.tiff \
common_noCursor.tiff \
common_copyCursor.tiff \
common_linkCursor.tiff \
common_outlineCollapsed.tiff \
common_outlineExpanded.tiff \
common_outlineUnexpandable.tiff \
GNUstep.tiff \
GNUstepMenuImage.tiff \
nsmapping.strings \
NSComboArrow.tiff \
common_ComboBoxEllipsis.tiff \
common_RightTabStop.tiff \
common_CenterTabStop.tiff \
common_LeftTabStop.tiff \
common_DecimalTabStop.tiff \
common_Diamond.tiff \
common_Printer.tiff \
common_ToolbarCustomizeToolbarItem.tiff \
common_ToolbarClippedItemsMark.tiff \
common_ToolbarSeparatorItem.tiff \
common_ToolbarShowColorsItem.tiff \
common_ToolbarShowFontsItem.tiff \
common_ToolbarSpaceItem.tiff \
common_ClosedHandCursor.tiff \
common_OpenHandCursor.tiff \
page_landscape.tiff \
page_portrait.tiff \
MagnifyGlass.tiff \
GSSearch.tiff \
GSStop.tiff \
NSRatingLevelIndicator.tiff
-include GNUmakefile.preamble
-include GNUmakefile.local
# We don't actually build anything in this directory so
# just include the common makefile rules
include $(GNUSTEP_MAKEFILES)/rules.make
include GNUmakefile.postamble
include $(GNUSTEP_MAKEFILES)/resource-set.make

View file

@ -1,79 +0,0 @@
#
# GNUmakefile.postamble
#
# Copyright (C) 1997 Free Software Foundation, Inc.
#
# Author: Scott Christley <scottc@net-community.com>
#
# This file is part of the GNUstep GUI Library.
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
# version 2 of the License, or (at your option) any later version.
#
# This library 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 for more details.
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; see the file COPYING.LIB.
# If not, see <http://www.gnu.org/licenses/> or write to the
# Free Software Foundation, 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
#
# GNUmakefile.postamble
#
# Project specific makefile rules
#
# Uncomment the targets you want.
# The double colons (::) are important, do not make them single colons
# otherwise the normal makefile rules will not be performed.
#
# Things to do before compiling
# before-all::
# Things to do after compiling
# after-all::
$(imagedir):
$(MKDIRS) $(imagedir)
# Things to do before installing
before-install:: $(imagedir)
# Things to do after installing
after-install::
for file in $(IMAGE_FILES); do \
$(INSTALL_DATA) $$file $(imagedir)/$$file ; \
done
# Things to do before uninstalling
# before-uninstall::
# Things to do after uninstalling
after-uninstall::
for file in $(IMAGE_FILES); do \
rm -f $(imagedir)/$$file ; \
done
# Things to do before cleaning
# before-clean::
# Things to do after cleaning
# after-clean::
# Things to do before distcleaning
# before-distclean::
# Things to do after distcleaning
# after-distclean::
# Things to do before checking
# before-check::
# Things to do after checking
# after-check::

View file

@ -2,8 +2,8 @@
# Sounds makefile for GNUstep GUI Library
# Copyright (C) 2009 Free Software Foundation, Inc.
#
# Author: Gregory Casamento <greg.casamento@gmail.com>
# Date: July 2009
# Author: Nicola Pero <nicola.pero@meta-innovation.com>
# Date: September 2009
#
# This file is part of the GNUstep GUI Library.
#
@ -29,27 +29,19 @@ include $(GNUSTEP_MAKEFILES)/common.make
include ../Version
sounddir = $(GNUSTEP_LIBRARY)/Sounds
RESOURCE_SET_NAME = Sounds
Sounds_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Sounds
Sounds_RESOURCE_FILES = \
Basso.wav \
Blow.wav \
Bottle.wav \
Frog.wav \
Glass.wav \
Hero.wav \
Ping.wav \
Pop.wav \
Sosumi.wav \
Submarine.wav \
Tink.wav
SOUND_FILES = \
Glass.wav \
Basso.wav \
Blow.wav \
Bottle.wav \
Frog.wav \
Glass.wav \
Hero.wav \
Ping.wav \
Pop.wav \
Sosumi.wav \
Submarine.wav \
Tink.wav
-include GNUmakefile.preamble
-include GNUmakefile.local
# We don't actually build anything in this directory so
# just include the common makefile rules
include $(GNUSTEP_MAKEFILES)/rules.make
include GNUmakefile.postamble
include $(GNUSTEP_MAKEFILES)/resource-set.make

View file

@ -1,79 +0,0 @@
#
# GNUmakefile.postamble
#
# Copyright (C) 2009 Free Software Foundation, Inc.
#
# Author: Gregory Casamento <greg.casamento@gmail.com>
#
# This file is part of the GNUstep GUI Library.
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
# version 2 of the License, or (at your option) any later version.
#
# This library 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 for more details.
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; see the file COPYING.LIB.
# If not, see <http://www.gnu.org/licenses/> or write to the
# Free Software Foundation, 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
#
# GNUmakefile.postamble
#
# Project specific makefile rules
#
# Uncomment the targets you want.
# The double colons (::) are important, do not make them single colons
# otherwise the normal makefile rules will not be performed.
#
# Things to do before compiling
# before-all::
# Things to do after compiling
# after-all::
$(sounddir):
$(MKDIRS) $(sounddir)
# Things to do before installing
before-install:: $(sounddir)
# Things to do after installing
after-install::
for file in $(SOUND_FILES); do \
$(INSTALL_DATA) $$file $(sounddir)/$$file ; \
done
# Things to do before uninstalling
# before-uninstall::
# Things to do after uninstalling
after-uninstall::
for file in $(SOUND_FILES); do \
rm -f $(sounddir)/$$file ; \
done
# Things to do before cleaning
# before-clean::
# Things to do after cleaning
# after-clean::
# Things to do before distcleaning
# before-distclean::
# Things to do after distcleaning
# after-distclean::
# Things to do before checking
# before-check::
# Things to do after checking
# after-check::

View file

@ -2,8 +2,8 @@
# Themes makefile for GNUstep GUI Library
# Copyright (C) 2009 Free Software Foundation, Inc.
#
# Author: Gregory Casamento <greg.casamento@gmail.com>
# Date: August 2009
# Author: Nicola Pero <nicola.pero@meta-innovation.com>
# Date: September 2009
#
# This file is part of the GNUstep GUI Library.
#
@ -29,15 +29,12 @@ include $(GNUSTEP_MAKEFILES)/common.make
include ../Version
themedir = $(GNUSTEP_LIBRARY)/Themes
#
# We have no themes to install yet! Once we have them, add them to
# the Themes_RESOURCE_FILES variable.
#
RESOURCE_SET_NAME = Themes
Themes_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Themes
Themes_RESOURCE_FILES =
THEME_FILES =
-include GNUmakefile.preamble
-include GNUmakefile.local
# We don't actually build anything in this directory so
# just include the common makefile rules
include $(GNUSTEP_MAKEFILES)/rules.make
include GNUmakefile.postamble
include $(GNUSTEP_MAKEFILES)/resource-set.make

View file

@ -1,79 +0,0 @@
#
# GNUmakefile.postamble
#
# Copyright (C) 2009 Free Software Foundation, Inc.
#
# Author: Gregory Casamento <greg.casamento@gmail.com>
#
# This file is part of the GNUstep GUI Library.
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
# version 2 of the License, or (at your option) any later version.
#
# This library 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 for more details.
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; see the file COPYING.LIB.
# If not, see <http://www.gnu.org/licenses/> or write to the
# Free Software Foundation, 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
#
# GNUmakefile.postamble
#
# Project specific makefile rules
#
# Uncomment the targets you want.
# The double colons (::) are important, do not make them single colons
# otherwise the normal makefile rules will not be performed.
#
# Things to do before compiling
# before-all::
# Things to do after compiling
# after-all::
$(themedir):
$(MKDIRS) $(themedir)
# Things to do before installing
before-install:: $(themedir)
# Things to do after installing
after-install::
for file in $$THEME_FILES; do \
cp -r $$file $(themedir)/$$file ; \
done
# Things to do before uninstalling
# before-uninstall::
# Things to do after uninstalling
after-uninstall::
for file in $$THEME_FILES; do \
rm -f $(themedir)/$$file ; \
done
# Things to do before cleaning
# before-clean::
# Things to do after cleaning
# after-clean::
# Things to do before distcleaning
# before-distclean::
# Things to do after distcleaning
# after-distclean::
# Things to do before checking
# before-check::
# Things to do after checking
# after-check::