4 files changed, 455 insertions, 0 deletions
diff --git a/packimages/pack/image-sort.lst b/packimages/pack/image-sort.lst
new file mode 100644
index 000000000000..d7a615be3bda
--- /dev/null
+++ b/packimages/pack/image-sort.lst
@@ -0,0 +1,342 @@
+#
+# This file exists to help improve the ordering of
+# icons inside the OO.o theme / images.zip file.
+#
+# Sections are processed together, and are delimited
+# by '-- <tag> [small]' a 'group' tage denotes equal
+# importance: icons must be interleaved, 'ordered'
+# denotes a simple best-fit order. 'literal' denotes
+# a list of explicit image loads
+#
+
+res/mainapp_16.png
+res/mainapp_32.png
+sw/res/punkt.png
+sw/res/punkt_h.png
+res/sx03251.png
+res/lx03251.png
+
+-- literal
+
+# 'standard' toolbars
+uiconfig/modules/swriter/toolbar/standardbar.xml
+uiconfig/modules/scalc/toolbar/standardbar.xml
+uiconfig/modules/simpress/toolbar/standardbar.xml
+uiconfig/modules/sdraw/toolbar/standardbar.xml
+-- group
+
+# default / startup toolbars
+uiconfig/modules/swriter/toolbar/textobjectbar.xml
+uiconfig/modules/scalc/toolbar/formatobjectbar.xml
+-- group
+
+uiconfig/modules/simpress/toolbar/drawingobjectbar.xml
+uiconfig/modules/sdraw/toolbar/drawingobjectbar.xml
+-- group
+
+uiconfig/modules/simpress/toolbar/toolbar.xml
+uiconfig/modules/sdraw/toolbar/toolbar.xml
+-- group
+
+uiconfig/modules/simpress/toolbar/commontaskbar.xml
+-- ordered
+
+svtools/res/prnfont.png
+svtools/res/bmpfont.png
+svtools/res/scalfont.png
+svx/res/signet_11x16.png
+svx/res/caution_11x16.png
+svx/res/notcertificate_16.png
+res/sc10223.png
+res/sc10224.png
+res/sx03250.png
+res/sx03249.png
+res/sx03246.png
+res/sx03245.png
+res/sx03139.png
+res/sx03248.png
+res/sx03247.png
+res/sx03255.png
+res/sx03242.png
+-- literal
+
+# default / startup menus:
+uiconfig/modules/swriter/menubar/menubar.xml
+uiconfig/modules/scalc/menubar/menubar.xml
+uiconfig/modules/simpress/menubar/menubar.xml
+uiconfig/modules/sdraw/menubar/menubar.xml
+-- group small
+
+#
+# complete list of other toolbars / menus
+# FIXME: should auto-generate this.
+#
+uiconfig/modules/BasicIDE/toolbar/fullscreenbar.xml
+uiconfig/modules/BasicIDE/toolbar/insertcontrolsbar.xml
+uiconfig/modules/BasicIDE/toolbar/macrobar.xml
+uiconfig/modules/BasicIDE/toolbar/standardbar.xml
+uiconfig/modules/dbapp/toolbar/formobjectbar.xml
+uiconfig/modules/dbapp/toolbar/queryobjectbar.xml
+uiconfig/modules/dbapp/toolbar/reportobjectbar.xml
+uiconfig/modules/dbapp/toolbar/tableobjectbar.xml
+uiconfig/modules/dbapp/toolbar/toolbar.xml
+#uiconfig/modules/dbbrowser/toolbar/browserobjectbar.xml
+#uiconfig/modules/dbbrowser/toolbar/copyobjectbar.xml
+uiconfig/modules/dbbrowser/toolbar/toolbar.xml
+uiconfig/modules/dbquery/toolbar/designobjectbar.xml
+uiconfig/modules/dbquery/toolbar/sqlobjectbar.xml
+uiconfig/modules/dbquery/toolbar/toolbar.xml
+uiconfig/modules/dbrelation/toolbar/toolbar.xml
+uiconfig/modules/dbtable/toolbar/toolbar.xml
+uiconfig/modules/StartModule/toolbar/standardbar.xml
+uiconfig/modules/schart/toolbar/arrowshapes.xml
+uiconfig/modules/schart/toolbar/basicshapes.xml
+uiconfig/modules/schart/toolbar/calloutshapes.xml
+uiconfig/modules/schart/toolbar/flowchartshapes.xml
+uiconfig/modules/schart/toolbar/standardbar.xml
+uiconfig/modules/schart/toolbar/starshapes.xml
+uiconfig/modules/schart/toolbar/symbolshapes.xml
+uiconfig/modules/schart/toolbar/toolbar.xml
+uiconfig/modules/scalc/toolbar/alignmentbar.xml
+uiconfig/modules/scalc/toolbar/arrowshapes.xml
+uiconfig/modules/scalc/toolbar/basicshapes.xml
+uiconfig/modules/scalc/toolbar/calloutshapes.xml
+uiconfig/modules/scalc/toolbar/colorbar.xml
+uiconfig/modules/scalc/toolbar/drawbar.xml
+uiconfig/modules/scalc/toolbar/drawobjectbar.xml
+uiconfig/modules/scalc/toolbar/extrusionobjectbar.xml
+uiconfig/modules/scalc/toolbar/flowchartshapes.xml
+uiconfig/modules/scalc/toolbar/fontworkobjectbar.xml
+uiconfig/modules/scalc/toolbar/fontworkshapetype.xml
+uiconfig/modules/scalc/toolbar/formatobjectbar.xml
+uiconfig/modules/scalc/toolbar/formcontrols.xml
+uiconfig/modules/scalc/toolbar/formdesign.xml
+uiconfig/modules/scalc/toolbar/formsfilterbar.xml
+uiconfig/modules/scalc/toolbar/formsnavigationbar.xml
+uiconfig/modules/scalc/toolbar/formtextobjectbar.xml
+uiconfig/modules/scalc/toolbar/fullscreenbar.xml
+uiconfig/modules/scalc/toolbar/graffilterbar.xml
+uiconfig/modules/scalc/toolbar/graphicobjectbar.xml
+uiconfig/modules/scalc/toolbar/insertbar.xml
+uiconfig/modules/scalc/toolbar/insertcellsbar.xml
+uiconfig/modules/scalc/toolbar/mediaobjectbar.xml
+uiconfig/modules/scalc/toolbar/moreformcontrols.xml
+uiconfig/modules/scalc/toolbar/previewbar.xml
+uiconfig/modules/scalc/toolbar/standardbar.xml
+uiconfig/modules/scalc/toolbar/starshapes.xml
+uiconfig/modules/scalc/toolbar/symbolshapes.xml
+uiconfig/modules/scalc/toolbar/textobjectbar.xml
+uiconfig/modules/scalc/toolbar/toolbar.xml
+uiconfig/modules/scalc/toolbar/viewerbar.xml
+uiconfig/modules/sdraw/toolbar/3dobjectsbar.xml
+uiconfig/modules/sdraw/toolbar/alignmentbar.xml
+uiconfig/modules/sdraw/toolbar/arrowsbar.xml
+uiconfig/modules/sdraw/toolbar/arrowshapes.xml
+uiconfig/modules/sdraw/toolbar/basicshapes.xml
+uiconfig/modules/sdraw/toolbar/bezierobjectbar.xml
+uiconfig/modules/sdraw/toolbar/calloutshapes.xml
+uiconfig/modules/sdraw/toolbar/choosemodebar.xml
+uiconfig/modules/sdraw/toolbar/colorbar.xml
+uiconfig/modules/sdraw/toolbar/connectorsbar.xml
+uiconfig/modules/sdraw/toolbar/drawingobjectbar.xml
+uiconfig/modules/sdraw/toolbar/ellipsesbar.xml
+uiconfig/modules/sdraw/toolbar/extrusionobjectbar.xml
+uiconfig/modules/sdraw/toolbar/flowchartshapes.xml
+uiconfig/modules/sdraw/toolbar/fontworkobjectbar.xml
+uiconfig/modules/sdraw/toolbar/fontworkshapetype.xml
+uiconfig/modules/sdraw/toolbar/formcontrols.xml
+uiconfig/modules/sdraw/toolbar/formdesign.xml
+uiconfig/modules/sdraw/toolbar/formsfilterbar.xml
+uiconfig/modules/sdraw/toolbar/formsnavigationbar.xml
+uiconfig/modules/sdraw/toolbar/formtextobjectbar.xml
+uiconfig/modules/sdraw/toolbar/fullscreenbar.xml
+uiconfig/modules/sdraw/toolbar/gluepointsobjectbar.xml
+uiconfig/modules/sdraw/toolbar/graffilterbar.xml
+uiconfig/modules/sdraw/toolbar/graphicobjectbar.xml
+uiconfig/modules/sdraw/toolbar/insertbar.xml
+uiconfig/modules/sdraw/toolbar/linesbar.xml
+uiconfig/modules/sdraw/toolbar/masterviewtoolbar.xml
+uiconfig/modules/sdraw/toolbar/mediaobjectbar.xml
+uiconfig/modules/sdraw/toolbar/moreformcontrols.xml
+uiconfig/modules/sdraw/toolbar/optionsbar.xml
+uiconfig/modules/sdraw/toolbar/positionbar.xml
+uiconfig/modules/sdraw/toolbar/standardbar.xml
+uiconfig/modules/sdraw/toolbar/starshapes.xml
+uiconfig/modules/sdraw/toolbar/symbolshapes.xml
+uiconfig/modules/sdraw/toolbar/textbar.xml
+uiconfig/modules/sdraw/toolbar/textobjectbar.xml
+uiconfig/modules/sdraw/toolbar/toolbar.xml
+uiconfig/modules/sdraw/toolbar/viewerbar.xml
+uiconfig/modules/sdraw/toolbar/zoombar.xml
+uiconfig/modules/simpress/toolbar/3dobjectsbar.xml
+uiconfig/modules/simpress/toolbar/alignmentbar.xml
+uiconfig/modules/simpress/toolbar/arrowsbar.xml
+uiconfig/modules/simpress/toolbar/arrowshapes.xml
+uiconfig/modules/simpress/toolbar/basicshapes.xml
+uiconfig/modules/simpress/toolbar/bezierobjectbar.xml
+uiconfig/modules/simpress/toolbar/calloutshapes.xml
+uiconfig/modules/simpress/toolbar/choosemodebar.xml
+uiconfig/modules/simpress/toolbar/colorbar.xml
+uiconfig/modules/simpress/toolbar/commontaskbar.xml
+uiconfig/modules/simpress/toolbar/connectorsbar.xml
+uiconfig/modules/simpress/toolbar/drawingobjectbar.xml
+uiconfig/modules/simpress/toolbar/ellipsesbar.xml
+uiconfig/modules/simpress/toolbar/extrusionobjectbar.xml
+uiconfig/modules/simpress/toolbar/flowchartshapes.xml
+uiconfig/modules/simpress/toolbar/fontworkobjectbar.xml
+uiconfig/modules/simpress/toolbar/fontworkshapetype.xml
+uiconfig/modules/simpress/toolbar/formcontrols.xml
+uiconfig/modules/simpress/toolbar/formdesign.xml
+uiconfig/modules/simpress/toolbar/formsfilterbar.xml
+uiconfig/modules/simpress/toolbar/formsnavigationbar.xml
+uiconfig/modules/simpress/toolbar/formtextobjectbar.xml
+uiconfig/modules/simpress/toolbar/fullscreenbar.xml
+uiconfig/modules/simpress/toolbar/gluepointsobjectbar.xml
+uiconfig/modules/simpress/toolbar/graffilterbar.xml
+uiconfig/modules/simpress/toolbar/graphicobjectbar.xml
+uiconfig/modules/simpress/toolbar/insertbar.xml
+uiconfig/modules/simpress/toolbar/linesbar.xml
+uiconfig/modules/simpress/toolbar/masterviewtoolbar.xml
+uiconfig/modules/simpress/toolbar/mediaobjectbar.xml
+uiconfig/modules/simpress/toolbar/moreformcontrols.xml
+uiconfig/modules/simpress/toolbar/optionsbar.xml
+uiconfig/modules/simpress/toolbar/outlinetoolbar.xml
+uiconfig/modules/simpress/toolbar/positionbar.xml
+uiconfig/modules/simpress/toolbar/slideviewobjectbar.xml
+uiconfig/modules/simpress/toolbar/slideviewtoolbar.xml
+uiconfig/modules/simpress/toolbar/standardbar.xml
+uiconfig/modules/simpress/toolbar/starshapes.xml
+uiconfig/modules/simpress/toolbar/symbolshapes.xml
+uiconfig/modules/simpress/toolbar/textbar.xml
+uiconfig/modules/simpress/toolbar/textobjectbar.xml
+uiconfig/modules/simpress/toolbar/toolbar.xml
+uiconfig/modules/simpress/toolbar/viewerbar.xml
+uiconfig/modules/simpress/toolbar/zoombar.xml
+uiconfig/modules/smath/toolbar/fullscreenbar.xml
+uiconfig/modules/smath/toolbar/standardbar.xml
+uiconfig/modules/smath/toolbar/toolbar.xml
+uiconfig/modules/sglobal/toolbar/alignmentbar.xml
+uiconfig/modules/sglobal/toolbar/arrowshapes.xml
+uiconfig/modules/sglobal/toolbar/basicshapes.xml
+uiconfig/modules/sglobal/toolbar/bezierobjectbar.xml
+uiconfig/modules/sglobal/toolbar/calloutshapes.xml
+uiconfig/modules/sglobal/toolbar/colorbar.xml
+uiconfig/modules/sglobal/toolbar/drawbar.xml
+uiconfig/modules/sglobal/toolbar/drawingobjectbar.xml
+uiconfig/modules/sglobal/toolbar/drawtextobjectbar.xml
+uiconfig/modules/sglobal/toolbar/extrusionobjectbar.xml
+uiconfig/modules/sglobal/toolbar/flowchartshapes.xml
+uiconfig/modules/sglobal/toolbar/fontworkobjectbar.xml
+uiconfig/modules/sglobal/toolbar/fontworkshapetype.xml
+uiconfig/modules/sglobal/toolbar/formcontrols.xml
+uiconfig/modules/sglobal/toolbar/formdesign.xml
+uiconfig/modules/sglobal/toolbar/formsfilterbar.xml
+uiconfig/modules/sglobal/toolbar/formsnavigationbar.xml
+uiconfig/modules/sglobal/toolbar/formtextobjectbar.xml
+uiconfig/modules/sglobal/toolbar/frameobjectbar.xml
+uiconfig/modules/sglobal/toolbar/fullscreenbar.xml
+uiconfig/modules/sglobal/toolbar/graffilterbar.xml
+uiconfig/modules/sglobal/toolbar/graphicobjectbar.xml
+uiconfig/modules/sglobal/toolbar/insertbar.xml
+uiconfig/modules/sglobal/toolbar/mediaobjectbar.xml
+uiconfig/modules/sglobal/toolbar/moreformcontrols.xml
+uiconfig/modules/sglobal/toolbar/numobjectbar.xml
+uiconfig/modules/sglobal/toolbar/oleobjectbar.xml
+uiconfig/modules/sglobal/toolbar/optimizetablebar.xml
+uiconfig/modules/sglobal/toolbar/previewobjectbar.xml
+uiconfig/modules/sglobal/toolbar/standardbar.xml
+uiconfig/modules/sglobal/toolbar/starshapes.xml
+uiconfig/modules/sglobal/toolbar/symbolshapes.xml
+uiconfig/modules/sglobal/toolbar/tableobjectbar.xml
+uiconfig/modules/sglobal/toolbar/textobjectbar.xml
+uiconfig/modules/sglobal/toolbar/toolbar.xml
+uiconfig/modules/sglobal/toolbar/viewerbar.xml
+uiconfig/modules/sweb/toolbar/arrowshapes.xml
+uiconfig/modules/sweb/toolbar/basicshapes.xml
+uiconfig/modules/sweb/toolbar/bezierobjectbar.xml
+uiconfig/modules/sweb/toolbar/calloutshapes.xml
+uiconfig/modules/sweb/toolbar/colorbar.xml
+uiconfig/modules/sweb/toolbar/drawingobjectbar.xml
+uiconfig/modules/sweb/toolbar/drawtextobjectbar.xml
+uiconfig/modules/sweb/toolbar/extrusionobjectbar.xml
+uiconfig/modules/sweb/toolbar/flowchartshapes.xml
+uiconfig/modules/sweb/toolbar/fontworkobjectbar.xml
+uiconfig/modules/sweb/toolbar/fontworkshapetype.xml
+uiconfig/modules/sweb/toolbar/formcontrols.xml
+uiconfig/modules/sweb/toolbar/formdesign.xml
+uiconfig/modules/sweb/toolbar/formsfilterbar.xml
+uiconfig/modules/sweb/toolbar/formsnavigationbar.xml
+uiconfig/modules/sweb/toolbar/formtextobjectbar.xml
+uiconfig/modules/sweb/toolbar/frameobjectbar.xml
+uiconfig/modules/sweb/toolbar/fullscreenbar.xml
+uiconfig/modules/sweb/toolbar/graffilterbar.xml
+uiconfig/modules/sweb/toolbar/graphicobjectbar.xml
+uiconfig/modules/sweb/toolbar/insertbar.xml
+uiconfig/modules/sweb/toolbar/mediaobjectbar.xml
+uiconfig/modules/sweb/toolbar/numobjectbar.xml
+uiconfig/modules/sweb/toolbar/oleobjectbar.xml
+uiconfig/modules/sweb/toolbar/optimizetablebar.xml
+uiconfig/modules/sweb/toolbar/previewobjectbar.xml
+uiconfig/modules/sweb/toolbar/standardbar.xml
+uiconfig/modules/sweb/toolbar/starshapes.xml
+uiconfig/modules/sweb/toolbar/symbolshapes.xml
+uiconfig/modules/sweb/toolbar/tableobjectbar.xml
+uiconfig/modules/sweb/toolbar/textobjectbar.xml
+uiconfig/modules/sweb/toolbar/toolbar.xml
+uiconfig/modules/sweb/toolbar/viewerbar.xml
+uiconfig/modules/swriter/toolbar/alignmentbar.xml
+uiconfig/modules/swriter/toolbar/arrowshapes.xml
+uiconfig/modules/swriter/toolbar/basicshapes.xml
+uiconfig/modules/swriter/toolbar/bezierobjectbar.xml
+uiconfig/modules/swriter/toolbar/calloutshapes.xml
+uiconfig/modules/swriter/toolbar/colorbar.xml
+uiconfig/modules/swriter/toolbar/drawbar.xml
+uiconfig/modules/swriter/toolbar/drawingobjectbar.xml
+uiconfig/modules/swriter/toolbar/drawtextobjectbar.xml
+uiconfig/modules/swriter/toolbar/extrusionobjectbar.xml
+uiconfig/modules/swriter/toolbar/flowchartshapes.xml
+uiconfig/modules/swriter/toolbar/fontworkobjectbar.xml
+uiconfig/modules/swriter/toolbar/fontworkshapetype.xml
+uiconfig/modules/swriter/toolbar/formcontrols.xml
+uiconfig/modules/swriter/toolbar/formdesign.xml
+uiconfig/modules/swriter/toolbar/formsfilterbar.xml
+uiconfig/modules/swriter/toolbar/formsnavigationbar.xml
+uiconfig/modules/swriter/toolbar/formtextobjectbar.xml
+uiconfig/modules/swriter/toolbar/frameobjectbar.xml
+uiconfig/modules/swriter/toolbar/fullscreenbar.xml
+uiconfig/modules/swriter/toolbar/graffilterbar.xml
+uiconfig/modules/swriter/toolbar/graphicobjectbar.xml
+uiconfig/modules/swriter/toolbar/insertbar.xml
+uiconfig/modules/swriter/toolbar/mediaobjectbar.xml
+uiconfig/modules/swriter/toolbar/moreformcontrols.xml
+uiconfig/modules/swriter/toolbar/numobjectbar.xml
+uiconfig/modules/swriter/toolbar/oleobjectbar.xml
+uiconfig/modules/swriter/toolbar/optimizetablebar.xml
+uiconfig/modules/swriter/toolbar/previewobjectbar.xml
+uiconfig/modules/swriter/toolbar/standardbar.xml
+uiconfig/modules/swriter/toolbar/starshapes.xml
+uiconfig/modules/swriter/toolbar/symbolshapes.xml
+uiconfig/modules/swriter/toolbar/tableobjectbar.xml
+uiconfig/modules/swriter/toolbar/textobjectbar.xml
+uiconfig/modules/swriter/toolbar/toolbar.xml
+uiconfig/modules/swriter/toolbar/viewerbar.xml
+
+-- ordered
+
+uiconfig/modules/BasicIDE/menubar/menubar.xml
+uiconfig/modules/dbapp/menubar/menubar.xml
+#uiconfig/modules/dbbrowser/menubar/menubar.xml
+uiconfig/modules/dbquery/menubar/menubar.xml
+uiconfig/modules/dbrelation/menubar/menubar.xml
+uiconfig/modules/dbtable/menubar/menubar.xml
+uiconfig/modules/StartModule/menubar/menubar.xml
+uiconfig/modules/schart/menubar/menubar.xml
+uiconfig/modules/scalc/menubar/menubar.xml
+uiconfig/modules/sdraw/menubar/menubar.xml
+uiconfig/modules/simpress/menubar/menubar.xml
+uiconfig/modules/smath/menubar/menubar.xml
+uiconfig/modules/sglobal/menubar/menubar.xml
+uiconfig/modules/sweb/menubar/menubar.xml
+uiconfig/modules/swriter/menubar/menubar.xml
+
+-- ordered small
diff --git a/packimages/pack/makefile.mk b/packimages/pack/makefile.mk
new file mode 100644
index 000000000000..38777f2f826b
--- /dev/null
+++ b/packimages/pack/makefile.mk
@@ -0,0 +1,108 @@
+#*************************************************************************
+#
+# 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
+CUSTOM_IMAGE_SETS=hicontrast crystal oxygen tango classic
+CUSTOM_IMAGES+=$(foreach,i,$(CUSTOM_IMAGE_SETS) images_$i)
+CUSTOM_PREFERRED_FALLBACK*=-c $(SOLARSRC)$/ooo_custom_images$/tango
+
+CRYSTAL_TARBALL=$(SOLARSRC)$/external_images$/ooo_crystal_images-1.tar.gz
+OXYGEN_TARBALL=$(SOLARSRC)$/external_images$/ooo_oxygen_images-2009-06-17.tar.gz
+CLASSIC_TARBALL=$(SOLARSRC)$/ooo_custom_images$/classic/classic_images.tar.gz
+
+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) $(SOLARSRC)$/$(RSCDEFIMG)/res/commandimagelist -name "*.png" | sed "s#$(SOLARSRC)$/$(RSCDEFIMG)/res#%GLOBALRES%#" | $(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 $(SOLARSRC)$/$(RSCDEFIMG) -m $(SOLARSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -l $(SOLARCOMMONRESDIR)$/img -s $(SORTED_LIST) -l $(RES)$/img -o $@
+
+images_% : $(RES)$/img$/commandimagelist.ilst
+    $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(SOLARSRC)$/$(RSCDEFIMG) -m $(SOLARSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -c $(SOLARSRC)$/ooo_custom_images$/$(@:s/images_//) -c $(MISC)$/$(@:s/images_//) $(CUSTOM_PREFERRED_FALLBACK) -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) $@
+
+# generate the HiContrast icon set
+$(MISC)$/hicontrast.flag .PHONY :
+    $(PERL) $(SOLARENV)$/bin$/hicontrast-to-theme.pl $(SOLARSRC)$/default_images $(MISC)$/hicontrast && $(TOUCH) $@
+
+# unpack the Crystal icon set
+$(MISC)$/crystal.flag : $(CRYSTAL_TARBALL)
+    cd $(MISC) && gzip -d -c $(CRYSTAL_TARBALL) | ( tar -xf - ) && $(TOUCH) $(@:f)
+.IF "$(GUI)"=="UNX"
+    chmod -R g+w $(MISC)$/crystal
+.ENDIF
+    @$(TYPE) $@ || echo "ERROR: unpacking $(CRYSTAL_TARBALL) failed"
+
+# unpack the Oxygen icon set
+$(MISC)$/oxygen.flag : $(OXYGEN_TARBALL)
+    cd $(MISC) && gzip -d -c $(OXYGEN_TARBALL) | ( tar -xf - ) && $(TOUCH) $(@:f)
+.IF "$(GUI)"=="UNX"
+    chmod -R g+w $(MISC)$/oxygen
+.ENDIF
+    @$(TYPE) $@ || echo "ERROR: unpacking $(CRYSTAL_TARBALL) failed"
+
+# unpack the classic icon set
+$(MISC)$/classic.flag : $(CLASSIC_TARBALL)
+    cd $(MISC) && gunzip -d -c $(CLASSIC_TARBALL) | ( tar -xf - ) && $(TOUCH) $(@:f)
+.IF "$(GUI)"=="UNX"
+    chmod -R g+w $(MISC)$/classic
+.ENDIF
+    @$(TYPE) $@ || echo "ERROR: unpacking $(CLASSIC_TARBALL) failed"
+
+# dependencies
+images_hicontrast : $(MISC)$/hicontrast.flag $(RES)$/img$/commandimagelist.ilst
+
+images_crystal : $(MISC)$/crystal.flag $(RES)$/img$/commandimagelist.ilst
+
+images_oxygen : $(MISC)$/oxygen.flag $(RES)$/img$/commandimagelist.ilst
+
+images_classic : $(MISC)$/classic.flag $(RES)$/img$/commandimagelist.ilst
+
diff --git a/packimages/prj/build.lst b/packimages/prj/build.lst
new file mode 100644
index 000000000000..01aa1e57b619
--- /dev/null
+++ b/packimages/prj/build.lst
@@ -0,0 +1,3 @@
+pim	packimages	::	postprocess NULL
+pim	packimages						usr1	-	all	pim_mkout NULL
+pim	packimages\pack				nmake	-	all	pim_pack NULL
diff --git a/packimages/prj/d.lst b/packimages/prj/d.lst
new file mode 100644
index 000000000000..1f4473e644ac
--- /dev/null
+++ b/packimages/prj/d.lst
@@ -0,0 +1,2 @@
+mkdir: %COMMON_DEST%\bin%_EXT%
+..\%__SRC%\bin\*.zip %COMMON_DEST%\bin%_EXT%