ICU-114 Get Transliteration building on Linux

X-SVN-Rev: 213
This commit is contained in:
Alan Liu 1999-11-22 19:31:05 +00:00
parent 17e50b1b8f
commit ce5fdbbb6c
6 changed files with 34 additions and 20 deletions

View file

@ -58,7 +58,7 @@ cpputils.o cstring.o dcmpdata.o digitlst.o filestrm.o locid.o locmap.o \
mutex.o normlzr.o putil.o rbcache.o resbund.o schriter.o scsu.o \
uchar.o uchriter.o ucmp8.o ucmp16.o ucmp32.o ucnv.o ucnv_bld.o \
ucnv_cnv.o ucnv_err.o ucnv_io.o uhash.o uloc.o unicode.o unistr.o \
ures.o ustring.o rbread.o rbdata.o ubidi.o ubidiln.o bidi.o
ures.o ustring.o rbread.o rbdata.o ubidi.o ubidiln.o bidi.o uvector.o
DEPS = $(OBJECTS:.o=.d)
@ -66,7 +66,7 @@ DEPS = $(OBJECTS:.o=.d)
HEADERS = utypes.h uloc.h ures.h ustring.h uchar.h chariter.h \
uchriter.h locid.h resbund.h unicode.h putil.h platform.h unistr.h \
schriter.h normlzr.h ucnv_err.h ucnv.h ucnv_bld.h convert.h \
ubidi.h bidi.h umisc.h
ubidi.h bidi.h umisc.h rep.h
## List of phony targets
.PHONY : all all-local install install-local clean clean-local \

View file

@ -53,12 +53,14 @@ CXXFLAGS = @CXXFLAGS@
LDFLAGS = @LDFLAGS@ $(LD_RPATH)$(LD_RPATH_PRE)$(libdir)
LIBS = $(LIBICU-UC) @LIBS@
OBJECTS = brkiter.o calendar.o chbkdat.o choicfmt.o colcache.o \
coleitr.o coll.o colrules.o datefmt.o dcfmtsym.o decimfmt.o dtfmtsym.o \
fmtable.o format.o gregocal.o lnbkdat.o mergecol.o msgfmt.o numfmt.o \
ptnentry.o simpletz.o simtxbd.o smpdtfmt.o snbkdat.o sortkey.o \
tables.o tblcoll.o tcoldata.o timezone.o txtbdat.o txtbdry.o ubrk.o \
ucal.o ucol.o udat.o umsg.o unicdcm.o uniset.o unum.o wdbkdat.o wdbktbl.o
OBJECTS = brkiter.o calendar.o chbkdat.o choicfmt.o colcache.o \
coleitr.o coll.o colrules.o cpdtrans.o datefmt.o dcfmtsym.o decimfmt.o \
dtfmtsym.o fmtable.o format.o gregocal.o hextouni.o lnbkdat.o \
mergecol.o msgfmt.o numfmt.o ptnentry.o rbt.o rbt_data.o rbt_pars.o \
rbt_rule.o rbt_set.o simpletz.o simtxbd.o smpdtfmt.o snbkdat.o \
sortkey.o tables.o tblcoll.o tcoldata.o timezone.o translit.o \
txtbdat.o txtbdry.o ubrk.o ucal.o ucol.o udat.o umsg.o unicdcm.o \
unifltlg.o unirange.o uniset.o unitohex.o unum.o wdbkdat.o wdbktbl.o
DEPS = $(OBJECTS:.o=.d)
@ -67,7 +69,8 @@ HEADERS= ucal.h unum.h udat.h umsg.h calendar.h choicfmt.h datefmt.h \
dcfmtsym.h decimfmt.h dtfmtsym.h fieldpos.h fmtable.h format.h \
gregocal.h msgfmt.h numfmt.h parsepos.h simpletz.h smpdtfmt.h \
timezone.h ucol.h coll.h tblcoll.h sortkey.h coleitr.h ubrk.h \
brkiter.h uniset.h
brkiter.h uniset.h \
cpdtrans.h hextouni.h rbt.h translit.h unifilt.h unifltlg.h unitohex.h
## List of phony targets
.PHONY : all all-local install install-local clean clean-local \

View file

