Fay.Liang
1e9024ede9
ASM #15311 - Merge and Build Support - Merge ASM delivery into 14.4.1-1m.
...
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/ChooseDataPeriodDialog.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
rpms/awips2.core/Installer.postgres/component.spec
rpms/awips2.core/Installer.python/component.spec
rpms/awips2.core/Installer.tools/component.spec
rpms/python.site-packages/Installer.h5py/component.spec
rpms/python.site-packages/Installer.matplotlib/component.spec
rpms/python.site-packages/Installer.nose/component.spec
rpms/python.site-packages/Installer.pupynere/component.spec
rpms/python.site-packages/Installer.qpid/component.spec
rpms/python.site-packages/Installer.scientific/component.spec
rpms/python.site-packages/Installer.scipy/component.spec
rpms/python.site-packages/Installer.shapely/component.spec
rpms/python.site-packages/Installer.tables/component.spec
Former-commit-id: 6b77894bd0
[formerly c6bd5d7675
] [formerly 6b77894bd0
[formerly c6bd5d7675
] [formerly eed6737801
[formerly 1f331890b8fc38b4f8ed3a3debc66b8fedba4fdd]]]
Former-commit-id: eed6737801
Former-commit-id: f3ecae8573
[formerly 5cc8e5b4af
]
Former-commit-id: 06ac6b396e
2015-01-12 13:03:31 -05:00
Brian Graham
963b52651e
ASM #15662 - Updated spec files to include AWIPS version
...
Change-Id: If8f78761550355a1ec55b6abde594583821d4d9f
Former-commit-id: aabc38c52c
[formerly 99143e0045
] [formerly aabc38c52c
[formerly 99143e0045
] [formerly e1b4c4abe3
[formerly 11741b03db9424aa10086553729303fa23a7366f]]]
Former-commit-id: e1b4c4abe3
Former-commit-id: 29912607c9
[formerly 24ca442651
]
Former-commit-id: 10fd784dd7
2014-12-09 09:25:59 -05:00
Greg Armendariz
a17f0cb3e1
Omaha #3216 - Update Python to 2.7.8, move specific site-packages to AWIPS2_build
...
Change-Id: Iedaba76caf3b690d31012dff00f91f3cd5e81e8b
Former-commit-id: d3295027c2
[formerly ad5e3134e4
] [formerly d3295027c2
[formerly ad5e3134e4
] [formerly d7af478037
[formerly 0d4e39f166c8e8607d0a3c3f43f3656531e62e1e]]]
Former-commit-id: d7af478037
Former-commit-id: fa3eda0370
[formerly 756d33bf89
]
Former-commit-id: 1fbd4f0038
2014-11-18 13:48:19 -06:00
David Lovely
0b76e0a9b6
Omaha #2991 Initial commit of QPID 0.28 and 0.30. Update native code to work with 0.30.
...
Change-Id: Ib28bf8e2edb3b299a7122bac7c80f302780b7470
Former-commit-id: b32d54c7f9
[formerly 625e83c445
] [formerly b32d54c7f9
[formerly 625e83c445
] [formerly 1a191cac55
[formerly 3addb3007b0bf7aab88b423bbf700583fc2b3e48]]]
Former-commit-id: 1a191cac55
Former-commit-id: 3b7d20e623
[formerly b9451471ac
]
Former-commit-id: 1b3334a183
2014-11-10 08:27:28 -06:00
Brad Gonzales
ce306f188b
Omaha #3013 added libgfortran and libf2c requires to the awips2-python-numpy rpm.
...
Change-Id: I3f232c800a7d2768b9b13b35703db97b83789a7b
Former-commit-id: c71a842639
[formerly 982503cb41
] [formerly c71a842639
[formerly 982503cb41
] [formerly abf6125958
[formerly 632b2cad7a328dead678026c673b001be0657394]]]
Former-commit-id: abf6125958
Former-commit-id: 9679fb32dc
[formerly b032306b52
]
Former-commit-id: 7e434f3ae1
2014-05-12 11:25:16 -05:00
Richard Peter
ae6e34be4b
Merge branch 'omaha_14.1.1' (14.1.1-11) into development
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java
edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/smartinit/IFPWE.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIUtil.java
msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/AbstractProcessLauncher.cs
Change-Id: Iaf9f42e7ee93949d34c70916fd91acf8c838c83a
Former-commit-id: b3b23647b4
[formerly 0c4ae068ad
] [formerly b3b23647b4
[formerly 0c4ae068ad
] [formerly a0b6ea8bb2
[formerly b09f1559254f06a82afa91f0cc14c8150f88ce64]]]
Former-commit-id: a0b6ea8bb2
Former-commit-id: 60679a818a
[formerly da027298d4
]
Former-commit-id: fd93b7d85e
2013-12-05 12:12:27 -06:00
Steve Harris
bfa9d638cc
14.1.1-11 baseline
...
Former-commit-id: 337b138200
[formerly 70a6f1936e
] [formerly 337b138200
[formerly 70a6f1936e
] [formerly 71ae71c850
[formerly c32b2b2037c84cc074e7dc5a5a13b93223640d7d]]]
Former-commit-id: 71ae71c850
Former-commit-id: 8bd818de09
[formerly 5526a8999d
]
Former-commit-id: f88a635a58
2013-12-02 17:10:10 -05:00
Steve Harris
da4589ec2b
14.1.1-4 baseline
...
Former-commit-id: 82dec19b6a
[formerly bd95bb6a4e
] [formerly 82dec19b6a
[formerly bd95bb6a4e
] [formerly 99e3707c5b
[formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]]
Former-commit-id: 99e3707c5b
Former-commit-id: b60635cd70
[formerly 7590a56e0e
]
Former-commit-id: 98ae84da42
2013-10-28 10:55:16 -04:00
Steve Harris
472c0a1a5e
14.1.1-3 baseline
...
Former-commit-id: 851f9df229
[formerly 94f24e0d8a
] [formerly 851f9df229
[formerly 94f24e0d8a
] [formerly 5739b4f832
[formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]]]
Former-commit-id: 5739b4f832
Former-commit-id: aa59400b67
[formerly 4a6a209aea
]
Former-commit-id: 8d67ffede4
2013-10-28 10:46:02 -04:00
Bryan Kowal
a249b45111
Issue #2422 - fix 14.2.1 RHEL6 build
...
Former-commit-id: efd377f12f
[formerly 61527c0b80
] [formerly efd377f12f
[formerly 61527c0b80
] [formerly 87087a5ea4
[formerly 19b9b3e4f5e3bc3d78c25afe4507c3e9c11eacb6]]]
Former-commit-id: 87087a5ea4
Former-commit-id: af4b729522
[formerly fe4e9ca3f8
]
Former-commit-id: 297ee050ca
2013-10-02 18:41:11 -05:00
Bryan Kowal
7bd9ea3d30
Issue #2422 - Merge branch 'omaha_14.1.1' into development_on_RHEL6
...
Conflicts:
cave/build/alertviz/customTargets.xml
cave/build/p2-build.xml
edexOsgi/com.raytheon.uf.edex.distribution/src/com/raytheon/uf/edex/distribution/DistributionSrv.java
edexOsgi/meteolib.jni.linux64/libmeteoLib.so
javaUtilities/build.wes2bridge.utility/wes2bridge/customTargets.xml
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
nativeLib/ncep_grib2module/.cproject
nativeLib/rary.meteorological/.cproject
nativeLib/rary.meteorological/src/dcapeFunc.c
rpms/awips2.cave/Installer.cave-etc/component.spec
rpms/awips2.cave/Installer.cave-feature/component.spec
rpms/awips2.core/Installer.aviation/component.spec
rpms/awips2.qpid/0.18/deploy.builder/build.sh
rpms/python.site-packages/Installer.qpid/component.spec
Former-commit-id: bb5acf7c11
[formerly c125b5b053
] [formerly bb5acf7c11
[formerly c125b5b053
] [formerly 9829477ced
[formerly 97612cb78e067c493f7b5a76a2a84d88c96a5094]]]
Former-commit-id: 9829477ced
Former-commit-id: 0f825df590
[formerly ef789bf912
]
Former-commit-id: 0efd4c7c50
2013-09-30 18:00:31 -05:00
Bryan Kowal
5889733924
Issue #2382 - fix qpid amqp path
...
Former-commit-id: b84cb9106f
[formerly b9f4e93687
] [formerly b84cb9106f
[formerly b9f4e93687
] [formerly b002df8a06
[formerly 263ce6e82d1ecf3164961b599c2d4aac7d61f783]]]
Former-commit-id: b002df8a06
Former-commit-id: eb6cc0320c
[formerly 8ce22ec91a
]
Former-commit-id: f10a1a5ac2
2013-09-17 17:51:43 -05:00
Steve Harris
609926f1f4
13.5.2-4 baseline
...
Former-commit-id: 595e7bc0d9
[formerly e3c935d48b
] [formerly 595e7bc0d9
[formerly e3c935d48b
] [formerly 58c6821427
[formerly da631849bc9eaaa5c83c2393520b6099413107a5]]]
Former-commit-id: 58c6821427
Former-commit-id: 4c6790f10f
[formerly abed443b59
]
Former-commit-id: e2398f74e5
2013-09-12 11:13:59 -04:00
Bryan Kowal
39bd67265e
Issue #2163 - convert the few remaining python rpms for 14.1.1; remove 13.6 feature modifications
...
Former-commit-id: 6578b9a7de
[formerly 1adf764747
] [formerly 6578b9a7de
[formerly 1adf764747
] [formerly 79e88c19aa
[formerly 4503735d3a05071878683f4a523d0dbd37e47ea3]]]
Former-commit-id: 79e88c19aa
Former-commit-id: 2a35fb001d
[formerly aa8eb47b95
]
Former-commit-id: 8dad5af165
2013-09-06 12:30:01 -05:00
Bryan Kowal
7ea8a63f32
Issue #2163 - build dynamicserialize and ufpy with the redhat 6 build
...
Former-commit-id: 41ab242c2d
[formerly a02d910023
] [formerly 41ab242c2d
[formerly a02d910023
] [formerly 03cadc5aa9
[formerly 422e9b611535e9c20338041e0e1af62d38aab047]]]
Former-commit-id: 03cadc5aa9
Former-commit-id: 9c890422fa
[formerly 65bb1ec74b
]
Former-commit-id: bcb07a8f39
2013-09-04 13:48:08 -05:00
Bryan Kowal
a8898ec348
Issue #2163 - RHEL6 14.1.1 build updates
...
Former-commit-id: 17d652a8dd
[formerly 9415560b38
] [formerly 17d652a8dd
[formerly 9415560b38
] [formerly ab3485a3ed
[formerly b0e47f4548c235a7cbaefc12e97264ce4c782fce]]]
Former-commit-id: ab3485a3ed
Former-commit-id: 751f005228
[formerly 17b8ded082
]
Former-commit-id: 6de01af674
2013-09-03 13:46:19 -05:00
Bryan Kowal
94b4a54523
Issue #2279 - updated python qpid library
...
- python qpid is no longer compiled; so, the rpm is now noarch
Former-commit-id: d77dd5a22c
[formerly 818c69fb39
] [formerly d77dd5a22c
[formerly 818c69fb39
] [formerly f2dd3ab85a
[formerly 8487a7abdc967f39f853919b5c274b354a674b2c]]]
Former-commit-id: f2dd3ab85a
Former-commit-id: 572e1c0b33
[formerly 981562faac
]
Former-commit-id: b1aed4e6fd
2013-08-29 16:00:45 -05:00
Bryan Kowal
55e29b2bba
Issue #2163 - 64-bit RHEL6 rpm conversion
...
- converted ant and added ant source to the repository (will no longer need to be retrieved from awipscm)
- converted Java
- converted the hdf5 tools and lzf is now built from source in addition to the hdf5 tools
- fixed python h5py to correctly include the built libsz libraries
Former-commit-id: b32922186d
[formerly 0bee225031
] [formerly b32922186d
[formerly 0bee225031
] [formerly e686f9bdda
[formerly ffc8892888976ee4b9d9edeb315b74edc5bb375f]]]
Former-commit-id: e686f9bdda
Former-commit-id: 8d4645a0a4
[formerly e24b249d5b
]
Former-commit-id: 5b451d09f1
2013-08-15 15:24:48 -05:00
Bryan Kowal
f61b437746
Issue #2163 - python rpm specification and awips2-notification compatibility with RedHat 6
...
Former-commit-id: 2b4faafed7
[formerly e3e596eb5d
] [formerly 2b4faafed7
[formerly e3e596eb5d
] [formerly be011d3b92
[formerly f2497ff20afefdcf67b0b4bcc17f9ee358d2288d]]]
Former-commit-id: be011d3b92
Former-commit-id: 6561efe457
[formerly 7b1615ba80
]
Former-commit-id: 8331e2a16a
2013-08-15 15:24:11 -05:00
Steve Harris
722e428c74
13.4.1-1 baseline
...
Former-commit-id: f95e0ad10b
[formerly 2f517b7713
] [formerly f95e0ad10b
[formerly 2f517b7713
] [formerly 00332e6305
[formerly c03222bb480d87c05982b4d49f863e615b5b5584]]]
Former-commit-id: 00332e6305
Former-commit-id: 0e950655f1
[formerly 4accbb80db
]
Former-commit-id: 4001e050e7
2013-04-24 17:15:55 -05:00
Steve Harris
2779f5c6d9
13.2.1-2 baseline
...
Former-commit-id: 33bc5fd816
[formerly 83e9157df7
] [formerly 33bc5fd816
[formerly 83e9157df7
] [formerly 328c6dccad
[formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]]
Former-commit-id: 328c6dccad
Former-commit-id: d9be4dce21
[formerly 47cc08ac79
]
Former-commit-id: 547c1dedd1
2013-01-23 11:18:44 -05:00
Steve Harris
ff9321e3ce
12.11.1-2 baseline
...
Change-Id: I1c6018b226a4dba788f50edff8801aa33939a83b
Former-commit-id: 75901860c2
[formerly c12ee14e66
] [formerly 75901860c2
[formerly c12ee14e66
] [formerly 1e02387ff1
[formerly da126f587a1e3761dbe16ee2a41aee0caba85bfc]]]
Former-commit-id: 1e02387ff1
Former-commit-id: 772c60efa4
[formerly 42bf60b2fc
]
Former-commit-id: e72b6d5da6
2012-10-08 13:26:20 -05:00
Steve Harris
e57e7237a9
12.10.1-4 baseline
...
Former-commit-id: e38e81ab8c
[formerly fd19ca5624
] [formerly e38e81ab8c
[formerly fd19ca5624
] [formerly 49c3861597
[formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]]
Former-commit-id: 49c3861597
Former-commit-id: 684feb34e5
[formerly 2ba58a3576
]
Former-commit-id: 26b7d083ec
2012-09-13 12:08:11 -05:00
Steve Harris
a924a8347a
12.10.1-1 baseline
...
Former-commit-id: 0abf64b77c
[formerly 195158c004
] [formerly 0abf64b77c
[formerly 195158c004
] [formerly d708932029
[formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]]]
Former-commit-id: d708932029
Former-commit-id: e720b8ed31
[formerly 7bd9c63dc7
]
Former-commit-id: d65f35ffe9
2012-09-04 12:07:27 -05:00
Steve Harris
ede38c4b3f
12.9.1-10 baseline
...
Former-commit-id: bdb45cdfae
[formerly 3adc50a783
] [formerly bdb45cdfae
[formerly 3adc50a783
] [formerly cb9b80f3a0
[formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]]]
Former-commit-id: cb9b80f3a0
Former-commit-id: f43a5af47f
[formerly dc08c5a71a
]
Former-commit-id: 5bb474d33c
2012-08-30 14:28:27 -05:00
Steve Harris
2d928d328e
12.9.1-5 baseline
...
Former-commit-id: a1d931fd44
[formerly 61f269f54c
] [formerly a1d931fd44
[formerly 61f269f54c
] [formerly f2fac39428
[formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]
Former-commit-id: f2fac39428
Former-commit-id: 7fb0b17bd5
[formerly 72824561cb
]
Former-commit-id: 9b5c2094ed
2012-08-21 15:27:03 -05:00
Steve Harris
7e1d1f6e08
12.9.1-4 baseline
...
Former-commit-id: 36c108e960
[formerly dcda3a2290
] [formerly 36c108e960
[formerly dcda3a2290
] [formerly 33b95fb96d
[formerly df38541c9df38c634626ae214f288b606004a768]]]
Former-commit-id: 33b95fb96d
Former-commit-id: d7d60cc623
[formerly 9990bf909b
]
Former-commit-id: de9b64b501
2012-08-15 15:19:10 -05:00
Steve Harris
78d66ba6df
12.8.1-10 baseline
...
Former-commit-id: 6244359a80
[formerly b5e8fee24d
] [formerly 6244359a80
[formerly b5e8fee24d
] [formerly ca25d508ec
[formerly 7c799ab7b99993c77b6568529b46aaf13d01300b]]]
Former-commit-id: ca25d508ec
Former-commit-id: 78d34d65d2
[formerly d5563fc340
]
Former-commit-id: 46daa48f1c
2012-08-06 09:34:26 -05:00
Steve Harris
d3be09bd74
12.8.1-5 baseline
...
Former-commit-id: 2653ddc2e3
[formerly fd2abfb6f1
] [formerly 2653ddc2e3
[formerly fd2abfb6f1
] [formerly cd49ef3eda
[formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]]]
Former-commit-id: cd49ef3eda
Former-commit-id: dab00b12e6
[formerly e0c3722fd1
]
Former-commit-id: e86949a8d3
2012-08-01 10:45:37 -05:00
Steve Harris
0c25458510
12.4.1-10 baseline
...
Former-commit-id: 4bfbdad17d
[formerly 9f8cb727a5
] [formerly 4bfbdad17d
[formerly 9f8cb727a5
] [formerly 8485b90ff8
[formerly bf53d06834caa780226121334ac1bcf0534c3f16]]]
Former-commit-id: 8485b90ff8
Former-commit-id: 33a67cdd82
[formerly a28d70b5c5
]
Former-commit-id: e5543a0e86
2012-05-01 18:06:13 -05:00
Bryan Kowal
bb662ca175
Issue #202 - restoring rpm directory to ss_sync.
...
Former-commit-id: 4453ad2d10
[formerly 65e1e4ee0b
] [formerly 4453ad2d10
[formerly 65e1e4ee0b
] [formerly ea1c82452b
[formerly 56068aa96fa6daf113861476bf4b7aebe2021ca4]]]
Former-commit-id: ea1c82452b
Former-commit-id: 9f6780c4dd
[formerly 7f1b468010
]
Former-commit-id: dafb6b18d8
2012-01-20 13:38:00 -06:00
Matt Nash
bcc32c10bc
Moving 12.1.1 into ss_sync
...
Former-commit-id: 580e2938d7
[formerly 66be3bec40
] [formerly 580e2938d7
[formerly 66be3bec40
] [formerly c83e5ff474
[formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]
Former-commit-id: c83e5ff474
Former-commit-id: 82300ccdcf
[formerly 1faae42484
]
Former-commit-id: 21d2361f00
2012-01-19 11:53:12 -06:00
Bryan Kowal
5d92644c26
Issue #34 - merging build changes originally made for the new svn transition into git.
...
Former-commit-id: 63f6f44fe1
[formerly 43c3807a32
] [formerly 63f6f44fe1
[formerly 43c3807a32
] [formerly 9d64e1df12
[formerly 40f016a9f9e605b039d41ed44a59a269caf8a024]]]
Former-commit-id: 9d64e1df12
Former-commit-id: 281be5e0b7
[formerly 06187b93be
]
Former-commit-id: 9ceb347a77
2012-01-18 16:00:45 -06:00
root
e2ecdcfe33
Initial revision of AWIPS2 11.9.0-7p5
...
Former-commit-id: a02aeb236c
[formerly 9f19e3f712
] [formerly a02aeb236c
[formerly 9f19e3f712
] [formerly 06a8b51d6d
[formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 8e80217e59
[formerly 3360eb6c5f
]
Former-commit-id: 377dcd10b9
2012-01-06 08:55:05 -06:00