truffle: src/share/tools/ProjectCreator/WinGammaPlatform.java comparison

comparison src/share/tools/ProjectCreator/WinGammaPlatform.java @ 6948:e522a00b91aa

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works

author	Doug Simon <doug.simon@oracle.com>
date	Mon, 12 Nov 2012 23:14:12 +0100
parents	76841bdd5f3e b9a9ed0f8eeb
children	b9a918201d47

comparison

equal deleted inserted replaced

-:ae13cc658b80
+:e522a00b91aa
 /*
-* Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.
 import java.io.PrintWriter;
 import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Stack;
 import java.util.TreeSet;
 import java.util.Vector;
 abstract class HsArgHandler extends ArgHandler {
 static final int STRING = 1;
 }
 return false;
 }
-/* This returns a String containing the full path to the passed
-file name, or null if an error occurred. If the file was not
-found or was a duplicate and couldn't be resolved using the
-preferred paths, the file name is added to the appropriate
-Vector of Strings. */
-private String findFileInDirectory(String fileName,
-DirectoryTree directory,
-Vector preferredPaths,
-Vector filesNotFound,
-Vector filesDuplicate) {
-List locationsInTree = directory.findFile(fileName);
-int  rootNameLength = directory.getRootNodeName().length();
-String name = null;
-if ((locationsInTree == null) ||
-(locationsInTree.size() == 0)) {
-filesNotFound.add(fileName);
-} else if (locationsInTree.size() > 1) {
-// Iterate through them, trying to find one with a
-// preferred path
-search:
-{
-for (Iterator locIter = locationsInTree.iterator();
-locIter.hasNext(); ) {
-DirectoryTreeNode node =
-(DirectoryTreeNode) locIter.next();
-String tmpName = node.getName();
-for (Iterator prefIter = preferredPaths.iterator();
-prefIter.hasNext(); ) {
-// We need to make sure the preferred path is
-// found from the file path not including the root node name.
-if (tmpName.indexOf((String)prefIter.next(),
-rootNameLength) != -1) {
-name = tmpName;
-break search;
-}
-}
-}
-}
-if (name == null) {
-filesDuplicate.add(fileName);
-}
-} else {
-name = ((DirectoryTreeNode) locationsInTree.get(0)).getName();
-}
-return name;
-}
-protected String envVarPrefixedFileName(String fileName,
-int sourceBaseLen,
-DirectoryTree tree,
-Vector preferredPaths,
-Vector filesNotFound,
-Vector filesDuplicate) {
-String fullName = findFileInDirectory(fileName,
-tree,
-preferredPaths,
-filesNotFound,
-filesDuplicate);
-return fullName;
-}
 String getProjectName(String fullPath, String extension)
 throws IllegalArgumentException, IOException {
 File file = new File(fullPath).getCanonicalFile();
 fullPath = file.getCanonicalPath();
 String parent = file.getParent();
 "BuildBase",
 "   (Did you set the HotSpotBuildSpace environment variable?)",
 HsArgHandler.STRING
 ),
+new HsArgRule("-buildSpace",
+"BuildSpace",
+null,
+HsArgHandler.STRING
+),
 new HsArgRule("-platformName",
 "PlatformName",
 null,
 HsArgHandler.STRING
 ),
 HsArgHandler.VECTOR
 ),
 new HsArgRule("-relativeInclude",
 "RelativeInclude",
+null,
+HsArgHandler.VECTOR
+),
+new HsArgRule("-absoluteSrcInclude",
+"AbsoluteSrcInclude",
+null,
+HsArgHandler.VECTOR
+),
+new HsArgRule("-relativeSrcInclude",
+"RelativeSrcInclude",
 null,
 HsArgHandler.VECTOR
 ),
 new HsArgRule("-define",
 "IgnorePath",
 null,
 HsArgHandler.VECTOR
 ),
+new HsArgRule("-hidePath",
+"HidePath",
+null,
+HsArgHandler.VECTOR
+),
 new HsArgRule("-additionalFile",
 "AdditionalFile",
 null,
 HsArgHandler.VECTOR
 ),
 }
 return allConfigs;
 }
