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

build updates for 16.4.1 edex

Browse source
This commit is contained in:
mjames-upc 2017-03-16 10:17:27 -06:00
parent 72f7e5a314
commit 2c2443f12a
10 changed files with 28 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/deploy.edex.awips2/esb/bin/start.sh
View file

@ -151,6 +151,6 @@ if [ ${RC} -ne 0 ]; then
exit 1
fi
YAJSW_JVM_ARGS="-Xmx32m -XX:MaxPermSize=12m -XX:ReservedCodeCacheSize=4m -Djava.io.tmpdir=${AWIPS2_TEMP}"
YAJSW_JVM_ARGS="-Xmx32m -XX:ReservedCodeCacheSize=4m -Djava.io.tmpdir=${AWIPS2_TEMP}"
java ${YAJSW_JVM_ARGS} -jar ${YAJSW_HOME}/wrapper.jar -c ${EDEX_HOME}/conf/${CONF_FILE} ${WRAPPER_ARGS}

9
build/deploy.edex.awips2/esb/conf/wrapper.conf
View file

@ -81,17 +81,14 @@ wrapper.jvm.parameter.order.1=-Dedex.run.mode
wrapper.jvm.parameter.order.2=-Daw.site.identifier
wrapper.jvm.parameter.order.LAST=-classpath
# sets the Maximum Permanent Generation memory size
wrapper.java.additional.3=-XX:MaxPermSize=${MAX_PERM_SIZE}
# disables JMX in Camel and speeds up EDEX startup and performance
wrapper.java.additional.4=-Dorg.apache.camel.jmx.disabled=true
wrapper.java.additional.3=-Dorg.apache.camel.jmx.disabled=true
# Enforces GMT to be used as the timezone
wrapper.java.additional.5=-Duser.timezone=GMT
wrapper.java.additional.4=-Duser.timezone=GMT
# Set default tmp to awips controlled directory for security
wrapper.java.additional.6=-Djava.io.tmpdir=${AWIPS2_TEMP}
wrapper.java.additional.5=-Djava.io.tmpdir=${AWIPS2_TEMP}
# garbage collection settings
wrapper.java.additional.gc.1=-XX:+UseConcMarkSweepGC

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

@ -193,10 +193,6 @@
id="com.raytheon.uf.viz.aviation.advisory.feature"
version="0.0.0"/>
<includes
id="com.raytheon.uf.viz.datadelivery.feature"
version="0.0.0"/>
<includes
id="edu.wisc.ssec.cimss.viz.convectprob.feature"
version="0.0.0"/>

4
cave/com.raytheon.viz.product.awips/developer.product
View file

@ -14,12 +14,12 @@
</configIni>
<launcherArgs>
<programArgs>-data @user.home/caveData -user @user.home/caveData -clean -consoleLog -component thinclient -alertviz</programArgs>
<programArgs>-data @user.home/caveData -user @user.home/caveData -clean -consoleLog -component thinclient -alertviz
</programArgs>
<vmArgs>-Xmx4536M
-XX:+UseG1GC
-Dosgi.instance.area.readOnly=true
-Dorg.eclipse.update.reconcile=false
-XX:MaxPermSize=256m
-Dorg.eclipse.ui/KEY_CONFIGURATION_ID=com.raytheon.viz.ui.cave.scheme
-Dqpid.dest_syntax=BURL
-Dlogback.configurationFile=logback-viz-core-developer.xml

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

@ -125,6 +125,10 @@
<param name="feature"
value="com.raytheon.uf.edex.remote.script.feature" />
</antcall>
<antcall target="build">
<param name="feature"
value="com.raytheon.uf.edex.goesr.feature" />
</antcall>
</target>

8
edexOsgi/build.edex/edex/common.properties
View file

