Apache OpenOffice (AOO) Bugzilla – Issue 39341
icon packaging code can't create multiple layered themes ...
Last modified: 2010-11-10 23:14:12 UTC
As above really; some patches to this & packimages.pl required. Turning the image paths into real paths as a first step, then updating the instsetoo_native/packimages makefile.
Doing the work on cws 'industrial01'
And, of course - it turns out this already works nicely in packimages.pl, so it's just a few instsetoo_native changes required.
also, requires some config_office changes & in fact packimages.pl changes are necessary - since most custom icon sets will want to fall-back through Industrial to the default set - since they will be 24x24 & 16x16 not 26x26 and 16x16.
Created attachment 20692 [details] packimages.pl change for multiple -c statements cf.gcc -I . -I .. etc.
Created attachment 20693 [details] trivial packimages makefile.mk patch
Ingo - any chance you can look at the scp2/ changes [ in the style of the babelfish cws & incorporating that prj/build.lst work ], to build the images.inc file. Initially I made this define a macro that could then be invoked in ooo_files.scp - I don't know if you prefer that ? [ making it more 'pure' include - but this complicated the code a little ]. Input much appreciated; clearly this depends on cws babelfish getting nominated now I guess.
Created attachment 20727 [details] scp changes
Well, it looks really interesting ;-) I would prefer, that you do not include the inc file into the file_ooo.scp. Why don't you create the complete scp file, or at least use a nearly empty file_images_ooo.scp, which contains only the header and the include input. Then you only have to add the file_images_ooo.par into the util/makefile.mk for OpenOffice. But if this works, it is of course also okay. (Please remove the flag SETUPZIP, it is no longer supported). IS -> Ause: How is CUSTOM_IMAGE_SETS defined for StarOffice?
Ingo - I've done as you suggested - a new, small file that just does this include for the images. I guess getting some review of the packimages change would be good - Ause - are you ok with that ? [ in the meantime I'll re-sync the cws to m68 ]
the patches for "packimages.pl" and the makefile look fine (did no explicit check though). there is just a minor issue in the makefile of some "/" which should be "$/".
Thanks Hans, committed that fix - so that's about it here I guess.
I verified that industrial01 builds for W32-tcsh and that all the code changes/new code look sensible. The new file_images_ooo.* and generation by scp/macros/ stuff was proposed by Ingo (and hereby IMHO preaproved) so that I declare this verified.
A Closed issue, is a Happy issue. Regards Andrew
Created attachment 73828