build the jar directly using fileset specs from constituent jar meta data

diff --git a/build.xml b/build.xml
index 6ddbf8fabc4dbb12fb4ea1322067c05723279740..db6593074a54e454f34f403ef61ca28077d06ccd 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -1052,10 +1052,69 @@ jsapi.exe from the lib directory.
     </target>
 
     <!-- debian .. builds only what's needed for Debian packaging -->
-    <target name="debian" depends="all,javadoc">
+    <target name="debian" depends="compile,javadoc">
         <mkdir dir="${deploy_dir}/freetts-${version}" />
         <copy todir="${deploy_dir}/freetts-${version}" includeEmptyDirs="false">
-            <fileset refid="binaries" />
+
+         <!-- freetts.jar -->
+            <fileset dir="${classes_dir}">\r
+                <include name="com/sun/speech/freetts/**"/>\r
+                <exclude name="com/sun/speech/freetts/en/**"/>\r
+                <exclude name="com/sun/speech/freetts/jsapi/**"/>\r
+                <include name="de/dfki/lt/freetts/**"/>\r
+                <exclude name="de/dfki/lt/freetts/en/**"/>\r
+                <exclude name="de/dfki/lt/freetts/de/**"/>\r
+                <exclude name="de/dfki/lt/mbrola/**"/>\r
+                <exclude name="tests/**"/>\r
+                <exclude name="**/*.bin"/>\r
+                <exclude name="**/*.idx"/>\r
+            </fileset>\r
+            <fileset dir="${src_dir}">\r
+                <include name="com/sun/speech/freetts/internal_voices.txt"/>\r
+            </fileset>
+
+         <!-- mbrola.jar -->
+            <fileset dir="${classes_dir}"
+                     includes="de/dfki/lt/freetts/mbrola/**,
+                          de/dfki/lt/freetts/en/us//**" />
+
+         <!-- en_us.jar -->
+            <fileset dir="${classes_dir}"
+                     includes="com/sun/speech/freetts/en/*.class,
+                         com/sun/speech/freetts/en/us/*.class" />
+            <fileset dir="${src_dir}"
+                     includes="com/sun/speech/freetts/en/us/*.txt"
+                     excludes="**/cmu*lex*.txt" />
+
+         <!-- cmulex.jar -->
+            <fileset dir="${classes_dir}"
+                     includes="com/sun/speech/freetts/en/us/cmulex_*.bin" />
+
+         <!-- cmudict04.jar -->
+            <fileset dir="${classes_dir}"
+                     includes="com/sun/speech/freetts/en/us/cmudict04_*.bin" />
+
+         <!-- cmutimelex.jar -->
+            <fileset dir="${classes_dir}"
+                     includes="com/sun/speech/freetts/en/us/cmutimelex_*.bin" />
+
+         <!-- cmu_us_kal.jar -->
+            <fileset dir="${classes_dir}"
+                     includes="com/sun/speech/freetts/en/us/cmu_us_kal/*" />
+
+         <!-- cmu_time_awb.jar -->
+            <fileset dir="${classes_dir}"
+                     includes="com/sun/speech/freetts/en/us/cmu_time_awb/*" />
+
+         <!-- arctic voice -->
+            <fileset dir="${classes_dir}"
+                     includes="com/sun/speech/freetts/en/us/${arctic_voice}/*" />
+            <fileset dir="${src_dir}"
+                     includes="com/sun/speech/freetts/en/us/${arctic_voice}/*.txt" />
+
+         <!-- user voice -->
+            <fileset dir="${classes_dir}" includes="${user_voice_path}/*" />
+
        </copy>
         <jar destfile="${deploy_dir}/freetts-${version}.jar"
              basedir="${deploy_dir}/freetts-${version}"