From: <doc...@us...> - 2007-11-09 01:14:33
|
Revision: 190 http://openpcl.svn.sourceforge.net/openpcl/?rev=190&view=rev Author: documentsystems Date: 2007-11-08 17:14:32 -0800 (Thu, 08 Nov 2007) Log Message: ----------- Howard Hoagland. OpenPCL build.xml file a lot of changes. Modified Paths: -------------- openpcl/build.xml Modified: openpcl/build.xml =================================================================== --- openpcl/build.xml 2007-11-09 01:13:57 UTC (rev 189) +++ openpcl/build.xml 2007-11-09 01:14:32 UTC (rev 190) @@ -1,22 +1,26 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<project name="OpenPCL" default="all"> +<project name="OpenPCL" default="all" basedir="."> - <property name="lowercase.project.name" value="openpcl"/> - <property name="lib.dir" value="lib"/> - <property name="src.dir" value="src"/> - <property name="build.dir" value="build"/> + <description>OpenPCL Build</description> - <property name="doc.dir" value="docs"/> + <property environment="env"/> + <property name="project.name" value="openpcl"/> + <property name="lib.dir" value="${basedir}/lib"/> + <property name="src.dir" value="${basedir}/src"/> + <property name="build.dir" value="${basedir}/build"/> + + <property name="classes.dir" value="${build.dir}/classes"/> + <property name="doc.dir" value="${build.dir}/docs"/> <property name="api.dir" value="${doc.dir}/api"/> - - <property name="rel.dir" value="rel"/> + <property name="rel.dir" value="${build.dir}/rel"/> + <property name="rel.website.dir" value="${rel.dir}/website"/> <property name="src.website.dir" value="${src.dir}/com/openpcl/install/website"/> <property name="src.localinstaller.dir" value="${src.dir}/com/openpcl/install/localinstaller"/> <property name="src.webstart.dir" value="${src.dir}/com/openpcl/install/webstart"/> <property name="src.data.dir" value="${src.dir}/com/openpcl/data"/> <property name="src.images.dir" value="${src.dir}/com/openpcl/viewer/images"/> - <property name="pclrenderimage.dir" value="com/openpcl/pclrenderimage"/> + <property name="pclrenderimage.dir" value="${basedir}/com/openpcl/pclrenderimage"/> <!-- <property name="openpclviewer.dir" value="com/openpcl/viewer"/> @@ -34,7 +38,7 @@ > ** password is also ${keystore.alias} ** > keytool -export -alias project -rfc -file sig.x509 --> - <property name="keystore.alias" value="${lowercase.project.name}"/> + <property name="keystore.alias" value="${project.name}"/> <property name="keystore.file" value="${keystore.alias}.keystore"/> <property name="keystore.password" value="${keystore.alias}"/> @@ -49,28 +53,23 @@ <available property="jsmooth.installed" file="${jsmooth.dir}/lib/jsmoothgen-ant.jar" value="true"/> <!-- Classpath --> - <path id="classpath"> - <fileset dir="${lib.dir}"> - <include name="*.jar" /> - </fileset> + <path id="project.class.path"> + <fileset dir="${lib.dir}" includes="*.jar"/> </path> <!-- clean --> - <target name="clean" description="Clean build created directories"> + <target name="clean" description="Clean build created directories and generated .jar files"> <delete dir="${build.dir}"/> - <delete dir="${doc.dir}"/> - <delete dir="${rel.dir}"/> - <delete file="${lib.dir}/openpcl.jar"/> - <delete file="${lib.dir}/pclrenderimage.jar"/> + <!-- Don't delete TableLayout.jar in the lib dir. --> <delete file="${src.images.dir}/thumbs.db"/> <echo>Finished OpenPCL Ant build.xml "clean" target.</echo> </target> <!-- compile --> <target name="compile" depends="clean" description="Compile source to class files"> - <mkdir dir="${build.dir}"/> - <javac srcdir="${src.dir}" destdir="${build.dir}" classpathref="classpath" debug="false" - verbose="false" followsymlinks="true" target="1.5" optimize="true"/> + <mkdir dir="${classes.dir}"/> + <javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="project.class.path" debug="true" + verbose="true" followsymlinks="true" target="1.5" optimize="true"/> <echo>Finished OpenPCL Ant build.xml "compile" target.</echo> </target> @@ -78,8 +77,8 @@ <target name="jar.pclrenderimage" depends="compile" description="Build pclrenderimage.jar for server side only (no OpenPCLViewer UI class files)"> <!-- The pclrenderimage.jar file is built unsigned in the lib dir --> - <jar jarfile="${lib.dir}/pclrenderimage.jar"> - <fileset dir="${build.dir}" includes="${pclrenderimage.dir}/**/*.class"/> + <jar jarfile="${build.dir}/pclrenderimage.jar"> + <fileset dir="${classes.dir}" includes="${pclrenderimage.dir}/**/*.class"/> </jar> <echo>Finished OpenPCL Ant build.xml "jar.pclrenderimage" target.</echo> </target> @@ -88,8 +87,8 @@ <target name="jar.openpcl" depends="jar.pclrenderimage" description="Build openpcl.jar has all the UI class files and all the pclrenderimage class files"> <!-- The openpcl.jar file is built unsigned in the lib dir --> - <jar jarfile="${lib.dir}/${lowercase.project.name}.jar"> - <fileset dir="${build.dir}" includes="**/*.class"/> + <jar jarfile="${build.dir}/${project.name}.jar"> + <fileset dir="${classes.dir}" includes="**/*.class"/> <fileset dir="${src.dir}" includes="**/viewer/images/**"/> <fileset dir="${src.dir}" includes="**/htmlfiles/**"/> </jar> @@ -104,7 +103,7 @@ <mkdir dir="${rel.dir}"/> <!-- Copy the 3 unsigned .jar files from lib to rel --> <copy todir="${rel.dir}"> - <fileset dir="${lib.dir}" includes="openpcl.jar"/> + <fileset dir="${build.dir}" includes="${project.name}.jar"/> <fileset dir="${lib.dir}" includes="pclrenderimage.jar"/> <fileset dir="${lib.dir}" includes="TableLayout.jar"/> </copy> @@ -120,14 +119,14 @@ <!-- javadoc --> <target name="javadoc" depends="applet" description="Builds JavaDoc API files"> <mkdir dir="${api.dir}"/> - <javadoc packagenames="com.${lowercase.project.name}.*" + <javadoc packagenames="com.${project.name}.*" sourcepath="${src.dir}" defaultexcludes="yes" destdir="${api.dir}" author="true" version="true" use="true" - classpathref="classpath" + classpathref="project.class.path" windowtitle="${ant.project.name} API"> <doctitle><![CDATA[<h1>${ant.project.name}</h1>]]></doctitle> <bottom><![CDATA[<i>OpenPCL <a href="http://www.openpcl.com">http://www.openpcl.com</a></i>]]></bottom> @@ -140,14 +139,14 @@ <!-- makezipfile --> <target name="makezipfile" depends="javadoc" description="Creates the zip file of the source code and JavaDoc"> - <zip destfile="${rel.dir}/${lowercase.project.name}.zip" update="true"> - <zipfileset file="build.xml" prefix="${lowercase.project.name}"/> - <zipfileset file=".classpath" prefix="${lowercase.project.name}"/> - <zipfileset file="${keystore.alias}.keystore" prefix="${lowercase.project.name}"/> - <zipfileset dir="${doc.dir}" prefix="${lowercase.project.name}/${doc.dir}"/> - <zipfileset dir="${lib.dir}" prefix="${lowercase.project.name}/${lib.dir}" includes="*.jar"/> - <zipfileset dir="${rel.dir}" prefix="${lowercase.project.name}/${rel.dir}" includes="*.jar"/> - <zipfileset dir="${src.dir}" prefix="${lowercase.project.name}/${src.dir}" excludes="**/izpackdoc/**,**/jsmoothdoc/**"/> + <zip destfile="${build.dir}/${project.name}.zip" update="true"> + <zipfileset file=".classpath" prefix="${project.name}"/> + <zipfileset file="build.xml" prefix="${project.name}"/> + <zipfileset file="${keystore.alias}.keystore" prefix="${project.name}"/> + <zipfileset dir="${doc.dir}" prefix="${project.name}/${doc.dir}"/> + <zipfileset dir="${lib.dir}" prefix="${project.name}/${lib.dir}" includes="*.jar"/> + <zipfileset dir="${rel.dir}" prefix="${project.name}/${rel.dir}" includes="*.jar"/> + <zipfileset dir="${src.dir}" prefix="${project.name}/${src.dir}" excludes="**/izpackdoc/**,**/jsmoothdoc/**"/> </zip> <echo>To create the installer, download IzPack from (http://www.izforge.com/izpack)</echo> <echo>Installed? ${izpack.installed}</echo> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |