Rename getRuleCMakeName() to getRuleSimpleName().
Rename function so as to not suggest it is for CMake use only
as the simplified rule name may be used for other project
formats.
Bug: skia:12541
Change-Id: I5b739dedb447ea5e0191daa9ac4df2bbcd70d6b6
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/566439
Reviewed-by: Kevin Lubick <kjlubick@google.com>
diff --git a/bazel/exporter/bazel_util.go b/bazel/exporter/bazel_util.go
index 728c084..5d936fc 100644
--- a/bazel/exporter/bazel_util.go
+++ b/bazel/exporter/bazel_util.go
@@ -123,8 +123,8 @@
}
// Create a string that uniquely identifies the rule and can be used
-// in the exported CMake file as a valid name.
-func getRuleCMakeName(bazelRuleName string) (string, error) {
+// in the exported project file as a valid name.
+func getRuleSimpleName(bazelRuleName string) (string, error) {
s, err := makeCanonicalRuleName(bazelRuleName)
if err != nil {
return "", skerr.Wrap(err)
diff --git a/bazel/exporter/bazel_util_test.go b/bazel/exporter/bazel_util_test.go
index b111570..26af56f 100644
--- a/bazel/exporter/bazel_util_test.go
+++ b/bazel/exporter/bazel_util_test.go
@@ -77,10 +77,10 @@
assert.Equal(t, "/path/to", path)
}
-func TestGetRuleCMakeName_ValidInput_Success(t *testing.T) {
+func TestGetRuleSimpleName_ValidInput_Success(t *testing.T) {
test := func(name, rule, expectedName string) {
t.Run(name, func(t *testing.T) {
- cmakeName, err := getRuleCMakeName(rule)
+ cmakeName, err := getRuleSimpleName(rule)
require.NoError(t, err)
assert.Equal(t, expectedName, cmakeName)
})
diff --git a/bazel/exporter/cmake_exporter.go b/bazel/exporter/cmake_exporter.go
index d39f07c..2c3cf84 100644
--- a/bazel/exporter/cmake_exporter.go
+++ b/bazel/exporter/cmake_exporter.go
@@ -169,7 +169,7 @@
absPath := filepath.Join(projectDir, target)
fmt.Fprintf(buffer, " %q\n", e.absToWorkspaceRelativePath(absPath))
} else {
- cmakeName, err := getRuleCMakeName(item)
+ cmakeName, err := getRuleSimpleName(item)
if err != nil {
return skerr.Wrap(err)
}
@@ -225,7 +225,7 @@
return nil
}
str := strings.Join(copts, " ")
- cmakeName, err := getRuleCMakeName(r.GetName())
+ cmakeName, err := getRuleSimpleName(r.GetName())
if err != nil {
return skerr.Wrap(err)
}
@@ -245,7 +245,7 @@
return nil
}
str := strings.Join(defines, ";")
- cmakeName, err := getRuleCMakeName(r.GetName())
+ cmakeName, err := getRuleSimpleName(r.GetName())
if err != nil {
return skerr.Wrap(err)
}
@@ -264,7 +264,7 @@
includes[i] = e.absToWorkspaceRelativePath(path)
}
str := strings.Join(includes, ";")
- cmakeName, err := getRuleCMakeName(r.GetName())
+ cmakeName, err := getRuleSimpleName(r.GetName())
if err != nil {
return skerr.Wrap(err)
}
@@ -283,7 +283,7 @@
return nil
}
str := strings.Join(defines, " ")
- cmakeName, err := getRuleCMakeName(r.GetName())
+ cmakeName, err := getRuleSimpleName(r.GetName())
if err != nil {
return skerr.Wrap(err)
}
@@ -320,7 +320,7 @@
var contents bytes.Buffer
targetName := r.GetName()
- variableName, err := getRuleCMakeName(r.GetName())
+ variableName, err := getRuleSimpleName(r.GetName())
if err != nil {
return skerr.Wrap(err)
}
@@ -345,7 +345,7 @@
targetName := r.GetName()
var contents bytes.Buffer
fmt.Fprintf(&contents, "# %s\n", targetName)
- cmakeName, err := getRuleCMakeName(r.GetName())
+ cmakeName, err := getRuleSimpleName(r.GetName())
if err != nil {
return skerr.Wrap(err)
}
@@ -374,7 +374,7 @@
rule := e.workspace.createRule(r)
targetName := r.GetName()
- cmakeName, err := getRuleCMakeName(r.GetName())
+ cmakeName, err := getRuleSimpleName(r.GetName())
if err != nil {
return skerr.Wrap(err)
}
