gcc/libjava/scripts/makemake.tcl
David Daney 52abc810fe makemake.tcl (properties_map): Don't exclude gnu/java/locale.
* scripts/makemake.tcl (properties_map): Don't exclude
	gnu/java/locale.
	* gnu/java/lang/MainThread.java (Klocale, Kcalendar): Remove.
	* java/text/Collator.java: Organize imports.
	(getAvailableLocales): Merge from classpath.
	(getInstance): Same.
	* sources.am: Regenerate.
	* Makefile.in: Regenerate.
	* classpath/lib/java/text/DecimalFormatSymbols.class,
	classpath/lib/java/text/DateFormatSymbols.class,
	classpath/lib/java/util/Currency.class,
	classpath/lib/java/util/Calendar.class,
	classpath/lib/gnu/java/lang/MainThread.class,
	classpath/lib/java/text/Collator.class,
	gnu/java/lang/MainThread.h,
	java/text/DateFormatSymbols.h,
	java/text/DecimalFormatSymbols.h,
	java/util/Calendar.h,
	java/util/Currency.h: Regenerate.
	* classpath/lib/gnu/java/locale/LocaleInformation_en_PH.class,
	classpath/lib/gnu/java/locale/LocaleInformation_es_AR.class,
	classpath/lib/gnu/java/locale/LocaleInformation_en_BW.class,
	classpath/lib/gnu/java/locale/LocaleInformation_de_BE.class,
	classpath/lib/gnu/java/locale/LocaleInformation_te_IN.class,
	classpath/lib/gnu/java/locale/LocaleInformation_en.class,
	classpath/lib/gnu/java/locale/LocaleInformation_iw_IL.class,
	classpath/lib/gnu/java/locale/LocaleInformation_fr_LU.class,
	classpath/lib/gnu/java/locale/LocaleInformation_ar_AE.class,
	classpath/lib/gnu/java/locale/LocaleInformation_sk_SK.class,
	classpath/lib/gnu/java/locale/LocaleInformation_fr_CA.class,
	classpath/lib/gnu/java/locale/LocaleInformation_es_MX.class,
	classpath/lib/gnu/java/locale/LocaleInformation_ar_EG.class,
	classpath/lib/gnu/java/locale/LocaleInformation_lt_LT.class,
	classpath/lib/gnu/java/locale/LocaleInformation_en_ZW.class,
	classpath/lib/gnu/java/locale/LocaleInformation_ar_QA.class,
	classpath/lib/gnu/java/locale/LocaleInformation_gv_GB.class,
	classpath/lib/gnu/java/locale/LocaleInformation_yi_US.class,
	classpath/lib/gnu/java/locale/LocaleInformation_ar_SD.class,
	classpath/lib/gnu/java/locale/LocaleInformation_ar_IQ.class,
	classpath/lib/gnu/java/locale/Calendar_de.class,
	classpath/lib/gnu/java/locale/LocaleInformation_es_HN.class,
	classpath/lib/gnu/java/locale/LocaleInformation_ar_YE.class,
	classpath/lib/gnu/java/locale/LocaleInformation_de_CH.class,
	classpath/lib/gnu/java/locale/LocaleInformation_es_PR.class,
	classpath/lib/gnu/java/locale/LocaleInformation_ar_BH.class,
	classpath/lib/gnu/java/locale/LocaleInformation_mi_NZ.class,
	classpath/lib/gnu/java/locale/Calendar_nl.class,
	classpath/lib/gnu/java/locale/LocaleInformation_fr_BE.class,
	classpath/lib/gnu/java/locale/LocaleInformation_es_EC.class,
	classpath/lib/gnu/java/locale/LocaleInformation_mt_MT.class,
	classpath/lib/gnu/java/locale/LocaleInformation_en_HK.class,
	classpath/lib/gnu/java/locale/LocaleInformation_es_CL.class,
	classpath/lib/gnu/java/locale/LocaleInformation_kw_GB.class,
	classpath/lib/gnu/java/locale/LocaleInformation_mk_MK.class,
	classpath/lib/gnu/java/locale/LocaleInformation_es_ES.class,
	classpath/lib/gnu/java/locale/LocaleInformation_cs_CZ.class,
	classpath/lib/gnu/java/locale/LocaleInformation_nl_NL.class,
	classpath/lib/gnu/java/locale/LocaleInformation_en_CA.class,
	classpath/lib/gnu/java/locale/LocaleInformation_bs_BA.class,
	classpath/lib/gnu/java/locale/LocaleInformation_ru_UA.class,
	classpath/lib/gnu/java/locale/LocaleInformation_es_US.class,
	classpath/lib/gnu/java/locale/LocaleInformation_fr_CH.class,
	classpath/lib/gnu/java/locale/LocaleInformation_ja_JP.class,
	classpath/lib/gnu/java/locale/LocaleInformation_it_CH.class,
	classpath/lib/gnu/java/locale/LocaleInformation_es_PA.class,
	classpath/lib/gnu/java/locale/LocaleInformation_kl_GL.class,
	classpath/lib/gnu/java/locale/LocaleInformation_de.class,
	classpath/lib/gnu/java/locale/LocaleInformation_el_GR.class,
	classpath/lib/gnu/java/locale/LocaleInformation_en_IN.class,
	classpath/lib/gnu/java/locale/LocaleInformation_es_DO.class,
	classpath/lib/gnu/java/locale/LocaleInformation_tr_TR.class,
	classpath/lib/gnu/java/locale/LocaleInformation_es_PE.class,
	classpath/lib/gnu/java/locale/LocaleInformation_zh_TW.class,
	classpath/lib/gnu/java/locale/LocaleInformation_ar_OM.class,
	classpath/lib/gnu/java/locale/LocaleInformation_ar_KW.class,
	classpath/lib/gnu/java/locale/LocaleInformation_ga_IE.class,
	classpath/lib/gnu/java/locale/LocaleInformation_hu_HU.class,
	classpath/lib/gnu/java/locale/LocaleInformation_nl.class,
	classpath/lib/gnu/java/locale/LocaleInformation_ca_ES.class,
	classpath/lib/gnu/java/locale/LocaleInformation_zh_SG.class,
	classpath/lib/gnu/java/locale/LocaleInformation_de_AT.class,
	classpath/lib/gnu/java/locale/LocaleInformation_ar_LB.class,
	classpath/lib/gnu/java/locale/LocaleInformation_es_PY.class,
	classpath/lib/gnu/java/locale/LocaleInformation_nl_BE.class,
	classpath/lib/gnu/java/locale/LocaleInformation_af_ZA.class,
	classpath/lib/gnu/java/locale/LocaleInformation_he_IL.class,
	classpath/lib/gnu/java/locale/LocaleInformation_ro_RO.class,
	classpath/lib/gnu/java/locale/LocaleInformation_vi_VN.class,
	classpath/lib/gnu/java/locale/LocaleInformation_cy_GB.class,
	classpath/lib/gnu/java/locale/LocaleInformation_hi_IN.class,
	classpath/lib/gnu/java/locale/LocaleInformation_es_CO.class,
	classpath/lib/gnu/java/locale/LocaleInformation_ar_JO.class,
	classpath/lib/gnu/java/locale/LocaleInformation_br_FR.class,
	classpath/lib/gnu/java/locale/LocaleInformation_ta_IN.class,
	classpath/lib/gnu/java/locale/LocaleInformation_en_ZA.class,
	classpath/lib/gnu/java/locale/LocaleInformation_fr_FR.class,
	classpath/lib/gnu/java/locale/LocaleInformation_ar_DZ.class,
	classpath/lib/gnu/java/locale/LocaleInformation_eu_ES.class,
	classpath/lib/gnu/java/locale/LocaleInformation_ar_TN.class,
	classpath/lib/gnu/java/locale/LocaleInformation_tl_PH.class,
	classpath/lib/gnu/java/locale/LocaleInformation_pl_PL.class,
	classpath/lib/gnu/java/locale/LocaleInformation_sv_FI.class,
	classpath/lib/gnu/java/locale/LocaleInformation_id_ID.class,
	classpath/lib/gnu/java/locale/LocaleInformation_en_GB.class,
	classpath/lib/gnu/java/locale/LocaleInformation_uz_UZ.class,
	classpath/lib/gnu/java/locale/LocaleInformation_fi_FI.class,
	classpath/lib/gnu/java/locale/LocaleInformation_en_IE.class,
	classpath/lib/gnu/java/locale/LocaleInformation_ar_MA.class,
	classpath/lib/gnu/java/locale/LocaleInformation_be_BY.class,
	classpath/lib/gnu/java/locale/LocaleInformation_bn_IN.class,
	classpath/lib/gnu/java/locale/LocaleInformation_pt_PT.class,
	classpath/lib/gnu/java/locale/LocaleInformation_es_BO.class,
	classpath/lib/gnu/java/locale/LocaleInformation_en_AU.class,
	classpath/lib/gnu/java/locale/LocaleInformation_es_NI.class,
	classpath/lib/gnu/java/locale/LocaleInformation_zh_CN.class,
	classpath/lib/gnu/java/locale/LocaleInformation_es_VE.class,
	classpath/lib/gnu/java/locale/LocaleInformation_ka_GE.class,
	classpath/lib/gnu/java/locale/LocaleInformation_it_IT.class,
	classpath/lib/gnu/java/locale/LocaleInformation_en_US.class,
	classpath/lib/gnu/java/locale/LocaleInformation_sl_SI.class,
	classpath/lib/gnu/java/locale/LocaleInformation_en_DK.class,
	classpath/lib/gnu/java/locale/LocaleInformation.class,
	classpath/lib/gnu/java/locale/LocaleInformation_es_CR.class,
	classpath/lib/gnu/java/locale/LocaleInformation_ru_RU.class,
	classpath/lib/gnu/java/locale/LocaleInformation_sq_AL.class,
	classpath/lib/gnu/java/locale/LocaleInformation_de_DE.class,
	classpath/lib/gnu/java/locale/LocaleInformation_es_GT.class,
	classpath/lib/gnu/java/locale/LocaleInformation_sr_YU.class,
	classpath/lib/gnu/java/locale/LocaleInformation_da_DK.class,
	classpath/lib/gnu/java/locale/LocaleInformation_gd_GB.class,
	classpath/lib/gnu/java/locale/LocaleInformation_hr_HR.class,
	classpath/lib/gnu/java/locale/LocaleInformation_zh_HK.class,
	classpath/lib/gnu/java/locale/LocaleInformation_uk_UA.class,
	classpath/lib/gnu/java/locale/LocaleInformation_ko_KR.class,
	classpath/lib/gnu/java/locale/Calendar_en.class,
	classpath/lib/gnu/java/locale/LocaleInformation_ar_LY.class,
	classpath/lib/gnu/java/locale/LocaleInformation_pt_BR.class,
	classpath/lib/gnu/java/locale/LocaleInformation_nn_NO.class,
	classpath/lib/gnu/java/locale/LocaleInformation_en_NZ.class,
	classpath/lib/gnu/java/locale/LocaleInformation_es_SV.class,
	classpath/lib/gnu/java/locale/LocaleInformation_ur_PK.class,
	classpath/lib/gnu/java/locale/LocaleInformation_et_EE.class,
	classpath/lib/gnu/java/locale/LocaleInformation_lv_LV.class,
	classpath/lib/gnu/java/locale/LocaleInformation_es_UY.class,
	classpath/lib/gnu/java/locale/LocaleInformation_oc_FR.class,
	classpath/lib/gnu/java/locale/LocaleInformation_fo_FO.class,
	classpath/lib/gnu/java/locale/LocaleInformation_ar_IN.class,
	classpath/lib/gnu/java/locale/LocaleInformation_de_LU.class,
	classpath/lib/gnu/java/locale/LocaleInformation_gl_ES.class,
	classpath/lib/gnu/java/locale/LocaleInformation_en_SG.class,
	classpath/lib/gnu/java/locale/LocaleInformation_se_NO.class,
	classpath/lib/gnu/java/locale/LocaleInformation_mr_IN.class,
	classpath/lib/gnu/java/locale/LocaleInformation_tg_TJ.class,
	classpath/lib/gnu/java/locale/LocaleInformation_no_NO.class,
	classpath/lib/gnu/java/locale/LocaleInformation_ar_SY.class,
	classpath/lib/gnu/java/locale/LocaleInformation_sv_SE.class,
	classpath/lib/gnu/java/locale/LocaleInformation_fa_IR.class,
	classpath/lib/gnu/java/locale/Calendar.class,
	gnu/java/locale/LocaleInformation_fr_CA.java,
	gnu/java/locale/LocaleInformation_sk_SK.java,
	gnu/java/locale/LocaleInformation_ar_BH.java,
	gnu/java/locale/LocaleInformation_ko_KR.h,
	gnu/java/locale/LocaleInformation_bs_BA.h,
	gnu/java/locale/LocaleInformation_nn_NO.h,
	gnu/java/locale/LocaleInformation_en_NZ.h,
	gnu/java/locale/LocaleInformation_en_ZW.java,
	gnu/java/locale/LocaleInformation_es_US.h,
	gnu/java/locale/LocaleInformation_es_SV.h,
	gnu/java/locale/LocaleInformation_de_LU.java,
	gnu/java/locale/LocaleInformation_fo_FO.java,
	gnu/java/locale/LocaleInformation_oc_FR.java,
	gnu/java/locale/LocaleInformation_it_CH.h,
	gnu/java/locale/LocaleInformation_de.h,
	gnu/java/locale/LocaleInformation_el_GR.h,
	gnu/java/locale/LocaleInformation_tr_TR.h,
	gnu/java/locale/LocaleInformation_ka_GE.java,
	gnu/java/locale/LocaleInformation_nn_NO.java,
	gnu/java/locale/LocaleInformation_se_NO.h,
	gnu/java/locale/LocaleInformation_ga_IE.h,
	gnu/java/locale/LocaleInformation_ru_UA.java,
	gnu/java/locale/LocaleInformation_fa_IR.java,
	gnu/java/locale/LocaleInformation_ja_JP.java,
	gnu/java/locale/LocaleInformation_sv_SE.h,
	gnu/java/locale/LocaleInformation_bn_IN.java,
	gnu/java/locale/LocaleInformation_af_ZA.h,
	gnu/java/locale/LocaleInformation_es_PE.java,
	gnu/java/locale/LocaleInformation_hi_IN.h,
	gnu/java/locale/LocaleInformation_en_ZA.java,
	gnu/java/locale/LocaleInformation_es_CO.h,
	gnu/java/locale/LocaleInformation_es_AR.h,
	gnu/java/locale/LocaleInformation_en_PH.h,
	gnu/java/locale/LocaleInformation_ta_IN.h,
	gnu/java/locale/LocaleInformation_en_ZA.h,
	gnu/java/locale/LocaleInformation_nl_NL.java,
	gnu/java/locale/LocaleInformation_ar_KW.java,
	gnu/java/locale/LocaleInformation_fr_FR.h,
	gnu/java/locale/LocaleInformation_ar_LY.java,
	gnu/java/locale/LocaleInformation_uz_UZ.java,
	gnu/java/locale/LocaleInformation_tl_PH.h,
	gnu/java/locale/LocaleInformation_fi_FI.java,
	gnu/java/locale/LocaleInformation_pl_PL.h,
	gnu/java/locale/LocaleInformation_sv_FI.h,
	gnu/java/locale/LocaleInformation_es_MX.h,
	gnu/java/locale/LocaleInformation_uz_UZ.h,
	gnu/java/locale/LocaleInformation_fi_FI.h,
	gnu/java/locale/LocaleInformation_ar_SD.java,
	gnu/java/locale/LocaleInformation_ar_QA.h,
	gnu/java/locale/LocaleInformation_kw_GB.java,
	gnu/java/locale/LocaleInformation_ar_YE.h,
	gnu/java/locale/LocaleInformation_es_PR.java,
	gnu/java/locale/LocaleInformation_zh_SG.java,
	gnu/java/locale/LocaleInformation_ca_ES.java,
	gnu/java/locale/LocaleInformation_ka_GE.h,
	gnu/java/locale/LocaleInformation_ar_BH.h,
	gnu/java/locale/LocaleInformation_fr_CH.java,
	gnu/java/locale/Calendar_nl.h,
	gnu/java/locale/LocaleInformation_en_DK.h,
	gnu/java/locale/LocaleInformation.h,
	gnu/java/locale/LocaleInformation_ar_JO.java,
	gnu/java/locale/LocaleInformation_br_FR.java,
	gnu/java/locale/LocaleInformation_ru_RU.java,
	gnu/java/locale/LocaleInformation_de_BE.java,
	gnu/java/locale/LocaleInformation_ru_RU.h,
	gnu/java/locale/LocaleInformation_de_DE.h,
	gnu/java/locale/LocaleInformation_hr_HR.h,
	gnu/java/locale/LocaleInformation_gd_GB.h,
	gnu/java/locale/LocaleInformation_nl.java,
	gnu/java/locale/LocaleInformation_en_GB.java,
	gnu/java/locale/LocaleInformation_uk_UA.h,
	gnu/java/locale/LocaleInformation_ar_LY.h,
	gnu/java/locale/LocaleInformation_ru_UA.h,
	gnu/java/locale/LocaleInformation_es_UY.java,
	gnu/java/locale/LocaleInformation_fr_CH.h,
	gnu/java/locale/LocaleInformation_lv_LV.h,
	gnu/java/locale/LocaleInformation_de.java,
	gnu/java/locale/LocaleInformation_el_GR.java,
	gnu/java/locale/LocaleInformation_es_CR.java,
	gnu/java/locale/LocaleInformation_ar_IN.h,
	gnu/java/locale/LocaleInformation_es_DO.h,
	gnu/java/locale/LocaleInformation_es_PE.h,
	gnu/java/locale/LocaleInformation_ar_OM.h,
	gnu/java/locale/LocaleInformation_zh_HK.java,
	gnu/java/locale/LocaleInformation_mr_IN.java,
	gnu/java/locale/LocaleInformation_no_NO.h,
	gnu/java/locale/LocaleInformation_es_EC.java,
	gnu/java/locale/LocaleInformation_ro_RO.java,
	gnu/java/locale/LocaleInformation_he_IL.java,
	gnu/java/locale/Calendar.java,
	gnu/java/locale/LocaleInformation_ar_LB.h,
	gnu/java/locale/LocaleInformation_fa_IR.h,
	gnu/java/locale/LocaleInformation_es_CO.java,
	gnu/java/locale/LocaleInformation_cy_GB.h,
	gnu/java/locale/LocaleInformation_en_SG.java,
	gnu/java/locale/LocaleInformation_mk_MK.java,
	gnu/java/locale/LocaleInformation_es_ES.java,
	gnu/java/locale/LocaleInformation_eu_ES.java,
	gnu/java/locale/LocaleInformation_en_BW.h,
	gnu/java/locale/LocaleInformation_es_VE.java,
	gnu/java/locale/LocaleInformation_zh_CN.java,
	gnu/java/locale/LocaleInformation_hr_HR.java,
	gnu/java/locale/LocaleInformation_gd_GB.java,
	gnu/java/locale/LocaleInformation_se_NO.java,
	gnu/java/locale/LocaleInformation_te_IN.h,
	gnu/java/locale/LocaleInformation_en.h,
	gnu/java/locale/LocaleInformation_ar_TN.h,
	gnu/java/locale/Calendar_nl.java,
	gnu/java/locale/LocaleInformation_es_US.java,
	gnu/java/locale/LocaleInformation_nl_BE.java,
	gnu/java/locale/LocaleInformation_es_PY.java,
	gnu/java/locale/LocaleInformation_sk_SK.h,
	gnu/java/locale/LocaleInformation_fr_CA.h,
	gnu/java/locale/LocaleInformation_be_BY.java,
	gnu/java/locale/LocaleInformation_lv_LV.java,
	gnu/java/locale/LocaleInformation_lt_LT.h,
	gnu/java/locale/LocaleInformation_gv_GB.java,
	gnu/java/locale/LocaleInformation_ar_MA.h,
	gnu/java/locale/LocaleInformation_en_IE.h,
	gnu/java/locale/LocaleInformation_es_CL.java,
	gnu/java/locale/LocaleInformation_bn_IN.h,
	gnu/java/locale/Calendar_de.java,
	gnu/java/locale/LocaleInformation_yi_US.h,
	gnu/java/locale/LocaleInformation_ar_DZ.java,
	gnu/java/locale/LocaleInformation_es_GT.java,
	gnu/java/locale/Calendar_de.h,
	gnu/java/locale/LocaleInformation_es_NI.h,
	gnu/java/locale/LocaleInformation_en_CA.java,
	gnu/java/locale/LocaleInformation_zh_CN.h,
	gnu/java/locale/LocaleInformation_es_VE.h,
	gnu/java/locale/LocaleInformation_de_CH.h,
	gnu/java/locale/LocaleInformation_en_NZ.java,
	gnu/java/locale/LocaleInformation_mi_NZ.java,
	gnu/java/locale/LocaleInformation_en_US.h,
	gnu/java/locale/LocaleInformation_sl_SI.h,
	gnu/java/locale/LocaleInformation_et_EE.java,
	gnu/java/locale/LocaleInformation_mi_NZ.h,
	gnu/java/locale/LocaleInformation_ar_QA.java,
	gnu/java/locale/LocaleInformation_en_HK.java,
	gnu/java/locale/LocaleInformation_ar_IQ.java,
	gnu/java/locale/LocaleInformation_ar_OM.java,
	gnu/java/locale/LocaleInformation_fr_FR.java,
	gnu/java/locale/LocaleInformation_es_CR.h,
	gnu/java/locale/LocaleInformation_en.java,
	gnu/java/locale/LocaleInformation_es_GT.h,
	gnu/java/locale/LocaleInformation_ur_PK.java,
	gnu/java/locale/LocaleInformation_pt_PT.java,
	gnu/java/locale/LocaleInformation_et_EE.h,
	gnu/java/locale/LocaleInformation_ar_IN.java,
	gnu/java/locale/LocaleInformation_es_AR.java,
	gnu/java/locale/LocaleInformation_en_PH.java,
	gnu/java/locale/LocaleInformation_en_IN.h,
	gnu/java/locale/LocaleInformation_kl_GL.h,
	gnu/java/locale/LocaleInformation_gl_ES.h,
	gnu/java/locale/LocaleInformation_sq_AL.java,
	gnu/java/locale/LocaleInformation_en_SG.h,
	gnu/java/locale/LocaleInformation_de_CH.java,
	gnu/java/locale/LocaleInformation_ga_IE.java,
	gnu/java/locale/LocaleInformation_no_NO.java,
	gnu/java/locale/LocaleInformation_de_AT.java,
	gnu/java/locale/LocaleInformation_tg_TJ.h,
	gnu/java/locale/LocaleInformation_hu_HU.h,
	gnu/java/locale/LocaleInformation_es_SV.java,
	gnu/java/locale/LocaleInformation_zh_SG.h,
	gnu/java/locale/LocaleInformation_ca_ES.h,
	gnu/java/locale/LocaleInformation_de_AT.h,
	gnu/java/locale/LocaleInformation_ar_SY.h,
	gnu/java/locale/LocaleInformation_he_IL.h,
	gnu/java/locale/LocaleInformation_ro_RO.h,
	gnu/java/locale/LocaleInformation_zh_TW.java,
	gnu/java/locale/LocaleInformation_es_NI.java,
	gnu/java/locale/LocaleInformation_ar_JO.h,
	gnu/java/locale/LocaleInformation_br_FR.h,
	gnu/java/locale/Calendar_en.java,
	gnu/java/locale/LocaleInformation_eu_ES.h,
	gnu/java/locale/LocaleInformation_pt_BR.java,
	gnu/java/locale/LocaleInformation_tg_TJ.java,
	gnu/java/locale/LocaleInformation_iw_IL.h,
	gnu/java/locale/LocaleInformation_ar_AE.h,
	gnu/java/locale/LocaleInformation_fr_LU.h,
	gnu/java/locale/LocaleInformation_id_ID.h,
	gnu/java/locale/LocaleInformation_sv_SE.java,
	gnu/java/locale/LocaleInformation_en_GB.h,
	gnu/java/locale/LocaleInformation_ar_EG.h,
	gnu/java/locale/LocaleInformation_cy_GB.java,
	gnu/java/locale/LocaleInformation_be_BY.h,
	gnu/java/locale/LocaleInformation_yi_US.java,
	gnu/java/locale/LocaleInformation_tr_TR.java,
	gnu/java/locale/LocaleInformation_pt_PT.h,
	gnu/java/locale/LocaleInformation_ar_IQ.h,
	gnu/java/locale/LocaleInformation_cs_CZ.java,
	gnu/java/locale/LocaleInformation_ar_TN.java,
	gnu/java/locale/LocaleInformation_ko_KR.java,
	gnu/java/locale/LocaleInformation_ar_AE.java,
	gnu/java/locale/LocaleInformation_fr_LU.java,
	gnu/java/locale/LocaleInformation_it_IT.h,
	gnu/java/locale/LocaleInformation_mt_MT.java,
	gnu/java/locale/LocaleInformation_fr_BE.h,
	gnu/java/locale/LocaleInformation_es_DO.java,
	gnu/java/locale/LocaleInformation_ta_IN.java,
	gnu/java/locale/LocaleInformation_es_CL.h,
	gnu/java/locale/LocaleInformation_te_IN.java,
	gnu/java/locale/LocaleInformation_ar_YE.java,
	gnu/java/locale/LocaleInformation_kw_GB.h,
	gnu/java/locale/LocaleInformation_uk_UA.java,
	gnu/java/locale/LocaleInformation_cs_CZ.h,
	gnu/java/locale/LocaleInformation_da_DK.h,
	gnu/java/locale/LocaleInformation_en_CA.h,
	gnu/java/locale/Calendar_en.h,
	gnu/java/locale/LocaleInformation_pt_BR.h,
	gnu/java/locale/LocaleInformation_ar_SY.java,
	gnu/java/locale/LocaleInformation_lt_LT.java,
	gnu/java/locale/LocaleInformation_vi_VN.java,
	gnu/java/locale/LocaleInformation_ur_PK.h,
	gnu/java/locale/LocaleInformation_en_IN.java,
	gnu/java/locale/LocaleInformation_kl_GL.java,
	gnu/java/locale/LocaleInformation_ja_JP.h,
	gnu/java/locale/LocaleInformation_es_UY.h,
	gnu/java/locale/LocaleInformation_es_PA.h,
	gnu/java/locale/LocaleInformation_de_LU.h,
	gnu/java/locale/LocaleInformation_fo_FO.h,
	gnu/java/locale/LocaleInformation_oc_FR.h,
	gnu/java/locale/LocaleInformation_zh_TW.h,
	gnu/java/locale/LocaleInformation_hu_HU.java,
	gnu/java/locale/LocaleInformation_ar_KW.h,
	gnu/java/locale/LocaleInformation_mr_IN.h,
	gnu/java/locale/LocaleInformation_ar_EG.java,
	gnu/java/locale/LocaleInformation_nl.h,
	gnu/java/locale/LocaleInformation_af_ZA.java,
	gnu/java/locale/LocaleInformation_es_PY.h,
	gnu/java/locale/LocaleInformation_nl_BE.h,
	gnu/java/locale/LocaleInformation_vi_VN.h,
	gnu/java/locale/LocaleInformation_es_PA.java,
	gnu/java/locale/Calendar.h,
	gnu/java/locale/LocaleInformation_da_DK.java,
	gnu/java/locale/LocaleInformation_de_BE.h,
	gnu/java/locale/LocaleInformation_ar_DZ.h,
	gnu/java/locale/LocaleInformation_bs_BA.java,
	gnu/java/locale/LocaleInformation_id_ID.java,
	gnu/java/locale/LocaleInformation_en_US.java,
	gnu/java/locale/LocaleInformation_sl_SI.java,
	gnu/java/locale/LocaleInformation_fr_BE.java,
	gnu/java/locale/LocaleInformation_ar_LB.java,
	gnu/java/locale/LocaleInformation_it_CH.java,
	gnu/java/locale/LocaleInformation_en_ZW.h,
	gnu/java/locale/LocaleInformation_gv_GB.h,
	gnu/java/locale/LocaleInformation_es_HN.java,
	gnu/java/locale/LocaleInformation_es_BO.h,
	gnu/java/locale/LocaleInformation_en_AU.h,
	gnu/java/locale/LocaleInformation_ar_SD.h,
	gnu/java/locale/LocaleInformation_sr_YU.java,
	gnu/java/locale/LocaleInformation_es_HN.h,
	gnu/java/locale/LocaleInformation_iw_IL.java,
	gnu/java/locale/LocaleInformation_it_IT.java,
	gnu/java/locale/LocaleInformation_es_MX.java,
	gnu/java/locale/LocaleInformation_es_PR.h,
	gnu/java/locale/LocaleInformation_ar_MA.java,
	gnu/java/locale/LocaleInformation_en_IE.java,
	gnu/java/locale/LocaleInformation.java,
	gnu/java/locale/LocaleInformation_en_DK.java,
	gnu/java/locale/LocaleInformation_es_EC.h,
	gnu/java/locale/LocaleInformation_mt_MT.h,
	gnu/java/locale/LocaleInformation_hi_IN.java,
	gnu/java/locale/LocaleInformation_en_AU.java,
	gnu/java/locale/LocaleInformation_es_BO.java,
	gnu/java/locale/LocaleInformation_gl_ES.java,
	gnu/java/locale/LocaleInformation_en_BW.java,
	gnu/java/locale/LocaleInformation_en_HK.h,
	gnu/java/locale/LocaleInformation_de_DE.java,
	gnu/java/locale/LocaleInformation_mk_MK.h,
	gnu/java/locale/LocaleInformation_es_ES.h,
	gnu/java/locale/LocaleInformation_sq_AL.h,
	gnu/java/locale/LocaleInformation_sv_FI.java,
	gnu/java/locale/LocaleInformation_pl_PL.java,
	gnu/java/locale/LocaleInformation_tl_PH.java,
	gnu/java/locale/LocaleInformation_sr_YU.h,
	gnu/java/locale/LocaleInformation_nl_NL.h,
	gnu/java/locale/LocaleInformation_zh_HK.h,
	java/text/DateFormatSymbols.java,
	java/text/DecimalFormatSymbols.java,
	java/util/Currency.java,
	java/util/Calendar.java: Remove

