From a83d9a7dceb65d22688990ec4a90e89487888ae0 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 6 Aug 2014 16:36:28 +0200 Subject: [PATCH] CLI: introduce alias "-cp" for "-classpath" --- .../jet/cli/common/arguments/K2JVMCompilerArguments.java | 2 +- compiler/testData/cli/jvm/help.out | 2 +- compiler/testData/cli/jvm/wrongArgument.out | 2 +- compiler/testData/cli/jvm/wrongKotlinSignature.args | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/arguments/K2JVMCompilerArguments.java b/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/arguments/K2JVMCompilerArguments.java index b23e86aaf3d..20c1af26a72 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/arguments/K2JVMCompilerArguments.java +++ b/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/arguments/K2JVMCompilerArguments.java @@ -24,7 +24,7 @@ public class K2JVMCompilerArguments extends CommonCompilerArguments { @ValueDescription("") public String destination; - @Argument(value = "classpath", description = "Paths where to find user class files") + @Argument(value = "classpath", alias = "cp", description = "Paths where to find user class files") @ValueDescription("") public String classpath; diff --git a/compiler/testData/cli/jvm/help.out b/compiler/testData/cli/jvm/help.out index 1e57bcf2f98..0095f4f129f 100644 --- a/compiler/testData/cli/jvm/help.out +++ b/compiler/testData/cli/jvm/help.out @@ -1,7 +1,7 @@ Usage: kotlinc-jvm where possible options include: -d Destination for generated class files - -classpath Paths where to find user class files + -classpath (-cp) Paths where to find user class files -annotations Paths to external annotations -include-runtime Include Kotlin runtime in to resulting .jar -no-jdk Don't include Java runtime into classpath diff --git a/compiler/testData/cli/jvm/wrongArgument.out b/compiler/testData/cli/jvm/wrongArgument.out index fe9de40aa70..cb6bf8083e9 100644 --- a/compiler/testData/cli/jvm/wrongArgument.out +++ b/compiler/testData/cli/jvm/wrongArgument.out @@ -2,7 +2,7 @@ Invalid argument: -wrong-argument Usage: kotlinc-jvm where possible options include: -d Destination for generated class files - -classpath Paths where to find user class files + -classpath (-cp) Paths where to find user class files -annotations Paths to external annotations -include-runtime Include Kotlin runtime in to resulting .jar -no-jdk Don't include Java runtime into classpath diff --git a/compiler/testData/cli/jvm/wrongKotlinSignature.args b/compiler/testData/cli/jvm/wrongKotlinSignature.args index 05eebd95c7b..18a05319f2d 100644 --- a/compiler/testData/cli/jvm/wrongKotlinSignature.args +++ b/compiler/testData/cli/jvm/wrongKotlinSignature.args @@ -1,5 +1,5 @@ $TESTDATA_DIR$/wrongKotlinSignature.kt --classpath +-cp $TESTDATA_DIR$/wrongKotlinSignatureLib -d $TEMP_DIR$