CWS-TOOLING: integrate CWS kick4nt

1 files changed, 39 insertions, 39 deletions

diff --git a/solenv/inc/tg_config.mk b/solenv/inc/tg_config.mk
index 61130c289906..428f9ff80b96 100644
--- a/solenv/inc/tg_config.mk
+++ b/solenv/inc/tg_config.mk
@@ -29,13 +29,13 @@
 #
 #*************************************************************************
 
-PACKAGEDIR*:=$(subst,.,$/ $(PACKAGE))
+PACKAGEDIR*:=$(subst,.,/ $(PACKAGE))
 XSLTPACKAGEDIR*:=$(subst,.,/ $(PACKAGE))
 XCSROOTURL!:=$(ABSXCSROOT)
 .IF $(GUI)==WNT
 XCSROOTURL!:=file:///$(subst,\,/ $(XCSROOTURL))
 .ENDIF
-SYSXSLDIR*:=$(XSLDIR)$/
+SYSXSLDIR*:=$(XSLDIR)/
 
 #
 # --- XCS ---
@@ -43,50 +43,50 @@ SYSXSLDIR*:=$(XSLDIR)$/
 
 .IF "$(XCSFILES)"!=""
 # remove unnecessary info from the component schemas
-XCS_TRIM=$(PROCESSOUT)$/registry$/schema$/$(PACKAGEDIR)$/{$(XCSFILES)}
+XCS_TRIM=$(PROCESSOUT)/registry/schema/$(PACKAGEDIR)/{$(XCSFILES)}
 
 # transform xcs format to properties format
-# XCS_RESOURCES=$(foreach,i,$(XCSFILES) $(MISC)$/registry$/res$/{$(alllangiso)}$/$(PACKAGEDIR)$/$(i:b).properties)
+# XCS_RESOURCES=$(foreach,i,$(XCSFILES) $(MISC)/registry/res/{$(alllangiso)}/$(PACKAGEDIR)/$(i:b).properties)
 
 ALLTAR: \
     $(XCS_TRIM) 
 .ENDIF			# "$(XCSFILES)"!=""
 
 .IF "$(XCS_TRIM)" != ""
-$(XCS_TRIM) :   $(DTDDIR)$/registry$/component-schema.dtd \
-                $(XSLDIR)$/schema_val.xsl \
-                $(XSLDIR)$/sanity.xsl \
-                $(XSLDIR)$/schema_trim.xsl 
+$(XCS_TRIM) :   $(DTDDIR)/registry/component-schema.dtd \
+                $(XSLDIR)/schema_val.xsl \
+                $(XSLDIR)/sanity.xsl \
+                $(XSLDIR)/schema_trim.xsl 
 .ENDIF
 
-$(PROCESSOUT)$/registry$/schema$/$(PACKAGEDIR)$/%.xcs : %.xcs
+$(PROCESSOUT)/registry/schema/$(PACKAGEDIR)/%.xcs : %.xcs
     @echo -------------+ validating and stripping schema files
     -$(MKDIRHIER) $(@:d)
-    $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))$/$(subst,$(PRJ), $(@:d))$*.val) \
+    $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))/$(subst,$(PRJ), $(@:d))$*.val) \
                 --stringparam componentName $(PACKAGE).$* \
                 $(SYSXSLDIR)schema_val.xsl $<
-    $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))$/$(subst,$(PRJ), $(@:d))$*.san) \
+    $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))/$(subst,$(PRJ), $(@:d))$*.san) \
                 $(SYSXSLDIR)sanity.xsl $<
-    $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))$/$(subst,$(PRJ), $@)) \
+    $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))/$(subst,$(PRJ), $@)) \
                 $(SYSXSLDIR)schema_trim.xsl $<
     +-$(RM) $(@:d)$*.val > $(NULLDEV)
     +-$(RM) $(@:d)$*.san > $(NULLDEV)
 
-$(PROCESSOUT)$/merge$/$(PACKAGEDIR)$/%.xcs : %.xcs
+$(PROCESSOUT)/merge/$(PACKAGEDIR)/%.xcs : %.xcs
 # just a copy for now - insert "cfgex" commandline when required
     -$(MKDIRHIER) $(@:d)
     $(COPY) $< $@
 
 # Create properties files for localized <info> contents (Currently not built)
 .IF "$(XCS_RESOURCES)" != ""
-$(XCS_RESOURCES) :   $(XSLDIR)$/resource.xsl 
+$(XCS_RESOURCES) :   $(XSLDIR)/resource.xsl 
 .ENDIF
 
