INTEGRATION: CWS winordinals (1.45.86); FILE MERGED

2008/03/07 14:56:14 vg 1.45.86.1: #i86800# switch to symbol-exporting scheme

1 files changed, 13 insertions, 70 deletions

diff --git a/solenv/inc/tg_def.mk b/solenv/inc/tg_def.mk
index 95a364735766..0375096ca298 100644
--- a/solenv/inc/tg_def.mk
+++ b/solenv/inc/tg_def.mk
@@ -4,9 +4,9 @@
 #
 #   $RCSfile: tg_def.mk,v $
 #
-#   $Revision: 1.45 $
+#   $Revision: 1.46 $
 #
-#   last change: $Author: obo $ $Date: 2008-01-04 16:16:27 $
+#   last change: $Author: obo $ $Date: 2008-03-25 14:21:49 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -85,26 +85,10 @@ $(DEF$(TNR)EXPORTFILE) : $(SHL$(TNR)VERSIONMAP)
 DEF$(TNR)FILTER=$(SOLARENV)$/inc$/dummy.flt
 
 RMHACK$(TNR):=$(RM)
-.IF "$(MWS_BUILD)"!=""
-.IF "$(UPDATER)"!=""
-.IF "$(DEFLIB$(TNR)NAME)"!=""
-
-DEF$(TNR)UNIQE:=$(mktmp $(GUI))
-
-# %_disk is a 4nt special; don't exppect it to work in any other shell
-BUILD_DRIVE$(TNR):=$(shell @echo %_disk)
-#BUILD_DRIVE$(TNR):=O
 
-.IF "$(BUILD_DRIVE$(TNR))"=="O"
-# in case of RE build, protect against failed lock
-EXPORT$(TNR)_PROTECT=$(TMP)$/$(DEF$(TNR)UNIQE:b).bat &&
-RMHACK$(TNR):=$(RM:s/+//)
-.ELSE			# "$(BUILD_DRIVE$(TNR))"=="O"
-.ENDIF			# "$(BUILD_DRIVE$(TNR))"=="O"
-
-.ENDIF			# "$(DEFLIB$(TNR)NAME)"!=""
-.ENDIF			# "$(UPDATER)"!=""
-.ENDIF			# "$(MWS_BUILD)"!=""
+.IF "$(DEF$(TNR)CEXP)"!=""
+EXPORT_ALL_SWITCH=-A $(DEF$(TNR)CEXP)
+.ENDIF
 
 .IF "$(link_always)"==""
 $(DEF$(TNR)TARGETN) : \
@@ -113,19 +97,6 @@ $(DEF$(TNR)TARGETN) : \
 .ELSE			# "$(link_always)"==""
 $(DEF$(TNR)TARGETN) .PHONY :
 .ENDIF			# "$(link_always)"==""
-.IF "$(MWS_BUILD)"!=""
-.IF "$(UPDATER)"!=""
-.IF "$(DEFLIB$(TNR)NAME)"!=""
-.IF "$(BUILD_DRIVE$(TNR))"=="O"
-#
-# don't forget to have the right DEFSTAG set!
-#
-    $(PERL) $(COMMON_ENV_TOOLS)$/lockcidef.pl -u$(DEF$(TNR)UNIQE:b) update $(DEFSTAG)
-.ENDIF			# "$(BUILD_DRIVE$(TNR))"=="O"
-.ENDIF				# "$(DEFLIB$(TNR)NAME)"!=""
-.ENDIF			# "$(UPDATER)"!=""
-.ENDIF			# "$(MWS_BUILD)"!=""
-#	-attrib -r defs$/$(OUTPATH)
     @-$(RM) $@.tmpfile
     @echo ------------------------------
     @echo Making Module-Definitionfile : $@
@@ -138,50 +109,22 @@ $(DEF$(TNR)TARGETN) .PHONY :
     @echo GetVersionInfo		>>$@.tmpfile
 .IF "$(DEFLIB$(TNR)NAME)"!=""
 .IF "$(COM)"=="GCC"
-    @-$(EXPORT$(TNR)_PROTECT) $(RM) $(MISC)$/$(SHL$(TNR)TARGET).exp
+    @-$(RM) $(MISC)$/$(SHL$(TNR)TARGET).exp
     dlltool --output-def $(MISC)$/$(SHL$(TNR)TARGET).exp --export-all-symbols \
          `$(TYPE) $(foreach,i,$(DEFLIB$(TNR)NAME) $(SLB)$/$(i).lib) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g`
     tail --lines +3 $(MISC)$/$(SHL$(TNR)TARGET).exp | sed '/^;/d' >>$@.tmpfile
-    @-$(EXPORT$(TNR)_PROTECT) $(RM) $(MISC)$/$(SHL$(TNR)TARGET).exp
+    @-$(RM) $(MISC)$/$(SHL$(TNR)TARGET).exp
 .ELSE
 .IF "$(SHL$(TNR)USE_EXPORTS)"==""
-    @-$(EXPORT$(TNR)_PROTECT) $(RMHACK$(TNR)) $(MISC)$/$(SHL$(TNR)TARGET).exp
-    @$(EXPORT$(TNR)_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL$(TNR)TARGET).exp $(SLB)$/$(DEFLIB$(TNR)NAME).lib
-.IF "$(DEF$(TNR)CEXP)"!=""
-    @$(EXPORT$(TNR)_PROTECT) $(LDUMP2) -A $(DEF$(TNR)CEXP) -E 20 -F $(MISC)$/$(SHL$(TNR)TARGET).flt $(MISC)$/$(SHL$(TNR)TARGET).exp			   >>$@.tmpfile
-.ELSE
-    @$(EXPORT$(TNR)_PROTECT) $(LDUMP2) -E 20 -F $(MISC)$/$(SHL$(TNR)TARGET).flt $(MISC)$/$(SHL$(TNR)TARGET).exp			   >>$@.tmpfile
-.ENDIF
-    $(EXPORT$(TNR)_PROTECT) $(RMHACK$(TNR)) $(MISC)$/$(SHL$(TNR)TARGET).exp
+    @-$(RMHACK$(TNR)) $(MISC)$/$(SHL$(TNR)TARGET).exp
+    @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL$(TNR)TARGET).exp $(SLB)$/$(DEFLIB$(TNR)NAME).lib
+    @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)$/$(SHL$(TNR)TARGET).flt $(MISC)$/$(SHL$(TNR)TARGET).exp			   >>$@.tmpfile
+    $(RMHACK$(TNR)) $(MISC)$/$(SHL$(TNR)TARGET).exp
 .ELSE			# "$(SHL$(TNR)USE_EXPORTS)"==""
