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

okay lets just edit all of them to make sure, and because consistensy is a good thing and you will end up doing it anyway so why not now?

Browse source
This commit is contained in:
mjames-upc 2014-05-16 20:11:08 -06:00
parent 2bec1dedfb
commit 1b1c7b621e
22 changed files with 400 additions and 435 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cave/build/build.xml
View file

@ -1,6 +1,6 @@
<project default="usage" basedir=".">
<property name="eclipse.dir"
value="/opt/uframe-eclipse" />
value="/awips2/eclipse" />
<property name="build.os"
value="linux" />
<property name="build.ws"
@ -128,4 +128,4 @@
<taskdef resource="net/sf/antcontrib/antlib.xml"
classpath="${basedir}/lib/ant/ant-contrib-1.0b3.jar" />
</project>
</project>

8
cave/build/cave/build.properties
View file

@ -46,9 +46,9 @@ collectingFolder=${archivePrefix}
# configs=win32,win32,x86 & linux,motif,x86
# By default the value is *,*,*
#configs = *, *, *
configs=linux, gtk, x86 & \
linux, gtk, x86_64 & \
win32, win32, x86
configs=linux, gtk, x86_64
# linux, gtk, x86_64 & \
# win32, win32, x86
# win32, win32, x86 & \
# linux, gtk, x86_64 & \
# linux, motif, x86 & \
@ -134,7 +134,7 @@ timestamp=007
#Os/Ws/Arch/nl of the eclipse specified by baseLocation
baseos=linux
basews=gtk
basearch=x86
basearch=x86_64
#this property indicates whether you want the set of plug-ins and features to be considered during the build to be limited to the ones reachable from the features / plugins being built
filteredDependencyCheck=false

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

@ -13,7 +13,7 @@
<!-- TODO: Verify These Properties References An Actual Directory. -->
<property name="eclipse.dir"
value="/opt/uframe-eclipse" />
value="/awips2/eclipse" />
<property name="build.version"
value="1.0.0" />
<property name="workspace.dir" value="${basedir}/../" />
@ -332,4 +332,4 @@
<taskdef resource="net/sf/antcontrib/antlib.xml"
classpath="${basedir}/lib/ant/ant-contrib-1.0b3.jar" />
</project>
</project>

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

@ -2,7 +2,7 @@
<!-- TODO: Verify These Properties References An Actual Directory. -->
<property name="eclipse.dir"
value="/opt/uframe-eclipse" />
value="/awips2/eclipse" />
<property name="build.version"
value="1.0.0" />
<property name="build.os"

1
cave/build/tools/headup/AWIPS/awipsFileFilter.csv
View file

@ -8,7 +8,6 @@ includeFiletype,.sql
include,/com.raytheon
include,/build.cave
include,/build.edex
include,/build.rcm
include,/build.native
,,Exclude Patterns
exclude,/.svn/

1 ,,Valid FileTypes
8 include,/com.raytheon
9 include,/build.cave
10 include,/build.edex
include,/build.rcm
11 include,/build.native
12 ,,Exclude Patterns
13 exclude,/.svn/

1
cave/com.raytheon.uf.viz.feature.alertviz/build.properties
View file

@ -1 +1,2 @@
bin.includes = feature.xml
baseLocation = /awips2/repo/awips2-builds

721
cave/com.raytheon.uf.viz.feature.alertviz/feature.xml
View file

