Commit graph

64 commits

Author SHA1 Message Date
Bryan Kowal
a51231058a Issue #2547 - fix RHEL6 nativeLib build in 14.1.1
Former-commit-id: 7af6c4794f9523e6f0d632b0a9f34e8f5cbcda3f
2013-11-12 19:57:25 -06:00
Steve Harris
c218866826 Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: 2d5b1f7563e0f8dbd0dadcfa89cad35ba6fac98b
2013-11-06 13:22:12 -06:00
Steve Harris
3328e2dd1d 14.1.1-7 baseline
Former-commit-id: 8add3b227e88c3943ea605fdc4e2f2b3c7dcf998
2013-11-06 14:16:14 -05:00
Steve Harris
0cb2978c13 14.1.1-6 baseline
Former-commit-id: 7029e583ef36bf746fddda316ba011e27ed766b4
2013-11-06 14:08:33 -05:00
Bryan Kowal
665911b033 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: 412bcb0f21b7385a170d14b3a88dd67c91a301a2
2013-10-31 15:23:08 -05:00
Steve Harris
bd95bb6a4e 14.1.1-4 baseline
Former-commit-id: 0cda967cc9da9d2a08a0197db23d48c65f03be81
2013-10-28 10:55:16 -04:00
Steve Harris
94f24e0d8a 14.1.1-3 baseline
Former-commit-id: cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03
2013-10-28 10:46:02 -04:00
Bryan Kowal
b7b11dc747 Issue #2396 - updated grib2.so to use a newer version of g2clib
Former-commit-id: 6730ef07554b6e335427bcf08dded302fcc4a398
2013-10-16 12:54:58 -05:00
Bryan Kowal
5eba3290c8 Merge branch 'master_14.1.1' into omaha_14.1.1
Conflicts:
	rpms/awips2.qpid/0.18/deploy.builder/build.sh

Former-commit-id: d6b9ed6ec29c5285ec454fb1c1e65e64a096edb9
2013-10-08 10:35:03 -05:00
Steve Harris
94aa71fcd1 13.5.2-8 baseline
Former-commit-id: 6effdd3f5ce46910c89236306fa33499eada174f
2013-10-04 11:30:03 -04:00
Steve Harris
fc0cdf4996 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: 5b5cb6d6fb5d492d9244e3fa50f84710a07811b3
2013-10-01 15:34:01 -05:00
Steve Harris
3821475d4e 13.5.2-6 baseline
Former-commit-id: 726299a49759971bf9a79ca7598c4f39ecb6721c
2013-09-23 10:03:15 -04:00
Bryan Kowal
5e334a7b0e Issue #2334 - only free memory when we actually no longer care about its contents.
Change-Id: I49fc1e514c65065ddb6e834a6aeed41f466341f4

