Commit graph

49 commits

Author SHA1 Message Date
Bryan Kowal
5bcf751c50 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: 326cae8be4 [formerly 5fb2f3ae5276385fb65c2102ad7619a855947632]
Former-commit-id: 9db548db3e
2013-09-04 10:08:21 -05:00
Steve Harris
433cc78081 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: 7fe19d898c [formerly b2674e0f626c643f0f81f865ea56351af2531c6a]
Former-commit-id: 18ee1d0092
2013-09-03 16:05:44 -05:00
Bryan Kowal
17d652a8dd Issue #2163 - RHEL6 14.1.1 build updates
Former-commit-id: ab3485a3ed [formerly b0e47f4548c235a7cbaefc12e97264ce4c782fce]
Former-commit-id: 9415560b38
2013-09-03 13:46:19 -05:00
Steve Harris
d931b80e70 13.5.1-18 baseline
Former-commit-id: 0a7acf96c7 [formerly f407ad6db2f621a5be95939aea88f49d874d1ab6]
Former-commit-id: afb34814dd
2013-08-22 09:12:43 -04:00
Bryan Kowal
a962be9a15 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: 8b51e353f1 [formerly 0a735f5fe81d5329bc02a421ecc39a0974d48d37]
Former-commit-id: 0b4961e9b0
2013-08-15 15:38:11 -05:00
Bryan Kowal
5feab7c0be 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: 36eca9bbfb [formerly d0f73c3852e45ec7b2363b46c77a94d7b3a47143]
Former-commit-id: bbca63a8b8
2013-08-15 15:25:52 -05:00
Bryan Kowal
2b4faafed7 Issue #2163 - python rpm specification and awips2-notification compatibility with RedHat 6
Former-commit-id: be011d3b92 [formerly f2497ff20afefdcf67b0b4bcc17f9ee358d2288d]
Former-commit-id: e3e596eb5d
2013-08-15 15:24:11 -05:00
Steve Harris
535218c676 13.5.1-15 baseline
Former-commit-id: c6dc1817e7 [formerly dbf9107f9c775f9a1df759bc341c0722f5fc92f2]
Former-commit-id: 53e96e21db
2013-08-14 10:24:26 -04:00
Greg Armendariz
f0b62a22bf 13.5.1-13 baseline
Former-commit-id: 5577e686c1 [formerly 3a9c1057ea5f7d72ba1d962766ad0e68ded9b3e4]
Former-commit-id: 29b823fee4
2013-08-08 17:00:36 -04:00
Steve Harris
392faf86e7 13.5.1-8 baseline
Former-commit-id: dfbf9a5afe [formerly 37504305d70e6aaf6a7bdfad8267054af0612515]
Former-commit-id: 3bece5e5d0
2013-07-26 09:02:34 -04:00
Steve Harris
630705aa3f 13.5.1-7 baseline
Former-commit-id: 86ce1248c2 [formerly 4310ff14ffe9c7975574bb8b40bef668a90649e4]
Former-commit-id: bf58a81b38
2013-07-18 12:07:22 -04:00
Steve Harris
c56be8a332 13.5.1-4 baseline
Former-commit-id: e197f23ce3 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]
Former-commit-id: 70e4ff30a6
2013-06-28 09:46:25 -04:00
Steve Harris
bc60b22f00 13.5.1-2 baseline
Former-commit-id: 3386330894 [formerly 36f4554f8f80812a5ffa0d243fe1a4ad6e330192]
Former-commit-id: adb779323d
2013-06-17 15:01:22 -04:00
Steve Harris
6384018950 13.5.1-1 baseline
Former-commit-id: fe872355a7 [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]
Former-commit-id: 998961612c
2013-06-10 15:17:17 -04:00
Steve Harris
8072752c77 13.4.1-7 baseline
Former-commit-id: 8347bed50e [formerly dd6304e82206bb46b0c0442d15ab5d9312d9f19f]
Former-commit-id: 4c6ff79e71
2013-05-13 12:58:10 -04:00
Steve Harris
aa9a719836 13.4.1-5 baseline
Former-commit-id: 4ae0e2e858 [formerly 2d978fe3d2cf99e04040d191e040dbcb84a60b9a]
Former-commit-id: 85bbf6d242
2013-05-03 09:29:14 -05:00
Steve Harris
344054d3e9 13.4.1-4.1 baseline (recovered lost bin directories for 13.4.1-4)
Former-commit-id: 0f76c3cbee [formerly dca18e1b350f5424ec129b6cd0d602ceb86e119b]
Former-commit-id: 1a6fd7edfd
2013-05-03 09:20:30 -05:00
Steve Harris
99f4569650 13.4.1-4 baseline
Former-commit-id: 7a78f8ac6e [formerly 4477bad886dc7ae0418409e3bc5ebce7965b6146]
Former-commit-id: d33e5861aa
2013-05-02 10:00:38 -05:00
Steve Harris
f95e0ad10b 13.4.1-1 baseline
Former-commit-id: 00332e6305 [formerly c03222bb480d87c05982b4d49f863e615b5b5584]
Former-commit-id: 2f517b7713
2013-04-24 17:15:55 -05:00
Steve Harris
f28b85d42f 13.3.1-17 baseline
Former-commit-id: a3fe998f8f [formerly 0eb0081dbf1af625ca75e98ab775247c924c3527]
Former-commit-id: 7bf9966dcb
2013-04-01 12:04:56 -05:00
Steve Harris
2e110bd151 13.3.1-6 baseline
Former-commit-id: 566b677d09 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]
Former-commit-id: 3a4c7931e1
2013-03-12 08:35:45 -05:00
Steve Harris
8ae397085e 13.3.1-1 baseline
Former-commit-id: d2a654625f [formerly 34684c71436ce4c395ea523eb34ded6792476816]
Former-commit-id: 71e8990021
2013-02-20 16:19:40 -06:00
Steve Harris
d66ad2f77b 13.2.1-6 baseline
Former-commit-id: a46e33f06e [formerly 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb]
Former-commit-id: d0752de66c
2013-02-07 16:00:39 -06:00
Steve Harris
33bc5fd816 13.2.1-2 baseline
Former-commit-id: 328c6dccad [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]
Former-commit-id: 83e9157df7
2013-01-23 11:18:44 -05:00
Steve Harris
51208e5515 13.1.2-2 baseline
Former-commit-id: 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]
Former-commit-id: c0c1d56f3a
2013-01-06 14:32:24 -06:00
Steve Harris
c7ec50d4f9 12.12.1-10 baseline
Former-commit-id: 28018b8d9b [formerly 07d77ee5ca986f9762ec9c3276e8320e3f363ebc]
Former-commit-id: 45f5150eb6
2012-12-06 09:12:15 -06:00
Steve Harris
40a5bc1683 12.11.1-7 baseline
Former-commit-id: 79a5638de9 [formerly 59b9a93267bcf7b82fdefc55784289f7510117d0]
Former-commit-id: d8ca6b9005
2012-10-23 16:40:50 -05:00
Steve Harris
98171b5de9 12.11.1-4 baseline
Former-commit-id: 6958b861f0 [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]
Former-commit-id: d3497e47eb
2012-10-16 13:27:07 -05:00
Steve Harris
81d91a8289 12.10.1-6 baseline
Former-commit-id: ba648f8e72 [formerly b0c7a01c0318ed09bb5eb7ff6cc6550948f19cbc]
Former-commit-id: cebe6534ae
2012-09-25 10:14:23 -05:00
Steve Harris
e38e81ab8c 12.10.1-4 baseline
Former-commit-id: 49c3861597 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]
Former-commit-id: fd19ca5624
2012-09-13 12:08:11 -05:00
Steve Harris
0abf64b77c 12.10.1-1 baseline
Former-commit-id: d708932029 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]
Former-commit-id: 195158c004
2012-09-04 12:07:27 -05:00
Steve Harris
bdb45cdfae 12.9.1-10 baseline
Former-commit-id: cb9b80f3a0 [formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]
Former-commit-id: 3adc50a783
2012-08-30 14:28:27 -05:00
Steve Harris
7a4f4ac493 12.9.1-5 baseline (with forgotten bin files now included)
Former-commit-id: b77a4d40d7 [formerly e977bd92cef6986b14725164c9eaa417ecf359cf]
Former-commit-id: b8ab6066f6
2012-08-22 16:00:33 -05:00
Steve Harris
a1d931fd44 12.9.1-5 baseline
Former-commit-id: f2fac39428 [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]
Former-commit-id: 61f269f54c
2012-08-21 15:27:03 -05:00
Steve Harris
2653ddc2e3 12.8.1-5 baseline
Former-commit-id: cd49ef3eda [formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]
Former-commit-id: fd2abfb6f1
2012-08-01 10:45:37 -05:00
Steve Harris
11f96dbedd 12.7.1-8 baseline
Former-commit-id: c42ae0fa39 [formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]
Former-commit-id: 16bf591a33
2012-07-19 16:20:40 -05:00
Steve Harris
8552902906 12.5.1-15 baseline
Former-commit-id: 3904c4ccf5 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]
Former-commit-id: b13cbb7e00
2012-06-08 13:39:48 -05:00
Steve Harris
4bfbdad17d 12.4.1-10 baseline
Former-commit-id: 8485b90ff8 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]
Former-commit-id: 9f8cb727a5
2012-05-01 18:06:13 -05:00
Steve Harris
750b7543dd 12.4.1-4 baseline
Former-commit-id: 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]
Former-commit-id: 67a5a68300
2012-04-18 15:18:16 -05:00
Steve Harris
0e4128712b 12.3.1-10 baseline
Former-commit-id: 22bd792cd9 [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]
Former-commit-id: 4068f5295f
2012-03-30 08:38:33 -05:00
Bryan Kowal
d4b76c1057 Issue #182 - the meteolib Activator will now return a properly formatted path to the meteolib dll when on a Windows workstation. The meteolib "cape function" will now acurrately report if it is out of memory.
Former-commit-id: 9f1b7a613a [formerly 1ec51accade835c1133eac9222131f9186985053]
Former-commit-id: 4276fc2fe8
2012-02-17 11:09:13 -06:00
Steve Harris
221a02882a Merge commit 'awips2_OB12.1.1_Omaha' into 4-Thin_Client
Conflicts:
	msi/AWIPSII.CAVE/AWIPSII.CAVE/ipr.gif
	msi/AWIPSII.CAVE/AWIPSII.CAVE/obj/x86/Release/_DELETE_ME_
	nativeLib/rary.cots.jepp/jepp-2.3/windows/Release/_DELETE_ME_

