Skip to content

Commit 58fa824

Browse files
mfikesswannodette
authored andcommitted
CLJS-2697: script/bootstrap --closure-library-head fails
1 parent 7127f5f commit 58fa824

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

script/bootstrap

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,17 +62,16 @@ cd closure/library
6262
if [ "$1" = "--closure-library-head" ] ; then
6363
echo "Building against HEAD of Google Closure library..."
6464

65-
# Check if svn present
66-
type svn >/dev/null 2>&1 || { echo >&2 "Need svn command to checkout HEAD of Google Closure library. Aborting."; exit 1; }
67-
6865
# Existing checkout?
69-
if svn info --non-interactive >/dev/null 2>&1; then
66+
if [ -d closure-library ] ; then
7067
echo "Updating Google Closure library from HEAD..."
71-
svn update -q --non-interactive
68+
cd closure-library
69+
git pull
70+
cd ..
7271
else
7372
echo "Checking out HEAD of Google Closure library..."
7473
rm -rf *
75-
svn checkout -q --non-interactive https://closure-library.googlecode.com/svn/trunk/ ./
74+
git clone https://github.com/google/closure-library
7675
fi
7776
else
7877
curl --retry 3 -O -s https://repo1.maven.org/maven2/org/clojure/google-closure-library/$GCLOSURE_LIB_RELEASE/google-closure-library-$GCLOSURE_LIB_RELEASE.jar || { echo "Download failed."; exit 1; }
@@ -94,8 +93,8 @@ rm closure-compiler-v$CLOSURE_RELEASE.jar
9493

9594
if [ "$1" = "--closure-library-head" ] ; then
9695
echo "Building lib/goog.jar..."
97-
echo "jar cf ./lib/goog.jar -C closure/library/closure/ goog"
98-
jar cf ./lib/goog.jar -C closure/library/closure/ goog
96+
echo "jar cf ./lib/goog.jar -C closure/library/closure-library/closure/ goog"
97+
jar cf ./lib/goog.jar -C closure/library/closure-library/closure/ goog
9998
fi
10099

101100
echo "Fetching Rhino..."

0 commit comments

Comments
 (0)