@ -36,7 +36,7 @@
* <li><code>REVERSE_RULE_BASED_PLACEHOLDER</code>. Like
* <code>RULE_BASED_PLACEHOLDER</code>, except the entity names in
* the ID are reversed, and the argument
* RuleBasedTransliterator.REVERSE is pased to the
* RuleBasedTransliterator::REVERSE is pased to the
* RuleBasedTransliterator constructor.
* </ul>
*/
@ -628,8 +628,8 @@ Transliterator* Transliterator::_createInstance(const UnicodeString& ID) {
if (rules != 0 && U_SUCCESS(status)) {
data = TransliterationRuleParser::parse(*rules, isReverse
? RuleBasedTransliterator.REVERSE
: RuleBasedTransliterator.FORWARD);
? RuleBasedTransliterator::REVERSE
: RuleBasedTransliterator::FORWARD);
// Double check to see if someone has modified the entry
// since we last looked at it.

View file

@ -63,7 +63,7 @@ loctest.o miscdtfm.o mnkytst.o msfmrgts.o nmfmapts.o nmfmtrt.o \
numfmtst.o numrgts.o pptest.o regcoll.o restest.o sdtfmtts.o tchcfmt.o \
tfsmalls.o tmsgfmt.o trcoll.o tscoll.o tsdate.o tsdcfmsy.o tsdtfmsy.o \
tsmthred.o tsmutex.o tsnmfmt.o tsputil.o tstnorm.o tzbdtest.o \
tzregts.o tztest.o ucdtest.o usettest.o ustrtest.o
tzregts.o tztest.o ucdtest.o usettest.o ustrtest.o transtst.o
DEPS = $(OBJECTS:.o=.d)

View file

@ -293,10 +293,10 @@ void TransliteratorTest::keyboardAux(const Transliterator& t,
}
// Show the start index '{' and the cursor '|'
UnicodeString a, b, c;
s.extractBetween(0, index[Transliterator.START], a);
s.extractBetween(index[Transliterator.START],
index[Transliterator.CURSOR], b);
s.extractBetween(index[Transliterator.CURSOR],
s.extractBetween(0, index[Transliterator::START], a);
s.extractBetween(index[Transliterator::START],
index[Transliterator::CURSOR], b);
s.extractBetween(index[Transliterator::CURSOR],
s.length(), c);
log.append(a).
append('{').
@ -482,8 +482,8 @@ void TransliteratorTest::expect(const Transliterator& t,
// Append the string buffer with a vertical bar '|' where
// the committed index is.
UnicodeString left, right;
rsource.extractBetween(0, index[Transliterator.CURSOR], left);
rsource.extractBetween(index[Transliterator.CURSOR], rsource.length(), right);
rsource.extractBetween(0, index[Transliterator::CURSOR], left);
rsource.extractBetween(index[Transliterator::CURSOR], rsource.length(), right);
log.append(left).append((UChar)'|').append(right);
}

View file

@ -83,8 +83,14 @@ sl_SI.txt sq.txt sq_AL.txt sr.txt sr_YU.txt sv.txt sv_SE.txt th.txt \
th_TH.txt tr.txt tr_TR.txt uk.txt uk_UA.txt vi.txt vi_VN.txt zh.txt \
zh_CN.txt zh_HK.txt zh_TW.txt default.txt index.txt
TRANSLIT_SOURCE = expcon.txt kbdescl1.txt larabic.txt ldevan.txt \
lgreek.txt lhalfwid.txt lhebrew.txt lkana.txt lrussian.txt \
quotes.txt ucname.txt
TXT_FILES = $(TXT_SOURCE:%=$(top_srcdir)/../data/%)
RES_FILES = $(TXT_FILES:.txt=.res)
TRANSLIT_FILES = $(TRANSLIT_SOURCE:%=$(top_srcdir)/../data/translit/%)
TRANSLIT_RES = $(TRANSLIT_FILES:.txt=.res)
TEST_FILES = $(top_srcdir)/test/testdata/default.res \
$(top_srcdir)/test/testdata/te.res \
$(top_srcdir)/test/testdata/te_IN.res
@ -105,7 +111,7 @@ distclean : distclean-local
dist: dist-local
check: check-local
all-local: $(TARGET) $(RES_FILES) $(TEST_FILES)
all-local: $(TARGET) $(RES_FILES) $(TRANSLIT_RES) $(TEST_FILES)
install-local: target-clean-local all-local
$(mkinstalldirs) $(sbindir)
@ -115,6 +121,11 @@ install-local: target-clean-local all-local
echo $(INSTALL_DATA) $(top_srcdir)/../data/$$file $(pkgdatadir)/$(VERSION)/$$file; \
$(INSTALL_DATA) $(top_srcdir)/../data/$$file $(pkgdatadir)/$(VERSION)/$$file; \
done
$(mkinstalldirs) $(pkgdatadir)/$(VERSION)/translit
@list='$(notdir $(TRANSLIT_RES))'; for file in $$list; do \
echo $(INSTALL_DATA) $(top_srcdir)/../data/translit/$$file $(pkgdatadir)/$(VERSION)/translit/$$file; \
$(INSTALL_DATA) $(top_srcdir)/../data/translit/$$file $(pkgdatadir)/$(VERSION)/translit/$$file; \
done
dist-local: