From ccbe99745900506b5817c8945e3f9e2b14fcdf57 Mon Sep 17 00:00:00 2001 From: mrodzis <weidling@sub.uni-goettingen.de> Date: Mon, 7 Jan 2019 09:23:13 +0100 Subject: [PATCH] Enable fast test build --- build.properties | 8 +++++++ build.xml | 48 ++++++++++++++++++++++++++++++++++------- expath-pkg.xml | 15 ++++++++++--- expath-pkg.xml.tmpl | 14 ++++++++++++ master.build.properties | 2 ++ 5 files changed, 76 insertions(+), 11 deletions(-) create mode 100644 build.properties create mode 100644 expath-pkg.xml.tmpl create mode 100644 master.build.properties diff --git a/build.properties b/build.properties new file mode 100644 index 0000000..66bc3ec --- /dev/null +++ b/build.properties @@ -0,0 +1,8 @@ +project.name=http://bdn-edition.de/intermediate_format +project.version=1.0.0 +project.title=BdN Intermediate Format +project.abbrev=interformat-develop +project.processorversion=4.5.0 + +destfile=${build.dir}/${project.abbrev}-${project.version}.xar +test.dir=test diff --git a/build.xml b/build.xml index 4f41ed9..4dbe3cd 100644 --- a/build.xml +++ b/build.xml @@ -1,11 +1,43 @@ <?xml version="1.0" encoding="UTF-8"?> -<project default="xar" name="interformat"> - <xmlproperty file="expath-pkg.xml"/> - <property name="project.version" value="${package(version)}"/> - <property name="project.app" value="interformat"/> - <property name="build.dir" value="build"/> - <target name="xar"> +<project default="xar" name="interformat" xmlns:xdb="http://exist-db.org/ant"> + + <property environment="env"/> + <property name="build.dir" value="build"/> + <property file="local.build.properties"/> + <property file="build.properties"/> + <xmlproperty file="expath-pkg.xml.tmpl"/> + + <target name="xar" depends="cleanup"> + <copy file="expath-pkg.xml.tmpl" tofile="expath-pkg.xml" filtering="true" overwrite="true"> + <filterset> + <filter token="project.version" value="${project.version}"/> + <filter token="project.title" value="${project.title}"/> + <filter token="project.abbrev" value="${project.abbrev}"/> + <filter token="project.name" value="${project.name}"/> + <filter token="project.processorversion" value="${project.processorversion}"/> + </filterset> + </copy> <mkdir dir="${build.dir}"/> - <zip basedir="." destfile="${build.dir}/${project.app}-${project.version}.xar" excludes="${build.dir}/*"/> + <zip basedir="." destfile="${destfile}" + excludes="${build.dir}/*,${test.dir}/*"/> </target> -</project> \ No newline at end of file + + <target name="cleanup"> + <delete dir="${test.dir}"/> + </target> + + <target name="test" depends="xar"> + <get src="https://bintray.com/existdb/releases/download_file?file_path=eXist-db-${project.processorversion}.tar.bz2" dest="${build.dir}/eXist-db-${project.processorversion}.tar.bz2" skipexisting="true" /> + <untar src="${build.dir}/eXist-db-${project.processorversion}.tar.bz2" dest="${test.dir}" compression="bzip2" /> + + <get src="https://ci.de.dariah.eu/exist-repo/find.zip?abbrev=sade_assets&processor=${project.processorversion}" dest="${test.dir}/eXist-db-${project.processorversion}/autodeploy/sade_assets-latest.xar" ignoreerrors="true"/> + <get src="https://ci.de.dariah.eu/exist-repo/find.zip?abbrev=cv&processor=${project.processorversion}" dest="${test.dir}/eXist-db-${project.processorversion}/autodeploy/codeview-latest.xar" ignoreerrors="true"/> + <get src="https://ci.de.dariah.eu/exist-repo/find.zip?abbrev=fontane-lucene-exist-module&processor=${project.processorversion}" dest="${test.dir}/eXist-db-${project.processorversion}/autodeploy/fontane-lucene-latest.xar" ignoreerrors="true"/> + + <get src="http://exist-db.org/exist/apps/public-repo/find.zip?abbrev=markdown&processor=${project.processorversion}" dest="${test.dir}/eXist-db-${project.processorversion}/autodeploy/markdown-latest.xar" ignoreerrors="true"/> + <get src="http://exist-db.org/exist/apps/public-repo/find.zip?abbrev=functx&processor=${project.processorversion}" dest="${test.dir}/eXist-db-${project.processorversion}/autodeploy/functx-latest.xar" ignoreerrors="true"/> + + <copy file="${destfile}" todir="${test.dir}/eXist-db-${project.processorversion}/autodeploy" /> + </target> + +</project> diff --git a/expath-pkg.xml b/expath-pkg.xml index 457f8c4..16f8c24 100644 --- a/expath-pkg.xml +++ b/expath-pkg.xml @@ -1,5 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<package xmlns="http://expath.org/ns/pkg" name="http://bdn-edition.de/intermediate_format" abbrev="interformat" version="0.2.5" spec="1.0"> - <title>BdN - Intermediate Format</title> +<package xmlns="http://expath.org/ns/pkg" + name="http://bdn-edition.de/intermediate_format" + abbrev="interformat-develop" + version="1.0.0" + spec="1.0"> + <title>BdN Intermediate Format</title> + <dependency processor="http://exist-db.org" semver-min="4.5.0"/> <dependency package="http://exist-db.org/apps/shared"/> -</package> \ No newline at end of file + <xquery> + <namespace>http://bdn-edition.de/intermediate_format</namespace> + <file>ifweb.xqm</file> + </xquery> +</package> diff --git a/expath-pkg.xml.tmpl b/expath-pkg.xml.tmpl new file mode 100644 index 0000000..d157135 --- /dev/null +++ b/expath-pkg.xml.tmpl @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<package xmlns="http://expath.org/ns/pkg" + name="@project.name@" + abbrev="@project.abbrev@" + version="@project.version@" + spec="1.0"> + <title>@project.title@</title> + <dependency processor="http://exist-db.org" semver-min="@project.processorversion@"/> + <dependency package="http://exist-db.org/apps/shared"/> + <xquery> + <namespace>http://bdn-edition.de/intermediate_format</namespace> + <file>ifweb.xqm</file> + </xquery> +</package> diff --git a/master.build.properties b/master.build.properties new file mode 100644 index 0000000..8d71055 --- /dev/null +++ b/master.build.properties @@ -0,0 +1,2 @@ +project.name=http://bdn-edition.de/intermediate_format +project.abbrev=interformat \ No newline at end of file -- GitLab