ICU-1075 Fix incorrect comments regarding changing res files to be built.
Fix problem in Windows build when omitting some converter files. X-SVN-Rev: 6230
This commit is contained in:
Andy Heninger
parent
94b2c62a59
commit
4c453dd177
@ -6,11 +6,11 @@
|
||||
# If you are thinking of modifying this file, READ THIS.
|
||||
#
|
||||
# Instead of changing this file [unless you want to check it back in],
|
||||
# you should consider creating a 'genrblocal.mk' file in this same directory.
|
||||
# you should consider creating a 'reslocal.mk' file in this same directory.
|
||||
# Then, you can have your local changes remain even if you upgrade or re
|
||||
# configure the ICU.
|
||||
#
|
||||
# Example 'genrblocal.mk' files:
|
||||
# Example 'reslocal.mk' files:
|
||||
#
|
||||
# * To add an additional converter to the list:
|
||||
# _____________________________________________________
|
||||
@ -19,7 +19,7 @@
|
||||
# * To REPLACE the default list and only build with a few
|
||||
# converters:
|
||||
# _____________________________________________________
|
||||
# | GENRB_SOURCE =default.txt index.txt ar.txt ar_AE.txt
|
||||
# | GENRB_SOURCE = root.txt index.txt ar.txt ar_AE.txt
|
||||
#
|
||||
#
|
||||
|
||||
|
||||
@ -86,21 +86,37 @@ PKGOPT=R:$(ICUP)
|
||||
!IF EXISTS("$(ICUDATA)\ucmfiles.mk")
|
||||
!INCLUDE "$(ICUDATA)\ucmfiles.mk"
|
||||
UCM_SOURCE=$(UCM_SOURCE)
|
||||
!IF EXISTS("$(ICUDATA)\ucmebcdic.mk")
|
||||
!INCLUDE "$(ICUDATA)\ucmebcdic.mk"
|
||||
UCM_SOURCE=$(UCM_SOURCE) $(UCM_SOURCE_EBCDIC)
|
||||
!IF EXISTS("$(ICUDATA)\ucmlocal.mk")
|
||||
!INCLUDE "$(ICUDATA)\ucmlocal.mk"
|
||||
UCM_SOURCE=$(UCM_SOURCE) $(UCM_SOURCE_EBCDIC) $(UCM_SOURCE_LOCAL)
|
||||
!ELSE
|
||||
#!MESSAGE Warning: cannot find "ucmlocal.mk"
|
||||
!ENDIF
|
||||
!ELSE
|
||||
!MESSAGE Warning: cannot find "ucmebcdic.mk".Not building EBCDIC converter files
|
||||
!ENDIF
|
||||
!ELSE
|
||||
!ERROR ERROR: cannot find "ucmfiles.mk"
|
||||
!ENDIF
|
||||
|
||||
!IF EXISTS("$(ICUDATA)\ucmebcdic.mk")
|
||||
!INCLUDE "$(ICUDATA)\ucmebcdic.mk"
|
||||
!ELSE
|
||||
!MESSAGE Warning: cannot find "ucmebcdic.mk".Not building EBCDIC converter files
|
||||
!ENDIF
|
||||
|
||||
!IF EXISTS("$(ICUDATA)\ucmlocal.mk")
|
||||
!INCLUDE "$(ICUDATA)\ucmlocal.mk"
|
||||
!IFDEF UCM_SOURCE_LOCAL
|
||||
UCM_SOURCE=$(UCM_SOURCE) $(UCM_SOURCE_LOCAL)
|
||||
!ENDIF
|
||||
!ELSE
|
||||
#!MESSAGE Warning: cannot find "ucmlocal.mk"
|
||||
!ENDIF
|
||||
|
||||
# Note that UCM_SOURCE_EBCDIC could be defined in either of ucmlocal.mk or ucmebcdic.mk.
|
||||
# Note also that subsequent dependency rules fail if there are leading spaces on UCM_SOURCE,
|
||||
# hence the contorted logic here.
|
||||
!IF ("$(UCM_SOURCE_EBCDIC)" != "")
|
||||
!IF ("$(UCM_SOURCE)" == "")
|
||||
UCM_SOURCE=$(UCM_SOURCE_EBCDIC)
|
||||
!ELSE
|
||||
UCM_SOURCE=$(UCM_SOURCE) $(UCM_SOURCE_EBCDIC)
|
||||
!ENDIF
|
||||
!ENDIF
|
||||
|
||||
|
||||
CNV_FILES=$(UCM_SOURCE:.ucm=.cnv)
|
||||
|
||||
# Read list of resource bundle files
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
# If you are thinking of modifying this file, READ THIS.
|
||||
#
|
||||
# Instead of changing this file [unless you want to check it back in],
|
||||
# you should consider creating a 'genrblocal.mk' file in this same directory.
|
||||
# you should consider creating a 'reslocal.mk' file in this same directory.
|
||||
# Then, you can have your local changes remain even if you upgrade or re
|
||||
# configure the ICU.
|
||||
#
|
||||
# Example 'genrblocal.mk' files:
|
||||
# Example 'reslocal.mk' files:
|
||||
#
|
||||
# * To add an additional converter to the list:
|
||||
# _____________________________________________________
|
||||
@ -19,7 +19,7 @@
|
||||
# * To REPLACE the default list and only build with a few
|
||||
# converters:
|
||||
# _____________________________________________________
|
||||
# | GENRB_SOURCE =default.txt index.txt ar.txt ar_AE.txt
|
||||
# | GENRB_SOURCE = root.txt index.txt ar.txt ar_AE.txt
|
||||
#
|
||||
#
|
||||
|
||||
|
||||
@ -86,21 +86,37 @@ PKGOPT=R:$(ICUP)
|
||||
!IF EXISTS("$(ICUDATA)\ucmfiles.mk")
|
||||
!INCLUDE "$(ICUDATA)\ucmfiles.mk"
|
||||
UCM_SOURCE=$(UCM_SOURCE)
|
||||
!IF EXISTS("$(ICUDATA)\ucmebcdic.mk")
|
||||
!INCLUDE "$(ICUDATA)\ucmebcdic.mk"
|
||||
UCM_SOURCE=$(UCM_SOURCE) $(UCM_SOURCE_EBCDIC)
|
||||
!IF EXISTS("$(ICUDATA)\ucmlocal.mk")
|
||||
!INCLUDE "$(ICUDATA)\ucmlocal.mk"
|
||||
UCM_SOURCE=$(UCM_SOURCE) $(UCM_SOURCE_EBCDIC) $(UCM_SOURCE_LOCAL)
|
||||
!ELSE
|
||||
#!MESSAGE Warning: cannot find "ucmlocal.mk"
|
||||
!ENDIF
|
||||
!ELSE
|
||||
!MESSAGE Warning: cannot find "ucmebcdic.mk".Not building EBCDIC converter files
|
||||
!ENDIF
|
||||
!ELSE
|
||||
!ERROR ERROR: cannot find "ucmfiles.mk"
|
||||
!ENDIF
|
||||
|
||||
!IF EXISTS("$(ICUDATA)\ucmebcdic.mk")
|
||||
!INCLUDE "$(ICUDATA)\ucmebcdic.mk"
|
||||
!ELSE
|
||||
!MESSAGE Warning: cannot find "ucmebcdic.mk".Not building EBCDIC converter files
|
||||
!ENDIF
|
||||
|
||||
!IF EXISTS("$(ICUDATA)\ucmlocal.mk")
|
||||
!INCLUDE "$(ICUDATA)\ucmlocal.mk"
|
||||
!IFDEF UCM_SOURCE_LOCAL
|
||||
UCM_SOURCE=$(UCM_SOURCE) $(UCM_SOURCE_LOCAL)
|
||||
!ENDIF
|
||||
!ELSE
|
||||
#!MESSAGE Warning: cannot find "ucmlocal.mk"
|
||||
!ENDIF
|
||||
|
||||
# Note that UCM_SOURCE_EBCDIC could be defined in either of ucmlocal.mk or ucmebcdic.mk.
|
||||
# Note also that subsequent dependency rules fail if there are leading spaces on UCM_SOURCE,
|
||||
# hence the contorted logic here.
|
||||
!IF ("$(UCM_SOURCE_EBCDIC)" != "")
|
||||
!IF ("$(UCM_SOURCE)" == "")
|
||||
UCM_SOURCE=$(UCM_SOURCE_EBCDIC)
|
||||
!ELSE
|
||||
UCM_SOURCE=$(UCM_SOURCE) $(UCM_SOURCE_EBCDIC)
|
||||
!ENDIF
|
||||
!ENDIF
|
||||
|
||||
|
||||
CNV_FILES=$(UCM_SOURCE:.ucm=.cnv)
|
||||
|
||||
# Read list of resource bundle files
|
||||
|
||||
Loading…
Reference in New Issue
Block a user