AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed make files to work with gnumake

Browse Source 
X-SVN-Rev: 789
This commit is contained in:
John Fitzpatrick 2000-02-18 00:29:08 +00:00
parent 8768599d96
commit 862b0832b9
6 changed files with 63 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
icu4j/src/build/rules.gmk
View File

@ -17,47 +17,46 @@ FILES_class= $(FILES_java:.java=.class)
CLASSLIST= classes.list
CLASS_DEST_DIR= $(CLASSDIR)/$(PKGPATH)
# {$(SRCDIR)/$(PKGPATH)}.java{$(CLASSDIR)/$(PKGPATH)}.class:
# @echo $(?) >> $(CLASSLIST)
# {$(SRCDIR)/$(PKGPATH)}.java{$(CLASS_DEST_DIR)}.class:
# @echo $(?) >> .classes.list
$(CLASS_DEST_DIR) :
@mkdir -p $@
$(FILES_class) : $(CLASS_DEST_DIR)%.class: $(SRCDIR)/$(PKGPATH)%.java
@echo $? >> $(CLASSLIST)
@echo $? >> .classes.list
.compile.classlist: $(FILES_class)
@if [ -s $(CLASSLIST) ] ; then echo Compiling { ; fi
@if [ -s $(CLASSLIST) ] ; then cat $(CLASSLIST) ; fi
@if [ -s $(CLASSLIST) ] ; then $(JAVAC) $(shell cat $(CLASSLIST)) ; fi
@if [ -s $(CLASSLIST) ] ; then echo } ; fi
@rm -f $(CLASSLIST)
@if [ -s .classes.list ] ; then echo Compiling { ; fi
@if [ -s .classes.list ] ; then echo $(FILES_java) ; fi
@if [ -s .classes.list ] ; then $(JAVAC) $(shell if [ -s .classes.list ] ; then cat .classes.list; fi) ; fi
@if [ -s .classes.list ] ; then echo } ; fi
@rm -f .classes.list
ifdef FILES_dict
# FILES_dict= $(FILES_dict:/=\)
SRC_FILES_dict= $(subst classes,src,$(FILES_dict))
# SRC_FILES_dict= $(FILES_dict:classes=src)
#SRC_FILES_dict= $(subst classes,src,$(FILES_dict))
SRC_FILES_dict= $(FILES_dict:classes=src)
endif
classes: $(CLASS_DEST_DIR) delete.classlist $(FILES_class) $(FILES_dics) .compile.classlist
ifdef FILES_dict
@cp $(SRC_FILES_dict) $(CLASSDIR)/$(PKGPATH)/$(notdir $(SRC_FILES_dict))
@cp $(SRC_FILES_dict) $(CLASS_DEST_DIR)/$(notdir $(SRC_FILES_dict))
endif
ifdef SUBDIRS
@for D in $(SUBDIRS) ; do cd $$D ; gnumake -f makefile.gmk classes ; cd .. ; done
# @for %%d in ( $(SUBDIRS) ) do cd %d && gnumake -f makefile.gmk classes && cd ..
endif
dict: $(SRC_FILES_dict) $(CLASSDIR)/$(PKGPATH)
dict: $(SRC_FILES_dict) $(CLASS_DEST_DIR)
@echo $(FILES_dict)
@echo $(SRC_FILES_dict)
@cp $(SRC_FILES_dict) $(CLASSDIR)/$(PKGPATH)/$(notdir $(SRC_FILES_dict))
@cp $(SRC_FILES_dict) $(CLASS_DEST_DIR)/$(notdir $(SRC_FILES_dict))
delete.classlist:
@rm -f $(CLASSLIST)
@rm -f .classes.list
clean:
rm -rf ../classes/com
rm -rf ../doc
#!ifdef FILES_java
# rm -f $(FILES_class)
#!endif

10
icu4j/src/com/ibm/icu/text/Transliterator.java
View File