From-SVN: r132872
2008-03-04 21:46:05 +00:00

566 lines
17 KiB
Tcl
Executable File

#!/usr/bin/tclsh
# Helper to enforce array-ness.
proc makearray {name} {
upvar $name ary
set ary(_) 1
unset ary(_)
}
global is_verbose
set is_verbose 0
# Verbose printer.
proc verbose {text} {
global is_verbose
if {$is_verbose} {
puts stderr $text
}
}
# This maps a name to its style:
# * bc objects in this package and all its sub-packages
# are to be compiled with the BC ABI. It is an error
# for sub-packages to also appear in the map.
# * bcheaders
# as bc, but generate header files and compile with CNI.
# * package
# objects in this package (and possibly sub-packages,
# if they do not appear in the map) will be compiled en masse
# from source into a single object, using the C++ ABI.
# * ordinary
# objects in this package (and possibly sub-packages
# if they do not appear in the map) will be compiled one at
# a time into separate .o files.
# * ignore
# objects in this package are not used. Note however that
# most ignored files are actually handled by listing them in
# 'standard.omit'
# * interpreter
# objects in this package (and possibly sub-packages,
# if they do not appear in the map) are only compiled if
# the interpreter is enabled. They are compiled as with the
# 'package' specifier.
#
# If a package does not appear in the map, the default is 'package'.
global package_map
set package_map(.) package
# These are ignored in Classpath.
set package_map(gnu/test) ignore
set package_map(gnu/javax/swing/plaf/gtk) ignore
set package_map(gnu/gcj/tools/gc_analyze) ignore
set package_map(gnu/java/awt/peer/swing) bc
set package_map(gnu/xml/aelfred2) bc
set package_map(gnu/xml/dom) bc
set package_map(gnu/xml/libxmlj) bc
set package_map(gnu/xml/pipeline) bc
set package_map(gnu/xml/stream) bc
set package_map(gnu/xml/transform) bc
set package_map(gnu/xml/util) bc
set package_map(gnu/xml/validation) bc
set package_map(gnu/xml/xpath) bc
set package_map(javax/imageio) bc
set package_map(javax/xml) bc
set package_map(gnu/java/beans) bc
set package_map(gnu/java/awt/dnd/peer/gtk) bc
set package_map(gnu/java/util/prefs/gconf) bc
set package_map(gnu/java/awt/peer/gtk) bc
set package_map(gnu/java/awt/dnd/peer/gtk) bc
set package_map(gnu/java/awt/peer/qt) bc
set package_map(gnu/java/awt/peer/x) bc
set package_map(gnu/java/util/prefs/gconf) bc
set package_map(gnu/javax/sound/midi) bc
set package_map(gnu/javax/sound/sampled/gstreamer) ignore
set package_map(org/xml) bc
set package_map(org/w3c) bc
set package_map(org/relaxng) bc
set package_map(javax/rmi) bc
set package_map(org/omg) bc
set package_map(gnu/CORBA) bc
set package_map(gnu/javax/rmi) bc
set package_map(gnu/java/lang/management) bcheaders
set package_map(java/lang/management) bc
set package_map(gnu/classpath/management) bc
set package_map(gnu/javax/management) bc
# parser/HTML_401F.class is really big, and there have been complaints
# about this package requiring too much memory to build. So, we
# compile it as separate objects. But, we're careful to compile the
# sub-packages as packages.
set package_map(gnu/javax/swing/text/html/parser) ordinary
set package_map(gnu/javax/swing/text/html/parser/models) package
set package_map(gnu/javax/swing/text/html/parser/support) package
# More special cases. These end up in their own library.
# Note that if we BC-compile AWT we must update these as well.
set package_map(gnu/gcj/xlib) package
set package_map(gnu/awt/xlib) package
# These packages should only be included if the interpreter is
# enabled.
set package_map(gnu/classpath/jdwp) interpreter
set package_map(gnu/classpath/jdwp/event) interpreter
set package_map(gnu/classpath/jdwp/event/filters) interpreter
set package_map(gnu/classpath/jdwp/exception) interpreter
set package_map(gnu/classpath/jdwp/id) interpreter
set package_map(gnu/classpath/jdwp/processor) interpreter
set package_map(gnu/classpath/jdwp/transport) interpreter
set package_map(gnu/classpath/jdwp/util) interpreter
set package_map(gnu/classpath/jdwp/value) interpreter
set package_map(gnu/gcj/jvmti) interpreter
# Some BC ABI packages have classes which must not be compiled BC.
# This maps such packages to a grep expression for excluding such
# classes.
global exclusion_map
makearray exclusion_map
# set exclusion_map(java/awt) AWTPermission
# This maps a package name to a list of corresponding .java file base
# names. The package name will either appear as a key in package_map,
# or it will be '.' for the default.
global name_map
makearray name_map
# This maps a java file base name, like 'java/lang/Object.java', to
# the source directory in which it resides. We keep a layer of
# indirection here so that we can override sources in Classpath with
# our own sources.
global dir_map
makearray dir_map
# An entry in this map means that all .properties files in the
# corresponding directory should be ignored.
global properties_map
makearray properties_map
# logging.properties is installed and is editable.
set properties_map(java/util/logging) _
# We want to be able to load xerces if it is on the class path. So,
# we have to avoid compiling in the XML-related service files.
set properties_map(META-INF/services/javax.xml.parsers.DocumentBuilderFactory) _
set properties_map(META-INF/services/javax.xml.parsers.SAXParserFactory) _
set properties_map(META-INF/services/javax.xml.parsers.TransformerFactory) _
set properties_map(META-INF/services/org.relaxng.datatype.DatatypeLibraryFactory) _
set properties_map(META-INF/services/org.w3c.dom.DOMImplementationSourceList) _
set properties_map(META-INF/services/org.xml.sax.driver) _
set properties_map(META-INF/services/javax.sound.sampled.spi.AudioFileReader.in) ignore
set properties_map(META-INF/services/javax.sound.sampled.spi.MixerProvider) ignore
set properties_map(META-INF/services/javax.sound.sampled.spi.MixerProvider.in) ignore
# List of all properties files.
set properties_files {}
# List of all '@' files that we are going to compile.
set package_files {}
# List of all '@' files that we are going to compile if the
# interpreter is enabled.
set interpreter_package_files {}
# List of all header file variables.
set header_vars {}
# List of all header file variables for interpreter packages.
set interpreter_header_vars {}
# List of all BC object files.
set bc_objects {}
# List of regexps for matching ignored files.
set ignore_rx_list {}
# Return true if a given file should be ignored.
# The argument is the path name including the package part.
proc ignore_file_p {file} {
global ignore_rx_list
foreach rx $ignore_rx_list {
if {[regexp -- $rx $file]} {
verbose "ignoring $file for $rx"
return 1
}
}
return 0
}
# Read a '.omit' file and update the internal data structures.
proc read_omit_file {name} {
global ignore_rx_list
set fd [open $name r]
while {! [eof $fd]} {
set line [gets $fd]
# Classpath's entries bogusly start with "../".
if {[string match ../* $line]} {
set line [string range $line 3 end]
}
if {$line != ""} {
lappend ignore_rx_list $line
}
}
close $fd
}
# Classify a single source file.
proc classify_source_file {basedir file} {
global package_map name_map dir_map
if {[ignore_file_p $file]} {
return
}
set seen [info exists dir_map($file)]
set dir_map($file) $basedir
set pkg $file
while {1} {
if {[info exists package_map($pkg)]} {
# If the entry is 'package', then set up a new entry for the
# file's package.
if {$package_map($pkg) == "package"} {
set pkg [file dirname $file]
set package_map($pkg) package
}
verbose "classify succeeded: $file -> $pkg"
if {! $seen} {
lappend name_map($pkg) $file
}
return
}
set pkg [file dirname $pkg]
}
error "can't happen"
}
# Scan a directory and its subdirectories for .java source files or
# .properties files. Note that we keep basedir and subdir separate so
# we can properly update our global data structures.
proc scan_directory {basedir subdir} {
global dir_map properties_map properties_files
set subdirs {}
set files {}
set here [pwd]
cd $basedir/$subdir
foreach file [lsort [glob -nocomplain *]] {
if {[string match *.java $file]} {
lappend files $subdir/$file
} elseif {[string match *.properties $file]} {
if {! [info exists properties_map($subdir)]} {
# We assume there aren't any overrides.
lappend properties_files $basedir/$subdir/$file
}
} elseif {[string match *.css $file]} {
# Special case for default.css needed by javax.swing.text.html.
lappend properties_files $basedir/$subdir/$file
} elseif {[file isdirectory $file]} {
lappend subdirs $subdir/$file
} elseif {$subdir == "META-INF/services"} {
# Service files are generally included as properties.
if {! [info exists properties_map($subdir/$file)]} {
lappend properties_files $basedir/$subdir/$file
}
}
}
cd $here
# Recurse first, so that we don't create new packages too eagerly.
foreach dir $subdirs {
scan_directory $basedir $dir
}
foreach file $files {
classify_source_file $basedir $file
}
}
# Scan known packages beneath the base directory for .java source
# files.
proc scan_packages {basedir} {
foreach subdir {gnu java javax org sun com META-INF} {
if {[file exists $basedir/$subdir]} {
scan_directory $basedir $subdir
}
}
}
# Emit a rule for a 'bc' package.
proc emit_bc_rule {package} {
global package_map exclusion_map bc_objects
if {$package == "."} {
set pkgname ordinary
} else {
set pkgname $package
}
set varname [join [split $pkgname /] _]_source_files
set loname [join [split $pkgname /] -].lo
set tname [join [split $pkgname /] -].list
puts "$loname: \$($varname)"
# Create a temporary list file and then compile it. This works
# around the libtool problem mentioned in PR 21058. classpath was
# built first, so the class files are to be found there.
set omit ""
if {[info exists exclusion_map($package)]} {
set omit "| grep -v $exclusion_map($package)"
}
puts "\t@find \$(srcdir)/classpath/lib/$package -name '*.class'${omit} > $tname"
puts -nonewline "\t\$(LTGCJCOMPILE) -fsource-filename=\$(here)/classpath/lib/classes "
if {$package_map($package) == "bc"} {
puts -nonewline "-fjni "
}
# Unless bc is disabled with --disable-libgcj-bc, $(LIBGCJ_BC_FLAGS) is:
# -findirect-dispatch -fno-indirect-classes
puts "\$(LIBGCJ_BC_FLAGS) -c -o $loname @$tname"
puts "\t@rm -f $tname"
puts ""
# We skip these because they are built into their own libraries and
# are handled specially in Makefile.am.
if {$loname != "gnu-java-awt-peer-qt.lo" && $loname != "gnu-java-awt-peer-x.lo"} {
lappend bc_objects $loname
}
}
# Emit a rule for a 'package' package.
proc emit_package_rule_to_list {package package_files_list} {
global package_map exclusion_map $package_files_list
if {$package == "."} {
set pkgname ordinary
} else {
set pkgname $package
}
set varname [join [split $pkgname /] _]_source_files
set base $pkgname
set lname $base.list
set dname $base.deps
if {$pkgname == "java/lang"} {
# Object and Class are special cases due to an apparent compiler
# bug. Process is a special case because we don't build all
# concrete implementations of Process on all platforms.
set omit "| tr ' ' '\\n' | fgrep -v Object.class | fgrep -v Class.class | egrep -v '\(Ecos\|Posix\|Win32\)Process' "
} else {
set omit ""
}
# A rule to make the phony file we are going to compile.
puts "$lname: \$($varname)"
puts "\t@\$(mkinstalldirs) \$(dir \$@)"
puts "\techo \$(srcdir)/classpath/lib/$package/*.class $omit> $lname"
puts ""
puts "-include $dname"
puts ""
puts ""
if {$pkgname != "gnu/gcj/xlib" && $pkgname != "gnu/awt/xlib"
&& $pkgname != "gnu/gcj/tools/gcj_dbtool"} {
lappend $package_files_list $lname
}
}
proc emit_package_rule {package} {
global package_files
emit_package_rule_to_list $package package_files
}
proc emit_interpreter_rule {package} {
global interpreter_package_files
emit_package_rule_to_list $package interpreter_package_files
}
# Emit a rule to build a package full of 'ordinary' files, that is,
# one .o for each .java.
proc emit_ordinary_rule {package} {
global name_map package_files
foreach file $name_map($package) {
# Strip off the '.java'.
set root [file rootname $file]
# Look for all included .class files. Assumes that we don't have
# multiple top-level classes in a .java file.
set lname $root.list
set dname $root.deps
puts "$lname: classpath/$file"
puts "\t@\$(mkinstalldirs) \$(dir \$@)"
puts "\techo \$(srcdir)/classpath/lib/${root}*.class> $lname"
puts ""
puts "-include $dname"
puts ""
puts ""
lappend package_files $lname
}
}
# Emit a package-like rule for a platform-specific Process
# implementation.
proc emit_process_package_rule {platform} {
set base "java/process-$platform"
set lname $base.list
set dname $base.deps
puts "$lname: java/lang/${platform}Process.java"
puts "\t@\$(mkinstalldirs) \$(dir \$@)"
puts "\techo \$(srcdir)/classpath/lib/java/lang/${platform}Process*.class > $lname"
puts ""
puts "-include $dname"
puts ""
puts ""
}
# Emit a source file variable for a package, and corresponding header
# file variable, if needed.
proc emit_source_var {package} {
global package_map name_map dir_map header_vars interpreter_header_vars
if {$package == "."} {
set pkgname ordinary
} else {
set pkgname $package
}
set uname [join [split $pkgname /] _]
set varname ${uname}_source_files
puts -nonewline "$varname ="
makearray dirs
foreach base [lsort $name_map($package)] {
# Terminate previous line.
puts " \\"
# Having files start with './' is ugly and confuses the automake
# "dirstamp" code; see automake PR 461.
set ndir $dir_map($base)/
if {$ndir == "./"} {
set ndir ""
}
puts -nonewline "${ndir}${base}"
set dirs($dir_map($base)) 1
}
puts ""
puts ""
if {$package_map($package) != "bc"} {
# Ugly code to build up the appropriate patsubst.
set result "\$(patsubst %.java,%.h,\$($varname))"
# We use -decreasing so that classpath/external will be stripped
# before classpath.
foreach dir [lsort -decreasing [array names dirs]] {
if {$dir != "."} {
set result "\$(patsubst $dir/%,%,$result)"
}
}
if {$package == "." || $package == "java/lang"} {
# Ugly hack.
set result "\$(filter-out java/lang/Object.h java/lang/Class.h,$result)"
}
puts "${uname}_header_files = $result"
puts ""
if {$pkgname != "gnu/gcj/xlib" && $pkgname != "gnu/awt/xlib"} {
if {$package_map($package) == "interpreter"} {
lappend interpreter_header_vars "${uname}_header_files"
} else {
lappend header_vars "${uname}_header_files"
}
}
}
}
# Pretty-print a Makefile variable.
proc pp_var {name valueList {pre ""} {post ""}} {
puts ""
puts -nonewline "$name ="
foreach val $valueList {
puts " \\"
puts -nonewline " ${pre}${val}${post}"
}
puts ""
}
global argv
if {[llength $argv] > 0 && [lindex $argv 0] == "-verbose"} {
set is_verbose 1
}
# Read the proper .omit files.
read_omit_file standard.omit.in
read_omit_file classpath/lib/standard.omit.in
# Scan classpath first.
scan_packages classpath
scan_packages classpath/external/sax
scan_packages classpath/external/w3c_dom
scan_packages classpath/external/relaxngDatatype
scan_packages classpath/external/jsr166
# Resource files.
scan_packages classpath/resource
# Now scan our own files; this will correctly override decisions made
# when scanning classpath.
scan_packages .
# Files created by the build.
classify_source_file classpath gnu/java/locale/LocaleData.java
classify_source_file classpath gnu/java/security/Configuration.java
puts "## This file was automatically generated by scripts/makemake.tcl"
puts "## Do not edit!"
puts ""
foreach package [lsort [array names package_map]] {
if {$package_map($package) == "ignore"} {
continue
}
if {! [info exists name_map($package)]} {
continue
}
emit_source_var $package
if {$package_map($package) == "bc"} {
emit_bc_rule $package
} elseif {$package_map($package) == "bcheaders"} {
emit_bc_rule $package
} elseif {$package_map($package) == "ordinary"} {
emit_ordinary_rule $package
} elseif {$package_map($package) == "package"} {
emit_package_rule $package
} elseif {$package_map($package) == "interpreter"} {
emit_interpreter_rule $package
} else {
error "unrecognized type: $package_map($package)"
}
}
emit_process_package_rule Ecos
emit_process_package_rule Win32
emit_process_package_rule Posix
puts "if INTERPRETER"
pp_var interpreter_packages_source_files $interpreter_package_files
pp_var interpreter_header_files $interpreter_header_vars "\$(" ")"
puts ""
puts "else"
puts ""
puts "interpreter_packages_source_files="
puts ""
puts "interpreter_header_files="
puts ""
puts "endif"
lappend package_files {$(interpreter_packages_source_files)}
lappend header_vars interpreter_header_files
pp_var all_packages_source_files $package_files
pp_var ordinary_header_files $header_vars "\$(" ")"
pp_var bc_objects $bc_objects
pp_var property_files $properties_files