Skip to content

Commit c6f879f

Browse files
darwinswannodette
authored andcommitted
CLJS-2235: Allow passing extra maven opts to build scripts
1 parent 8972224 commit c6f879f

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

script/aot_core

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ set -ex
55
FILE_SEP='/'
66
PATH_SEP=':'
77
OS_ID=`uname | tr [:upper:] [:lower:]`
8+
CLJS_SCRIPT_MVN_OPTS=${CLJS_SCRIPT_MVN_OPTS:-""}
89

910
if [[ $OS_ID == *mingw* ]]
1011
then
@@ -16,7 +17,7 @@ fi
1617

1718
CP_FILE=`mktemp /tmp/cljs_cp.txt.XXXXXXXXXXX`
1819

19-
mvn -f pom.template.xml dependency:build-classpath -Dmdep.outputFile=$CP_FILE -Dmdep.fileSeparator=$FILE_SEP -Dmdep.pathSeparator=$PATH_SEP
20+
mvn -f pom.template.xml dependency:build-classpath -Dmdep.outputFile=$CP_FILE -Dmdep.fileSeparator=$FILE_SEP -Dmdep.pathSeparator=$PATH_SEP $CLJS_SCRIPT_MVN_OPTS
2021

2122
CLJS_CP=`cat $CP_FILE`
2223

script/build

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ rm -rf target
1010

1111
POM_TEMPLATE="pom.template.xml"
1212
POM_FILE="pom.xml"
13+
CLJS_SCRIPT_MVN_OPTS=${CLJS_SCRIPT_MVN_OPTS:-""}
1314

1415
# The command `git describe --match v0.0` will return a string like
1516
#
@@ -57,15 +58,15 @@ mv $AOT_CACHE_FILE src/main/cljs/cljs/core.cljs.cache.aot.edn
5758

5859
# For Hudson server
5960
if [ "$HUDSON" = "true" ]; then
60-
mvn --fail-at-end -Psonatype-oss-release \
61+
mvn --fail-at-end -Psonatype-oss-release $CLJS_SCRIPT_MVN_OPTS \
6162
clean deploy nexus-staging:release
6263

6364
echo "Creating tag $TAG"
6465
git tag -f "$TAG"
6566
git push origin "$TAG"
6667
else
6768
echo "Skipping remote deployment and Git tag because we are not on Hudson."
68-
mvn clean install
69+
mvn $CLJS_SCRIPT_MVN_OPTS clean install
6970
fi
7071

7172
rm -f src/main/cljs/cljs/core.aot.js

0 commit comments

Comments
 (0)