more unwinding of diffs

[debian/freetts] / build.xml

diff --git a/build.xml b/build.xml
index b251077bf37d053c7ceaaef78ef34aa6964d84a2..843332f4ad141a7a3c090bebaae6b1f59a13ac3d 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -1005,7 +1005,7 @@ jsapi.exe from the lib directory.
 
     <fileset id="binaries"
              dir="."
-             includes="lib/*.jar,mbrola/*.jar"
+             includes="lib/*.jar,bin/*.jar,mbrola/*.jar"
              excludes="lib/jsapi.jar" />
 
     <fileset id="jsapi_sh"
@@ -1052,83 +1052,16 @@ jsapi.exe from the lib directory.
     </target>
 
     <!-- debian .. builds only what's needed for Debian packaging -->
-    <target name="debian" depends="compile,javadoc">
+    <target name="debian" depends="all,javadoc">
         <mkdir dir="${deploy_dir}/freetts-${version}" />
         <copy todir="${deploy_dir}/freetts-${version}" includeEmptyDirs="false">
-
-         <!-- 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}/*" />
-
-            <fileset dir="."
-                     includes="speech.properties, lib/voices.txt" />
-
+            <fileset refid="binaries" />
        </copy>
-        <jar destfile="${deploy_dir}/freetts-${version}.jar"
-             basedir="${deploy_dir}/freetts-${version}"
-             filesonly="true"
-             compress="true"
-       />
     </target>
 
     <!-- freetts-bin -->
     <target name="deploy_bin" depends="deploy_init">
-        <jar destfile="${deploy_dir}/freetts-${version}.jar"
+        <jar destfile="${deploy_dir}/freetts-${version}-bin.zip"
              basedir="${deploy_dir}"
              filesonly="true"
              compress="true"
@@ -1137,7 +1070,6 @@ jsapi.exe from the lib directory.
                       freetts-${version}/overview.html,
                        **/tests/**,
                        freetts-${version}/de/**,
-                       freetts-${version}/javadoc/**,
                        freetts-${version}/com/**" />
     </target>