1.1 --- a/src/share/tools/ProjectCreator/ProjectCreator.java Mon Sep 24 17:59:24 2012 -0700 1.2 +++ b/src/share/tools/ProjectCreator/ProjectCreator.java Thu Mar 29 16:43:21 2012 +0200 1.3 @@ -24,75 +24,76 @@ 1.4 1.5 public class ProjectCreator { 1.6 1.7 - public static void usage() { 1.8 - System.out.println("ProjectCreator options:"); 1.9 - System.err.println("WinGammaPlatform platform-specific options:"); 1.10 - System.err.println(" -sourceBase <path to directory (workspace) " + 1.11 - "containing source files; no trailing slash>"); 1.12 - System.err.println(" -dspFileName <full pathname to which .dsp file " + 1.13 - "will be written; all parent directories must " + 1.14 - "already exist>"); 1.15 - System.err.println(" -envVar <environment variable to be inserted " + 1.16 - "into .dsp file, substituting for path given in " + 1.17 - "-sourceBase. Example: HotSpotWorkSpace>"); 1.18 - System.err.println(" -dllLoc <path to directory in which to put " + 1.19 - "jvm.dll and jvm_g.dll; no trailing slash>"); 1.20 - System.err.println(" If any of the above are specified, "+ 1.21 - "they must all be."); 1.22 - System.err.println(" Additional, optional arguments, which can be " + 1.23 - "specified multiple times:"); 1.24 - System.err.println(" -absoluteInclude <string containing absolute " + 1.25 - "path to include directory>"); 1.26 - System.err.println(" -relativeInclude <string containing include " + 1.27 - "directory relative to -envVar>"); 1.28 - System.err.println(" -define <preprocessor flag to be #defined " + 1.29 - "(note: doesn't yet support " + 1.30 - "#define (flag) (value))>"); 1.31 - System.err.println(" -perFileLine <file> <line>"); 1.32 - System.err.println(" -conditionalPerFileLine <file> <line for " + 1.33 - "release build> <line for debug build>"); 1.34 - System.err.println(" (NOTE: To work around a bug in nmake, where " + 1.35 - "you can't have a '#' character in a quoted " + 1.36 - "string, all of the lines outputted have \"#\"" + 1.37 - "prepended)"); 1.38 - System.err.println(" -startAt <subdir of sourceBase>"); 1.39 - System.err.println(" -ignoreFile <file which won't be able to be " + 1.40 - "found in the sourceBase because it's generated " + 1.41 - "later>"); 1.42 - System.err.println(" -additionalFile <file not in database but " + 1.43 - "which should show up in .dsp file>"); 1.44 - System.err.println(" -additionalGeneratedFile <environment variable of " + 1.45 - "generated file's location> <relative path to " + 1.46 - "directory containing file; no trailing slash> " + 1.47 - "<name of file generated later in the build process>"); 1.48 - System.err.println(" -prelink <build> <desc> <cmds>:"); 1.49 - System.err.println(" Generate a set of prelink commands for the given BUILD"); 1.50 - System.err.println(" (\"Debug\" or \"Release\"). The prelink description and commands"); 1.51 - System.err.println(" are both quoted strings."); 1.52 - System.err.println(" Default includes: \".\""); 1.53 - System.err.println(" Default defines: WIN32, _WINDOWS, \"HOTSPOT_BUILD_USER=$(USERNAME)\""); 1.54 - } 1.55 + public static void usage() { 1.56 + System.out.println("ProjectCreator options:"); 1.57 + System.err.println("WinGammaPlatform platform-specific options:"); 1.58 + System.err.println(" -sourceBase <path to directory (workspace) " 1.59 + + "containing source files; no trailing slash>"); 1.60 + System.err.println(" -dspFileName <full pathname to which .dsp file " 1.61 + + "will be written; all parent directories must " 1.62 + + "already exist>"); 1.63 + System.err.println(" -envVar <environment variable to be inserted " 1.64 + + "into .dsp file, substituting for path given in " 1.65 + + "-sourceBase. Example: HotSpotWorkSpace>"); 1.66 + System.err.println(" -dllLoc <path to directory in which to put " 1.67 + + "jvm.dll and jvm_g.dll; no trailing slash>"); 1.68 + System.err.println(" If any of the above are specified, " 1.69 + + "they must all be."); 1.70 + System.err.println(" Additional, optional arguments, which can be " 1.71 + + "specified multiple times:"); 1.72 + System.err.println(" -absoluteInclude <string containing absolute " 1.73 + + "path to include directory>"); 1.74 + System.err.println(" -relativeInclude <string containing include " 1.75 + + "directory relative to -envVar>"); 1.76 + System.err.println(" -define <preprocessor flag to be #defined " 1.77 + + "(note: doesn't yet support " + "#define (flag) (value))>"); 1.78 + System.err.println(" -perFileLine <file> <line>"); 1.79 + System.err.println(" -conditionalPerFileLine <file> <line for " 1.80 + + "release build> <line for debug build>"); 1.81 + System.err.println(" (NOTE: To work around a bug in nmake, where " 1.82 + + "you can't have a '#' character in a quoted " 1.83 + + "string, all of the lines outputted have \"#\"" + "prepended)"); 1.84 + System.err.println(" -startAt <subdir of sourceBase>"); 1.85 + System.err.println(" -ignoreFile <file which won't be able to be " 1.86 + + "found in the sourceBase because it's generated " + "later>"); 1.87 + System.err.println(" -additionalFile <file not in database but " 1.88 + + "which should show up in .dsp file>"); 1.89 + System.err 1.90 + .println(" -additionalGeneratedFile <environment variable of " 1.91 + + "generated file's location> <relative path to " 1.92 + + "directory containing file; no trailing slash> " 1.93 + + "<name of file generated later in the build process>"); 1.94 + System.err.println(" -prelink <build> <desc> <cmds>:"); 1.95 + System.err 1.96 + .println(" Generate a set of prelink commands for the given BUILD"); 1.97 + System.err 1.98 + .println(" (\"Debug\" or \"Release\"). The prelink description and commands"); 1.99 + System.err.println(" are both quoted strings."); 1.100 + System.err.println(" Default includes: \".\""); 1.101 + System.err 1.102 + .println(" Default defines: WIN32, _WINDOWS, \"HOTSPOT_BUILD_USER=$(USERNAME)\""); 1.103 + } 1.104 1.105 - public static void main(String[] args) { 1.106 - try { 1.107 - if (args.length < 3) { 1.108 - usage(); 1.109 - System.exit(1); 1.110 - } 1.111 + public static void main(String[] args) { 1.112 + try { 1.113 + if (args.length < 3) { 1.114 + usage(); 1.115 + System.exit(1); 1.116 + } 1.117 1.118 - String platformName = args[0]; 1.119 - Class platformClass = Class.forName(platformName); 1.120 - WinGammaPlatform platform = (WinGammaPlatform) platformClass.newInstance(); 1.121 + String platformName = args[0]; 1.122 + Class platformClass = Class.forName(platformName); 1.123 + WinGammaPlatform platform = (WinGammaPlatform) platformClass 1.124 + .newInstance(); 1.125 1.126 - String[] platformArgs = new String[args.length - 1]; 1.127 - System.arraycopy(args, 1, platformArgs, 0, platformArgs.length); 1.128 + String[] platformArgs = new String[args.length - 1]; 1.129 + System.arraycopy(args, 1, platformArgs, 0, platformArgs.length); 1.130 1.131 - // Allow the platform to write platform-specific files 1.132 - platform.createVcproj(platformArgs); 1.133 - } 1.134 - catch (Exception e) { 1.135 - e.printStackTrace(); 1.136 - System.exit(1); 1.137 - } 1.138 - } 1.139 + // Allow the platform to write platform-specific files 1.140 + platform.createVcproj(platformArgs); 1.141 + } catch (Exception e) { 1.142 + e.printStackTrace(); 1.143 + System.exit(1); 1.144 + } 1.145 + } 1.146 }