Daniel A Wozniak
566a4ea66a
Install the launcher so we can execute py files
2018-08-13 16:21:59 -07:00
twangboy
e30d17099d
Use goto instead of if statement
2018-07-17 18:23:34 -06:00
twangboy
e1042fa084
Remove vcredist for Py3
2018-07-17 16:28:01 -06:00
twangboy
361b3cdc2f
Rollback python-certifi-win32
...
It's causing issues with the test suite on Windows
2018-07-11 10:33:39 -06:00
twangboy
b0087d425c
Add license info
2018-07-06 15:55:14 -06:00
twangboy
935f9b560c
Fix dependencies
...
Adds back libnacl
Adds back libsodium.dll
Adds new python-certifi-win32
2018-07-06 15:46:57 -06:00
twangboy
59ae2cc5fc
Use --disable-pip-version-check for build_env_#.ps1
2018-06-18 13:15:03 -06:00
twangboy
66d8b0331a
Add sign.bat script for signing packages
2018-05-23 11:20:51 -06:00
twangboy
9d498293b1
Remove unused settings, update NSIS
2018-05-03 16:46:03 -06:00
twangboy
990a24d7ed
Fix build_env scripts
...
Uses `cmd /c` when launching commands to avoid the hang when installing
python 3
`clean_env.bat` will uninstall Py2 and Py3 in a single run
2018-04-12 11:26:40 -06:00
Daniel Wallace
b9efec8526
remove libnacl on windows
...
We do not use raet on windows, so we don't need to install it
2018-04-04 13:37:40 -05:00
twangboy
fa0b0efe46
Fix some installer script inconsistencies
2018-03-20 09:54:36 -06:00
twangboy
e7ab97cc17
Remove six as a hard dep for Salt
2018-03-07 12:26:37 -07:00
twangboy
cc67e5c2ef
Set six to 1.11.0
...
CherryPy has a requisite of six>=1.11.0 and salt had a requisite of
six==1.10.0 which was causing a problem in the dev environment
2018-03-07 11:52:17 -07:00
twangboy
bcf8b19566
Update the installer build
...
Fixes some issues with Py3 not building
Brings the 2 build_env files more in line with each other
Fixes some typos in the build_env scripts
Removes the need for seperate req files for Py2 and Py3
Setup.py uses the windows req file on Windows
Removes the need to install pycrypto and pyyaml in setup.py. They are
now handled in the req.txt
Uses pypi resources instead of downloading .whl files and .exes for
dependencies
Updates nssm version to address the issue in #46192
Removes nssm from buildenv and downloads 32 and 64 bit versions of nssm
in build_pkg.bat
Removes the AppNoConsole=1 setting from the nsis script since it is not
needed with the new version of nssm
2018-03-02 13:04:48 -07:00
rallytime
8e3a2e25fe
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- salt/modules/git.py
2018-01-26 15:17:56 -05:00
twangboy
52d6d78150
Only keep ssh.py in the Windows installer
2018-01-17 14:00:10 -07:00
twangboy
54eb0db2c4
Keep ssh state and execution modules in the installer
2018-01-17 13:49:39 -07:00
twangboy
e3a8279c01
Get path to python binary based on executable
2018-01-03 10:19:09 -07:00
twangboy
03aec37040
Fix search/replace in Py3
2018-01-02 15:22:58 -07:00
twangboy
b46845888d
Add libnacl dependency
2017-12-27 13:40:49 -07:00
rallytime
4f21a2bbfd
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- pkg/windows/installer/Salt-Minion-Setup.nsi
- salt/runners/manage.py
2017-12-19 12:57:51 -05:00
Jan Harasym
aa438e1605
Installation Fails on headless machines.
...
Installation fails on headless machines if `/passive` is set, `/passive` will display an installation progress bar on windows desktop. `/quiet` suppresses the GUI and does not fail when there is no desktop session available. Fixes #45036 .
2017-12-18 13:56:58 -05:00
twangboy
2d269d1a76
Change all comment markers to '#'
2017-09-12 12:59:57 -06:00
twangboy
6984b8fd60
Add /norestart to vcredist installer
2017-09-12 12:49:20 -06:00
twangboy
d80aea16cb
Handle ErrorCodes returned by VCRedist installer
2017-09-12 11:56:17 -06:00
twangboy
fb31e9a530
Add /norestart switch to vcredist install
2017-09-12 10:05:36 -06:00
twangboy
9979ccb613
Remove Py2 and Py3 in the same run
2017-08-31 14:15:06 -06:00
twangboy
a5d9f85db6
Modifications to build scripts
...
Py3 installs to c:\python35
Quote the path to the python install directory
Fix spellings in comments
Move pywin32 dlls to site-packages/win32 instead of python root
Remove pywin32 postinstall and testing scripts
Add passive switch to py3 uninstall
2017-08-31 11:41:13 -06:00
twangboy
ffb23fbe47
Remove the line that wipes out the cache
2017-08-14 12:26:27 -06:00
twangboy
a3becf8342
Change service shutdown timeouts
...
Windows default for stopping a service is 30 seconds. This changes the
default timeouts for the salt-minion service to more closely resemble
how it is handled in Windows. This gives Python a chance to cleanly exit
before being forcibly closed.
2017-08-14 11:19:09 -06:00
twangboy
8604312a7b
Remove master conf in minion install
2017-08-02 17:12:02 -06:00
rallytime
36a1bcf8c5
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- salt/modules/win_wua.py
- salt/utils/schedule.py
- tests/unit/modules/rabbitmq_test.py
2017-07-27 14:00:15 -06:00
twangboy
d55a44dd1a
Avoid loading user site packages
2017-07-26 14:21:41 -06:00
twangboy
9af1eb2741
Ignore any PYTHON* environment vars already on the system
2017-07-26 13:42:12 -06:00
twangboy
4e2fb03a95
Add pythonpath to batch files and service
2017-07-26 12:21:14 -06:00
twangboy
a7c910c31e
Remove build and dist directories before install
2017-07-18 11:36:38 -06:00
twangboy
0946002713
Add blank line after delete
2017-07-18 11:28:49 -06:00
twangboy
f7c0bb4f46
Remove build and dist directories before install
2017-07-18 11:23:16 -06:00
Mike Place
41514b886e
Merge pull request #42096 from twangboy/win_use_default_configs
...
Use default salt configs for Windows installs
2017-07-03 17:03:26 -05:00
twangboy
c1e899c0ca
Create Master installer if script is found
2017-07-03 13:54:27 -06:00
twangboy
7da86b3540
Use default salt configs for Windows installs
2017-07-03 13:33:24 -06:00
twangboy
e4183a6d1c
Fix comments
2017-07-03 10:27:04 -06:00
twangboy
984b736e14
Add missing batch file
2017-07-03 10:24:10 -06:00
Mike Place
3cdd2fe96c
Merge pull request #41701 from twangboy/remove_win_unicode_console
...
Remove win_unicode_console dependency
2017-06-19 11:57:12 -05:00
twangboy
8b4e3ad77d
Upgrade psutil to version 5.2.2
2017-06-16 17:59:50 -06:00
rallytime
16a2747d7d
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- pkg/windows/buildenv/salt.bat
- salt/modules/pillar.py
- salt/utils/openstack/nova.py
- tests/unit/cloud/clouds/test_dimensiondata.py
- tests/unit/cloud/clouds/test_gce.py
2017-06-14 13:31:42 -06:00
twangboy
0d4be0220b
Add batch files for master
2017-06-12 15:48:46 -06:00
twangboy
e8a24db927
Remove win_unicode_console dependency
2017-06-12 11:56:18 -06:00
twangboy
c3a22dc0e7
Remove RAET deps, remove salt.bat
2017-05-24 16:22:43 -06:00
