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

Issue #1739 - updates for recent CAVE and EDEX feature-refactoring

Browse source 
- resolved EDEX rpm naming conflict
- resolved CAVE junit dependency issue

Change-Id: I8d868188ad8eff5f55ec9894477f1f772fa4d2dc

Former-commit-id: d081a2afcd [formerly d081a2afcd [formerly 7028a07133a943fe15b094bbd439cbd885463b2e]]
Former-commit-id: 4faf8aefbe
Former-commit-id: 497bf33892
This commit is contained in:
Bryan Kowal 2013-02-28 18:08:33 -06:00
parent 0778375180
commit cb5a2677b9
9 changed files with 25 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -157,11 +157,11 @@
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.viz.cots.feature" />
value="com.raytheon.uf.common.base.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.common.base.feature" />
value="com.raytheon.uf.viz.cots.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"

1
cave/com.raytheon.uf.viz.common.core.feature/feature.xml
View file

@ -19,7 +19,6 @@
<requires>
<import feature="com.raytheon.uf.viz.cots.feature" version="1.0.0.qualifier"/>
<import feature="com.raytheon.uf.common.base.feature" version="1.0.0.qualifier"/>
</requires>
<plugin

10
cave/com.raytheon.uf.viz.cots.feature/feature.xml
View file

@ -16,6 +16,10 @@
<license url="http://www.example.com/license">
[Enter License Description here.]
</license>
<requires>
<import feature="com.raytheon.uf.common.base.feature" version="1.0.0.qualifier"/>
</requires>
<plugin
id="javax.media.opengl"
@ -131,12 +135,6 @@
install-size="0"
version="0.0.0"/>
<plugin
id="org.junit"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="com.sun.jna"
download-size="0"

6
edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
View file

@ -124,6 +124,12 @@
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.junit"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="com.raytheon.uf.common.message"

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

@ -187,21 +187,21 @@ function buildFeatureRPMs()
if [ "${feature}" = "com.raytheon.uf.common.base.feature" ]; then
echo 'export COMPONENT_NAME="awips2-cave-common-base"' > \
${CONST_SETUP_DIR}/feature.setup
echo 'export COMPONENT_FEATURE="com.raytheon.uf.common.base.feature"' >> \
echo 'export COMPONENT_FEATURE="${feature}"' >> \
${CONST_SETUP_DIR}/feature.setup
echo 'export COMPONENT_DESC="awips2-cave-common-base"' >> \
${CONST_SETUP_DIR}/feature.setup
echo 'export DOWNSTREAM_REQUIRES="awips2-cave"' >> \
${CONST_SETUP_DIR}/feature.setup
else
if [ "${feature}" = "com.raytheon.uf.viz.common.core.feature" ]; then
echo 'export COMPONENT_NAME="awips2-cave-viz-common-core"' > \
if [ "${feature}" = "com.raytheon.uf.viz.cots.feature" ]; then
echo 'export COMPONENT_NAME="awips2-cave-viz-cots"' > \
${CONST_SETUP_DIR}/feature.setup
echo 'export COMPONENT_FEATURE="com.raytheon.uf.viz.common.core.feature"' >> \
echo 'export COMPONENT_FEATURE="${feature}"' >> \
${CONST_SETUP_DIR}/feature.setup
echo 'export COMPONENT_DESC="awips2-cave-viz-common-core"' >> \
echo 'export COMPONENT_DESC="awips2-cave-viz-cots"' >> \
${CONST_SETUP_DIR}/feature.setup
echo 'export DOWNSTREAM_REQUIRES="awips2-cave-viz-cots awips2-cave-common-base"' >> \
echo 'export DOWNSTREAM_REQUIRES="awips2-cave-common-base"' >> \
${CONST_SETUP_DIR}/feature.setup
else
java -jar ${PROCESS_FEATURE_JAR} \

12
rpms/awips2.edex/Installer.edex-base/component.spec → rpms/awips2.edex/Installer.edex/component.spec
View file

@ -1,7 +1,7 @@
#
# AWIPS II edex-base Spec File
# AWIPS II EDEX Spec File
#
Name: awips2-edex-base
Name: awips2-edex
Summary: AWIPS II Edex
Version: %{_component_version}
Release: %{_component_release}
@ -13,14 +13,14 @@ Distribution: N/A
Vendor: Raytheon
Packager: Bryan Kowal
provides: awips2-edex-base
provides: awips2-edex
provides: awips2-base-component
requires: awips2-python
requires: awips2-java
requires: awips2-psql
%description
AWIPS II Edex Installation - Installs and configures AWIPS II Edex "Base".
AWIPS II Edex Installation - Installs and configures AWIPS II Edex.
# Turn off the brp-python-bytecompile script
%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
@ -56,7 +56,7 @@ if [ "${BUILD_ARCH}" = "i386" ]; then
BUILD_ARCH="x86"
fi
# use deploy-install to deploy edex-base.
# use deploy-install to deploy edex.
pushd . > /dev/null
cd %{_baseline_workspace}
/awips2/ant/bin/ant -f ${DEPLOY_SCRIPT} \
@ -74,7 +74,7 @@ popd > /dev/null
INSTALLER_RPM="%{_baseline_workspace}/rpms"
# copy the service script.
EDEX_BASE="${INSTALLER_RPM}/awips2.edex/Installer.edex-base"
EDEX_BASE="${INSTALLER_RPM}/awips2.edex/Installer.edex"
cp -v ${EDEX_BASE}/scripts/init.d/* \
%{_build_root}/etc/init.d
if [ $? -ne 0 ]; then

0
rpms/awips2.edex/Installer.edex-base/scripts/init.d/edexServiceList → rpms/awips2.edex/Installer.edex/scripts/init.d/edexServiceList
View file

0
rpms/awips2.edex/Installer.edex-base/scripts/init.d/edex_camel → rpms/awips2.edex/Installer.edex/scripts/init.d/edex_camel
View file

2
rpms/awips2.edex/deploy.builder/build.sh
View file

@ -151,7 +151,7 @@ setTargetArchitecture
# Adjust Our Execution Position.
cd ../
buildRPM "Installer.edex-base"
buildRPM "Installer.edex"
buildRPM "Installer.edex-configuration"
buildRPM "Installer.edex-shapefiles"
# build the edex-datadelivery rpm