Commit graph

19 commits

Author SHA1 Message Date
Bryan Kowal
1f53abd09c Issue #2851 - 64-bit Windows build updates; also supports 32-bit builds
Amend: remove generated files

Change-Id: I727391745ff9cbaaa1a3953567f909da1da01630

Former-commit-id: f790e255ff [formerly 72a8f0406f] [formerly f790e255ff [formerly 72a8f0406f] [formerly c9ee6a38d0 [formerly 20e1e788dd5ca68497d5496586b30a8463dd0ca8]]]
Former-commit-id: c9ee6a38d0
Former-commit-id: 12a0cf6185 [formerly 5f2c5fb681]
Former-commit-id: f246fb0b97
2014-03-31 12:37:37 -05:00
Bryan Kowal
6dc3ae2214 Issue #2851 - msi build updates for two shortcuts instead of a single launcher; added amd64 scripts
Former-commit-id: 911c0a99c9 [formerly a554dc8c20] [formerly 911c0a99c9 [formerly a554dc8c20] [formerly 286051cbb9 [formerly 386723d9048f6d6b6bd0281f273210949672acd2]]]
Former-commit-id: 286051cbb9
Former-commit-id: f0f10e2544 [formerly 6b28f08242]
Former-commit-id: f5c1cf750b
2014-03-26 14:57:46 -05:00
Brian.Dyke
ac07a4fc49 Merge branch 'master_14.1.1' into master_14.2.1
Former-commit-id: a0e3f08fce [formerly 394076196b] [formerly a0e3f08fce [formerly 394076196b] [formerly 7b798ab5d2 [formerly 4385b291d04f60f3d5b3f00b1411ab1cd8c89ba7]]]
Former-commit-id: 7b798ab5d2
Former-commit-id: fa189c0ef6 [formerly 6ced1bedc2]
Former-commit-id: c8b3730fef
2014-03-07 09:01:09 -05:00
Brian.Dyke
c1dab50ce0 14.1.1-22 baseline
Former-commit-id: fe30e1d545 [formerly 21f17d4f9b] [formerly fe30e1d545 [formerly 21f17d4f9b] [formerly 08d8f1a0ee [formerly ae37ad5bac445251d1456f37588819fccfede061]]]
Former-commit-id: 08d8f1a0ee
Former-commit-id: 9406a1d6c0 [formerly a4c136fd60]
Former-commit-id: 067802b104
2014-03-07 08:49:00 -05:00
Richard Peter
ae6e34be4b Merge branch 'omaha_14.1.1' (14.1.1-11) into development
Conflicts:
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java
	edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/smartinit/IFPWE.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIUtil.java
	msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/AbstractProcessLauncher.cs

Change-Id: Iaf9f42e7ee93949d34c70916fd91acf8c838c83a

