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

CAVE RPM build release-ready 16.2.2: p2 build feature set fix

Browse source
This commit is contained in:
Michael James 2016-11-14 11:17:13 -06:00
parent c174383ea7
commit ebdf888c97
13 changed files with 34 additions and 223 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cave/build/features.txt
View file

@ -8,10 +8,9 @@ com.raytheon.uf.viz.dataplugins.feature
com.raytheon.viz.feature.awips
com.raytheon.uf.viz.application.feature
com.raytheon.uf.viz.base.feature
com.raytheon.uf.viz.nwsauth.feature
com.raytheon.uf.viz.archive.feature
com.raytheon.uf.viz.gisdatastore.feature
com.raytheon.uf.viz.useradmin.feature
edu.wisc.ssec.cimss.viz.convectprob.feature
gov.noaa.nws.mdl.viz.boundaryTool.common.feature
com.raytheon.viz.dataaccess.feature
com.raytheon.uf.viz.localization.perspective.feature
com.raytheon.uf.viz.core.feature
@ -48,3 +47,5 @@ com.raytheon.uf.viz.npp.sounding.feature
com.raytheon.uf.viz.ncep.npp.feature
com.raytheon.uf.viz.ncep.perspective.feature
com.raytheon.uf.viz.d2d.skewt.feature
gov.noaa.gsd.viz.ensemble.feature
com.raytheon.uf.viz.satellite.goesr.feature

6
cave/build/p2-build.xml
View file

@ -282,6 +282,12 @@
<antcall target="p2.build.repo">
<param name="feature" value="edu.wisc.ssec.cimss.viz.convectprob.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature" value="gov.noaa.nws.mdl.viz.boundaryTool.common.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature" value="com.raytheon.uf.viz.satellite.goesr.feature" />
</antcall>
<antcall target="cleanup.features" />
</target>

BIN
cave/build/static/linux/cave/cave.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.5 KiB

9
cave/com.raytheon.viz.feature.awips.developer/feature.xml
View file

@ -116,11 +116,11 @@
<includes
id="com.raytheon.uf.viz.d2d.nsharp.feature"
version="0.0.0"/>
<!--
<includes
id="com.raytheon.uf.viz.archive.feature"
version="0.0.0"/>
-->
<includes
id="com.raytheon.uf.viz.ncep.perspective.feature"
version="0.0.0"/>
@ -196,11 +196,6 @@
<includes
id="com.raytheon.uf.viz.satellite.goesr.feature"
version="0.0.0"/>
<!--
<includes
id="com.raytheon.uf.viz.useradmin.feature"
version="0.0.0"/>
-->
<includes
id="com.raytheon.viz.hydro.feature"
version="0.0.0"/>

7
cave/com.raytheon.viz.product.awips/awips.product
View file

@ -76,10 +76,7 @@
<feature id="com.raytheon.viz.feature.awips"/>
<feature id="com.raytheon.uf.viz.application.feature"/>
<feature id="com.raytheon.uf.viz.base.feature"/>
<feature id="com.raytheon.uf.viz.nwsauth.feature"/>
<feature id="com.raytheon.uf.viz.archive.feature"/>
<feature id="com.raytheon.uf.viz.gisdatastore.feature"/>
<feature id="com.raytheon.uf.viz.useradmin.feature"/>
<feature id="com.raytheon.viz.dataaccess.feature"/>
<feature id="com.raytheon.uf.viz.localization.perspective.feature"/>
<feature id="com.raytheon.uf.viz.core.feature"/>
@ -116,6 +113,10 @@
<feature id="com.raytheon.uf.viz.ncep.npp.feature"/>
<feature id="com.raytheon.uf.viz.ncep.perspective.feature"/>
<feature id="com.raytheon.uf.viz.d2d.skewt.feature"/>
<feature id="gov.noaa.gsd.viz.ensemble.feature"/>
<feature id="edu.wisc.ssec.cimss.viz.convectprob.feature"/>
<feature id="gov.noaa.nws.mdl.viz.boundaryTool.common.feature"/>
<feature id="com.raytheon.uf.viz.satellite.goesr.feature"/>
</features>
<configurations>

119
cave/com.raytheon.viz.product.awips/nawips.product
View file