@ -42,475 +42,474 @@
<import plugin="javax.measure" version="1.0.0" match="greaterOrEqual"/>
</requires>
<plugin
id="ch.qos.logback"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="org.slf4j"
download-size="0"
install-size="0"
version="0.0.0"/>
version="1.7.5"/>
<plugin
id="org.springframework"
download-size="0"
install-size="0"
version="0.0.0"/>
version="3.1.4"/>
<plugin
id="org.reflections"
download-size="0"
install-size="0"
version="0.9.9"/>
<plugin
id="org.quartz"
download-size="0"
install-size="0"
version="1.8.6"/>
<plugin
id="org.postgres"
download-size="0"
install-size="0"
version="9.2.0"/>
<plugin
id="org.jep"
download-size="0"
install-size="0"
version="1.0.0.qualifier"/>
<plugin
id="org.javassist"
download-size="0"
install-size="0"
version="3.9.0.GA"/>
<plugin
id="org.hibernate"
download-size="0"
install-size="0"
version="1.0.0.qualifier"/>
<plugin
id="org.hamcrest"
download-size="0"
install-size="0"
version="1.3.0"/>
<plugin
id="org.geotools"
download-size="0"
install-size="0"
version="2.6.4"/>
<plugin
id="org.eclipse.core.runtime"
download-size="0"
install-size="0"
version="3.8.0.v20120521-2346"
unpack="false"/>
<plugin
id="org.apache.velocity"
download-size="0"
install-size="0"
version="1.7.0"/>
<plugin
id="org.apache.thrift"
download-size="0"
install-size="0"
version="0.9.0"/>
<plugin
id="org.apache.qpid"
download-size="0"
install-size="0"
version="1.0.0.18"/>
<plugin
id="org.apache.mina"
download-size="0"
install-size="0"
version="1.0.0.qualifier"/>
<plugin
id="org.apache.http"
download-size="0"
install-size="0"
version="4.1.2"/>
<plugin
id="org.apache.derby"
download-size="0"
install-size="0"
version="10.10.1.1"/>
<plugin
id="org.apache.commons.pool"
download-size="0"
install-size="0"
version="1.3.0"/>
<plugin
id="org.apache.commons.lang"
download-size="0"
install-size="0"
version="2.3.0"
unpack="false"/>
<plugin
id="org.apache.commons.io"
download-size="0"
install-size="0"
version="2.4.0"/>
<plugin
id="org.apache.commons.digester"
download-size="0"
install-size="0"
version="1.8.1"/>
<plugin
id="org.apache.commons.configuration"
download-size="0"
install-size="0"
version="1.6.0"/>
<plugin
id="org.apache.commons.collections"
download-size="0"
install-size="0"
version="3.2.0"/>
<plugin
id="org.apache.commons.codec"
download-size="0"
install-size="0"
version="1.4.0"
unpack="false"/>
<plugin
id="org.apache.commons.beanutils"
download-size="0"
install-size="0"
version="1.8.3"/>
<plugin
id="org.apache.activemq"
download-size="0"
install-size="0"
version="0.0.0"/>
version="5.2.0"/>
<plugin
id="net.sf.ehcache"
download-size="0"
install-size="0"
version="1.0.0.qualifier"/>
<plugin
id="net.sf.cglib"
download-size="0"
install-size="0"
version="0.0.0"/>
version="2.1.3"/>
<plugin
id="javax.vecmath"
download-size="0"
install-size="0"
version="1.3.1"/>
<plugin
id="javax.persistence"
download-size="0"
install-size="0"
version="1.0.0.qualifier"/>
<plugin
id="javax.measure"
download-size="0"
install-size="0"
version="1.0.0.qualifier"/>
<plugin
id="javax.jms"
download-size="0"
install-size="0"
version="1.0.0.qualifier"/>
<plugin
id="com.google.guava"
download-size="0"
install-size="0"
version="1.0.0.qualifier"/>
<plugin
id="com.raytheon.uf.viz.alertviz"
download-size="0"
install-size="0"
version="0.0.0"/>
version="1.12.1174.qualifier"/>
<plugin
id="com.raytheon.uf.common.localization"
id="com.raytheon.uf.viz.alertviz.ui"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
version="1.12.1174.qualifier"/>
<plugin
id="com.raytheon.uf.common.serialization"
id="com.raytheon.uf.viz.application"
download-size="0"
install-size="0"
version="0.0.0"
version="1.0.0.qualifier"
unpack="false"/>
<plugin
id="com.raytheon.uf.viz.core"
download-size="0"
install-size="0"
version="0.0.0"/>
version="1.13.0.qualifier"/>
<plugin
id="org.apache.commons.collections"
id="com.raytheon.uf.viz.plugin.nwsauth"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="org.apache.commons.codec"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="org.apache.commons.configuration"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="org.apache.commons.digester"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="org.apache.commons.beanutils"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="javax.persistence"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="org.apache.thrift"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="org.geotools"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="javax.vecmath"
download-size="0"
install-size="0"
version="0.0.0"/>
version="1.12.1174.qualifier"
unpack="false"/>
<plugin
id="com.raytheon.uf.viz.product.alertviz"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.raytheon.uf.viz.alertviz.ui"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="com.raytheon.uf.common.status"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.raytheon.uf.common.colormap"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.raytheon.uf.common.time"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="com.raytheon.uf.common.dataplugin"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.raytheon.uf.common.python"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.postgres"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="org.jep"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="org.apache.velocity"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="javax.measure"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="org.apache.commons.pool"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="net.sf.ehcache"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="com.raytheon.uf.common.message"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.raytheon.uf.common.datastorage"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.raytheon.uf.common.geospatial"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="com.raytheon.uf.common.dataaccess"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="com.raytheon.uf.common.pointdata"
download-size="0"
install-size="0"
version="0.0.0"
version="1.12.1174.qualifier"
unpack="false"/>
<plugin
id="com.raytheon.uf.viz.python.swt"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.raytheon.uf.common.serialization.comm"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.raytheon.uf.common.dataplugin.level"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.qpid"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="javax.jms"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="org.apache.mina"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="com.raytheon.uf.common.util"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.javassist"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="org.hibernate"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="com.raytheon.uf.common.topo"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.raytheon.uf.common.auth"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.raytheon.uf.common.comm"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.hamcrest.core"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.raytheon.uf.common.alertviz"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.raytheon.uf.common.dataquery"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.raytheon.uf.common.site"
download-size="0"
install-size="0"
version="0.0.0"
version="1.12.1174.qualifier"
unpack="false"/>
<plugin
id="com.raytheon.uf.viz.spring.dm"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.core.runtime"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.raytheon.uf.common.alertmonitor"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.http"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="com.raytheon.uf.viz.application"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.raytheon.uf.common.plugin.nwsauth"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.raytheon.uf.viz.plugin.nwsauth"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.raytheon.uf.common.cache"
download-size="0"
install-size="0"
version="0.0.0"
version="1.1.1153.qualifier"
unpack="false"/>
<plugin
id="com.raytheon.uf.viz.thinclient"
download-size="0"
install-size="0"
version="0.0.0"/>
version="1.0.0.qualifier"/>
<plugin
id="com.raytheon.uf.viz.thinclient.alertviz"
download-size="0"
install-size="0"
version="0.0.0"
version="1.0.0.qualifier"
unpack="false"/>
<plugin
id="com.raytheon.viz.ui"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="com.raytheon.viz.core"
download-size="0"
install-size="0"
version="0.0.0"/>
version="1.12.1174.qualifier"/>
<plugin
id="org.apache.commons.lang"
id="com.raytheon.viz.ui"
download-size="0"
install-size="0"
version="0.0.0"
version="1.12.1174.qualifier"/>
<plugin
id="com.raytheon.uf.common.velocity"
download-size="0"
install-size="0"
version="1.0.0.qualifier"
unpack="false"/>
<plugin
id="com.raytheon.uf.common.util"
download-size="0"
install-size="0"
version="1.12.1174.qualifier"
unpack="false"/>
<plugin
id="com.raytheon.uf.common.units"
download-size="0"
install-size="0"
version="0.0.0"
version="1.0.0.qualifier"/>
<plugin
id="com.raytheon.uf.common.topo"
download-size="0"
install-size="0"
version="1.12.1174.qualifier"
unpack="false"/>
<plugin
id="com.raytheon.uf.common.velocity"
id="com.raytheon.uf.common.time"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.quartz"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="org.apache.derby"
download-size="0"
install-size="0"
version="0.0.0"/>
version="1.12.1174.qualifier"/>
<plugin
id="com.raytheon.uf.common.style"
download-size="0"
install-size="0"
version="0.0.0"
version="1.0.0.qualifier"
unpack="false"/>
<plugin
id="com.google.guava"
id="com.raytheon.uf.common.status"
download-size="0"
install-size="0"
version="0.0.0"/>
version="1.12.1174.qualifier"
unpack="false"/>
<plugin
id="org.reflections"
id="com.raytheon.uf.common.site"
download-size="0"
install-size="0"
version="0.0.0"/>
version="1.12.1174.qualifier"
unpack="false"/>
<plugin
id="org.apache.commons.io"
id="com.raytheon.uf.common.serialization.comm"
download-size="0"
install-size="0"
version="0.0.0"/>
version="1.12.1174.qualifier"
unpack="false"/>
<plugin
id="com.raytheon.uf.common.serialization"
download-size="0"
install-size="0"
version="1.12.1174.qualifier"
unpack="false"/>
<plugin
id="com.raytheon.uf.common.python"
download-size="0"
install-size="0"
version="1.12.1174.qualifier"
unpack="false"/>
<plugin
id="com.raytheon.uf.common.pointdata"
download-size="0"
install-size="0"
version="1.13.0.qualifier"
unpack="false"/>
<plugin
id="com.raytheon.uf.common.plugin.nwsauth"
download-size="0"
install-size="0"
version="1.12.1174.qualifier"
unpack="false"/>
<plugin
id="com.raytheon.uf.common.message"
download-size="0"
install-size="0"
version="1.12.1174.qualifier"
unpack="false"/>
<plugin
id="com.raytheon.uf.common.localization"
download-size="0"
install-size="0"
version="1.12.1174.qualifier"
unpack="false"/>
<plugin
id="com.raytheon.uf.common.geospatial"
download-size="0"
install-size="0"
version="1.12.1174.qualifier"/>
<plugin
id="com.raytheon.uf.common.datastorage"
download-size="0"
install-size="0"
version="1.12.1174.qualifier"
unpack="false"/>
<plugin
id="com.raytheon.uf.common.dataquery"
download-size="0"
install-size="0"
version="1.0.0.qualifier"
unpack="false"/>
<plugin
id="com.raytheon.uf.common.dataplugin.level"
download-size="0"
install-size="0"
version="1.12.1174.qualifier"
unpack="false"/>
<plugin
id="com.raytheon.uf.common.dataplugin"
download-size="0"
install-size="0"
version="1.12.1174.qualifier"
unpack="false"/>
<plugin
id="com.raytheon.uf.common.dataaccess"
download-size="0"
install-size="0"
version="1.0.0.qualifier"/>
<plugin
id="com.raytheon.uf.common.comm"
download-size="0"
install-size="0"
version="1.12.1174.qualifier"
unpack="false"/>
<plugin
id="com.raytheon.uf.common.colormap"
download-size="0"
install-size="0"
version="1.12.1174.qualifier"
unpack="false"/>
<plugin
id="com.raytheon.uf.common.cache"
download-size="0"
install-size="0"
version="1.12.1174.qualifier"
unpack="false"/>
<plugin
id="com.raytheon.uf.common.auth"
download-size="0"
install-size="0"
version="1.12.1174.qualifier"
unpack="false"/>
<plugin
id="com.raytheon.uf.common.alertviz"
download-size="0"
install-size="0"
version="1.0.0.qualifier"
unpack="false"/>
<plugin
id="com.raytheon.uf.common.alertmonitor"
download-size="0"
install-size="0"
version="1.12.1174.qualifier"
unpack="false"/>
<plugin
id="ch.qos.logback"
download-size="0"
install-size="0"
version="1.0.13"/>
</feature>

2
cave/com.raytheon.viz.product.awips/awips.product
View file

@ -14,7 +14,7 @@
</configIni>
<launcherArgs>
<programArgs>-data @user.home/caveData -user @user.home/caveData -clean</programArgs>
<programArgs>-data @user.home/caveData -user @user.home/caveData -clean -perspective NCP</programArgs>
<programArgsLin>-consoleLog</programArgsLin>
<vmArgs>-Xincgc -Dosgi.instance.area.readOnly=true
-Declipse.log.enabled=false

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

@ -14,7 +14,7 @@
</configIni>
<launcherArgs>
<programArgs>-data @user.home/caveData -user @user.home/caveData -clean -consoleLog -alertviz</programArgs>
<programArgs>-data @user.home/caveData -user @user.home/caveData -clean -consoleLog -alertviz -perspective NCP</programArgs>
<vmArgs>-Xincgc -Xmx1024M -Dosgi.instance.area.readOnly=true
-Declipse.log.enabled=false
-XX:+UnlockDiagnosticVMOptions -XX:+UnsyncloadClass

40
cave/com.raytheon.viz.radar.feature/feature.xml
View file

@ -24,56 +24,22 @@
<import feature="com.raytheon.uf.viz.core.feature" version="1.0.0.qualifier"/>
</requires>
<plugin
id="com.raytheon.rcm.lib"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.raytheon.uf.viz.radarapps.config"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.raytheon.uf.viz.radarapps.fsi"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="com.raytheon.uf.viz.radarapps.requests"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.raytheon.uf.viz.radarapps.rps"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.raytheon.uf.viz.radarapps.core"
download-size="0"
install-size="0"
version="0.0.0"/>
version="1.12.1174.qualifier"/>
<plugin
id="com.raytheon.uf.viz.radar.gl"
download-size="0"
install-size="0"
version="0.0.0"/>
version="1.12.1174.qualifier"/>
<plugin
id="com.raytheon.viz.radar"
download-size="0"
install-size="0"
version="0.0.0"/>
version="1.12.1174.qualifier"/>
</feature>

