build and feature cleanup
This commit is contained in:
mjames-upc
parent
2d37d15171
commit
e97d66b924
3 changed files with 68 additions and 112 deletions
|
|
@ -9,11 +9,6 @@
|
|||
<!-- read the properties -->
|
||||
<property file="${basedir}/edex/common.properties" />
|
||||
<property file="${basedir}/edex/developer.properties" />
|
||||
<condition property="wa.enabled">
|
||||
<not>
|
||||
<equals arg1="${wa.to.deploy}" arg2="" />
|
||||
</not>
|
||||
</condition>
|
||||
|
||||
<dirname property="antfile.dir" file="${ant.file}" />
|
||||
<echo message="ANT FILE DIR:${antfile.dir}" />
|
||||
|
|
@ -23,71 +18,62 @@
|
|||
<echo message="REPO DIR:${repo.dir}"/>
|
||||
<basename property="base.name" file="${base.dir}" />
|
||||
<echo message="BASE NAME:${base.name}" />
|
||||
<if>
|
||||
<equals arg1="${base.name}" arg2="edexOsgi" />
|
||||
<then>
|
||||
<!-- we are in the distributed development environment -->
|
||||
<echo message="BUILDING: in distributed development environment" />
|
||||
<dirname property="awips.baseline.directory" file="${base.dir}" />
|
||||
<dirname property="git.directory" file="${awips.baseline.directory}" />
|
||||
<echo message="GIT.DIRECTORY:${git.directory}" />
|
||||
<var name="repository.directories" value="${awips.baseline.directory}" />
|
||||
<for list="${core.repositories}" param="repo.directory">
|
||||
<sequential>
|
||||
<var name="repository.directories" value="${repository.directories},${git.directory}${file.separator}@{repo.directory}" />
|
||||
</sequential>
|
||||
</for>
|
||||
|
||||
<for list="${optional.repositories}" param="repo.directory">
|
||||
<sequential>
|
||||
<if>
|
||||
<isset property="optional.directories" />
|
||||
<then>
|
||||
<var name="optional.directories" value="${optional.directories},${git.directory}${file.separator}@{repo.directory}" />
|
||||
</then>
|
||||
<else>
|
||||
<var name="optional.directories" value="${git.directory}${file.separator}@{repo.directory}" />
|
||||
</else>
|
||||
</if>
|
||||
</sequential>
|
||||
</for>
|
||||
<!-- we are in the distributed development environment -->
|
||||
<echo message="BUILDING: in distributed development environment" />
|
||||
<dirname property="awips.baseline.directory" file="${base.dir}" />
|
||||
<dirname property="git.directory" file="${awips.baseline.directory}" />
|
||||
<echo message="GIT.DIRECTORY:${git.directory}" />
|
||||
<var name="repository.directories" value="${awips.baseline.directory}" />
|
||||
<for list="${core.repositories}" param="repo.directory">
|
||||
<sequential>
|
||||
<var name="repository.directories" value="${repository.directories},${git.directory}${file.separator}@{repo.directory}" />
|
||||
</sequential>
|
||||
</for>
|
||||
|
||||
<property name="tab" value=" " />
|
||||
<echo level="info" message=" " />
|
||||
<echo level="info" message="Deploy checks the following directories for source:" />
|
||||
<echo level="info" message=" " />
|
||||
<for list="${repository.directories}" param="repository.directory">
|
||||
<sequential>
|
||||
<echo level="info" message="${tab}@{repository.directory}" />
|
||||
<if>
|
||||
<not>
|
||||
<available file="@{repository.directory}" type="dir" />
|
||||
</not>
|
||||
<then>
|
||||
<echo level="error" message="${tab}@{repository.directory} does not exist!" />
|
||||
<property name="missingDir" value="true" />
|
||||
</then>
|
||||
</if>
|
||||
</sequential>
|
||||
</for>
|
||||
<for list="${optional.repositories}" param="repo.directory">
|
||||
<sequential>
|
||||
<if>
|
||||
<isset property="missingDir" />
|
||||
<isset property="optional.directories" />
|
||||
<then>
|
||||
<echo level="error" message=" " />
|
||||
<echo level="error" message="Edit core.repositories=${core.repositories} in common.properties, rename source directories or create a symlink!" />
|
||||
<echo level="error" message=" " />
|
||||
<fail message="Unable to locate source directories." />
|
||||
<var name="optional.directories" value="${optional.directories},${git.directory}${file.separator}@{repo.directory}" />
|
||||
</then>
|
||||
<else>
|
||||
<var name="optional.directories" value="${git.directory}${file.separator}@{repo.directory}" />
|
||||
</else>
|
||||
</if>
|
||||
</sequential>
|
||||
</for>
|
||||
|
||||
<property name="tab" value=" " />
|
||||
<echo level="info" message=" " />
|
||||
<echo level="info" message="Deploy checks the following directories for source:" />
|
||||
<echo level="info" message=" " />
|
||||
<for list="${repository.directories}" param="repository.directory">
|
||||
<sequential>
|
||||
<echo level="info" message="${tab}@{repository.directory}" />
|
||||
<if>
|
||||
<not>
|
||||
<available file="@{repository.directory}" type="dir" />
|
||||
</not>
|
||||
<then>
|
||||
<echo level="error" message="${tab}@{repository.directory} does not exist!" />
|
||||
<property name="missingDir" value="true" />
|
||||
</then>
|
||||
</if>
|
||||
<echo level="info" message=" " />
|
||||
</sequential>
|
||||
</for>
|
||||
<if>
|
||||
<isset property="missingDir" />
|
||||
<then>
|
||||
<echo level="error" message=" " />
|
||||
<echo level="error" message="Edit core.repositories=${core.repositories} in common.properties, rename source directories or create a symlink!" />
|
||||
<echo level="error" message=" " />
|
||||
<fail message="Unable to locate source directories." />
|
||||
</then>
|
||||
<else>
|
||||
<!-- all of the projects are in the workspace or one single directory -->
|
||||
<echo message="BUILDING: in workspace or flattened directory structure" />
|
||||
<var name="awips.baseline.directory" value="${base.dir}" />
|
||||
<var name="repository.directories" value="${base.dir}" />
|
||||
</else>
|
||||
</if>
|
||||
<echo level="info" message=" " />
|
||||
|
||||
|
||||
<echo message="AWIPS.BASELINE.DIRECTORY:${awips.baseline.directory}" />
|
||||
<echo message="REPOSITORY.DIRECTORIES:${repository.directories}" />
|
||||
|
|
@ -133,17 +119,6 @@
|
|||
<then>
|
||||
<echo level="info" message=" Class file found at ${toString:compiled}" />
|
||||
<var name="optionaldirectories" value="${optional.directory};${optionaldirectories}" />
|
||||
<!-- If class file is found, check for directories that contain compiled libraries or features only-->
|
||||
<for list="${wa.req.dirs}" param="wa.req.dir">
|
||||
<sequential>
|
||||
<if>
|
||||
<available file="@{repo.directory}/@{wa.req.dir}" type="dir" />
|
||||
<then>
|
||||
<var name="optionaldirectories" value="@{repo.directory}/@{wa.req.dir};${optionaldirectories}" />
|
||||
</then>
|
||||
</if>
|
||||
</sequential>
|
||||
</for>
|
||||
</then>
|
||||
<else>
|
||||
<echo message=" No class files found in @{repo.directory}/${variable.name} - skipping." />
|
||||
|
|
@ -154,25 +129,6 @@
|
|||
</sequential>
|
||||
</for>
|
||||
|
||||
|
||||
<!-- Loop through the WA directories, if they exist. -->
|
||||
<if>
|
||||
<isset property="wa.enabled" />
|
||||
<then>
|
||||
<for list="${wa.to.deploy}" param="wa" delimiter="${path.separator}">
|
||||
<sequential>
|
||||
<var name="wa.base.directory" value="@{wa}/${variable.name}" />
|
||||
|
||||
<if>
|
||||
<available file="${wa.base.directory}" type="dir" />
|
||||
<then>
|
||||
<var name="basedirectories" value="${wa.base.directory};${basedirectories}" />
|
||||
</then>
|
||||
</if>
|
||||
</sequential>
|
||||
</for>
|
||||
</then>
|
||||
</if>
|
||||
</sequential>
|
||||
</for>
|
||||
</target>
|
||||
|
|
|
|||
|
|
@ -412,14 +412,14 @@
|
|||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
<!--
|
||||
|
||||
<plugin
|
||||
id="com.raytheon.uf.edex.plugin.bufrmthdw"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
-->
|
||||
|
||||
<plugin
|
||||
id="com.raytheon.uf.edex.plugin.bufrncwf"
|
||||
download-size="0"
|
||||
|
|
@ -483,14 +483,14 @@
|
|||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
<!--
|
||||
|
||||
<plugin
|
||||
id="com.raytheon.uf.common.dataplugin.bufrmthdw"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
-->
|
||||
|
||||
<plugin
|
||||
id="com.raytheon.uf.common.dataplugin.bufrncwf"
|
||||
download-size="0"
|
||||
|
|
@ -566,7 +566,7 @@
|
|||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
<!--
|
||||
|
||||
<plugin
|
||||
id="com.raytheon.uf.edex.plugin.acars"
|
||||
download-size="0"
|
||||
|
|
@ -594,7 +594,7 @@
|
|||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
-->
|
||||
|
||||
<plugin
|
||||
id="com.raytheon.edex.plugin.grib"
|
||||
download-size="0"
|
||||
|
|
@ -876,14 +876,14 @@
|
|||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
<!--
|
||||
|
||||
<plugin
|
||||
id="gov.noaa.nws.ncep.common.dataplugin.atcf"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
-->
|
||||
|
||||
<plugin
|
||||
id="gov.noaa.nws.ncep.common.dataplugin.aww"
|
||||
download-size="0"
|
||||
|
|
@ -953,14 +953,14 @@
|
|||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
<!--
|
||||
|
||||
<plugin
|
||||
id="gov.noaa.nws.ncep.edex.plugin.atcf"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
-->
|
||||
|
||||
<plugin
|
||||
id="gov.noaa.nws.ncep.edex.plugin.convsigmet"
|
||||
download-size="0"
|
||||
|
|
@ -1023,7 +1023,7 @@
|
|||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
<!--
|
||||
|
||||
<plugin
|
||||
id="gov.noaa.nws.ncep.common.dataplugin.sgwh"
|
||||
download-size="0"
|
||||
|
|
@ -1051,14 +1051,14 @@
|
|||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
-->
|
||||
|
||||
<plugin
|
||||
id="gov.noaa.nws.ncep.edex.common"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
<!--
|
||||
|
||||
<plugin
|
||||
id="gov.noaa.nws.ncep.edex.plugin.sgwh"
|
||||
download-size="0"
|
||||
|
|
@ -1086,7 +1086,7 @@
|
|||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
-->
|
||||
|
||||
<plugin
|
||||
id="gov.noaa.nws.ncep.common.log4j.config"
|
||||
download-size="0"
|
||||
|
|
@ -1141,7 +1141,7 @@
|
|||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
<!--
|
||||
|
||||
<plugin
|
||||
id="gov.noaa.nws.ncep.common.dataplugin.modis"
|
||||
download-size="0"
|
||||
|
|
@ -1155,7 +1155,7 @@
|
|||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
-->
|
||||
|
||||
<plugin
|
||||
id="gov.nasa.gsfc.fits"
|
||||
download-size="0"
|
||||
|
|
@ -1186,7 +1186,7 @@
|
|||
|
||||
<plugin
|
||||
id="gov.noaa.nws.ncep.edex.plugin.nctext"
|
||||
download-size="0"
|
||||
download-size=""
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
|
|
|||
|
|
@ -125,8 +125,8 @@ fi
|
|||
|
||||
%post
|
||||
|
||||
echo "#generated on $(date)" > $LIST_FILE
|
||||
echo "export SERVICES=('ingest' 'ingestGrib' 'request')" >> $LIST_FILE
|
||||
echo "#generated on $(date)" > /etc/init.d/edexServiceList
|
||||
echo "export SERVICES=('ingest' 'ingestGrib' 'request')" >> /etc/init.d/edexServiceList
|
||||
|
||||
if [ ! -d /awips2/edex/data/archive ]; then
|
||||
mkdir -p /awips2/edex/data/archive
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue