incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yda...@apache.org
Subject svn commit: r1292855 - in /incubator/ooo/trunk/main/i18npool: prj/ source/breakiterator/data/ source/collator/ source/collator/data/ source/indexentry/data/ source/search/ source/textconversion/data/ util/
Date Thu, 23 Feb 2012 17:07:21 GMT
Author: ydario
Date: Thu Feb 23 17:07:20 2012
New Revision: 1292855

URL: http://svn.apache.org/viewvc?rev=1292855&view=rev
Log:
i118923 - OS/2 port: i18npool build system updates.

Modified:
    incubator/ooo/trunk/main/i18npool/prj/d.lst
    incubator/ooo/trunk/main/i18npool/source/breakiterator/data/makefile.mk
    incubator/ooo/trunk/main/i18npool/source/collator/data/makefile.mk
    incubator/ooo/trunk/main/i18npool/source/collator/makefile.mk
    incubator/ooo/trunk/main/i18npool/source/indexentry/data/makefile.mk
    incubator/ooo/trunk/main/i18npool/source/search/makefile.mk
    incubator/ooo/trunk/main/i18npool/source/search/textsearch.cxx
    incubator/ooo/trunk/main/i18npool/source/textconversion/data/makefile.mk
    incubator/ooo/trunk/main/i18npool/util/makefile.mk

Modified: incubator/ooo/trunk/main/i18npool/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/i18npool/prj/d.lst?rev=1292855&r1=1292854&r2=1292855&view=diff
==============================================================================
--- incubator/ooo/trunk/main/i18npool/prj/d.lst (original)
+++ incubator/ooo/trunk/main/i18npool/prj/d.lst Thu Feb 23 17:07:20 2012
@@ -37,11 +37,13 @@ mkdir: %_DEST%\inc%_EXT%\i18npool
 ..\version.mk  %_DEST%\inc%_EXT%\i18npool\version.mk
 
 ..\%__SRC%\lib\ii18nisolang*.lib %_DEST%\lib%_EXT%\ii18nisolang*.lib
+..\%__SRC%\lib\i18nisolang*.lib %_DEST%\lib%_EXT%\i18nisolang*.lib
 ..\%__SRC%\bin\i18nisol*.dll %_DEST%\bin%_EXT%\i18nisol*.dll
 ..\%__SRC%\lib\libi18nisolang*.so %_DEST%\lib%_EXT%\libi18nisolang*.so
 ..\%__SRC%\lib\libi18nisolang*.dylib %_DEST%\lib%_EXT%\libi18nisolang*.dylib
 
 ..\%__SRC%\lib\ii18npaper*.lib %_DEST%\lib%_EXT%\ii18npaper*.lib
+..\%__SRC%\lib\i18npaper*.lib %_DEST%\lib%_EXT%\i18npaper*.lib
 ..\%__SRC%\bin\i18npape*.dll %_DEST%\bin%_EXT%\i18npape*.dll
 ..\%__SRC%\lib\libi18npaper*.so %_DEST%\lib%_EXT%\libi18npaper*.so
 ..\%__SRC%\lib\libi18npaper*.dylib %_DEST%\lib%_EXT%\libi18npaper*.dylib

Modified: incubator/ooo/trunk/main/i18npool/source/breakiterator/data/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/i18npool/source/breakiterator/data/makefile.mk?rev=1292855&r1=1292854&r2=1292855&view=diff
==============================================================================
--- incubator/ooo/trunk/main/i18npool/source/breakiterator/data/makefile.mk (original)
+++ incubator/ooo/trunk/main/i18npool/source/breakiterator/data/makefile.mk Thu Feb 23 17:07:20
2012
@@ -74,5 +74,7 @@ $(MISC)$/dict_%.cxx : %.dic
 	$(AUGMENT_LIBRARY_PATH) $(BIN)$/gendict $< $@
 
 # ugly - is this dependency really required here?
+.IF "$(GUI)" != "OS2"
 $(foreach,i,$(shell @$(FIND) . -name "*.dic") $(MISC)$/dict_$(i:b).cxx) : $(BIN)$/gendict$(EXECPOST)
+.ENDIF
 

Modified: incubator/ooo/trunk/main/i18npool/source/collator/data/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/i18npool/source/collator/data/makefile.mk?rev=1292855&r1=1292854&r2=1292855&view=diff
==============================================================================
--- incubator/ooo/trunk/main/i18npool/source/collator/data/makefile.mk (original)
+++ incubator/ooo/trunk/main/i18npool/source/collator/data/makefile.mk Thu Feb 23 17:07:20
2012
@@ -54,5 +54,7 @@ $(MISC)$/collator_%.cxx : %.txt
     $(AUGMENT_LIBRARY_PATH) $(BIN)$/gencoll_rule $< $@ $*
 
 # ugly - is this dependency really required here?
+.IF "$(GUI)" != "OS2"
 $(foreach,i,$(shell @$(FIND) . -name "*.txt") $(MISC)$/dict_$(i:b).cxx) : $(BIN)$/gencoll_rule$(EXECPOST)
+.ENDIF
 

Modified: incubator/ooo/trunk/main/i18npool/source/collator/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/i18npool/source/collator/makefile.mk?rev=1292855&r1=1292854&r2=1292855&view=diff
==============================================================================
--- incubator/ooo/trunk/main/i18npool/source/collator/makefile.mk (original)
+++ incubator/ooo/trunk/main/i18npool/source/collator/makefile.mk Thu Feb 23 17:07:20 2012
@@ -34,7 +34,11 @@ ENABLE_EXCEPTIONS=TRUE
 
 # --- Files --------------------------------------------------------
 
+.IF "$(GUI)" == "OS2"
+txtlist:=$(shell @cd data > $(NULLDEV) && ls *.txt)
+.ELSE
 txtlist:=$(shell @cd data >& $(NULLDEV) && ls *.txt)
+.ENDIF
 LOCAL_RULE_LANGS:=$(uniq $(foreach,i,$(txtlist) $(i:s/-/_/:s/_/ /:1)))
 rules_dependencies:=$(foreach,i,$(txtlist) data$/$i) $(INCCOM)$/lrl_include.hxx
 
@@ -65,5 +69,9 @@ $(rules_obj) : $(rules_dependencies)
 
 $(INCCOM)$/lrl_include.hxx: $(foreach,i,$(txtlist) data$/$i)
 	@@$(RM) $@
+.IF "$(GUI)" == "OS2"
+	@echo $(EMQ)#define LOCAL_RULE_LANGS $(EMQ)"$(LOCAL_RULE_LANGS)$(EMQ)" > $@
+.ELSE
 	@echo $(EMQ)#define LOCAL_RULE_LANGS $(EMQ)"$(LOCAL_RULE_LANGS)$(EMQ)" >& $@
+.ENDIF
 

Modified: incubator/ooo/trunk/main/i18npool/source/indexentry/data/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/i18npool/source/indexentry/data/makefile.mk?rev=1292855&r1=1292854&r2=1292855&view=diff
==============================================================================
--- incubator/ooo/trunk/main/i18npool/source/indexentry/data/makefile.mk (original)
+++ incubator/ooo/trunk/main/i18npool/source/indexentry/data/makefile.mk Thu Feb 23 17:07:20
2012
@@ -57,5 +57,7 @@ $(MISC)$/%.cxx : %.txt
     $(AUGMENT_LIBRARY_PATH) $(BIN)$/genindex_data $< $@ $*
 
 # ugly - is this dependency really required here?
+.IF "$(GUI)" != "OS2"
 $(foreach,i,$(shell @$(FIND) . -name "*.txt") $(MISC)$/dict_$(i:b).cxx) : $(BIN)$/genindex_data$(EXECPOST)
+.ENDIF
 

Modified: incubator/ooo/trunk/main/i18npool/source/search/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/i18npool/source/search/makefile.mk?rev=1292855&r1=1292854&r2=1292855&view=diff
==============================================================================
--- incubator/ooo/trunk/main/i18npool/source/search/makefile.mk (original)
+++ incubator/ooo/trunk/main/i18npool/source/search/makefile.mk Thu Feb 23 17:07:20 2012
@@ -48,7 +48,11 @@ EXCEPTIONSNOOPTFILES= \
         $(SLO)$/textsearch.obj
 .ENDIF
 
+.IF "$(GUI)" == "OS2"
+SHL1TARGET= i18nsear
+.ELSE
 SHL1TARGET= $(TARGET)
+.ENDIF
 SHL1OBJS=	$(SLOFILES)
 
 SHL1STDLIBS= \

Modified: incubator/ooo/trunk/main/i18npool/source/search/textsearch.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/i18npool/source/search/textsearch.cxx?rev=1292855&r1=1292854&r2=1292855&view=diff
==============================================================================
--- incubator/ooo/trunk/main/i18npool/source/search/textsearch.cxx (original)
+++ incubator/ooo/trunk/main/i18npool/source/search/textsearch.cxx Thu Feb 23 17:07:20 2012
@@ -720,7 +720,11 @@ void TextSearch::RESrchPrepare( const ::
 		nIcuSearchFlags |= UREGEX_CASE_INSENSITIVE;
 	UErrorCode nIcuErr = U_ZERO_ERROR;
 	// assumption: transliteration didn't mangle regexp control chars
+#ifdef OS2
+	IcuUniString aIcuSearchPatStr( (const UChar*)rPatternStr.getStr(), rPatternStr.getLength());
+#else
 	IcuUniString aIcuSearchPatStr( rPatternStr.getStr(), rPatternStr.getLength());
+#endif
 #if 1
 	// for conveniance specific syntax elements of the old regex engine are emulated
 	// by using regular word boundary matching \b to replace \< and \>
@@ -752,7 +756,11 @@ SearchResult TextSearch::RESrchFrwrd( co
 
 	// use the ICU RegexMatcher to find the matches
 	UErrorCode nIcuErr = U_ZERO_ERROR;
+#ifdef OS2
+	const IcuUniString aSearchTargetStr( (const UChar*)searchStr.getStr(), endPos);
+#else
 	const IcuUniString aSearchTargetStr( searchStr.getStr(), endPos);
+#endif
 	pRegexMatcher->reset( aSearchTargetStr);
 	// search until there is a valid match
 	for(;;)
@@ -802,7 +810,11 @@ SearchResult TextSearch::RESrchBkwrd( co
 	// TODO: use ICU's backward searching once it becomes available
 	//       as its replacement using forward search is not as good as the real thing
 	UErrorCode nIcuErr = U_ZERO_ERROR;
+#ifdef OS2
+	const IcuUniString aSearchTargetStr( (const UChar*)searchStr.getStr(), startPos);
+#else
 	const IcuUniString aSearchTargetStr( searchStr.getStr(), startPos);
+#endif
 	pRegexMatcher->reset( aSearchTargetStr);
 	if( !pRegexMatcher->find( endPos, nIcuErr))
 		return aRet;

Modified: incubator/ooo/trunk/main/i18npool/source/textconversion/data/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/i18npool/source/textconversion/data/makefile.mk?rev=1292855&r1=1292854&r2=1292855&view=diff
==============================================================================
--- incubator/ooo/trunk/main/i18npool/source/textconversion/data/makefile.mk (original)
+++ incubator/ooo/trunk/main/i18npool/source/textconversion/data/makefile.mk Thu Feb 23 17:07:20
2012
@@ -58,5 +58,7 @@ $(MISC)$/%.cxx : %.dic
 	$(AUGMENT_LIBRARY_PATH) $(BIN)$/genconv_dict $* $< $@
 
 # ugly - is this dependency really required here?
+.IF "$(GUI)" != "OS2"
 $(foreach,i,$(shell @$(FIND) . -name "*.dic") $(MISC)$/dict_$(i:b).cxx) : $(BIN)$/genconv_dict$(EXECPOST)
+.ENDIF
 

Modified: incubator/ooo/trunk/main/i18npool/util/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/i18npool/util/makefile.mk?rev=1292855&r1=1292854&r2=1292855&view=diff
==============================================================================
--- incubator/ooo/trunk/main/i18npool/util/makefile.mk (original)
+++ incubator/ooo/trunk/main/i18npool/util/makefile.mk Thu Feb 23 17:07:20 2012
@@ -47,7 +47,11 @@ LIB1FILES=	$(SLB)$/defaultnumberingprovi
 		$(SLB)$/textconversion.lib \
 		$(SLB)$/ordinalsuffix.lib
 
+.IF "$(GUI)" == "OS2"
+SHL1TARGET= i18npool
+.ELSE
 SHL1TARGET= $(TARGET)
+.ENDIF
 # WNT needs implib name even if there is none
 SHL1IMPLIB= i$(SHL1TARGET)
 



Mime
View raw message