diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-03-26 10:28:38 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-03-26 10:28:38 +0000 |
| commit | 10a1a63a37e5d130726ae6980f2ca57f06c46fd1 (patch) | |
| tree | 83e9580524c49206218dd4c8ba22e69495388d72 /icu | |
| parent | 74da1f2e44de16279f2324405fa0a99c7285c0e7 (diff) | |
MWS_SRX644: migrate branch mws_srx644 -> HEAD
Diffstat (limited to 'icu')
| -rw-r--r-- | icu/makefile.mk | 16 | ||||
| -rw-r--r-- | icu/prj/build.lst | 2 |
2 files changed, 11 insertions, 7 deletions
diff --git a/icu/makefile.mk b/icu/makefile.mk index 4748d593bcf6..45a6d8a94cec 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.8 $ +# $Revision: 1.9 $ # -# last change: $Author: er $ $Date: 2002-10-31 15:45:58 $ +# last change: $Author: hr $ $Date: 2003-03-26 11:28:37 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -133,7 +133,11 @@ CONFIGURE_ACTION=$(BACK_PATH)..$/..$/convert.bat CONFIGURE_ACTION=$(BACK_PATH)..$/..$/convert.sh .ENDIF # "$(USE_SHELL)"=="4nt" BUILD_DIR=source +.IF "$(COMEX)"=="8" +BUILD_ACTION=wdevenv allinone$/allinone Release +.ELSE BUILD_ACTION=msdev allinone$/allinone.dsw /useenv /MAKE "all - Win32 Release" +.ENDIF OUT2LIB= \ $(BUILD_DIR)$/..$/lib$/icudata.lib \ @@ -153,7 +157,7 @@ OUT2BIN= \ all: \ $(MISC)$/remove_build.flag \ ALLTAR - + .INCLUDE : set_ext.mk .INCLUDE : target.mk .INCLUDE : tg_ext.mk @@ -164,9 +168,9 @@ TG_DELIVER : $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) .IF "$(BINARY_PATCH_FILE_NAME)"!="" $(PACKAGE_DIR)$/so_add_binary : $(PACKAGE_DIR)$/$(ADD_FILES_FLAG_FILE) - cd $(PACKAGE_DIR) && gunzip -c $(BACK_PATH)$(BINARY_PATCH_FILE_NAME) | tar $(TAR_EXCLUDE_SWITCH) -xvf - + cd $(PACKAGE_DIR) && gunzip -c $(BACK_PATH)$(BINARY_PATCH_FILE_NAME) | tar $(TAR_EXCLUDE_SWITCH) -xvf - +$(TOUCH) $(PACKAGE_DIR)$/so_add_binary - + $(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(PACKAGE_DIR)$/so_add_binary .ENDIF @@ -174,7 +178,7 @@ $(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(PACKAGE_DIR)$/so_add_binary # Since you never know what will be in a patch (for example, it may already # patch at configure level) or in the case of a binary patch, we remove the # entire package directory if a patch is newer. -# Changes in this makefile could also make a complete build necessary if +# Changes in this makefile could also make a complete build necessary if # configure is affected. $(MISC)$/remove_build.flag : $(BINARY_PATCH_FILE_NAME) $(PATCH_FILE_NAME) makefile.mk $(REMOVE_PACKAGE_COMMAND) diff --git a/icu/prj/build.lst b/icu/prj/build.lst index c14ab8124ab0..5903f4f7aa22 100644 --- a/icu/prj/build.lst +++ b/icu/prj/build.lst @@ -1,3 +1,3 @@ -ic icu : NULL +ic icu : solenv NULL ic icu usr1 - all ic_mkout NULL ic icu nmake - all ic_icu NULL |