azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support inline true/false options

Browse Source
This commit is contained in:
Mikhael Bogdanov
2014-03-20 15:32:20 +04:00
parent 0b1470b5e5
commit ca4609dd2a
34 changed files with 357 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java
+6 -3
View File
@@ -33,7 +33,7 @@ import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation;
import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity;
import org.jetbrains.jet.cli.common.messages.MessageCollector;
import org.jetbrains.jet.cli.jvm.K2JVMCompiler;
import org.jetbrains.jet.lang.types.lang.InlineUtil;
import org.jetbrains.jet.cli.common.arguments.CompilerArgumentsUtil;
import java.io.File;
import java.io.IOException;
@@ -312,8 +312,11 @@ public abstract class KotlinCompileMojoBase extends AbstractMojo {
arguments.noJdkAnnotations = true;
arguments.annotations = getFullAnnotationsPath(log, annotationPaths);
log.info("Using kotlin annotations from " + arguments.annotations);
arguments.enableInline = inline;
log.info("Method inlining is " + InlineUtil.optionToInlineFlag(arguments.enableInline));
arguments.inline = inline;
if (!CompilerArgumentsUtil.checkInlineOption(arguments.inline)) {
throw new MojoExecutionException(CompilerArgumentsUtil.getWrongOptionErrorMessage(arguments.inline));
}
log.info("Method inlining is " + CompilerArgumentsUtil.optionToInlineFlag(arguments.inline));
}
protected String getFullAnnotationsPath(Log log, List<String> annotations) {