Replace gclient/DEPS with git sub-modules.

With this CL, we check out dependent third party source code by using git sub-modules rather than gclient/DEPS, which allows us to drop hard dependency on gclient when checking out and building Mozc. Although some prebuilt binaries in gclient are still useful for some platforms, in principle OSS Mozc no longer depends on gclient. This is a clean-up of source checking out process. Build artifacts should not be affected with this change. BUG= TEST=unittest REF_BUG= REF_CL=
google · Sep 19, 2015 · 276fa5c · 276fa5c
1 parent 03c3155
commit 276fa5c
Show file tree

Hide file tree

Showing 19 changed files with 65 additions and 173 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,27 @@
+[submodule "src/third_party/breakpad"]
+	path = src/third_party/breakpad
+	url = https://chromium.googlesource.com/breakpad/breakpad
+[submodule "src/third_party/fontTools"]
+	path = src/third_party/fontTools
+	url = https://github.com/googlei18n/fonttools.git
+[submodule "src/third_party/gmock"]
+	path = src/third_party/gmock
+	url = https://github.com/google/googlemock.git
+[submodule "src/third_party/gtest"]
+	path = src/third_party/gtest
+	url = https://github.com/google/googletest.git
+[submodule "src/third_party/gyp"]
+	path = src/third_party/gyp
+	url = https://chromium.googlesource.com/external/gyp
+[submodule "src/third_party/japanese_usage_dictionary"]
+	path = src/third_party/japanese_usage_dictionary
+	url = https://github.com/hiroyuki-komatsu/japanese-usage-dictionary.git
+[submodule "src/third_party/jsoncpp"]
+	path = src/third_party/jsoncpp
+	url = https://github.com/open-source-parsers/jsoncpp.git
+[submodule "src/third_party/protobuf"]
+	path = src/third_party/protobuf
+	url = https://github.com/google/protobuf.git
+[submodule "src/third_party/zinnia"]
+	path = src/third_party/zinnia
+	url = https://github.com/taku910/zinnia.git
diff --git a/.travis.yml b/.travis.yml
@@ -33,23 +33,7 @@ os:
 language: objective-c
 
 install:
-  - git submodule add https://github.com/open-source-parsers/jsoncpp.git src/third_party/jsoncpp
-  - git -C src/third_party/jsoncpp checkout 11086dd6a7eba04289944367ca82cea71299ed70
-  - git submodule add https://github.com/google/googlemock.git src/third_party/gmock
-  - git -C src/third_party/gmock checkout d478a1f46d51ac2baa3f3b3896139897f24dc2d1
-  - git submodule add https://github.com/google/googletest.git src/third_party/gtest
-  - git -C src/third_party/gtest checkout 1d53731f2c210557caab5660dbe2c578dce6114f
-  - git submodule add https://chromium.googlesource.com/external/gyp src/third_party/gyp
-  - git -C src/third_party/gyp checkout cdf037c1edc0ba3b5d25f8e3973661efe00980cc
-  - git submodule add https://github.com/google/protobuf.git src/third_party/protobuf
-  - git -C src/third_party/protobuf checkout 172019c40bf548908ab09bfd276074c929d48415
-  - git submodule add https://github.com/hiroyuki-komatsu/japanese-usage-dictionary.git src/third_party/japanese_usage_dictionary
-  - git -C src/third_party/japanese_usage_dictionary checkout e5b3425575734c323e1d947009dd74709437b684
-  - git submodule add https://github.com/googlei18n/fonttools.git src/third_party/fontTools
-  - git -C src/third_party/fontTools checkout 5ba7d98a4153fad57258fca23b0bcb238717aec3
-  - git submodule add https://github.com/taku910/zinnia.git src/third_party/zinnia
-  - git -C src/third_party/zinnia checkout 44dddcf96c0970a806d666030295706f45cbd045
-  - git submodule add https://chromium.googlesource.com/chromium/tools/depot_tools.git src/third_party/depot_tools
+  - git -C src/third_party clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
   - export PATH="$PATH":`pwd`/src/third_party/depot_tools
 
 script:

diff --git a/appveyor.yml b/appveyor.yml
@@ -34,26 +34,8 @@ clone_folder: c:\projects\mozc
 init:
 - git config --global core.autocrlf input
 install:
-- git -C src\third_party clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
-- set PATH=%PATH%;c:\projects\mozc\src\third_party\depot_tools
-- gclient
-- gclient
-- git submodule add https://github.com/open-source-parsers/jsoncpp.git src/third_party/jsoncpp
-- git -C src/third_party/jsoncpp checkout 11086dd6a7eba04289944367ca82cea71299ed70
-- git submodule add https://github.com/google/googlemock.git src/third_party/gmock
-- git -C src/third_party/gmock checkout d478a1f46d51ac2baa3f3b3896139897f24dc2d1
-- git submodule add https://github.com/google/googletest.git src/third_party/gtest
-- git -C src/third_party/gtest checkout 1d53731f2c210557caab5660dbe2c578dce6114f
-- git submodule add https://chromium.googlesource.com/external/gyp src/third_party/gyp
-- git -C src/third_party/gyp checkout cdf037c1edc0ba3b5d25f8e3973661efe00980cc
-- git submodule add https://github.com/google/protobuf.git src/third_party/protobuf
-- git -C src/third_party/protobuf checkout 172019c40bf548908ab09bfd276074c929d48415
-- git submodule add https://github.com/hiroyuki-komatsu/japanese-usage-dictionary.git src/third_party/japanese_usage_dictionary
-- git -C src/third_party/japanese_usage_dictionary checkout e5b3425575734c323e1d947009dd74709437b684
-- git submodule add https://chromium.googlesource.com/breakpad/breakpad src/third_party/breakpad
-- git -C src/third_party/breakpad checkout d2904bb42181bc32c17b26ac4a0604c0e57473cc
-- git submodule add https://github.com/taku910/zinnia.git src/third_party/zinnia
-- git -C src/third_party/zinnia checkout 44dddcf96c0970a806d666030295706f45cbd045
+- git submodule update --init --recursive
+- choco install ninja -version 1.6.0
 build_script:
 - python src\build_mozc.py gyp --noqt
 - ninja -C src\out_win\Release mozc_cache_service mozc_renderer mozc_ime mozc_tip32 mozc_broker32 rewriter composer

diff --git a/doc/build_mozc_in_docker.md b/doc/build_mozc_in_docker.md
@@ -29,15 +29,6 @@ sudo docker run --interactive --tty --rm $USER/mozc_fedora21
 ### Hint
 Don't forget to rebuild Docker container when Dockerfile is updated.
 
-### Update the source tree
-If Dockerfile is not updated but GitHub Mozc repository is updated, you can fetch the latest source code as follows.
-
-```
-cd ../
-gclient sync
-cd src/
-```
-
 # Build in the container
 Before explaining detailed build configurations and options, let's walk through the simplest cases to see how it looks like.
 

diff --git a/doc/build_mozc_in_osx.md b/doc/build_mozc_in_osx.md
@@ -8,43 +8,25 @@ We only support OS X 10.7 or later intel only.
 # Software Requirements
 
 Building on Mac requires the following software.
+
   * Xcode
+  * [Ninja](https://github.com/martine/ninja)
 
 If you don't need to run gui tools like about dialog, config dialog, or dictionary tool, you can omit installing Qt.  Candidate window still shows without Qt.  See below for the detailed information.
 
 # Get the Code
 
-First, you'll need to download the gclient depot tool, and add depot\_tools to your PATH.
-
-```
-cd ~/
-git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
-export PATH=`pwd`/depot_tools:"$PATH"
-```
-
-Then, download the Mozc code from its SVN repository with the gclient command:
+You can download Mozc source code as follows:
 
 ```
-mkdir -p ~/work/mozc
-cd ~/work/mozc
-gclient config https://github.com/google/mozc.git --name=. --deps-file=src/DEPS
-gclient sync
+mkdir -p ~/work
+cd ~/work
+git clone https://github.com/google/mozc.git --recursive
 ```
 
-This will also download source code of other programs such as googletest and Protocol Buffers.
-Update to the latest revision
-
-Execute the following command to update to the latest revision.
-
-```
-gclient sync
-```
-
-Updating the tree sometimes causes a mysterious build error. Try "build\_mozc.py clean" if it occurs.
-
 # Compilation
 
-First, you'll need to generate Xcode project using a tool called GYP, which is automatically downloaded by "gclient sync":
+First, you'll need to generate Xcode project using a tool called [GYP](https://chromium.googlesource.com/external/gyp).
 
 ```
 cd ~/work/mozc/src

diff --git a/doc/build_mozc_in_windows.md b/doc/build_mozc_in_windows.md
@@ -13,36 +13,34 @@ Building Mozc on Windows requires the following software.
   * (optinal) [Qt libraries](http://download.qt.io/archive/qt/)
     * Commercial version and LGPL version are available.
 
-# Get the Code
+# Get dependent prebuilt binaries
 
-First, you'll need to download the gclient [depot\_tools](http://dev.chromium.org/developers/how-tos/install-depot-tools), and add ```depot_tools``` to your ```PATH```.
+If you do not have `git`, `python 2.7`, and `ninja` in your build environment, you can use prebuilt binaries in [depot\_tools](https://commondatastorage.googleapis.com/chrome-infra-docs/flat/depot_tools/docs/html/depot_tools_tutorial.html).  You need to manually unzip `depot_tools.zip` and add the extracted directory into your `PATH`.
 
 ```
 set PATH=%PATH%;c:\work\depot_tools
 ```
 
-Then download the code:
+Then run `gclient` command twice so that dependent libraries can be installed automatically.
 
 ```
-mkdir c:\work\mozc
-cd c:\work\mozc
-gclient config https://github.com/google/mozc.git --name=. --deps-file=src/DEPS
-gclient sync
+gclient
+gclient
 ```
 
-## Update to the latest revision
+# Get the Code
 
-Execute the following command to update to the latest revision.
+You can download Mozc source code as follows:
 
 ```
-gclient sync
+mkdir c:\work
+cd c:\work
+git clone https://github.com/google/mozc.git --recursive
 ```
 
-Updating the tree sometimes causes a mysterious build error. Try ```build_mozc.py clean``` if it occurs.
-
 # Compilation
 
-First, you'll need to generate Visual C++ project files using a tool called GYP, which is automatically downloaded by ```gclient sync```:
+First, you'll need to generate Visual C++ project files using a tool called [GYP](https://chromium.googlesource.com/external/gyp).
 
 ```
 cd c:\work\mozc\src
@@ -246,4 +244,4 @@ python build_mozc.py gyp --noqt
 python build_mozc.py runtests -c Release
 ```
 
-Note that you can specify `--qtdir=` option instead of `--noqt' in GYP phase, currently there is no unit test that depends on Qt.
+Note that you can specify `--qtdir=` option instead of `--noqt` in GYP phase since currently there is no unit test that depends on Qt.
diff --git a/src/DEPS b/src/DEPS
diff --git a/src/docker/fedora21/Dockerfile b/src/docker/fedora21/Dockerfile
@@ -64,15 +64,12 @@ RUN curl -LO http://storage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/nac
 RUN cd nacl_sdk && ./naclsdk install pepper_40
 ENV NACL_SDK_ROOT /home/mozc_builder/work/nacl_sdk/pepper_40
 
-## depot_tools
+## depot_tools for Ninja prebuilt
 RUN git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
 ENV PATH $PATH:/home/mozc_builder/work/depot_tools
 
-# check out Mozc source
-RUN mkdir -p /home/mozc_builder/work/mozc
-WORKDIR /home/mozc_builder/work/mozc
-RUN gclient config https://github.com/google/mozc.git --name=. --deps-file=src/DEPS
-RUN gclient sync
+# check out Mozc source with submodules
+RUN git clone https://github.com/google/mozc.git --recursive
 
 WORKDIR /home/mozc_builder/work/mozc/src
 ENTRYPOINT bash
diff --git a/src/docker/ubuntu14.04/Dockerfile b/src/docker/ubuntu14.04/Dockerfile
@@ -69,15 +69,12 @@ RUN curl -LO http://storage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/nac
 RUN cd nacl_sdk && ./naclsdk install pepper_40
 ENV NACL_SDK_ROOT /home/mozc_builder/work/nacl_sdk/pepper_40
 
-## depot_tools
+## depot_tools for Ninja prebuilt
 RUN git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
 ENV PATH $PATH:/home/mozc_builder/work/depot_tools
 
-# check out Mozc source
-RUN mkdir -p /home/mozc_builder/work/mozc
-WORKDIR /home/mozc_builder/work/mozc
-RUN gclient config https://github.com/google/mozc.git --name=. --deps-file=src/DEPS
-RUN gclient sync
+# check out Mozc source with submodules
+RUN git clone https://github.com/google/mozc.git --recursive
 
 WORKDIR /home/mozc_builder/work/mozc/src
 ENTRYPOINT bash
diff --git a/src/mozc_version_template.txt b/src/mozc_version_template.txt
@@ -1,6 +1,6 @@
 MAJOR=2
 MINOR=17
-BUILD=2122
+BUILD=2123
 REVISION=102
 # NACL_DICTIONARY_VERSION is the target version of the system dictionary to be
 # downloaded by NaCl Mozc.

diff --git a/src/third_party/breakpad b/src/third_party/breakpad
diff --git a/src/third_party/fontTools b/src/third_party/fontTools
diff --git a/src/third_party/gmock b/src/third_party/gmock
diff --git a/src/third_party/gtest b/src/third_party/gtest
diff --git a/src/third_party/gyp b/src/third_party/gyp
diff --git a/src/third_party/japanese_usage_dictionary b/src/third_party/japanese_usage_dictionary
diff --git a/src/third_party/jsoncpp b/src/third_party/jsoncpp
diff --git a/src/third_party/protobuf b/src/third_party/protobuf
diff --git a/src/third_party/zinnia b/src/third_party/zinnia