xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
393 commits 31 branches 40 tags 3.8 GiB
Commit graph

66 commits

Author SHA1 Message Date
Steve Harris
156395b85b Merge branch 'master_14.1.1' into omaha_14.1.1 
Conflicts:
	rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so (took master_14.1.1 version)

Former-commit-id: dc4f3b7594 [formerly 1015e180f1] [formerly 2f0d53c9b2 [formerly 5388a8206a9f447f2ff9030a9e6cfad76efc4cee]]
Former-commit-id: 2f0d53c9b2
Former-commit-id: d97edb20d1
 2013-11-15 13:05:40 -06:00
Steve Harris
eab5bb1147 14.1.1-9 baseline 
Former-commit-id: a32eadf384 [formerly f8f995b697] [formerly 5a0a40e67c [formerly 0d10fff4b09db0e4b0b8bcf7481f5f13af0943f5]]
Former-commit-id: 5a0a40e67c
Former-commit-id: 8c136f202d
 2013-11-15 12:47:49 -05:00
Bryan Kowal
b2c63727ba Issue #2547 - fix RHEL6 nativeLib build in 14.1.1 
Former-commit-id: b2272ad695 [formerly a51231058a] [formerly e3639da703 [formerly 7af6c4794f9523e6f0d632b0a9f34e8f5cbcda3f]]
Former-commit-id: e3639da703
Former-commit-id: 48d5d8c3a1
 2013-11-12 19:57:25 -06:00
Steve Harris
a48b85a0b2 Merge branch 'master_14.1.1' into omaha_14.1.1 
Former-commit-id: cdb514cb5c [formerly c218866826] [formerly d8afc4c58c [formerly 2d5b1f7563e0f8dbd0dadcfa89cad35ba6fac98b]]
Former-commit-id: d8afc4c58c
Former-commit-id: 7c71117a50
 2013-11-06 13:22:12 -06:00
Steve Harris
b694612fe0 14.1.1-7 baseline 
Former-commit-id: 80614c0e52 [formerly 3328e2dd1d] [formerly 4fff87723f [formerly 8add3b227e88c3943ea605fdc4e2f2b3c7dcf998]]
Former-commit-id: 4fff87723f
Former-commit-id: 48df058653
 2013-11-06 14:16:14 -05:00
Steve Harris
e86a0aa489 14.1.1-6 baseline 
Former-commit-id: 946a9be17e [formerly 0cb2978c13] [formerly 6067af4252 [formerly 7029e583ef36bf746fddda316ba011e27ed766b4]]
Former-commit-id: 6067af4252
Former-commit-id: 26da1ce793
 2013-11-06 14:08:33 -05:00
Bryan Kowal
7a83214b1c Merge branch 'master_14.1.1' into omaha_14.1.1 
Conflicts:
	nativeLib/files.native/files.native.ecl
	nativeLib/ncep_grib2module/.cproject
	nativeLib/rary.cots.g2clib/.project
	nativeLib/rary.cots.g2clib/g2_unpack3.c
	rpms/awips2.core/Installer.python/component.spec
	rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
	rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so
	rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so.1

Former-commit-id: 4d7a4aefec [formerly 665911b033] [formerly c76c856340 [formerly 412bcb0f21b7385a170d14b3a88dd67c91a301a2]]
Former-commit-id: c76c856340
Former-commit-id: 0954490a5a
 2013-10-31 15:23:08 -05:00
