CWS-TOOLING: integrate CWS cloph12

2009-01-13 18:36:51 +0100 cloph  r266245 : #i98008# add back the XSLTLIB exports - used when using the internal libxslt (patched xslt-config that uses that var)
2009-01-13 01:51:56 +0100 cloph  r266186 : #i97928# missed hu_HU in the initial commit
2009-01-12 22:45:02 +0100 cloph  r266183 : #i98008# remove unused XSLTLIB exports
2009-01-12 00:30:16 +0100 cloph  r266130 : #i97928# silence timestamp has not been update warning, reduce number of unzip calls
2009-01-11 22:02:28 +0100 cloph  r266129 : #i80368# fix ambiguous inference chains, remove duplicated license files, minor other cleanup

1 files changed, 30 insertions, 54 deletions

diff --git a/readlicense_oo/util/makefile.pmk b/readlicense_oo/util/makefile.pmk
index 7001f39398..37f70734f5 100755
--- a/readlicense_oo/util/makefile.pmk
+++ b/readlicense_oo/util/makefile.pmk
@@ -8,8 +8,6 @@
 #
 # $RCSfile: makefile.pmk,v $
 #
-# $Revision: 1.19 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,64 +30,42 @@
 # --- Targets ------------------------------------------------------
 
 .IF "$(GUI)"=="UNX"
-SYSDOCS=$(foreach,j,$(READMEFILES) $(j:d)$(j:b:u)$(j:e:s/.txt//))
-.ELSE          # "$(GUI)"=="UNX"
-SYSDOCS=$(foreach,j,$(READMEFILES) $(j:d)$(j:b)$(j:e))
-.ENDIF          # "$(GUI)"=="UNX"
-
-ALLDOCS:=$(foreach,i,$(alllangiso) $(foreach,j,$(READMEFILES) $(j:d)$(j:b)_$i$(j:e)))
-ALLSYSDOCS:=$(foreach,i,$(alllangiso) $(foreach,j,$(SYSDOCS) $(j:d)$(GUI)$/$(j:b)_$i$(j:e)))
+# 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)"!="en-US"
-MERGEDXRM=$(COMMONMISC)$/$(TARGET)$/$(READMEFILES:b:+".xrm")
-MERGEDXRMDIR=$(COMMONMISC)$/$(TARGET)
-.ELSE			# "$(WITH_LANG)"!="en-US"
-MERGEDXRM=$(READMEFILES:b:+".xrm")
-MERGEDXRMDIR=.
-.ENDIF			# "$(WITH_LANG)"!="en-US"
+.IF "$(WITH_LANG)"!=""
+MERGEDXRM=$(COMMONMISC)$/$(TARGET)$/readme.xrm
+.ELSE		# "$(WITH_LANG)"!=""
+MERGEDXRM=.$/readme.xrm
+.ENDIF		# "$(WITH_LANG)"!=""
 
 .INCLUDE : target.mk
 
-ALLTAR : $(ALLSYSDOCS)
-
-$(ALLDOCS) : $(MERGEDXRMDIR)$/$(READMEFILES:b:+".xrm") $(PRJ)$/docs/readme.xsl $(COMMONMISC)$/readme.dtd
+ALLTAR : $(SYSTEXTDOCS) $(SYSHTMLDOCS)
 
-$(COMMONMISC)$/readme.dtd : ..$/readme.dtd
+$(COMMONMISC)$/readme.dtd : ..$/readme.dtd  
+    $(MKDIRHIER) $(MISC)$/$(GUI)
     $(COPY) $< $@
 
-$(MISC)$/$(GUI)$/README%.html : $(MISC)$/readme%.html
-    @+-$(MKDIRHIER) $(@:d)
-    +$(COPY) $< $@
-   
-$(MISC)$/$(GUI)$/README% : $(MISC)$/readme%.txt
-    @+-$(MKDIRHIER) $(@:d)
-    +$(COPY) $< $@
-   
-$(MISC)$/$(GUI)$/readme% : $(MISC)$/readme%
-    @+-$(MKDIRHIER) $(@:d)
-    +$(COPY) $< $@
-   
-$(MISC)$/readme%.html :
-    @+-$(MKDIRHIER) $(@:d)
+virtual : $(MERGEDXRM) $(COMMONMISC)$/readme.dtd $(PRJ)$/docs/readme.xsl
+
+$(MISC)$/readme_text.xsl : virtual
+    $(SED) 's#method="html".*>#method="text"/>#' < ..$/readme.xsl > $@
+
+$(MISC)$/$(GUI)$/$(eq,$(GUI),WNT readme README)_%.html : 'virtual'
     $(XSLTPROC) --nonet -o $@ \
-             --stringparam os1 $(OS) \
-             --stringparam gui1 $(GUI) \
-             --stringparam cp1 $(CPUNAME) \
-             --stringparam com1 $(COM) \
-             --stringparam lang1 $(@:b:s/_/./:e:s/.//) \
-             --stringparam type html \
-         ..$/readme.xsl \
-             $(subst,_$(@:b:s/_/./:e:s/.//), $(MERGEDXRMDIR)$/$(@:b).xrm)
+    --stringparam os1 $(OS)	--stringparam gui1 $(GUI)	--stringparam com1  $(COM) \
+    --stringparam cp1 $(CPUNAME)	--stringparam type html	--stringparam lang1 $* \
+    ..$/readme.xsl	$(MERGEDXRM)
 
-$(MISC)$/readme%.txt :
-    @+-$(MKDIRHIER) $(@:d)
-    $(SED) "s#method=\(.\)html..*#method=\1text\1/>#" < ..$/readme.xsl | \
-             $(XSLTPROC) --nonet -o $@ \
-             --stringparam os1 $(OS) \
-             --stringparam gui1 $(GUI) \
-             --stringparam cp1 $(CPUNAME) \
-             --stringparam com1 $(COM) \
-             --stringparam lang1 $(@:b:s/_/./:e:s/.//) \
-             --stringparam type text \
-             - \
-             $(subst,_$(@:b:s/_/./:e:s/.//), $(MERGEDXRMDIR)$/$(@:b).xrm)
+# no percent-rule to avoid ambiguous inference chains for README_<lang>.html 
+$(SYSTEXTDOCS) : $(MISC)$/readme_text.xsl
+    $(XSLTPROC) --nonet -o $@ \
+    --stringparam os1 $(OS)	--stringparam gui1 $(GUI)	--stringparam com1  $(COM) \
+    --stringparam cp1 $(CPUNAME)	--stringparam type text	--stringparam lang1 $(@:b:s/readme_//:s/README_//) \
+    $<	$(MERGEDXRM)