start

Fix broken configs for "remote" and "bare" repos.

.gitignore

@@ -1 +1,5 @@
-bazel-*
+bazel-bazel-*
+bazel-bin
+bazel-genfiles
+bazel-out
+bazel-testlogs

.gitmodules

@@ -4,3 +4,9 @@
 [submodule "submodule/src/remote"]
 	path = submodule/src/remote
 	url = git://github.com/laramiel/bazel-example-golang-remote
+[submodule "vendor/github.com/laramiel/bazel-example-golang-remote"]
+	path = vendor/github.com/laramiel/bazel-example-golang-remote
+	url = git://github.com/laramiel/bazel-example-golang-remote
+[submodule "vendor/github.com/laramiel/bazel-example-golang-bare"]
+	path = vendor/github.com/laramiel/bazel-example-golang-bare
+	url = git://github.com/laramiel/bazel-example-golang-bare

BUILD

@@ -1,36 +1,13 @@
-load("@bazel_tools//tools/build_rules/go:def.bzl", "go_prefix", "go_binary")
+load("@io_bazel_rules_go//go:def.bzl", "go_binary")
 
 package(
     default_visibility = ["//visibility:public"],
 )
 
-go_prefix("github.com/laramiel/bazel-example-golang/")
-
 go_binary(
-	name ="hello",
-	srcs = [ "hello.go" ],
-)
-
-go_binary(
-	name ="local",
-	srcs = [ "local.go" ],
-	deps = [
-	    "//local",
-	],
-)
-
-go_binary(
-	name ="remote",
-	srcs = [ "remote.go" ],
-	deps = [
-	    "@remote//:remote",
-	],
-)
-
-go_binary(
-	name ="bare",
-	srcs = [ "bare.go" ],
-	deps = [
-	    "@bare//:bare",
-	],
+    name = "hello",
+    srcs = ["hello.go"],
+    deps = [
+        "//cmd",
+    ]
 )

README.md

@@ -8,15 +8,47 @@ This requires bazel release > `bazel-0.20`.
 ```
 $ git clone https://github.com/laramiel/bazel-example-golang.git
 $ cd bazel-example-golang
+$ git submodule init
+$ git submodule foreach git pull origin master
 
 $ bazel run :hello
 
-$ bazel run :local
 $ bazel run :remote
 $ bazel run :bare
 
 $ git submodule update --init --recursive
 $ bazel run //submodule:bare
 $ bazel run //submodule:remote
+
+$ bazel run //with_vendor:remote
+$ bazel run //with_vendor:bare
+
 ```
 