Former-commit-id: b3b23647b4 [formerly 0c4ae068ad] [formerly b3b23647b4 [formerly 0c4ae068ad] [formerly a0b6ea8bb2 [formerly b09f1559254f06a82afa91f0cc14c8150f88ce64]]]
Former-commit-id: a0b6ea8bb2
Former-commit-id: 60679a818a [formerly da027298d4]
Former-commit-id: fd93b7d85e
2013-12-05 12:12:27 -06:00
Steve Harris
60f062ea59 14.1.1-12 baseline
Former-commit-id: 371d1ca63c [formerly b24d9c80b0] [formerly 371d1ca63c [formerly b24d9c80b0] [formerly a3ec45a99f [formerly 3b3b8ffbdadc65f41b67f2d649ec18e19521c989]]]
Former-commit-id: a3ec45a99f
Former-commit-id: 4e6f319422 [formerly 14421048af]
Former-commit-id: 234ca267ed
2013-12-04 16:47:59 -05:00
Steve Harris
da4589ec2b 14.1.1-4 baseline
Former-commit-id: 82dec19b6a [formerly bd95bb6a4e] [formerly 82dec19b6a [formerly bd95bb6a4e] [formerly 99e3707c5b [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]]
Former-commit-id: 99e3707c5b
Former-commit-id: b60635cd70 [formerly 7590a56e0e]
Former-commit-id: 98ae84da42
2013-10-28 10:55:16 -04:00
Steve Harris
472c0a1a5e 14.1.1-3 baseline
Former-commit-id: 851f9df229 [formerly 94f24e0d8a] [formerly 851f9df229 [formerly 94f24e0d8a] [formerly 5739b4f832 [formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]]]
Former-commit-id: 5739b4f832
Former-commit-id: aa59400b67 [formerly 4a6a209aea]
Former-commit-id: 8d67ffede4
2013-10-28 10:46:02 -04:00
Bryan Kowal
9d045d3c92 Issue #2033 - windows build updates for etc directory deployment
Change-Id: Icfb30220639eeefe01a03479f0a5248dcb5cf928

Former-commit-id: 89c561ad89 [formerly c5f6540e3c] [formerly 89c561ad89 [formerly c5f6540e3c] [formerly 073fd49741 [formerly d51012b2e5685e547d0d8f3b3ccd0f4c4640b9dc]]]
Former-commit-id: 073fd49741
Former-commit-id: 42ac7b6bdd [formerly e3ad305202]
Former-commit-id: cef35754ca
2013-10-07 18:41:49 -05:00
Bryan Kowal
0ad325f534 Revert "Issue #2033 - msi build updates"
Undo copying localization into etc at build time.

This reverts commit d35b6790d013a8eddd10469d301e11e853d2875f [formerly e46254cef1] [formerly 3bf9b72f52 [formerly 7208eadbfb] [formerly 3bf9b72f52 [formerly 7208eadbfb] [formerly e46254cef1 [formerly 18394168994e3683ecd2ba114be12ba2a547b62c]]]].


Former-commit-id: 1632c72103 [formerly 02e1055f19] [formerly 1632c72103 [formerly 02e1055f19] [formerly 3d6ff3f0fa [formerly f705e71d62e84d82cb8e880e0b17e18710f61d97]]]
Former-commit-id: 3d6ff3f0fa
Former-commit-id: a29a8b8d0e [formerly ac0b2bd9eb]
Former-commit-id: b72e77fdc0
2013-10-04 09:47:59 -05:00
Bryan Kowal
6056aed708 Issue #2033 - msi build updates
Former-commit-id: 3bf9b72f52 [formerly 7208eadbfb] [formerly 3bf9b72f52 [formerly 7208eadbfb] [formerly e46254cef1 [formerly 18394168994e3683ecd2ba114be12ba2a547b62c]]]
Former-commit-id: e46254cef1
Former-commit-id: 93ff6ab60d [formerly e76c20007a]
Former-commit-id: 8660d4b9e7
2013-09-30 16:18:37 -05:00
Steve Harris
609926f1f4 13.5.2-4 baseline
Former-commit-id: 595e7bc0d9 [formerly e3c935d48b] [formerly 595e7bc0d9 [formerly e3c935d48b] [formerly 58c6821427 [formerly da631849bc9eaaa5c83c2393520b6099413107a5]]]
Former-commit-id: 58c6821427
Former-commit-id: 4c6790f10f [formerly abed443b59]
Former-commit-id: e2398f74e5
2013-09-12 11:13:59 -04:00
Steve Harris
db64b2e2d9 13.5.2-2 baseline
Former-commit-id: 8cde3b2b54 [formerly 4a47fb97c5] [formerly 8cde3b2b54 [formerly 4a47fb97c5] [formerly 9e4bf0cf2e [formerly 6cecce21eb6a7c9b72d7a61936dcbe4f4688fba9]]]
Former-commit-id: 9e4bf0cf2e
Former-commit-id: 12b0ab91fd [formerly 5de6d566f0]
Former-commit-id: 180e042b5d
2013-08-29 15:01:29 -04:00
Bryan Kowal
1ae985d556 Issue #2198 - completely override the Path and PythonPath in the environment.
- PythonPath is specific to CAVE and will not normally be set
- What is currently set in Path is not relevant because we are running ported code


Former-commit-id: 6b9ca89bbc [formerly f5c3b89dd2] [formerly 6b9ca89bbc [formerly f5c3b89dd2] [formerly e1415e3689 [formerly 1edbb1847a9dfda4fa7562972b70c8ca3f83f246]]]
Former-commit-id: e1415e3689
Former-commit-id: 5b58abe854 [formerly 5458f6956b]
Former-commit-id: 029369f3d5
2013-08-26 12:43:43 -05:00
Bryan Kowal
8503422d36 Issue #2198 - created a launcher that would start both AlertViz and CAVE; no extra windows are created now
- Note: VizLauncher and AWIPSII.CAVE are NOT Eclipse projects.


Former-commit-id: 013ba62af1 [formerly a1fccaa598] [formerly 013ba62af1 [formerly a1fccaa598] [formerly 21cfeb1b83 [formerly c1c6cd087a493f052a66fbc6e7b608cd959f7905]]]
Former-commit-id: 21cfeb1b83
Former-commit-id: eec811c3b1 [formerly 6cf776926c]
Former-commit-id: 433efe1982
2013-08-20 13:56:07 -05:00
Steve Harris
859965fc9d 13.5.1-1 baseline
Former-commit-id: 6384018950 [formerly 998961612c] [formerly 6384018950 [formerly 998961612c] [formerly fe872355a7 [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]]
Former-commit-id: fe872355a7
Former-commit-id: 0aab285b8a [formerly 30ba1d634e]
Former-commit-id: 146c5e8940
2013-06-10 15:17:17 -04:00
Steve Harris
f52ec0b0a0 13.1.2-2 baseline
Former-commit-id: 51208e5515 [formerly c0c1d56f3a] [formerly 51208e5515 [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: cd4185ef5c [formerly 941337c553]
Former-commit-id: b6fa9b4858
2013-01-06 14:32:24 -06:00
Steve Harris
74b66d9683 12.4.1-4 baseline
Former-commit-id: 750b7543dd [formerly 67a5a68300] [formerly 750b7543dd [formerly 67a5a68300] [formerly 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]
Former-commit-id: 2a216f333c
Former-commit-id: a2a6a18fae [formerly a4e519f3cd]
Former-commit-id: 8cd5974f4c
2012-04-18 15:18:16 -05:00
Bryan Kowal
28028b9ad3 Issue #22 - merging Windows MSI installer changes into git thinclient branch.
Former-commit-id: be61ec82b0 [formerly 48b420cbb2] [formerly be61ec82b0 [formerly 48b420cbb2] [formerly ff44a81ceb [formerly afbdec0abdb020d47c592a37d0d0b78633e7e609]]]
Former-commit-id: ff44a81ceb
Former-commit-id: bddafa475a [formerly 5eb9afeb98]
Former-commit-id: dd1c5cdee4
2012-01-23 12:36:13 -06:00