-    @$(EXPORT$(TNR)_PROTECT) $(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB$(TNR)NAME) $(SLB)$/$(i).lib) | $(GREP) EXPORT: > $(MISC)$/$(SHL$(TNR)TARGET).direct
-.IF "$(SHL$(TNR)USE_EXPORTS)"!="name"
-.IF "$(DEF$(TNR)CEXP)"!=""
-    @$(EXPORT$(TNR)_PROTECT) $(LDUMP2) -D -A $(DEF$(TNR)CEXP) -E 20 -F $(DEF$(TNR)FILTER) $(MISC)$/$(SHL$(TNR)TARGET).direct >>$@.tmpfile
-.ELSE
-    @$(EXPORT$(TNR)_PROTECT) $(LDUMP2) -D -E 20 -F $(DEF$(TNR)FILTER) $(MISC)$/$(SHL$(TNR)TARGET).direct >>$@.tmpfile
-.ENDIF
-.ELSE			# "$(SHL$(TNR)USE_EXPORTS)"!="name"
-.IF "$(DEF$(TNR)CEXP)"!=""
-    @$(EXPORT$(TNR)_PROTECT) $(LDUMP2) -N -D -A $(DEF$(TNR)CEXP) -E 20 -F $(DEF$(TNR)FILTER) $(MISC)$/$(SHL$(TNR)TARGET).direct >>$@.tmpfile
-.ELSE
-    @$(EXPORT$(TNR)_PROTECT) $(LDUMP2) -N -D -E 20 -F $(DEF$(TNR)FILTER) $(MISC)$/$(SHL$(TNR)TARGET).direct >>$@.tmpfile
-.ENDIF
-.ENDIF			# "$(SHL$(TNR)USE_EXPORTS)"!="name"
+    @$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB$(TNR)NAME) $(SLB)$/$(i).lib) | $(GREP) EXPORT: > $(MISC)$/$(SHL$(TNR)TARGET).direct
+    @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF$(TNR)FILTER) $(MISC)$/$(SHL$(TNR)TARGET).direct >>$@.tmpfile
 .ENDIF			# "$(SHL$(TNR)USE_EXPORTS)"==""
 .ENDIF
-# now *\defs\$(OUTPATH)	exists, commit it
-.IF "$(MWS_BUILD)"!=""
-.IF "$(UPDATER)"!=""
-.IF "$(BUILD_DRIVE$(TNR))"=="O"
-#
-# don't forget to have the right DEFSTAG set!
-#
-    $(PERL) $(COMMON_ENV_TOOLS)$/lockcidef.pl -u$(DEF$(TNR)UNIQE:b) commit
-    $(4nt_force_shell)$(TMP)$/$(DEF$(TNR)UNIQE:b).bat && $(RM:s/+//) $(TMP)$/$(DEF$(TNR)UNIQE:b).bat
-.ENDIF			# "$(BUILD_DRIVE$(TNR))"=="O"
-.ENDIF			# "$(UPDATER)"!=""
-.ENDIF			# "$(MWS_BUILD)"!=""
 .ENDIF				# "$(DEFLIB$(TNR)NAME)"!=""
 .IF "$(DEF$(TNR)EXPORT1)"!=""
     @echo $(DEF$(TNR)EXPORT1)										>>$@.tmpfile