Changeset 128 for trunk

Timestamp:

12/15/06 20:39:45 (5 years ago)

Author:

jlee

Message:

Use icons in docbook-xsl distribution

Location:

trunk

Files:

• build.xml (modified) (4 diffs)
• src/org/thestaticvoid/iriverter/doc/images/caution.gif (deleted)
• src/org/thestaticvoid/iriverter/doc/images/home.gif (deleted)
• src/org/thestaticvoid/iriverter/doc/images/important.gif (deleted)
• src/org/thestaticvoid/iriverter/doc/images/next.gif (deleted)
• src/org/thestaticvoid/iriverter/doc/images/note.gif (deleted)
• src/org/thestaticvoid/iriverter/doc/images/prev.gif (deleted)
• src/org/thestaticvoid/iriverter/doc/images/tip.gif (deleted)
• src/org/thestaticvoid/iriverter/doc/images/toc-blank.gif (deleted)
• src/org/thestaticvoid/iriverter/doc/images/toc-minus.gif (deleted)
• src/org/thestaticvoid/iriverter/doc/images/toc-plus.gif (deleted)
• src/org/thestaticvoid/iriverter/doc/images/up.gif (deleted)
• src/org/thestaticvoid/iriverter/doc/images/warning.gif (deleted)

trunk/build.xml

@@ -8 +8 @@
         <property name="swt.linux.dir" value="lib/swt-M20060921-0945-gtk-linux-x86" />
         <property name="swt.windows.dir" value="lib/swt-M20060921-0945-win32-win32-x86" />
+        <property name="icons.dir" value="org/thestaticvoid/iriverter/icons" />
+        <property name="profiles.dir" value="org/thestaticvoid/iriverter/profiles" />
         <property name="doc.dir" value="org/thestaticvoid/iriverter/doc" />
-        <property name="xslt.style" value="lib/docbook-xsl-1.71.1/html/chunk.xsl" />
+        <property name="doc.images.dir" value="${doc.dir}/images" />
+        <property name="docbook.dir" value="lib/docbook-xsl-1.71.1" />
+        <property name="docbook.images.dir" value="${docbook.dir}/images" />
+        <property name="xslt.style" value="${docbook.dir}/html/chunk.xsl" />
         <property name="xslt.parser.classpath" value="lib/saxon6-5-5-1/saxon.jar" />
 
@@ -23 +28 @@
                 <mkdir dir="${build.dir}" />
 
-                <javac srcdir="${src.dir}" destdir="${build.dir}" classpath="${swt.dir}/swt.jar" />
+                <javac srcdir="${src.dir}" destdir="${build.dir}" classpath="${swt.dir}/swt.jar" source="1.4" target="1.4" />
 
-                <copy todir="${build.dir}">
-                        <fileset dir="${src.dir}">
-                                <include name="**/icons/*" />
-                                <include name="**/profiles/*" />
-                        </fileset> 
+                <copy todir="${build.dir}/${icons.dir}">
+                        <fileset dir="${src.dir}/${icons.dir}" />
+                </copy>
+                
+                <copy todir="${build.dir}/${profiles.dir}">
+                        <fileset dir="${src.dir}/${profiles.dir}" />
                 </copy>
         </target>
@@ -38 +44 @@
                         <param name="base.dir" expression="${build.dir}/${doc.dir}/" />
                         <param name="use.id.as.filename" expression="1" />
+                        <param name="admon.graphics" expression="1" />
                 </xslt>
                 
-                <copy todir="${build.dir}">
-                        <fileset dir="${src.dir}" includes="**/doc/images/*" />
+                <copy todir="${build.dir}/${doc.images.dir}">
+                        <fileset dir="${src.dir}/${doc.images.dir}" />
+                        <fileset dir="${docbook.images.dir}" />
                 </copy>
         </target>
@@ -55 +63 @@
                 
                 <copy file="${jar.dir}/iriverter.jar" todir="${dist.dir}" />
-                <signjar jar="${dist.dir}/iriverter.jar" keystore="keystore" alias="iriverter" storepass="iriverter" />
+                <copy file="${swt.linux.dir}/swt.jar" tofile="${dist.dir}/swt-gtk-linux-x86.jar" />
+                <copy file="${swt.windows.dir}/swt.jar" tofile="${dist.dir}/swt-win32-win32-x86.jar" />
+                
+                <copy todir="${dist.dir}">
+                        <fileset dir="${web.dir}" />
+                </copy>
 
-                <copy file="${swt.linux.dir}/swt.jar" tofile="${dist.dir}/swt-gtk-linux-x86.jar" />
-                <signjar jar="${dist.dir}/swt-gtk-linux-x86.jar" keystore="keystore" alias="iriverter" storepass="iriverter" />
+                <jar destfile="${dist.dir}/swt-native-gtk-linux-x86.jar" basedir="${swt.linux.dir}" includes="*.so" />
+                <jar destfile="${dist.dir}/swt-native-win32-win32-x86.jar" basedir="${swt.windows.dir}" includes="*.dll" />
                 
-                <jar destfile="${dist.dir}/swt-native-gtk-linux-x86.jar" basedir="${swt.linux.dir}" includes="*.so" />
-                <signjar jar="${dist.dir}/swt-native-gtk-linux-x86.jar" keystore="keystore" alias="iriverter" storepass="iriverter" />
-                
-                <copy file="${swt.windows.dir}/swt.jar" tofile="${dist.dir}/swt-win32-win32-x86.jar" />
-                <signjar jar="${dist.dir}/swt-win32-win32-x86.jar" keystore="keystore" alias="iriverter" storepass="iriverter" />
-                
-                <jar destfile="${dist.dir}/swt-native-win32-win32-x86.jar" basedir="${swt.windows.dir}" includes="*.dll" />
-                <signjar jar="${dist.dir}/swt-native-win32-win32-x86.jar" keystore="keystore" alias="iriverter" storepass="iriverter" />
-                
-                <copy file="${web.dir}/iriverter.gif" todir="${dist.dir}" />
-                <copy file="${web.dir}/iriverter.jnlp" todir="${dist.dir}" />
+                <signjar keystore="keystore" alias="iriverter" storepass="iriverter">
+                        <fileset dir="${dist.dir}" includes="*.jar" />
+                </signjar>
         </target>