diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-04-07 14:05:52 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-04-14 19:09:30 +0000 |
| commit | 1404605513cedd34070154aa355663b8e4734bc4 (patch) | |
| tree | a01b87e146eb6a948c7177f197b43fba5add1e2c /cmake | |
| parent | 311758aff7b21d877addac447d9216a22bc1af5e (diff) | |
Start moving win-setup to PowerShell.
Add win-setup.ps1, which duplicates the following tasks performed by
config.nmake + Makefile.nmake + win-setup.sh:
- Create the windows library directory.
- Download files.
- Download and unpack zip files.
- Check and set current-tag.txt
Don't verify applications or libraries. CMakeLists.txt does that.
Update the Developer's Guide.
Have POWERSHELL_COMMAND use dot sourcing instead of "-File", which
appears to be a synonym for "-IgnoreTheExitStatusReturnedByThisScript".
This removes our dependencies on unzip and wget and reduces our dependency
on bash.
Change-Id: Ia9def24acbe183d81b9d477fa42e655e4a3a6614
Reviewed-on: https://code.wireshark.org/review/7990
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindPowerShell.cmake | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cmake/modules/FindPowerShell.cmake b/cmake/modules/FindPowerShell.cmake index a84039da3d..9e751545d7 100644 --- a/cmake/modules/FindPowerShell.cmake +++ b/cmake/modules/FindPowerShell.cmake @@ -18,7 +18,10 @@ find_package_handle_standard_args(POWERSHELL DEFAULT_MSG POWERSHELL_EXECUTABLE) set(_powershell_command "POWERSHELL_COMMAND-NOTFOUND") if(POWERSHELL_FOUND) - set(_powershell_command "${POWERSHELL_EXECUTABLE}" -NoProfile -NonInteractive -executionpolicy bypass -File) + # Calling a script using "-File" doesn't properly return exit codes. + # Use dot sourcing instead + # https://connect.microsoft.com/PowerShell/feedback/details/777375/powershell-exe-does-not-set-an-exit-code-when-file-is-used + set(_powershell_command "${POWERSHELL_EXECUTABLE}" -NoProfile -NonInteractive -executionpolicy bypass .) endif() set(POWERSHELL_COMMAND ${_powershell_command} CACHE STRING "Command suitable for running PowerShell scripts." |