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

16.2.2-1 build spec updates

Browse source
This commit is contained in:
mjames-upc 2016-07-15 14:48:53 -06:00
parent 3d65da712c
commit d03493966f
10 changed files with 122 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
edexOsgi/build.edex/build.xml
View file

@ -18,6 +18,11 @@
value="org.eclipse.equinox.launcher_1.3.0.v20120522-1813.jar" /> value="org.eclipse.equinox.launcher_1.3.0.v20120522-1813.jar" />
<target name="main-build" depends="clean"> <target name="main-build" depends="clean">
<!--
<antcall target="build">
<param name="feature"
value="com.raytheon.uf.edex.datadelivery.feature" />
</antcall>-->
<antcall target="build"> <antcall target="build">
<param name="feature" <param name="feature"
value="com.raytheon.uf.common.base.feature" /> value="com.raytheon.uf.common.base.feature" />
@ -118,12 +123,10 @@
<param name="feature" <param name="feature"
value="com.raytheon.uf.edex.binlightning.feature" /> value="com.raytheon.uf.edex.binlightning.feature" />
</antcall> </antcall>
<!--
<antcall target="build"> <antcall target="build">
<param name="feature" <param name="feature"
value="gov.nasa.msfc.sport.edex.sportlma.feature" /> value="gov.nasa.msfc.sport.edex.sportlma.feature" />
</antcall> </antcall>
-->
</target> </target>
<!-- <!--
@ -215,7 +218,38 @@
</classpath> </classpath>
</java> </java>
</target> </target>
<target name="buildHybrid" depends="clean">
<echo message="feature=com.raytheon.uf.common.base.feature" />
<java
classname="org.eclipse.core.launcher.Main"
fork="true"
failonerror="true">
<arg value="-application" />
<arg value="org.eclipse.ant.core.antRunner" />
<arg value="-buildfile" />
<arg value="${uframe.eclipse}/plugins/${pde.build.script}" />
<arg value="-DbaseLocation=${uframe.eclipse}" />
<arg value="-Dbuilder=${basedir}/edex" />
<arg value="-DbuildDirectory=${basedir}/edex/tmp" />
<arg value="-DtopLevelElementId=com.raytheon.uf.common.base.feature" />
<arg value="-Dbase=${basedir}/edex" />
<arg value="-Dconfigs=${build.os},${build.ws},${build.arch}" />
<arg value="-Dgenerate.p2.metadata=true" />
<arg value="-Dp2.metadata.repo=file:/${basedir}/edex/postBuild/awips2/cave/.repository" />
<arg value="-Dp2.artifact.repo=file:/${basedir}/edex/postBuild/awips2/cave/.repository" />
<arg value="-Dp2.publish.artifacts=true" />
<arg value="-DgenerateVersionsList=true" />
<classpath>
<pathelement
location="${uframe.eclipse}/plugins/${eclipse.launcher.jar}" />
</classpath>
</java>
<antcall target="clean" />
</target>
<target name="clean"> <target name="clean">
<if> <if>
<available file="${basedir}/edex/includes" <available file="${basedir}/edex/includes"

6
rpms/awips2.core/Installer.edex-environment/edex/component.spec
View file

@ -108,10 +108,10 @@ if [ $? -ne 0 ]; then
fi fi
RPM_PROJECT="%{_baseline_workspace}/rpms" RPM_PROJECT="%{_baseline_workspace}/rpms"
POSTGRES_INITD="%{_baseline_workspace}/installers/RPMs/postgresql/scripts/init.d/edex_postgres" POSTGRES_INITD="%{_baseline_workspace}/rpms/awips2.core/Installer.postgres/scripts/init.d/edex_postgres"
QPID_INITD="%{_baseline_workspace}/installers/RPMs/qpid-java-broker/scripts/init.d/qpidd" QPID_INITD="%{_baseline_workspace}/foss/qpid-java-broker-0.32/src/patch/qpid-java-broker/wrapper/qpidd"
EDEX_INITD="${RPM_PROJECT}/awips2.edex/Installer.edex/scripts/init.d/edex_camel" EDEX_INITD="${RPM_PROJECT}/awips2.edex/Installer.edex/scripts/init.d/edex_camel"
HTTPD_PYPIES_INITD="%{_baseline_workspace}/installers/RPMs/httpd-pypies/configuration/etc/init.d/httpd-pypies" HTTPD_PYPIES_INITD="%{_baseline_workspace}/rpms/awips2.core/Installer.httpd-pypies/configuration/etc/init.d/httpd-pypies"
# Copy the startup scripts. # Copy the startup scripts.
cp ${POSTGRES_INITD} \ cp ${POSTGRES_INITD} \

2
rpms/awips2.core/Installer.maps-database/component.spec
View file

