INTEGRATION: CWS supdremove02 (1.203.4); FILE MERGED

2008/02/05 16:16:12 rt 1.203.4.6: #i85482# RESLIB?VERSION is not used any more.
2008/02/05 15:59:13 rt 1.203.4.5: #i85482# Remove UPD from library name.
Remove temporary hack of rev. 1.203.4.1
2008/02/01 13:19:33 rt 1.203.4.4: #i85484# Remove obsolete stuff, needed for WIN16 only.
2008/02/01 12:03:17 rt 1.203.4.3: #i85482# Remove UPD from library name.
2008/01/31 13:49:42 rt 1.203.4.2: #i85482# Remove UPD from resource name.
2008/01/28 12:47:57 rt 1.203.4.1: #i85482# Remove UPD from library name.
For now just strip UPD from macros. Of course for a correct handling all
makefiles have to be changed so that UPD does not get added to naming
scheme at all. This will be done. This change here is just for getting
first results fast.

1 files changed, 20 insertions, 41 deletions

diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index 863f01daf3ce..e878aea70b32 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -4,9 +4,9 @@
 #
 #   $RCSfile: target.mk,v $
 #
-#   $Revision: 1.203 $
+#   $Revision: 1.204 $
 #
-#   last change: $Author: ihi $ $Date: 2008-01-16 14:27:25 $
+#   last change: $Author: obo $ $Date: 2008-02-25 16:42:29 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -801,13 +801,12 @@ LIB9ARCHIV=
 
 .IF "$(RESLIB1NAME)" != ""
 .IF "$(RESLIB1NOVERSION)"==""
-RESLIB1VERSION:=$(UPD)
 .ENDIF			# "$(RESLIB1NOVERSION)"==""
 .IF "$(common_build_reslib)"!=""
-RESLIB1TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB1NAME)$(RESLIB1VERSION)LANGEXT.res
+RESLIB1TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB1NAME)LANGEXT.res
 RSC_MULTI1=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/rsc_$(RESLIB1NAME)
 .ELSE			# "$(common_build_reslib)"!=""
-RESLIB1TARGETN=$(BIN)$/$(RESLIB1NAME)$(RESLIB1VERSION)LANGEXT.res
+RESLIB1TARGETN=$(BIN)$/$(RESLIB1NAME)LANGEXT.res
 RSC_MULTI1=$(MISC)$/rsc_$(RESLIB1NAME)
 .ENDIF			# "$(common_build_reslib)"!=""
 # change to iso if resmgr is changed
@@ -816,13 +815,12 @@ RESLIB1TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB1TARGETN))
 
 .IF "$(RESLIB2NAME)" != ""
 .IF "$(RESLIB2NOVERSION)"==""
-RESLIB2VERSION:=$(UPD)
 .ENDIF			# "$(RESLIB2NOVERSION)"==""
 .IF "$(common_build_reslib)"!=""
-RESLIB2TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB2NAME)$(RESLIB2VERSION)LANGEXT.res
+RESLIB2TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB2NAME)LANGEXT.res
 RSC_MULTI2=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/rsc_$(RESLIB2NAME)
 .ELSE			# "$(common_build_reslib)"!=""
-RESLIB2TARGETN=$(BIN)$/$(RESLIB2NAME)$(RESLIB2VERSION)LANGEXT.res
+RESLIB2TARGETN=$(BIN)$/$(RESLIB2NAME)LANGEXT.res
 RSC_MULTI2=$(MISC)$/rsc_$(RESLIB2NAME)
 .ENDIF			# "$(common_build_reslib)"!=""
 RESLIB2TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB2TARGETN)))
@@ -830,13 +828,12 @@ RESLIB2TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB2TARGETN))
 
 .IF "$(RESLIB3NAME)" != ""
 .IF "$(RESLIB3NOVERSION)"==""
-RESLIB3VERSION:=$(UPD)
 .ENDIF			# "$(RESLIB3NOVERSION)"==""
 .IF "$(common_build_reslib)"!=""
-RESLIB3TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB3NAME)$(RESLIB3VERSION)LANGEXT.res
+RESLIB3TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB3NAME)LANGEXT.res
 RSC_MULTI3=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/rsc_$(RESLIB3NAME)
 .ELSE			# "$(common_build_reslib)"!=""
-RESLIB3TARGETN=$(BIN)$/$(RESLIB3NAME)$(RESLIB3VERSION)LANGEXT.res
+RESLIB3TARGETN=$(BIN)$/$(RESLIB3NAME)LANGEXT.res
 RSC_MULTI3=$(MISC)$/rsc_$(RESLIB3NAME)
 .ENDIF			# "$(common_build_reslib)"!=""
 RESLIB3TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB3TARGETN)))