Chose to keep in 4-Thin_Client


Former-commit-id: 23cc9689de [formerly 0c520ee63a42d53754686f52ffa5b94a0fe4eea1]
Former-commit-id: b9f4780fcb
2012-02-15 14:39:43 -06:00
Bryan Kowal
2fabaff1d9 Issue #243 - it is now possible to build meteolib on Windows; meteolib, jep, and gridslice are now all built using MSBuild when built from the command line.
Former-commit-id: 521756e57e [formerly 1dd23c4dea214938fe9660f303458c5f08efdc01]
Former-commit-id: 38eb4bd2b6
2012-02-15 10:31:58 -06:00
Ben Steffensmeier
808846e237 Issue #176 remove id from dataURI notifications
Change-Id: I418de45a0daf13c9656161cc4ef67b755052ea58

Issue #342 - edex_com, edex_notify, and awips2-notification updates.
Change-Id: Iba95d0fac10f40c76db4a46924f93cbbe40da4a2

Former-commit-id: f65d86a06a [formerly 518db101f2ec18afa31a5b12fbaab3bbb903013b]
Former-commit-id: 944e59e989
2012-02-14 15:46:11 -06:00
Bryan Kowal
c78e988d55 Issue #243 - standardized the Windows build of jep and gridslice. Both can be built from within Visual C++ 2008 or headless via a cmd console.
Former-commit-id: 4faf9831ed [formerly de3970ed2c199ca0c2a6bdf9a7eaa3d0d0069122]
Former-commit-id: 67562b0674
2012-02-13 13:57:10 -06:00
Bryan Kowal
3fecaf9a5a Issue #197 - merging gridslice changes into git thinclient branch.
Former-commit-id: a48a3094f0 [formerly ae1bd95af06f6413ff17b73b290fda3ab8a13b29]
Former-commit-id: 710c7af072
2012-01-23 13:40:59 -06:00
Bryan Kowal
be0b6a87eb Issue #24 - merging jep changes into git thinclient branch.
Former-commit-id: cf4d56d0a0 [formerly 89f42f2933110db2f8ae8ffb299a4de5fa3b87ac]
Former-commit-id: 5039d66b12
2012-01-23 13:25:11 -06:00
Matt Nash
580e2938d7 Moving 12.1.1 into ss_sync
Former-commit-id: c83e5ff474 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]
Former-commit-id: 66be3bec40
2012-01-19 11:53:12 -06:00
root
a02aeb236c Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]
Former-commit-id: 9f19e3f712
2012-01-06 08:55:05 -06:00