Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fork annotation processing into its own step.
This is part of a refactor to gather all the GenerationUnits before processing begins. The commented out lines in J2ObjCTest.java succeed on Mac, but mysteriously the annotation processing fails on my PC and in []. The same annotation processing (with precisely the same args) succeeds when run with Javac on PC. The same result happens when only this test is patched against head. Per tball, proceeding and circling back later since nothing in annotation processing is broken now that wasn't broken before. Change on 2015/03/03 by mthvedt <mthvedt@google.com> ------------- Created by MOE: http://code.google.com/p/moe-java MOE_MIGRATED_REVID=87660001
- Loading branch information
Showing
12 changed files
with
312 additions
and
132 deletions.
There are no files selected for viewing
142 changes: 142 additions & 0 deletions
142
translator/src/main/java/com/google/devtools/j2objc/AnnotationPreProcessor.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,142 @@ | ||
| /* | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.google.devtools.j2objc; | ||
|
|
||
| import com.google.common.base.Joiner; | ||
| import com.google.common.collect.Lists; | ||
| import com.google.common.collect.Maps; | ||
| import com.google.devtools.j2objc.file.InputFile; | ||
| import com.google.devtools.j2objc.file.RegularInputFile; | ||
| import com.google.devtools.j2objc.util.ErrorUtil; | ||
| import com.google.devtools.j2objc.util.FileUtil; | ||
| import com.google.devtools.j2objc.util.PathClassLoader; | ||
|
|
||
| import org.eclipse.jdt.core.compiler.batch.BatchCompiler; | ||
| import org.eclipse.jdt.core.dom.CompilationUnit; | ||
| import org.eclipse.jdt.internal.compiler.impl.CompilerOptions; | ||
|
|
||
| import java.io.File; | ||
| import java.io.IOException; | ||
| import java.io.PrintWriter; | ||
| import java.util.ArrayList; | ||
| import java.util.Collections; | ||
| import java.util.Iterator; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.ServiceLoader; | ||
|
|
||
| import javax.annotation.processing.Processor; | ||
|
|
||
| /** | ||
| * Preprocesses all input with annotation processors, if any. | ||
| */ | ||
| class AnnotationPreProcessor { | ||
|
|
||
| private File tmpDirectory; | ||
| private List<RegularInputFile> additionalFiles = new ArrayList<RegularInputFile>(); | ||
|
|
||
| AnnotationPreProcessor() { | ||
| } | ||
|
|
||
| List<RegularInputFile> getAdditionalFiles() { | ||
| return additionalFiles; | ||
| } | ||
|
|
||
| File getTemporaryDirectory() { | ||
| return tmpDirectory; | ||
| } | ||
|
|
||
| /** | ||
| * Process the given input files, given in the same format as J2ObjC command line args. | ||
| */ | ||
| void process(Iterable<String> fileArgs) { | ||
| assert tmpDirectory == null; // Shouldn't run an instance more than once. | ||
|
|
||
| if (!hasAnnotationProcessors()) { | ||
| return; | ||
| } | ||
|
|
||
| try { | ||
| tmpDirectory = FileUtil.createTempDir("annotations"); | ||
| } catch (IOException e) { | ||
| ErrorUtil.error("failed creating temporary directory: " + e); | ||
| return; | ||
| } | ||
| String tmpDirPath = tmpDirectory.getAbsolutePath(); | ||
| List<String> compileArgs = Lists.newArrayList(); | ||
| Joiner pathJoiner = Joiner.on(":"); | ||
| List<String> sourcePath = Options.getSourcePathEntries(); | ||
| sourcePath.add(tmpDirPath); | ||
| compileArgs.add("-sourcepath"); | ||
| compileArgs.add(pathJoiner.join(sourcePath)); | ||
| compileArgs.add("-classpath"); | ||
| List<String> classPath = Options.getClassPathEntries(); | ||
| compileArgs.add(pathJoiner.join(classPath)); | ||
| compileArgs.add("-encoding"); | ||
| compileArgs.add(Options.getCharset().name()); | ||
| compileArgs.add("-source"); | ||
| compileArgs.add("1.7"); | ||
| compileArgs.add("-s"); | ||
| compileArgs.add(tmpDirPath); | ||
| compileArgs.add("-d"); | ||
| compileArgs.add(tmpDirPath); | ||
| if (Options.isVerbose()) { | ||
| compileArgs.add("-XprintProcessorInfo"); | ||
| compileArgs.add("-XprintRounds"); | ||
| } | ||
| for (String fileArg : fileArgs) { | ||
| compileArgs.add(fileArg); | ||
| } | ||
| Map<String, String> batchOptions = Maps.newHashMap(); | ||
| batchOptions.put(CompilerOptions.OPTION_Process_Annotations, CompilerOptions.ENABLED); | ||
| batchOptions.put(CompilerOptions.OPTION_GenerateClassFiles, CompilerOptions.DISABLED); | ||
| // Fully qualified name used since "Main" isn't unique. | ||
| org.eclipse.jdt.internal.compiler.batch.Main batchCompiler = | ||
| new org.eclipse.jdt.internal.compiler.batch.Main( | ||
| new PrintWriter(System.out), new PrintWriter(System.err), false, batchOptions, null); | ||
| if (!batchCompiler.compile(compileArgs.toArray(new String[0]))) { | ||
| // Any compilation errors will already by displayed. | ||
| ErrorUtil.error("failed batch processing sources"); | ||
| } else { | ||
| addGeneratedSources(tmpDirectory, ""); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Check whether any javax.annotation.processing.Processor services are defined on | ||
| * the declared classpath. This is checked here to avoid batch compiling sources | ||
| * in case any might have annotations that should be processed. | ||
| */ | ||
| private boolean hasAnnotationProcessors() { | ||
| ServiceLoader<Processor> serviceLoader = ServiceLoader.load( | ||
| Processor.class, new PathClassLoader(Options.getClassPathEntries())); | ||
| Iterator<Processor> iterator = serviceLoader.iterator(); | ||
| return iterator.hasNext(); | ||
| } | ||
|
|
||
| private void addGeneratedSources(File dir, String currentRelativePath) { | ||
| assert dir.exists() && dir.isDirectory(); | ||
| for (File f : dir.listFiles()) { | ||
| String relativeName = currentRelativePath + File.separatorChar + f.getName(); | ||
| if (f.isDirectory()) { | ||
| addGeneratedSources(f, relativeName); | ||
| } else { | ||
| if (f.getName().endsWith(".java")) { | ||
| additionalFiles.add(new RegularInputFile(f.getPath(), relativeName)); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.