Commit Graph

37743 Commits (2ab0db467a4b0edc36043aaa6b7c24c0c772900a)

Author SHA1 Message Date
Oz Linden 2ab0db467a merge changes for MAINT-7592 2017-07-11 17:47:32 -04:00
Oz Linden cec06ebd63 MAINT-7592 (update): fix ToS cancel alert and leftover xml comment terminator 2017-07-11 17:46:29 -04:00
Oz Linden 83cda57b10 merge changes for MAINT-7592 2017-07-11 14:19:13 -04:00
Oz Linden d4974cdff9 MAINT-7592: Update ToS agreement floater 2017-07-11 08:47:53 -04:00
Nat Goodspeed 7eb53d4ccb Automated merge with ssh://bitbucket.org/lindenlab/viewer64-vmp-integration 2017-06-29 12:06:30 -04:00
Glenn Glazer b660325546 upgrade to VMP package 507000 2017-06-29 08:00:21 -07:00
Nat Goodspeed 621db1ddd1 DRTVWR-418: Merge SL-739 and MAINT-7515 fix into viewer64. 2017-06-28 21:02:01 -04:00
Glenn Glazer 8736605b65 merge 2017-06-28 14:51:44 -07:00
Glenn Glazer 240239142b upgrade to VMP package 506977 2017-06-28 14:11:01 -07:00
Nat Goodspeed ab1255c416 DRTVWR-418: Bump TEXTURE_CACHE_VERSION and INDRA_OBJECT_CACHE_VERSION
so the Alex Ivy viewer will reset caches.

We have some evidence that the cache content is tied to ADDRESS_SIZE, so
asking a 64-bit viewer to process 32-bit cache content is problematic.
2017-06-28 10:50:52 -04:00
coyot deaca27155 merge 2017-06-27 13:33:08 -07:00
coyot 6eae3c6f4f use icon in viewer exe for shortcut 2017-06-27 13:32:34 -07:00
Glenn Glazer 3fd2ac14ea upgrade to VMP package 506923 2017-06-27 12:20:55 -07:00
Glenn Glazer cc85030f7e Try pointing icon path to actual viewer exe 2017-06-27 07:57:04 -07:00
Glenn Glazer 263a9e7791 MAINT-7514: remove check if same version is installed 2017-06-26 13:11:20 -07:00
Glenn Glazer 1c148b5bc0 merge 2017-06-26 10:02:07 -07:00
Nat Goodspeed c45c51fa9b Automated merge with ssh://bitbucket.org/nat_linden/viewer64-maint-7514 2017-06-26 12:58:29 -04:00
Nat Goodspeed be9a9c82a0 DRTVWR-418: Merge viewer64-vmp-integration into viewer64. 2017-06-26 12:58:01 -04:00
Glenn Glazer 74afc93a49 upgrade to VMP package 506854 2017-06-26 07:17:02 -07:00
Nat Goodspeed 924414d65e MAINT-7514: Fetch needed env vars in WindowsManifest.sign() method. 2017-06-26 10:04:57 -04:00
Nat Goodspeed b3c506bc68 MAINT-7514: Add (32) or (64) to registry for "install again?" prompt.
Specifically, append (32) or (64) to the four-part version number stored in
the registry entry used to detect whether this viewer has already been
installed. This is injected as a new VERSION_REGISTRY NSIS variable.

(It was tempting to simply change the value of VERSION_LONG with the embedded
address size. However, there is one other use of VERSION_LONG in the NSIS
template. That use is the subject of MAINT-7533.)

Synthesize the VERSION_REGISTRY value in viewer_manifest.py and add it to the
substitution dict used to populate the NSIS template.

ADDRESS_SIZE isn't passed into viewer_manifest.py, but it can be inferred from
the existing 'arch' parameter: 'arch' as well as 'platform' is used to select
the specific subclass of the ViewerManifest class to instantiate for this run.
Add an appropriate address_size attribute to every such subclass.

Change a couple existing tests on 'arch' to tests on self.address_size instead
-- clearer to the maintainer.

Also, given that subclass selection mechanism, the ViewerManifest base class
shouldn't need if / elif tests on 'platform'. Make build_data_json_platform a
class attribute as well, removing the base-class stanza that dynamically
examines 'platform' and 'arch'.

