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

Remove RAET deps, remove salt.bat

Browse source
This commit is contained in:
twangboy 2017-05-24 16:22:43 -06:00
parent 460af48f1f
commit c3a22dc0e7
4 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkg/windows/buildenv/salt.bat
View file

@ -1,11 +0,0 @@
@ echo off
:: Script for invoking Salt Main
:: Accepts all parameters that Salt Main accepts
:: Define Variables
Set SaltDir=%~dp0
Set SaltDir=%SaltDir:~0,-1%
Set Python=%SaltDir%\bin\python.exe
Set Script=%SaltDir%\bin\Scripts\salt
"%Python%" "%Script%" %*

13
pkg/windows/clean_env.bat
View file

@ -50,8 +50,17 @@ goto eof
:RemovePython3
echo %0 :: Uninstalling Python 3 ...
echo ---------------------------------------------------------------------
echo %0 :: - 3.5.3
"%LOCALAPPDATA%\Package Cache\{b94f45d6-8461-440c-aa4d-bf197b2c2499}\python-3.5.3-amd64.exe" /uninstall
:: 64 bit
if exist "%LOCALAPPDATA%\Package Cache\{b94f45d6-8461-440c-aa4d-bf197b2c2499}" (
echo %0 :: - 3.5.3 64bit
"%LOCALAPPDATA%\Package Cache\{b94f45d6-8461-440c-aa4d-bf197b2c2499}\python-3.5.3-amd64.exe" /uninstall
)
:: 32 bit
if exist "%LOCALAPPDATA%\Package Cache\{a10037e1-4247-47c9-935b-c5ca049d0299}" (
echo %0 :: - 3.5.3 32bit
"%LOCALAPPDATA%\Package Cache\{a10037e1-4247-47c9-935b-c5ca049d0299}\python-3.5.3" /uninstall
)
rem wipe the Python directory
echo %0 :: Removing the C:\Program Files\Python35 Directory ...

2
pkg/windows/modules/get-settings.psm1
View file

@ -82,7 +82,6 @@ Function Get-Settings {
"Libeay" = "libeay32.dll"
"SSLeay" = "ssleay32.dll"
"OpenSSLLic" = "OpenSSL_License.txt"
"libsodium" = "libsodium.dll"
"msvcr" = "msvcr120.dll"
}
$ini.Add("64bitDLLs", $64bitDLLs)
@ -92,7 +91,6 @@ Function Get-Settings {
"Libeay" = "libeay32.dll"
"SSLeay" = "ssleay32.dll"
"OpenSSLLic" = "OpenSSL_License.txt"
"libsodium" = "libsodium.dll"
"msvcr" = "msvcr120.dll"
}
$ini.Add("32bitDLLs", $32bitDLLs)

2
pkg/windows/req_base.txt
View file

@ -9,11 +9,9 @@ futures==3.1.1
gitdb==0.6.4
GitPython==2.1.3
idna==2.5
ioflo==1.6.7
ioloop==0.1a0
ipaddress==1.0.18
Jinja2==2.9.6
libnacl==1.5.0
Mako==1.0.6
MarkupSafe==1.0
msgpack-python==0.4.8