diff options
author | Matúš Kukan <matus.kukan@gmail.com> | 2012-02-16 20:18:13 +0100 |
---|---|---|
committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-02-17 20:02:45 +0100 |
commit | 5a4e4d5543edd47f4b411c0f2fa43d1a0e6a1ff7 (patch) | |
tree | faa1490797f1d409ad61a84e2c88b82ec81e57e0 /packimages/pack | |
parent | libjvmfwk is needed even when building without java (diff) | |
download | core-5a4e4d5543edd47f4b411c0f2fa43d1a0e6a1ff7.tar.gz core-5a4e4d5543edd47f4b411c0f2fa43d1a0e6a1ff7.zip |
packimages: convert to gbuild
Diffstat (limited to 'packimages/pack')
-rw-r--r-- | packimages/pack/Makefile | 70 | ||||
-rw-r--r-- | packimages/pack/makefile.mk | 68 |
2 files changed, 70 insertions, 68 deletions
diff --git a/packimages/pack/Makefile b/packimages/pack/Makefile new file mode 100644 index 000000000000..5d88e2597783 --- /dev/null +++ b/packimages/pack/Makefile @@ -0,0 +1,70 @@ +# -*- 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 Matúš Kukan <matus.kukan@gmail.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. + +gb_PARTIALBUILD:=T +include $(GBUILDDIR)/gbuild_simple.mk + +# Custom sets, at 24x24 & 16x16 fall-back to Tango preferentially +# (Tango fallbacks to Industrial for the missing icons) +CUSTOM_images := $(foreach theme,$(WITH_THEMES),images_$(theme).zip) +CUSTOM_PREFERRED_FALLBACK_1 := -c $(SRCDIR)/icon-themes/tango +CUSTOM_PREFERRED_FALLBACK_2 := -c $(SRCDIR)/icon-themes/industrial + +# commandimagelist.ilst and sorted.lst are phony to rebuild everything each time +.PHONY: all commandimagelist.ilst sorted.lst +all: images.zip images_brand.zip $(CUSTOM_images) + +images.zip: commandimagelist.ilst sorted.lst + $(call gb_Helper_abbreviate_dirs_native, \ + $(PERL) $(SOLARENV)/bin/packimages.pl -g $(SRCDIR)/icon-themes/galaxy \ + -m $(SRCDIR)/icon-themes/galaxy -c . -l . -l $(OUTDIR)/res/img \ + -s sorted.lst -o $@) + +images_%.zip: commandimagelist.ilst sorted.lst + $(call gb_Helper_abbreviate_dirs_native, \ + $(PERL) $(SOLARENV)/bin/packimages.pl -g $(SRCDIR)/icon-themes/galaxy \ + -m $(SRCDIR)/icon-themes/galaxy -c $(SRCDIR)/icon-themes/$* \ + $(CUSTOM_PREFERRED_FALLBACK_1) $(CUSTOM_PREFERRED_FALLBACK_2) \ + -l . -l $(OUTDIR)/res/img -s sorted.lst -o $@) + +# make sure to have one to keep packing happy +images_brand.zip: + @touch $@ + +commandimagelist.ilst: + $(call gb_Helper_abbreviate_dirs_native, \ + find $(SRCDIR)/icon-themes/galaxy/cmd -name "*.png" | \ + sed "s#$(SRCDIR)/icon-themes/galaxy#%MODULE%#" | \ + $(PERL) $(SOLARENV)/bin/sort.pl > $@.$(INPATH) && \ + $(PERL) $(SOLARENV)/bin/diffmv.pl $@.$(INPATH) $@) + +sorted.lst: $(SRCDIR)/packimages/pack/image-sort.lst + $(call gb_Helper_abbreviate_dirs_native, \ + $(PERL) $(SOLARENV)/bin/image-sort.pl $< $(OUTDIR)/xml $@) + +.DEFAULT_GOAL := all +# vim: set noet sw=4 ts=4: diff --git a/packimages/pack/makefile.mk b/packimages/pack/makefile.mk deleted file mode 100644 index ebc6f81d9b08..000000000000 --- a/packimages/pack/makefile.mk +++ /dev/null @@ -1,68 +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=packimages -TARGET=packimages - -.INCLUDE: settings.mk -# point to an existing directory as default that poses no threat -# to a "find" that looks for "*.png" -RSCCUSTOMIMG*=$(PRJ) -.INCLUDE: target.mk - -IMAGES := $(COMMONBIN)$/images.zip -SORTED_LIST=$(RES)$/img$/sorted.lst -# Custom sets, at 24x24 & 16x16 fall-back to Tango preferentially -# (Tango fallbacks to Industrial for the missing icons) -CUSTOM_IMAGE_SETS=$(WITH_THEMES) -CUSTOM_IMAGES+=$(foreach,i,$(CUSTOM_IMAGE_SETS) images_$i) -CUSTOM_PREFERRED_FALLBACK_1*=-c $(SRC_ROOT)/icon-themes$/tango -CUSTOM_PREFERRED_FALLBACK_2*=-c $(SRC_ROOT)/icon-themes$/industrial - -ALLTAR : $(IMAGES) $(CUSTOM_IMAGES) $(COMMONBIN)$/images_brand.zip - -$(IMAGES) $(CUSTOM_IMAGES) : $(SORTED_LIST) - -$(SORTED_LIST) : image-sort.lst - +-$(MKDIR) $(RES)$/img - +$(PERL) $(SOLARENV)$/bin$/image-sort.pl image-sort.lst $(SOLARXMLDIR) $@ - -$(RES)$/img$/commandimagelist.ilst .PHONY : $(SORTED_LIST) - @@-$(MKDIR) $(RES)$/img -#+-$(RM) $@ $@.$(INPATH) - $(FIND) $(SRC_ROOT)/$(RSCDEFIMG)/cmd -name "*.png" | sed "s#$(SRC_ROOT)/$(RSCDEFIMG)#%MODULE%#" | $(PERL) $(SOLARENV)$/bin$/sort.pl > $@.$(INPATH) - $(PERL) $(SOLARENV)$/bin$/diffmv.pl $@.$(INPATH) $@ - -$(COMMONBIN)$/images.zip .PHONY: $(RES)$/img$/commandimagelist.ilst - $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(SRC_ROOT)/$(RSCDEFIMG) -m $(SRC_ROOT)/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -l $(SOLARCOMMONRESDIR)$/img -s $(SORTED_LIST) -l $(RES)$/img -o $@ - -images_% : $(RES)$/img$/commandimagelist.ilst - $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(SRC_ROOT)/$(RSCDEFIMG) -m $(SRC_ROOT)/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -c $(SRC_ROOT)/icon-themes$/$(@:s/images_//) -c $(MISC)$/$(@:s/images_//) $(CUSTOM_PREFERRED_FALLBACK_1) $(CUSTOM_PREFERRED_FALLBACK_2) -l $(SOLARCOMMONRESDIR)$/img -l $(RES)$/img -s $(SORTED_LIST) -o $(COMMONBIN)$/$@.zip - -# make sure to have one to keep packing happy -$(COMMONBIN)$/images_brand.zip: - @$(TOUCH) $@ |