Commit graph

378 commits

Author SHA1 Message Date
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
Bryan Kowal
5db663c2ae Issue #2432 - fix qpid build
Former-commit-id: ef1e8ac70bec7c9d242c5aed0cf07acaaf2bb31b
2013-10-03 08:33:15 -05: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
0f8fc513bf 13.5.2-7 baseline
Former-commit-id: dace09a228fa4bef6bddc1388f12d35adcbd7543
2013-09-30 13:05:31 -04: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
Bryan Kowal
b9f4e93687 Issue #2382 - fix qpid amqp path
Former-commit-id: 263ce6e82d1ecf3164961b599c2d4aac7d61f783
2013-09-17 17:51:43 -05:00
Steve Harris
0745317d53 13.5.2-5 baseline
Former-commit-id: ed50e9426fd099fd9336b7bfc8d0c5c35f8500f4
2013-09-16 10:14:25 -04:00
Bryan Kowal
21d395a914 Issue #2356 - update httpd-collaboration configuration for new httpd version and RHEL6
Former-commit-id: 21ac850e9cf61f58a324f17ee687f50cda7c5804
2013-09-12 13:08:07 -05:00
Steve Harris
e3c935d48b 13.5.2-4 baseline
Former-commit-id: da631849bc9eaaa5c83c2393520b6099413107a5
2013-09-12 11:13:59 -04:00
Bryan Kowal
826d5e1c78 Issue #2356 - pypies configuration updates and RHEL6 compatibility updates
Former-commit-id: 2f1617632a5d24748e915066a7209839bca3f68a
2013-09-11 17:34:19 -05:00
Bryan Kowal
18756316ce Issue #2343 - resolve AWIPS II httpd depenency issue
Former-commit-id: b5081a38c6d90f47a625fde975f717ff4f63215f
2013-09-10 17:04:35 -05:00
Bryan Kowal
f8c0886d52 Issue #2163 - disable Java 7 build
Former-commit-id: eb2bba4ac4a43eff894a23f714c8b71fba20419c
2013-09-09 09:46:09 -05:00
Bryan Kowal
1adf764747 Issue #2163 - convert the few remaining python rpms for 14.1.1; remove 13.6 feature modifications
Former-commit-id: 4503735d3a05071878683f4a523d0dbd37e47ea3
2013-09-06 12:30:01 -05: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
a02d910023 Issue #2163 - build dynamicserialize and ufpy with the redhat 6 build
Former-commit-id: 422e9b611535e9c20338041e0e1af62d38aab047
2013-09-04 13:48:08 -05:00
Steve Harris
9fdd0e51a0 13.5.2-3 baseline
Former-commit-id: 51ecc8e9e15940e6cbe2c5da55edc5860ea8b0ca
2013-09-04 14:13:29 -04: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
4a47fb97c5 13.5.2-2 baseline
Former-commit-id: 6cecce21eb6a7c9b72d7a61936dcbe4f4688fba9
2013-08-29 15:01:29 -04:00
Steve Harris
73dd0f166c 13.5.2-1 baseline
Former-commit-id: a362ca91ee5972a1501a2842191fbe2e23feac9c
2013-08-28 09:43:48 -04:00
Steve Harris
afb34814dd 13.5.1-18 baseline
Former-commit-id: f407ad6db2f621a5be95939aea88f49d874d1ab6
2013-08-22 09:12:43 -04:00
Steve Harris
9dd7dc5d20 13.5.1-17 baseline
Former-commit-id: c5d75a6473b2659b9ac1054a1160c921bd8c1c16
2013-08-19 16:34:24 -04:00
Bryan Kowal
a3a5c799fc Issue #2163 - build the java and awips2-common-base rpms
Former-commit-id: dcd9e70f94deda8a26e8df00ee9bc8ffc13abe43
2013-08-15 15:40:18 -05:00
Bryan Kowal
32f3e63bd5 Issue #2163 - copy additional httpd source to the rpm SOURCES directory
Former-commit-id: b22a36d559ba6db6d1bd3d3c6785984353449a92
2013-08-15 15:40:05 -05:00
Bryan Kowal
19d80d96c3 Issue #2163 - remaining RHEL6 RPM changes
- Amend: update build.sh to build the full set of rpms

