From 0ecc49e60900f167c748724a39919915d602fde4 Mon Sep 17 00:00:00 2001
From: mjames-upc <mjames@unidata.ucar.edu>
Date: Thu, 26 Jul 2018 09:56:55 -0600
Subject: [PATCH] full cave feature set for rpmbuild

---
 build/repos                                   |   1 +
 build/rsync.dirs                              |   7 +
 cave/build/p2-build.xml                       | 133 ++++++++----------
 .../feature.xml                               |  44 ++++--
 4 files changed, 95 insertions(+), 90 deletions(-)

diff --git a/build/repos b/build/repos
index 5ef8ce3193..41e2c57db5 100644
--- a/build/repos
+++ b/build/repos
@@ -1,4 +1,5 @@
 awips2-cimss 
+awips2-collaboration
 awips2-core-foss 
 awips2-core 
 awips2-data-delivery 
diff --git a/build/rsync.dirs b/build/rsync.dirs
index cedb98810a..ab3038eac5 100644
--- a/build/rsync.dirs
+++ b/build/rsync.dirs
@@ -12,6 +12,7 @@ javaUtilities/* rpms pythonPackages
 ../awips2-rpm/installers
 ../awips2-nws/common/* 
 ../awips2-nws/viz/* 
+../awips2-nws/features/*
 ../awips2-nws/edex/* 
 ../awips2-hazards/edex/*
 ../awips2-hazards/common/*
@@ -27,12 +28,18 @@ javaUtilities/* rpms pythonPackages
 ../awips2-cimss/viz/*
 ../awips2-cimss/edex/*
 ../awips2-cimss/common/*
+../awips2-collaboration/viz/*
+../awips2-collaboration/features/*
+../awips2-collaboration/common/*
+../awips2-collaboration/foss/*
 ../awips2-data-delivery/common/*
 ../awips2-data-delivery/edex/*
 ../awips2-data-delivery/features/*
 ../awips2-data-delivery/viz/*
 ../awips2-drawing/viz/*
+../awips2-drawing/features/*
 ../awips2-gsd/viz/*
+../awips2-gsd/features/*
 ../awips2-nasa/edex/*
 ../awips2-ogc/foss/*
 ../awips2-ogc/edex/*
diff --git a/cave/build/p2-build.xml b/cave/build/p2-build.xml
index 49631ad50f..eb489433af 100644
--- a/cave/build/p2-build.xml
+++ b/cave/build/p2-build.xml
@@ -181,6 +181,9 @@
 		<antcall target="p2.build.repo">
 			<param name="feature" value="com.raytheon.uf.viz.dataplugins.feature" />
 		</antcall>
+		<antcall target="p2.build.repo">
+			<param name="feature" value="com.raytheon.uf.viz.dat.feature" />
+		</antcall>
 		<antcall target="p2.build.repo">
 			<param name="feature" value="com.raytheon.uf.viz.d2d.core.feature" />
 		</antcall>
@@ -193,6 +196,9 @@
 		<antcall target="p2.build.repo">
 			<param name="feature" value="com.raytheon.viz.warngen.feature" />
 		</antcall>
+		<antcall target="p2.build.repo">
+			<param name="feature" value="com.raytheon.viz.warnings.feature" />
+		</antcall>
 		<antcall target="p2.build.repo">
 			<param name="feature" value="com.raytheon.uf.viz.grid.feature" />
 		</antcall>
@@ -247,30 +253,27 @@
 		<antcall target="p2.build.repo">
 			<param name="feature" value="com.raytheon.uf.viz.datadelivery.feature" />
 		</antcall>
-        <antcall target="p2.build.repo">
-            <param name="feature" value="com.raytheon.uf.viz.npp.feature" />
-        </antcall>
+        	<antcall target="p2.build.repo">
+        		<param name="feature" value="com.raytheon.uf.viz.npp.feature" />
+        	</antcall>
 		<antcall target="p2.build.repo">
 			<param name="feature" value="com.raytheon.uf.viz.d2d.skewt.feature" />
 		</antcall>
 		<antcall target="p2.build.repo">
 			<param name="feature" value="com.raytheon.viz.volumebrowser.feature" />
 		</antcall>
-        <antcall target="p2.build.repo">
-            <param name="feature" value="com.raytheon.uf.viz.d2d.nsharp.feature" />
-        </antcall>
-        <antcall target="p2.build.repo">
-            <param name="feature" value="com.raytheon.uf.viz.npp.sounding.feature" />
-        </antcall>
-        <antcall target="p2.build.repo">
-             <param name="feature" value="com.raytheon.uf.viz.ncep.npp.feature" />
-        </antcall>      
+        	<antcall target="p2.build.repo">
+        		<param name="feature" value="com.raytheon.uf.viz.d2d.nsharp.feature" />
+        	</antcall>
+        	<antcall target="p2.build.repo">
+        		<param name="feature" value="com.raytheon.uf.viz.npp.sounding.feature" />
+        	</antcall>
+        	<antcall target="p2.build.repo">
+         		<param name="feature" value="com.raytheon.uf.viz.ncep.npp.feature" />
+        	</antcall>      
 		<antcall target="p2.build.repo">
 			<param name="feature" value="com.raytheon.uf.viz.acarssounding.feature" />
 		</antcall>
-                <antcall target="p2.build.repo">
-                <param name="feature" value="com.raytheon.uf.viz.ncep.npp.feature" />
-                </antcall>
 		<antcall target="p2.build.repo">
 			<param name="feature" value="com.raytheon.uf.viz.d2d.gfe.feature" />
 		</antcall>
@@ -280,6 +283,9 @@
 		<antcall target="p2.build.repo">
 			<param name="feature" value="com.raytheon.uf.viz.d2d.ui.awips.feature" />
 		</antcall>
+        	<antcall target="p2.build.repo">
+        		<param name="feature" value="com.raytheon.uf.viz.d2d.damagepath.feature" />
+        	</antcall>
 		<antcall target="p2.build.repo">
 			<param name="feature" value="edu.wisc.ssec.cimss.viz.convectprob.feature" />
 		</antcall>
@@ -298,66 +304,46 @@
 		<antcall target="p2.build.repo">
 			<param name="feature" value="gov.noaa.nws.obs.viz.geodata.feature" />
 		</antcall>
-	
 		<antcall target="p2.build.repo">
 			<param name="feature" value="gov.noaa.nws.ocp.uf.viz.gisdatastore.feature" />
 		</antcall>
-
-        <antcall target="p2.build.repo">
-            <param name="feature" value="com.raytheon.uf.viz.d2d.damagepath.feature" />
-        </antcall>
-
+        	<antcall target="p2.build.repo">
+        		<param name="feature" value="com.raytheon.uf.viz.ohd.feature" />
+        	</antcall>
+        	<antcall target="p2.build.repo">
+        		<param name="feature" value="com.raytheon.uf.viz.scan.feature" />
+        	</antcall>
+        	<antcall target="p2.build.repo">
+        		<param name="feature" value="com.raytheon.uf.viz.server.edex.feature" />
+        	</antcall>
+        	<antcall target="p2.build.repo">
+        		<param name="feature" value="com.raytheon.uf.viz.vtec.feature" />
+        	</antcall>
+        	<antcall target="p2.build.repo">
+        		<param name="feature" value="com.raytheon.viz.dataaccess.feature" />
+        	</antcall>
+        	<antcall target="p2.build.repo">
+        		<param name="feature" value="edu.ucar.unidata.uf.viz.feature" />
+        	</antcall>
+        	<antcall target="p2.build.repo">
+        		<param name="feature" value="gov.noaa.gsd.viz.hazards.feature" />
+        	</antcall>
+        	<antcall target="p2.build.repo">
+        		<param name="feature" value="gov.noaa.nws.ncep.swpc.viz.feature" />
+        	</antcall>
+        	<antcall target="p2.build.repo">
+        		<param name="feature" value="gov.noaa.nws.ocp.viz.climate.feature" />
+        	</antcall>
+        	<antcall target="p2.build.repo">
+        		<param name="feature" value="gov.noaa.nws.ocp.viz.firewx.feature" />
+        	</antcall>
+        	<antcall target="p2.build.repo">
+        		<param name="feature" value="gov.noaa.nws.ocp.viz.psh.feature" />
+        	</antcall>
 		<antcall target="cleanup.features" />
 	</target>
 
-	<target name="wa-build" depends="p2.build" description="Builds work assignment specific features after the main build">
-		<for param="wa.feature.list.file">
-			<fileset dir="${basedir}" includes="*-wa-build.properties" />
-			<sequential>
-				<var name="wa.features" unset="true" />
-				<property file="@{wa.feature.list.file}" />
-				<for list="${wa.features}" param="wa.feature">
-					<sequential>
-						<antcall target="p2.build.repo">
-							<param name="feature" value="@{wa.feature}" />
-						</antcall>
-					</sequential>
-				</for>
-			</sequential>
-		</for>
-	</target>
-
-	<target name="wa-cleanup" depends="wa-build" description="Removes references to WA-specific features that should not be built as an RPM.">
-		<for param="wa.feature.list.file">
-			<fileset dir="${basedir}" includes="*-wa-build.properties" />
-			<sequential>
-				<var name="wa.features.ignore" unset="true" />
-				<property file="@{wa.feature.list.file}" />
-				<for list="${wa.features.ignore}" param="wa.feature">
-					<sequential>
-						<if>
-							<available file="${basedir}/cave/p2/features/@{wa.feature}" type="dir" />
-							<then>
-								<!-- Remove the feature directory. -->
-								<delete includeemptydirs="true">
-									<fileset dir="${basedir}/cave/p2/features/@{wa.feature}" />
-								</delete>
-
-								<!-- Remove references to the feature from features.txt -->
-								<exec executable="/bin/sed" output="${basedir}/cave/p2/dist/features.txt.tmp">
-									<arg value="/@{wa.feature}/d" />
-									<arg value="${basedir}/cave/p2/dist/features.txt" />
-								</exec>
-								<move file="${basedir}/cave/p2/dist/features.txt.tmp" tofile="${basedir}/cave/p2/dist/features.txt" />
-							</then>
-						</if>
-					</sequential>
-				</for>
-			</sequential>
-		</for>
-	</target>
-
-	<target name="main" depends="clean, p2.build, wa-build, wa-cleanup" />
+	<target name="main" depends="clean, p2.build" />
 
 	<target name="p2.build.repo">
 		<!-- Copy The Feature -->
@@ -472,15 +458,6 @@
 				</delete>
 			</then>
 		</if>
-		<!-- Remove 'com.raytheon.uf.viz.collaboration.product.feature' -->
-		<if>
-			<available file="${basedir}/cave/p2/features/com.raytheon.uf.viz.collaboration.product.feature" type="dir" />
-			<then>
-				<delete includeemptydirs="true">
-					<fileset dir="${basedir}/cave/p2/features/com.raytheon.uf.viz.collaboration.product.feature" />
-				</delete>
-			</then>
-		</if>
 	</target>
 
 	<taskdef resource="net/sf/antcontrib/antcontrib.properties"/>
diff --git a/cave/com.raytheon.viz.feature.awips.developer/feature.xml b/cave/com.raytheon.viz.feature.awips.developer/feature.xml
index 3421df7d99..3ea14fee7c 100644
--- a/cave/com.raytheon.viz.feature.awips.developer/feature.xml
+++ b/cave/com.raytheon.viz.feature.awips.developer/feature.xml
@@ -69,6 +69,38 @@
          id="com.raytheon.viz.warngen.feature"
          version="0.0.0"/>
 
+   <includes
+         id="com.raytheon.uf.viz.dat.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="com.raytheon.uf.viz.scan.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="com.raytheon.viz.dataaccess.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="com.raytheon.uf.viz.collaboration.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="com.raytheon.uf.viz.ohd.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="gov.noaa.nws.ncep.swpc.viz.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="edu.ucar.unidata.uf.viz.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="com.raytheon.viz.warnings.feature"
+         version="0.0.0"/>
+
    <includes
          id="com.raytheon.uf.viz.grid.feature"
          version="0.0.0"/>
@@ -209,10 +241,6 @@
          id="com.raytheon.viz.gfe.feature"
          version="0.0.0"/>
 
-   <includes
-         id="com.raytheon.uf.viz.bmh.feature"
-         version="0.0.0"/>
-
    <includes
          id="com.raytheon.uf.viz.server.edex.feature"
          version="0.0.0"/>
@@ -221,14 +249,6 @@
          id="gov.noaa.nws.ocp.uf.viz.gisdatastore.feature"
          version="0.0.0"/>
 
-   <includes
-         id="gov.noaa.nws.ocp.viz.firewx.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="com.raytheon.viz.warnings.feature"
-         version="0.0.0"/>
-
    <includes
          id="com.raytheon.uf.viz.vtec.feature"
          version="0.0.0"/>