INTEGRATION: CWS icuupgrade (1.29.8); FILE MERGED

2006/11/14 16:56:01 er 1.29.8.9: correct PRJNAME
2006/10/12 01:48:19 khong 1.29.8.8: fixed a merge problem
2006/10/11 04:38:23 khong 1.29.8.7: RESYNC: (1.29-1.30); FILE MERGED
2006/09/21 09:36:56 obo 1.29.8.6: #i60645#,#i53611# upgrade to 3.6, buildable for VS 2003 and VS 2005 Express
2006/09/06 01:06:14 khong 1.29.8.5: #i60645# upgrade to icu 3.6
2006/08/03 16:13:37 er 1.29.8.4: #i60645# additional files need their entries
2006/06/22 10:39:20 obo 1.29.8.3: #i60645# changes for wntmsci10
2006/06/15 16:35:03 khong 1.29.8.2: #i60645# upgrade icu to 3.4.1
2006/05/23 20:34:05 khong 1.29.8.1: #i53388# upgrade icu to 3.4.1

1 files changed, 37 insertions, 41 deletions

diff --git a/icu/makefile.mk b/icu/makefile.mk
index 82f40d3457ef..34f674c9762a 100644
--- a/icu/makefile.mk
+++ b/icu/makefile.mk
@@ -4,9 +4,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.30 $
+#   $Revision: 1.31 $
 #
-#   last change: $Author: vg $ $Date: 2006-09-25 13:00:31 $
+#   last change: $Author: kz $ $Date: 2006-12-12 15:51:25 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -34,7 +34,7 @@
 #*************************************************************************
 PRJ=.
 
-PRJNAME=so_icu
+PRJNAME=icu
 TARGET=so_icu
 
 # --- Settings -----------------------------------------------------
@@ -43,18 +43,18 @@ TARGET=so_icu
 
 # --- Files --------------------------------------------------------
 
-TARFILE_NAME=icu-2.6
+.INCLUDE :	icuversion.mk
+
+.IF "$(ICU_MICRO)"!="0"
+TARFILE_NAME=icu-$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO)
+.ELSE
+TARFILE_NAME=icu-$(ICU_MAJOR).$(ICU_MINOR)
+.ENDIF
 TARFILE_ROOTDIR=icu
 
-PATCH_FILE_NAME=icu-2.6.patch
+PATCH_FILE_NAME=${TARFILE_NAME}.patch
 
-ADDITIONAL_FILES= \
-    source$/layout$/TibetanLayoutEngine.cpp \
-    source$/layout$/TibetanLayoutEngine.h \
-    source$/layout$/KhmerLayoutEngine.cpp \
-    source$/layout$/KhmerLayoutEngine.h \
-    source$/layout$/KhmerReordering.cpp \
-    source$/layout$/KhmerReordering.h
+# ADDITIONAL_FILES=
 
 .IF "$(GUI)"=="UNX"
 .IF "$(COMNAME)"=="sunpro5"
@@ -92,30 +92,26 @@ CONFIGURE_FLAGS=
 BUILD_DIR=$(CONFIGURE_DIR)
 BUILD_ACTION=$(GNUMAKE)
 OUT2LIB= \
-    $(BUILD_DIR)$/data$/out$/libicudata$(DLLPOST).26.0 \
-    $(BUILD_DIR)$/data$/out$/libicudata$(DLLPOST).26 \
-    $(BUILD_DIR)$/data$/out$/libicudata$(DLLPOST) \
-    $(BUILD_DIR)$/common$/libicuuc.a \
-    $(BUILD_DIR)$/common$/libicuuc$(DLLPOST).26.0 \
-    $(BUILD_DIR)$/common$/libicuuc$(DLLPOST).26 \
-    $(BUILD_DIR)$/common$/libicuuc$(DLLPOST) \
-    $(BUILD_DIR)$/i18n$/libicui18n.a \
-    $(BUILD_DIR)$/i18n$/libicui18n$(DLLPOST).26.0 \
-    $(BUILD_DIR)$/i18n$/libicui18n$(DLLPOST).26 \
-    $(BUILD_DIR)$/i18n$/libicui18n$(DLLPOST) \
-    $(BUILD_DIR)$/layout$/libicule.a \
-    $(BUILD_DIR)$/layout$/libicule$(DLLPOST).26.0 \
-    $(BUILD_DIR)$/layout$/libicule$(DLLPOST).26 \
-    $(BUILD_DIR)$/layout$/libicule$(DLLPOST) \
-    $(BUILD_DIR)$/tools$/toolutil$/libicutoolutil.a \
-    $(BUILD_DIR)$/tools$/toolutil$/libicutoolutil$(DLLPOST).26.0 \
-    $(BUILD_DIR)$/tools$/toolutil$/libicutoolutil$(DLLPOST).26 \
-    $(BUILD_DIR)$/tools$/toolutil$/libicutoolutil$(DLLPOST)
+    $(BUILD_DIR)$/lib$/libicudata$(DLLPOST).$(ICU_MAJOR)$(ICU_MINOR).$(ICU_MICRO) \
+    $(BUILD_DIR)$/lib$/libicudata$(DLLPOST).$(ICU_MAJOR)$(ICU_MINOR) \
+    $(BUILD_DIR)$/lib$/libicudata$(DLLPOST) \
+    $(BUILD_DIR)$/lib$/libicuuc$(DLLPOST).$(ICU_MAJOR)$(ICU_MINOR).$(ICU_MICRO) \
+    $(BUILD_DIR)$/lib$/libicuuc$(DLLPOST).$(ICU_MAJOR)$(ICU_MINOR) \
+    $(BUILD_DIR)$/lib$/libicuuc$(DLLPOST) \
+    $(BUILD_DIR)$/lib$/libicui18n$(DLLPOST).$(ICU_MAJOR)$(ICU_MINOR).$(ICU_MICRO) \
+    $(BUILD_DIR)$/lib$/libicui18n$(DLLPOST).$(ICU_MAJOR)$(ICU_MINOR) \
+    $(BUILD_DIR)$/lib$/libicui18n$(DLLPOST) \
+    $(BUILD_DIR)$/lib$/libicule$(DLLPOST).$(ICU_MAJOR)$(ICU_MINOR).$(ICU_MICRO) \
+    $(BUILD_DIR)$/lib$/libicule$(DLLPOST).$(ICU_MAJOR)$(ICU_MINOR) \
+    $(BUILD_DIR)$/lib$/libicule$(DLLPOST) \
+    $(BUILD_DIR)$/lib$/libicutu$(DLLPOST).$(ICU_MAJOR)$(ICU_MINOR).$(ICU_MICRO) \
+    $(BUILD_DIR)$/lib$/libicutu$(DLLPOST).$(ICU_MAJOR)$(ICU_MINOR) \
+    $(BUILD_DIR)$/lib$/libicutu$(DLLPOST)
 
 OUT2BIN= \
-    $(BUILD_DIR)$/tools$/genccode$/genccode \
-    $(BUILD_DIR)$/tools$/genbrk$/genbrk \
-    $(BUILD_DIR)$/tools$/gencmn$/gencmn
+    $(BUILD_DIR)$/bin$/genccode \
+    $(BUILD_DIR)$/bin$/genbrk \
+    $(BUILD_DIR)$/bin$/gencmn
 
 .ENDIF
 
@@ -156,9 +152,9 @@ ICU_BUILD_LIBPOST=
 CONFIGURE_ACTION+= $(COPY) ..$/..$/..$/..$/..$/makefiles.zip . $(BUILD_ACTION_SEP) unzip makefiles.zip
 
 .IF "$(CCNUMVER)"<="001400000000"
-BUILD_ACTION=cd allinone$/all && cmd /c nmake /f all.mak CFG="all - Win32 Release" EXCEPTIONSWITCH="-EHsc" && cd ..$/..
+BUILD_ACTION=cd allinone && nmake /f all.mak CFG="all - Win32 Release" EXFLAGS="-EHsc" && cd ..$/..
 .ELSE
-BUILD_ACTION=cd allinone$/all && cmd /c nmake /f all.mak CFG="all - Win32 Release" EXCEPTIONSWITCH="-EHa -Zc:wchar_t-" && cd ..$/..
+BUILD_ACTION=cd allinone && nmake /f all.mak CFG="all - Win32 Release" EXFLAGS="-EHa -Zc:wchar_t-" && cd ..$/..
 .ENDIF
 
 OUT2LIB= \
@@ -169,11 +165,11 @@ OUT2LIB= \
     $(BUILD_DIR)$/..$/lib$/icutu$(ICU_BUILD_LIBPOST).lib
 
 OUT2BIN= \
-    $(BUILD_DIR)$/..$/bin$/icudt26l.dll \
-    $(BUILD_DIR)$/..$/bin$/icuin26$(ICU_BUILD_LIBPOST).dll \
-    $(BUILD_DIR)$/..$/bin$/icuuc26$(ICU_BUILD_LIBPOST).dll \
-    $(BUILD_DIR)$/..$/bin$/icule26$(ICU_BUILD_LIBPOST).dll \
-    $(BUILD_DIR)$/..$/bin$/icutu26$(ICU_BUILD_LIBPOST).dll \
+    $(BUILD_DIR)$/..$/bin$/icudt$(ICU_MAJOR)$(ICU_MINOR).dll \
+    $(BUILD_DIR)$/..$/bin$/icuin$(ICU_MAJOR)$(ICU_MINOR)$(ICU_BUILD_LIBPOST).dll \
+    $(BUILD_DIR)$/..$/bin$/icuuc$(ICU_MAJOR)$(ICU_MINOR)$(ICU_BUILD_LIBPOST).dll \
+    $(BUILD_DIR)$/..$/bin$/icule$(ICU_MAJOR)$(ICU_MINOR)$(ICU_BUILD_LIBPOST).dll \
+    $(BUILD_DIR)$/..$/bin$/icutu$(ICU_MAJOR)$(ICU_MINOR)$(ICU_BUILD_LIBPOST).dll \
     $(BUILD_DIR)$/..$/bin$/genccode.exe \
     $(BUILD_DIR)$/..$/bin$/genbrk.exe \
     $(BUILD_DIR)$/..$/bin$/gencmn.exe