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

single awips2-gfesuite RPM for el7 to use common for both EDEX and CAVE

Browse source
This commit is contained in:
Michael James 2017-07-11 10:43:34 -04:00
parent 043608f5a4
commit 5c5e3e5207
8 changed files with 40 additions and 149 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
edexOsgi/com.raytheon.uf.tools.gfesuite/deploy.xml
View file

@ -22,7 +22,6 @@
<!-- Deploy script for the GFESuite Command Line Interface Tools. -->
<!-- Usage: -->
<!-- ant -f deploy.xml -Dinstall.dir={path to install} [-Dinstaller=true] -->
<!-- [-Dclient.build=true] -->
<!-- ================================================================================ -->
<project default="deploy.all" basedir="." >
@ -41,15 +40,15 @@
</condition>
<condition property="deploy.client" value="yes">
<istrue value="${client.build}"/>
<istrue value="true"/>
</condition>
<condition property="deploy.hti" value="yes">
<isfalse value="${client.build}"/>
<istrue value="true"/>
</condition>
<condition property="deploy.nwps" value="yes">
<isfalse value="${client.build}"/>
<istrue value="true"/>
</condition>
<property name="gfe.suite.home" value="${install.dir}" />
@ -67,7 +66,6 @@
<target name="deploy.all" description="Deploys GFESuite CLI tools to a specific directory">
<!-- copy the CLI tools to the deploy directory -->
<echo message="Updating ${gfe.suite.bin} with latest GFESuite tools" />
<echo message="deploy.client=${deploy.client}" />
<mkdir dir="${gfe.suite.bin}"/>
<antcall target="-deploy.cli.common"/>
<antcall target="-deploy.hti"/>

96
rpms/awips2.core/Installer.gfesuite-client/component.spec
View file

