From e51c43b9e3970aab098a8d17c1057f660732a584 Mon Sep 17 00:00:00 2001 From: Alexander Kriegisch Date: Sat, 20 Mar 2021 10:07:12 +0700 Subject: [PATCH] Improve batch compiler usage messages - Use spaces instead of tabs for indentation. - Document parameters bound in Eclipse JDT, e.g. {0} is not the compiler name there but the system's path separator ';' or ':'. So if we want to display the compiler name, we need {1}. - For both normal usage and '-X' usage, compiler name + version are printed now. Signed-off-by: Alexander Kriegisch --- .../batch/messages_aspectj.properties | 73 ++++++++++--------- 1 file changed, 40 insertions(+), 33 deletions(-) diff --git a/org.aspectj.ajdt.core/src/main/resources/org/aspectj/org/eclipse/jdt/internal/compiler/batch/messages_aspectj.properties b/org.aspectj.ajdt.core/src/main/resources/org/aspectj/org/eclipse/jdt/internal/compiler/batch/messages_aspectj.properties index 3e15c9560..8c7c66599 100644 --- a/org.aspectj.ajdt.core/src/main/resources/org/aspectj/org/eclipse/jdt/internal/compiler/batch/messages_aspectj.properties +++ b/org.aspectj.ajdt.core/src/main/resources/org/aspectj/org/eclipse/jdt/internal/compiler/batch/messages_aspectj.properties @@ -4,37 +4,43 @@ compiler.copyright = misc.version = {0} {1} - {2} {3} -misc.usage = {0}\n\ -\n\ -\tUsage: ..\n\ -\n\ -AspectJ-specific options:\n\ -\t-inpath use classes in dirs and jars/zips in as source\n\ -\t ( uses platform-specific path delimiter)\n\ -\t-injars use classes in zip files as source\n\ -\t ( uses classpath delimiter)\n\ -\t deprecated - use inpath instead.\n\ -\t-aspectpath weave aspects in .class files from dirs and jars/zip into sources\n\ -\t ( uses classpath delimiter)\n\ -\t-outjar put output classes in zip file \n\ -\t-outxml generate META-INF/aop.xml\n\ -\t-outxmlfile specify alternate destination output of -outxml\n\ -\t-argfile specify line-delimited list of source files\n\ -\t-showWeaveInfo display information about weaving\n\ -\t-incremental continuously-running compiler, needs -sourceroots\n\ -\t (reads stdin: enter to recompile and ''q'' to quit)\n\ -\t-sourceroots compile all .aj and .java files in \n\ -\t ( uses classpath delimiter)\n\ -\t-crossrefs generate .ajsym file into the output directory\n\ -\t-emacssym generate .ajesym symbol files for emacs support\n\ -\t-Xlint same as ''-Xlint:warning''\n\ -\t-Xlint: set default level for crosscutting messages\n\ -\t ( may be ignore, warning, or error)\n\ -\t-Xlintfile specify properties file to set per-message levels\n\ -\t (cf org/aspectj/weaver/XlintDefault.properties)\n\ -\t-X print help on non-standard options\n\ -\n\ -Standard Eclipse compiler options:\n\ +# In org.aspectj.org.eclipse.jdt.internal.compiler.batch.Main.printUsage(java.lang.String) of JDT, the following +# parameters are being bound to usage messages (misc.usage, misc.usage.warn, xoption.usage): +# {0} System.getProperty("path.separator") +# {1} compiler.name +# {2} compiler.version +# {3} compiler.copyright +misc.usage = {1} - {2}\n\ +\ \n\ +\ Usage: ..\n\ +\ \n\ +\ AspectJ-specific options:\n\ +\ -inpath use classes in dirs and jars/zips in as source\n\ +\ ( uses platform-specific path delimiter)\n\ +\ -injars use classes in zip files as source\n\ +\ ( uses classpath delimiter)\n\ +\ deprecated - use inpath instead.\n\ +\ -aspectpath weave aspects in .class files from dirs and jars/zip into sources\n\ +\ ( uses classpath delimiter)\n\ +\ -outjar put output classes in zip file \n\ +\ -outxml generate META-INF/aop.xml\n\ +\ -outxmlfile specify alternate destination output of -outxml\n\ +\ -argfile specify line-delimited list of source files\n\ +\ -showWeaveInfo display information about weaving\n\ +\ -incremental continuously-running compiler, needs -sourceroots\n\ +\ (reads stdin: enter to recompile and ''q'' to quit)\n\ +\ -sourceroots compile all .aj and .java files in \n\ +\ ( uses classpath delimiter)\n\ +\ -crossrefs generate .ajsym file into the output directory\n\ +\ -emacssym generate .ajesym symbol files for emacs support\n\ +\ -Xlint same as ''-Xlint:warning''\n\ +\ -Xlint: set default level for crosscutting messages\n\ +\ ( may be ignore, warning, or error)\n\ +\ -Xlintfile specify properties file to set per-message levels\n\ +\ (cf org/aspectj/weaver/XlintDefault.properties)\n\ +\ -X print help on non-standard options\n\ +\ \n\ +\ Standard Eclipse compiler options:\n\ \ Options enabled by default are prefixed with ''+''\n\ \ \n\ \ Classpath options:\n\ @@ -198,7 +204,7 @@ Standard Eclipse compiler options:\n\ \ unusedTypeArgs + unused type arguments for method and constructor\n\ \ uselessTypeCheck unnecessary cast/instanceof operation\n\ \ varargsCast + varargs argument need explicit cast\n\ -\ warningToken + unsupported or unnecessary @SuppressWarnings\n +\ warningToken + unsupported or unnecessary @SuppressWarnings\n\ \ \n\ \ Debug options:\n\ \ -g[:lines,vars,source] custom debug info\n\ @@ -225,8 +231,9 @@ Standard Eclipse compiler options:\n\ # This property only exists in AspectJ. Options not documented below (see org.aspectj.ajdt.ajc.BuildArgParser): # -XincrementalFile, -XjavadocsInModel, -Xset:, -Xdev:NoAtAspectJProcessing, -Xdev:Pinpoint -xoption.usage = {0} non-standard options:\n\ +xoption.usage = {1} - {2}\n\ \ \n\ +\ AspectJ-specific non-standard options:\n\ \ -XnoInline don't inline advice\n\ \ -XnotReweavable create class files that can't be subsequently rewoven\n\ \ by AspectJ.\n\ -- 2.39.5