Skip to content

Commit

Permalink
Updated build scripts to retrieve dashboard from public repo. Dashboa…
Browse files Browse the repository at this point in the history
…rd will be required as central admin facility when we remove other webapp contents from trunk.

svn path=/trunk/eXist/; revision=17160
  • Loading branch information
wolfgangmm committed Sep 19, 2012
1 parent 92528dc commit 6376e53
Show file tree
Hide file tree
Showing 3 changed files with 61 additions and 6 deletions.
7 changes: 5 additions & 2 deletions build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ build.compiler=modern
build.compiler.source=1.6
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/

# output dir for junit reports
junit.reports = test
junit.output = true
Expand Down Expand Up @@ -56,7 +59,7 @@ antlr.traceTreeWalker = false
catalina.home = ./thirdparty/tomcat5

# IZPack is required to create the installer package
izpack.dir = /home/ljo/bin/izpack-4.3.4
izpack.dir = /Applications/IzPack/

# Launch4J is required to create the windows installer
launch4j.dir = /home/ljo/bin/launch4j
launch4j.dir = /Applications/launch4j/
6 changes: 2 additions & 4 deletions build/scripts/build-impl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<import file="./subversion.xml"/>
<import file="./junit.xml"/>
<import file="./antlr3.xml"/>

<!-- setup conditional properties -->
<available file="${xmldb.src}" type="dir" property="has.xmldb.src"/>
<available file="key.store" property="key.store.present"/>
Expand Down Expand Up @@ -583,8 +583,6 @@
<delete dir="${junit.reports}/jdepend"/>
<delete dir="${junit.reports}/classes"/>

<delete dir="${src.webapp}/WEB-INF/expathrepo"/>

<delete dir="samples/classes"/>
<delete failonerror="no" file="examples.jar"/>
<delete failonerror="no" file="exist.jar"/>
Expand Down Expand Up @@ -698,7 +696,7 @@
</target>

<target name="extensions-xar" depends="jar">
<ant antfile="build.xml" dir="webapp/repo" inheritall="false"/>
<ant antfile="build/scripts/setup.xml" dir="." inheritall="false"/>
</target>

<target name="cleandocs">
Expand Down
54 changes: 54 additions & 0 deletions build/scripts/setup.xml
Original file line number Diff line number Diff line change
@@ -0,0 +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>

<taskdef name="fetch" classname="nl.ow.dilemma.ant.fetch.FetchTask"/>

<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"/>

<!-- 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>

<!--
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" description="Download standard xar packages." if="autostart-empty">

<foreach list="${autodeploy}" target="download-xar" param="xar"></foreach>
</target>

<target name="download-xar">
<fetch dest="${autostart-dir}" url="${public-repo}/${xar}"/>
</target>
</project>

0 comments on commit 6376e53

Please sign in to comment.