|
24 | 24 | import sys
|
25 | 25 | import tempfile
|
26 | 26 | import time
|
27 |
| -import traceback |
28 |
| -import urllib.request |
29 | 27 | from dataclasses import dataclass
|
30 | 28 | from enum import Flag, auto
|
31 | 29 | from pathlib import Path
|
@@ -216,34 +214,10 @@ def __init__(self, generator: str, output_directory: str, idl_path: str):
|
216 | 214 | self.command = ["./scripts/codegen.py", "--output-dir", output_directory,
|
217 | 215 | "--generator", generator, idl_path]
|
218 | 216 |
|
219 |
| - def runJavaPrettifier(self): |
220 |
| - try: |
221 |
| - java_outputs = subprocess.check_output(["./scripts/codegen.py", "--name-only", "--generator", |
222 |
| - self.generator, "--log-level", "fatal", self.idl_path]).decode("utf8").split("\n") |
223 |
| - java_outputs = [os.path.join(self.output_directory, name) for name in java_outputs if name] |
224 |
| - |
225 |
| - logging.info("Prettifying %d java files:", len(java_outputs)) |
226 |
| - for name in java_outputs: |
227 |
| - logging.info(" %s" % name) |
228 |
| - |
229 |
| - # Keep this version in sync with what restyler uses (https://github.com/project-chip/connectedhomeip/blob/master/.restyled.yaml). |
230 |
| - FORMAT_VERSION = "1.6" |
231 |
| - URL_PREFIX = 'https://github.com/google/google-java-format/releases/download/google-java-format' |
232 |
| - JAR_NAME = f"google-java-format-{FORMAT_VERSION}-all-deps.jar" |
233 |
| - jar_url = f"{URL_PREFIX}-{FORMAT_VERSION}/{JAR_NAME}" |
234 |
| - |
235 |
| - path, http_message = urllib.request.urlretrieve(jar_url, Path.home().joinpath(JAR_NAME).as_posix()) |
236 |
| - |
237 |
| - subprocess.check_call(['java', '-jar', path, '--replace'] + java_outputs) |
238 |
| - except Exception as err: |
239 |
| - traceback.print_exception(err) |
240 |
| - print('google-java-format error:', err) |
241 |
| - |
242 | 217 | def generate(self) -> TargetRunStats:
|
243 | 218 | generate_start = time.time()
|
244 | 219 |
|
245 | 220 | subprocess.check_call(self.command)
|
246 |
| - self.runJavaPrettifier() |
247 | 221 |
|
248 | 222 | generate_end = time.time()
|
249 | 223 |
|
|
0 commit comments