From 30f80526d0c8fb1226d4663b5e2702a9a8dff9c3 Mon Sep 17 00:00:00 2001
From: Stephan Wunderlich <sw@openoffice.org>
Date: Tue, 26 Feb 2002 15:34:10 +0000
Subject: CHG: create map-file instead of exp-file

---
 sal/qa/makefile.mk | 70 +++++++++++++++++-------------------------------------
 1 file changed, 22 insertions(+), 48 deletions(-)

(limited to 'sal/qa')

diff --git a/sal/qa/makefile.mk b/sal/qa/makefile.mk
index fa4307350..4fe4363ab 100644
--- a/sal/qa/makefile.mk
+++ b/sal/qa/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.1 $
+#   $Revision: 1.2 $
 #
-#   last change: $Author: sz $ $Date: 2002-01-18 09:57:03 $
+#   last change: $Author: sw $ $Date: 2002-02-26 16:34:10 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -65,9 +65,7 @@ PRJNAME=sal
 TARGET=tests
 
 # --- Settings -----------------------------------------------------
-.INCLUDE :  svpre.mk
 .INCLUDE :  settings.mk
-.INCLUDE :  sv.mk
 
 .IF "$(OS)" == "WNT"
 REGEXP="s/^[\#].*$$//"
@@ -89,14 +87,12 @@ SHL1STDLIBS+=\
             $(SALLIB) \
             $(SALHELPERLIB)
 
+SHL1VERSIONMAP = $(SHL1TARGET).map
 SHL1DEPN=
 SHL1IMPLIB= i$(SHL1TARGET)
 SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
 
 DEF1NAME    =$(SHL1TARGET)
-DEF1EXPORTFILE= $(MISC)$/$(SHL1TARGET).exp
-
-
 
 SHL2OBJS = \
             $(SLO)$/rtl_String_Utils.obj \
@@ -107,60 +103,38 @@ SHL2STDLIBS+=\
             $(SALLIB) \
             $(SALHELPERLIB)
 
+SHL2VERSIONMAP = $(SHL2TARGET).map
 SHL2DEPN=
 SHL2IMPLIB= i$(SHL2TARGET)
 SHL2DEF=    $(MISC)$/$(SHL2TARGET).def
 
 DEF2NAME    =$(SHL2TARGET)
-DEF2EXPORTFILE= $(MISC)$/$(SHL2TARGET).exp
-
-#SHL2OBJS = \
-#            $(SLO)$/rtl_String_Utils.obj \
-#            $(SLO)$/rtl_OUString.obj \
-#            $(SLO)$/osl_apitest_conditn.obj \
-#            $(SLO)$/osl_apitest_diagnose.obj \
-#            $(SLO)$/osl_apitest_file.obj \
-#            $(SLO)$/osl_apitest_interlck.obj \
-#            $(SLO)$/osl_apitest_mutex.obj \
-#            $(SLO)$/osl_apitest_nlsupport.obj \
-#            $(SLO)$/osl_apitest_pipe.obj \
-#            $(SLO)$/osl_apitest_profile.obj \
-#            $(SLO)$/osl_apitest_time.obj \
-#            $(SLO)$/osl_apitest_util.obj
-
-
-#SHL1TARGET= rtl_apitest
-#SHL1STDLIBS+=\
-#$(SALLIB)
-#SHL1DEPN=
-#SHL1IMPLIB= i$(SHL1TARGET)
-#SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-
-#DEF1NAME    =$(SHL1TARGET)
-#DEF1EXPORTFILE= $(MISC)$/$(SHL1TARGET).exp
 
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
 
-#$(MISC)$/$(SHL1TARGET).exp : sce$/$(SHL1TARGET).sce
-#    +$(TYPE) $< | sed $(REGEXP) | sed "s/^/test_/" | sed "/test_./ w $@"
-#$(MISC)$/$(SHL2TARGET).exp : sce$/$(SHL2TARGET).sce
-#    +$(TYPE) $< | sed $(REGEXP) | sed "s/^/test_/" | sed "/test_./ w $@"
-
-$(MISC)$/$(SHL1TARGET).exp : sce$/$(SHL1TARGET).sce
+$(SHL1TARGET).map : sce$/$(SHL1TARGET).sce    
     +$(TYPE) $< | sed $(REGEXP) > $@
-    +$(TYPE) $@ | sed "s/^/test_/" > $(MISC)$/$(SHL1TARGET).tst
-    +$(TYPE) $(MISC)$/$(SHL1TARGET).tst | sed "/test_./ w $@"
-
-$(MISC)$/$(SHL2TARGET).exp : sce$/$(SHL2TARGET).sce
+    +$(TYPE) $@ | sed "s/^/test_/" >> $(MISC)$/$(SHL1TARGET).tst    
+    +$(TYPE) mapHeader > $(SHL1TARGET).map
+    +$(TYPE) $(MISC)$/$(SHL1TARGET).tst | sed "/test_./ w $(MISC)$/$(SHL1TARGET).map1"
+    +$(TYPE) $(MISC)$/$(SHL1TARGET).map1 >> $(SHL1TARGET).map
+    +$(RM) $(MISC)$/$(SHL1TARGET).map1    
+    +$(TYPE) mapFooter >> $(SHL1TARGET).map
+
+$(SHL2TARGET).map : sce$/$(SHL2TARGET).sce    
     +$(TYPE) $< | sed $(REGEXP) > $@
-    +$(TYPE) $@ | sed "s/^/test_/" > $(MISC)$/$(SHL2TARGET).tst
-    +$(TYPE) $(MISC)$/$(SHL2TARGET).tst | sed "/test_./ w $@"
+    +$(TYPE) $@ | sed "s/^/test_/" >> $(MISC)$/$(SHL2TARGET).tst    
+    +$(TYPE) mapHeader > $(SHL2TARGET).map
+    +$(TYPE) $(MISC)$/$(SHL2TARGET).tst | sed "/test_./ w $(MISC)$/$(SHL2TARGET).map1"    
+    +$(TYPE) $(MISC)$/$(SHL2TARGET).map1 >> $(SHL2TARGET).map
+    +$(RM) $(MISC)$/$(SHL2TARGET).map1
+    +$(TYPE) mapFooter >> $(SHL2TARGET).map
 
 cleanup:
-    +$(RM) sce$/$(SHL1TARGET).exp
-    +$(RM) sce$/$(SHL2TARGET).exp
+    +$(RM) $(SHL1TARGET).map
+    +$(RM) $(SHL2TARGET).map
+    +$(RM) sce$/$(SHL1TARGET).tst
     +$(RM) sce$/$(SHL1TARGET).tst
-
 
-- 
cgit v1.2.3