Merge pull request stackb#315 from stackb/pcj/revert-267

Revert "Implement gencopy.package option (stackb#248)"

Author: pcj

cmd/gencopy/gencopy.go

@@ -185,9 +185,6 @@ func makePkgSrcDstPairs(cfg *Config, pkg *PackageConfig) []*SrcDst {
 }
 
 func makePkgSrcDstPair(cfg *Config, pkg *PackageConfig, src, dst string) *SrcDst {
-	if pkg.TargetPackage != "" {
-		dst = filepath.Join(pkg.TargetPackage, dst)
-	}
 	if pkg.TargetWorkspaceRoot != "" {
 		src = filepath.Join("external", strings.TrimPrefix(src, ".."))
 		dst = filepath.Join(pkg.TargetWorkspaceRoot, dst)

cmd/gencopy/gencopy_test.go

@@ -63,13 +63,6 @@ func TestMakePkgSrcDstPair(t *testing.T) {
 			dst:  "file.txt",
 			want: SrcDst{Src: "external/foo/file.txt", Dst: "/home/external/foo/file.txt"},
 		},
-		"TargetPackage": {
-			cfg:  Config{WorkspaceRootDirectory: "/home"},
-			pkg:  PackageConfig{TargetPackage: "pkg"},
-			src:  "file.txt",
-			dst:  "file.txt",
-			want: SrcDst{Src: "file.txt", Dst: "/home/pkg/file.txt"},
-		},
 	} {
 		t.Run(name, func(t *testing.T) {
 			got := makePkgSrcDstPair(&tc.cfg, &tc.pkg, tc.src, tc.dst)

rules/golden_filegroup.bzl

@@ -53,16 +53,13 @@ def golden_filegroup(
 
     tags = kwargs.pop("tags", [])
     srcs = kwargs.pop("srcs", [])
-    package = kwargs.pop("package", "")
-
     goldens = [src + extension for src in srcs]
     native.filegroup(name = name, srcs = srcs, tags = tags, **kwargs)
 
     _files(name = name_sources, dep = name, tags = tags)
 
     proto_compile_gencopy_test(
         name = name_test,
-        package = package,
         srcs = goldens,
         deps = [name_sources],
         mode = "check",
@@ -73,7 +70,6 @@ def golden_filegroup(
 
     proto_compile_gencopy_run(
         name = name_run,
-        package = package,
         deps = [name_sources],
         mode = "update",
         extension = extension,

rules/proto_compile_gencopy.bzl

@@ -58,14 +58,10 @@ def _proto_compile_gencopy_impl(ctx):
             else:
                 srcs.append(f.short_path)
 
-        package = info.label.package
-        if ctx.attr.package:
-            package = "/".join([ctx.label.package, package])
-
         config.packageConfigs.append(
             struct(
                 targetLabel = str(info.label),
-                targetPackage = package,
+                targetPackage = info.label.package,
                 targetWorkspaceRoot = info.label.workspace_root,
                 generatedFiles = [f.short_path for f in info.outputs],
                 sourceFiles = srcs,
@@ -97,9 +93,6 @@ def _proto_compile_gencopy_rule(is_test):
                 doc = "optional file extension to add to the copied file",
                 mandatory = False,
             ),
-            package = attr.string(
-                doc = "The package dir to which the generated files should belong",
-            ),
         ),
         executable = True,
         test = is_test,