Similarly, move platform-specific tweaks to the build_data_dict used to
populate build_data.json into a new finish_build_data_dict() method overridden
by individual platform subclasses.

Encapsulate the logic around running the Windows code-signing tool into a
sign() method, and call it as needed. For obtaining environment variables with
fallback values, use os.environ.get() instead of os.path.expandvars() with
tests on the returned value.
2017-06-26 09:15:01 -04:00
Glenn Glazer d6bd3cbcf1 merge from gate 2017-06-23 09:50:11 -07:00
Glenn Glazer faf237e60c MAINT-7515: point shortcut icon at viewer exe 2017-06-23 09:49:09 -07:00
Glenn Glazer 6bcbee3328 upgrade to VMP package 506825 2017-06-22 16:24:31 -07:00
Nat Goodspeed 58f62e2883 DRTVWR-418: Update to curl build 506810 2017-06-22 14:13:42 -04:00
Glenn Glazer 2a24defdd0 upgrade to VMP package 506766 2017-06-21 15:37:15 -07:00
Glenn Glazer d09bebe323 upgrade to VMP package 506741 2017-06-20 14:32:50 -07:00
Glenn Glazer 1054ddf1ba pull from v64 gate 2017-06-20 13:46:51 -07:00
Nat Goodspeed a3066b7375 Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2017-06-20 16:11:33 -04:00
Oz Linden f1e52656e9 increment viewer version to 5.0.7 2017-06-20 16:10:15 -04:00
Oz Linden 36e0aab434 Added tag 5.0.6-release for changeset 3e5035dfd8af 2017-06-20 16:10:15 -04:00
Glenn Glazer 8205eaa6e3 merge 2017-06-20 12:09:59 -07:00
Glenn Glazer e7b8a598f0 upgrade to VMP package 506528 2017-06-20 10:20:46 -07:00
Oz Linden a5dd8d1c3a merge CEF update 2017-06-20 07:29:48 -04:00
Oz Linden 543d9b98a3 update viewer-manager, primarily to solve Mac packaging problem 2017-06-19 18:01:40 -04:00
Oz Linden 6465523de6 remove dependency on urllib3 in viewer-manager 2017-06-16 16:48:57 -04:00
Oz Linden ff9314d955 update viewer-manager to fix problem with finding the ca-bundle 2017-06-16 13:34:51 -04:00
Oz Linden 51116c46c6 remove redundant slash from update service base url (cosmetic) 2017-06-16 13:29:44 -04:00
Oz Linden 55796deebb MAINT-7505: correct packaging of python llbase 2017-06-16 10:43:04 -04:00
Glenn Glazer 430566a393 SL-700: upgrade to VMP package 506528 2017-06-15 09:01:52 -07:00
Glenn Glazer 7ead7c7285 SL-700: temporarily use local version of ca-bundle.crt, remove ca-bundle copy calls from viewer manifest 2017-06-14 16:02:54 -07:00
Glenn Glazer c538ff12c5 SL-700: temporarily use local version of ca-bundle.crt instead of from voice, misc cleanup 2017-06-14 14:16:23 -07:00
Glenn Glazer bcf7195bce upgrade to vmp package 506464 2017-06-13 11:54:09 -07:00
Glenn Glazer 1c19d8d270 upgrade to vmp package 506452 2017-06-13 10:58:37 -07:00
Glenn Glazer ac78ad7ff3 SL-700: synchronize viewer and vmp llbase platforms 2017-06-13 08:15:07 -07:00
Glenn Glazer d372cdf068 MAINT-7192: upgrade to W64 viewer to llbase 506431 2017-06-12 20:40:55 -07:00
Glenn Glazer 65dd2988dc MAINT-7192: upgrade to viewer to vmp package 506422 2017-06-12 16:12:37 -07:00
Glenn Glazer 215a034d6c MAINT-7192: upgrade to viewer to llbase 506286 2017-06-12 14:07:30 -07:00
Glenn Glazer 5134805c66 MAINT-7192: upgrade to VMP package 506412 2017-06-12 13:26:19 -07:00
Callum Prentice 124d8c8dce Automated merge with head of callum_linden/viewer64 that pulls in the latest version of p64_3p-dullahan version 3.3021 (Like Chrome 59) 2017-06-08 15:43:08 -07:00