INTEGRATION: CWS ause016 (1.4.36); FILE MERGED

2005/01/18 10:51:59 hjs 1.4.36.1: #i35263# avoid language specific lines in d.lst

1 files changed, 31 insertions, 13 deletions

diff --git a/readlicense_oo/util/makefile.pmk b/readlicense_oo/util/makefile.pmk
index 20a6f79fe62a..0f839c39c810 100755
--- a/readlicense_oo/util/makefile.pmk
+++ b/readlicense_oo/util/makefile.pmk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.pmk,v $
 #
-#   $Revision: 1.4 $
+#   $Revision: 1.5 $
 #
-#   last change: $Author: hjs $ $Date: 2004-06-26 03:08:51 $
+#   last change: $Author: kz $ $Date: 2005-01-21 09:52:02 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -67,19 +67,37 @@
 MAXPROCESS=1
 .ENDIF
 
-ALLDOCS = $(foreach,i,$(alllangiso) $(foreach,j,$(READMEFILES) $(j:d)$i$/$(j:b)_$i$(j:e)))
+.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)))
 
 .INCLUDE : target.mk
 
-ALLTAR : $(ALLDOCS)
+ALLTAR : $(ALLSYSDOCS)
 
 $(ALLDOCS) : $(COMMONMISC)$/$(TARGET)$/$(READMEFILES:b:+".xrm") $(PRJ)$/docs/readme.xsl
 
-
-$(MISC)$/%.html :
+$(MISC)$/$(GUI)$/README%.html : $(MISC)$/readme%.html
+    @+-$(MKDIR) $(@:d)
+    +$(COPY) $< $@
+   
+$(MISC)$/$(GUI)$/README% : $(MISC)$/readme%.txt
+    @+-$(MKDIR) $(@:d)
+    +$(COPY) $< $@
+   
+$(MISC)$/$(GUI)$/readme% : $(MISC)$/readme%
+    @+-$(MKDIR) $(@:d)
+    +$(COPY) $< $@
+   
+$(MISC)$/readme%.html :
     @+-$(MKDIR) $(@:d)
 .IF "$(SOLAR_JAVA)"!=""
-    $(JAVA) -classpath $(COMMON_BUILD_TOOLS)$/xt.jar$(PATH_SEPERATOR)$(COMMON_BUILD_TOOLS)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $(subst,_$(@:d:d:b), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(@:d:d:b) type=html file=$@
+    $(JAVA) -classpath $(COMMON_BUILD_TOOLS)$/xt.jar$(PATH_SEPERATOR)$(COMMON_BUILD_TOOLS)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $(subst,_$(@:b:s/_/./:e:s/.//), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(@:b:s/_/./:e:s/.//) type=html file=$@
 .ELSE
     sed 's|xmlns:xt="http://www.jclark.com/xt"||;s|extension-element-prefixes="xt"||;s|.*xt:document.*||;s|<xsl:output method = "HTML" doctype-public = "-//W3C//DTD HTML 3.2//EN" />|<xsl:output method="html" doctype-public="-//W3C//DTD HTML 3.2//EN" />|' < ..$/readme.xsl > ..$/readme2.xsl
     xsltproc -o $@ \
@@ -87,17 +105,17 @@ $(MISC)$/%.html :
              --stringparam gui1 $(GUI) \
              --stringparam cp1 $(CPUNAME) \
              --stringparam com1 $(COM) \
-             --stringparam lang1 $(@:d:d:b) \
+             --stringparam lang1 $(@:b:s/_/./:e:s/.//) \
              --stringparam type html \
              ..$/readme2.xsl \
-             $(subst,_$(@:d:d:b), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm)
+             $(subst,_$(@:b:s/_/./:e:s/.//), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm)
     rm ..$/readme2.xsl
 .ENDIF
 
-$(MISC)$/%.txt :
+$(MISC)$/readme%.txt :
     @+-$(MKDIR) $(@:d)
 .IF "$(SOLAR_JAVA)"!=""
-    $(JAVA) -classpath $(COMMON_BUILD_TOOLS)$/xt.jar$(PATH_SEPERATOR)$(COMMON_BUILD_TOOLS)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $(subst,_$(@:d:d:b), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(@:d:d:b) type=text file=$@
+    $(JAVA) -classpath $(COMMON_BUILD_TOOLS)$/xt.jar$(PATH_SEPERATOR)$(COMMON_BUILD_TOOLS)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $(subst,_$(@:b:s/_/./:e:s/.//), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(@:b:s/_/./:e:s/.//) type=text file=$@
 .ELSE
     sed 's|xmlns:xt="http://www.jclark.com/xt"||;s|extension-element-prefixes="xt"||;s|.*xt:document.*||;s|<xsl:output method = "HTML" doctype-public = "-//W3C//DTD HTML 3.2//EN" />|<xsl:output method="text" />|' < ..$/readme.xsl > ..$/readme2.xsl
     xsltproc -o $@ \
@@ -105,10 +123,10 @@ $(MISC)$/%.txt :
              --stringparam gui1 $(GUI) \
              --stringparam cp1 $(CPUNAME) \
              --stringparam com1 $(COM) \
-             --stringparam lang1 $(@:d:d:b) \
+             --stringparam lang1 $(@:b:s/_/./:e:s/.//) \
              --stringparam type text \
              ..$/readme2.xsl \
-             $(subst,_$(@:d:d:b), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm)
+             $(subst,_$(@:b:s/_/./:e:s/.//), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm)
     rm ..$/readme2.xsl
 .ENDIF