@ -1,96 +0,0 @@
#
# AWIPS II gfesuite client Spec File
#
Name: awips2-gfesuite-client
Summary: AWIPS II gfesuite client Installation
Version: %{_component_version}
Release: %{_component_release}%{?dist}
Group: AWIPSII
BuildRoot: /tmp
BuildArch: noarch
URL: N/A
License: N/A
Distribution: N/A
Vendor: %{_build_vendor}
Packager: %{_build_site}
AutoReq: no
Provides: awips2-gfesuite-client
Requires: awips2-python
Requires: awips2-cave
Requires: awips2-java
BuildRequires: awips2-ant
BuildRequires: awips2-java
%description
AWIPS II gfesuite-client Installation - Contains The AWIPS II gfesuite-client Component.
# 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')
%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
%build
%install
mkdir -p ${RPM_BUILD_ROOT}/awips2/GFESuite
if [ $? -ne 0 ]; then
exit 1
fi
GFESUITE_PROJECT="com.raytheon.uf.tools.gfesuite"
GFESUITE_DEPLOY_SCRIPT="%{_baseline_workspace}/${GFESUITE_PROJECT}/deploy.xml"
/awips2/ant/bin/ant -f ${GFESUITE_DEPLOY_SCRIPT} \
-Dinstall.dir=${RPM_BUILD_ROOT}/awips2/GFESuite \
-Dinstaller=true -Dclient.build=true
if [ $? -ne 0 ]; then
echo "ERROR: ant failed."
exit 1
fi
# Create additional directories that are required.
mkdir -p ${RPM_BUILD_ROOT}/awips2/GFESuite/exportgrids/primary
if [ $? -ne 0 ]; then
exit 1
fi
mkdir -p ${RPM_BUILD_ROOT}/awips2/GFESuite/exportgrids/backup
if [ $? -ne 0 ]; then
exit 1
fi
mkdir -p ${RPM_BUILD_ROOT}/awips2/GFESuite/products/ISC
if [ $? -ne 0 ]; then
exit 1
fi
mkdir -p ${RPM_BUILD_ROOT}/awips2/GFESuite/products/ATBL
if [ $? -ne 0 ]; then
exit 1
fi
%clean
rm -rf ${RPM_BUILD_ROOT}
%files
%defattr(644,root,root,-)
%defattr(644,awips,fxalpha,755)
%dir /awips2/GFESuite
/awips2/GFESuite/*
%defattr(755,awips,fxalpha,755)
%dir /awips2/GFESuite/bin
/awips2/GFESuite/bin/*
%defattr(644,awips,fxalpha,755)
%dir /awips2/GFESuite/bin/src
/awips2/GFESuite/bin/src/*
%dir /awips2/GFESuite/exportgrids
/awips2/GFESuite/exportgrids/*
%defattr(644,awips,fxalpha,775)
%dir /awips2/GFESuite/products
/awips2/GFESuite/products/*

14
rpms/awips2.core/Installer.gfesuite-server/component.spec → rpms/awips2.core/Installer.gfesuite/component.spec
View file

@ -1,8 +1,8 @@
#
# AWIPS II gfesuite server Spec File
# AWIPS II gfesuite Spec File
#
Name: awips2-gfesuite-server
Summary: AWIPS II gfesuite server Installation
Name: awips2-gfesuite
Summary: AWIPS II gfesuite Installation
Version: %{_component_version}
Release: %{_component_release}%{?dist}
Group: AWIPSII
@ -15,17 +15,16 @@ Vendor: %{_build_vendor}
Packager: %{_build_site}
AutoReq: no
Provides: awips2-gfesuite-server
Provides: awips2-gfesuite
Requires: numpy
Requires: awips2-python
Requires: awips2-edex-gfe
Requires: awips2-java
Obsoletes: awips2-gfesuite-server, awips2-gfesuite-client
BuildRequires: awips2-ant
BuildRequires: awips2-java
%description
AWIPS II gfesuite-client Installation - Contains The AWIPS II gfesuite-server Component.
AWIPS II gfesuite Installation - Contains The AWIPS II gfesuite Component.
# 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')
@ -81,7 +80,6 @@ fi
rm -rf ${RPM_BUILD_ROOT}
%files
%defattr(644,root,root,-)
%defattr(644,awips,fxalpha,755)
%dir /awips2/GFESuite
/awips2/GFESuite/*

3
rpms/awips2.core/deploy.builder/build.sh
View file

@ -158,8 +158,7 @@ cd ../
# Only Build The RPMs That May Have Changed - AWIPS II-Specific Components.
buildRPM "Installer.version"
buildRPM "Installer.gfesuite-client"
buildRPM "Installer.gfesuite-server"
buildRPM "Installer.gfesuite"
buildRPM "Installer.adapt-native"
buildRPM "Installer.alertviz"
buildRPM "Installer.aviation"

8
rpms/build/common/lookupRPM.sh
View file

@ -167,12 +167,8 @@ function lookupRPM()
export RPM_SPECIFICATION="${awips2_core_dir}/Installer.database-standalone-configuration"
return 0
fi
if [ "${1}" = "awips2-gfesuite-client" ]; then
export RPM_SPECIFICATION="${awips2_core_dir}/Installer.gfesuite-client"
return 0
fi
if [ "${1}" = "awips2-gfesuite-server" ]; then
export RPM_SPECIFICATION="${awips2_core_dir}/Installer.gfesuite-server"
if [ "${1}" = "awips2-gfesuite" ]; then
export RPM_SPECIFICATION="${awips2_core_dir}/Installer.gfesuite"
return 0
fi
if [ "${1}" = "awips2-hydroapps-shared" ]; then

44
rpms/build/x86_64/build.sh
View file

@ -179,47 +179,41 @@ if [ "${1}" = "-server" ]; then
buildRPM "awips2-edex-shapefiles"
buildRPM "awips2-edex-upc"
buildRPM "awips2-data.gfe"
buildRPM "awips2-gfesuite-client"
buildRPM "awips2-gfesuite-server"
buildRPM "awips2-gfesuite"
buildRPM "awips2-data.hdf5-topo"
buildRPM "awips2-yajsw"
fi
if [ "${1}" = "-rh6" ]; then
##buildEDEX
#buildRPM "awips2"
#buildRPM "awips2-java"
#buildRPM "awips2-pypies"
#buildRPM "awips2-python-awips"
#buildRPM "awips2-python-jep"
#buildRPM "awips2-ldm"
#buildRPM "awips2-tools"
#buildRPM "awips2-notification"
#buildRPM "awips2-hydroapps-shared"
##buildRPM "awips2-postgresql"
if [ "${1}" = "-rh7" ]; then
buildRPM "awips2-database"
buildRPM "awips2-gfesuite"
buildRPM "awips2-hydroapps-shared"
buildRPM "awips2-data.hdf5-topo"
buildRPM "awips2-maps-database"
buildRPM "awips2-ncep-database"
buildRPM "awips2-ldm"
buildRPM "awips2-common-base"
buildRPM "awips2-ant"
buildRPM "awips2-maven"
buildRPM "awips2-eclipse"
buildRPM "awips2-aviation-shared"
buildRPM "awips2-data.gfe"
buildEDEX
buildRPM "awips2"
buildRPM "awips2-java"
buildRPM "awips2-pypies"
buildRPM "awips2-python-awips"
buildRPM "awips2-python-jep"
buildRPM "awips2-tools"
buildRPM "awips2-notification"
buildRPM "awips2-httpd-pypies"
buildRPM "awips2-qpid-lib"
buildRPM "awips2-qpid-java"
buildRPM "awips2-qpid-java-broker"
buildRPM "awips2-database"
buildRPM "awips2-postgresql"
buildRPM "awips2-maps-database"
buildRPM "awips2-ncep-database"
buildLocalizationRPMs
buildRPM "awips2-adapt-native"
buildRPM "awips2-aviation-shared"
buildRPM "awips2-cli"
buildRPM "awips2-edex-environment"
buildRPM "awips2-edex-shapefiles"
buildRPM "awips2-edex-upc"
buildRPM "awips2-data.gfe"
buildRPM "awips2-gfesuite-client"
buildRPM "awips2-gfesuite-server"
buildRPM "awips2-groovy"
buildRPM "awips2-data.hdf5-topo"
buildRPM "awips2-yajsw"
exit 0
fi

9
rpms/unidata/repo.sh
View file

@ -7,5 +7,10 @@ pwd
repomanage -k1 --old . | xargs rm -f
createrepo -g ./comps.xml .
unset LD_LIBRARY_PATH
. /etc/profile.d/awips2.sh
rsync --archive --delete $RPMDIR tomcat@www:/web/content/repos/yum/awips2-dev/
#. /etc/profile.d/awips2.sh
rsync --archive --delete $RPMDIR js-17-218.jetstream-cloud.org:/awips2/repo/awips2_17.1.1
cd ..
#rm -rf awips2_${AWIPSII_VERSION}.tar
#tar -cf awips2_${AWIPSII_VERSION}.tar awips2_${AWIPSII_VERSION}
#scp awips2_${AWIPSII_VERSION}.tar mjames@129.114.17.218:/awips2/repo/

7
rpms/unidata/rsync.dirs
View file

@ -13,15 +13,12 @@ javaUtilities/* rpms pythonPackages nativeLib/*
../awips2-nws/viz/*
../awips2-nws/features/*
../awips2-nws/edex/*
../awips2-nasa/edex/*
../awips2-nasa/features/*
../awips2-nasa/features/*
../awips2-nasa/edex/*
../awips2-cimss/common/*
../awips2-cimss/viz/*
../awips2-cimss/features/*
../awips2-cimss/edex/*
../awips2-ohd/lib/*
../awips2-ohd/features/*
../awips2-ohd/edex/*
../awips2-ncep/common/*
../awips2-ncep/viz/*
../awips2-ncep/features/*