xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Omaha #3299 - Modify RCM deploy script

Browse source 
Change-Id: I420acc08705ebc2f52cd52ab7954b4d8c16fef15

Former-commit-id: 97c6bded155fc58e59beecdb33016e5286e622c1
This commit is contained in:
Greg Armendariz 2015-02-06 11:17:00 -06:00
parent d9eb0d8b55
commit 2a554c5498
2 changed files with 73 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

90
RadarServer/build.rcm/build.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
This_software_was_developed_and_/_or_modified_by_Raytheon_Company, This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government. pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
@ -21,8 +21,20 @@
<!DOCTYPE project [ <!DOCTYPE project [
<!ENTITY substitute-targets SYSTEM "substitute.xml"> <!ENTITY substitute-targets SYSTEM "substitute.xml">
]> ]>
<project name="RCMPackageBuilder" default="deploy" basedir="."> <project name="RCMPackageBuilder" default="deploy" basedir=".">
<!-- <property file="${basedir}/../../edexOsgi/build.edex/edex/common.properties" />
<path id="ant.classpath">
<fileset dir="${basedir}/../../edexOsgi/build.edex/lib/ant">
<include name="*.jar" />
</fileset>
</path>
<taskdef resource="net/sf/antcontrib/antlib.xml"
classpath="${basedir}/../../edexOsgi/build.edex/lib/ant/ant-contrib-1.0b3.jar" />
<!--
This build script expects the following projects to exist at the same This build script expects the following projects to exist at the same
level as this project's folder. com.raytheon.rcm.lib level as this project's folder. com.raytheon.rcm.lib
com.raytheon.rcm.server com.raytheon.rcm.server.mq com.raytheon.rcm.server com.raytheon.rcm.server.mq
@ -30,11 +42,14 @@
built before running this script. built before running this script.
--> -->
&substitute-targets; &substitute-targets;
<description> <description>
Builds a deployment of the RCM for packaging Builds a deployment of the RCM for packaging
</description> </description>
<!-- set global properties for this build --> <!-- set global properties for this build -->
<property environment="user" /> <property environment="user" />
@ -56,13 +71,42 @@
</and> </and>
</condition> </condition>
<condition property="cots.dir" value="${basedir}/.." else="${basedir}/../../cots"> <property name="top.dir" value="${basedir}/../../.."/>
<available file="${basedir}/../org.springframework" /> <property name="core_foss_lib.dir" value="${top.dir}/${core-foss.repo}/lib"/>
</condition> <property name="a2_foss_lib.dir" value="${top.dir}/${awips2-foss.repo}/lib"/>
<property name="core_common.dir" value="${top.dir}/${core.repo}/common/"/>
<condition property="edexsrc.dir" value="${basedir}/.." else="${basedir}/../../edexOsgi"> <property name="tab" value=" "/>
<available file="${basedir}/../com.raytheon.uf.common.util" /> <echo level="info" message=" "/>
</condition> <echo level="info" message="Deploy checks the following directories for source:"/>
<echo level="info" message=" "/>
<for list="${core.repositories}" param="repository.directory">
<sequential>
<echo level="info" message="${tab}@{repository.directory}" />
<if>
<not>
<available file="${top.dir}/@{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>
<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>
</if>
<echo level="info" message=" "/>
<property name="edexsrc.dir" value="${basedir}/../../edexOsgi"/>
<!-- Set default EDEX install location for copy filter --> <!-- Set default EDEX install location for copy filter -->
<property name="def.edex.install.dir" value="/awips" /> <property name="def.edex.install.dir" value="/awips" />
@ -85,7 +129,9 @@
Deploy on top of existing deployment. Old files not removed nor is the Deploy on top of existing deployment. Old files not removed nor is the
configuration file changed. configuration file changed.
--> -->
<target name="re.deploy">
<target name="re.deploy">
<mkdir dir="${deploy.dir}" /> <mkdir dir="${deploy.dir}" />
<mkdir dir="${deploy.dir}/bin" /> <mkdir dir="${deploy.dir}/bin" />
<mkdir dir="${deploy.dir}/lib" /> <mkdir dir="${deploy.dir}/lib" />
@ -125,25 +171,25 @@
</chmod> </chmod>
<copy todir="${deploy.dir}/lib" flatten="true"> <copy todir="${deploy.dir}/lib" flatten="true">
<fileset dir="${cots.dir}/org.apache.activemq" includes="**/*.jar" /> <fileset dir="${core_foss_lib.dir}/org.apache.activemq" includes="**/*.jar" />
<fileset dir="${cots.dir}/org.apache.qpid" includes="**/*.jar" /> <fileset dir="${core_foss_lib.dir}/org.apache.qpid" includes="**/*.jar" />
<fileset dir="${cots.dir}/org.slf4j" includes="**/*.jar"> <fileset dir="${core_foss_lib.dir}/org.slf4j" includes="**/*.jar">
<include name="**/jcl-over-slf4j*.jar" /> <include name="**/jcl-over-slf4j*.jar" />
<include name="**/jul-to-slf4j*.jar" /> <include name="**/jul-to-slf4j*.jar" />
<include name="**/slf4j-api*.jar" /> <include name="**/slf4j-api*.jar" />
</fileset> </fileset>
<fileset dir="${cots.dir}/org.apache.commons.beanutils" includes="**/*.jar" /> <fileset dir="${core_foss_lib.dir}/org.apache.commons.beanutils" includes="**/*.jar" />
<fileset dir="${cots.dir}/org.apache.commons.codec" includes="**/*.jar" /> <fileset dir="${core_foss_lib.dir}/org.apache.commons.codec" includes="**/*.jar" />
<fileset dir="${cots.dir}/org.apache.commons.collections" includes="**/*.jar" /> <fileset dir="${core_foss_lib.dir}/org.apache.commons.collections" includes="**/*.jar" />
<fileset dir="${cots.dir}/org.apache.commons.lang" includes="**/*.jar" /> <fileset dir="${core_foss_lib.dir}/org.apache.commons.lang" includes="**/*.jar" />
<fileset dir="${cots.dir}/ch.qos.logback" includes="**/*.jar" /> <fileset dir="${core_foss_lib.dir}/ch.qos.logback" includes="**/*.jar" />
<fileset dir="${cots.dir}/javax.jms" includes="**/*.jar" /> <fileset dir="${core_foss_lib.dir}/javax.jms" includes="**/*.jar" />
<fileset dir="${cots.dir}/org.springframework"> <fileset dir="${core_foss_lib.dir}/org.springframework">
<include name="**/*spring*beans*.jar" /> <include name="**/*spring*beans*.jar" />
<include name="**/*spring*context*.jar" /> <include name="**/*spring*context*.jar" />
</fileset> </fileset>
<fileset dir="${cots.dir}/org.itadaki.bzip2" includes="**/*.jar" /> <fileset dir="${a2_foss_lib.dir}/org.itadaki.bzip2" includes="**/*.jar" />
<fileset dir="${cots.dir}/org.quartz" includes="**/*.jar" /> <fileset dir="${core_foss_lib.dir}/org.quartz" includes="**/*.jar" />
</copy> </copy>
<delete dir="bin" /> <delete dir="bin" />
@ -178,7 +224,7 @@
<fileset dir="../com.raytheon.rcm.server/bin" includes="**/*.class" /> <fileset dir="../com.raytheon.rcm.server/bin" includes="**/*.class" />
<fileset dir="../com.raytheon.rcm.server.mq/bin" includes="**/*.class" /> <fileset dir="../com.raytheon.rcm.server.mq/bin" includes="**/*.class" />
<fileset dir="../com.raytheon.rcm.server.mq/bin" includes="**/*.txt" /> <fileset dir="../com.raytheon.rcm.server.mq/bin" includes="**/*.txt" />
<fileset dir="${edexsrc.dir}/com.raytheon.uf.common.util/bin" includes="**/*.class" /> <fileset dir="${core_common.dir}/com.raytheon.uf.common.util/bin" includes="**/*.class" />
</copy> </copy>
</target> </target>

6
edexOsgi/build.edex/edex/common.properties
View file

@ -4,7 +4,11 @@ architecture=x86_64
includegen.filter=raytheon|noaa\.nws|noaa\.gsd|gov\.nasa\.msfc|edu\.wisc\.ssec\.cimss includegen.filter=raytheon|noaa\.nws|noaa\.gsd|gov\.nasa\.msfc|edu\.wisc\.ssec\.cimss
# AWIPSII core repositories required for build # AWIPSII core repositories required for build
core.repositories=ufcore,ufcore-foss,AWIPS2_foss core.repo=ufcore
core-foss.repo=ufcore-foss
awips2-foss.repo=AWIPS2_foss
core.repositories=${core.repo},${core-foss.repo},${awips2-foss.repo}
# Note: currently, there is a limit of 99 plugin directories. # Note: currently, there is a limit of 99 plugin directories.
dir.01=cave dir.01=cave