Toggle version to 1.7.0 and clean up build file: Remove obsolete CVS stuff, combine sub-targets with just one caller, and remove unused targets.
This commit is contained in:
hns
parent
3673da711c
commit
c31f60ffa7
3 changed files with 14 additions and 77 deletions
|
|
@ -1,4 +1,4 @@
|
|||
This is the README file for version 1.6.3 of the Helma Javascript
|
||||
This is the README file for version 1.7.0 of the Helma Javascript
|
||||
Web Application Framework.
|
||||
|
||||
==============
|
||||
|
|
|
|||
87
build.xml
87
build.xml
|
|
@ -8,13 +8,9 @@
|
|||
<target name="init">
|
||||
<property name="Name" value="helma"/>
|
||||
<property name="year" value="1998-${year}"/>
|
||||
<property name="version" value="1.6.3"/>
|
||||
<property name="version" value="1.7.0"/>
|
||||
<property name="project" value="helma"/>
|
||||
|
||||
<property name="cvs.root.apps" value=":pserver:anonymous@adele.helma.at:/opt/cvs/apps"/>
|
||||
<property name="cvs.root.helma" value=":pserver:anonymous@adele.helma.at:/opt/cvs/helma"/>
|
||||
<property name="cvs.apps.tag" value="HEAD"/>
|
||||
|
||||
<property name="home.dir" value="."/>
|
||||
<property name="build.dir" value="${home.dir}/build"/>
|
||||
<property name="build.src" value="${home.dir}/src"/>
|
||||
|
|
@ -72,8 +68,8 @@
|
|||
<!--<echo message=" docs -> tries to retrieve the HTML documentation "/> -->
|
||||
<!--<echo message=" (may need proxy settings in startscript)"/> -->
|
||||
<echo message=" package --> generates the distribution (zip and tar.gz)"/>
|
||||
<echo message=" app [name] --> gets an application from the cvs and zips it"/>
|
||||
<echo message=" module [name] --> gets a module from the cvs and zips it"/>
|
||||
<echo message=" app [name] --> gets an application from svn and zips it"/>
|
||||
<echo message=" module [name] --> gets a module from svn and zips it"/>
|
||||
<echo message=" core --> generates core for production updates (zip and tar.gz)"/>
|
||||
<echo message=" clean --> clean up temporary build directories and files"/>
|
||||
<echo message=""/>
|
||||
|
|
@ -160,7 +156,6 @@
|
|||
<!-- Create the jsdoc Framework documentation -->
|
||||
<!-- =================================================================== -->
|
||||
<target name="jsdocs" depends="init, package-modules">
|
||||
<!-- cvs cvsRoot="${cvs.root.apps}" command="export" tag="${cvs.apps.tag}" package="reference" dest="${build.work}" /-->
|
||||
|
||||
<!-- add a copy of the reference -->
|
||||
<mkdir dir="${build.work}/reference"/>
|
||||
|
|
@ -224,7 +219,7 @@
|
|||
|
||||
<!-- copy the license files -->
|
||||
<copy todir="${build.work}/licenses">
|
||||
<fileset dir="${home.dir}/licenses" excludes="**/CVS**"/>
|
||||
<fileset dir="${home.dir}/licenses" excludes="**/.svn**"/>
|
||||
</copy>
|
||||
<copy file="${home.dir}/license.txt" todir="${build.work}/licenses"/>
|
||||
|
||||
|
|
@ -294,7 +289,7 @@
|
|||
|
||||
<!-- copy the framework (apps.props, server.props, hop/db, hop/static) -->
|
||||
<copy todir="${build.work}">
|
||||
<fileset dir="${build.dir}/${distribution}" excludes="**/CVS**"/>
|
||||
<fileset dir="${build.dir}/${distribution}" excludes="**/.svn**"/>
|
||||
</copy>
|
||||
|
||||
<!-- copy the launcher jar and start files -->
|
||||
|
|
@ -323,13 +318,13 @@
|
|||
|
||||
<!-- copy the license files -->
|
||||
<copy todir="${build.work}/licenses">
|
||||
<fileset dir="${home.dir}/licenses" excludes="**/CVS**"/>
|
||||
<fileset dir="${home.dir}/licenses" excludes="**/.svn**"/>
|
||||
</copy>
|
||||
<copy file="${home.dir}/license.txt" todir="${build.work}/licenses"/>
|
||||
|
||||
<!-- copy the scripts directory -->
|
||||
<copy todir="${build.work}/scripts">
|
||||
<fileset dir="${home.dir}/scripts" excludes="**/CVS**"/>
|
||||
<fileset dir="${home.dir}/scripts" excludes="**/.svn**"/>
|
||||
</copy>
|
||||
|
||||
<!-- zip the sourcecode -->
|
||||
|
|
@ -351,27 +346,15 @@
|
|||
|
||||
<mkdir dir="${build.work}/apps" />
|
||||
|
||||
<!-- get demo apps -->
|
||||
<!--cvs cvsRoot="${cvs.root.apps}" command="export" tag="${cvs.apps.tag}" package="welcome" dest="${build.work}/apps" /-->
|
||||
|
||||
<!-- add a copy of the welcome app -->
|
||||
<mkdir dir="${build.work}/apps/welcome"/>
|
||||
<copy todir="${build.work}/apps/welcome">
|
||||
<fileset dir="${build.externals}/welcome"/>
|
||||
</copy>
|
||||
|
||||
<antcall target="package-manage" />
|
||||
|
||||
</target>
|
||||
|
||||
|
||||
<!-- =================================================================== -->
|
||||
<!-- Checkout and zip manage application -->
|
||||
<!-- =================================================================== -->
|
||||
<target name="package-manage" depends="init">
|
||||
<!--cvs cvsRoot="${cvs.root.apps}" command="export" tag="${cvs.apps.tag}" package="manage" dest="${build.work}" /-->
|
||||
<mkdir dir="${build.work}/apps/manage"/>
|
||||
<zip zipfile="${build.work}/apps/manage/manage.zip" basedir="${build.externals}/manage/" includes="**" excludes="**/properties,readme/**" />
|
||||
<zip zipfile="${build.work}/apps/manage/manage.zip" basedir="${build.externals}/manage/"
|
||||
includes="**" excludes="**/properties,readme/**" />
|
||||
<copy todir="${build.work}/apps/manage">
|
||||
<fileset dir="${build.externals}/manage" includes="app.properties,class.properties,readme.txt"/>
|
||||
</copy>
|
||||
|
|
@ -380,10 +363,9 @@
|
|||
|
||||
|
||||
<!-- =================================================================== -->
|
||||
<!-- Checkout modules, and include helmaTools -->
|
||||
<!-- Checkout modules including helmaTools -->
|
||||
<!-- =================================================================== -->
|
||||
<target name="package-modules" depends="init">
|
||||
<!--cvs cvsRoot="${cvs.root.apps}" command="export" tag="${cvs.apps.tag}" package="modules" dest="${build.work}" /-->
|
||||
|
||||
<!-- add a copy of the modules -->
|
||||
<mkdir dir="${build.work}/modules"/>
|
||||
|
|
@ -391,17 +373,9 @@
|
|||
<fileset dir="${build.externals}/modules"/>
|
||||
</copy>
|
||||
|
||||
<antcall target="package-helmaTools" />
|
||||
</target>
|
||||
|
||||
|
||||
<!-- =================================================================== -->
|
||||
<!-- Checkout and zip helmaTools -->
|
||||
<!-- =================================================================== -->
|
||||
<target name="package-helmaTools" depends="init">
|
||||
<!-- cvs cvsRoot="${cvs.root.apps}" command="export" package="helmaTools" dest="${build.work}" /-->
|
||||
<mkdir dir="${build.work}/modules"/>
|
||||
<zip zipfile="${build.work}/modules/helmaTools.zip" basedir="${build.externals}/helmaTools/" includes="**" excludes="**/*.txt, **/*.html, **/*.bat, **/*.sh" />
|
||||
<zip zipfile="${build.work}/modules/helmaTools.zip" basedir="${build.externals}/helmaTools/"
|
||||
includes="**" excludes="**/*.txt, **/*.html, **/*.bat, **/*.sh" />
|
||||
<!--delete dir="${build.work}/helmaTools" /-->
|
||||
</target>
|
||||
|
||||
|
|
@ -507,42 +481,5 @@
|
|||
</delete>
|
||||
</target>
|
||||
|
||||
<!-- =================================================================== -->
|
||||
<!-- Gets an application from the cvs and zips/targzs it -->
|
||||
<!-- =================================================================== -->
|
||||
<target name="app" depends="init">
|
||||
<mkdir dir="${build.dist}" />
|
||||
<mkdir dir="${build.work}" />
|
||||
|
||||
<!-- to retrieve special versions of an application insert
|
||||
additional attributes: tag="TAGNAME" or date="1972-09-24 20:05" -->
|
||||
<!--cvs cvsRoot="${cvs.root.apps}" command="export" tag="${cvs.apps.tag}" package="${application}" dest="${build.work}" /-->
|
||||
|
||||
<fixcrlf srcdir="${build.work}" eol="crlf" eof="add" includes="**/*.txt, **/*.properties, **/*.hac, **/*.js, **/*.skin, **/*.xml" />
|
||||
<zip zipfile="${build.dist}/${application}-${DSTAMP}.zip" basedir="${build.work}" includes="**"/>
|
||||
|
||||
<fixcrlf srcdir="${build.work}" eol="lf" eof="remove" includes="**/*.txt, **/*.properties, **/*.hac, **/*.js, **/*.skin" />
|
||||
<tar tarfile="${build.dist}/${application}-${DSTAMP}.tar" basedir="${build.work}">
|
||||
<tarfileset dir="${build.work}">
|
||||
<include name="${build.work}/**"/>
|
||||
</tarfileset>
|
||||
</tar>
|
||||
<gzip zipfile="${build.dist}/${application}-${DSTAMP}.tar.gz" src="${build.dist}/${application}-${DSTAMP}.tar" />
|
||||
|
||||
<delete file="${build.dist}/${application}-${DSTAMP}.tar" />
|
||||
<!--delete dir="${build.work}" /-->
|
||||
</target>
|
||||
|
||||
|
||||
<!-- =================================================================== -->
|
||||
<!-- Checkout and zip a module -->
|
||||
<!-- =================================================================== -->
|
||||
<target name="module" depends="init">
|
||||
<cvs cvsRoot="${cvs.root.apps}" command="export" tag="${cvs.apps.tag}" package="${application}" dest="${build.work}" />
|
||||
<mkdir dir="${build.work}/modules"/>
|
||||
<zip zipfile="${build.work}/modules/${application}-${DSTAMP}.zip" basedir="${build.work}/${application}/" includes="**" excludes="**/*.txt, **/*.html, **/*.bat, **/*.sh" />
|
||||
<delete dir="${build.work}/${application}" />
|
||||
</target>
|
||||
|
||||
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ import helma.util.ResourceProperties;
|
|||
*/
|
||||
public class Server implements Runnable {
|
||||
// version string
|
||||
public static final String version = "1.6.3 (__builddate__)";
|
||||
public static final String version = "1.7.0 (__builddate__)";
|
||||
|
||||
// static server instance
|
||||
private static Server server;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue