antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 5 Projects Releases 5 Activity Actions

neither jsdocs nor javadocs did build and the tools seem to be gone for a long time so drop those tasks from ant file; also removed welcome app from demo since this app no longer exists

Browse source
This commit is contained in:
Simon Oberhammer 2018-02-13 14:35:10 +01:00
parent 81f5e3cd8e
commit d1fb7d312e
2 changed files with 4 additions and 101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

94
build.xml
View file

@ -17,7 +17,6 @@
<property name="build.lib" value="${home.dir}/lib"/> <property name="build.lib" value="${home.dir}/lib"/>
<property name="build.classes" value="${home.dir}/classes"/> <property name="build.classes" value="${home.dir}/classes"/>
<property name="build.docs" value="${home.dir}/docs"/> <property name="build.docs" value="${home.dir}/docs"/>
<property name="build.javadocs" value="${home.dir}/docs/api"/>
<property name="build.externals" value="${build.dir}/externals"/> <property name="build.externals" value="${build.dir}/externals"/>
<property name="build.work" value="${home.dir}/work"/> <property name="build.work" value="${home.dir}/work"/>
@ -31,9 +30,6 @@
<property name="optimize" value="on"/> <property name="optimize" value="on"/>
<property name="deprecation" value="off"/> <property name="deprecation" value="off"/>
<property name="build.jsdocs" value="${home.dir}/docs/framework"/>
<property name="jsdoc" value="${home.dir}/work/reference/templates/jsdoc.pl"/>
<path id="build.class.path"> <path id="build.class.path">
<fileset dir="${home.dir}/lib"> <fileset dir="${home.dir}/lib">
<exclude name="**/helma*.jar" /> <exclude name="**/helma*.jar" />
@ -63,10 +59,6 @@
<echo message=""/> <echo message=""/>
<echo message=" compile --> compiles the source code to ./classes"/> <echo message=" compile --> compiles the source code to ./classes"/>
<echo message=" jar --> generates the ./lib/helma-YYYYMMDD.jar file"/> <echo message=" jar --> generates the ./lib/helma-YYYYMMDD.jar file"/>
<echo message=" javadocs --> generates the API docs"/>
<echo message=" jsdocs --> generates the framework docs"/>
<!--<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=" package --> generates the distribution (zip and tar.gz)"/>
<echo message=" app [name] --> gets an application from svn 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=" module [name] --> gets a module from svn and zips it"/>
@ -132,57 +124,6 @@
</target> </target>
<!-- =================================================================== -->
<!-- Creates the javadoc API documentation -->
<!-- =================================================================== -->
<target name="javadocs" depends="init">
<mkdir dir="${build.javadocs}"/>
<javadoc packagenames="helma.*"
sourcepath="${build.src}"
destdir="${build.javadocs}"
author="false"
private="false"
version="false"
windowtitle="${Name} ${version} API"
doctitle="${Name} ${version} API"
bottom="Copyright &#169; ${year} Helma.org. All Rights Reserved."
classpathref="build.class.path"
/>
</target>
<!-- =================================================================== -->
<!-- Create the jsdoc Framework documentation -->
<!-- =================================================================== -->
<target name="jsdocs" depends="init, package-modules">
<!-- add a copy of the reference -->
<mkdir dir="${build.work}/reference"/>
<copy todir="${build.work}/reference">
<fileset dir="${build.externals}/reference"/>
</copy>
<!-- add a copy of the modules -->
<mkdir dir="${build.work}/reference/modules"/>
<copy todir="${build.work}/reference/modules">
<fileset dir="${build.externals}/modules/"/>
</copy>
<mkdir dir="${build.jsdocs}"/>
<java dir="${home.dir}" fork="true" jar="${build.lib}/rhino.jar">
<sysproperty key="jsdoc.dir" value="work/reference"/>
<arg value="work/reference/app/run.js"/>
<arg value="-t=work/reference/templates"/>
<arg value="-d=docs/framework"/>
<arg value="-r=3"/>
<arg value="work/reference/coreEnvironment"/>
<arg value="work/reference/coreExtensions"/>
<arg value="work/reference/modules"/>
</java>
<delete dir="${build.work}/reference" />
</target>
<!-- =================================================================== --> <!-- =================================================================== -->
<!-- Get the documentation (currently can fail due to request time-out --> <!-- Get the documentation (currently can fail due to request time-out -->
<!-- or missing support for proxies) --> <!-- or missing support for proxies) -->
@ -244,9 +185,6 @@
<!-- checkout the demo apps (and zip manage-app) --> <!-- checkout the demo apps (and zip manage-app) -->
<antcall target="package-apps" /> <antcall target="package-apps" />
<!-- generate the framework and modules documentation -->
<antcall target="jsdocs" />
<!-- create the main part of helma --> <!-- create the main part of helma -->
<antcall target="package-raw"> <antcall target="package-raw">
<param name="distribution" value="main" /> <param name="distribution" value="main" />
@ -267,7 +205,6 @@
</antcall> </antcall>
<!-- make the src distributions --> <!-- make the src distributions -->
<antcall target="javadocs"/>
<antcall target="package-src-zip"> <antcall target="package-src-zip">
<param name="filename" value="${package.name}"/> <param name="filename" value="${package.name}"/>
</antcall> </antcall>
@ -299,11 +236,6 @@
<!-- copy README.txt --> <!-- copy README.txt -->
<copy file="${home.dir}/README.txt" todir="${build.work}/"/> <copy file="${home.dir}/README.txt" todir="${build.work}/"/>
<!-- copy the whole docs-directory -->
<copy todir="${build.work}/docs">
<fileset dir="${build.docs}"/>
</copy>
<!-- copy all libraries except helma-YYYYMMDD.jar --> <!-- copy all libraries except helma-YYYYMMDD.jar -->
<copy todir="${build.work}/lib"> <copy todir="${build.work}/lib">
<fileset dir="${home.dir}/lib"> <fileset dir="${home.dir}/lib">
@ -339,23 +271,17 @@
<!-- =================================================================== --> <!-- =================================================================== -->
<!-- Checkout demo apps, put them in work directory and zip manage app --> <!-- zip manage app -->
<!-- =================================================================== --> <!-- =================================================================== -->
<target name="package-apps" depends="init"> <target name="package-apps" depends="init">
<mkdir dir="${build.work}/apps" /> <mkdir dir="${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>
<mkdir dir="${build.work}/apps/manage"/> <mkdir dir="${build.work}/apps/manage"/>
<zip zipfile="${build.work}/apps/manage/manage.zip" basedir="${build.externals}/manage/" <zip zipfile="${build.work}/apps/manage/manage.zip" basedir="${home.dir}/apps/manage/"
includes="**" excludes="**/properties,readme/**" /> includes="**" excludes="**/properties,readme/**" />
<copy todir="${build.work}/apps/manage"> <copy todir="${build.work}/apps/manage">
<fileset dir="${build.externals}/manage" includes="app.properties,class.properties,readme.txt"/> <fileset dir="${home.dir}/apps/manage" includes="app.properties,class.properties,readme.txt"/>
</copy> </copy>
<!-- delete dir="${build.work}/manage" /--> <!-- delete dir="${build.work}/manage" /-->
</target> </target>
@ -369,13 +295,8 @@
<!-- add a copy of the modules --> <!-- add a copy of the modules -->
<mkdir dir="${build.work}/modules"/> <mkdir dir="${build.work}/modules"/>
<copy todir="${build.work}/modules"> <copy todir="${build.work}/modules">
<fileset dir="${build.externals}/modules"/> <fileset dir="${home.dir}/modules"/>
</copy> </copy>
<mkdir dir="${build.work}/modules"/>
<zip zipfile="${build.work}/modules/helmaTools.zip" basedir="${build.externals}/helmaTools/"
includes="**" excludes="**/*.txt, **/*.html, **/*.bat, **/*.sh" />
<!--delete dir="${build.work}/helmaTools" /-->
</target> </target>
@ -395,7 +316,6 @@
<exclude name="start.sh"/> <exclude name="start.sh"/>
<exclude name="lib/jimi.jar"/> <exclude name="lib/jimi.jar"/>
<exclude name="lib/apache-dom.jar"/> <exclude name="lib/apache-dom.jar"/>
<exclude name="docs/api/**"/>
</tarfileset> </tarfileset>
</tar> </tar>
<gzip zipfile="${build.dist}/${filename}.tar.gz" src="${build.dist}/${filename}.tar"/> <gzip zipfile="${build.dist}/${filename}.tar.gz" src="${build.dist}/${filename}.tar"/>
@ -416,7 +336,6 @@
<exclude name="start.sh"/> <exclude name="start.sh"/>
<exclude name="lib/jimi.jar"/> <exclude name="lib/jimi.jar"/>
<exclude name="lib/apache-dom.jar"/> <exclude name="lib/apache-dom.jar"/>
<exclude name="docs/api/**"/>
</zipfileset> </zipfileset>
</zip> </zip>
</target> </target>
@ -433,12 +352,10 @@
<include name="src/**"/> <include name="src/**"/>
<include name="build/**"/> <include name="build/**"/>
<include name="build.xml"/> <include name="build.xml"/>
<include name="docs/**"/>
<include name="licenses/**"/> <include name="licenses/**"/>
<include name="license.txt"/> <include name="license.txt"/>
<include name="lib/jimi.jar"/> <include name="lib/jimi.jar"/>
<include name="lib/apache-dom.jar"/> <include name="lib/apache-dom.jar"/>
<exclude name="docs/modules/**"/>
</tarfileset> </tarfileset>
</tar> </tar>
<gzip zipfile="${build.dist}/${filename}-src.tar.gz" src="${build.dist}/${filename}-src.tar"/> <gzip zipfile="${build.dist}/${filename}-src.tar.gz" src="${build.dist}/${filename}-src.tar"/>
@ -457,12 +374,10 @@
<include name="src/**"/> <include name="src/**"/>
<include name="build/**"/> <include name="build/**"/>
<include name="build.xml"/> <include name="build.xml"/>
<include name="docs/**"/>
<include name="licenses/**"/> <include name="licenses/**"/>
<include name="license.txt"/> <include name="license.txt"/>
<include name="lib/jimi.jar"/> <include name="lib/jimi.jar"/>
<include name="lib/apache-dom.jar"/> <include name="lib/apache-dom.jar"/>
<exclude name="docs/modules/**"/>
</zipfileset> </zipfileset>
</zip> </zip>
</target> </target>
@ -473,7 +388,6 @@
<target name="clean" depends="init"> <target name="clean" depends="init">
<delete dir="${build.work}" /> <delete dir="${build.work}" />
<delete dir="${build.classes}" /> <delete dir="${build.classes}" />
<delete dir="${build.docs}"/>
<delete dir="${build.dist}"/> <delete dir="${build.dist}"/>
<delete file="${home.dir}/launcher.jar" quiet="true"/> <delete file="${home.dir}/launcher.jar" quiet="true"/>
<delete> <delete>

11
build/main/apps.properties
View file

@ -10,14 +10,3 @@
manage manage
# More complex example of an application with custom configuration:
welcome
welcome.mountpoint = /
welcome.repository.0 = apps/welcome/code/
welcome.repository.1 = modules/helmaTools.zip
welcome.static = apps/welcome/static
welcome.staticMountpoint = /static
welcome.staticHome = index.html,default.html
welcome.staticIndex = true
welcome.uploadLimit = 2048