Use git to checkout code instead of svn

[XiaodongLoong]

Summary

When I run llvm/utils/docker/build_docker_image.sh script to build clang
with Dockerfile. I met an error that I cannot checkout code by svn. So I
use git to checkout code from Github instead of svn.

[sammccall]

This looks reasonable to me, thanks! I'm not very familiar with this code but the svn version is definitely busted now.

(Please upload diffs with full context (-U99999) to make it possible to browse the whole file)

[XiaodongLoong]

(Please upload diffs with full context (-U99999) to make it possible to browse the whole file)

OK, Thank you for your guidance. I'll do it.

llvm/utils/docker/build_docker_image.sh

 Available options:
   General:
     -h|--help               show this help message
   Docker-specific:
     -s|--source             image source dir (i.e. debian10, nvidia-cuda, etc)
     -d|--docker-repository  docker repository for the image
     -t|--docker-tag         docker tag for the image
   Checkout arguments:
-    -b|--branch         svn branch to checkout, i.e. 'trunk',
-                        'branches/release_40'
-                        (default: 'trunk')
-    -r|--revision       svn revision to checkout
+    -b|--branch         git branch to checkout, i.e. 'main',
+                        'release/10.x'
+                        (default: 'main')
+    -r|--revision       git revision to checkout
     -c|--cherrypick     revision to cherry-pick. Can be specified multiple times.
                         Cherry-picks are performed in the sorted order using the
                         following command:
-                        'svn patch <(svn diff -c \$rev)'.
-    -p|--llvm-project   name of an svn project to checkout. Will also add the
-                        project to a list LLVM_ENABLE_PROJECTS, passed to CMake.
-                        For clang, please use 'clang', not 'cfe'.
-                        Project 'llvm' is always included and ignored, if
-                        specified.
+                        'git cherry-pick \$rev'.
+    -p|--llvm-project   Add the project to a list LLVM_ENABLE_PROJECTS, passed to
+                        CMake.
                         Can be specified multiple times.
     -c|--checksums      name of a file, containing checksums of llvm checkout.
                         Script will fail if checksums of the checkout do not
                         match.
   Build-specific:
     -i|--install-target name of a cmake install target to build and include in
                         the resulting archive. Can be specified multiple times.
 
-r|--revision|-c|-cherrypick|-b|--branch)
       ;;
     -i|--install-target)
       SEEN_INSTALL_TARGET=1
       BUILDSCRIPT_ARGS="$BUILDSCRIPT_ARGS $1 $2"
       shift 2
       ;;
     -p|--llvm-project)
       PROJ="$2"
-      if [ "$PROJ" == "cfe" ]; then
-        PROJ="clang"
-      fi
-
-      CHECKOUT_ARGS="$CHECKOUT_ARGS $1 $PROJ"
-      if [ "$PROJ" != "clang-tools-extra" ]; then
-        CMAKE_ENABLED_PROJECTS="$CMAKE_ENABLED_PROJECTS;$PROJ"
-      fi
-
       shift 2
       ;;
     -c|--checksums)
       shift
       CHECKSUMS_FILE="$1"
       shift
       ;;
     --)

llvm/utils/docker/debian10/Dockerfile

 LABEL maintainer "LLVM Developers"
 # Install build dependencies of llvm.
 # First, Update the apt's source list and include the sources of the packages.
 RUN grep deb /etc/apt/sources.list | \
     sed 's/^deb/deb-src /g' >> /etc/apt/sources.list
 # Install compiler, python and subversion.
 RUN apt-get update && \
     apt-get install -y --no-install-recommends ca-certificates gnupg \
