Split the tools needed for repo management into minimal manifest This will be used to do multi-stage bootstrapping. Change-Id: Iccc9f927148d964ae9c54c7d74fdeaa6ef8093a2
diff --git a/deps_convert.py b/deps_convert.py index 2154af7..8b46cb1 100755 --- a/deps_convert.py +++ b/deps_convert.py
@@ -21,6 +21,7 @@ <manifest label="default"> <imports> <import name="buildtools"/> + <import name="minimal"/> </imports> <hosts> <host name="gerrit" @@ -52,28 +53,7 @@ def print_project_footer(): print """ <!-- End of entries generated by deps_convert.py --> - - <project name="release.go.jiri" - remote="https://vanadium.googlesource.com/release.go.jiri" - path="release/go/src/v.io/jiri"/> - <project name="release.go.x.lib" - remote="https://vanadium.googlesource.com/release.go.x.lib" - path="release/go/src/v.io/x/lib"/> - <project name="release.go.x.devtools" - remote="https://vanadium.googlesource.com/release.go.x.devtools" - path="release/go/src/v.io/x/devtools"/> - </projects> -""" - -def print_tools(): - print """ - <tools> - <tool name="jiri" - package="v.io/jiri" - project="release.go.jiri" - data="../x/devtools/data"/> - </tools> -""" + </projects>""" def print_hooks_header(): print """ @@ -144,7 +124,6 @@ print_project_header() print_parsed_deps(scope["deps"]) print_project_footer() - print_tools() print_hooks_header() print_parsed_hooks(scope["hooks"]) print_hooks_footer()
diff --git a/v2/default b/v2/default index 8cf7a57..b73d276 100644 --- a/v2/default +++ b/v2/default
@@ -3,6 +3,7 @@ <manifest label="default"> <imports> <import name="buildtools"/> + <import name="minimal"/> </imports> <hosts> <host name="gerrit" @@ -162,27 +163,8 @@ revision="642f1498d056dbba3e50ed5a232ab2f482626dec"/> <!-- End of entries generated by deps_convert.py --> - - <project name="release.go.jiri" - remote="https://vanadium.googlesource.com/release.go.jiri" - path="release/go/src/v.io/jiri"/> - <project name="release.go.x.lib" - remote="https://vanadium.googlesource.com/release.go.x.lib" - path="release/go/src/v.io/x/lib"/> - <project name="release.go.x.devtools" - remote="https://vanadium.googlesource.com/release.go.x.devtools" - path="release/go/src/v.io/x/devtools"/> </projects> - - <tools> - <tool name="jiri" - package="v.io/jiri" - project="release.go.jiri" - data="../x/devtools/data"/> - </tools> - - <hooks> <!-- Entries generated by deps_convert.py --> @@ -313,7 +295,7 @@ interpreter="python" path="build/download_nacl_toolchains.py"> <arg>--packages</arg> - <arg>pnacl_newlib</arg> + <arg>pnacl_newlib,pnacl_translator</arg> <arg>sync</arg> <arg>--extract</arg> </hook>
diff --git a/v2/minimal b/v2/minimal new file mode 100644 index 0000000..91482db --- /dev/null +++ b/v2/minimal
@@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<manifest label="minimal"> + <projects> + <project name="release.go.jiri" + remote="https://vanadium.googlesource.com/release.go.jiri" + path="release/go/src/v.io/jiri"/> + <project name="release.go.x.lib" + remote="https://vanadium.googlesource.com/release.go.x.lib" + path="release/go/src/v.io/x/lib"/> + <project name="release.go.x.devtools" + remote="https://vanadium.googlesource.com/release.go.x.devtools" + path="release/go/src/v.io/x/devtools"/> + </projects> + <tools> + <tool name="jiri" + package="v.io/jiri" + project="release.go.jiri" + data="../x/devtools/data"/> + </tools> +</manifest>