Skip to content

Commit 4b8de46

Browse files
committed
scripts
1 parent 0da7a64 commit 4b8de46

File tree

2 files changed

+19
-7
lines changed

2 files changed

+19
-7
lines changed

build.cmd

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,6 @@ goto :success
4949

5050
:ARGUMENTS_OK
5151

52-
rem Do no work
53-
if /I "%1" == "none" (goto :success)
54-
5552
rem disable setup build by setting FSC_BUILD_SETUP=0
5653
if /i "%FSC_BUILD_SETUP%" == "" (set FSC_BUILD_SETUP=1)
5754

@@ -98,6 +95,10 @@ for %%i in (%BUILD_FSC_DEFAULT%) do ( call :PROCESS_ARG %%i )
9895

9996
REM apply defaults
10097

98+
if /i "%_buildexit%" == "1" (
99+
exit /B %_buildexitvalue%
100+
)
101+
101102
if /i "%_autoselect%" == "1" (
102103
set BUILD_NET40_FSHARP_CORE=1
103104
set BUILD_NET40=1
@@ -135,6 +136,12 @@ set ARG2=%~2
135136
if "%ARG%" == "1" if "%2" == "" (set ARG=default)
136137
if "%2" == "" if not "%ARG%" == "default" goto :EOF
137138

139+
rem Do no work
140+
if /i "%ARG%" == "none" (
141+
set _buildexit=1
142+
set _buildexitvalue=0
143+
)
144+
138145
if /i "%ARG%" == "net40-lib" (
139146
set _autoselect=0
140147
set BUILD_NET40_FSHARP_CORE=1

build.sh

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,6 @@ if [ "$1" = "--help" ] || [ "$1" = "-h" ] || [ "$1" = "-?" ]; then
6464
show_usage_and_exit
6565
fi
6666

67-
if [ "$1" = "none" ]; then
68-
exit 0
69-
fi
70-
7167
# Save directory of the current script -- this is used below to fix up relative paths (if needed).
7268
# The directory should have a trailing slash like it does on Windows, to minimize differences between scripts.
7369
_scriptdir="$( cd -P -- "$(dirname -- "$(command -v -- "$0")")" && pwd -P )/"
@@ -142,6 +138,11 @@ do
142138
"nobuild")
143139
export BUILD_PHASE=0
144140
;;
141+
"none")
142+
_autoselect=0
143+
export _buildexit=1
144+
export _buildexitVALUE=0
145+
;;
145146
"all")
146147
_autoselect=0
147148
export BUILD_PROTO=1
@@ -324,6 +325,10 @@ do
324325
esac
325326
done
326327

328+
if [ $_buildexit -eq 1 ]; then
329+
exit $_buildexitvalue
330+
fi
331+
327332
# Apply defaults, if necessary.
328333
if [ $_autoselect -eq 1 ]; then
329334
export BUILD_NET40=1

0 commit comments

Comments
 (0)