@ -8,7 +8,7 @@ includegen.filter=raytheon|noaa\.nws|gov.nasa.msfc|noaa\.gsd|edu\.wisc\.ssec\.ci
core.repo=awips2-core
core-foss.repo=awips2-core-foss
awips2-foss.repo=awips2-foss
awips2-goesr.repo=awips2-goesr
awips2-ncep.repo=awips2-ncep
awips2-cimss.repo=awips2-cimss
awips2-gsd.repo=awips2-gsd
@ -16,11 +16,10 @@ awips2-ohd.repo=awips2-ohd
#awips2-unidata.repo=awips2-unidata
#epdt.repo=EPDT
core.repositories=${core.repo},${core-foss.repo},${awips2-foss.repo},${awips2-ncep.repo}
core.repositories=${core.repo},${core-foss.repo},${awips2-foss.repo},${awips2-ncep.repo},${awips2-goesr.repo}
optional.repositories=${awips2-cimss.repo},${awips2-gsd.repo},${awips2-ohd.repo}
#,${epdt.repo}
#,${awips2-unidata.repo}
# Note: currently, there is a limit of 99 plugin directories.
dir.01=cave
dir.02=cots
dir.03=edexOsgi
@ -28,14 +27,11 @@ dir.04=RadarServer
dir.05=edu
dir.06=ost
dir.07=ohd
# directories from ufcore
dir.08=common
dir.09=edex
dir.10=features
dir.11=viz
# directories from ufcore-foss
dir.12=lib
# CIMSS plug-in directory
dir.13=CIMSS
dir.14=foss

6
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
View file

@ -115,9 +115,13 @@
<includes
id="com.raytheon.uf.edex.remote.script.feature"
version="0.0.0"/>
<includes
id="com.raytheon.uf.edex.config.auto.feature"
version="0.0.0"/>
<includes
id="com.raytheon.uf.edex.goesr.feature"
version="0.0.0"/>
</feature>

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

@ -109,17 +109,17 @@ if [ "${1}" = "-viz" ]; then
fi
if [ "${1}" = "-rh6" ]; then
#buildRPM "awips2-postgresql"
#buildEDEX
#buildRPM "awips2-ldm"
#buildRPM "awips2-pypies"
#buildRPM "awips2-tools"
buildLocalizationRPMs
exit 0
#buildRPM "awips2-common-base"
#buildLocalizationRPMs
#buildRPM "awips2-notification"
#buildRPM "awips2-hydroapps-shared"
##buildRPM "awips2-java"
#buildRPM "awips2-postgresql"
#buildRPM "awips2-common-base"
#buildRPM "awips2-python"
#buildRPM "awips2-python-cherrypy"
#buildRPM "awips2-python-nose"
@ -150,8 +150,9 @@ if [ "${1}" = "-rh6" ]; then
#buildRPM "awips2-qpid-lib"
#buildRPM "awips2-qpid-java"
#buildRPM "awips2-qpid-java-broker"
buildRPM "awips2-database-standalone-configuration"
buildRPM "awips2-database"
#buildRPM "awips2-database-standalone-configuration"
#buildRPM "awips2-database"
buildRPM "awips2-maps-database"
buildRPM "awips2-ncep-database"
buildRPM "awips2-adapt-native"
@ -164,14 +165,9 @@ if [ "${1}" = "-rh6" ]; then
buildRPM "awips2-gfesuite-server"
buildRPM "awips2-groovy"
buildRPM "awips2-localapps-environment"
buildLocalizationRPMs
if [ $? -ne 0 ]; then
exit 1
fi
#buildRPM "awips2-pypies"
buildRPM "awips2-data.hdf5-topo"
buildRPM "awips2"
#buildRPM "awips2-yajsw"
buildRPM "awips2-yajsw"
exit 0
fi

2
rpms/unidata/build.sh
View file

@ -1,6 +1,6 @@
#!/bin/bash -v
set -xe
rm -rf /awips2/jenkins/buildspace/workspace/AWIPS2-UPC_build/baseline/
#rm -rf /awips2/jenkins/buildspace/workspace/AWIPS2-UPC_build/baseline/
export JENKINS_WORKSPACE=/awips2/repo/awips2-builds
# determine where we are ...

4
rpms/unidata/buildEnvironment.sh
View file

@ -15,8 +15,8 @@ export BUILD_WORKSPACE=${BUILD_DIR}/workspace
# baseline is...
export BASELINE="${JENKINS_WORKSPACE}"
export AWIPSII_VERSION="16.2.2"
export AWIPSII_RELEASE="3"
export AWIPSII_VERSION="16.4.1"
export AWIPSII_RELEASE="1"
export AWIPSII_TOP_DIR="${BUILD_WORKSPACE}/tmp/rpms_built_dir"