CWS-TOOLING: integrate CWS kick4nt

1 files changed, 60 insertions, 100 deletions

diff --git a/solenv/inc/_tg_sdi.mk b/solenv/inc/_tg_sdi.mk
index d2ac613a41ea..c10ad54608cd 100644
--- a/solenv/inc/_tg_sdi.mk
+++ b/solenv/inc/_tg_sdi.mk
@@ -5,11 +5,7 @@ $(HIDSID1PARTICLE): $(SDI1TARGET)
     @echo ------------------------------
     @echo Making: $@
     @-$(RM) $@.$(ROUT).tmp $@
-.IF "$(USE_SHELL)"=="4nt"
-    @$(TYPE) $(MISC)$/$(SDI1NAME).sid | $(AWK) "$$1==\"#define\" { print $$2, $$3 }" > $@.$(ROUT).tmp
-.ELSE
-    @$(TYPE) $(MISC)$/$(SDI1NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
-.ENDIF
+    @$(TYPE) $(MISC)/$(SDI1NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
     @-$(RM) $@
     @$(RENAME) $@.$(ROUT).tmp $@
 .ENDIF # "$(HIDSID1PARTICLE)"!=""
@@ -20,12 +16,12 @@ $(SDI1TARGET): $(SVSDI1DEPEND) $(SDI1NAME).sdi
     @echo Making: $@
     @-$(RM) $@
     $(SVIDL) @$(mktmp \
-    -fs$(INCCOMX)$/$(SDI1NAME).hxx	\
-    -fd$(INCCOMX)$/$(SDI1NAME).ilb	\
-    -fm$(MISC)$/$(SDI1NAME).don	\
-    -fl$(MISC)$/$(SDI1NAME).lst         \
+    -fs$(INCCOMX)/$(SDI1NAME).hxx	\
+    -fd$(INCCOMX)/$(SDI1NAME).ilb	\
+    -fm$(MISC)/$(SDI1NAME).don	\
+    -fl$(MISC)/$(SDI1NAME).lst         \
     -fx$(SDI1EXPORT).sdi		\
-    -fz$(MISC)$/$(SDI1NAME).sid	\
+    -fz$(MISC)/$(SDI1NAME).sid	\
     $(SDI1NAME).sdi -I$(MISC) -I$(SVSDIINC) -I$(INC) $(INCLUDE))
 .ENDIF # "$(SDI1TARGET)"!=""
 
@@ -37,11 +33,7 @@ $(HIDSID2PARTICLE): $(SDI2TARGET)
     @echo ------------------------------
     @echo Making: $@
     @-$(RM) $@.$(ROUT).tmp $@
-.IF "$(USE_SHELL)"=="4nt"
-    @$(TYPE) $(MISC)$/$(SDI2NAME).sid | $(AWK) "$$1==\"#define\" { print $$2, $$3 }" > $@.$(ROUT).tmp
-.ELSE
-    @$(TYPE) $(MISC)$/$(SDI2NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
-.ENDIF
+    @$(TYPE) $(MISC)/$(SDI2NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
     @-$(RM) $@
     @$(RENAME) $@.$(ROUT).tmp $@
 .ENDIF # "$(HIDSID2PARTICLE)"!=""
@@ -52,12 +44,12 @@ $(SDI2TARGET): $(SVSDI2DEPEND) $(SDI2NAME).sdi
     @echo Making: $@
     @-$(RM) $@
     $(SVIDL) @$(mktmp \
-    -fs$(INCCOMX)$/$(SDI2NAME).hxx	\
-    -fd$(INCCOMX)$/$(SDI2NAME).ilb	\
-    -fm$(MISC)$/$(SDI2NAME).don	\
-    -fl$(MISC)$/$(SDI2NAME).lst         \
+    -fs$(INCCOMX)/$(SDI2NAME).hxx	\
+    -fd$(INCCOMX)/$(SDI2NAME).ilb	\
+    -fm$(MISC)/$(SDI2NAME).don	\
+    -fl$(MISC)/$(SDI2NAME).lst         \
     -fx$(SDI2EXPORT).sdi		\
-    -fz$(MISC)$/$(SDI2NAME).sid	\
+    -fz$(MISC)/$(SDI2NAME).sid	\
     $(SDI2NAME).sdi -I$(MISC) -I$(SVSDIINC) -I$(INC) $(INCLUDE))
 .ENDIF # "$(SDI2TARGET)"!=""
 
@@ -69,11 +61,7 @@ $(HIDSID3PARTICLE): $(SDI3TARGET)
     @echo ------------------------------
     @echo Making: $@
     @-$(RM) $@.$(ROUT).tmp $@
-.IF "$(USE_SHELL)"=="4nt"
-    @$(TYPE) $(MISC)$/$(SDI3NAME).sid | $(AWK) "$$1==\"#define\" { print $$2, $$3 }" > $@.$(ROUT).tmp
-.ELSE
-    @$(TYPE) $(MISC)$/$(SDI3NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
-.ENDIF
+    @$(TYPE) $(MISC)/$(SDI3NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
     @-$(RM) $@
     @$(RENAME) $@.$(ROUT).tmp $@
 .ENDIF # "$(HIDSID3PARTICLE)"!=""
@@ -84,12 +72,12 @@ $(SDI3TARGET): $(SVSDI3DEPEND) $(SDI3NAME).sdi
     @echo Making: $@
     @-$(RM) $@
     $(SVIDL) @$(mktmp \
-    -fs$(INCCOMX)$/$(SDI3NAME).hxx	\
-    -fd$(INCCOMX)$/$(SDI3NAME).ilb	\
-    -fm$(MISC)$/$(SDI3NAME).don	\
-    -fl$(MISC)$/$(SDI3NAME).lst         \
+    -fs$(INCCOMX)/$(SDI3NAME).hxx	\
+    -fd$(INCCOMX)/$(SDI3NAME).ilb	\
+    -fm$(MISC)/$(SDI3NAME).don	\
+    -fl$(MISC)/$(SDI3NAME).lst         \
     -fx$(SDI3EXPORT).sdi		\
-    -fz$(MISC)$/$(SDI3NAME).sid	\
+    -fz$(MISC)/$(SDI3NAME).sid	\
     $(SDI3NAME).sdi -I$(MISC) -I$(SVSDIINC) -I$(INC) $(INCLUDE))
 .ENDIF # "$(SDI3TARGET)"!=""
 
@@ -101,11 +89,7 @@ $(HIDSID4PARTICLE): $(SDI4TARGET)
     @echo ------------------------------
     @echo Making: $@
     @-$(RM) $@.$(ROUT).tmp $@
-.IF "$(USE_SHELL)"=="4nt"
-    @$(TYPE) $(MISC)$/$(SDI4NAME).sid | $(AWK) "$$1==\"#define\" { print $$2, $$3 }" > $@.$(ROUT).tmp
-.ELSE
-    @$(TYPE) $(MISC)$/$(SDI4NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
-.ENDIF
+    @$(TYPE) $(MISC)/$(SDI4NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
     @-$(RM) $@
     @$(RENAME) $@.$(ROUT).tmp $@
 .ENDIF # "$(HIDSID4PARTICLE)"!=""
@@ -116,12 +100,12 @@ $(SDI4TARGET): $(SVSDI4DEPEND) $(SDI4NAME).sdi
     @echo Making: $@
     @-$(RM) $@
     $(SVIDL) @$(mktmp \
-    -fs$(INCCOMX)$/$(SDI4NAME).hxx	\
-    -fd$(INCCOMX)$/$(SDI4NAME).ilb	\
-    -fm$(MISC)$/$(SDI4NAME).don	\
-    -fl$(MISC)$/$(SDI4NAME).lst         \
+    -fs$(INCCOMX)/$(SDI4NAME).hxx	\
+    -fd$(INCCOMX)/$(SDI4NAME).ilb	\
+    -fm$(MISC)/$(SDI4NAME).don	\
+    -fl$(MISC)/$(SDI4NAME).lst         \
     -fx$(SDI4EXPORT).sdi		\
-    -fz$(MISC)$/$(SDI4NAME).sid	\
+    -fz$(MISC)/$(SDI4NAME).sid	\
     $(SDI4NAME).sdi -I$(MISC) -I$(SVSDIINC) -I$(INC) $(INCLUDE))
 .ENDIF # "$(SDI4TARGET)"!=""
 
@@ -133,11 +117,7 @@ $(HIDSID5PARTICLE): $(SDI5TARGET)
     @echo ------------------------------
     @echo Making: $@
     @-$(RM) $@.$(ROUT).tmp $@
-.IF "$(USE_SHELL)"=="4nt"
-    @$(TYPE) $(MISC)$/$(SDI5NAME).sid | $(AWK) "$$1==\"#define\" { print $$2, $$3 }" > $@.$(ROUT).tmp
-.ELSE
-    @$(TYPE) $(MISC)$/$(SDI5NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
-.ENDIF
+    @$(TYPE) $(MISC)/$(SDI5NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
     @-$(RM) $@
     @$(RENAME) $@.$(ROUT).tmp $@
 .ENDIF # "$(HIDSID5PARTICLE)"!=""
@@ -148,12 +128,12 @@ $(SDI5TARGET): $(SVSDI5DEPEND) $(SDI5NAME).sdi
     @echo Making: $@
     @-$(RM) $@
     $(SVIDL) @$(mktmp \
-    -fs$(INCCOMX)$/$(SDI5NAME).hxx	\
-    -fd$(INCCOMX)$/$(SDI5NAME).ilb	\
-    -fm$(MISC)$/$(SDI5NAME).don	\
-    -fl$(MISC)$/$(SDI5NAME).lst         \
+    -fs$(INCCOMX)/$(SDI5NAME).hxx	\
+    -fd$(INCCOMX)/$(SDI5NAME).ilb	\
+    -fm$(MISC)/$(SDI5NAME).don	\
+    -fl$(MISC)/$(SDI5NAME).lst         \
     -fx$(SDI5EXPORT).sdi		\
-    -fz$(MISC)$/$(SDI5NAME).sid	\
+    -fz$(MISC)/$(SDI5NAME).sid	\
     $(SDI5NAME).sdi -I$(MISC) -I$(SVSDIINC) -I$(INC) $(INCLUDE))
 .ENDIF # "$(SDI5TARGET)"!=""
 
@@ -165,11 +145,7 @@ $(HIDSID6PARTICLE): $(SDI6TARGET)
     @echo ------------------------------
     @echo Making: $@
     @-$(RM) $@.$(ROUT).tmp $@
-.IF "$(USE_SHELL)"=="4nt"
-    @$(TYPE) $(MISC)$/$(SDI6NAME).sid | $(AWK) "$$1==\"#define\" { print $$2, $$3 }" > $@.$(ROUT).tmp
-.ELSE
-    @$(TYPE) $(MISC)$/$(SDI6NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
-.ENDIF
+    @$(TYPE) $(MISC)/$(SDI6NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
     @-$(RM) $@
     @$(RENAME) $@.$(ROUT).tmp $@
 .ENDIF # "$(HIDSID6PARTICLE)"!=""
@@ -180,12 +156,12 @@ $(SDI6TARGET): $(SVSDI6DEPEND) $(SDI6NAME).sdi
     @echo Making: $@
     @-$(RM) $@
     $(SVIDL) @$(mktmp \
-    -fs$(INCCOMX)$/$(SDI6NAME).hxx	\
-    -fd$(INCCOMX)$/$(SDI6NAME).ilb	\
-    -fm$(MISC)$/$(SDI6NAME).don	\
-    -fl$(MISC)$/$(SDI6NAME).lst         \
+    -fs$(INCCOMX)/$(SDI6NAME).hxx	\
+    -fd$(INCCOMX)/$(SDI6NAME).ilb	\
+    -fm$(MISC)/$(SDI6NAME).don	\
+    -fl$(MISC)/$(SDI6NAME).lst         \
     -fx$(SDI6EXPORT).sdi		\
-    -fz$(MISC)$/$(SDI6NAME).sid	\
+    -fz$(MISC)/$(SDI6NAME).sid	\
     $(SDI6NAME).sdi -I$(MISC) -I$(SVSDIINC) -I$(INC) $(INCLUDE))
 .ENDIF # "$(SDI6TARGET)"!=""
 
@@ -197,11 +173,7 @@ $(HIDSID7PARTICLE): $(SDI7TARGET)
     @echo ------------------------------
     @echo Making: $@
     @-$(RM) $@.$(ROUT).tmp $@
-.IF "$(USE_SHELL)"=="4nt"
-    @$(TYPE) $(MISC)$/$(SDI7NAME).sid | $(AWK) "$$1==\"#define\" { print $$2, $$3 }" > $@.$(ROUT).tmp
-.ELSE
-    @$(TYPE) $(MISC)$/$(SDI7NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
-.ENDIF
+    @$(TYPE) $(MISC)/$(SDI7NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
     @-$(RM) $@
     @$(RENAME) $@.$(ROUT).tmp $@
 .ENDIF # "$(HIDSID7PARTICLE)"!=""
@@ -212,12 +184,12 @@ $(SDI7TARGET): $(SVSDI7DEPEND) $(SDI7NAME).sdi
     @echo Making: $@
     @-$(RM) $@
     $(SVIDL) @$(mktmp \
-    -fs$(INCCOMX)$/$(SDI7NAME).hxx	\
-    -fd$(INCCOMX)$/$(SDI7NAME).ilb	\
-    -fm$(MISC)$/$(SDI7NAME).don	\
-    -fl$(MISC)$/$(SDI7NAME).lst         \
+    -fs$(INCCOMX)/$(SDI7NAME).hxx	\
+    -fd$(INCCOMX)/$(SDI7NAME).ilb	\
+    -fm$(MISC)/$(SDI7NAME).don	\
+    -fl$(MISC)/$(SDI7NAME).lst         \
     -fx$(SDI7EXPORT).sdi		\
-    -fz$(MISC)$/$(SDI7NAME).sid	\
+    -fz$(MISC)/$(SDI7NAME).sid	\
     $(SDI7NAME).sdi -I$(MISC) -I$(SVSDIINC) -I$(INC) $(INCLUDE))
 .ENDIF # "$(SDI7TARGET)"!=""
 
@@ -229,11 +201,7 @@ $(HIDSID8PARTICLE): $(SDI8TARGET)
     @echo ------------------------------
     @echo Making: $@
     @-$(RM) $@.$(ROUT).tmp $@
-.IF "$(USE_SHELL)"=="4nt"
-    @$(TYPE) $(MISC)$/$(SDI8NAME).sid | $(AWK) "$$1==\"#define\" { print $$2, $$3 }" > $@.$(ROUT).tmp
-.ELSE
-    @$(TYPE) $(MISC)$/$(SDI8NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
-.ENDIF
+    @$(TYPE) $(MISC)/$(SDI8NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
     @-$(RM) $@
     @$(RENAME) $@.$(ROUT).tmp $@
 .ENDIF # "$(HIDSID8PARTICLE)"!=""
@@ -244,12 +212,12 @@ $(SDI8TARGET): $(SVSDI8DEPEND) $(SDI8NAME).sdi
     @echo Making: $@
     @-$(RM) $@
     $(SVIDL) @$(mktmp \
-    -fs$(INCCOMX)$/$(SDI8NAME).hxx	\
-    -fd$(INCCOMX)$/$(SDI8NAME).ilb	\
-    -fm$(MISC)$/$(SDI8NAME).don	\
-    -fl$(MISC)$/$(SDI8NAME).lst         \
+    -fs$(INCCOMX)/$(SDI8NAME).hxx	\
+    -fd$(INCCOMX)/$(SDI8NAME).ilb	\
+    -fm$(MISC)/$(SDI8NAME).don	\
+    -fl$(MISC)/$(SDI8NAME).lst         \
     -fx$(SDI8EXPORT).sdi		\
-    -fz$(MISC)$/$(SDI8NAME).sid	\
+    -fz$(MISC)/$(SDI8NAME).sid	\
     $(SDI8NAME).sdi -I$(MISC) -I$(SVSDIINC) -I$(INC) $(INCLUDE))
 .ENDIF # "$(SDI8TARGET)"!=""
 
@@ -261,11 +229,7 @@ $(HIDSID9PARTICLE): $(SDI9TARGET)
     @echo ------------------------------
     @echo Making: $@
     @-$(RM) $@.$(ROUT).tmp $@
-.IF "$(USE_SHELL)"=="4nt"
-    @$(TYPE) $(MISC)$/$(SDI9NAME).sid | $(AWK) "$$1==\"#define\" { print $$2, $$3 }" > $@.$(ROUT).tmp
-.ELSE
-    @$(TYPE) $(MISC)$/$(SDI9NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
-.ENDIF
+    @$(TYPE) $(MISC)/$(SDI9NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
     @-$(RM) $@
     @$(RENAME) $@.$(ROUT).tmp $@
 .ENDIF # "$(HIDSID9PARTICLE)"!=""
@@ -276,12 +240,12 @@ $(SDI9TARGET): $(SVSDI9DEPEND) $(SDI9NAME).sdi
     @echo Making: $@
     @-$(RM) $@
     $(SVIDL) @$(mktmp \
-    -fs$(INCCOMX)$/$(SDI9NAME).hxx	\
-    -fd$(INCCOMX)$/$(SDI9NAME).ilb	\
-    -fm$(MISC)$/$(SDI9NAME).don	\
-    -fl$(MISC)$/$(SDI9NAME).lst         \
+    -fs$(INCCOMX)/$(SDI9NAME).hxx	\
+    -fd$(INCCOMX)/$(SDI9NAME).ilb	\
+    -fm$(MISC)/$(SDI9NAME).don	\
+    -fl$(MISC)/$(SDI9NAME).lst         \
     -fx$(SDI9EXPORT).sdi		\
-    -fz$(MISC)$/$(SDI9NAME).sid	\
+    -fz$(MISC)/$(SDI9NAME).sid	\
     $(SDI9NAME).sdi -I$(MISC) -I$(SVSDIINC) -I$(INC) $(INCLUDE))
 .ENDIF # "$(SDI9TARGET)"!=""
 
@@ -293,11 +257,7 @@ $(HIDSID10PARTICLE): $(SDI10TARGET)
     @echo ------------------------------
     @echo Making: $@
     @-$(RM) $@.$(ROUT).tmp $@
-.IF "$(USE_SHELL)"=="4nt"
-    @$(TYPE) $(MISC)$/$(SDI10NAME).sid | $(AWK) "$$1==\"#define\" { print $$2, $$3 }" > $@.$(ROUT).tmp
-.ELSE
-    @$(TYPE) $(MISC)$/$(SDI10NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
-.ENDIF
+    @$(TYPE) $(MISC)/$(SDI10NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
     @-$(RM) $@
     @$(RENAME) $@.$(ROUT).tmp $@
 .ENDIF # "$(HIDSID10PARTICLE)"!=""
@@ -308,12 +268,12 @@ $(SDI10TARGET): $(SVSDI10DEPEND) $(SDI10NAME).sdi
     @echo Making: $@
     @-$(RM) $@
     $(SVIDL) @$(mktmp \
-    -fs$(INCCOMX)$/$(SDI10NAME).hxx	\
-    -fd$(INCCOMX)$/$(SDI10NAME).ilb	\
-    -fm$(MISC)$/$(SDI10NAME).don	\
-    -fl$(MISC)$/$(SDI10NAME).lst         \
+    -fs$(INCCOMX)/$(SDI10NAME).hxx	\
+    -fd$(INCCOMX)/$(SDI10NAME).ilb	\
+    -fm$(MISC)/$(SDI10NAME).don	\
+    -fl$(MISC)/$(SDI10NAME).lst         \
     -fx$(SDI10EXPORT).sdi		\
-    -fz$(MISC)$/$(SDI10NAME).sid	\
+    -fz$(MISC)/$(SDI10NAME).sid	\
     $(SDI10NAME).sdi -I$(MISC) -I$(SVSDIINC) -I$(INC) $(INCLUDE))
 .ENDIF # "$(SDI10TARGET)"!=""