[Libreoffice-commits] .: readlicense_oo/util

[Sebastian Spaeth]

 readlicense_oo/util/makefile.pmk |   22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

New commits:
commit 42d6c3efc3a5c443588f295cb484b83dacff54ed
Author: Sebastian Spaeth <Sebastian at SSpaeth.de>
Date:   Thu Nov 18 14:09:30 2010 +0100

    Revert "Don't produce .html variant of README_lang files"
    
    Same as with the LICENSE.html. Somewhere the installer still expects
    it to be present and complains. Oh well. Someone should do a proper
    job in removing superfluous files.
    
    This reverts commit ecf2ec2e37a38c9e82338c81a8a7e49efd5283f4.

diff --git a/readlicense_oo/util/makefile.pmk b/readlicense_oo/util/makefile.pmk
index 2e072f1..0efd971 100755
--- a/readlicense_oo/util/makefile.pmk
+++ b/readlicense_oo/util/makefile.pmk
@@ -30,8 +30,10 @@
 .IF "$(GUI)"=="UNX"
 # uppercase and no filename extension for txt
 SYSTEXTDOCS=$(foreach,i,$(alllangiso) $(MISC)$/$(GUI)$/README_$i)
+SYSHTMLDOCS=$(SYSTEXTDOCS:+".html")
 .ELSE		# "$(GUI)"=="UNX"
 SYSTEXTDOCS=$(foreach,i,$(alllangiso) $(MISC)$/$(GUI)$/readme_$i.txt)
+SYSHTMLDOCS=$(SYSTEXTDOCS:s/.txt/.html/)
 .ENDIF		# "$(GUI)"=="UNX"
 
 .IF "$(WITH_LANG)"!=""
@@ -42,7 +44,7 @@ MERGEDXRM=.$/readme.xrm
 
 .INCLUDE : target.mk
 
-ALLTAR : $(SYSTEXTDOCS)
+ALLTAR : $(SYSTEXTDOCS) $(SYSHTMLDOCS)
 
 $(COMMONMISC)$/readme.dtd : ..$/readme.dtd  
     $(MKDIRHIER) $(MISC)$/$(GUI)
@@ -53,6 +55,24 @@ virtual : $(MERGEDXRM) $(COMMONMISC)$/readme.dtd $(PRJ)$/docs/readme.xsl
 $(MISC)$/readme_text.xsl : virtual
      $(SED) '' < ..$/readme.xsl > $@
 
+$(MISC)$/$(GUI)$/$(eq,$(GUI),WNT readme README)_%.html : 'virtual'
+    @@-$(MKDIRHIER) $(@:d)
+    $(XSLTPROC) --nonet --novalid -o $@ \
+    --stringparam os1 $(OS)	--stringparam gui1 $(GUI)	--stringparam com1  $(COM) \
+    --stringparam cp1 $(CPUNAME)	--stringparam type html	--stringparam lang1 $* \
+    ..$/readme.xsl	$(MERGEDXRM)
+.IF "$(GUI)"=="UNX"
+    chmod g+w $(MISC)$/$(GUI)
+.ENDIF			# "$(GUI)"=="UNX"
+
+$(MISC)$/$(GUI)$/$(eq,$(GUI),OS2 readme README)_%.html : 'virtual'
+    @@-$(MKDIRHIER) $(@:d)
+    $(XSLTPROC) --nonet --novalid -o $@ \
+    --stringparam os1 $(OS)	--stringparam gui1 $(GUI)	--stringparam com1  $(COM) \
+    --stringparam cp1 $(CPUNAME)	--stringparam type html	--stringparam lang1 $* \
+    ..$/readme.xsl	$(MERGEDXRM)
+
+# no percent-rule to avoid ambiguous inference chains for README_<lang>.html 
 $(SYSTEXTDOCS) : $(MISC)$/readme_text.xsl
     @@-$(MKDIRHIER) $(@:d)
     $(XSLTPROC) --nonet --novalid -o $@ \