Index: vm/vmcore/src/init/parse_arguments.cpp =================================================================== --- vm/vmcore/src/init/parse_arguments.cpp (revision 549648) +++ vm/vmcore/src/init/parse_arguments.cpp (working copy) @@ -88,180 +88,30 @@ void print_generic_help() { - LECHO(21, - "Usage: {0} [-options] class [args...]\n" - " (to execute a method main() of the class)\n" - " or {0} [-options] -jar jarfile [args...]\n" - " (to execute the jar file)\n" - "\n" - "where options include:\n" - " -classpath \n" - " -cp \n" - " A {1} separated list of directories, jar archives,\n" - " and zip archives to search for class file\n" - " -client select the 'client' VM (same as -Xem:client)\n" - " -server select the 'server' VM (same as -Xem:server)\n" - " -D=\n" - " set a system property\n" - " -showversion print product version and continue\n" - " -version print product version and exit\n" - " -verbose[:class|:gc|:jni]\n" - " enable verbose output\n" - " -agentlib:[=]\n" - " load JVMTI agent library, library name is platform independent\n" - " -agentpath:[=...|:]\n" - " -ea[:...|:]\n" - " enable assertions\n" - " -disableassertions[:...|:]\n" - " -da[:...|:]\n" - " disable assertions\n" - " -esa | -enablesystemassertions\n" - " enable system assertions\n" - " -dsa | -disablesystemassertions\n" - " disable system assertions\n" - " -? -help print this help message\n" - " -help properties\n" - " help on system properties\n" - " -X print help on non-standard options" + // the '-help' output is defined in resource file 'harmony.properties' + LECHO(21, "{0} {1} \n" + "Internal error: string resource is undefined in harmony.properties\n" << EXECUTABLE_NAME << PORT_PATH_SEPARATOR_STR); } static void print_help_on_nonstandard_options() { - LECHO(22, - " -Xbootclasspath:\n" - " Set bootclasspath to the specified value\n" - " -Xbootclasspath/a:\n" - " Append specified directories and files to bootclasspath\n" - " -Xbootclasspath/p:\n" - " Prepend specified directories and files to bootclasspath\n" - " -Xjit \n" - " Specify JIT specific options\n" - " -Xms\n" - " Set Java heap size\n" - " -Xmx\n" - " Set maximum Java heap size\n" - " -Xdebug\n" - " Does nothing, this is a compatibility option\n" - " -Xnoagent\n" - " Does nothing, this is a compatibility option\n" - " -Xrun\n" - " Specify debugger agent library\n" - " -Xverbose[:[:]\n" - " Switch logging on [for specified category only\n" - " [and log that category to a file]]\n" - " -Xwarn[:[:]\n" - " Switch verbose logging off [for specified category only\n" - " [and log that category to a file]]\n" - " -Xverboseconf:\n" - " Set up logging via log4cxx configuration file\n" - " -Xverboselog:\n" - " Log verbose output to a file\n" - " -Xverify[:none|all]\n" - " Do full bytecode verification\n" - " -Xinvisible\n" - " Retain invisible annotations at runtime\n" - " -Xfileline\n" - " Add source information to logging messages\n" - " -Xthread\n" - " Add thread id to logging messages\n" - " -Xcategory\n" - " Add category name to logging messages\n" - " -Xtimestamp\n" - " Add timestamp to logging messages\n" - " -Xfunction\n" - " Add function signature to logging messages"); + // the '-X' output is defined in resource file 'harmony.properties' + LECHO(22, // base -X help output (like -Xbootclasspath, -Xmx) + "Internal error: string resource is undefined in harmony.properties\n"); #ifdef _DEBUG - LECHO(23, - " -Xlog[:[:]\n" - " Switch debug logging on [for specified category only\n" - " [and log that category to a file]]\n" - " -Xtrace[:[:]\n" - " Switch trace logging on [for specified category only\n" - " [and log that category to a file]]"); + LECHO(23, // -Xlog & -Xtrace help output + "Internal error: string resource is undefined in harmony.properties\n"); #endif //_DEBUG #ifdef VM_STATS - LECHO(24, - " -Xstats:\n" - " Generates different statistics"); + LECHO(24, // -Xstats help output + "Internal error: string resource is undefined in harmony.properties\n"); #endif // VM_STATS - LECHO(25, - " -Xint\n" - " Use interpreter to execute the program\n" - " -Xgc:\n" - " Specify gc specific options\n" - " -Xem:\n" - " Specify em specific options\n" - " -Xdumpstubs\n" - " Writes stubs generated by LIL to disk\n" - " -Xparallel_jit\n" - " Launch compilation in parallel (default)\n" - " -Xno_parallel_jit\n" - " Do not launch compilation in parallel\n" - " -Xdumpfile:\n" - " Specifies a file name for the dump\n" - " -XX:=\n" - " set an internal system property.\n" - " Boolean options may be turned on with -XX:+