-$(PROCESSOUT)$/registry$/res$/{$(alllangiso)}$/$(PACKAGEDIR)$/%.properties :| $(PROCESSOUT)$/merge$/$(PACKAGEDIR)$/%.xcs
+$(PROCESSOUT)/registry/res/{$(alllangiso)}/$(PACKAGEDIR)/%.properties :| $(PROCESSOUT)/merge/$(PACKAGEDIR)/%.xcs
     @echo -------------+ creating locale dependent resource bundles
     -$(MKDIRHIER) $(@:d)
-    $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))$/$(subst,$(PRJ), $@)) \
-                --stringparam locale {$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))} \
+    $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))/$(subst,$(PRJ), $@)) \
+                --stringparam locale {$(subst,/$(PACKAGEDIR)/$(@:f), $(subst,$(PROCESSOUT)/registry/res/, $@))} \
                 $(SYSXSLDIR)resource.xsl $<
 
 # 
@@ -94,25 +94,25 @@ $(PROCESSOUT)$/registry$/res$/{$(alllangiso)}$/$(PACKAGEDIR)$/%.properties :| $(
 #
 
 .IF "$(XCUFILES)"!=""
-XCU_DEFAULT =$(PROCESSOUT)$/registry$/data$/$(PACKAGEDIR)$/{$(XCUFILES)}
-XCU_MODULES =$(foreach,i,$(MODULEFILES) $(PROCESSOUT)$/registry$/spool$/$(PACKAGEDIR)$/$(i))
-XCU_LANG    =$(foreach,i,$(LOCALIZEDFILES) $(PROCESSOUT)$/registry$/res$/{$(alllangiso)}$/$(PACKAGEDIR)$/$(i))
+XCU_DEFAULT =$(PROCESSOUT)/registry/data/$(PACKAGEDIR)/{$(XCUFILES)}
+XCU_MODULES =$(foreach,i,$(MODULEFILES) $(PROCESSOUT)/registry/spool/$(PACKAGEDIR)/$(i))
+XCU_LANG    =$(foreach,i,$(LOCALIZEDFILES) $(PROCESSOUT)/registry/res/{$(alllangiso)}/$(PACKAGEDIR)/$(i))
 .ENDIF			# "$(XCUFILES)"!=""
 
 .IF "$(XCU_DEFAULT)" != ""
-$(XCU_DEFAULT) : $(DTDDIR)$/registry$/component-update.dtd \
-                 $(XSLDIR)$/data_val.xsl \
-                 $(XSLDIR)$/alllang.xsl 
+$(XCU_DEFAULT) : $(DTDDIR)/registry/component-update.dtd \
+                 $(XSLDIR)/data_val.xsl \
+                 $(XSLDIR)/alllang.xsl 
 .ENDIF
 
-$(PROCESSOUT)$/registry$/data$/$(PACKAGEDIR)$/%.xcu : %.xcu
+$(PROCESSOUT)/registry/data/$(PACKAGEDIR)/%.xcu : %.xcu
     @echo -------------+ validating and creating a locale independent file
     -$(MKDIRHIER) $(@:d) 
-    $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))$/$(subst,$(PRJ), $(@:d))$*.val) \
+    $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))/$(subst,$(PRJ), $(@:d))$*.val) \
                 --stringparam xcs $(XCSROOTURL)/registry/schema/$(XSLTPACKAGEDIR)/$*.xcs \
                 --stringparam schemaRoot $(XCSROOTURL)/registry/schema \
                 $(SYSXSLDIR)data_val.xsl $<
-    $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))$/$(subst,$(PRJ), $@)) \
+    $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))/$(subst,$(PRJ), $@)) \
                 --stringparam xcs $(XCSROOTURL)/registry/schema/$(XSLTPACKAGEDIR)/$*.xcs \
                 --stringparam schemaRoot $(XCSROOTURL)/registry/schema \
                 $(SYSXSLDIR)alllang.xsl $<
@@ -124,48 +124,48 @@ $(PROCESSOUT)$/registry$/data$/$(PACKAGEDIR)$/%.xcu : %.xcu
 $(XCU_LANG) : $(LOCALIZESDF)
 .ENDIF			# "$(XCU_LANG)"!=""
 
-$(PROCESSOUT)$/merge$/$(PACKAGEDIR)$/%.xcu : %.xcu
+$(PROCESSOUT)/merge/$(PACKAGEDIR)/%.xcu : %.xcu
     -$(MKDIRHIER) $(@:d)
     $(CFGEX) -p $(PRJNAME) -i $(@:f) -o $@ -m $(LOCALIZESDF) -l all
 
 .IF "$(XCU_LANG)" != ""
