Skip to content

Commit

Permalink
Factor exe base name duplication out of omaha_version_utils.py
Browse files Browse the repository at this point in the history
Partially addresses google#327
  • Loading branch information
sparist committed Sep 24, 2021
1 parent be7e62a commit 0cbb2a8
Showing 1 changed file with 11 additions and 10 deletions.
21 changes: 11 additions & 10 deletions omaha/omaha_version_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

_ONECLICK_PLUGIN_NAME = 'npGoogleOneClick'
_UPDATE_PLUGIN_NAME = 'npGoogleUpdate'
_MAIN_EXE_BASE_NAME = 'GoogleUpdate'
_CRASH_HANDLER_NAME = 'GoogleCrashHandler'

# List of languages that are fully supported in the current build.
Expand Down Expand Up @@ -118,23 +119,23 @@ def _GetMetainstallerPayloadFilenames(prefix,
# TODO(omaha): Move the other filename defines in main.scons into this file
# and allow all filenames to be customized.
payload_files = [
'GoogleUpdate.exe',
'%s.exe' % _MAIN_EXE_BASE_NAME,
'%s.exe' % _CRASH_HANDLER_NAME,
'%sgoopdate.dll' % (prefix),
'GoogleUpdateHelper.msi',
'GoogleUpdateBroker.exe',
'GoogleUpdateOnDemand.exe',
'GoogleUpdateComRegisterShell64.exe',
'%sHelper.msi' % _MAIN_EXE_BASE_NAME,
'%sBroker.exe' % _MAIN_EXE_BASE_NAME,
'%sOnDemand.exe' % _MAIN_EXE_BASE_NAME,
'%sComRegisterShell64.exe' % _MAIN_EXE_BASE_NAME,
'%spsmachine.dll' % (prefix),
'%spsmachine_64.dll' % (prefix),
'%spsuser.dll' % (prefix),
'%spsuser_64.dll' % (prefix),
]

if _IsSupportedOmaha2Version(omaha_version):
payload_files.remove('GoogleUpdateBroker.exe')
payload_files.remove('GoogleUpdateOnDemand.exe')
payload_files.remove('GoogleUpdateComRegisterShell64.exe')
payload_files.remove('%sBroker.exe' % _MAIN_EXE_BASE_NAME)
payload_files.remove('%sOnDemand.exe' % _MAIN_EXE_BASE_NAME)
payload_files.remove('%sComRegisterShell64.exe' % _MAIN_EXE_BASE_NAME)
payload_files.remove('psmachine.dll')
payload_files.remove('psmachine_64.dll')
payload_files.remove('psuser.dll')
Expand All @@ -156,14 +157,14 @@ def _GetMetainstallerPayloadFilenames(prefix,
omaha_version[1] >= 3 and
(omaha_version[2] >= 32)):
# added with 1.3.32.1 and later
payload_files.append('GoogleUpdateCore.exe')
payload_files.append('%sCore.exe' % _MAIN_EXE_BASE_NAME)

if (omaha_version[0] >= 1 and
omaha_version[1] >= 3 and
(omaha_version[2] > 36 or
(omaha_version[2] == 36 and omaha_version[3] >= 61))):
# GoogleUpdateHelper.msi was removed with version 1.3.36.61.
payload_files.remove('GoogleUpdateHelper.msi')
payload_files.remove('%sHelper.msi' % _MAIN_EXE_BASE_NAME)

for language in languages:
payload_files += ['%sgoopdateres_%s.dll' % (prefix, language)]
Expand Down

0 comments on commit 0cbb2a8

Please sign in to comment.