Skip to content

Commit

Permalink
[ignore] Adding support for /home/ljo/eXist/local.build.properties fo…
Browse files Browse the repository at this point in the history
…r overriding properties from /home/ljo/eXist/build.properties. Adding property use.autodeploy.feature to govern download of xar files to /home/ljo/eXist/autodeploy/. Use in local.build.properties or from commandline eg JAVA_OPTS=-Duse.autodeploy.feature=false ./build.sh rebuild

svn path=/trunk/eXist/; revision=17184
  • Loading branch information
ljo committed Sep 26, 2012
1 parent d46d8e3 commit b0ea78e
Show file tree
Hide file tree
Showing 4 changed files with 57 additions and 57 deletions.
1 change: 1 addition & 0 deletions build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ build.compiler.target=1.6

autodeploy=dashboard-0.1.xar,eXide-1.0.xar
autodeploy.repo=http://demo.exist-db.org/exist/apps/public-repo/public/
use.autodeploy.feature=true

# output dir for junit reports
junit.reports = test
Expand Down
2 changes: 1 addition & 1 deletion build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<description>eXist Open Source Native XML Database</description>

<!-- import default properties from file -->

<property file="local.build.properties"/>
<property file="build.properties"/>

<!-- set proxy if needed, use properties in build.properties -->
Expand Down
2 changes: 1 addition & 1 deletion build/scripts/build-impl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -695,7 +695,7 @@
<ant antfile="build.xml" dir="samples"/>
</target>

<target name="extensions-xar" depends="jar">
<target name="extensions-xar" depends="jar" if="${use.autodeploy.feature}" >
<ant antfile="build/scripts/setup.xml" dir="." inheritall="false"/>
</target>

Expand Down
109 changes: 54 additions & 55 deletions build/scripts/setup.xml
Original file line number Diff line number Diff line change
@@ -1,55 +1,54 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- ======================================================================= -->
<!-- eXist build file : Setup default xar packages -->
<!-- ======================================================================= -->

<!-- $Id$ -->

<project basedir="../.." name="Setup" default="setup">

<description>Package setup tasks</description>

<!-- Additional task defs -->
<taskdef resource="net/sf/antcontrib/antcontrib.properties">
<classpath>
<pathelement location="tools/ant/lib/ant-contrib-1.0b3.jar"/>
</classpath>
</taskdef>

<property file="build.properties"/>

<property name="public-repo" value="http://demo.exist-db.org/exist/apps/public-repo/public/"/>
<property name="autostart-dir" value="autodeploy"/>

<target name="prepare">
<mkdir dir="${autostart-dir}"/>
<!-- Automatically download standard xar packages from public repository
if autostart directory is empty.
-->
<path id="autostart-files">
<fileset dir="${autostart-dir}">
<include name="*.xar"/>
</fileset>
</path>

<property name="autostart-files" refid="autostart-files"/>

<condition property="autostart-empty">
<equals arg1="" arg2="${autostart-files}"/>
</condition>
</target>

<!--
Download jar files the author website. This is newest version of the library,
if the URL is updated in time. The download size is significantly larger.
-->
<target name="setup" depends="prepare" description="Download standard xar packages." if="autostart-empty">
<foreach list="${autodeploy}" target="download-xar" param="xar"></foreach>
</target>

<target name="download-xar">
<taskdef name="fetch" classname="nl.ow.dilemma.ant.fetch.FetchTask"/>
<fetch dest="${autostart-dir}" url="${public-repo}/${xar}"/>
</target>
</project>
<?xml version="1.0" encoding="UTF-8"?>

<!-- ======================================================================= -->
<!-- eXist build file : Setup default xar packages -->
<!-- ======================================================================= -->

<!-- $Id$ -->

<project basedir="../.." name="Setup" default="setup">

<description>Package setup tasks</description>

<!-- Additional task defs -->
<taskdef resource="net/sf/antcontrib/antcontrib.properties">
<classpath>
<pathelement location="tools/ant/lib/ant-contrib-1.0b3.jar"/>
</classpath>
</taskdef>

<property file="build.properties"/>

<property name="public-repo" value="http://demo.exist-db.org/exist/apps/public-repo/public/"/>
<property name="autostart-dir" value="autodeploy"/>

<target name="prepare">
<mkdir dir="${autostart-dir}"/>
<!-- Automatically download standard xar packages from public repository
if autostart directory is empty.
-->
<path id="autostart-files">
<fileset dir="${autostart-dir}">
<include name="*.xar"/>
</fileset>
</path>

<property name="autostart-files" refid="autostart-files"/>

<condition property="autostart-empty">
<equals arg1="" arg2="${autostart-files}"/>
</condition>
</target>

<!--
Download xar files from the package website.
-->
<target name="setup" depends="prepare" description="Download standard xar packages." if="autostart-empty">
<foreach list="${autodeploy}" target="download-xar" param="xar"></foreach>
</target>

<target name="download-xar">
<taskdef name="fetch" classname="nl.ow.dilemma.ant.fetch.FetchTask"/>
<fetch dest="${autostart-dir}" url="${public-repo}/${xar}"/>
</target>
</project>

0 comments on commit b0ea78e

Please sign in to comment.