Steve Harris
b60635cd70 14.1.1-4 baseline 
Former-commit-id: 82dec19b6a [formerly bd95bb6a4e] [formerly 99e3707c5b [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]
Former-commit-id: 99e3707c5b
Former-commit-id: 7590a56e0e
 2013-10-28 10:55:16 -04:00
Steve Harris
aa59400b67 14.1.1-3 baseline 
Former-commit-id: 851f9df229 [formerly 94f24e0d8a] [formerly 5739b4f832 [formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]]
Former-commit-id: 5739b4f832
Former-commit-id: 4a6a209aea
 2013-10-28 10:46:02 -04:00
Bryan Kowal
b1bdf0dbc5 Issue #2396 - updated grib2.so to use a newer version of g2clib 
Former-commit-id: 2ad7db4f5d [formerly b7b11dc747] [formerly 9a472e1bbe [formerly 6730ef07554b6e335427bcf08dded302fcc4a398]]
Former-commit-id: 9a472e1bbe
Former-commit-id: f892849313
 2013-10-16 12:54:58 -05:00
Bryan Kowal
72ed6c5f7a Merge branch 'master_14.1.1' into omaha_14.1.1 
Conflicts:
	rpms/awips2.qpid/0.18/deploy.builder/build.sh

Former-commit-id: 96c800f3f4 [formerly 5eba3290c8] [formerly 8f14318bc7 [formerly d6b9ed6ec29c5285ec454fb1c1e65e64a096edb9]]
Former-commit-id: 8f14318bc7
Former-commit-id: 53af4c7284
 2013-10-08 10:35:03 -05:00
Steve Harris
21b84f0290 13.5.2-8 baseline 
Former-commit-id: 8ba7d392d6 [formerly 94aa71fcd1] [formerly 18325949fb [formerly 6effdd3f5ce46910c89236306fa33499eada174f]]
Former-commit-id: 18325949fb
Former-commit-id: d89fbf73d9
 2013-10-04 11:30:03 -04:00
Steve Harris
c2fa80310e Merge branch 'master_14.1.1' (13.5.2-7) into omaha_14.1.1 
Conflicts:
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	rpms/python.site-packages/Installer.qpid/component.spec

kept the omaha_14.1.1 versions of the .so files


Former-commit-id: 59f753ee0d [formerly fc0cdf4996] [formerly 84ad96f2e0 [formerly 5b5cb6d6fb5d492d9244e3fa50f84710a07811b3]]
Former-commit-id: 84ad96f2e0
Former-commit-id: c6a4241c5b
 2013-10-01 15:34:01 -05:00
Steve Harris
557a7c87d5 13.5.2-6 baseline 
Former-commit-id: 059549438a [formerly 3821475d4e] [formerly 3837fbe670 [formerly 726299a49759971bf9a79ca7598c4f39ecb6721c]]
Former-commit-id: 3837fbe670
Former-commit-id: 22cb9b98cd
 2013-09-23 10:03:15 -04:00
Bryan Kowal
0f702bf515 Issue #2334 - only free memory when we actually no longer care about its contents. 
Change-Id: I49fc1e514c65065ddb6e834a6aeed41f466341f4

Former-commit-id: 0d9fe24f7b [formerly 5e334a7b0e] [formerly 706920aed6 [formerly ac3d847501e41668f923f2ea40572c3894e8dc79]]
Former-commit-id: 706920aed6
Former-commit-id: 34f85b41c2
 2013-09-19 17:32:08 -05:00
Steve Harris
4c6790f10f 13.5.2-4 baseline 
Former-commit-id: 595e7bc0d9 [formerly e3c935d48b] [formerly 58c6821427 [formerly da631849bc9eaaa5c83c2393520b6099413107a5]]
Former-commit-id: 58c6821427
Former-commit-id: abed443b59
 2013-09-12 11:13:59 -04:00
Bryan Kowal
1918d5e96a Issue #2163 - fix Eclipse CDT metadata after merge 
Former-commit-id: ea4cbc4c9a [formerly 351824fb85] [formerly b88a13d3b5 [formerly 7502d12a78c68f56e33a41bae7b3346d195ad79f]]
Former-commit-id: b88a13d3b5
Former-commit-id: 4670dcb9a7
 2013-09-04 14:49:47 -05:00
Bryan Kowal
98e4f44a7d Issue #2163 - RHEL6 nativeLib changes required for compiler compatibility 
- Amend: restore mpe changes
- Amend: attempt rebase

Change-Id: I7763e2b8b56cc9d2caae022f35e72c82a7f1da90

Conflicts:

	nativeLib/edex_com/.cproject
	nativeLib/edex_notify/.cproject


Former-commit-id: 5bcf751c50 [formerly 9db548db3e] [formerly 326cae8be4 [formerly 5fb2f3ae5276385fb65c2102ad7619a855947632]]
Former-commit-id: 326cae8be4
Former-commit-id: 573aeaa238
 2013-09-04 10:08:21 -05:00
Steve Harris
55bbf0f747 Merge branch 'master_13.5.2' (13.5.2-2) into omaha_14.1.1 
Conflicts:
	edexOsgi/com.raytheon.uf.edex.distribution/src/com/raytheon/uf/edex/distribution/DistributionSrv.java
	nativeLib/edexBridge/.cproject
	nativeLib/edexBridge/edexBridge.cpp
	rpms/awips2.core/Installer.ldm/component.spec
	rpms/awips2.core/Installer.ldm/patch/ld.so.conf.d/awips2-ldm-i386.conf
	rpms/awips2.qpid/0.18/SOURCES/awips.patch
	rpms/awips2.qpid/0.18/SPECS/qpid-lib.spec
	rpms/awips2.qpid/0.18/deploy.builder/build.sh
	rpms/build/common/rpms.sh

Former-commit-id: 433cc78081 [formerly 18ee1d0092] [formerly 7fe19d898c [formerly b2674e0f626c643f0f81f865ea56351af2531c6a]]
Former-commit-id: 7fe19d898c
Former-commit-id: 0514103d87
 2013-09-03 16:05:44 -05:00
Bryan Kowal
751f005228 Issue #2163 - RHEL6 14.1.1 build updates 
Former-commit-id: 17d652a8dd [formerly 9415560b38] [formerly ab3485a3ed [formerly b0e47f4548c235a7cbaefc12e97264ce4c782fce]]
Former-commit-id: ab3485a3ed
Former-commit-id: 17b8ded082
 2013-09-03 13:46:19 -05:00
Steve Harris
261b1da9d6 13.5.1-18 baseline 
Former-commit-id: d931b80e70 [formerly afb34814dd] [formerly 0a7acf96c7 [formerly f407ad6db2f621a5be95939aea88f49d874d1ab6]]
Former-commit-id: 0a7acf96c7
Former-commit-id: 2f9aa87a9f
 2013-08-22 09:12:43 -04:00
Bryan Kowal
9943f3a57c Issue #2163 - fixed awips2-openfire and re-compiled nativeLib for RHEL6. 
Conflicts:
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.empty.motif.so
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.empty.motif.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so

Former-commit-id: a962be9a15 [formerly 0b4961e9b0] [formerly 8b51e353f1 [formerly 0a735f5fe81d5329bc02a421ecc39a0974d48d37]]
Former-commit-id: 8b51e353f1
Former-commit-id: 5dffc9321c
 2013-08-15 15:38:11 -05:00
Bryan Kowal
9b62e39fff Issue #2163 - additional RHEL6 changes 
- updated edexBridge to use the QPID 0.18 API
- awips2-ldm is now ready for RHEL 6
- the QPID 0.18 rpms now build for RHEL 6
- disabled the build of QPID 0.7
- awips2-qpid-lib (new to RHEL 6) is now ready


Former-commit-id: 5feab7c0be [formerly bbca63a8b8] [formerly 36eca9bbfb [formerly d0f73c3852e45ec7b2363b46c77a94d7b3a47143]]
Former-commit-id: 36eca9bbfb
Former-commit-id: 1f5e92aac9
 2013-08-15 15:25:52 -05:00
Bryan Kowal
6561efe457 Issue #2163 - python rpm specification and awips2-notification compatibility with RedHat 6 
Former-commit-id: 2b4faafed7 [formerly e3e596eb5d] [formerly be011d3b92 [formerly f2497ff20afefdcf67b0b4bcc17f9ee358d2288d]]
Former-commit-id: be011d3b92
Former-commit-id: 7b1615ba80
 2013-08-15 15:24:11 -05:00
Steve Harris
4f9288e7c1 13.5.1-15 baseline 
Former-commit-id: 535218c676 [formerly 53e96e21db] [formerly c6dc1817e7 [formerly dbf9107f9c775f9a1df759bc341c0722f5fc92f2]]
Former-commit-id: c6dc1817e7
Former-commit-id: 65beefde58
 2013-08-14 10:24:26 -04:00
Greg Armendariz
9f2f62427b 13.5.1-13 baseline 
Former-commit-id: f0b62a22bf [formerly 29b823fee4] [formerly 5577e686c1 [formerly 3a9c1057ea5f7d72ba1d962766ad0e68ded9b3e4]]
Former-commit-id: 5577e686c1
Former-commit-id: 8bfac41add
 2013-08-08 17:00:36 -04:00
Steve Harris
a7d4c6274e 13.5.1-8 baseline 
Former-commit-id: 392faf86e7 [formerly 3bece5e5d0] [formerly dfbf9a5afe [formerly 37504305d70e6aaf6a7bdfad8267054af0612515]]
Former-commit-id: dfbf9a5afe
Former-commit-id: 2afb46f814
 2013-07-26 09:02:34 -04:00
Steve Harris
cb50a0028d 13.5.1-7 baseline 
Former-commit-id: 630705aa3f [formerly bf58a81b38] [formerly 86ce1248c2 [formerly 4310ff14ffe9c7975574bb8b40bef668a90649e4]]
Former-commit-id: 86ce1248c2
Former-commit-id: f9c9aecba5
 2013-07-18 12:07:22 -04:00
Steve Harris
640b022e84 13.5.1-4 baseline 
Former-commit-id: c56be8a332 [formerly 70e4ff30a6] [formerly e197f23ce3 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]
Former-commit-id: e197f23ce3
Former-commit-id: f658320357
 2013-06-28 09:46:25 -04:00
Steve Harris
ccd66c0724 13.5.1-2 baseline 
Former-commit-id: bc60b22f00 [formerly adb779323d] [formerly 3386330894 [formerly 36f4554f8f80812a5ffa0d243fe1a4ad6e330192]]
Former-commit-id: 3386330894
Former-commit-id: 3926dc20f7
 2013-06-17 15:01:22 -04:00
Steve Harris
0aab285b8a 13.5.1-1 baseline 
Former-commit-id: 6384018950 [formerly 998961612c] [formerly fe872355a7 [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]
Former-commit-id: fe872355a7
Former-commit-id: 30ba1d634e
 2013-06-10 15:17:17 -04:00
Steve Harris
ff7a21ac37 13.4.1-7 baseline 
Former-commit-id: 8072752c77 [formerly 4c6ff79e71] [formerly 8347bed50e [formerly dd6304e82206bb46b0c0442d15ab5d9312d9f19f]]
Former-commit-id: 8347bed50e
Former-commit-id: b35027f661
 2013-05-13 12:58:10 -04:00
Steve Harris
e0af96524f 13.4.1-5 baseline 
Former-commit-id: aa9a719836 [formerly 85bbf6d242] [formerly 4ae0e2e858 [formerly 2d978fe3d2cf99e04040d191e040dbcb84a60b9a]]
Former-commit-id: 4ae0e2e858
Former-commit-id: aa4624c58f
 2013-05-03 09:29:14 -05:00
Steve Harris
c1349f4a6d 13.4.1-4.1 baseline (recovered lost bin directories for 13.4.1-4) 
Former-commit-id: 344054d3e9 [formerly 1a6fd7edfd] [formerly 0f76c3cbee [formerly dca18e1b350f5424ec129b6cd0d602ceb86e119b]]
Former-commit-id: 0f76c3cbee
Former-commit-id: 99a7521fd6
 2013-05-03 09:20:30 -05:00
Steve Harris
4357e2dacc 13.4.1-4 baseline 
Former-commit-id: 99f4569650 [formerly d33e5861aa] [formerly 7a78f8ac6e [formerly 4477bad886dc7ae0418409e3bc5ebce7965b6146]]
Former-commit-id: 7a78f8ac6e
Former-commit-id: 7828293d32
 2013-05-02 10:00:38 -05:00
Steve Harris
0e950655f1 13.4.1-1 baseline 
Former-commit-id: f95e0ad10b [formerly 2f517b7713] [formerly 00332e6305 [formerly c03222bb480d87c05982b4d49f863e615b5b5584]]
Former-commit-id: 00332e6305
Former-commit-id: 4accbb80db
 2013-04-24 17:15:55 -05:00
Steve Harris
ef413da5f7 13.3.1-17 baseline 
Former-commit-id: f28b85d42f [formerly 7bf9966dcb] [formerly a3fe998f8f [formerly 0eb0081dbf1af625ca75e98ab775247c924c3527]]
Former-commit-id: a3fe998f8f
Former-commit-id: 4afa41d4e7
 2013-04-01 12:04:56 -05:00
Steve Harris
6fe4b16924 13.3.1-6 baseline 
Former-commit-id: 2e110bd151 [formerly 3a4c7931e1] [formerly 566b677d09 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]]
Former-commit-id: 566b677d09
Former-commit-id: 4ed21b702b
 2013-03-12 08:35:45 -05:00
Steve Harris
e4435815c9 13.3.1-1 baseline 
Former-commit-id: 8ae397085e [formerly 71e8990021] [formerly d2a654625f [formerly 34684c71436ce4c395ea523eb34ded6792476816]]
Former-commit-id: d2a654625f
Former-commit-id: 46d28be4a4
 2013-02-20 16:19:40 -06:00
Steve Harris
bbe92e6824 13.2.1-6 baseline 
Former-commit-id: d66ad2f77b [formerly d0752de66c] [formerly a46e33f06e [formerly 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb]]
Former-commit-id: a46e33f06e
Former-commit-id: 30d38334cc
 2013-02-07 16:00:39 -06:00
Steve Harris
d9be4dce21 13.2.1-2 baseline 
Former-commit-id: 33bc5fd816 [formerly 83e9157df7] [formerly 328c6dccad [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]
Former-commit-id: 328c6dccad
Former-commit-id: 47cc08ac79
 2013-01-23 11:18:44 -05:00
Steve Harris
cd4185ef5c 13.1.2-2 baseline 
Former-commit-id: 51208e5515 [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 941337c553
 2013-01-06 14:32:24 -06:00
Steve Harris
8a41d325d2 12.12.1-10 baseline 
Former-commit-id: c7ec50d4f9 [formerly 45f5150eb6] [formerly 28018b8d9b [formerly 07d77ee5ca986f9762ec9c3276e8320e3f363ebc]]
Former-commit-id: 28018b8d9b
Former-commit-id: 0c67cb78a3
 2012-12-06 09:12:15 -06:00
Steve Harris
efba080b9c 12.11.1-7 baseline 
Former-commit-id: 40a5bc1683 [formerly d8ca6b9005] [formerly 79a5638de9 [formerly 59b9a93267bcf7b82fdefc55784289f7510117d0]]
Former-commit-id: 79a5638de9
Former-commit-id: cfd228f0d7
 2012-10-23 16:40:50 -05:00
Steve Harris
2c82d9cb07 12.11.1-4 baseline 
Former-commit-id: 98171b5de9 [formerly d3497e47eb] [formerly 6958b861f0 [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]
Former-commit-id: 6958b861f0
Former-commit-id: cbbdb231ce
 2012-10-16 13:27:07 -05:00
Steve Harris
0e77eb2fe2 12.10.1-6 baseline 
Former-commit-id: 81d91a8289 [formerly cebe6534ae] [formerly ba648f8e72 [formerly b0c7a01c0318ed09bb5eb7ff6cc6550948f19cbc]]
Former-commit-id: ba648f8e72
Former-commit-id: 5d5a61bd75
 2012-09-25 10:14:23 -05:00
Steve Harris
684feb34e5 12.10.1-4 baseline 
Former-commit-id: e38e81ab8c [formerly fd19ca5624] [formerly 49c3861597 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]
Former-commit-id: 49c3861597
Former-commit-id: 2ba58a3576
 2012-09-13 12:08:11 -05:00
Steve Harris
e720b8ed31 12.10.1-1 baseline 
Former-commit-id: 0abf64b77c [formerly 195158c004] [formerly d708932029 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]]
Former-commit-id: d708932029
Former-commit-id: 7bd9c63dc7
 2012-09-04 12:07:27 -05:00
Steve Harris
f43a5af47f 12.9.1-10 baseline 
Former-commit-id: bdb45cdfae [formerly 3adc50a783] [formerly cb9b80f3a0 [formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]]
Former-commit-id: cb9b80f3a0
Former-commit-id: dc08c5a71a
 2012-08-30 14:28:27 -05:00
Steve Harris
34fa4b5804 12.9.1-5 baseline (with forgotten bin files now included) 
Former-commit-id: 7a4f4ac493 [formerly b8ab6066f6] [formerly b77a4d40d7 [formerly e977bd92cef6986b14725164c9eaa417ecf359cf]]
Former-commit-id: b77a4d40d7
Former-commit-id: b2c0dd1abb
 2012-08-22 16:00:33 -05:00