2
edexOsgi/build.edex/build-docs.xml
View file

@ -20,7 +20,7 @@
</fileset>
<!-- ECLIPSE RCP libraries -->
<fileset dir="${projects.dir}/uframe-eclipse/plugins">
<fileset dir="${projects.dir}/eclipse/plugins">
<include name="**/*.jar/" />
</fileset>
</path>

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

@ -1,6 +1,6 @@
<project name="Build EDEX" default="main">
<property name="uframe.eclipse"
value="/opt/uframe-eclipse" />
value="/awips2/eclipse" />
<property name="build.version"
value="1.0.0" />
<property name="build.os"

4
javaUtilities/build.wes2bridge.utility/ant/setup.xml
View file

@ -6,7 +6,7 @@
<property name="destination.directory"
value="" />
<!-- The location of uframe-eclipse. -->
<property name="eclipse.directory" value="/opt/uframe-eclipse" />
<property name="eclipse.directory" value="/awips2/eclipse" />
<!-- Used to indicate if this is part of an rpm build. -->
<property name="rpm.build" value="false" />
@ -29,4 +29,4 @@
<var name="bin.dir" value="bin" />
</else>
</if>
</project>
</project>

4
javaUtilities/build.wes2bridge.utility/build.xml
View file

@ -1,6 +1,6 @@
<project default="build" basedir=".">
<property name="eclipse.dir"
value="/opt/uframe-eclipse" />
value="/awips2/eclipse" />
<target name="init">
<antcall target="clean" />
@ -57,4 +57,4 @@
<taskdef resource="net/sf/antcontrib/antlib.xml"
classpath="${basedir}/lib/ant/ant-contrib-1.0b3.jar" />
</project>
</project>

