Merge of the NewUI changes into the trunk
This commit is contained in:
@@ -21,27 +21,52 @@
|
||||
|
||||
<!-- Global property names -->
|
||||
<property name="app.name" value="venice"/>
|
||||
<property name="deploy.home" value="../../${app.name}"/>
|
||||
<property name="deploy.home" value="/home/erbo/newui"/>
|
||||
<property name="dist.home" value="${deploy.home}"/>
|
||||
<property name="dist.src" value="${app.name}.jar"/>
|
||||
<property name="dist.war" value="${app.name}.war"/>
|
||||
<property name="javadoc.home" value="${deploy.home}/javadoc"/>
|
||||
|
||||
<!-- Prepare directory for build -->
|
||||
<target name="prepare">
|
||||
<mkdir dir="${deploy.home}"/>
|
||||
<copy todir="${deploy.home}">
|
||||
<!-- Build the base directories that fastupdate requires. -->
|
||||
<target name="mkbasedirs">
|
||||
<mkdir dir="${deploy.home}"/>
|
||||
<mkdir dir="${deploy.home}/WEB-INF"/>
|
||||
<mkdir dir="${deploy.home}/WEB-INF/scripts"/>
|
||||
</target>
|
||||
|
||||
<!-- Copy everything to the application directory that can be updated without a restart. -->
|
||||
<target name="fastupdate" depends="mkbasedirs">
|
||||
<copy todir="${deploy.home}"> <!-- this copies all the JSP files and stuff -->
|
||||
<fileset dir="web"/>
|
||||
</copy>
|
||||
<mkdir dir="${deploy.home}/WEB-INF"/>
|
||||
<copy todir="${deploy.home}/WEB-INF/scripts"> <!-- this copies all the scripts -->
|
||||
<fileset dir="scripts"/>
|
||||
</copy>
|
||||
</target>
|
||||
|
||||
<!-- Prepare directory for build (copy everything that requires a restart to take effect) -->
|
||||
<target name="prepare" depends="mkbasedirs">
|
||||
<copy todir="${deploy.home}/WEB-INF">
|
||||
<fileset dir="etc"/>
|
||||
<fileset dir="etc">
|
||||
<include name="*.xml"/>
|
||||
<include name="*.css"/>
|
||||
<include name="*.dict"/>
|
||||
</fileset>
|
||||
</copy>
|
||||
<mkdir dir="${deploy.home}/WEB-INF/classes"/>
|
||||
<mkdir dir="${deploy.home}/WEB-INF/lib"/>
|
||||
<copy todir="${deploy.home}/WEB-INF/lib">
|
||||
<fileset dir="lib"/>
|
||||
<fileset dir="lib">
|
||||
<include name="*.jar"/>
|
||||
</fileset>
|
||||
</copy>
|
||||
<mkdir dir="${deploy.home}/WEB-INF/tlds"/>
|
||||
<copy todir="${deploy.home}/WEB-INF/tlds">
|
||||
<fileset dir="tlds">
|
||||
<include name="*.tld"/>
|
||||
</fileset>
|
||||
</copy>
|
||||
<mkdir dir="${deploy.home}/WEB-INF/temp"/>
|
||||
<mkdir dir="${javadoc.home}"/>
|
||||
</target>
|
||||
|
||||
@@ -51,7 +76,7 @@
|
||||
</target>
|
||||
|
||||
<!-- Compile all the Java source -->
|
||||
<target name="compile" depends="prepare">
|
||||
<target name="compile" depends="prepare,fastupdate">
|
||||
<javac srcdir="src" destdir="${deploy.home}/WEB-INF/classes" debug="on" optimize="off" deprecation="on">
|
||||
<classpath>
|
||||
<fileset dir="${deploy.home}/WEB-INF/lib">
|
||||
@@ -65,17 +90,16 @@
|
||||
</copy>
|
||||
</target>
|
||||
|
||||
|
||||
<!-- Create Javadocs -->
|
||||
<target name="javadoc" depends="prepare">
|
||||
<target name="javadoc" depends="mkbasedirs,prepare">
|
||||
<javadoc sourcepath="src" packagenames="*" destdir="${javadoc.home}"/>
|
||||
</target>
|
||||
|
||||
<!-- Build it all, man -->
|
||||
<target name="all" depends="clean,prepare,compile,javadoc"/>
|
||||
<target name="all" depends="clean,mkbasedirs,prepare,fastupdate,compile,javadoc"/>
|
||||
|
||||
<!-- Build the distribution .WAR file and JAR up the source code -->
|
||||
<target name="dist" depends="prepare,compile">
|
||||
<target name="dist" depends="mkbasedirs,prepare,fastupdate,compile">
|
||||
<jar jarfile="${dist.home}/${dist.src}" basedir="."/>
|
||||
<jar jarfile="${dist.home}/${dist.war}" basedir="${deploy.home}"/>
|
||||
</target>
|
||||
|
||||
Reference in New Issue
Block a user