Commit graph

14 commits

Author SHA1 Message Date
Bryan Kowal
a030e35d95 Issue #1253 - re-compiled the shared libraries with the -O2 flag
Change-Id: I7e15eb5285f485fab4cdbf35e13dba91417090e1

Former-commit-id: 5237a0006e [formerly 3a5a9e9a24] [formerly c0302de18790e2fc770c6bb01693c40e1329898c [formerly 27b8ed0057]] [formerly 1cbc7c77a1 [formerly 27b8ed0057 [formerly daa7b076a331dab3d7139a16a24a4880becd08b1]]]
Former-commit-id: 1cbc7c77a1
Former-commit-id: 176f3be7ec5e0a3de9cb5b52c6e92a3ec81f5060 [formerly 385cd3f62a]
Former-commit-id: 367c8d0211
2012-10-09 14:40:36 -05:00
Steve Harris
9d1f595fe6 Merge branch 'ss_builds' (12.10.1-4) into development
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Former-commit-id: bedc9569ca [formerly 04de1d5857] [formerly 29e7427dc3] [formerly 04d9735c8f [formerly 29e7427dc3 [formerly 4b7c9ed0bdf6dc1a3a86421b502a176256d56aeb]]]
Former-commit-id: 04d9735c8f
Former-commit-id: 9191d8c6cfa1f6e0cfae44b8ecd803bd00e75cc9 [formerly 53673f63e6]
Former-commit-id: e23b030dfd
2012-09-13 13:26:13 -05:00
Steve Harris
424c32bd5d 12.10.1-4 baseline
Former-commit-id: 0d8d18d7e2 [formerly e38e81ab8c] [formerly fd19ca5624] [formerly 49c3861597 [formerly fd19ca5624 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]]
Former-commit-id: 49c3861597
Former-commit-id: 26cccfeea72d00040b6ff379b12158bba9f339d2 [formerly 2ba58a3576]
Former-commit-id: 684feb34e5
2012-09-13 12:08:11 -05:00
Steve Harris
a3a1864f56 Merge branch 'ss_builds' (12.9.1-11) into development
Conflicts:
	rpms/build/i386/build.sh

Former-commit-id: 9ff4f369a4 [formerly f52c8b374d] [formerly 3a9d4961e2] [formerly 34cbde4124 [formerly 3a9d4961e2 [formerly 73ab8bdcc39291fbe36b5bcffe53d9106cc00238]]]
Former-commit-id: 34cbde4124
Former-commit-id: b24c67b6e98e964ff9cd901ee9da994905e8a1b9 [formerly 3230e0b246]
Former-commit-id: ffe253196a
2012-08-30 14:40:34 -05:00
Steve Harris
c704490769 12.9.1-10 baseline
Former-commit-id: 264d870cbf [formerly bdb45cdfae] [formerly 3adc50a783] [formerly cb9b80f3a0 [formerly 3adc50a783 [formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]]]
Former-commit-id: cb9b80f3a0
Former-commit-id: eed64ebc552063bbc01aefdaa691a9c27ae700c3 [formerly dc08c5a71a]
Former-commit-id: f43a5af47f
2012-08-30 14:28:27 -05:00
Steve Harris
a6797a478a Merge branch 'ss_builds' (12.9.1-5) into development_on_ss_builds
Conflicts:
	cave/com.raytheon.viz.ui/schema/editorMenuAddition.exsd
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/ContributedEditorMenuAction.java
	edexOsgi/build.edex/edex/allElements.xml
	edexOsgi/build.edex/edex/customAssembly.xml
	edexOsgi/build.edex/esb/lib/lib_illusion/x86_64/libpython.so
	edexOsgi/build.edex/esb/lib/native/linux64/libjep.so
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/config.guess
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/config.sub
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/depcomp
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/install-sh
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/ltmain.sh
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/missing
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/mkinstalldirs
	nativeLib/rary.cots.jasper/jasper-1.900.1/configure
	rpms/awips2.core/Installer.python/nativeLib/i386/grib2.so
	rpms/awips2.core/Installer.python/nativeLib/i386/gridslice.so
	rpms/awips2.core/Installer.python/nativeLib/i386/libjasper.so.1.0.0
	rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
	rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so.1.0.0
	rpms/awips2.edex/deploy.builder/build.sh
	rpms/build/i386/build.sh
	tools/scripts/commit-msg
	tools/scripts/git-u-setup
	tools/scripts/uamend
	tools/scripts/ucommit
	tools/scripts/upull
	tools/scripts/upush
	tools/scripts/ustat