@@ -844,13 +841,12 @@ RESLIB3TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB3TARGETN))
 
 .IF "$(RESLIB4NAME)" != ""
 .IF "$(RESLIB4NOVERSION)"==""
-RESLIB4VERSION:=$(UPD)
 .ENDIF			# "$(RESLIB4NOVERSION)"==""
 .IF "$(common_build_reslib)"!=""
-RESLIB4TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB4NAME)$(RESLIB4VERSION)LANGEXT.res
+RESLIB4TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB4NAME)LANGEXT.res
 RSC_MULTI4=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/rsc_$(RESLIB4NAME)
 .ELSE			# "$(common_build_reslib)"!=""
-RESLIB4TARGETN=$(BIN)$/$(RESLIB4NAME)$(RESLIB4VERSION)LANGEXT.res
+RESLIB4TARGETN=$(BIN)$/$(RESLIB4NAME)LANGEXT.res
 RSC_MULTI4=$(MISC)$/rsc_$(RESLIB4NAME)
 .ENDIF			# "$(common_build_reslib)"!=""
 RESLIB4TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB4TARGETN)))
@@ -858,13 +854,12 @@ RESLIB4TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB4TARGETN))
 
 .IF "$(RESLIB5NAME)" != ""
 .IF "$(RESLIB5NOVERSION)"==""
-RESLIB5VERSION:=$(UPD)
 .ENDIF			# "$(RESLIB5NOVERSION)"==""
 .IF "$(common_build_reslib)"!=""
-RESLIB5TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB5NAME)$(RESLIB5VERSION)LANGEXT.res
+RESLIB5TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB5NAME)LANGEXT.res
 RSC_MULTI5=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/rsc_$(RESLIB5NAME)
 .ELSE			# "$(common_build_reslib)"!=""
-RESLIB5TARGETN=$(BIN)$/$(RESLIB5NAME)$(RESLIB5VERSION)LANGEXT.res
+RESLIB5TARGETN=$(BIN)$/$(RESLIB5NAME)LANGEXT.res
 RSC_MULTI5=$(MISC)$/rsc_$(RESLIB5NAME)
 .ENDIF			# "$(common_build_reslib)"!=""
 RESLIB5TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB5TARGETN)))
@@ -872,13 +867,12 @@ RESLIB5TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB5TARGETN))
 
 .IF "$(RESLIB6NAME)" != ""
 .IF "$(RESLIB6NOVERSION)"==""
-RESLIB6VERSION:=$(UPD)
 .ENDIF			# "$(RESLIB6NOVERSION)"==""
 .IF "$(common_build_reslib)"!=""
-RESLIB6TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB6NAME)$(RESLIB6VERSION)LANGEXT.res
+RESLIB6TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB6NAME)LANGEXT.res
 RSC_MULTI6=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/rsc_$(RESLIB6NAME)
 .ELSE			# "$(common_build_reslib)"!=""
-RESLIB6TARGETN=$(BIN)$/$(RESLIB6NAME)$(RESLIB6VERSION)LANGEXT.res
+RESLIB6TARGETN=$(BIN)$/$(RESLIB6NAME)LANGEXT.res
 RSC_MULTI6=$(MISC)$/rsc_$(RESLIB6NAME)
 .ENDIF			# "$(common_build_reslib)"!=""
 RESLIB6TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB6TARGETN)))
@@ -886,13 +880,12 @@ RESLIB6TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB6TARGETN))
 
 .IF "$(RESLIB7NAME)" != ""
 .IF "$(RESLIB7NOVERSION)"==""
-RESLIB7VERSION:=$(UPD)
 .ENDIF			# "$(RESLIB7NOVERSION)"==""
 .IF "$(common_build_reslib)"!=""
-RESLIB7TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB7NAME)$(RESLIB7VERSION)LANGEXT.res
+RESLIB7TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB7NAME)LANGEXT.res
 RSC_MULTI7=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/rsc_$(RESLIB7NAME)
 .ELSE			# "$(common_build_reslib)"!=""
-RESLIB7TARGETN=$(BIN)$/$(RESLIB7NAME)$(RESLIB7VERSION)LANGEXT.res
+RESLIB7TARGETN=$(BIN)$/$(RESLIB7NAME)LANGEXT.res
 RSC_MULTI7=$(MISC)$/rsc_$(RESLIB7NAME)
 .ENDIF			# "$(common_build_reslib)"!=""
 RESLIB7TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB7TARGETN)))