Change-Id: I182f23ffc67f2dc84a0e5436b2830311e29f534f

Conflicts:
	rpms/awips2.edex/Installer.edex-datadelivery/datadelivery.patch0

Former-commit-id: 45adc2b64e9037273e1013631ba7a8fbef400c35
2013-08-15 15:39:37 -05: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
c1dab22fdb Issue #2163 - remaining rpms that are not dependent on nativeLib and cleanup
Conflicts:
	RadarServer/build.rcm/build.xml
	cave/com.raytheon.uf.viz.feature.alertviz/feature.xml

Former-commit-id: 58a80b4b6d31d11b0ca722545bfd788a2feee488
2013-08-15 15:30:05 -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
b08a9da804 Issue #2163 - pgadmin 3 updated for RHEL 6 compatibility
Former-commit-id: 417c6abe1a9d7f2df51ca38a8127d06e6a15dc7b
2013-08-15 15:25:43 -05:00
Bryan Kowal
91a84e57b5 Issue #2163 - updates to PostgreSQL, psql, httpd-pypies, and httpd-collaboration rpms
- httpd has been updated for compatibility


Former-commit-id: 8298c43aba3850753b67ff002f71e02e70b12fb0
2013-08-15 15:25:02 -05:00
Bryan Kowal
0bee225031 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: ffc8892888976ee4b9d9edeb315b74edc5bb375f
2013-08-15 15:24:48 -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
cd3b63d961 13.5.1-16 baseline
Former-commit-id: 2fcbcde58066c18ab423c94c37f446ab5e7f42da
2013-08-15 13:40:37 -04:00
Steve Harris
53e96e21db 13.5.1-15 baseline
Former-commit-id: dbf9107f9c775f9a1df759bc341c0722f5fc92f2
2013-08-14 10:24:26 -04:00
Steve Harris
d695e5debe 13.5.1-14 baseline
Former-commit-id: fe7b1a704ee92b34684e4f9059bd61cfa28dd485
2013-08-14 10:07:41 -04:00
Greg Armendariz
29b823fee4 13.5.1-13 baseline
Former-commit-id: 3a9c1057ea5f7d72ba1d962766ad0e68ded9b3e4
2013-08-08 17:00:36 -04:00
Greg Armendariz
c9898ba8d1 13.5.1-12 baseline
Former-commit-id: eb9cd610891ce5830f4a169db036a49f32c1e63b
2013-08-08 15:34:01 -04:00
Greg Armendariz
ea7b22500e 13.5.1-11 baseline
Former-commit-id: 7142e607157f6d6ac1ba5cb24f3b3dbf9ab75f7f
2013-08-07 14:34:27 -04:00
Greg Armendariz
852455843f 13.5.1-10 baseline
Former-commit-id: c2c6882c462c34ce9cb9ea3399071c2a121ba0f7
2013-08-07 14:14:46 -04:00
Steve Harris
97fe6a670f 13.5.1-9 baseline
Former-commit-id: 06a1dd45adedbe259f9c30ebf93f2f90017fe945
2013-08-01 09:20:23 -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
Greg Armendariz
7e09fa5a0b 13.5.1-6 baseline
Former-commit-id: 30b8d4c0ce425715ea44a394b4b4f143c64b416a
2013-07-10 10:04:22 -04:00
Greg Armendariz
492f92ef7b 13.5.1-5 baseline
Former-commit-id: e0157ab61ca5f2a62d78993a27893778fa119c4f
2013-07-03 12:20:27 -04:00
Steve Harris
70e4ff30a6 13.5.1-4 baseline
Former-commit-id: d18b403b332dff67d1c85d4317bbceda337d1b41
2013-06-28 09:46:25 -04:00
Steve Harris
63803c1424 13.5.1-3 baseline
Former-commit-id: cc90f0c02410fef504ec9de389c07dfa41164247
2013-06-24 09:29:43 -04:00