Former-commit-id: 57c1be9f5a [formerly 084ac9fbd4] [formerly d38f8b80f0] [formerly 44a7cb75e7 [formerly d38f8b80f0 [formerly 6d33469c48d659279c02e5e9489b67b00576381a]]]
Former-commit-id: 44a7cb75e7
Former-commit-id: 531735b4428be30c033b6b463b0342df571ead88 [formerly 77369f78a6]
Former-commit-id: b335416e06
2012-08-21 16:17:58 -05:00
Steve Harris
40aa780b3d 12.4.1-10 baseline
Former-commit-id: 7fa9dbd5fb [formerly 4bfbdad17d] [formerly 9f8cb727a5] [formerly 8485b90ff8 [formerly 9f8cb727a5 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]]
Former-commit-id: 8485b90ff8
Former-commit-id: 73930fb29d0c1e91204e76e6ebfdbe757414f319 [formerly a28d70b5c5]
Former-commit-id: 33a67cdd82
2012-05-01 18:06:13 -05:00
Steve Harris
98d8b3f188 12.4.1-4 baseline
Former-commit-id: 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]
Former-commit-id: 2a216f333c
Former-commit-id: e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd]
Former-commit-id: a2a6a18fae
2012-04-18 15:18:16 -05:00
Steve Harris
f3d32f34ce 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: 6d3d1066eb [formerly 221a02882a] [formerly b9f4780fcb] [formerly 23cc9689de [formerly b9f4780fcb [formerly 0c520ee63a42d53754686f52ffa5b94a0fe4eea1]]]
Former-commit-id: 23cc9689de
Former-commit-id: 601b02191762801f860cf28b52a200c6e003e7ea [formerly a2e3aabc60]
Former-commit-id: a85a777232
2012-02-15 14:39:43 -06:00
Bryan Kowal
83ba57dcd1 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: 7b5b643d18 [formerly 2fabaff1d9] [formerly 38eb4bd2b6] [formerly 521756e57e [formerly 38eb4bd2b6 [formerly 1dd23c4dea214938fe9660f303458c5f08efdc01]]]
Former-commit-id: 521756e57e
Former-commit-id: 66ae2354057f0c9b76ece5f6ef014f53d118b46b [formerly 1c023403e2]
Former-commit-id: 134b8f2915
2012-02-15 10:31:58 -06:00
Bryan Kowal
2e2b3b4869 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: 02c48be369 [formerly c78e988d55] [formerly 67562b0674] [formerly 4faf9831ed [formerly 67562b0674 [formerly de3970ed2c199ca0c2a6bdf9a7eaa3d0d0069122]]]
Former-commit-id: 4faf9831ed
Former-commit-id: e75d6befa5289852fa8cf3ebd7ce2bc1848f4f41 [formerly eb91bb964e]
Former-commit-id: 0bf4fecb62
2012-02-13 13:57:10 -06:00
Bryan Kowal
3bc50618b7 Issue #24 - merging jep changes into git thinclient branch.
Former-commit-id: c1d930b119 [formerly be0b6a87eb] [formerly 5039d66b12] [formerly cf4d56d0a0 [formerly 5039d66b12 [formerly 89f42f2933110db2f8ae8ffb299a4de5fa3b87ac]]]
Former-commit-id: cf4d56d0a0
Former-commit-id: 04447b381e8f34176bf56aeac8375d7e5d6866ba [formerly 90c33ef882]
Former-commit-id: f6b08149ad
2012-01-23 13:25:11 -06:00
Matt Nash
fa4cd88c90 Moving 12.1.1 into ss_sync
Former-commit-id: d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]
Former-commit-id: c83e5ff474
Former-commit-id: 21d2361f00 [formerly 1faae42484]
Former-commit-id: 82300ccdcf
2012-01-19 11:53:12 -06:00
root
9bb8decbcf Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 377dcd10b9 [formerly 3360eb6c5f]
Former-commit-id: 8e80217e59
2012-01-06 08:55:05 -06:00