@ -198,7 +198,7 @@ import java.text.MessageFormat;
* <p>Copyright &copy; IBM Corporation 1999. All rights reserved.
*
* @author Alan Liu
* @version $RCSfile: Transliterator.java,v $ $Revision: 1.12 $ $Date: 2000/02/16 19:04:31 $
* @version $RCSfile: Transliterator.java,v $ $Revision: 1.13 $ $Date: 2000/02/18 00:29:08 $
*/
public abstract class Transliterator {
/**
@ -374,7 +374,9 @@ public abstract class Transliterator {
* to this String to obtain the class name.
*/
private static final String RB_RULE_BASED_PREFIX =
"com.ibm.text.resources.TransliterationRule$";
"com.ibm.text.resources.TransliterationRule_";
private static final char RB_RULE_BASED_SEPEATOR = '_';
/**
* Resource bundle key for the RuleBasedTransliterator rule.
@ -863,8 +865,8 @@ public abstract class Transliterator {
} else {
String IDLeft = ID.substring(0, i);
String IDRight = ID.substring(i+1);
resourceName += isReverse ? (IDRight + '$' + IDLeft)
: (IDLeft + '$' + IDRight);
resourceName += isReverse ? (IDRight + RB_RULE_BASED_SEPEATOR + IDLeft)
: (IDLeft + RB_RULE_BASED_SEPEATOR + IDRight);
}
try {
ResourceBundle resource = ResourceBundle.getBundle(resourceName);

10
icu4j/src/com/ibm/text/Transliterator.java
View File

@ -198,7 +198,7 @@ import java.text.MessageFormat;
* <p>Copyright &copy; IBM Corporation 1999. All rights reserved.
*
* @author Alan Liu
* @version $RCSfile: Transliterator.java,v $ $Revision: 1.12 $ $Date: 2000/02/16 19:04:31 $
* @version $RCSfile: Transliterator.java,v $ $Revision: 1.13 $ $Date: 2000/02/18 00:29:08 $
*/
public abstract class Transliterator {
/**
@ -374,7 +374,9 @@ public abstract class Transliterator {
* to this String to obtain the class name.
*/
private static final String RB_RULE_BASED_PREFIX =
"com.ibm.text.resources.TransliterationRule$";
"com.ibm.text.resources.TransliterationRule_";
private static final char RB_RULE_BASED_SEPEATOR = '_';
/**
* Resource bundle key for the RuleBasedTransliterator rule.
@ -863,8 +865,8 @@ public abstract class Transliterator {
} else {
String IDLeft = ID.substring(0, i);
String IDRight = ID.substring(i+1);
resourceName += isReverse ? (IDRight + '$' + IDLeft)
: (IDLeft + '$' + IDRight);
resourceName += isReverse ? (IDRight + RB_RULE_BASED_SEPEATOR + IDLeft)
: (IDLeft + RB_RULE_BASED_SEPEATOR + IDRight);
}
try {
ResourceBundle resource = ResourceBundle.getBundle(resourceName);

30
icu4j/src/com/ibm/text/resources/GNUmakefile
View File

@ -1,5 +1,5 @@
#
# @(#)$RCSfile: GNUmakefile,v $ $Revision: 1.1 $ $Date: 2000/02/16 23:39:59 $
# @(#)$RCSfile: GNUmakefile,v $ $Revision: 1.2 $ $Date: 2000/02/18 00:29:08 $
#
TOPDIR= ../../../../..
@ -26,20 +26,20 @@ FILES_java= $(TARGDIR)/NumberFormatRules.java \
$(TARGDIR)/BreakIteratorRules.java \
$(TARGDIR)/BreakIteratorRules_th.java \
\
$(TARGDIR)/TransliterationRule$$Fullwidth$$Halfwidth.java \
$(TARGDIR)/TransliterationRule$$Han$$Pinyin.java \
$(TARGDIR)/TransliterationRule$$Kanji$$English.java \
$(TARGDIR)/TransliterationRule$$Kanji$$OnRomaji.java \
$(TARGDIR)/TransliterationRule$$KeyboardEscape$$Latin1.java \
$(TARGDIR)/TransliterationRule$$Latin$$Arabic.java \
$(TARGDIR)/TransliterationRule$$Latin$$Cyrillic.java \
$(TARGDIR)/TransliterationRule$$Latin$$Devanagari.java \
$(TARGDIR)/TransliterationRule$$Latin$$Greek.java \
$(TARGDIR)/TransliterationRule$$Latin$$Hebrew.java \
$(TARGDIR)/TransliterationRule$$Latin$$Jamo.java \
$(TARGDIR)/TransliterationRule$$Latin$$Kana.java \
$(TARGDIR)/TransliterationRule$$StraightQuotes$$CurlyQuotes.java \
$(TARGDIR)/TransliterationRule$$UnicodeName$$UnicodeChar.java \
$(TARGDIR)/TransliterationRule_Fullwidth_Halfwidth.java \
# $(TARGDIR)/TransliterationRule_Han_Pinyin.java \
$(TARGDIR)/TransliterationRule_Kanji_English.java \
$(TARGDIR)/TransliterationRule_Kanji_OnRomaji.java \
$(TARGDIR)/TransliterationRule_KeyboardEscape_Latin1.java \
$(TARGDIR)/TransliterationRule_Latin_Arabic.java \
$(TARGDIR)/TransliterationRule_Latin_Cyrillic.java \
$(TARGDIR)/TransliterationRule_Latin_Devanagari.java \
$(TARGDIR)/TransliterationRule_Latin_Greek.java \
$(TARGDIR)/TransliterationRule_Latin_Hebrew.java \
$(TARGDIR)/TransliterationRule_Latin_Jamo.java \
$(TARGDIR)/TransliterationRule_Latin_Kana.java \
$(TARGDIR)/TransliterationRule_StraightQuotes_CurlyQuotes.java \
$(TARGDIR)/TransliterationRule_UnicodeName_UnicodeChar.java \
\
$(TARGDIR)/LocaleElements.java \
$(TARGDIR)/LocaleElements_en.java \

30
icu4j/src/com/ibm/text/resources/makefile
View File

@ -1,5 +1,5 @@
#
# @(#)$RCSfile: makefile,v $ $Revision: 1.1 $ $Date: 2000/02/16 23:40:00 $
# @(#)$RCSfile: makefile,v $ $Revision: 1.2 $ $Date: 2000/02/18 00:29:08 $
#
TOPDIR= ../../../../..
@ -26,20 +26,20 @@ FILES_java= $(TARGDIR)/NumberFormatRules.java \
$(TARGDIR)/BreakIteratorRules.java \
$(TARGDIR)/BreakIteratorRules_th.java \
\
$(TARGDIR)/TransliterationRule$$Fullwidth$$Halfwidth.java \
$(TARGDIR)/TransliterationRule$$Han$$Pinyin.java \
$(TARGDIR)/TransliterationRule$$Kanji$$English.java \
$(TARGDIR)/TransliterationRule$$Kanji$$OnRomaji.java \
$(TARGDIR)/TransliterationRule$$KeyboardEscape$$Latin1.java \
$(TARGDIR)/TransliterationRule$$Latin$$Arabic.java \
$(TARGDIR)/TransliterationRule$$Latin$$Cyrillic.java \
$(TARGDIR)/TransliterationRule$$Latin$$Devanagari.java \
$(TARGDIR)/TransliterationRule$$Latin$$Greek.java \
$(TARGDIR)/TransliterationRule$$Latin$$Hebrew.java \
$(TARGDIR)/TransliterationRule$$Latin$$Jamo.java \
$(TARGDIR)/TransliterationRule$$Latin$$Kana.java \
$(TARGDIR)/TransliterationRule$$StraightQuotes$$CurlyQuotes.java \
$(TARGDIR)/TransliterationRule$$UnicodeName$$UnicodeChar.java \
$(TARGDIR)/TransliterationRule_Fullwidth_Halfwidth.java \
# $(TARGDIR)/TransliterationRule_Han_Pinyin.java \
$(TARGDIR)/TransliterationRule_Kanji_English.java \
$(TARGDIR)/TransliterationRule_Kanji_OnRomaji.java \
$(TARGDIR)/TransliterationRule_KeyboardEscape_Latin1.java \
$(TARGDIR)/TransliterationRule_Latin_Arabic.java \
$(TARGDIR)/TransliterationRule_Latin_Cyrillic.java \
$(TARGDIR)/TransliterationRule_Latin_Devanagari.java \
$(TARGDIR)/TransliterationRule_Latin_Greek.java \
$(TARGDIR)/TransliterationRule_Latin_Hebrew.java \
$(TARGDIR)/TransliterationRule_Latin_Jamo.java \
$(TARGDIR)/TransliterationRule_Latin_Kana.java \
$(TARGDIR)/TransliterationRule_StraightQuotes_CurlyQuotes.java \
$(TARGDIR)/TransliterationRule_UnicodeName_UnicodeChar.java \
\
$(TARGDIR)/LocaleElements.java \
$(TARGDIR)/LocaleElements_en.java \

12
icu4j/src/makefile.gmk
View File

@ -1,5 +1,5 @@
#
# @(#)$RCSfile: makefile.gmk,v $ $Revision: 1.2 $ $Date: 2000/02/17 05:14:59 $
# @(#)$RCSfile: makefile.gmk,v $ $Revision: 1.3 $ $Date: 2000/02/18 00:29:08 $
#
TOPDIR=..
@ -11,7 +11,7 @@ SUBDIRS= com
default: classes
DOCDIR= $(TOPDIR)\docs
DOCDIR= $(TOPDIR)/docs
DOCINDEX= $(DOCDIR)/index.html
javadoc: FORCE
@ -24,7 +24,7 @@ javadoc: FORCE
-encoding "iso-8859-1" \
-docencoding "iso-8859-1" \
-bottom "<font size=-1>Copyright &copy; 1998-2000 IBM Corporation.</font>" \
com/ibm/text/*.java com/ibm/util/*.java
$(TOPDIR)/src/com/ibm/text/*.java $(TOPDIR)/src/com/ibm/util/*.java
tools: classes toolsinternal
@ -34,13 +34,13 @@ tests: classes testsinternal
demos: classes demosinternal
toolsinternal: FORCE
cd com\ibm\test && nmake -nologo classes && cd ..\..\..
cd com/ibm/test ; gnumake -f makefile.gmk classes ; cd ../../..
testsinternal: FORCE
cd com\ibm\test && nmake -nologo classes && cd ..\..\..
cd com/ibm/test ; gnumake -f makefile.gmk classes ; cd ../../..
demosinternal: FORCE
cd com\ibm\demo && nmake -nologo classes && cd ..\..\..
cd com/ibm/demo ; gnumake -f makefile.gmk classes ; cd ../../..
complete: classes testsinternal toolsinternal demosinternal javadoc