Bryan Kowal
f88323d260
Issue #2851 - 64-bit Windows build updates; also supports 32-bit builds
...
Amend: remove generated files
Change-Id: I727391745ff9cbaaa1a3953567f909da1da01630
Former-commit-id: 6c0f960c70
[formerly f790e255ff
] [formerly 72a8f0406f
] [formerly 6c0f960c70
[formerly f790e255ff
] [formerly 72a8f0406f
] [formerly c9ee6a38d0
[formerly 72a8f0406f
[formerly 20e1e788dd5ca68497d5496586b30a8463dd0ca8]]]]
Former-commit-id: c9ee6a38d0
Former-commit-id: 00532f63ff
[formerly 12a0cf6185
] [formerly 454c0c02b1d2b3c3e8be077dcbdb6f905ca46d42 [formerly 5f2c5fb681
]]
Former-commit-id: c5478bfeecf31ebce381eac8454223f66b646315 [formerly f246fb0b97
]
Former-commit-id: 1f53abd09c
2014-03-31 12:37:37 -05:00
Bryan Kowal
7cf013ef34
Issue #2851 - msi build updates for two shortcuts instead of a single launcher; added amd64 scripts
...
Former-commit-id: d455d71216
[formerly 911c0a99c9
] [formerly a554dc8c20
] [formerly d455d71216
[formerly 911c0a99c9
] [formerly a554dc8c20
] [formerly 286051cbb9
[formerly a554dc8c20
[formerly 386723d9048f6d6b6bd0281f273210949672acd2]]]]
Former-commit-id: 286051cbb9
Former-commit-id: 718bbc47f4
[formerly f0f10e2544
] [formerly 92b3111cb9f6f27db1c947559a4696fd1d1b0a4b [formerly 6b28f08242
]]
Former-commit-id: ce22ec280d942b3e0262be01d99c367f30ddd085 [formerly f5c1cf750b
]
Former-commit-id: 6dc3ae2214
2014-03-26 14:57:46 -05:00
Brian.Dyke
603695a2a4
Merge branch 'master_14.1.1' into master_14.2.1
...
Former-commit-id: c2449e7821
[formerly a0e3f08fce
] [formerly 394076196b
] [formerly c2449e7821
[formerly a0e3f08fce
] [formerly 394076196b
] [formerly 7b798ab5d2
[formerly 394076196b
[formerly 4385b291d04f60f3d5b3f00b1411ab1cd8c89ba7]]]]
Former-commit-id: 7b798ab5d2
Former-commit-id: eb6abe6faa
[formerly fa189c0ef6
] [formerly e502d460a99724c0ff3efb14c8d0f8d731aad320 [formerly 6ced1bedc2
]]
Former-commit-id: c243cc113e92d596862d61e7a6a2878bf1eafda3 [formerly c8b3730fef
]
Former-commit-id: ac07a4fc49
2014-03-07 09:01:09 -05:00
Brian.Dyke
ed94e1bc6b
14.1.1-22 baseline
...
Former-commit-id: 1dcc56775d
[formerly fe30e1d545
] [formerly 21f17d4f9b
] [formerly 1dcc56775d
[formerly fe30e1d545
] [formerly 21f17d4f9b
] [formerly 08d8f1a0ee
[formerly 21f17d4f9b
[formerly ae37ad5bac445251d1456f37588819fccfede061]]]]
Former-commit-id: 08d8f1a0ee
Former-commit-id: 3c9cde458a
[formerly 9406a1d6c0
] [formerly f1658f5e11228e084b4f3ed536ccf891c20f621a [formerly a4c136fd60
]]
Former-commit-id: 385ffc492ff49872acfb40d1c47fffb7dff76ec2 [formerly 067802b104
]
Former-commit-id: c1dab50ce0
2014-03-07 08:49:00 -05:00
Richard Peter
f362062048
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: ba577ff354
[formerly b3b23647b4
] [formerly 0c4ae068ad
] [formerly ba577ff354
[formerly b3b23647b4
] [formerly 0c4ae068ad
] [formerly a0b6ea8bb2
[formerly 0c4ae068ad
[formerly b09f1559254f06a82afa91f0cc14c8150f88ce64]]]]
Former-commit-id: a0b6ea8bb2
Former-commit-id: 530b3bd588
[formerly 60679a818a
] [formerly a031ba53197c00cc0956c78c19bfb9d661fb4215 [formerly da027298d4
]]
Former-commit-id: 53e9784af497b834229cb70070f6499791f6f567 [formerly fd93b7d85e
]
Former-commit-id: ae6e34be4b
2013-12-05 12:12:27 -06:00
Steve Harris
31c94115c7
14.1.1-12 baseline
...
Former-commit-id: f53eb87892
[formerly 371d1ca63c
] [formerly b24d9c80b0
] [formerly f53eb87892
[formerly 371d1ca63c
] [formerly b24d9c80b0
] [formerly a3ec45a99f
[formerly b24d9c80b0
[formerly 3b3b8ffbdadc65f41b67f2d649ec18e19521c989]]]]
Former-commit-id: a3ec45a99f
Former-commit-id: 1e4b2bac7b
[formerly 4e6f319422
] [formerly 78fc95a6e82a286a422cf62a1c8adc867f7438c4 [formerly 14421048af
]]
Former-commit-id: e177b16a88af27dc0abf4496fe58fbe454cfa8c9 [formerly 234ca267ed
]
Former-commit-id: 60f062ea59
2013-12-04 16:47:59 -05:00
Steve Harris
cbf859daf6
14.1.1-4 baseline
...
Former-commit-id: cb3b53f205
[formerly 82dec19b6a
] [formerly bd95bb6a4e
] [formerly cb3b53f205
[formerly 82dec19b6a
] [formerly bd95bb6a4e
] [formerly 99e3707c5b
[formerly bd95bb6a4e
[formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]]]
Former-commit-id: 99e3707c5b
Former-commit-id: 2039d101ef
[formerly b60635cd70
] [formerly 2d757fef6618aded3efb26a4e6771f03101fe824 [formerly 7590a56e0e
]]
Former-commit-id: 973d527ee973fdb4fc285ca2d02f0a43a03bb0fa [formerly 98ae84da42
]
Former-commit-id: da4589ec2b
2013-10-28 10:55:16 -04:00
Steve Harris
c784003711
14.1.1-3 baseline
...
Former-commit-id: a0ba2e1252
[formerly 851f9df229
] [formerly 94f24e0d8a
] [formerly a0ba2e1252
[formerly 851f9df229
] [formerly 94f24e0d8a
] [formerly 5739b4f832
[formerly 94f24e0d8a
[formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]]]]
Former-commit-id: 5739b4f832
Former-commit-id: 2d30611c6d
[formerly aa59400b67
] [formerly 164f1968b2ad159ca45dcba9ade0490d55b9ed19 [formerly 4a6a209aea
]]
Former-commit-id: 9a1c18417dfee86a141522f27e066ec83d4258d5 [formerly 8d67ffede4
]
Former-commit-id: 472c0a1a5e
2013-10-28 10:46:02 -04:00
Bryan Kowal
6838bff38e
Issue #2033 - windows build updates for etc directory deployment
...
Change-Id: Icfb30220639eeefe01a03479f0a5248dcb5cf928
Former-commit-id: c7ea9ddac2
[formerly 89c561ad89
] [formerly c5f6540e3c
] [formerly c7ea9ddac2
[formerly 89c561ad89
] [formerly c5f6540e3c
] [formerly 073fd49741
[formerly c5f6540e3c
[formerly d51012b2e5685e547d0d8f3b3ccd0f4c4640b9dc]]]]
Former-commit-id: 073fd49741
Former-commit-id: cc0ed5ee96
[formerly 42ac7b6bdd
] [formerly 03fce35c4a56e480e55739c7f4bfb5c42b76f678 [formerly e3ad305202
]]
Former-commit-id: d34c434b98be92df3170f3a3e4e3928556e2e1b2 [formerly cef35754ca
]
Former-commit-id: 9d045d3c92
2013-10-07 18:41:49 -05:00
Bryan Kowal
b767da74f2
Revert "Issue #2033 - msi build updates"
...
Undo copying localization into etc at build time.
This reverts commit d35b6790d013a8eddd10469d301e11e853d2875f [formerly e46254cef1
] [formerly 50d9790e17
[formerly 3bf9b72f52
] [formerly 7208eadbfb
] [formerly 50d9790e17
[formerly 3bf9b72f52
] [formerly 7208eadbfb
] [formerly e46254cef1
[formerly 7208eadbfb
[formerly 18394168994e3683ecd2ba114be12ba2a547b62c]]]]].
Former-commit-id: 28e14d1520
[formerly 1632c72103
] [formerly 02e1055f19
] [formerly 28e14d1520
[formerly 1632c72103
] [formerly 02e1055f19
] [formerly 3d6ff3f0fa
[formerly 02e1055f19
[formerly f705e71d62e84d82cb8e880e0b17e18710f61d97]]]]
Former-commit-id: 3d6ff3f0fa
Former-commit-id: 1b450afc35
[formerly a29a8b8d0e
] [formerly cf942de33b8e2634ee81bb98c9f6b239e1f435b7 [formerly ac0b2bd9eb
]]
Former-commit-id: 2829b85519ed488a07adf58fb2aa8d2956d7f337 [formerly b72e77fdc0
]
Former-commit-id: 0ad325f534
2013-10-04 09:47:59 -05:00
Bryan Kowal
4666acc492
Issue #2033 - msi build updates
...
Former-commit-id: 50d9790e17
[formerly 3bf9b72f52
] [formerly 7208eadbfb
] [formerly 50d9790e17
[formerly 3bf9b72f52
] [formerly 7208eadbfb
] [formerly e46254cef1
[formerly 7208eadbfb
[formerly 18394168994e3683ecd2ba114be12ba2a547b62c]]]]
Former-commit-id: e46254cef1
Former-commit-id: f3d50a7986
[formerly 93ff6ab60d
] [formerly 51e6108a23287dd44038da5afa85240716815ba7 [formerly e76c20007a
]]
Former-commit-id: fcd0e86f16a56a19a3cc744fffd66eb77a9afa96 [formerly 8660d4b9e7
]
Former-commit-id: 6056aed708
2013-09-30 16:18:37 -05:00
Steve Harris
3a21a9eb6c
13.5.2-4 baseline
...
Former-commit-id: 3d0b711ccf
[formerly 595e7bc0d9
] [formerly e3c935d48b
] [formerly 3d0b711ccf
[formerly 595e7bc0d9
] [formerly e3c935d48b
] [formerly 58c6821427
[formerly e3c935d48b
[formerly da631849bc9eaaa5c83c2393520b6099413107a5]]]]
Former-commit-id: 58c6821427
Former-commit-id: a8201afb82
[formerly 4c6790f10f
] [formerly 1a01e9adff02825a5599659ed7c17823430819bc [formerly abed443b59
]]
Former-commit-id: d4668ee6901a6bb072be3a88eaad320aed699c0f [formerly e2398f74e5
]
Former-commit-id: 609926f1f4
2013-09-12 11:13:59 -04:00
Steve Harris
7c47939632
13.5.2-2 baseline
...
Former-commit-id: 8dcd159377
[formerly 8cde3b2b54
] [formerly 4a47fb97c5
] [formerly 8dcd159377
[formerly 8cde3b2b54
] [formerly 4a47fb97c5
] [formerly 9e4bf0cf2e
[formerly 4a47fb97c5
[formerly 6cecce21eb6a7c9b72d7a61936dcbe4f4688fba9]]]]
Former-commit-id: 9e4bf0cf2e
Former-commit-id: c10c39b5d6
[formerly 12b0ab91fd
] [formerly 8411cf39c13b7f63f746f4a1b8806ba15bfa7510 [formerly 5de6d566f0
]]
Former-commit-id: ac9d4632081685ff126231e5a993f8fb95aba22d [formerly 180e042b5d
]
Former-commit-id: db64b2e2d9
2013-08-29 15:01:29 -04:00
Bryan Kowal
30286d2f79
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: 3fa97d7819
[formerly 6b9ca89bbc
] [formerly f5c3b89dd2
] [formerly 3fa97d7819
[formerly 6b9ca89bbc
] [formerly f5c3b89dd2
] [formerly e1415e3689
[formerly f5c3b89dd2
[formerly 1edbb1847a9dfda4fa7562972b70c8ca3f83f246]]]]
Former-commit-id: e1415e3689
Former-commit-id: 1659386a9c
[formerly 5b58abe854
] [formerly 47dedaefabeda6c6ca4ce57a08b9555bae5e9e89 [formerly 5458f6956b
]]
Former-commit-id: caf5ae2a02e399f6e14aeaac73826d152ff92803 [formerly 029369f3d5
]
Former-commit-id: 1ae985d556
2013-08-26 12:43:43 -05:00
Bryan Kowal
eb05558a87
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: 3e9c78b9e0
[formerly 013ba62af1
] [formerly a1fccaa598
] [formerly 3e9c78b9e0
[formerly 013ba62af1
] [formerly a1fccaa598
] [formerly 21cfeb1b83
[formerly a1fccaa598
[formerly c1c6cd087a493f052a66fbc6e7b608cd959f7905]]]]
Former-commit-id: 21cfeb1b83
Former-commit-id: c350450024
[formerly eec811c3b1
] [formerly 28e6522f39684a2c80f4e36f7968404f94210af4 [formerly 6cf776926c
]]
Former-commit-id: d4152ca5536158bbd4ab18c8cc1af71b6f8ede23 [formerly 433efe1982
]
Former-commit-id: 8503422d36
2013-08-20 13:56:07 -05:00
Steve Harris
97a4c59662
13.5.1-1 baseline
...
Former-commit-id: 5d99df9969
[formerly 6384018950
] [formerly 998961612c
] [formerly 5d99df9969
[formerly 6384018950
] [formerly 998961612c
] [formerly fe872355a7
[formerly 998961612c
[formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]]]
Former-commit-id: fe872355a7
Former-commit-id: 43b7a9b410
[formerly 0aab285b8a
] [formerly 7fa801e313a1348e6bb00da11f43928fdf179b69 [formerly 30ba1d634e
]]
Former-commit-id: 83a711e54bdd8cabc147e6ca5222939082f46f9c [formerly 146c5e8940
]
Former-commit-id: 859965fc9d
2013-06-10 15:17:17 -04:00
Steve Harris
745f2c6409
13.1.2-2 baseline
...
Former-commit-id: e8f4a2f031
[formerly 51208e5515
] [formerly c0c1d56f3a
] [formerly e8f4a2f031
[formerly 51208e5515
] [formerly c0c1d56f3a
] [formerly 4ba416aeb3
[formerly c0c1d56f3a
[formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 82cdde8491
[formerly cd4185ef5c
] [formerly 413d9d9811179a10639f756b8b4f690d86be7a6a [formerly 941337c553
]]
Former-commit-id: c69e1900269e630aefc061c2464bc8fea1c9776a [formerly b6fa9b4858
]
Former-commit-id: f52ec0b0a0
2013-01-06 14:32:24 -06:00
Steve Harris
5b35d8a6e0
12.4.1-4 baseline
...
Former-commit-id: 4767b0e069
[formerly 750b7543dd
] [formerly 67a5a68300
] [formerly 4767b0e069
[formerly 750b7543dd
] [formerly 67a5a68300
] [formerly 2a216f333c
[formerly 67a5a68300
[formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]]
Former-commit-id: 2a216f333c
Former-commit-id: 98d8b3f188
[formerly a2a6a18fae
] [formerly e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd
]]
Former-commit-id: 816045b74a6ddb3791f4e241a6f25a4d4ab3391a [formerly 8cd5974f4c
]
Former-commit-id: 74b66d9683
2012-04-18 15:18:16 -05:00
Bryan Kowal
7e2690ee90
Issue #22 - merging Windows MSI installer changes into git thinclient branch.
...
Former-commit-id: f522b77248
[formerly be61ec82b0
] [formerly 48b420cbb2
] [formerly f522b77248
[formerly be61ec82b0
] [formerly 48b420cbb2
] [formerly ff44a81ceb
[formerly 48b420cbb2
[formerly afbdec0abdb020d47c592a37d0d0b78633e7e609]]]]
Former-commit-id: ff44a81ceb
Former-commit-id: 5368408482
[formerly bddafa475a
] [formerly 68d481a3d913cffc25e47fc6f2eae8a4f8628bf1 [formerly 5eb9afeb98
]]
Former-commit-id: b43548f0f51b0647e84191cf2451632da3f62170 [formerly dd1c5cdee4
]
Former-commit-id: 28028b9ad3
2012-01-23 12:36:13 -06:00