Skip to content

Commit

Permalink
Changed how data files are copied: copy those specified in the src/ME…
Browse files Browse the repository at this point in the history 
…TA-INF/*.datafiles (fixes #3430342)
  • Loading branch information
@egonw
egonw committed Nov 1, 2011
1 parent 2413197 commit 68536e1
Showing 1 changed file with 30 additions and 42 deletions.
72 changes: 30 additions & 42 deletions build.xml
View file
Expand Up @@ -940,27 +940,21 @@
<copy todir="${sourcedist.dir}/src/META-INF">
<fileset dir="src/META-INF" />
</copy>
<copy todir="${sourcedist.dir}/${src}/main/org/openscience/cdk/config/data/">
<fileset dir="${src}/main/org/openscience/cdk/config/data/"
includes="*" />
</copy>
<copy
file="${src}/main/org/openscience/cdk/dict/data/chemical.xml"
tofile="${sourcedist.dir}/${src}/main/org/openscience/cdk/dict/data/chemical.xml" />
<copy todir="${sourcedist.dir}/${src}/main/org/openscience/cdk/dict/data/">
<fileset dir="${src}/main/org/openscience/cdk/dict/data/" includes="*.owl"/>
</copy>
<mkdir dir="${sourcedist.dir}/${src}/main/org/openscience/cdk/modeling/forcefield/data/"/>
<copy todir="${sourcedist.dir}/${src}/main/org/openscience/cdk/modeling/forcefield/data/">
<fileset dir="${src}/main/org/openscience/cdk/modeling/forcefield/data/" includes="*.prm"/>
</copy>
<mkdir dir="${sourcedist.dir}/${src}/main/org/openscience/cdk/modeling/builder3d/data/"/>
<copy todir="${sourcedist.dir}/${src}/main/org/openscience/cdk/modeling/builder3d/data/">
<fileset dir="${src}/main/org/openscience/cdk/modeling/builder3d/data/" includes="*.gz"/>
</copy>
<mkdir dir="${sourcedist.dir}/${src}/main/org/openscience/cdk/layout/templates"/>
<copy todir="${sourcedist.dir}/${src}/main/org/openscience/cdk/layout/templates">
<fileset dir="${src}/main/org/openscience/cdk/layout/templates" includes="*"/>
<copy todir="${sourcedist.dir}/${src}/main/">
<fileset dir="${src}/main/" includesfile="${src}/META-INF/atomtype.datafiles" />
<fileset dir="${src}/main/" includesfile="${src}/META-INF/builder3d.datafiles" />
<fileset dir="${src}/main/" includesfile="${src}/META-INF/core.datafiles" />
<fileset dir="${src}/main/" includesfile="${src}/META-INF/dict.datafiles" />
<fileset dir="${src}/main/" includesfile="${src}/META-INF/extra.datafiles" />
<fileset dir="${src}/main/" includesfile="${src}/META-INF/fingerprint.datafiles" />
<fileset dir="${src}/main/" includesfile="${src}/META-INF/forcefield.datafiles" />
<fileset dir="${src}/main/" includesfile="${src}/META-INF/io.datafiles" />
<fileset dir="${src}/main/" includesfile="${src}/META-INF/log4j.datafiles" />
<fileset dir="${src}/main/" includesfile="${src}/META-INF/pdb.datafiles" />
<fileset dir="${src}/main/" includesfile="${src}/META-INF/qsaratomic.datafiles" />
<fileset dir="${src}/main/" includesfile="${src}/META-INF/qsar.datafiles" />
<fileset dir="${src}/main/" includesfile="${src}/META-INF/qsarmolecular.datafiles" />
<fileset dir="${src}/main/" includesfile="${src}/META-INF/sdg.datafiles" />
</copy>
<mkdir dir="${sourcedist.dir}/doc/" />
<copy todir="${sourcedist.dir}/doc/">
Expand Down Expand Up @@ -1004,27 +998,21 @@
<copy todir="${sourcedist.dir}/src/META-INF">
<fileset dir="src/META-INF" />
</copy>
<copy todir="${sourcedist.dir}/${src}/main/org/openscience/cdk/config/data/">
<fileset dir="${src}/main/org/openscience/cdk/config/data/"
includes="*" />
</copy>
<copy
file="${src}/main/org/openscience/cdk/dict/data/chemical.xml"
tofile="${sourcedist.dir}/${src}/main/org/openscience/cdk/dict/data/chemical.xml" />
<copy todir="${sourcedist.dir}/${src}/main/org/openscience/cdk/dict/data/">
<fileset dir="${src}/main/org/openscience/cdk/dict/data/" includes="*.owl"/>
</copy>
<mkdir dir="${sourcedist.dir}/${src}/main/org/openscience/cdk/modeling/forcefield/data/"/>
<copy todir="${sourcedist.dir}/${src}/main/org/openscience/cdk/modeling/forcefield/data/">
<fileset dir="${src}/main/org/openscience/cdk/modeling/forcefield/data/" includes="*.prm"/>
</copy>
<mkdir dir="${sourcedist.dir}/${src}/main/org/openscience/cdk/modeling/builder3d/data/"/>
<copy todir="${sourcedist.dir}/${src}/main/org/openscience/cdk/modeling/builder3d/data/">
<fileset dir="${src}/main/org/openscience/cdk/modeling/builder3d/data/" includes="*.gz"/>
</copy>
<mkdir dir="${sourcedist.dir}/${src}/main/org/openscience/cdk/layout/templates"/>
<copy todir="${sourcedist.dir}/${src}/main/org/openscience/cdk/layout/templates">
<fileset dir="${src}/main/org/openscience/cdk/layout/templates" includes="*"/>
<copy todir="${sourcedist.dir}/${src}/main/">
<fileset dir="${src}/main/" includesfile="${src}/META-INF/atomtype.datafiles" />
<fileset dir="${src}/main/" includesfile="${src}/META-INF/builder3d.datafiles" />
<fileset dir="${src}/main/" includesfile="${src}/META-INF/core.datafiles" />
<fileset dir="${src}/main/" includesfile="${src}/META-INF/dict.datafiles" />
<fileset dir="${src}/main/" includesfile="${src}/META-INF/extra.datafiles" />
<fileset dir="${src}/main/" includesfile="${src}/META-INF/fingerprint.datafiles" />
<fileset dir="${src}/main/" includesfile="${src}/META-INF/forcefield.datafiles" />
<fileset dir="${src}/main/" includesfile="${src}/META-INF/io.datafiles" />
<fileset dir="${src}/main/" includesfile="${src}/META-INF/log4j.datafiles" />
<fileset dir="${src}/main/" includesfile="${src}/META-INF/pdb.datafiles" />
<fileset dir="${src}/main/" includesfile="${src}/META-INF/qsaratomic.datafiles" />
<fileset dir="${src}/main/" includesfile="${src}/META-INF/qsar.datafiles" />
<fileset dir="${src}/main/" includesfile="${src}/META-INF/qsarmolecular.datafiles" />
<fileset dir="${src}/main/" includesfile="${src}/META-INF/sdg.datafiles" />
</copy>
<mkdir dir="${sourcedist.dir}/doc/" />
<copy todir="${sourcedist.dir}/doc/">
Expand Down

0 comments on commit 68536e1

Please sign in to comment.