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

Issue #2297 - fix 14.2.1 build

Browse source 
- Amend: fix issue #

Change-Id: Ib438dfdb4f80320f2052c5941d80f2dbb49882e4

Former-commit-id: 1b35cf5c72 [formerly ff7244318b689bfee01796af0b1a0c1b277e4b48]
Former-commit-id: fb10395d44
This commit is contained in:
Bryan Kowal 2013-09-17 09:13:23 -05:00
parent 0da96389cf
commit 85c2c499b6
4 changed files with 2 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cave/build/alertviz/customTargets.xml
View file

@ -167,9 +167,7 @@
<!-- Update the 32-bit linux AlertViz zip with static files -->
<zip destfile="${buildDirectory}/${buildLabel}/${buildId}-linux.gtk.x86.zip"
update="true">
<fileset dir="${buildDirectory}/../../static/common"
excludes="cave/**" />
<fileset dir="${buildDirectory}/../../static/linux"
excludes="cave/**" />
@ -177,9 +175,7 @@
<!-- Update the 64-bit linux AlertViz zip with static files -->
<zip destfile="${buildDirectory}/${buildLabel}/${buildId}-linux.gtk.x86_64.zip"
update="true">
<fileset dir="${buildDirectory}/../../static/common"
excludes="cave/**" />
<fileset dir="${buildDirectory}/../../static/linux"
excludes="cave/**" />
@ -188,8 +184,6 @@
<zip destfile="${buildDirectory}/${buildLabel}/${buildId}-win32.win32.x86.zip"
update="true">
<fileset dir="${buildDirectory}/../../static/common"
excludes="cave/**" />
<fileset dir="${buildDirectory}/../../static/win32.x86"
excludes="cave/**" />

3
cave/build/cave/customTargets.xml
View file

@ -196,9 +196,6 @@
<fileset dir="${buildDirectory}/../../static/win32.x86"
excludes="alertviz/**" />
<!-- Include cave/etc in the win32 CAVE zip -->
<fileset dir="${buildDirectory}/../../static/common"
excludes="alertviz/**" />
</zip>
</target>

82
rpms/awips2.cave/Installer.cave-etc/component.spec
View file

@ -1,82 +0,0 @@
# RPM Metadata
%define _component_name awips2-cave-etc
%define _component_desc "awips2-cave-etc"
#
# awips2-cave-etc Spec File
#
%define __prelink_undo_cmd %{nil}
# 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')
%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-java-repack-jars[[:space:]].*$!!g')
Name: %{_component_name}
Summary: awips2-cave Installation
Version: %{_component_version}
Release: %{_component_release}
Group: AWIPSII
BuildRoot: /tmp
URL: N/A
License: N/A
Distribution: N/A
Vendor: Raytheon
Packager: Bryan Kowal
AutoReq: no
provides: %{_component_name}
requires: awips2-cave
requires: awips2
%description
%{_component_desc}
%prep
# Verify That The User Has Specified A BuildRoot.
if [ "${RPM_BUILD_ROOT}" = "/tmp" ]
then
echo "An Actual BuildRoot Must Be Specified. Use The --buildroot Parameter."
echo "Unable To Continue ... Terminating"
exit 1
fi
if [ -d ${RPM_BUILD_ROOT} ]; then
rm -rf ${RPM_BUILD_ROOT}
fi
mkdir -p ${RPM_BUILD_ROOT}/awips2/cave/etc
%build
%install
BASELINE_ETC_DIR="build/static/common/cave/etc"
ETC_DIR_LOC="%{_baseline_workspace}/${BASELINE_ETC_DIR}"
if [ ! -d ${ETC_DIR_LOC} ]; then
echo "ERROR: Unable to find CAVE etc directory."
exit 1
fi
cp -r ${ETC_DIR_LOC}/* ${RPM_BUILD_ROOT}/awips2/cave/etc
RC=$?
if [ ${RC} -ne 0 ]; then
echo "ERROR: Copy of CAVE etc directory has failed."
exit 1
fi
%pre
# Ensure that CAVE is available. There is not any point in installing
# the files if CAVE is not available.
if [ ! -f /awips2/cave/cave ]; then
echo "ERROR: The cave executable was not found or is corrupt - /awips2/cave/cave;"
echo " awips2-cave must be re-installed. This installation will be terminated."
exit 1
fi
%clean
rm -rf ${RPM_BUILD_ROOT}
%files
%defattr(644,awips,fxalpha,755)
%dir /awips2
%dir /awips2/cave
%dir /awips2/cave/etc
/awips2/cave/etc/*

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

@ -269,5 +269,4 @@ cd ../
# Only Build The RPMs That May Have Changed - AWIPS II-Specific Components.
buildRPM "Installer.cave"
buildRPM "Installer.cave-etc"
buildFeatureRPMs