mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2026-05-05 12:16:13 +02:00
Code Issues Projects Releases Wiki Activity

Improvements to Bazel workspace generator

Browse Source 
- Format generatated workspace file to match bazel build file style guidelines
- Automatically generate bazel and buck versions from onos-lib-gen

Change-Id: Iaa879e4e6356e42382b0c9ba82d7ae82e87dac9a
This commit is contained in:
Ray Milkey 2018-05-30 18:27:10 -07:00
parent 816db1086a
commit 75bd9e09e5
6 changed files with 2085 additions and 2084 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/BUCK
View File

@ -1,4 +1,4 @@
# ***** This file was auto-generated at Wed, 30 May 2018 22:37:13 GMT. Do not edit this file manually. *****
# ***** This file was auto-generated at Thu, 31 May 2018 16:26:40 GMT. Do not edit this file manually. *****
# ***** Use onos-lib-gen *****
pass_thru_pom(

4128
tools/build/bazel/generate_workspace.bzl
View File

File diff suppressed because it is too large Load Diff

32
tools/build/libgen/src/main/java/org/onosproject/libgen/BuckArtifact.java
View File

@ -90,11 +90,11 @@ public abstract class BuckArtifact {
String getBazelJavaLibraryFragment() {
if (isJar()) {
String format =
" native.java_library (\n" +
" name = '%s',\n" +
" visibility = ['//visibility:public'],\n" +
" exports = ['@%s//jar'],\n" +
" )\n\n";
"\n native.java_library(\n" +
" name = \"%s\",\n" +
" visibility = [\"//visibility:public\"],\n" +
" exports = [\"@%s//jar\"],\n" +
" )\n";
return String.format(format, jarTarget(), jarTarget());
}
return "";
@ -116,23 +116,23 @@ public abstract class BuckArtifact {
String repo = extractRepo();
String repoAttribute = "";
if (!"".equals(repo)) {
repoAttribute = " repository = '" + repo + "',\n";
repoAttribute = " repository = \"" + repo + "\",\n";
}
String format =
" native.maven_jar (\n" +
" name = '%s',\n" +
" artifact = '%s',\n" +
" sha1 = '%s',\n" +
"\n native.maven_jar(\n" +
" name = \"%s\",\n" +
" artifact = \"%s\",\n" +
" sha1 = \"%s\",\n" +
"%s" +
" )\n\n";
" )\n";
return String.format(format, jarTarget(), mavenCoords(), sha, repoAttribute);
} else {
String format =
" native.http_jar (\n" +
" name = '%s',\n" +
" url = '%s',\n" +
" sha256 = '%s',\n" +
" )\n\n";
"\n native.http_jar(\n" +
" name = \"%s\",\n" +
" url = \"%s\",\n" +
" sha256 = \"%s\",\n" +
" )\n";
return String.format(format, jarTarget(), url(), sha);
}
}

4
tools/build/libgen/src/main/java/org/onosproject/libgen/BuckLibGenerator.java
View File

@ -184,8 +184,8 @@ public class BuckLibGenerator {
StringBuilder mavenJars = new StringBuilder();
StringBuilder javaLibraries = new StringBuilder();
mavenJars.append("def generated_maven_jars():\n");
javaLibraries.append("def generated_java_libraries():\n");
mavenJars.append("\ndef generated_maven_jars():");
javaLibraries.append("\ndef generated_java_libraries():");
artifacts.forEach(artifact -> {
mavenJars.append(artifact.getBazelMavenJarFragment());

2
tools/build/libgen/src/main/java/org/onosproject/libgen/BuckLibrary.java
View File

@ -86,7 +86,7 @@ public class BuckLibrary {
output.append(String.format("] + %s + [", target.replaceFirst(":", "")));
} else {
String pathEnd = target.startsWith("//") ? "" : "//jar";
output.append(String.format("\n '%s%s',", convertBuckTargetName(target), pathEnd));
output.append(String.format("\n \"%s%s\",", convertBuckTargetName(target), pathEnd));
}
});
output.append("\n]\n");

1
tools/build/onos-lib-gen
View File

@ -10,3 +10,4 @@ cd $(onos-buck root 2>/dev/null)
JAR=$(onos-buck build //tools/build/libgen:libgen --show-output 2>/dev/null | tail -1 | cut -d\ -f2)
java -jar $JAR lib/deps.json lib/BUCK
java -jar $JAR lib/deps.json tools/build/bazel/generate_workspace.bzl --bazel