@@ -900,13 +893,12 @@ RESLIB7TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB7TARGETN))
 
 .IF "$(RESLIB8NAME)" != ""
 .IF "$(RESLIB8NOVERSION)"==""
-RESLIB8VERSION:=$(UPD)
 .ENDIF			# "$(RESLIB8NOVERSION)"==""
 .IF "$(common_build_reslib)"!=""
-RESLIB8TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB8NAME)$(RESLIB8VERSION)LANGEXT.res
+RESLIB8TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB8NAME)LANGEXT.res
 RSC_MULTI8=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/rsc_$(RESLIB8NAME)
 .ELSE			# "$(common_build_reslib)"!=""
-RESLIB8TARGETN=$(BIN)$/$(RESLIB8NAME)$(RESLIB8VERSION)LANGEXT.res
+RESLIB8TARGETN=$(BIN)$/$(RESLIB8NAME)LANGEXT.res
 RSC_MULTI8=$(MISC)$/rsc_$(RESLIB8NAME)
 .ENDIF			# "$(common_build_reslib)"!=""
 RESLIB8TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB8TARGETN)))
@@ -914,13 +906,12 @@ RESLIB8TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB8TARGETN))
 
 .IF "$(RESLIB9NAME)" != ""
 .IF "$(RESLIB9NOVERSION)"==""
-RESLIB9VERSION:=$(UPD)
 .ENDIF			# "$(RESLIB9NOVERSION)"==""
 .IF "$(common_build_reslib)"!=""
-RESLIB9TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB9NAME)$(RESLIB9VERSION)LANGEXT.res
+RESLIB9TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB9NAME)LANGEXT.res
 RSC_MULTI9=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/rsc_$(RESLIB9NAME)
 .ELSE			# "$(common_build_reslib)"!=""
-RESLIB9TARGETN=$(BIN)$/$(RESLIB9NAME)$(RESLIB9VERSION)LANGEXT.res
+RESLIB9TARGETN=$(BIN)$/$(RESLIB9NAME)LANGEXT.res
 RSC_MULTI9=$(MISC)$/rsc_$(RESLIB9NAME)
 .ENDIF			# "$(common_build_reslib)"!=""
 RESLIB9TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB9TARGETN)))
@@ -930,10 +921,6 @@ RESLIB9TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB9TARGETN))
 INDPRESLIB1TARGETN=$(BIN)$/$(INDPRESLIB1NAME).dll
 .ENDIF
 
-.IF "$(RESLIBSPLIT1NAME)"!=""
-RESLIBSPLIT1TARGETN=$(BIN)$/$(RESLIBSPLIT1NAME)$(UPD)$(LANGEXT).dll
-.ENDIF
-
 .IF "$(DEF1NAME)"!=""
 DEF1TARGETN=$(MISC)$/$(DEF1NAME).def
 .ENDIF
@@ -1114,10 +1101,6 @@ ALLTAR:	\
         $(RESLIB3TARGETN) $(RESLIB4TARGETN) \
         $(RESLIB5TARGETN) $(RESLIB6TARGETN) \
         $(RESLIB7TARGETN) $(RESLIB8TARGETN) \
-        $(RESLIBSPLIT1TARGETN) $(RESLIBSPLIT2TARGETN)\
-        $(RESLIBSPLIT3TARGETN) $(RESLIBSPLIT4TARGETN)\
-        $(RESLIBSPLIT5TARGETN) $(RESLIBSPLIT6TARGETN)\
-        $(RESLIBSPLIT7TARGETN)\
         $(COMMONPRJHIDOTHERTARGET) \
         $(PRJHID2TARGET) \
         $(LOCALIZE_ME_DEST)\
@@ -1227,10 +1210,6 @@ ALLTAR: \
         $(RESLIB5TARGETN) $(RESLIB6TARGETN) \
         $(RESLIB7TARGETN) $(RESLIB8TARGETN) \
         $(RESLIB9TARGETN) \
-        $(RESLIBSPLIT1TARGETN) $(RESLIBSPLIT2TARGETN)\
-        $(RESLIBSPLIT3TARGETN) $(RESLIBSPLIT4TARGETN)\
-        $(RESLIBSPLIT5TARGETN) $(RESLIBSPLIT6TARGETN)\
-        $(RESLIBSPLIT7TARGETN) \
         $(COMMONPRJHIDOTHERTARGET) \
         $(PRJHID2TARGET) \
                 $(SIGNFORNETSCAPE) \