Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add salt-api in windows installer #49949

Merged
merged 6 commits into from Nov 1, 2018
Merged

Add salt-api in windows installer #49949

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f14d054
Add salt-api in windows installer
Oct 9, 2018
82e9d42
Merge branch 'develop' into dev/iepopr/add-saltapi-in-windows-installer
Oct 23, 2018
74e41ab
Merge branch 'develop' into dev/iepopr/add-saltapi-in-windows-installer
Oct 25, 2018
34a348b
Add salt-api limited support notes on Windows
Oct 25, 2018
21df8b0
Merge branch 'dev/iepopr/add-saltapi-in-windows-installer' of github.…
Oct 25, 2018
d82c01f
Merge branch 'develop' into dev/iepopr/add-saltapi-in-windows-installer
Nov 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion setup.py
View file
Open in desktop
Expand Up @@ -887,7 +887,8 @@ def _property_data_files(self):
return data_files

if IS_WINDOWS_PLATFORM:
data_files[0][1].extend(['doc/man/salt-cp.1',
data_files[0][1].extend(['doc/man/salt-api.1',
'doc/man/salt-cp.1',
'doc/man/salt-key.1',
'doc/man/salt-master.1',
'doc/man/salt-minion.1',
Expand Down Expand Up @@ -935,6 +936,7 @@ def _property_scripts(self):

if IS_WINDOWS_PLATFORM:
scripts.extend(['scripts/salt',
'scripts/salt-api',
'scripts/salt-cp',
'scripts/salt-key',
'scripts/salt-master',
Expand Down Expand Up @@ -972,6 +974,7 @@ def _property_entry_points(self):

if IS_WINDOWS_PLATFORM:
scripts.extend(['salt = salt.scripts:salt_main',
'salt-api = salt.scripts:salt_api',
'salt-cp = salt.scripts:salt_cp',
'salt-key = salt.scripts:salt_key',
'salt-master = salt.scripts:salt_master',
Expand Down