@ -45,7 +45,7 @@ fi
cp -r %{_baseline_workspace}/build.edex/opt/db/ddl/maps/* \ cp -r %{_baseline_workspace}/build.edex/opt/db/ddl/maps/* \
${RPM_BUILD_ROOT}/awips2/database/sqlScripts/share/sql/maps ${RPM_BUILD_ROOT}/awips2/database/sqlScripts/share/sql/maps
PATH_TO_STATIC_DDL="/home/awips/awips2-static/maps/db" PATH_TO_STATIC_DDL=%{_static_files}/maps/db
if [ ! -d ${PATH_TO_STATIC_DDL} ]; then if [ ! -d ${PATH_TO_STATIC_DDL} ]; then
echo "File ${PATH_TO_STATIC_DDL} not found!" echo "File ${PATH_TO_STATIC_DDL} not found!"
exit 1 exit 1

4
rpms/awips2.core/Installer.tools/component.spec
View file

@ -7,8 +7,8 @@
Name: awips2-tools Name: awips2-tools
Summary: AWIPS II Tools Distribution Summary: AWIPS II Tools Distribution
Version: 1.8.5 Version: %{_component_version}
Release: %{_component_version}.%{_component_release}%{?dist} Release: 1.8.5%{?dist}
Group: AWIPSII Group: AWIPSII
BuildRoot: %{_build_root} BuildRoot: %{_build_root}
BuildArch: %{_build_arch} BuildArch: %{_build_arch}

2
rpms/awips2.shapefiles/Installer.edex-shapefiles/component.spec
View file

@ -46,7 +46,7 @@ if [ $? -ne 0 ]; then
exit 1 exit 1
fi fi
SHAPEFILES=%{_static_files}/awips2-static/maps/shapefiles SHAPEFILES=%{_static_files}/maps/shapefiles
if [ ! -d ${SHAPEFILES} ]; then if [ ! -d ${SHAPEFILES} ]; then
file ${SHAPEFILES} file ${SHAPEFILES}
exit 1 exit 1

4
rpms/awips2.shapefiles/deploy.builder/build.sh
View file

@ -51,10 +51,6 @@ function prepareBuildEnvironment()
if [ "${UFRAME_ECLIPSE}" = "" ]; then if [ "${UFRAME_ECLIPSE}" = "" ]; then
export UFRAME_ECLIPSE="${VAR_UFRAME_ECLIPSE}" export UFRAME_ECLIPSE="${VAR_UFRAME_ECLIPSE}"
fi fi
if [ "${AWIPSII_STATIC_FILES}" = "" ]; then
export AWIPSII_STATIC_FILES="/awips2/repo"
fi
} }
function setTargetArchitecture() function setTargetArchitecture()

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

@ -197,6 +197,10 @@ function lookupRPM()
export RPM_SPECIFICATION="${awips2_core_dir}/Installer.database" export RPM_SPECIFICATION="${awips2_core_dir}/Installer.database"
return 0 return 0
fi fi
if [ "${1}" = "awips2-edex-configuration" ]; then
export RPM_SPECIFICATION="${awips2_edex_dir}/Installer.edex-configuration"
return 0
fi
if [ "${1}" = "awips2-database-standalone-configuration" ]; then if [ "${1}" = "awips2-database-standalone-configuration" ]; then
export RPM_SPECIFICATION="${awips2_core_dir}/Installer.database-standalone-configuration" export RPM_SPECIFICATION="${awips2_core_dir}/Installer.database-standalone-configuration"
return 0 return 0

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

@ -107,31 +107,31 @@ if [ "${1}" = "-jep" ]; then
buildRPM "awips2-python-jep" buildRPM "awips2-python-jep"
fi fi
if [ "${1}" = "-pydev" ]; then if [ "${1}" = "-pydev" ]; then
#buildRPM "awips2-python" buildRPM "awips2-python"
#buildRPM "awips2-python-scientific" buildRPM "awips2-python-scientific"
buildRPM "awips2-python-awips" buildRPM "awips2-python-awips"
#buildRPM "awips2-python-jep" buildRPM "awips2-python-jep"
#buildRPM "awips2-python-gfe" buildRPM "awips2-python-gfe"
#buildRPM "awips2-python-numpy" buildRPM "awips2-python-numpy"
#buildRPM "awips2-python-pyparsing" buildRPM "awips2-python-pyparsing"
#buildRPM "awips2-python-six" buildRPM "awips2-python-six"
#buildRPM "awips2-python-nose" buildRPM "awips2-python-nose"
#buildRPM "awips2-python-h5py" buildRPM "awips2-python-h5py"
#buildRPM "awips2-pypies" #buildRPM "awips2-pypies"
#buildRPM "awips2-python-cycler" buildRPM "awips2-python-cycler"
#buildRPM "awips2-python-shapely" buildRPM "awips2-python-shapely"
#buildRPM "awips2-python-cython" buildRPM "awips2-python-cython"
#buildRPM "awips2-python-metpy" buildRPM "awips2-python-metpy"
#buildRPM "awips2-python-cartopy" buildRPM "awips2-python-cartopy"
#buildRPM "awips2-python-scipy" buildRPM "awips2-python-scipy"
#buildRPM "awips2-python-matplotlib" buildRPM "awips2-python-matplotlib"
#buildRPM "awips2-python-basemap" buildRPM "awips2-python-basemap"
# DONE # DONE
#buildRPM "awips2-python-pint" buildRPM "awips2-python-pint"
#buildRPM "awips2-python-dateutil" buildRPM "awips2-python-dateutil"
exit 0 exit 0
fi fi
@ -295,7 +295,7 @@ if [ "${1}" = "-httpd" ]; then
exit 0 exit 0
fi fi
if [ "${1}" = "-postgres" ]; then if [ "${1}" = "-postgres" ]; then
buildRPM "awips2-postgres" buildRPM "awips2-postgresql" # this builds awips2-psql too
exit 0 exit 0
fi fi
if [ "${1}" = "-maps" ]; then if [ "${1}" = "-maps" ]; then
@ -305,14 +305,19 @@ fi
if [ "${1}" = "-database" ]; then if [ "${1}" = "-database" ]; then
#buildRPM "awips2-pypies" #buildRPM "awips2-pypies"
buildRPM "awips2-database" #buildRPM "awips2-cli"
buildRPM "awips2-database-standalone-configuration" #buildRPM "awips2-edex-environment"
buildRPM "awips2-maps-database" #buildRPM "awips2-edex-configuration"
buildRPM "awips2-ncep-database" buildRPM "awips2-tools"
buildRPM "awips2-gfesuite-client" #buildRPM "awips2-notification"
buildRPM "awips2-gfesuite-server" #buildRPM "awips2-database"
buildRPM "awips2-data.hdf5-topo" #buildRPM "awips2-database-standalone-configuration"
buildRPM "awips2-data.gfe" #buildRPM "awips2-maps-database"
#buildRPM "awips2-ncep-database"
#buildRPM "awips2-gfesuite-client"
#buildRPM "awips2-gfesuite-server"
#buildRPM "awips2-data.hdf5-topo"
#buildRPM "awips2-data.gfe"
#buildRPM "awips2-python-pytz" #buildRPM "awips2-python-pytz"
#buildRPM "awips2-python-setuptools" #buildRPM "awips2-python-setuptools"
#buildRPM "awips2-maven" #buildRPM "awips2-maven"
@ -588,8 +593,8 @@ if [ "${1}" = "-shp" ]; then
fi fi
if [ "${1}" = "-edex" ]; then if [ "${1}" = "-edex" ]; then
#buildRPM "awips2" buildRPM "awips2"
#buildRPM "awips2-common-base" buildRPM "awips2-common-base"
buildEDEX buildEDEX
#buildRPM "awips2-data.hdf5-topo" #buildRPM "awips2-data.hdf5-topo"
#if [ $? -ne 0 ]; then #if [ $? -ne 0 ]; then

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

@ -151,4 +151,30 @@ function buildLocalizationRPMs()
return 0 return 0
} }
function buildShapefiles()
{
cd ${WORKSPACE}/rpms/awips2.shapefiles/deploy.builder
if [ $? -ne 0 ]; then
echo "ERROR: Failed to build the edex shapefile rpm."
return 1
fi
# Determine the build architecture.
export EDEX_BUILD_ARCH=`uname -i`
if [ "${EDEX_BUILD_ARCH}" = "i386" ]; then
export EDEX_BUILD_ARCH="x86"
fi
if [ $? -ne 0 ]; then
echo "ERROR: Failed to determine the architecture."
return 1
fi
/bin/bash build.sh
if [ $? -ne 0 ]; then
echo "ERROR: Failed to build the edex shapefile rpm."
return 1
fi
return 0
}

6
rpms/unidata/buildEnvironment.sh
View file

@ -15,7 +15,7 @@ export BUILD_WORKSPACE=${BUILD_DIR}/workspace
# baseline is... # baseline is...
export BASELINE="${JENKINS_WORKSPACE}" export BASELINE="${JENKINS_WORKSPACE}"
export AWIPSII_VERSION="16.2.2" export AWIPSII_VERSION="16.2.2"
export AWIPSII_RELEASE="2" export AWIPSII_RELEASE="1"
export AWIPSII_TOP_DIR="${BUILD_WORKSPACE}/tmp/rpms_built_dir" export AWIPSII_TOP_DIR="${BUILD_WORKSPACE}/tmp/rpms_built_dir"
@ -23,9 +23,7 @@ export AWIPSII_TOP_DIR="${BUILD_WORKSPACE}/tmp/rpms_built_dir"
export WORKSPACE="${BUILD_WORKSPACE}/AWIPS2-UPC_build/baseline" export WORKSPACE="${BUILD_WORKSPACE}/AWIPS2-UPC_build/baseline"
export UFRAME_ECLIPSE="/awips2/eclipse" export UFRAME_ECLIPSE="/awips2/eclipse"
export AWIPSII_STATIC_FILES="/home/${USER}/awips2-static"
export AWIPSII_STATIC_FILES="/awips2/repo"
export AWIPSII_STATIC_FILES="/home/awips/awips2-static"
export AWIPSII_BUILD_ROOT="${BUILD_WORKSPACE}/tmp/${USER}/awips-component" export AWIPSII_BUILD_ROOT="${BUILD_WORKSPACE}/tmp/${USER}/awips-component"
export REPO_DEST="${BUILD_WORKSPACE}/tmp/${USER}/repo" export REPO_DEST="${BUILD_WORKSPACE}/tmp/${USER}/repo"