-class FileAttribute {
-int     numConfigs;
-Vector  configs;
-String  shortName;
-boolean noPch, pchRoot;
-FileAttribute(String shortName, BuildConfig cfg, int numConfigs) {
-this.shortName = shortName;
-this.noPch =  (cfg.lookupHashFieldInContext("DisablePch", shortName) != null);
-this.pchRoot = shortName.equals(BuildConfig.getFieldString(null, "UseToGeneratePch"));
-this.numConfigs = numConfigs;
-configs = new Vector();
-add(cfg.get("Name"));
-}
-void add(String confName) {
-configs.add(confName);
-// if presented in all configs
-if (configs.size() == numConfigs) {
-configs = null;
-}
-}
-}
-class FileInfo implements Comparable {
-String        full;
-FileAttribute attr;
-FileInfo(String full, FileAttribute  attr) {
-this.full = full;
-this.attr = attr;
-}
-public int compareTo(Object o) {
-FileInfo oo = (FileInfo)o;
-return full.compareTo(oo.full);
-}
-boolean isHeader() {
-return attr.shortName.endsWith(".h") || attr.shortName.endsWith(".hpp");
-}
-boolean isCpp() {
-return attr.shortName.endsWith(".cpp");
-}
-}
-TreeSet sortFiles(Hashtable allFiles) {
-TreeSet rv = new TreeSet();
-Enumeration e = allFiles.keys();
-while (e.hasMoreElements()) {
-String fullPath = (String)e.nextElement();
-rv.add(new FileInfo(fullPath, (FileAttribute)allFiles.get(fullPath)));
-}
-return rv;
-}
-Hashtable computeAttributedFiles(Vector allConfigs) {
-Hashtable ht = new Hashtable();
-int numConfigs = allConfigs.size();
-for (Iterator i = allConfigs.iterator(); i.hasNext(); ) {
-BuildConfig bc = (BuildConfig)i.next();
-Hashtable  confFiles = (Hashtable)bc.getSpecificField("AllFilesHash");
-String confName = bc.get("Name");
-for (Enumeration e=confFiles.keys(); e.hasMoreElements(); ) {
-String filePath = (String)e.nextElement();
-FileAttribute fa = (FileAttribute)ht.get(filePath);
-if (fa == null) {
-fa = new FileAttribute((String)confFiles.get(filePath), bc, numConfigs);
-ht.put(filePath, fa);
-} else {
-fa.add(confName);
-}
-}
-}
-return ht;
-}
-Hashtable computeAttributedFiles(BuildConfig bc) {
-Hashtable ht = new Hashtable();
-Hashtable confFiles = (Hashtable)bc.getSpecificField("AllFilesHash");
-for (Enumeration e = confFiles.keys(); e.hasMoreElements(); ) {
-String filePath = (String)e.nextElement();
-ht.put(filePath,  new FileAttribute((String)confFiles.get(filePath), bc, 1));
-}
-return ht;
-}
 PrintWriter printWriter;
 public void writeProjectFile(String projectFileName, String projectName,
 Vector<BuildConfig> allConfigs) throws IOException {
 throw new RuntimeException("use compiler version specific version");
 }
+int indent;
+private Stack<String> tagStack = new Stack<String>();
+private void startTagPrim(String name, String[] attrs, boolean close) {
+startTagPrim(name, attrs, close, true);
+}
+private void startTagPrim(String name, String[] attrs, boolean close,
+boolean newline) {
+doIndent();
+printWriter.print("<" + name);
+indent++;
+if (attrs != null && attrs.length > 0) {
+for (int i = 0; i < attrs.length; i += 2) {
+printWriter.print(" " + attrs[i] + "=\"" + attrs[i + 1] + "\"");
+if (i < attrs.length - 2) {
+}
+}
+}
+if (close) {
+indent--;
+printWriter.print(" />");
+} else {
+// TODO push tag name, and change endTag to pop and print.
+tagStack.push(name);
+printWriter.print(">");
+}
+if (newline) {
+printWriter.println();
+}
+}
+void startTag(String name, String... attrs) {
+startTagPrim(name, attrs, false);
+}
+void startTagV(String name, Vector attrs) {
+String s[] = new String[attrs.size()];
+for (int i = 0; i < attrs.size(); i++) {
+s[i] = (String) attrs.elementAt(i);
+}
+startTagPrim(name, s, false);
+}
+void endTag() {
+String name = tagStack.pop();
+indent--;
+doIndent();
+printWriter.println("</" + name + ">");
+}
+private void endTagNoIndent() {
+String name = tagStack.pop();
+indent--;
+printWriter.println("</" + name + ">");
+}
+void tag(String name, String... attrs) {
+startTagPrim(name, attrs, true);
+}
+void tagData(String name, String data) {
+startTagPrim(name, null, false, false);
+printWriter.print(data);
+endTagNoIndent();
+}
+void tagData(String name, String data, String... attrs) {
+startTagPrim(name, attrs, false, false);
+printWriter.print(data);
+endTagNoIndent();
+}
+void tagV(String name, Vector attrs) {
+String s[] = new String[attrs.size()];
+for (int i = 0; i < attrs.size(); i++) {
+s[i] = (String) attrs.elementAt(i);
+}
+startTagPrim(name, s, true);
+}
+void doIndent() {
+for (int i = 0; i < indent; i++) {
+printWriter.print("  ");
+}
+}
 }

Mercurial > hg > truffle

comparison src/share/tools/ProjectCreator/WinGammaPlatform.java @ 6948:e522a00b91aa