#97443# rule for export lists of testshl libraries; workaround for dmake bug

4 files changed, 38 insertions, 14 deletions

diff --git a/solenv/inc/pstrules.mk b/solenv/inc/pstrules.mk
index 76f2ba13e875..c019486ba0d9 100644
--- a/solenv/inc/pstrules.mk
+++ b/solenv/inc/pstrules.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: pstrules.mk,v $
 #
-#   $Revision: 1.17 $
+#   $Revision: 1.18 $
 #
-#   last change: $Author: hjs $ $Date: 2001-11-21 17:13:21 $
+#   last change: $Author: hjs $ $Date: 2002-02-13 16:58:18 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -273,3 +273,23 @@ $(UNOUCROUT)$/%.hdl : $(UNOUCRDEP)
     +cppumaker $(CPPUMAKERFLAGS) -B$(UNOUCRBASE) -O$(UNOUCROUT) -T{$(subst,$/,. $(subst,$(UNOUCROUT)$/, $(@:db)))}  $(UNOUCRRDB)
 
 
+.IF "$(TESTDIR)"!=""
+
+# workaround for strange dmake bug:
+# if the previous block was a rule or a target, "\#" isn't recognized
+# as an escaped "#". if it was an assignment, escaping works...
+some_unique_variable_name:=1
+
+.IF "$(OS)" == "WNT"
+REGEXP:="s/^[\#].*$$//"
+.ELSE
+REGEXP:='s/^[\#].*$$//'
+.ENDIF
+
+$(MISC)$/%.exp : sce$/%.sce
+    @+-$(RM) $@ >& $(NULLDEV)
+    @+-$(RM) $(@:d)$(@:b).tst >& $(NULLDEV)
+    +$(TYPE) $< | sed $(REGEXP) | sed "s/^/test_/" > $(@:d)$(@:b).tst
+    +$(TYPE) $(@:d)$(@:b).tst | sed "/test_./ w $@"
+
+.ENDIF			# "$(TESTDIR)"!=""
diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk
index 74b46257d6fd..fe9ce0a9a7b6 100644
--- a/solenv/inc/rules.mk
+++ b/solenv/inc/rules.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: rules.mk,v $
 #
-#   $Revision: 1.39 $
+#   $Revision: 1.40 $
 #
-#   last change: $Author: hjs $ $Date: 2002-01-08 11:58:56 $
+#   last change: $Author: hjs $ $Date: 2002-02-13 16:58:18 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -553,7 +553,6 @@ $(MISC)$/%.dprc :
     @+echo LAZY_DEPS=were_used_to_generate >> $@
 .ENDIF			# "$(LAZY_DEPS)"==""	
 
-.IF "$(MAKEFILERC)"==""
 $(MISC)$/%.dpc : $(CFILES) $(CXXFILES) $(RCFILES) $(UNOIDLTARGETS) $(SLOFILES) $(OBJFILES) $(DEPOBJFILES)
     @echo ------------------------------
     @echo Making: $@
@@ -574,11 +573,6 @@ $(MISC)$/%.dpr : $(SRCFILES) $(SRC1FILES) $(SRC2FILES) $(SRC3FILES)
 .ELSE
     @+echo "#" > $@
 .ENDIF
-.ELSE		# MAKEFILERC == ""
-$/.dpc : 
-    @echo ------------------------------
-    @echo Ignoring: $@
-.ENDIF
 
 $(MISC)$/%.dpz :
     @echo ------------------------------
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index d4f5238e3336..7d798c23818c 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: settings.mk,v $
 #
-#   $Revision: 1.96 $
+#   $Revision: 1.97 $
 #
-#   last change: $Author: hjs $ $Date: 2002-02-04 17:04:56 $
+#   last change: $Author: hjs $ $Date: 2002-02-13 16:58:18 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -1500,3 +1500,8 @@ $(COMP8TYPELIST)_XML2CMPTYPES:=$(shell xml2cmp -types stdout $(MISC)$/$(COMP8TYP
 $(COMP9TYPELIST)_XML2CMPTYPES:=$(shell xml2cmp -types stdout $(MISC)$/$(COMP9TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
 .ENDIF
 
+# workaround for strange dmake bug:
+# if the previous block was a rule or a target, "\#" isn't recognized
+# as an escaped "#". if it was an assignment, escaping works...
+some_unique_variable_name:=1
+
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index 82ca04017fc0..62ef15f6c121 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: target.mk,v $
 #
-#   $Revision: 1.99 $
+#   $Revision: 1.100 $
 #
-#   last change: $Author: hjs $ $Date: 2002-01-31 12:45:38 $
+#   last change: $Author: hjs $ $Date: 2002-02-13 16:58:18 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -2982,3 +2982,8 @@ $(SUBDIRS) .PHONY :
 .ENDIF			# "$(mk_tmp)$(BSCLIENT)"!=""
 .ENDIF			# "$(SUBDIRS)"!=""
 
+# workaround for strange dmake bug:
+# if the previous block was a rule or a target, "\#" isn't recognized
+# as an escaped "#". if it was an assignment, escaping works...
+some_unique_variable_name:=1
+