diff --git a/build.xml b/build.xml
index 2d00a85eb3821b1947c768f7b009e475890b7ec9..199fc42dc670884f384c380b7b2379f66650b912 100644
--- a/build.xml
+++ b/build.xml
@@ -23,11 +23,11 @@
<phingcall target="startup" />
<trycatch property="exceptionmsg">
<try>
- <phingcall target="ci-tasks" />
+ <phingcall target="ci-tasks" />
</try>
<catch>
- <phingcall target="shutdown" />
- <fail>Unexpected error during continuous integration tasks -- ${exceptionmsg}</fail>
+ <phingcall target="shutdown" />
+ <fail>Unexpected error during continuous integration tasks -- ${exceptionmsg}</fail>
</catch>
</trycatch>
<phingcall target="shutdown" />
@@ -44,21 +44,26 @@
<!-- PHP CodeSniffer -->
<exec command="phpcs --standard=PEAR --extensions=php --report=checkstyle ${srcdir}/module/VuFind/src > ${builddir}/reports/checkstyle.xml" escape="false" />
- <!-- PHPUnit -->
- <exec dir="${srcdir}/tests" command="VUFIND_LOCAL_DIR=${srcdir}/local phpunit -dzend.enable_gc=0 --log-junit ${builddir}/reports/phpunit.xml --coverage-clover ${builddir}/reports/coverage/clover.xml --coverage-html ${builddir}/reports/coverage/" passthru="true" checkreturn="true" />
+ <!-- Run PHPUnit -->
+ <phingcall target="phpunit"/>
<!-- PHP API Documentation -->
<phpdoc2 title="VuFind API Documentation"
destdir="${builddir}/apidocs">
<fileset dir=".">
- <include name="module/VuFind/src/**/*.php" />
- <!-- This file breaks phpdoc2; exclude until we can figure out why: -->
- <exclude name="module/VuFind/src/VuFind/Log/Writer/Stream.php" />
+ <include name="module/VuFind/src/**/*.php" />
+ <!-- This file breaks phpdoc2; exclude until we can figure out why: -->
+ <exclude name="module/VuFind/src/VuFind/Log/Writer/Stream.php" />
</fileset>
</phpdoc2>
</target>
+ <!-- PHPUnit -->
+ <target name="phpunit" description="Run unit tests">
+ <exec dir="${srcdir}/tests" command="VUFIND_LOCAL_DIR=${srcdir}/local phpunit -dzend.enable_gc=0 --log-junit ${builddir}/reports/phpunit.xml --coverage-clover ${builddir}/reports/coverage/clover.xml --coverage-html ${builddir}/reports/coverage/" passthru="true" checkreturn="true" />
+ </target>
+
<!-- Install and Activate VuFind -->
<target name="startup" description="install and activate demo">
<!-- set up appropriate read/write permissions for Apache -->
@@ -73,28 +78,28 @@
<if>
<equals arg1="${dbtype}" arg2="pgsql" />
<then>
- <!-- build database -->
- <exec command="sudo su -c "psql -c \"DROP DATABASE ${vufinddb};\"" ${pgsqlrootuser}" />
- <exec command="sudo su -c "psql -c \"DROP USER ${vufinddbuser};\"" ${pgsqlrootuser}" />
- <exec command="sudo su -c "psql -c \"CREATE DATABASE ${vufinddb};\"" ${pgsqlrootuser}" checkreturn="true" />
- <exec command="sudo su -c "psql -c \"CREATE USER ${vufinddbuser} PASSWORD '${vufinddbpass}';\"" ${pgsqlrootuser}" checkreturn="true" />
- <exec command="sudo su -c "psql -c \"GRANT ALL ON DATABASE ${vufinddb} TO ${vufinddbuser};\"" ${pgsqlrootuser}" checkreturn="true" />
- <!--<exec command="sudo su -c "psql -c \"select 'grant SELECT,INSERT,UPDATE,DELETE on '||schemaname||'.'||tablename||' to ${vufinddbuser};' from pg_tables where schemaname in ('${vufinddb}') order by schemaname, tablename;\"" ${pgsqlrootuser}" checkreturn="true" />-->
- <exec command="PGPASSWORD=${vufinddbpass} psql -U ${vufinddbuser} -f ${srcdir}/module/VuFind/sql/postgres.sql ${vufinddb}" checkreturn="true" />
-
- <!-- configure VuFind -->
- <exec command="sed -e "s!mysql://root@localhost/vufind!pgsql://${vufinddbuser}:${vufinddbpass}@${pgsqlhost}/${vufinddb}!" ${srcdir}/config/vufind/config.ini > ${srcdir}/local/config/vufind/config.ini" />
+ <!-- build database -->
+ <exec command="sudo su -c "psql -c \"DROP DATABASE ${vufinddb};\"" ${pgsqlrootuser}" />
+ <exec command="sudo su -c "psql -c \"DROP USER ${vufinddbuser};\"" ${pgsqlrootuser}" />
+ <exec command="sudo su -c "psql -c \"CREATE DATABASE ${vufinddb};\"" ${pgsqlrootuser}" checkreturn="true" />
+ <exec command="sudo su -c "psql -c \"CREATE USER ${vufinddbuser} PASSWORD '${vufinddbpass}';\"" ${pgsqlrootuser}" checkreturn="true" />
+ <exec command="sudo su -c "psql -c \"GRANT ALL ON DATABASE ${vufinddb} TO ${vufinddbuser};\"" ${pgsqlrootuser}" checkreturn="true" />
+ <!--<exec command="sudo su -c "psql -c \"select 'grant SELECT,INSERT,UPDATE,DELETE on '||schemaname||'.'||tablename||' to ${vufinddbuser};' from pg_tables where schemaname in ('${vufinddb}') order by schemaname, tablename;\"" ${pgsqlrootuser}" checkreturn="true" />-->
+ <exec command="PGPASSWORD=${vufinddbpass} psql -U ${vufinddbuser} -f ${srcdir}/module/VuFind/sql/postgres.sql ${vufinddb}" checkreturn="true" />
+
+ <!-- configure VuFind -->
+ <exec command="sed -e "s!mysql://root@localhost/vufind!pgsql://${vufinddbuser}:${vufinddbpass}@${pgsqlhost}/${vufinddb}!" ${srcdir}/config/vufind/config.ini > ${srcdir}/local/config/vufind/config.ini" />
</then>
<else>
- <!-- build database -->
- <exec command="mysqladmin -f -h ${mysqlhost} -u ${mysqlrootuser} -p${mysqlrootpass} drop ${vufinddb}" />
- <exec command="mysqladmin -h ${mysqlhost} -u ${mysqlrootuser} -p${mysqlrootpass} create ${vufinddb}" checkreturn="true" />
- <exec command="mysql -h ${mysqlhost} -u ${mysqlrootuser} -p${mysqlrootpass} -e "GRANT SELECT,INSERT,UPDATE,DELETE ON ${vufinddb}.* TO '${vufinddbuser}'@'${mysqlhost}' IDENTIFIED BY '${vufinddbpass}' WITH GRANT OPTION"" checkreturn="true" />
- <exec command="mysql -h ${mysqlhost} -u ${mysqlrootuser} -p${mysqlrootpass} -e "FLUSH PRIVILEGES"" checkreturn="true" />
- <exec command="mysql -h ${mysqlhost} -u ${mysqlrootuser} -p${mysqlrootpass} -D ${vufinddb} < ${srcdir}/module/VuFind/sql/mysql.sql" checkreturn="true" />
-
- <!-- configure VuFind -->
- <exec command="sed -e "s!mysql://root@localhost/vufind!mysql://${vufinddbuser}:${vufinddbpass}@${mysqlhost}/${vufinddb}!" ${srcdir}/config/vufind/config.ini > ${srcdir}/local/config/vufind/config.ini" />
+ <!-- build database -->
+ <exec command="mysqladmin -f -h ${mysqlhost} -u ${mysqlrootuser} -p${mysqlrootpass} drop ${vufinddb}" />
+ <exec command="mysqladmin -h ${mysqlhost} -u ${mysqlrootuser} -p${mysqlrootpass} create ${vufinddb}" checkreturn="true" />
+ <exec command="mysql -h ${mysqlhost} -u ${mysqlrootuser} -p${mysqlrootpass} -e "GRANT SELECT,INSERT,UPDATE,DELETE ON ${vufinddb}.* TO '${vufinddbuser}'@'${mysqlhost}' IDENTIFIED BY '${vufinddbpass}' WITH GRANT OPTION"" checkreturn="true" />
+ <exec command="mysql -h ${mysqlhost} -u ${mysqlrootuser} -p${mysqlrootpass} -e "FLUSH PRIVILEGES"" checkreturn="true" />
+ <exec command="mysql -h ${mysqlhost} -u ${mysqlrootuser} -p${mysqlrootpass} -D ${vufinddb} < ${srcdir}/module/VuFind/sql/mysql.sql" checkreturn="true" />
+
+ <!-- configure VuFind -->
+ <exec command="sed -e "s!mysql://root@localhost/vufind!mysql://${vufinddbuser}:${vufinddbpass}@${mysqlhost}/${vufinddb}!" ${srcdir}/config/vufind/config.ini > ${srcdir}/local/config/vufind/config.ini" />
</else>
</if>
@@ -118,11 +123,11 @@
<if>
<equals arg1="${dbtype}" arg2="pgsql" />
<then>
- <exec command="sudo su -c "psql -c \"DROP DATABASE ${vufinddb};\"" ${pgsqlrootuser}" checkreturn="true" />
- <exec command="sudo su -c "psql -c \"DROP USER ${vufinddbuser};\"" ${pgsqlrootuser}" checkreturn="true" />
+ <exec command="sudo su -c "psql -c \"DROP DATABASE ${vufinddb};\"" ${pgsqlrootuser}" checkreturn="true" />
+ <exec command="sudo su -c "psql -c \"DROP USER ${vufinddbuser};\"" ${pgsqlrootuser}" checkreturn="true" />
</then>
<else>
- <exec command="mysqladmin -f -h ${mysqlhost} -u ${mysqlrootuser} -p${mysqlrootpass} drop ${vufinddb}" />
+ <exec command="mysqladmin -f -h ${mysqlhost} -u ${mysqlrootuser} -p${mysqlrootpass} drop ${vufinddb}" />
</else>
</if>
@@ -138,7 +143,7 @@
<delete dir="${srcdir}/solr/biblio/spellShingle" includeemptydirs="true" failonerror="true" />
<delete failonerror="false">
<fileset dir="${srcdir}/solr/jetty/logs">
- <include name="*.log" />
+ <include name="*.log" />
</fileset>
</delete>
<delete dir="${srcdir}/local" includeemptydirs="true" failonerror="true" />
@@ -163,20 +168,20 @@
<if>
<istrue value="${filename}"/> <!-- To ignore the last token, as find command output list has ',' after last filename -->
<then>
- <exec command="basename ${filename}" outputProperty="BASENAME" />
+ <exec command="basename ${filename}" outputProperty="BASENAME" />
- <!-- create custom import configurations to load the MARC filename into the building facet to help
- test cases to limit searches to within specific collections of test records. -->
- <exec command="echo building=\"${BASENAME}\" > ${srcdir}/import/marc-${BASENAME}.properties" />
- <exec command="sed -e "s!marc_local.properties!marc-${BASENAME}.properties!" ${srcdir}/local/import/import.properties > ${srcdir}/local/import/import-${BASENAME}.properties" />
+ <!-- create custom import configurations to load the MARC filename into the building facet to help
+ test cases to limit searches to within specific collections of test records. -->
+ <exec command="echo building=\"${BASENAME}\" > ${srcdir}/import/marc-${BASENAME}.properties" />
+ <exec command="sed -e "s!marc_local.properties!marc-${BASENAME}.properties!" ${srcdir}/local/import/import.properties > ${srcdir}/local/import/import-${BASENAME}.properties" />
- <!-- perform the import -->
- <exec command="VUFIND_HOME=${srcdir} VUFIND_LOCAL_DIR=${srcdir}/local ${srcdir}/import-marc.sh -p ${srcdir}/local/import/import-${BASENAME}.properties ${filename}" outputProperty="LASTOUTPUT" />
- <echo message="${LASTOUTPUT}" />
+ <!-- perform the import -->
+ <exec command="VUFIND_HOME=${srcdir} VUFIND_LOCAL_DIR=${srcdir}/local ${srcdir}/import-marc.sh -p ${srcdir}/local/import/import-${BASENAME}.properties ${filename}" outputProperty="LASTOUTPUT" />
+ <echo message="${LASTOUTPUT}" />
- <!-- clean up temp files -->
- <delete file="${srcdir}/import/marc-${BASENAME}.properties" />
- <delete file="${srcdir}/import/import-${BASENAME}.properties" />
+ <!-- clean up temp files -->
+ <delete file="${srcdir}/import/marc-${BASENAME}.properties" />
+ <delete file="${srcdir}/import/import-${BASENAME}.properties" />
</then>
</if>
</target>