8:47 a.m.
Author: remy.maucherat(a)jboss.com
Date: 2008-05-27 09:47:39 -0400 (Tue, 27 May 2008)
New Revision: 641
Modified:
trunk/build.properties.default
trunk/build.xml
trunk/webapps/docs/changelog.xml
Log:
- Some small cleanup.
- Update NSIS and JDT.
Modified: trunk/build.properties.default
===================================================================
--- trunk/build.properties.default 2008-05-26 14:34:28 UTC (rev 640)
+++ trunk/build.properties.default 2008-05-27 13:47:39 UTC (rev 641)
@@ -39,8 +39,8 @@
# ----- Eclipse JDT, version 3.2 or later -----
jdt.home=${base.path}/eclipse/plugins
jdt.lib=${jdt.home}
-jdt.jar=${jdt.lib}/org.eclipse.jdt.core_3.3.1.v_780_R33x.jar
-jdt.loc=http://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops/R-3.3.1-200709211145/eclipse-JDT-3.3.1.zip
+jdt.jar=${jdt.lib}/org.eclipse.jdt.core_3.3.3.v_793_R33x.jar
+jdt.loc=http://download.eclipse.org/eclipse/downloads/drops/R-3.3.2-200802211800/eclipse-JDT-3.3.2.zip
# ----- Commons DBCP, version 1.1 or later -----
commons-dbcp.version=1.2.2
@@ -59,12 +59,12 @@
commons-collections-src.loc=${base-commons.loc}/collections/source/commons-collections-3.2-src.tar.gz
# ----- NSIS, version 2.0 or later -----
-nsis.home=${base.path}/nsis-2.36
+nsis.home=${base.path}/nsis-2.37
nsis.exe=${nsis.home}/makensis.exe
nsis.installoptions.dll=${nsis.home}/Plugins/InstallOptions.dll
nsis.nsexec.dll=${nsis.home}/Plugins/nsExec.dll
nsis.nsisdl.dll=${nsis.home}/Plugins/NSISdl.dll
-nsis.loc=${base-sf.loc}/nsis/nsis-2.36.zip
+nsis.loc=${base-sf.loc}/nsis/nsis-2.37.zip
# ----- JBoss Native, version 2.0 or later -----
jbossnative.home=${base.path}/jboss-native-2.0.3
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2008-05-26 14:34:28 UTC (rev 640)
+++ trunk/build.xml 2008-05-27 13:47:39 UTC (rev 641)
@@ -92,11 +92,12 @@
<!-- Compile internal server components -->
<javac srcdir="java" destdir="${tomcat.classes}"
- debug="${compile.debug}"
- deprecation="${compile.deprecation}"
- source="${compile.source}"
- optimize="${compile.optimize}"
- excludes="**/CVS/**,**/.svn/**">
+ debug="${compile.debug}"
+ optimize="${compile.optimize}"
+ deprecation="${compile.deprecation}"
+ source="${compile.source}"
+ target="${compile.target}"
+ excludes="**/CVS/**,**/.svn/**">
<!-- Comment this in to show unchecked warnings: <compilerarg
value="-Xlint:unchecked"/> -->
<classpath refid="tomcat.classpath" />
</javac>
@@ -667,7 +668,9 @@
<target name="download"
description="Builds and download dependent components">
- <antcall target="downloadgz">
+ <mkdir dir="${base.path}" />
+
+ <antcall target="downloadgz">
<param name="sourcefile" value="${commons-daemon.loc}"/>
<param name="destfile" value="${commons-daemon.jar}"/>
</antcall>
@@ -688,6 +691,7 @@
<mkdir dir="${tomcat-dbcp.home}"/>
<antcall target="build-tomcat-dbcp">
<param name="basedir" value="${tomcat-dbcp.home}" />
+ <param name="destfile" value="${tomcat-dbcp.jar}" />
</antcall>
<!-- Build Jasper JDT bundle -->
@@ -715,7 +719,7 @@
</target>
- <target name="build-tomcat-dbcp">
+ <target name="build-tomcat-dbcp" unless="exist"
depends="testexist">
<copy todir="${tomcat-dbcp.home}">
<!--
<fileset dir="${commons-collections.home}" >
@@ -757,12 +761,14 @@
</move>
<mkdir dir="${tomcat-dbcp.home}/classes"/>
<javac destdir="${tomcat-dbcp.home}/classes"
- optimize="off"
- debug="${compile.debug}"
- deprecation="${compile.deprecation}"
- source="${compile.source}"
- sourcepath="${tomcat-dbcp.home}/src/java"
- srcdir="${tomcat-dbcp.home}/src/java" >
+ sourcepath="${tomcat-dbcp.home}/src/java"
+ srcdir="${tomcat-dbcp.home}/src/java"
+ debug="${compile.debug}"
+ optimize="${compile.optimize}"
+ deprecation="${compile.deprecation}"
+ source="${compile.source}"
+ target="${compile.target}"
+ excludes="**/CVS/**,**/.svn/**">
<include name="**" />
</javac>
<jar jarfile="${tomcat-dbcp.jar}"
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2008-05-26 14:34:28 UTC (rev 640)
+++ trunk/webapps/docs/changelog.xml 2008-05-27 13:47:39 UTC (rev 641)
@@ -19,6 +19,12 @@
<section name="JBoss Web 2.1.1.CR4 (remm)">
<subsection name="General">
<changelog>
+ <update>
+ Update to NSIS 2.37. (remm)
+ </update>
+ <update>
+ Update to JDT 3.3.3. (remm)
+ </update>
</changelog>
</subsection>
<subsection name="Catalina">