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

Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1

Browse source 
Former-commit-id: 9d58b11efd [formerly 81ebcaada8] [formerly 551e3dfac0] [formerly 9d58b11efd [formerly 81ebcaada8] [formerly 551e3dfac0] [formerly 649426f4b3 [formerly 551e3dfac0 [formerly 999467410f61f1874d5cf1e599fca9ce83ae4f70]]]]
Former-commit-id: 649426f4b3
Former-commit-id: 74f8c3a641 [formerly ec3fcbafec] [formerly 35eaa572930695d4d5cdfdd5c365fac9bf2cabc5 [formerly 454c8be23a]]
Former-commit-id: bf1efe66fe3870faa98f20abd7817f44f3fa6870 [formerly 16c15a10f4]
Former-commit-id: 80e592746a
This commit is contained in:
Fay.Liang 2015-02-04 16:51:19 -05:00
commit a5adfcc5dc
3 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
edexOsgi/build.edex/edex/customTargets.xml
View file

@ -279,6 +279,12 @@
regexp="com-raytheon-uf-(.+)-feature" regexp="com-raytheon-uf-(.+)-feature"
select="\1" /> select="\1" />
<propertyregex property="edex.component"
override="true"
input="${edex.component}"
regexp="^(?:edu|gov)-.*(edex-.+)-feature"
select="\1" />
<!-- Create the distribution directory. --> <!-- Create the distribution directory. -->
<mkdir dir="${builder}/dist" /> <mkdir dir="${builder}/dist" />
<zip destfile="${builder}/dist/${edex.component}.zip" <zip destfile="${builder}/dist/${edex.component}.zip"

4
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/countyTypes.txt
View file

@ -14,6 +14,10 @@ PR \ MUNICIPALITY
PUERTO RICO \ MUNICIPALITY PUERTO RICO \ MUNICIPALITY
PR+ \ MUNICIPALITIES PR+ \ MUNICIPALITIES
PUERTO RICO+ \ MUNICIPALITIES PUERTO RICO+ \ MUNICIPALITIES
GU \
GUAM \
GU+ \
GUAM+ \
DEFAULT+ \ COUNTIES DEFAULT+ \ COUNTIES
DEFAULT \ COUNTY DEFAULT \ COUNTY
CITY \ CITY \

6
rpms/awips2.core/Installer.pgadmin/component.spec
View file

@ -21,9 +21,9 @@ Packager: Bryan Kowal
AutoReq: no AutoReq: no
BuildRequires: awips2-postgresql = 9.2.3-1.el6 BuildRequires: awips2-postgresql = 9.2.3-1.el6
BuildRequires: postgresql = 8.4.13-1.el6_3 BuildRequires: postgresql >= 8.4.13-1.el6_3
BuildRequires: postgresql-devel = 8.4.13-1.el6_3 BuildRequires: postgresql-devel >= 8.4.13-1.el6_3
BuildRequires: postgresql-libs = 8.4.13-1.el6_3 BuildRequires: postgresql-libs >= 8.4.13-1.el6_3
BuildRequires: wxGTK >= 2.8.12-1 BuildRequires: wxGTK >= 2.8.12-1
BuildRequires: wxGTK-devel >= 2.8.12-1 BuildRequires: wxGTK-devel >= 2.8.12-1