-$(XCU_LANG) : $(XSLDIR)$/alllang.xsl
+$(XCU_LANG) : $(XSLDIR)/alllang.xsl
 .ENDIF
 
-$(PROCESSOUT)$/registry$/res$/{$(alllangiso)}$/$(PACKAGEDIR)$/%.xcu :| $(PROCESSOUT)$/merge$/$(PACKAGEDIR)$/%.xcu
+$(PROCESSOUT)/registry/res/{$(alllangiso)}/$(PACKAGEDIR)/%.xcu :| $(PROCESSOUT)/merge/$(PACKAGEDIR)/%.xcu
 .ELSE			# "$(WITH_LANG)"!=""
-$(PROCESSOUT)$/registry$/res$/{$(alllangiso)}$/$(PACKAGEDIR)$/%.xcu :| %.xcu
+$(PROCESSOUT)/registry/res/{$(alllangiso)}/$(PACKAGEDIR)/%.xcu :| %.xcu
 .ENDIF			# "$(WITH_LANG)"!=""
     @echo ------------- creating locale dependent entries
     -$(MKDIRHIER) $(@:d)
-    $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))$/$(subst,$(PRJ), $@)) \
+    $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))/$(subst,$(PRJ), $@)) \
                 --stringparam xcs $(XCSROOTURL)/registry/schema/$(XSLTPACKAGEDIR)/$*.xcs \
                 --stringparam schemaRoot $(XCSROOTURL)/registry/schema \
-                --stringparam locale {$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))} \
+                --stringparam locale {$(subst,/$(PACKAGEDIR)/$(@:f), $(subst,$(PROCESSOUT)/registry/res/, $@))} \
                 $(SYSXSLDIR)alllang.xsl $<
 
 # --- languagepack tag modules ---
 .IF "$(LANGUAGEPACKS)" != ""
-$(LANGUAGEPACKS) : $(XSLDIR)$/delcomment.sed 
+$(LANGUAGEPACKS) : $(XSLDIR)/delcomment.sed 
 .ENDIF
 
 
-$(PROCESSOUT)$/registry$/spool$/Langpack-%.xcu : Langpack.xcu.tmpl
+$(PROCESSOUT)/registry/spool/Langpack-%.xcu : Langpack.xcu.tmpl
     @echo -------------+ creating a Langpack module for locale $*
     -$(MKDIRHIER) $(@:d) 
-    $(SED) -e "s/__LANGUAGE__/$*/" -f $(XSLDIR)$/delcomment.sed $< > $@
+    $(SED) -e "s/__LANGUAGE__/$*/" -f $(XSLDIR)/delcomment.sed $< > $@
 
 
 # --- modules ---
 .IF "$(XCU_MODULES)" != ""
-$(XCU_MODULES) : $(XSLDIR)$/alllang.xsl 
+$(XCU_MODULES) : $(XSLDIR)/alllang.xsl 
 .ENDIF
 
 
-$(PROCESSOUT)$/registry$/spool$/$(PACKAGEDIR)$/%.xcu :| $$(@:b:s/-/./:b).xcu
+$(PROCESSOUT)/registry/spool/$(PACKAGEDIR)/%.xcu :| $$(@:b:s/-/./:b).xcu
     @echo -------------+ creating a module file
     -$(MKDIRHIER) $(@:d) 
-    $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))$/$(subst,$(PRJ), $@)) \
+    $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))/$(subst,$(PRJ), $@)) \
                 --stringparam xcs $(XCSROOTURL)/registry/schema/$(XSLTPACKAGEDIR)/$(<:b).xcs \
                 --stringparam schemaRoot $(XCSROOTURL)/registry/schema \
                 --stringparam module $(subst,$(<:b)-, $(*)) \
@@ -177,7 +177,7 @@ ALLTAR: \
     $(XCU_MODULES) \
     $(XCU_LANG)
 
-$(XCU_DEFAULT) : $$(@:d:s!$(PROCESSOUT)$/registry$/data$/!$(ABSXCSROOT)$/registry$/schema$/!)$$(@:f:s/.xcu/.xcs/)
+$(XCU_DEFAULT) : $$(@:d:s!$(PROCESSOUT)/registry/data/!$(ABSXCSROOT)/registry/schema/!)$$(@:f:s/.xcu/.xcs/)
 
 .ENDIF			# "$(XCUFILES)"!=""