[jsword-svn] r1000 - in trunk: bibledesktop common
common/src/main/java/org/crosswire/common/util jsword-web
jsword-web/etc/eclipse
dmsmith at crosswire.org
dmsmith at crosswire.org
Sun Jan 29 19:33:01 MST 2006
Author: dmsmith
Date: 2006-01-29 19:32:49 -0700 (Sun, 29 Jan 2006)
New Revision: 1000
Modified:
trunk/bibledesktop/build.xml
trunk/common/core.xml
trunk/common/src/main/java/org/crosswire/common/util/EventListenerList.java
trunk/jsword-web/build.xml
trunk/jsword-web/etc/eclipse/jsword-web-ant-check.launch
Log:
Making nightly.release dependant upon whether source has changed.
Modified: trunk/bibledesktop/build.xml
===================================================================
--- trunk/bibledesktop/build.xml 2006-01-29 20:14:02 UTC (rev 999)
+++ trunk/bibledesktop/build.xml 2006-01-30 02:32:49 UTC (rev 1000)
@@ -27,7 +27,10 @@
</target>
<!--=======================================================================-->
- <target name="install" depends="build, keygen" description="Prepares for web based jnlp deploy">
+ <target name="install"
+ depends="build, keygen, install.check"
+ unless="install.uptodate"
+ description="Prepares for web based jnlp deploy">
<echo message="Building JNLP: uninstalled files in: ${jnlp.uninstalled} and installed in ${jnlp.installed}"/>
<!-- sign the jars to a temporary location so they can be reused -->
<jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="bibledesktop-${release.version}.jar"/>
@@ -50,9 +53,13 @@
<jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="rome-0.7.jar"/>
<jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="werx-051405.jar"/>
<jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="xmlrpc-2.0.1.jar"/>
+
+ <!-- Create a flag file used to determine whether the set of jars needs to be signed -->
+ <touch file="${target.root}/.flagfile"/>
<!-- Copy the files needed for the distribution -->
<mkdir dir="${jnlp.uninstalled}"/>
- <copy todir="${jnlp.uninstalled}">
+ <copy todir="${jnlp.uninstalled}"
+ preservelastmodified="true">
<fileset dir="${target.signed}"/>
<fileset dir="${source.etc}/jnlp">
<include name="bibledesktop.jnlp"/>
@@ -83,11 +90,13 @@
-->
<!--
Attempt a local deploy, we might be able to get the jnlp file to work
- locally on a relative path, but in the mean time there is always the *.bat
+ locally on a relative path, but in the mean time there is always the *.exe
and *.sh startup files.
-->
<mkdir dir="${jnlp.installed}"/>
- <copy todir="${jnlp.installed}" filtering="true">
+ <copy todir="${jnlp.installed}"
+ filtering="true"
+ preservelastmodified="true">
<fileset dir="${jnlp.uninstalled}">
<include name="**/*.jnlp"/>
</fileset>
@@ -97,11 +106,21 @@
<filter token="release.version" value="${release.version}"/>
</filterset>
</copy>
- <copy todir="${jnlp.installed}" filtering="false">
+ <copy todir="${jnlp.installed}"
+ filtering="false"
+ preservelastmodified="true">
<fileset dir="${jnlp.uninstalled}">
<exclude name="**/*.jnlp"/>
</fileset>
</copy>
</target>
+ <target name="install.check">
+ <uptodate property="install.uptodate"
+ targetfile="${target.root}/.flagfile">
+ <srcfiles dir="${target.jar}"/>
+ </uptodate>
+ <echo message="install.uptodate result: ${install.uptodate}"/>
+ </target>
+
</project>
Modified: trunk/common/core.xml
===================================================================
--- trunk/common/core.xml 2006-01-29 20:14:02 UTC (rev 999)
+++ trunk/common/core.xml 2006-01-30 02:32:49 UTC (rev 1000)
@@ -226,7 +226,7 @@
if="jardir.present">
<!-- Copy the jars from the std location to the target jar directory -->
<mkdir dir="${target.jar}"/>
- <copy verbose="${verbose.copy}" todir="${target.jar}" flatten="true">
+ <copy verbose="${verbose.copy}" todir="${target.jar}" flatten="true" preservelastmodified="true">
<fileset dir="${source.jar}">
<patternset refid="external.runtime.jars"/>
</fileset>
@@ -269,7 +269,7 @@
if="dependency.jar"
description="Prepare this build from the dependency.">
<mkdir dir="${target.jar}"/>
- <copy verbose="${verbose.copy}" todir="${target.jar}" flatten="true">
+ <copy verbose="${verbose.copy}" todir="${target.jar}" flatten="true" preservelastmodified="true">
<fileset dir="${dependency.jar}" includes="*.jar"/>
</copy>
</target>
Modified: trunk/common/src/main/java/org/crosswire/common/util/EventListenerList.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/util/EventListenerList.java 2006-01-29 20:14:02 UTC (rev 999)
+++ trunk/common/src/main/java/org/crosswire/common/util/EventListenerList.java 2006-01-30 02:32:49 UTC (rev 1000)
@@ -165,7 +165,7 @@
*/
public int getListenerCount()
{
- return listenerList.length/2;
+ return listenerList.length / 2;
}
/**
@@ -198,7 +198,8 @@
*/
public synchronized void add(Class t, EventListener li)
{
- if (li ==null) {
+ if (li == null)
+ {
// In an ideal world, we would do an assertion here
// to help developers know they are probably doing
// something wrong
@@ -237,7 +238,8 @@
*/
public synchronized void remove(Class t, EventListener li)
{
- if (li ==null) {
+ if (li == null)
+ {
// In an ideal world, we would do an assertion here
// to help developers know they are probably doing
// something wrong
Modified: trunk/jsword-web/build.xml
===================================================================
--- trunk/jsword-web/build.xml 2006-01-29 20:14:02 UTC (rev 999)
+++ trunk/jsword-web/build.xml 2006-01-30 02:32:49 UTC (rev 1000)
@@ -1,6 +1,6 @@
<project name="jsword-web" default="all">
- <import file="../common/core.xml"/>
+ <import file="../common/core.xml"/>
<property name="dependency" value="bibledesktop-web"/>
<property name="dependency.jar" value="../bibledesktop/${target.jar}"/>
@@ -90,8 +90,24 @@
<target name="tools" depends="java2html,checkstyle,javancss,findbugs,pmd,cpd,jdepend"/>
<!--=======================================================================-->
- <target name="install" depends="install.dependency, webapp, tools, release.nightly" description="Install all the files">
+ <target name="install"
+ depends="install.dependency, install.check"
+ unless="release.uptodate"
+ description="Install all the files">
+ <antcall target="do.install"/>
</target>
+ <target name="do.install"
+ depends="webapp, tools, release.nightly">
+ <!-- Create a flag file used to determine whether this task finished successfully -->
+ <touch file="${target.root}/.flagfile"/>
+ </target>
+ <target name="install.check">
+ <uptodate property="release.uptodate"
+ targetfile="${target.root}/.flagfile">
+ <srcfiles dir="${target.web}/WEB-INF/lib" includes="*"/>
+ </uptodate>
+ <echo message="release.uptodate result: ${release.uptodate}"/>
+ </target>
<!--=======================================================================-->
<target name="webapp" description="Build an unpacked war file">
Modified: trunk/jsword-web/etc/eclipse/jsword-web-ant-check.launch
===================================================================
--- trunk/jsword-web/etc/eclipse/jsword-web-ant-check.launch 2006-01-29 20:14:02 UTC (rev 999)
+++ trunk/jsword-web/etc/eclipse/jsword-web-ant-check.launch 2006-01-30 02:32:49 UTC (rev 1000)
@@ -10,5 +10,6 @@
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/jsword-web/build.xml}"/>
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_TARGETS" value="tools,"/>
<stringAttribute key="org.eclipse.debug.ui.target_run_perspective" value="perspective_default"/>
</launchConfiguration>
More information about the jsword-svn
mailing list