[Libreoffice] Wanted Presenter Screen

[Rene Engelhard]

On Wed, Jan 12, 2011 at 02:13:15AM +0100, Rene Engelhard wrote:
> My build log says the following in the build:
[...]
> cat description.tmp | sed s/UPDATED_PLATFORM/linux_x86_64/ > ../../unxlngx6.pro/misc/PresenterScreen/description.xml
> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
> cat: description.tmp: No such file or directory
> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
> cat manifest.xml | sed "s/SHARED_EXTENSION/.so/" > ../../unxlngx6.pro/misc/PresenterScreen/META-INF/manifest.xml
> 
> I think this is a blocker, isn't it?

OK, and this is why - see sdext/source/presenter/makefile.mk:

OOo:

$(DESCRIPTION) $(PHONYDESC) : $$(@:f)
        @-$(MKDIRHIER) $(@:d)
        $(PERL) $(SOLARENV)$/bin$/licinserter.pl description.xml registry/LICENSE_xxx $(DESCRIPTION_TMP)
        @echo LAST_WITH_LANG=$(WITH_LANG) > $(ZIP1DIR)_lang_track.mk
        $(TYPE) $(DESCRIPTION_TMP) | sed s/UPDATED_PLATFORM/$(PLATFORMID)/ > $@
        @@-$(RM) $(DESCRIPTION_TMP)

us:

$(DESCRIPTION) $(PHONYDESC) : $$(@:f)
    @-$(MKDIRHIER) $(@:d)
    @echo LAST_WITH_LANG=$(WITH_LANG) > $(ZIP1DIR)_lang_track.mk
    $(TYPE) description.tmp | sed s/UPDATED_PLATFORM/$(PLATFORMID)/ > $@

This commit broke it:

commit dffdb2c6d18435360b05a4fbf111fcd86cca4248
Author: Fridrich Štrba <fridrich.strba at bluewin.ch>
Date:   Mon Dec 13 21:19:49 2010 +0100

    Don't bundle MSVC runtime + don't dupplicate licenses

which did (amongst others) the following:

@@ -365,19 +365,14 @@ $(ZIP1DIR)$/%.xcs : %.xcs
     @@-$(MKDIRHIER) $(@:d)
     $(GNUCOPY) $< $@

-# Temporary file that is used to replace some placeholders in description.xml.
-DESCRIPTION_TMP:=$(ZIP1DIR)$/description.xml.tmp
-
 .INCLUDE .IGNORE : $(ZIP1DIR)_lang_track.mk
 .IF "$(LAST_WITH_LANG)"!="$(WITH_LANG)"
 PHONYDESC=.PHONY
 .ENDIF                 # "$(LAST_WITH_LANG)"!="$(WITH_LANG)"
 $(DESCRIPTION) $(PHONYDESC) : $$(@:f)
     @-$(MKDIRHIER) $(@:d)
-    $(PERL) $(SOLARENV)$/bin$/licinserter.pl description.xml registry/LICENSE_xxx $(DESCRIPTION_TMP)
     @echo LAST_WITH_LANG=$(WITH_LANG) > $(ZIP1DIR)_lang_track.mk
-    $(TYPE) $(DESCRIPTION_TMP) | sed s/UPDATED_PLATFORM/$(PLATFORMID)/ > $@
-    @@-$(RM) $(DESCRIPTION_TMP)
+    $(TYPE) description.tmp | sed s/UPDATED_PLATFORM/$(PLATFORMID)/ > $@

This means the description.xml in solver (used for packing up the oxt) doesn't get correctly written because
being based on something not existing.

Given the above commit was intentional and that we're in deep freeze I don't think we should readd the lines but just do

diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk
index 696d0e5..9e25e34 100755
--- a/sdext/source/presenter/makefile.mk
+++ b/sdext/source/presenter/makefile.mk
@@ -372,7 +372,7 @@ PHONYDESC=.PHONY
 $(DESCRIPTION) $(PHONYDESC) : $$(@:f)
     @-$(MKDIRHIER) $(@:d)
     @echo LAST_WITH_LANG=$(WITH_LANG) > $(ZIP1DIR)_lang_track.mk
-    $(TYPE) description.tmp | sed s/UPDATED_PLATFORM/$(PLATFORMID)/ > $@
+    $(TYPE) description.xml | sed s/UPDATED_PLATFORM/$(PLATFORMID)/ > $@


 .ENDIF # "$(ENABLE_PRESENTER_SCREEN)" != "NO"

Grüße/Regards,

René
-- 
 .''`.  René Engelhard -- Debian GNU/Linux Developer
 : :' : http://www.debian.org | http://people.debian.org/~rene/
 `. `'  rene at debian.org | GnuPG-Key ID: D03E3E70
   `-   Fingerprint: E12D EA46 7506 70CF A960 801D 0AA0 4571 D03E 3E70