Former-commit-id: ac3d847501e41668f923f2ea40572c3894e8dc79
2013-09-19 17:32:08 -05:00
Steve Harris
e3c935d48b 13.5.2-4 baseline
Former-commit-id: da631849bc9eaaa5c83c2393520b6099413107a5
2013-09-12 11:13:59 -04:00
Bryan Kowal
351824fb85 Issue #2163 - fix Eclipse CDT metadata after merge
Former-commit-id: 7502d12a78c68f56e33a41bae7b3346d195ad79f
2013-09-04 14:49:47 -05:00
Bryan Kowal
9db548db3e 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: 5fb2f3ae5276385fb65c2102ad7619a855947632
2013-09-04 10:08:21 -05:00
Steve Harris
18ee1d0092 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: b2674e0f626c643f0f81f865ea56351af2531c6a
2013-09-03 16:05:44 -05:00
Bryan Kowal
9415560b38 Issue #2163 - RHEL6 14.1.1 build updates
Former-commit-id: b0e47f4548c235a7cbaefc12e97264ce4c782fce
2013-09-03 13:46:19 -05:00
Steve Harris
afb34814dd 13.5.1-18 baseline
Former-commit-id: f407ad6db2f621a5be95939aea88f49d874d1ab6
2013-08-22 09:12:43 -04:00
Bryan Kowal
0b4961e9b0 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: 0a735f5fe81d5329bc02a421ecc39a0974d48d37
2013-08-15 15:38:11 -05:00
Bryan Kowal
bbca63a8b8 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: d0f73c3852e45ec7b2363b46c77a94d7b3a47143
2013-08-15 15:25:52 -05:00
Bryan Kowal
e3e596eb5d Issue #2163 - python rpm specification and awips2-notification compatibility with RedHat 6
Former-commit-id: f2497ff20afefdcf67b0b4bcc17f9ee358d2288d
2013-08-15 15:24:11 -05:00
Steve Harris
53e96e21db 13.5.1-15 baseline
Former-commit-id: dbf9107f9c775f9a1df759bc341c0722f5fc92f2
2013-08-14 10:24:26 -04:00
Greg Armendariz
29b823fee4 13.5.1-13 baseline
Former-commit-id: 3a9c1057ea5f7d72ba1d962766ad0e68ded9b3e4
2013-08-08 17:00:36 -04:00
Steve Harris
3bece5e5d0 13.5.1-8 baseline
Former-commit-id: 37504305d70e6aaf6a7bdfad8267054af0612515
2013-07-26 09:02:34 -04:00
Steve Harris
bf58a81b38 13.5.1-7 baseline
Former-commit-id: 4310ff14ffe9c7975574bb8b40bef668a90649e4
2013-07-18 12:07:22 -04:00
Steve Harris
70e4ff30a6 13.5.1-4 baseline
Former-commit-id: d18b403b332dff67d1c85d4317bbceda337d1b41
2013-06-28 09:46:25 -04:00
Steve Harris
adb779323d 13.5.1-2 baseline
Former-commit-id: 36f4554f8f80812a5ffa0d243fe1a4ad6e330192
2013-06-17 15:01:22 -04:00
Steve Harris
998961612c 13.5.1-1 baseline
Former-commit-id: 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3
2013-06-10 15:17:17 -04:00
Steve Harris
4c6ff79e71 13.4.1-7 baseline
Former-commit-id: dd6304e82206bb46b0c0442d15ab5d9312d9f19f
2013-05-13 12:58:10 -04:00
Steve Harris
85bbf6d242 13.4.1-5 baseline
Former-commit-id: 2d978fe3d2cf99e04040d191e040dbcb84a60b9a
2013-05-03 09:29:14 -05:00
Steve Harris
1a6fd7edfd 13.4.1-4.1 baseline (recovered lost bin directories for 13.4.1-4)
Former-commit-id: dca18e1b350f5424ec129b6cd0d602ceb86e119b
2013-05-03 09:20:30 -05:00
Steve Harris
d33e5861aa 13.4.1-4 baseline
Former-commit-id: 4477bad886dc7ae0418409e3bc5ebce7965b6146
2013-05-02 10:00:38 -05:00
Steve Harris
2f517b7713 13.4.1-1 baseline
Former-commit-id: c03222bb480d87c05982b4d49f863e615b5b5584
2013-04-24 17:15:55 -05:00
Steve Harris
7bf9966dcb 13.3.1-17 baseline
Former-commit-id: 0eb0081dbf1af625ca75e98ab775247c924c3527
2013-04-01 12:04:56 -05:00
Steve Harris
3a4c7931e1 13.3.1-6 baseline
Former-commit-id: fecc19685d09be66f3eeeee392e565a1ce8b7e65
2013-03-12 08:35:45 -05:00
Steve Harris
71e8990021 13.3.1-1 baseline
Former-commit-id: 34684c71436ce4c395ea523eb34ded6792476816
2013-02-20 16:19:40 -06:00
Steve Harris
d0752de66c 13.2.1-6 baseline
Former-commit-id: 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb
2013-02-07 16:00:39 -06:00
Steve Harris
83e9157df7 13.2.1-2 baseline
Former-commit-id: bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf
2013-01-23 11:18:44 -05:00
Steve Harris
c0c1d56f3a 13.1.2-2 baseline
Former-commit-id: 221d0aaf0e19a054387134e72a76a278159bf4d0
2013-01-06 14:32:24 -06:00
Steve Harris
45f5150eb6 12.12.1-10 baseline
Former-commit-id: 07d77ee5ca986f9762ec9c3276e8320e3f363ebc
2012-12-06 09:12:15 -06:00
Steve Harris
d8ca6b9005 12.11.1-7 baseline
Former-commit-id: 59b9a93267bcf7b82fdefc55784289f7510117d0
2012-10-23 16:40:50 -05:00
Steve Harris
d3497e47eb 12.11.1-4 baseline
Former-commit-id: dddf20c9518c578d1bebd0b5e01b10c5080fd24e
2012-10-16 13:27:07 -05:00
Steve Harris
cebe6534ae 12.10.1-6 baseline
Former-commit-id: b0c7a01c0318ed09bb5eb7ff6cc6550948f19cbc
2012-09-25 10:14:23 -05:00
Steve Harris
fd19ca5624 12.10.1-4 baseline
Former-commit-id: 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed
2012-09-13 12:08:11 -05:00
Steve Harris
195158c004 12.10.1-1 baseline
Former-commit-id: 7d17407c5b0a4a3f9b4b083891a5a5975c645810
2012-09-04 12:07:27 -05:00
Steve Harris
3adc50a783 12.9.1-10 baseline
Former-commit-id: 32048810bc091d7ba09a321c36cd5a78b2d4bd39
2012-08-30 14:28:27 -05:00
Steve Harris
b8ab6066f6 12.9.1-5 baseline (with forgotten bin files now included)
Former-commit-id: e977bd92cef6986b14725164c9eaa417ecf359cf
2012-08-22 16:00:33 -05:00
Steve Harris
61f269f54c 12.9.1-5 baseline
Former-commit-id: d85b989f77196d20eb2d2a21cf4daa13d50474ae
2012-08-21 15:27:03 -05:00
Steve Harris
fd2abfb6f1 12.8.1-5 baseline
Former-commit-id: 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f
2012-08-01 10:45:37 -05:00