-           build-essential cmake make python3 zlib1g wget subversion unzip && \
+           build-essential cmake make python3 zlib1g wget subversion unzip git && \
     rm -rf /var/lib/apt/lists/*
 # Install a newer ninja release. It seems the older version in the debian repos
 # randomly crashes when compiling llvm.
 RUN wget "https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip" && \
     echo "d2fea9ff33b3ef353161ed906f260d565ca55b8ca0568fa07b1d2cab90a84a07 ninja-linux.zip" \
         | sha256sum -c  && \
     unzip ninja-linux.zip -d /usr/local/bin && \
     rm ninja-linux.zip

llvm/utils/docker/nvidia-cuda/Dockerfile

 #===- llvm/utils/docker/nvidia-cuda/build/Dockerfile ---------------------===//
 #
 # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 # See https://llvm.org/LICENSE.txt for license information.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 #
 #===----------------------------------------------------------------------===//
 # Stage 1. Check out LLVM source code and run the build.
 FROM nvidia/cuda:8.0-devel as builder
 LABEL maintainer "LLVM Developers"
 # Install llvm build dependencies.
 RUN apt-get update && \
     apt-get install -y --no-install-recommends ca-certificates cmake python \
-        subversion ninja-build && \
+        subversion ninja-build git && \
     rm -rf /var/lib/apt/lists/*
 
 ADD checksums /tmp/checksums
 ADD scripts /tmp/scripts
 
 # Checkout the source code.
 ARG checkout_args
 RUN /tmp/scripts/checkout.sh ${checkout_args}

llvm/utils/docker/scripts/checkout.sh

 #!/usr/bin/env bash
 #===- llvm/utils/docker/scripts/checkout.sh ---------------------===//
 #
 # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 # See https://llvm.org/LICENSE.txt for license information.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 #
 #===-----------------------------------------------------------------------===//
 
 set -e
 
 function show_usage() {
   cat << EOF
 Usage: checkout.sh [options]
 
-Checkout svn sources into /tmp/clang-build/src. Used inside a docker container.
+Checkout git sources into /tmp/clang-build/src. Used inside a docker container.
 
 Available options:
   -h|--help           show this help message
-  -b|--branch         svn branch to checkout, i.e. 'trunk',
-                      'branches/release_40'
-                      (default: 'trunk')
-  -r|--revision       svn revision to checkout
+  -b|--branch         git branch to checkout, i.e. 'main',
+                      'release/10.x'
+                      (default: 'main')
+  -r|--revision       git revision to checkout
   -c|--cherrypick     revision to cherry-pick. Can be specified multiple times.
                       Cherry-picks are performed in the sorted order using the
                       following command:
-                      'svn patch <(svn diff -c \$rev)'.
-  -p|--llvm-project   name of an svn project to checkout.
-                      For clang, please use 'clang', not 'cfe'.
-                      Project 'llvm' is always included and ignored, if
-                      specified.
-                      Can be specified multiple times.
+                      'git cherry-pick \$rev)'.
 EOF
 }
 
-LLVM_SVN_REV=""
+LLVM_GIT_REV=""
 CHERRYPICKS=""
 LLVM_BRANCH=""
-# We always checkout llvm
-LLVM_PROJECTS="llvm"
-
-function contains_project() {
-  local TARGET_PROJ="$1"
-  local PROJ
-  for PROJ in $LLVM_PROJECTS; do
-    if [ "$PROJ" == "$TARGET_PROJ" ]; then
-      return 0
-    fi
-  done
-  return 1
-}
 
 while [[ $# -gt 0 ]]; do
   case "$1" in
     -r|--revision)
       shift
-      LLVM_SVN_REV="$1"
+      LLVM_GIT_REV="$1"
       shift
       ;;
     -c|--cherrypick)
       shift
       CHERRYPICKS="$CHERRYPICKS $1"
       shift
       ;;
     -b|--branch)
       shift
       LLVM_BRANCH="$1"
       shift
       ;;
-    -p|--llvm-project)
-      shift
-      PROJ="$1"
-      shift
-
-      if [ "$PROJ" == "cfe" ]; then
-        PROJ="clang"
-      fi
-
-      if ! contains_project "$PROJ" ; then
-        if [ "$PROJ" == "clang-tools-extra" ] && [ ! contains_project "clang" ]; then
-          echo "Project 'clang-tools-extra' specified before 'clang'. Adding 'clang' to a list of projects first."
-          LLVM_PROJECTS="$LLVM_PROJECTS clang"
-        fi
-        LLVM_PROJECTS="$LLVM_PROJECTS $PROJ"
-      else
-        echo "Project '$PROJ' is already enabled, ignoring extra occurrences."
-      fi
-      ;;
     -h|--help)
       show_usage
       exit 0
       ;;
     *)
       echo "Unknown option: $1"
       exit 1
   esac
 done
 
 if [ "$LLVM_BRANCH" == "" ]; then
-  LLVM_BRANCH="trunk"
+  LLVM_BRANCH="main"
 fi
 
-if [ "$LLVM_SVN_REV" != "" ]; then
-  SVN_REV_ARG="-r$LLVM_SVN_REV"
-  echo "Checking out svn revision r$LLVM_SVN_REV."
+if [ "$LLVM_GIT_REV" != "" ]; then
+  GIT_REV_ARG="$LLVM_GIT_REV"
+  echo "Checking out git revision $LLVM_GIT_REV."
 else
-  SVN_REV_ARG=""
-  echo "Checking out latest svn revision."
+  GIT_REV_ARG=""
+  echo "Checking out latest git revision."
 fi
 
 # Sort cherrypicks and remove duplicates.
 CHERRYPICKS="$(echo "$CHERRYPICKS" | xargs -n1 | sort | uniq | xargs)"
 
 function apply_cherrypicks() {
   local CHECKOUT_DIR="$1"
 
   [ "$CHERRYPICKS" == "" ] || echo "Applying cherrypicks"
   pushd "$CHECKOUT_DIR"
 
   # This function is always called on a sorted list of cherrypicks.
   for CHERRY_REV in $CHERRYPICKS; do
-    echo "Cherry-picking r$CHERRY_REV into $CHECKOUT_DIR"
-
-    local PATCH_FILE="$(mktemp)"
-    svn diff -c $CHERRY_REV > "$PATCH_FILE"
-    svn patch "$PATCH_FILE"
-    rm "$PATCH_FILE"
+    echo "Cherry-picking $CHERRY_REV into $CHECKOUT_DIR"
+    git cherry-pick $CHERRY_REV
   done
 
   popd
 }
 
 CLANG_BUILD_DIR=/tmp/clang-build
 
-# Get the sources from svn.
-echo "Checking out sources from svn"
+# Get the sources from git.
+echo "Checking out sources from git"
 mkdir -p "$CLANG_BUILD_DIR/src"
-for LLVM_PROJECT in $LLVM_PROJECTS; do
-  if [ "$LLVM_PROJECT" == "clang" ]; then
-    SVN_PROJECT="cfe"
-  else
-    SVN_PROJECT="$LLVM_PROJECT"
-  fi
+CHECKOUT_DIR="$CLANG_BUILD_DIR/src"
 
-  if [ "$SVN_PROJECT" != "clang-tools-extra" ]; then
-    CHECKOUT_DIR="$CLANG_BUILD_DIR/src/$LLVM_PROJECT"
-  else
-    CHECKOUT_DIR="$CLANG_BUILD_DIR/src/clang/tools/extra"
-  fi
-
-  echo "Checking out https://llvm.org/svn/llvm-project/$SVN_PROJECT to $CHECKOUT_DIR"
-  svn co -q $SVN_REV_ARG \
-    "https://llvm.org/svn/llvm-project/$SVN_PROJECT/$LLVM_BRANCH" \
-    "$CHECKOUT_DIR"
+echo "Checking out https://github.com/llvm/llvm-project.git to $CHECKOUT_DIR"
+git clone -b $LLVM_BRANCH --single-branch \
+  "https://github.com/llvm/llvm-project.git" \
 
+pushd $CHECKOUT_DIR
+git checkout -q $GIT_REV_ARG
+popd
+
   # We apply cherrypicks to all repositories regardless of whether the revision
   # changes this repository or not. For repositories not affected by the
   # cherrypick, applying the cherrypick is a no-op.
   apply_cherrypicks "$CHECKOUT_DIR"
-done
 
 CHECKSUMS_FILE="/tmp/checksums/checksums.txt"
 
 if [ -f "$CHECKSUMS_FILE" ]; then
   echo "Validating checksums for LLVM checkout..."
   python "$(dirname $0)/llvm_checksum/llvm_checksum.py" -c "$CHECKSUMS_FILE" \
     --partial --multi_dir "$CLANG_BUILD_DIR/src"
 else
   echo "Skipping checksumming checks..."
 fi
 
 echo "Done"