ICU-5801 Fix jar packaging problem. cnvalias.icu was accidentally included in core jar because of bad path definition in build.xml
X-SVN-Rev: 22100
This commit is contained in:
parent
04f79f5d29
commit
9674ebb255
@ -108,8 +108,8 @@
|
||||
<property file="build.properties" />
|
||||
<!-- fix the data folder every time there is a version update-->
|
||||
|
||||
<property name="icu4j.data.path" value="com/ibm/icu/impl/data/icudt${icu4j.version.number}b/" />
|
||||
<property name="icu4j.testdata.path" value="com/ibm/icu/dev/data/testdata/" />
|
||||
<property name="icu4j.data.path" value="com/ibm/icu/impl/data/icudt${icu4j.version.number}b" />
|
||||
<property name="icu4j.testdata.path" value="com/ibm/icu/dev/data/testdata" />
|
||||
<property name="icu4j.javac.source" value="1.3" />
|
||||
<property name="icu4j.javac.target" value="1.3" />
|
||||
|
||||
@ -380,7 +380,7 @@
|
||||
<target name="jar" depends="core,indices,charsetsJar" description="build 'icu4j.jar' jar file">
|
||||
<jar jarfile="${jar.file}" compress="true">
|
||||
<fileset dir="${basedir}" includes="license.html, unicode-license.txt" />
|
||||
<fileset dir="${build.dir}" includes="com/ibm/icu/util/**/*,com/ibm/icu/text/**/*,com/ibm/icu/math/**/*,com/ibm/icu/impl/**/*,com/ibm/icu/lang/**/*" excludes="META-INF/services/**/*,com/ibm/icu/charset/**/*,${icu4j.data.path}/*.cnv, ${icu4j.data.path}/cnvalias.icu" />
|
||||
<fileset dir="${build.dir}" includes="com/ibm/icu/util/**/*,com/ibm/icu/text/**/*,com/ibm/icu/math/**/*,com/ibm/icu/impl/**/*,com/ibm/icu/lang/**/*" excludes="META-INF/services/**/*,com/ibm/icu/charset/**/*,${icu4j.data.path}/*.cnv,${icu4j.data.path}/cnvalias.icu" />
|
||||
<manifest>
|
||||
<attribute name="Built-By" value="${corp}" />
|
||||
<section name="common">
|
||||
@ -399,9 +399,11 @@
|
||||
</target>
|
||||
|
||||
<target name="charsetsJar" depends="core,indices" description="build 'icu4j-charstes.jar' jar file">
|
||||
<echo message="${icu4j.data.path}/cnvalias.icu"/>
|
||||
<jar jarfile="${charsets.jar.file}" compress="true">
|
||||
<fileset dir="${basedir}" includes="license.html, unicode-license.txt" />
|
||||
<fileset dir="${build.dir}" includes="META-INF/services/**/*,com/ibm/icu/charset/**/*,${icu4j.data.path}/*.cnv, ${icu4j.data.path}/cnvalias.icu" />
|
||||
<fileset dir="${build.dir}"
|
||||
includes="META-INF/services/**/*,com/ibm/icu/charset/**/*,${icu4j.data.path}/*.cnv,${icu4j.data.path}/cnvalias.icu" />
|
||||
<manifest>
|
||||
<attribute name="Built-By" value="${corp}" />
|
||||
<section name="common">
|
||||
@ -620,7 +622,7 @@
|
||||
<fileset dir="${build.dir}/${icu4j.data.path}/../" includes="BreakIterator*.class" />
|
||||
<fileset dir="${build.dir}/${icu4j.data.path}" />
|
||||
<fileset dir="${build.dir}/${icu4j.testdata.path}" />
|
||||
<fileset dir="${build.dir}/${icu4j.testdata.path}../" />
|
||||
<fileset dir="${build.dir}/${icu4j.testdata.path}/../" />
|
||||
</delete>
|
||||
</target>
|
||||
<target name="noDataCheck" depends="noData" description="runs the tests when no data is present">
|
||||
|
Loading…
Reference in New Issue
Block a user