4
ncep/gov.noaa.nws.ncep.viz.ui.perspectives/src/gov/noaa/nws/ncep/viz/ui/perspectives/NCPerspectiveManager.java
View file

@ -404,8 +404,8 @@ public class NCPerspectiveManager extends AbstractCAVEPerspectiveManager {
} else {
try {
rbdsToLoad = SpfsManager.getInstance().getRbdsFromSpf(
grpAndSpf[0], grpAndSpf[1], true); // resolve Latest
rbdsToLoad = SpfsManager.getInstance().getRbdsFromSpf("default",
grpAndSpf[1], true); // resolve Latest
// Cycle times
} catch (VizException e) {
MessageDialog errDlg = new MessageDialog(

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

@ -3,12 +3,12 @@
# Build Variables:
# -----------------------------------------------------------------------------
VAR_AWIPSII_TOP_DIR="/home/bkowal/rpmbuild"
VAR_WORKSPACE="/common/bkowal/git/thunder/baseline"
VAR_AWIPSII_TOP_DIR="/home/mjames/rpmbuild"
VAR_WORKSPACE="/awips2/repo/awips2-builds"
VAR_AWIPSII_BUILD_ROOT="/tmp/awips-component"
VAR_AWIPSII_VERSION=""
VAR_AWIPSII_RELEASE=""
VAR_UFRAME_ECLIPSE="/opt/uframe-eclipse"
VAR_UFRAME_ECLIPSE="/awips2/eclipse"
VAR_AWIPSCM_SHARE="/awipscm"
# -----------------------------------------------------------------------------

4
rpms/awips2.cave/setup/scripts/prepare_dist.sh
View file

@ -22,12 +22,12 @@ if [ ${RC} -ne 0 ]; then
exit 1
fi
if [ ! -d ${WORKSPACE}/cave/build ]; then
if [ ! -d ${WORKSPACE}/build ]; then
echo "ERROR: The CAVE build directory was not found in the workspace - ${WORKSPACE}/build."
echo " When it was checked out of SVN was it accidentally named build.cave instead?"
exit 1
fi
cd ${WORKSPACE}/cave/build
cd ${WORKSPACE}/build
# Build the CAVE zip file.
if [ ! -f build.sh ]; then

4
rpms/awips2.core/Installer.edex-environment/wes2bridge.files/build/build.sh
View file

@ -5,7 +5,7 @@ export U_RPM_DESTINATION="/home/bkowal/rpmbuild"
export U_COMPONENT_VERSION="11.9.0"
export U_COMPONENT_RELEASE="1"
export U_BUILD_ROOT="/tmp/${USER}/awips2-build"
export U_UFRAME_ECLIPSE="/opt/uframe-eclipse"
export U_UFRAME_ECLIPSE="/awips2/eclipse"
export U_BASELINE_WORKSPACE="/common/bkowal/workspace"
# build variables
@ -22,7 +22,7 @@ if [ "${BUILD_ROOT}" = "" ]; then
export BUILD_ROOT="${U_BUILD_ROOT}"
fi
if [ "${UFRAME_ECLIPSE}" = "" ]; then
export UFRAME_ECLIPSE="/opt/uframe-eclipse"
export UFRAME_ECLIPSE="/awips2/eclipse"
fi
if [ "${BASELINE_WORKSPACE}" = "" ]; then
export BASELINE_WORKSPACE="${U_BASELINE_WORKSPACE}"

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

@ -8,7 +8,7 @@ VAR_WORKSPACE="/common/bkowal/git/thunder/baseline"
VAR_AWIPSII_BUILD_ROOT="/tmp/awips-component"
VAR_AWIPSII_VERSION=""
VAR_AWIPSII_RELEASE=""
VAR_UFRAME_ECLIPSE="/opt/uframe-eclipse"
VAR_UFRAME_ECLIPSE="/awips2/eclipse"
VAR_AWIPSCM_SHARE="/awipscm"
# -----------------------------------------------------------------------------

8
rpms/awips2.qpid/0.7/SPECS/qpid-cpp-mrg.spec
View file

@ -5,10 +5,10 @@
# svn revision: $Rev$
#
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
#%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
#%{!?ruby_sitelib: %define ruby_sitelib %(/usr/bin/ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"] ')}
#%{!?ruby_sitearch: %define ruby_sitearch %(/usr/bin/ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')}
%define python_sitelib /awips2/qpid/lib/python2.7/site-packages/
# ===========
# The following section controls which rpms are produced for which builds.
# * To set the following flags, assign the value 1 for true; 0 for false.
@ -151,7 +151,7 @@ BuildRequires: nspr-devel
BuildRequires: xqilla-devel
BuildRequires: xerces-c-devel
%endif
BuildRequires: swig
###########BuildRequires: swig
BuildRequires: db4-devel
BuildRequires: libaio-devel
%if %{rhel_4} || %{rhel_5}
@ -440,7 +440,7 @@ components.
%_libdir/libqmfengine.so
%_libdir/libqmfconsole.so
%_bindir/qmf-gen
#%{python_sitelib}/qmfgen
%{python_sitelib}/qmfgen
%endif

8
rpms/awips2.qpid/0.7/deploy.builder/build.sh
View file

@ -2,11 +2,11 @@
SPECS_FILE="qpid-cpp-mrg.spec"
# Verify that the correct version of swig is installed.
REQUIRED_SWIG_VERSION="SWIG Version 2.0"
REQUIRED_SWIG_VERSION="SWIG Version 3.0"
COMMAND=`which swig`
RC=$?
if [ ${RC} -ne 0 ]; then
echo "ERROR: 'swig v2.0.X' Is Required To Successfully Build The QPID RPMs."
echo "ERROR: 'swig v3.0.X' Is Required To Successfully Build The QPID RPMs."
echo "Unable To Continue ... Terminating."
exit 1
fi
@ -21,7 +21,7 @@ fi
VERIFY_SWIG_VERSION=`echo "${SWIG_VERSION}" | grep "${REQUIRED_SWIG_VERSION}"`
if [ "${VERIFY_SWIG_VERSION}" = "" ]; then
echo "ERROR: 'swig v2.0.X' Is Required To Successfully Build The QPID RPMs."
echo "ERROR: 'swig v3.0.X' Is Required To Successfully Build The QPID RPMs."
echo " '${SWIG_VERSION}' Was Detected."
echo "Unable To Continue ... Terminating."
exit 1
@ -58,7 +58,7 @@ fi
perl -p -i -e "s/BuildRequires: swig/#BuildRequires: swig/g" \
SPECS/${SPECS_FILE}
rpmbuild -ba --target=i386 --define '_topdir %(echo ${QPID_WORKSPACE_DIR})' \
rpmbuild -ba --define '_topdir %(echo ${QPID_WORKSPACE_DIR})' \
SPECS/${SPECS_FILE}
RC=$?
if [ ${RC} -ne 0 ]; then

2
rpms/python.site-packages/deploy.builder/build.sh
View file

@ -5,7 +5,7 @@
# And The pythonPackages Project.
export WORKSPACE_DIR=`cd ../../../; pwd;`
export RPM_SITE_PACKAGE_LOG_FILE="rpm-build.log"
export UFRAME_ECLIPSE="/opt/uframe-eclipse"
export UFRAME_ECLIPSE="/awips2/eclipse"
export AWIPSCM_SHARE="/awipscm"
source ${WORKSPACE_DIR}/Installer.rpm/awips2.core/deploy.builder/env.sh