Also removed the building of the AlertViz rpm

*rpms/awips2.core/deploy.builder/build.sh
*rpms/build/x86_64/build.sh
*rpms/build/common/lookupRPM.sh
	Commented out building of AlertViz rpm
*dist/comps.xml
	Removed mandatory awips2-alertviz rpm
	Removed awips2-gfesuite rpm
	Added qpis2-qpid-proton rpm (which typically got installed from dependecies, but wouldn't get removed)
This commit is contained in:
ucar-tmeyer 2022-12-30 16:02:04 +00:00
parent 1c60c28dbc
commit a590b8859e
5 changed files with 9 additions and 10 deletions

View file

@ -24,7 +24,7 @@
-Dorg.eclipse.swt.internal.gtk.cairoGraphics=false -Dorg.eclipse.swt.internal.gtk.cairoGraphics=false
-Dorg.eclipse.swt.internal.gtk.useCairo=false -Dorg.eclipse.swt.internal.gtk.useCairo=false
-Dorg.eclipse.ui/KEY_CONFIGURATION_ID=com.raytheon.viz.ui.cave.scheme -Dorg.eclipse.ui/KEY_CONFIGURATION_ID=com.raytheon.viz.ui.cave.scheme
-Dlogback.configurationFile=logback-viz-core.xml -Dlogback.configurationFile=logback-viz-alertview.xml
-Dlogback.statusListenerClass=com.raytheon.uf.common.logback.UFLogbackInternalStatusListener -Dlogback.statusListenerClass=com.raytheon.uf.common.logback.UFLogbackInternalStatusListener
-Dthrift.stream.maxsize=320 -Dthrift.stream.maxsize=320
-Dviz.memory.warn.threshold=10M -Dviz.memory.warn.threshold=10M

5
dist/comps.xml vendored
View file

@ -102,7 +102,6 @@
<packagereq type="mandatory">awips2-yajsw</packagereq> <packagereq type="mandatory">awips2-yajsw</packagereq>
<packagereq type="mandatory">awips2-edex-rcm</packagereq> <packagereq type="mandatory">awips2-edex-rcm</packagereq>
<packagereq type="mandatory">awips2-edex-mpe</packagereq> <packagereq type="mandatory">awips2-edex-mpe</packagereq>
<packagereq type="mandatory">awips2-gfesuite</packagereq>
<packagereq type="mandatory">awips2-edex-geodb</packagereq> <packagereq type="mandatory">awips2-edex-geodb</packagereq>
<packagereq type="mandatory">awips2-ldm</packagereq> <packagereq type="mandatory">awips2-ldm</packagereq>
@ -120,6 +119,7 @@
<packagereq type="mandatory">awips2-python</packagereq> <packagereq type="mandatory">awips2-python</packagereq>
<packagereq type="mandatory">awips2-python-jep</packagereq> <packagereq type="mandatory">awips2-python-jep</packagereq>
<packagereq type="mandatory">awips2-qpid-broker-j</packagereq> <packagereq type="mandatory">awips2-qpid-broker-j</packagereq>
<packagereq type="mandatory">awips2-qpid-proton</packagereq>
<packagereq type="mandatory">awips2-rcm</packagereq> <packagereq type="mandatory">awips2-rcm</packagereq>
<packagereq type="mandatory">awips2-data.hdf5-topo</packagereq> <packagereq type="mandatory">awips2-data.hdf5-topo</packagereq>
<packagereq type="mandatory">awips2-data.gfe</packagereq> <packagereq type="mandatory">awips2-data.gfe</packagereq>
@ -177,9 +177,9 @@
<packagereq type="mandatory">awips2-cave-wrapper</packagereq> <packagereq type="mandatory">awips2-cave-wrapper</packagereq>
<packagereq type="mandatory">awips2-gfesuite</packagereq> <packagereq type="mandatory">awips2-gfesuite</packagereq>
<packagereq type="mandatory">awips2-alertviz</packagereq>
<packagereq type="mandatory">awips2-cli</packagereq> <packagereq type="mandatory">awips2-cli</packagereq>
<packagereq type="mandatory">awips2-notification</packagereq> <packagereq type="mandatory">awips2-notification</packagereq>
<packagereq type="mandatory">awips2-qpid-proton</packagereq>
<packagereq type="mandatory">awips2-python-dynamicserialize</packagereq> <packagereq type="mandatory">awips2-python-dynamicserialize</packagereq>
<packagereq type="mandatory">awips2-python-h5py</packagereq> <packagereq type="mandatory">awips2-python-h5py</packagereq>
@ -232,7 +232,6 @@
<packagereq type="mandatory">awips2-ncep-gempak</packagereq> <packagereq type="mandatory">awips2-ncep-gempak</packagereq>
<packagereq type="mandatory">awips2-gfesuite</packagereq> <packagereq type="mandatory">awips2-gfesuite</packagereq>
<packagereq type="mandatory">awips2-alertviz</packagereq>
<packagereq type="mandatory">awips2-cli</packagereq> <packagereq type="mandatory">awips2-cli</packagereq>
<packagereq type="mandatory">awips2-notification</packagereq> <packagereq type="mandatory">awips2-notification</packagereq>

View file

@ -179,7 +179,7 @@ buildRPM "Installer.gfesuite-server"
buildRPM "Installer.database-standalone-configuration" buildRPM "Installer.database-standalone-configuration"
buildRPM "Installer.database-server-configuration" buildRPM "Installer.database-server-configuration"
buildRPM "Installer.adapt-native" buildRPM "Installer.adapt-native"
buildRPM "Installer.alertviz" #buildRPM "Installer.alertviz"
buildRPM "Installer.aviation" buildRPM "Installer.aviation"
buildRPM "Installer.cli" buildRPM "Installer.cli"
buildRPM "Installer.database" buildRPM "Installer.database"

View file

@ -342,10 +342,10 @@ function lookupRPM()
fi fi
# awips2 rpms -> viz rpms. # awips2 rpms -> viz rpms.
if [ "${1}" = "awips2-alertviz" ]; then #if [ "${1}" = "awips2-alertviz" ]; then
export RPM_SPECIFICATION="${awips2_cave_dir}/Installer.alertviz" # export RPM_SPECIFICATION="${awips2_cave_dir}/Installer.alertviz"
return 0 # return 0
fi #fi
if [ "${1}" = "-cave" ]; then if [ "${1}" = "-cave" ]; then
return 0 return 0
fi fi

View file

@ -165,7 +165,7 @@ function build_server(){
build_pypies build_pypies
buildLocalization buildLocalization
buildRPM "awips2-alertviz" #buildRPM "awips2-alertviz"
buildRPM "awips2-aviation-shared" buildRPM "awips2-aviation-shared"
buildRPM "awips2-cli" buildRPM "awips2-cli"
buildRPM "awips2-common-base" buildRPM "awips2-common-base"