@ -1,119 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
<product name="CAVE" id="com.raytheon.viz.product.awips.CAVE" application="com.raytheon.uf.viz.application.application" useFeatures="true" includeLaunchers="true">
<aboutInfo>
<image path="icons/ipr.gif"/>
<text>
%caveAboutText
</text>
</aboutInfo>
<configIni use="default">
</configIni>
<launcherArgs>
<programArgs>-data @user.home/caveData -user @user.home/caveData</programArgs>
<programArgsLin>-consoleLog</programArgsLin>
<vmArgs>-XX:+UseG1GC
-Dosgi.instance.area.readOnly=true
-Dorg.eclipse.update.reconcile=false
-Dorg.eclipse.swt.internal.gtk.cairoGraphics=false
-XX:MaxPermSize=128m
-Dorg.eclipse.ui/KEY_CONFIGURATION_ID=com.raytheon.viz.ui.awips.scheme
-Dqpid.dest_syntax=BURL
-Dlogback.configurationFile=logback-viz-core.xml
-Dlogback.statusListenerClass=com.raytheon.uf.common.logback.UFLogbackInternalStatusListener
-Dthrift.stream.maxsize=200
-Dviz.memory.warn.threshold=98
-Dhttps.certificate.check=true
-XX:+UnlockExperimentalVMOptions
-XX:G1HeapRegionSize=4M
-XX:InitiatingHeapOccupancyPercent=25
-XX:G1MixedGCCountTarget=16
-XX:G1MixedGCLiveThresholdPercent=25
-XX:G1OldCSetRegionThresholdPercent=25
-XX:G1HeapWastePercent=5</vmArgs>
<vmArgsLin>-Xmx3072M -XX:MaxDirectMemorySize=2G
-XX:OnOutOfMemoryError=&quot;capture -t no -p $pid &amp;&quot;</vmArgsLin>
<vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
</launcherArgs>
<windowImages i16="icons/cave_16x16.png" i32="icons/cave_32x32.png" i48="icons/cave_48x48.png" i64="icons/cave_64x64.png" i128="icons/cave_128x128.png"/>
<splash
location="com.raytheon.viz.ui.personalities.awips"
startupProgressRect="3,234,413,13"
startupMessageRect="7,252,445,20"
startupForegroundColor="000000" />
<launcher name="cave">
<solaris/>
<win useIco="false">
<bmp/>
</win>
</launcher>
<vm>
<linux include="true">jdk1.7.0</linux>
</vm>
<plugins>
</plugins>
<features>
<feature id="com.raytheon.viz.feature.awips" version="1.9.0.qualifier"/>
<feature id="com.raytheon.uf.viz.application.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.common.base.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.base.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.localization.perspective.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.alertview.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.gisdatastore.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.npp.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.viz.dataaccess.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.nwsauth.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.sounding.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.dataplugin.obs.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.archive.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.cots.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.common.core.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.core.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.d2d.core.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.viz.satellite.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.ncep.core.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.core.maps.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.viz.radar.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.kml.export.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.grid.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.thinclient.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.viz.text.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.d2d.damagepath.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.viz.gfe.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.registry.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.aviation.advisory.feature" version="1.14.0.qualifier"/>
<feature id="com.raytheon.uf.viz.useradmin.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.ncep.dataplugins.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.dataplugins.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.displays.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.d2d.ui.awips.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.d2d.skewt.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.d2d.xy.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.ncep.displays.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.ncep.perspective.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.ncep.nsharp.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.ncep.npp.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.viz.volumebrowser.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.d2d.nsharp.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.acarssounding.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.npp.sounding.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.d2d.gfe.feature" version="1.0.0.qualifier"/>
</features>
<configurations>
<plugin id="com.raytheon.uf.viz.spring.dm" autoStart="true" startLevel="4" />
<plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
<plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
<plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
</configurations>
</product>

14
rpms/awips2.cave/Installer.cave-wrapper/component.spec
View file