+# Explanation
+
+This repository works in conjunction with other git repositories to
+provide a demonstration of Bazel BUILD rules for golang.
+
+* [bazel-example-golang](https://github.com/laramiel/bazel-example-golang)  
+  The main repository, demonstrating binary, local, and remote repository usage.
+
+* [bazel-example-golang-remote](https://github.com/laramiel/bazel-example-golang-remote)  
+  An example remote repository which includes Bazel rules.
+
+* [bazel-example-golang-bare](https://github.com/laramiel/bazel-example-golang-bare)
+  An example remote repository without any Bazel rules.
+
+
+Each of the remote repositories is linked into `go_binary()` targets in several
+ways:
+
+1. Using the WORKSPACE file to define `git_repository()` rules.
+   This accounts for the `:remote` and `:bare` targets.
+
+2. Using git submodules to import the repository source, and
+   using those paths. This accounts for the `//submodule:bare`
+   and `//submodule:remote` targets.
+
+3. Using the VENDOR extension introduced in go1.6.
+

WORKSPACE

@@ -1,30 +1,23 @@
-load("@bazel_tools//tools/build_rules/go:def.bzl", "go_repositories")
+load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
-go_repositories()
+# git_repository(
+#     name = "io_bazel_rules_go",
+#     remote = "https://github.com/bazelbuild/rules_go.git",
+#     branch = "master",
+# )
 
-git_repository(
-  name = "remote",
-  remote = "https://github.com/laramiel/bazel-example-golang-remote.git",
-  commit = "8f2e405",
+http_archive(
+    name = "io_bazel_rules_go",
+    sha256 = "6b65cb7917b4d1709f9410ffe00ecf3e160edf674b78c54a894471320862184f",
+    urls = [
+        "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.39.0/rules_go-v0.39.0.zip",
+        "https://github.com/bazelbuild/rules_go/releases/download/v0.39.0/rules_go-v0.39.0.zip",
+    ],
 )
 
+load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
 
-BARE_BUILD = """
-load("@bazel_tools//tools/build_rules/go:def.bzl", "go_prefix", "go_library")
+go_rules_dependencies()
 
-go_prefix("github.com/laramiel/bazel-example-golang-bare")
-
-go_library(
-    name = "bare",
-    srcs = [ "bare.go" ],
-    visibility = ["//visibility:public"],
-)
-
-"""
-
-new_git_repository(
-  name = "bare",
-  remote = "https://github.com/laramiel/bazel-example-golang-bare.git",
-  commit = "3bd848f",
-  build_file_content = BARE_BUILD
-)
+go_register_toolchains(version = "1.19.3")

bare.go

@@ -1,10 +0,0 @@
-package main 
-
-import (
-	"fmt"
-	"github.com/laramiel/bazel-example-golang-bare/bare"
-)
-
-func main() {
-	fmt.Println("Hello", bare.World())
-}

bazel-lotr

@@ -0,0 +1 @@
+/private/var/tmp/_bazel_christian/3262850bcac806b0124f7f44b81dceb1/execroot/__main__

cmd/BUILD

@@ -0,0 +1,8 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
+
+go_library(
+    name ="cmd",
+    srcs = [ "cmd.go" ],
+    visibility = ["//visibility:public"],
+    importpath= "github.com/squk/lotr/cmd"
+)

cmd/cmd.go

@@ -0,0 +1,9 @@
+package main
+
+import (
+	"fmt"
+)
+
+func main() {
+	fmt.Println("Hello World. Cmd")
+}

hello.go

@@ -1,4 +1,4 @@
-package main 
+package main
 
 import (
 	"fmt"

local.go

@@ -1,10 +0,0 @@
-package main 
-
-import (
-	"fmt"
-	"github.com/laramiel/bazel-example-golang/local/local"
-)
-
-func main() {
-	fmt.Println("Hello ", local.World())
-}

local/BUILD

@@ -1,7 +0,0 @@
-load("@bazel_tools//tools/build_rules/go:def.bzl", "go_library")
-
-go_library(
-	name ="local",
-	srcs = [ "local.go" ],
-    visibility = ["//visibility:public"],
-)

local/local.go

@@ -1,5 +0,0 @@
-package local
-
-func World() string {
-	return "local.World!"
-}

remote.go

@@ -1,10 +0,0 @@
-package main 
-
-import (
-	"fmt"
-	"github.com/laramiel/bazel-example-golang-remote/remote"
-)
-
-func main() {
-	fmt.Println("Hello ", remote.World())
-}

submodule/BUILD

@@ -1,21 +0,0 @@
-load("@bazel_tools//tools/build_rules/go:def.bzl", "go_prefix", "go_binary")
-
-package(
-    default_visibility = ["//visibility:public"],
-)
-
-go_binary(
-	name ="bare",
-	srcs = [ "bare.go" ],
-	deps = [
-	    "//submodule/src:bare",
-	],
-)
-
-go_binary(
-	name ="remote",
-	srcs = [ "remote.go" ],
-	deps = [
-	    "//submodule/src/remote",
-	],
-)

submodule/bare.go

@@ -1,10 +0,0 @@
-package main 
-
-import (
-	"fmt"
-	"github.com/laramiel/bazel-example-golang-bare/bare"
-)
-
-func main() {
-	fmt.Println("Hello", bare.World())
-}

submodule/remote.go

@@ -1,10 +0,0 @@
-package main 
-
-import (
-	"fmt"
-	"github.com/laramiel/bazel-example-golang-remote/remote"
-)
-
-func main() {
-	fmt.Println("Hello", remote.World())
-}

submodule/src/BUILD

@@ -1,9 +0,0 @@
-load("@bazel_tools//tools/build_rules/go:def.bzl", "go_prefix", "go_library")
-
-go_prefix("github.com/laramiel/bazel-example-golang-bare/")
-
-go_library(
-    name = "bare",
-    srcs = [ "bare/bare.go" ],
-    visibility = ["//visibility:public"],
-)

vendor/github.com/laramiel/BUILD

@@ -0,0 +1,7 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
+
+go_library(
+    name = "bare",
+    srcs = ["bazel-example-golang-bare/bare.go"],
+    visibility = ["//visibility:public"],
+)