litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-2811 getting closer - working except for themes.

Browse source
This commit is contained in:
j2blake 2011-09-09 19:11:51 +00:00
parent 11239bf040
commit a29d85db04
6 changed files with 77 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

9
webapp/build.xml
View file

@ -13,7 +13,7 @@
<!-- - - - - - - - - - - - - - - - - -
properties
- - - - - - - - - - - - - - - - - -->
<property name="corebase.dir" location="." />
<dirname property="corebase.dir" file="${ant.file.vitroCore}" />
<!--
If calling from a Product build script, these properties already point to
@ -232,7 +232,8 @@ deploy - Deploy the application directly into the Tomcat webapps directory.
depends="test"
unless="skipinfo"
description="--> Store revision info in build">
<property name="revisionInfo.product.dir" location="${ant.file.vitroCore}/.." />
<property name="revisionInfo.product.dir" location="${corebase.dir}/.." />
<property name="revisionInfo.build.file" location="${war-resources.dir}/revisionInfo.txt" />
<delete file="${revisionInfo.build.file}" />
@ -243,7 +244,7 @@ deploy - Deploy the application directly into the Tomcat webapps directory.
<echo file="${revisionInfo.build.file}">${revisionInfo.timestamp}
</echo>
<javac srcdir="${appbase.dir}/../utilities/buildutils/revisioninfo"
<javac srcdir="${corebase.dir}/../utilities/buildutils/revisioninfo"
destdir="${test-classes.dir}"
debug="true"
deprecation="${javac.deprecation}"
@ -267,7 +268,7 @@ deploy - Deploy the application directly into the Tomcat webapps directory.
target: prepareSolr
- - - - - - - - - - - - - - - - - -->
<target name="prepareSolr" depends="properties">
<property name="solr.distrib.dir" location="${appbase.dir}/../solr" />
<property name="solr.distrib.dir" location="${corebase.dir}/../solr" />
<property name="solr.example.dir" location="${solr.distrib.dir}/exampleSolr" />
<property name="solr.context.config.example"
location="${solr.distrib.dir}/exampleSolrContext.xml" />

76
webapp/product-build.xml
View file

@ -42,14 +42,18 @@
<typedef name="dirDifference"
classname="edu.cornell.mannlib.vitro.utilities.anttasks.DirDifferenceResourceCollection"
classpathref="anttasks.classpath" />
<typedef name="optionalDir"
classname="edu.cornell.mannlib.vitro.utilities.anttasks.OptionalDirResourceCollection"
classpathref="anttasks.classpath" />
<!-- - - - - - - - - - - - - - - - - -
target: product-prepare
- - - - - - - - - - - - - - - - - -->
<target name="product-prepare" depends="product-prepare-lib">
<target name="product-prepare">
<mkdir dir="${appbase.dir}" />
<mkdir dir="${appbase.dir}/web" />
<mkdir dir="${appbase.dir}/src" />
<mkdir dir="${appbase.dir}/test" />
<copy todir="${appbase.dir}/web">
<dirDifference primary="${inner.basedir}/web" blocking="${product.modifications.dir}" />
@ -68,22 +72,38 @@
blockingOptional="true" />
</copy>
<copy todir="${appbase.dir}/src">
<fileset dir="./src" />
<optionalDir primary="./src" />
</copy>
<copy todir="${appbase.dir}/lib">
<dirDifference primary="${inner.basedir}/lib"
blocking="./lib"
blockingOptional="true" />
</copy>
<copy todir="${appbase.dir}/lib">
<optionalDir primary="./lib" />
</copy>
<copy todir="${appbase.dir}/test">
<dirDifference primary="${inner.basedir}/test"
blocking="./test"
blockingOptional="true" />
</copy>
<copy todir="${appbase.dir}/test">
<optionalDir primary="./test" />
</copy>
<copy todir="${appbase.dir}/test">
<dirDifference primary="${inner.basedir}/test"
blocking="./test"
blockingOptional="true" />
</copy>
<copy todir="${appbase.dir}/test">
<optionalDir primary="./test" />
</copy>
<copy tofile="${appbase.dir}/context.xml" file="${inner.basedir}/context.xml" />
</target>
<!-- - - - - - - - - - - - - - - - - -
target: product-prepare-lib
- - - - - - - - - - - - - - - - - -->
<target name="product-prepare-lib">
<mkdir dir="${appbase.dir}/lib" />
<available property="product.lib.exist" file="./lib" />
<mergedirs suffix="lib" flag="${product.lib.exist}" />
<copydir suffix="lib" flag="${product.lib.exist}" />
</target>
<!-- =================================
target: describe
================================= -->
@ -162,36 +182,6 @@
<innercall target="war" />
</target>
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
MACROS
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<!--
Call a target in the inner script.
-->
<macrodef name="mergedirs">
<attribute name="suffix" />
<attribute name="flag" />
<sequential>
<copy todir="${appbase.dir}/web">
<dirDifference primary="${inner.basedir}/web" blocking="${product.modifications.dir}" />
</copy>
<copy todir="${appbase.dir}/web">
<fileset dir="${product.modifications.dir}" />
</copy>
<ant dir="${inner.basedir}" inheritall="false">
<!-- pass the properties that are needed. -->
<propertyset>
<propertyref name="build.dir" />
<propertyref name="skip.core.themes" />
<propertyref name="deploy.properties.file" />
</propertyset>
<additionalProperties />
<target name="@{target}" />
</ant>
</sequential>
</macrodef>
<!--
===========================================================================
===========================================================================