@ -64,7 +64,7 @@ mkdir -p ${RPM_BUILD_ROOT}/awips2/cave
if [ $? -ne 0 ]; then
exit 1
fi
mkdir -p ${RPM_BUILD_ROOT}/etc/xdg/autostart
mkdir -p ${RPM_BUILD_ROOT}/usr/share/applications
if [ $? -ne 0 ]; then
exit 1
fi
@ -85,8 +85,7 @@ fi
# text-workstation autostart script.
CAVE_SCRIPTS_DIR="%{_baseline_workspace}/rpms/%{_component_project_dir}/scripts"
TEXTWS_AUTO_SCRIPT="${CAVE_SCRIPTS_DIR}/autostart/awips2-textws.desktop"
cp ${TEXTWS_AUTO_SCRIPT} ${RPM_BUILD_ROOT}/etc/xdg/autostart
cp ${CAVE_SCRIPTS_DIR}/autostart/cave.desktop ${RPM_BUILD_ROOT}/usr/share/applications/
if [ $? -ne 0 ]; then
exit 1
fi
@ -142,12 +141,6 @@ popd > /dev/null 2>&1
%pre
%post
# Remove the text-workstation autostart script if we have not been installed
# on an xt workstation
if [ ! "`hostname | cut -b 1-2`" = "xt" ]; then
rm -f /etc/xdg/autostart/awips2-textws.desktop
fi
# relocate any localization files installed by awips2-cave
/bin/bash /awips2/cave/relocateLocalization.sh
if [ $? -ne 0 ]; then
@ -172,9 +165,10 @@ rm -rf ${RPM_BUILD_ROOT}
%dir /awips2/cave/caveEnvironment
/awips2/cave/caveEnvironment/*
/awips2/cave/*.sh
/awips2/cave/cave.png
/awips2/cave/VizUpdater.jar
# not a noarch RPM due to the presence of the architecture-specific libraries.
%dir /awips2/cave/lib64
/awips2/cave/lib64/*
%attr(644,root,root) /etc/xdg/autostart/awips2-textws.desktop
%attr(644,root,root) /usr/share/applications/cave.desktop

7
rpms/awips2.cave/Installer.cave-wrapper/scripts/autostart/awips2-cave.desktop
View file

@ -1,7 +0,0 @@
[Desktop Entry]
Type=Application
Encoding=UTF-8
Version=1.0
Name=No Name
Name[en_US]=CAVE
Exec=/bin/bash -i -c "sleep 1; /awips2/cave/cave.sh"

10
rpms/awips2.cave/Installer.cave-wrapper/scripts/autostart/cave.desktop Normal file
View file

@ -0,0 +1,10 @@
[Desktop Entry]
Type=Application
Encoding=UTF-8
Version=1.0
Name=AWIPS CAVE
Comment=Unidata AWIPS CAVE Visualization Client
Icon=/awips2/cave/cave.png
Exec=/awips2/cave/cave.sh
Categories=Network;WebBrowser
X-Desktop-File-Install-Version=0.15

2
rpms/awips2.cave/Installer.cave-wrapper/scripts/autostart/awips2-textws.desktop → rpms/awips2.cave/Installer.cave-wrapper/scripts/autostart/textws.desktop
View file

@ -2,6 +2,6 @@
Type=Application
Encoding=UTF-8
Version=1.0
Name=No Name
Name=TextWS
Name[en_US]=TextWS
Exec=/bin/bash -i -c "sleep 2; /awips2/cave/textWS.sh"

4
rpms/awips2.cave/Installer.cave/component.spec
View file

@ -213,7 +213,6 @@ if [ -f /awips2/.cave/installCAVECommon.sh ]; then
rm -rf /awips2/.cave
fi
function updateCaveVersion() {
# Note: the system properties echoed to the versions script are based on
# about.mappings in the com.raytheon.viz.product.awips plugin.
@ -229,8 +228,11 @@ if [ -d /awips2/cave ]; then
updateCaveVersion
fi
chown -R awips:fxalpha /awips2/cave
%preun
%postun
rm -rf /awips2/cave
%clean
rm -rf ${RPM_BUILD_ROOT}

7
rpms/awips2.cave/Installer.cave/scripts/autostart/awips2-cave.desktop
View file

@ -1,7 +0,0 @@
[Desktop Entry]
Type=Application
Encoding=UTF-8
Version=1.0
Name=No Name
Name[en_US]=CAVE
Exec=/bin/bash -i -c "sleep 1; /awips2/cave/cave.sh"

65
rpms/awips2.cave/deploy.builder/build.sh
View file

@ -83,7 +83,6 @@ pde_base_dir=${build_project_dir}/cave
pde_build_dir=${pde_base_dir}/tmp
prepare_dir=${pde_base_dir}/prepare
awips_product=com.raytheon.viz.product.awips/awips.product
ncep_product=com.raytheon.viz.product.awips/nawips.product
if [ ${prepare_dir} ]; then
rm -rf ${prepare_dir}
@ -231,67 +230,3 @@ cp ${pde_build_dir}/I.CAVE/CAVE-linux.gtk.x86_64.zip ${WORKSPACE}/rpms/awips2.ca
cd ${WORKSPACE}/rpms/awips2.cave
buildRPMExec "Installer.cave" "awips2-cave"
buildRPMExec "Installer.cave-wrapper" ""
rm -rf ${pde_build_dir}
mkdir -p ${pde_build_dir}
cd ${prepare_dir}
/awips2/java/bin/java -jar -DbaseLocation=${UFRAME_ECLIPSE} \
-DbuildDirectory=${pde_build_dir} -DstagingDirectory=${WORKSPACE} \
-DbuildProduct=${ncep_product} -DbaseUpgrade=com.raytheon.viz.feature.awips \
-DoutputFile=${prepare_dir}/ncepInstall.txt \
-DexcludeFeatures=com.raytheon.viz.feature.awips.developer,com.raytheon.uf.viz.feature.alertviz \
AwipsDependencyEvaluator.jar
if [ $? -ne 0 ]; then
exit 1
fi
# Complete the nawips CAVE RCP build.
/awips2/java/bin/java -jar ${_pde_launcher_jar} -application org.eclipse.ant.core.antRunner \
-buildfile ${_pde_product_xml} -DbaseLocation=${UFRAME_ECLIPSE} \
-Dbuilder=${pde_base_dir} -DbuildDirectory=${pde_build_dir} \
-DforceContextQualifier=${_context_qualifier} \
-Dbase=${pde_base_dir} -Dproduct=${WORKSPACE}/${ncep_product}
if [ $? -ne 0 ]; then
exit 1
fi
unzip ${pde_build_dir}/I.CAVE/CAVE-linux.gtk.x86_64.zip -d ${pde_build_dir}/I.CAVE
for feature in `cat ${prepare_dir}/ncepInstall.txt`; do
if [ -d ${_repo_install_staging} ]; then
rm -rf ${_repo_install_staging}
fi
mkdir ${_repo_install_staging}
unzip ${REPO_DEST}/${feature}.zip -d ${_repo_install_staging}
CAVE_EXE="${pde_build_dir}/I.CAVE/cave/cave"
NOSPLASH_ARG="-nosplash"
DIRECTOR_APP="-application org.eclipse.equinox.p2.director"
#DESTINATION_ARG="-destination ${pde_build_dir}/I.CAVE/cave"
INSTALL_ARG="-i ${feature}.feature.group"
UNINSTALL_ARG="-u ${feature}.feature.group"
# Used to ensure that the awips2-java is used.
VM_ARG=/awips2/java/bin/java
REPO="-repository file:${_repo_install_staging}"
COMMON_CMD="${CAVE_EXE} -vm ${VM_ARG} ${NOSPLASH_ARG} ${DIRECTOR_APP} ${DESTINATION_ARG}"
INSTALL_CMD="${COMMON_CMD} ${INSTALL_ARG} ${REPO}"
${INSTALL_CMD}
if [ $? -ne 0 ]; then
exit 1
fi
done
rm -fv ${pde_build_dir}/I.CAVE/CAVE-linux.gtk.x86_64.zip
pushd . > /dev/null 2>&1
cd ${pde_build_dir}/I.CAVE
zip -r CAVE-linux.gtk.x86_64.zip cave
popd > /dev/null
# Copy the CAVE binary to the location expected by the RPM build
cp ${pde_build_dir}/I.CAVE/CAVE-linux.gtk.x86_64.zip ${WORKSPACE}/rpms/awips2.cave/setup/dist/
cd ${WORKSPACE}/rpms/awips2.cave
buildRPMExec "Installer.cave" "awips2-cave-ncep"