Commit graph

34 commits

Author SHA1 Message Date
Fay.Liang
06ac6b396e 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: c6bd5d7675 [formerly c6bd5d7675 [formerly 1f331890b8fc38b4f8ed3a3debc66b8fedba4fdd]]
Former-commit-id: eed6737801
Former-commit-id: 5cc8e5b4af
2015-01-12 13:03:31 -05:00
Brian Graham
10fd784dd7 ASM #15662 - Updated spec files to include AWIPS version
Change-Id: If8f78761550355a1ec55b6abde594583821d4d9f

Former-commit-id: 99143e0045 [formerly 99143e0045 [formerly 11741b03db9424aa10086553729303fa23a7366f]]
Former-commit-id: e1b4c4abe3
Former-commit-id: 24ca442651
2014-12-09 09:25:59 -05:00
Greg Armendariz
1fbd4f0038 Omaha #3216 - Update Python to 2.7.8, move specific site-packages to AWIPS2_build
Change-Id: Iedaba76caf3b690d31012dff00f91f3cd5e81e8b

Former-commit-id: ad5e3134e4 [formerly ad5e3134e4 [formerly 0d4e39f166c8e8607d0a3c3f43f3656531e62e1e]]
Former-commit-id: d7af478037
Former-commit-id: 756d33bf89
2014-11-18 13:48:19 -06:00
David Lovely
1b3334a183 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: 625e83c445 [formerly 625e83c445 [formerly 3addb3007b0bf7aab88b423bbf700583fc2b3e48]]
Former-commit-id: 1a191cac55
Former-commit-id: b9451471ac
2014-11-10 08:27:28 -06:00
Brad Gonzales
7e434f3ae1 Omaha #3013 added libgfortran and libf2c requires to the awips2-python-numpy rpm.
Change-Id: I3f232c800a7d2768b9b13b35703db97b83789a7b

Former-commit-id: 982503cb41 [formerly 982503cb41 [formerly 632b2cad7a328dead678026c673b001be0657394]]
Former-commit-id: abf6125958
Former-commit-id: b032306b52
2014-05-12 11:25:16 -05:00
Richard Peter
fd93b7d85e 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: 0c4ae068ad [formerly 0c4ae068ad [formerly b09f1559254f06a82afa91f0cc14c8150f88ce64]]
Former-commit-id: a0b6ea8bb2
Former-commit-id: da027298d4
2013-12-05 12:12:27 -06:00
Steve Harris
f88a635a58 14.1.1-11 baseline
Former-commit-id: 70a6f1936e [formerly 70a6f1936e [formerly c32b2b2037c84cc074e7dc5a5a13b93223640d7d]]
Former-commit-id: 71ae71c850
Former-commit-id: 5526a8999d
2013-12-02 17:10:10 -05:00
Steve Harris
98ae84da42 14.1.1-4 baseline
Former-commit-id: bd95bb6a4e [formerly bd95bb6a4e [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]
Former-commit-id: 99e3707c5b
Former-commit-id: 7590a56e0e
2013-10-28 10:55:16 -04:00
Steve Harris
8d67ffede4 14.1.1-3 baseline
Former-commit-id: 94f24e0d8a [formerly 94f24e0d8a [formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]]
Former-commit-id: 5739b4f832
Former-commit-id: 4a6a209aea
2013-10-28 10:46:02 -04:00
Bryan Kowal
297ee050ca Issue #2422 - fix 14.2.1 RHEL6 build
Former-commit-id: 61527c0b80 [formerly 61527c0b80 [formerly 19b9b3e4f5e3bc3d78c25afe4507c3e9c11eacb6]]
Former-commit-id: 87087a5ea4
Former-commit-id: fe4e9ca3f8
2013-10-02 18:41:11 -05:00
Bryan Kowal
0efd4c7c50 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: c125b5b053 [formerly c125b5b053 [formerly 97612cb78e067c493f7b5a76a2a84d88c96a5094]]
Former-commit-id: 9829477ced
Former-commit-id: ef789bf912
2013-09-30 18:00:31 -05:00
Bryan Kowal
f10a1a5ac2 Issue #2382 - fix qpid amqp path
Former-commit-id: b9f4e93687 [formerly b9f4e93687 [formerly 263ce6e82d1ecf3164961b599c2d4aac7d61f783]]
Former-commit-id: b002df8a06
Former-commit-id: 8ce22ec91a
2013-09-17 17:51:43 -05:00
Steve Harris
e2398f74e5 13.5.2-4 baseline
Former-commit-id: e3c935d48b [formerly e3c935d48b [formerly da631849bc9eaaa5c83c2393520b6099413107a5]]
Former-commit-id: 58c6821427
Former-commit-id: abed443b59
2013-09-12 11:13:59 -04:00
Bryan Kowal
8dad5af165 Issue #2163 - convert the few remaining python rpms for 14.1.1; remove 13.6 feature modifications
Former-commit-id: 1adf764747 [formerly 1adf764747 [formerly 4503735d3a05071878683f4a523d0dbd37e47ea3]]
Former-commit-id: 79e88c19aa
Former-commit-id: aa8eb47b95
2013-09-06 12:30:01 -05:00
Bryan Kowal
bcb07a8f39 Issue #2163 - build dynamicserialize and ufpy with the redhat 6 build
Former-commit-id: a02d910023 [formerly a02d910023 [formerly 422e9b611535e9c20338041e0e1af62d38aab047]]
Former-commit-id: 03cadc5aa9
Former-commit-id: 65bb1ec74b
2013-09-04 13:48:08 -05:00
Bryan Kowal
6de01af674 Issue #2163 - RHEL6 14.1.1 build updates
Former-commit-id: 9415560b38 [formerly 9415560b38 [formerly b0e47f4548c235a7cbaefc12e97264ce4c782fce]]
Former-commit-id: ab3485a3ed
Former-commit-id: 17b8ded082
2013-09-03 13:46:19 -05:00
Bryan Kowal
b1aed4e6fd Issue #2279 - updated python qpid library
- python qpid is no longer compiled; so, the rpm is now noarch


Former-commit-id: 818c69fb39 [formerly 818c69fb39 [formerly 8487a7abdc967f39f853919b5c274b354a674b2c]]
Former-commit-id: f2dd3ab85a
Former-commit-id: 981562faac
2013-08-29 16:00:45 -05:00
Bryan Kowal
5b451d09f1 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: 0bee225031 [formerly 0bee225031 [formerly ffc8892888976ee4b9d9edeb315b74edc5bb375f]]
Former-commit-id: e686f9bdda
Former-commit-id: e24b249d5b
2013-08-15 15:24:48 -05:00
Bryan Kowal
8331e2a16a Issue #2163 - python rpm specification and awips2-notification compatibility with RedHat 6
Former-commit-id: e3e596eb5d [formerly e3e596eb5d [formerly f2497ff20afefdcf67b0b4bcc17f9ee358d2288d]]
Former-commit-id: be011d3b92
Former-commit-id: 7b1615ba80
2013-08-15 15:24:11 -05:00
Steve Harris
4001e050e7 13.4.1-1 baseline
Former-commit-id: 2f517b7713 [formerly 2f517b7713 [formerly c03222bb480d87c05982b4d49f863e615b5b5584]]
Former-commit-id: 00332e6305
Former-commit-id: 4accbb80db
2013-04-24 17:15:55 -05:00
Steve Harris
547c1dedd1 13.2.1-2 baseline
Former-commit-id: 83e9157df7 [formerly 83e9157df7 [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]
Former-commit-id: 328c6dccad
Former-commit-id: 47cc08ac79
2013-01-23 11:18:44 -05:00
Steve Harris
e72b6d5da6 12.11.1-2 baseline
Change-Id: I1c6018b226a4dba788f50edff8801aa33939a83b

Former-commit-id: c12ee14e66 [formerly c12ee14e66 [formerly da126f587a1e3761dbe16ee2a41aee0caba85bfc]]
Former-commit-id: 1e02387ff1
Former-commit-id: 42bf60b2fc
2012-10-08 13:26:20 -05:00
Steve Harris
26b7d083ec 12.10.1-4 baseline
Former-commit-id: fd19ca5624 [formerly fd19ca5624 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]
Former-commit-id: 49c3861597
Former-commit-id: 2ba58a3576
2012-09-13 12:08:11 -05:00
Steve Harris
d65f35ffe9 12.10.1-1 baseline
Former-commit-id: 195158c004 [formerly 195158c004 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]]
Former-commit-id: d708932029
Former-commit-id: 7bd9c63dc7
2012-09-04 12:07:27 -05:00
Steve Harris
5bb474d33c 12.9.1-10 baseline
Former-commit-id: 3adc50a783 [formerly 3adc50a783 [formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]]
Former-commit-id: cb9b80f3a0
Former-commit-id: dc08c5a71a
2012-08-30 14:28:27 -05:00
Steve Harris
9b5c2094ed 12.9.1-5 baseline
Former-commit-id: 61f269f54c [formerly 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]
Former-commit-id: f2fac39428
Former-commit-id: 72824561cb
2012-08-21 15:27:03 -05:00
Steve Harris
de9b64b501 12.9.1-4 baseline
Former-commit-id: dcda3a2290 [formerly dcda3a2290 [formerly df38541c9df38c634626ae214f288b606004a768]]
Former-commit-id: 33b95fb96d
Former-commit-id: 9990bf909b
2012-08-15 15:19:10 -05:00
Steve Harris
46daa48f1c 12.8.1-10 baseline
Former-commit-id: b5e8fee24d [formerly b5e8fee24d [formerly 7c799ab7b99993c77b6568529b46aaf13d01300b]]
Former-commit-id: ca25d508ec
Former-commit-id: d5563fc340
2012-08-06 09:34:26 -05:00
Steve Harris
e86949a8d3 12.8.1-5 baseline
Former-commit-id: fd2abfb6f1 [formerly fd2abfb6f1 [formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]]
Former-commit-id: cd49ef3eda
Former-commit-id: e0c3722fd1
2012-08-01 10:45:37 -05:00
Steve Harris
e5543a0e86 12.4.1-10 baseline
Former-commit-id: 9f8cb727a5 [formerly 9f8cb727a5 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]
Former-commit-id: 8485b90ff8
Former-commit-id: a28d70b5c5
2012-05-01 18:06:13 -05:00
Bryan Kowal
dafb6b18d8 Issue #202 - restoring rpm directory to ss_sync.
Former-commit-id: 65e1e4ee0b [formerly 65e1e4ee0b [formerly 56068aa96fa6daf113861476bf4b7aebe2021ca4]]
Former-commit-id: ea1c82452b
Former-commit-id: 7f1b468010
2012-01-20 13:38:00 -06:00
Matt Nash
21d2361f00 Moving 12.1.1 into ss_sync
Former-commit-id: 66be3bec40 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]
Former-commit-id: c83e5ff474
Former-commit-id: 1faae42484
2012-01-19 11:53:12 -06:00
Bryan Kowal
9ceb347a77 Issue #34 - merging build changes originally made for the new svn transition into git.
Former-commit-id: 43c3807a32 [formerly 43c3807a32 [formerly 40f016a9f9e605b039d41ed44a59a269caf8a024]]
Former-commit-id: 9d64e1df12
Former-commit-id: 06187b93be
2012-01-18 16:00:45 -06:00
root
377dcd10b9 Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 9f19e3f712 [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 3360eb6c5f
2012-01-06 08:55:05 -06:00