saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Move the SSH checks out of the windows checks

Browse source
This commit is contained in:
Pedro Algarvio 2014-10-01 22:57:39 +01:00
parent c081844c22
commit 4df44783ed
1 changed files with 31 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
setup.py
View file

@ -688,30 +688,34 @@ SETUP_KWARGS = {'name': NAME,
'zip_safe': False 'zip_safe': False
} }
if PACKAGED_FOR_SALT_SSH:
SETUP_KWARGS['data_files'][0][1].extend([
'doc/man/salt-ssh.1',
'doc/man/salt-run.1',
'doc/man/salt-cloud.1',
])
if IS_WINDOWS_PLATFORM is False: if IS_WINDOWS_PLATFORM is False:
SETUP_KWARGS['cmdclass']['sdist'] = CloudSdist SETUP_KWARGS['cmdclass']['sdist'] = CloudSdist
SETUP_KWARGS['cmdclass']['install_lib'] = InstallLib SETUP_KWARGS['cmdclass']['install_lib'] = InstallLib
# SETUP_KWARGS['packages'].extend(['salt.cloud', # SETUP_KWARGS['packages'].extend(['salt.cloud',
# 'salt.cloud.clouds']) # 'salt.cloud.clouds'])
SETUP_KWARGS['package_data']['salt.cloud'] = ['deploy/*.sh'] SETUP_KWARGS['package_data']['salt.cloud'] = ['deploy/*.sh']
if PACKAGED_FOR_SALT_SSH:
SETUP_KWARGS['data_files'][0][1].extend([
'doc/man/salt-master.1',
'doc/man/salt-key.1',
'doc/man/salt.1',
'doc/man/salt-api.1',
'doc/man/salt-syndic.1',
'doc/man/salt-unity.1',
])
if PACKAGED_FOR_SALT_SSH is False:
SETUP_KWARGS['data_files'][0][1].extend([ SETUP_KWARGS['data_files'][0][1].extend([
'doc/man/salt-ssh.1', 'doc/man/salt-ssh.1',
'doc/man/salt-run.1', 'doc/man/salt-run.1',
'doc/man/salt-cloud.1', 'doc/man/salt-cloud.1',
]) ])
else:
SETUP_KWARGS['data_files'][0][1].extend([
'doc/man/salt-master.1',
'doc/man/salt-key.1',
'doc/man/salt.1',
'doc/man/salt-api.1',
'doc/man/salt-syndic.1',
'doc/man/salt-run.1',
'doc/man/salt-ssh.1',
'doc/man/salt-cloud.1',
'doc/man/salt-unity.1',
])
# bbfreeze explicit includes # bbfreeze explicit includes
@ -819,14 +823,22 @@ if WITH_SETUPTOOLS:
'salt-minion = salt.scripts:salt_minion', 'salt-minion = salt.scripts:salt_minion',
] ]
} }
else:
SETUP_KWARGS['entry_points'] = {'console_scripts': [
'salt-ssh = salt.scripts:salt_ssh',
'salt-run = salt.scripts:salt_run',
'salt-call = salt.scripts:salt_call',
'salt-cloud = salt.scripts:salt_cloud',
]}
if IS_WINDOWS_PLATFORM is False: if IS_WINDOWS_PLATFORM is False:
if PACKAGED_FOR_SALT_SSH: if PACKAGED_FOR_SALT_SSH:
SETUP_KWARGS['entry_points'] = {'console_scripts': [ SETUP_KWARGS['entry_points']['console_scripts'].extend([
'salt-ssh = salt.scripts:salt_ssh', 'salt = salt.scripts:salt_main',
'salt-run = salt.scripts:salt_run', 'salt-api = salt.scripts:salt_api',
'salt-call = salt.scripts:salt_call', 'salt-key = salt.scripts:salt_key',
'salt-cloud = salt.scripts:salt_cloud', 'salt-master = salt.scripts:salt_master',
]} 'salt-syndic = salt.scripts:salt_syndic',
])
else: else:
SETUP_KWARGS['entry_points']['console_scripts'].extend([ SETUP_KWARGS['entry_points']['console_scripts'].extend([
'salt = salt.scripts:salt_main', 'salt = salt.scripts:salt_main',