Skip to content

Commit 47e4d97

Browse files
committed
Support verbose
1 parent 1180685 commit 47e4d97

File tree

2 files changed

+17
-5
lines changed

2 files changed

+17
-5
lines changed

dev/auto-test/anaconda.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,13 @@ help()
7878
-r R_VERSION install R, default does not
7979
-u delete prior artifacts, default does not
8080
-uu delete conda cache, default does not
81+
-v verbose
8182
EOF
8283
exit
8384
}
8485

8586
# Run plain help as needed before possibly affecting settings
86-
# shown by help as defaults:
87+
# shown by help as defaults:
8788
zparseopts h=HELP
8889
if (( ${#HELP} )) help
8990

@@ -92,7 +93,7 @@ A="" # May become "-a"
9293
B="" # May become "-b"
9394
R="" # May become ( -r R_VERSION )
9495
USE_R="" # May become "-r"
95-
zparseopts -D -E -F a=A b=B c:=CT p:=PV r:=R u+=UNINSTALL
96+
zparseopts -D -E -F a=A b=B c:=CT p:=PV r:=R u+=UNINSTALL v=VERBOSE
9697
if (( ${#PV} )) PYTHON_VERSION=${PV[2]}
9798
if (( ${#CT} )) CONDA_TIMESTAMP=${CT[2]}
9899
if (( ${#R} )) USE_R="-r"
@@ -343,7 +344,7 @@ task $SWIFT_T/dev/release/make-release-pkg.zsh $B -T
343344
# Set up the build environment in Miniconda-build
344345
task $SWIFT_T/dev/conda/setup-conda.sh
345346
# Build the Swift/T package!
346-
task $SWIFT_T/dev/conda/conda-build.sh $R $CONDA_PLATFORM
347+
task $SWIFT_T/dev/conda/conda-build.sh $R $CONDA_PLATFORM $VERBOSE
347348

348349
# Check that the PKG was built
349350
check-pkg

dev/conda/conda-build.sh

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,18 @@ help()
2222
cat <<END
2323
2424
Options:
25-
conda-build.sh [-C] [-r RV] PLATFORM
25+
conda-build.sh [-Cv] [-r RV] PLATFORM
2626
-C : configure-only-
2727
generate meta.yaml and settings.sed, then stop
2828
-r RV : enable R version RV
29+
-v : verbose (show meta.yaml and settings.sed)
2930
3031
END
3132
exit
3233
}
3334

3435
C="" R="" R_VERSION=""
35-
zparseopts -D -E -F h=HELP C=C r:=R
36+
zparseopts -D -E -F h=HELP C=C r:=R v=VERBOSE
3637

3738
if (( ${#HELP} )) help
3839
if (( ${#*} != 1 )) abort "conda-build.sh: Provide CONDA_PLATFORM!"
@@ -145,6 +146,16 @@ m4 -P -I $DEV_CONDA $COMMON_M4 $META_TEMPLATE > meta.yaml
145146
log "writing ${PWD#${SWIFT_T_TOP}/}/settings.sed"
146147
m4 -P -I $DEV_CONDA $COMMON_M4 $SETTINGS_SED > settings.sed
147148

149+
if (( ${#VERBOSE} )) {
150+
echo
151+
log "meta.yaml:"
152+
cat meta.yaml
153+
echo
154+
log "settings.sed:"
155+
cat settings.sed
156+
echo
157+
}
158+
148159
if (( ${#C} )) {
149160
log "configure-only: exit."
150161
return

0 commit comments

Comments
 (0)