--- old/src/share/tools/ProjectCreator/BuildConfig.java 2012-04-23 14:32:16.248020500 +0200 +++ new/src/share/tools/ProjectCreator/BuildConfig.java 2012-04-23 14:32:15.752992200 +0200 @@ -22,15 +22,14 @@ * */ -import java.io.File; import java.util.Enumeration; import java.util.Hashtable; -import java.util.Iterator; import java.util.Vector; class BuildConfig { - Hashtable vars; - Vector basicNames, basicPaths; + @SuppressWarnings("rawtypes") + Hashtable vars; + Vector basicNames, basicPaths; String[] context; static CompilerInterface ci; @@ -47,7 +46,8 @@ return ci; } - protected void initNames(String flavour, String build, String outDll) { + @SuppressWarnings("rawtypes") + protected void initNames(String flavour, String build, String outDll) { if (vars == null) vars = new Hashtable(); String flavourBuild = flavour + "_" + build; @@ -63,26 +63,28 @@ // ones mentioned above were needed to expand format String buildBase = expandFormat(getFieldString(null, "BuildBase")); String sourceBase = getFieldString(null, "SourceBase"); + String buildSpace = getFieldString(null, "BuildSpace"); String outDir = buildBase; put("Id", flavourBuild); put("OutputDir", outDir); put("SourceBase", sourceBase); put("BuildBase", buildBase); + put("BuildSpace", buildSpace); put("OutputDll", outDir + Util.sep + outDll); context = new String [] {flavourBuild, flavour, build, null}; } - protected void init(Vector includes, Vector defines) { + protected void init(Vector includes, Vector defines) { initDefaultDefines(defines); initDefaultCompilerFlags(includes); initDefaultLinkerFlags(); - handleDB(); + //handleDB(); } - protected void initDefaultCompilerFlags(Vector includes) { + protected void initDefaultCompilerFlags(Vector includes) { Vector compilerFlags = new Vector(); compilerFlags.addAll(getCI().getBaseCompilerFlags(getV("Define"), @@ -100,143 +102,48 @@ put("LinkerFlags", linkerFlags); } - DirectoryTree getSourceTree(String sourceBase, String startAt) { - DirectoryTree tree = new DirectoryTree(); - - tree.addSubdirToIgnore("Codemgr_wsdata"); - tree.addSubdirToIgnore("deleted_files"); - tree.addSubdirToIgnore("SCCS"); - tree.setVerbose(true); - if (startAt != null) { - tree.readDirectory(sourceBase + File.separator + startAt); - } else { - tree.readDirectory(sourceBase); + public boolean matchesIgnoredPath(String path) { + Vector rv = new Vector(); + collectRelevantVectors(rv, "IgnorePath"); + for (String pathPart : rv) { + if (path.contains(pathPart)) { + return true; + } } - - return tree; - } - - - Vector getPreferredPaths() { - Vector preferredPaths = new Vector(); - - // In the case of multiple files with the same name in - // different subdirectories, prefer these versions - preferredPaths.add("windows"); - preferredPaths.add("x86"); - preferredPaths.add("closed"); - - // Also prefer "opto" over "adlc" for adlcVMDeps.hpp - preferredPaths.add("opto"); - - return preferredPaths; - } - - - void handleDB() { - WinGammaPlatform platform = (WinGammaPlatform)getField(null, "PlatformObject"); - - putSpecificField("AllFilesHash", computeAllFiles(platform)); + return false; } - - - private boolean matchesIgnoredPath(String prefixedName) { - Vector rv = new Vector(); - collectRelevantVectors(rv, "IgnorePath"); - for (Iterator i = rv.iterator(); i.hasNext(); ) { - String pathPart = (String) i.next(); - if (prefixedName.contains(Util.normalize(pathPart))) { + + public boolean matchesHidePath(String path) { + Vector rv = new Vector(); + collectRelevantVectors(rv, "HidePath"); + for (String pathPart : rv) { + if (path.contains(Util.normalize(pathPart))) { return true; } } return false; } - - void addAll(Iterator i, Hashtable hash, - WinGammaPlatform platform, DirectoryTree tree, - Vector preferredPaths, Vector filesNotFound, Vector filesDuplicate) { - for (; i.hasNext(); ) { - String fileName = (String) i.next(); - if (lookupHashFieldInContext("IgnoreFile", fileName) == null) { - String prefixedName = platform.envVarPrefixedFileName(fileName, - 0, /* ignored */ - tree, - preferredPaths, - filesNotFound, - filesDuplicate); - if (prefixedName != null) { - prefixedName = Util.normalize(prefixedName); - if (!matchesIgnoredPath(prefixedName)) { - addTo(hash, prefixedName, fileName); - } - } + + public Vector matchesAdditionalGeneratedPath(String fullPath) { + Vector rv = new Vector(); + Hashtable v = (Hashtable)BuildConfig.getField(this.toString(), "AdditionalGeneratedFile"); + if (v != null) { + for (Enumeration e=v.keys(); e.hasMoreElements(); ) { + String key = e.nextElement(); + String val = v.get(key); + + if (fullPath.endsWith(expandFormat(key))) { + rv.add(expandFormat(val)); + } } } + return rv; } void addTo(Hashtable ht, String key, String value) { ht.put(expandFormat(key), expandFormat(value)); } - Hashtable computeAllFiles(WinGammaPlatform platform) { - Hashtable rv = new Hashtable(); - DirectoryTree tree = getSourceTree(get("SourceBase"), getFieldString(null, "StartAt")); - Vector preferredPaths = getPreferredPaths(); - - // Hold errors until end - Vector filesNotFound = new Vector(); - Vector filesDuplicate = new Vector(); - - Vector includedFiles = new Vector(); - - // find all files - Vector dirs = getSourceIncludes(); - for (Iterator i = dirs.iterator(); i.hasNext(); ) { - String dir = (String)i.next(); - DirectoryTree subtree = getSourceTree(dir, null); - for (Iterator fi = subtree.getFileIterator(); fi.hasNext(); ) { - String name = ((File)fi.next()).getName(); - includedFiles.add(name); - } - } - addAll(includedFiles.iterator(), rv, - platform, tree, - preferredPaths, filesNotFound, filesDuplicate); - - Vector addFiles = new Vector(); - collectRelevantVectors(addFiles, "AdditionalFile"); - addAll(addFiles.iterator(), rv, - platform, tree, - preferredPaths, filesNotFound, filesDuplicate); - - collectRelevantHashes(rv, "AdditionalGeneratedFile"); - - if ((filesNotFound.size() != 0) || - (filesDuplicate.size() != 0)) { - System.err.println("Error: some files were not found or " + - "appeared in multiple subdirectories of " + - "directory " + get("SourceBase") + " and could not " + - "be resolved with os_family and arch."); - if (filesNotFound.size() != 0) { - System.err.println("Files not found:"); - for (Iterator iter = filesNotFound.iterator(); - iter.hasNext(); ) { - System.err.println(" " + (String) iter.next()); - } - } - if (filesDuplicate.size() != 0) { - System.err.println("Duplicate files:"); - for (Iterator iter = filesDuplicate.iterator(); - iter.hasNext(); ) { - System.err.println(" " + (String) iter.next()); - } - } - throw new RuntimeException(); - } - - return rv; - } - void initDefaultDefines(Vector defines) { Vector sysDefines = new Vector(); sysDefines.add("WIN32"); @@ -324,31 +231,16 @@ } void collectRelevantVectors(Vector rv, String field) { - for (int i = 0; i < context.length; i++) { - Vector v = getFieldVector(context[i], field); - if (v != null) { - for (Iterator j=v.iterator(); j.hasNext(); ) { - String val = (String)j.next(); - rv.add(expandFormat(val)); - } - } - } - } - - void collectRelevantHashes(Hashtable rv, String field) { - for (int i = 0; i < context.length; i++) { - Hashtable v = (Hashtable)getField(context[i], field); + for (String ctx : context) { + Vector v = getFieldVector(ctx, field); if (v != null) { - for (Enumeration e=v.keys(); e.hasMoreElements(); ) { - String key = (String)e.nextElement(); - String val = (String)v.get(key); - addTo(rv, key, val); + for (String val : v) { + rv.add(expandFormat(val).replace('/', '\\')); } } } } - Vector getDefines() { Vector rv = new Vector(); collectRelevantVectors(rv, "Define"); @@ -357,21 +249,17 @@ Vector getIncludes() { Vector rv = new Vector(); - collectRelevantVectors(rv, "AbsoluteInclude"); - rv.addAll(getSourceIncludes()); - return rv; } private Vector getSourceIncludes() { - Vector rv = new Vector(); - Vector ri = new Vector(); + Vector rv = new Vector(); + Vector ri = new Vector(); String sourceBase = getFieldString(null, "SourceBase"); collectRelevantVectors(ri, "RelativeInclude"); - for (Iterator i = ri.iterator(); i.hasNext(); ) { - String f = (String)i.next(); + for (String f : ri) { rv.add(sourceBase + Util.sep + f); } return rv; @@ -604,7 +492,6 @@ } } - abstract class ProductConfig extends BuildConfig { protected void init(Vector includes, Vector defines) { defines.add("NDEBUG"); @@ -638,7 +525,7 @@ } } - +/* class CoreDebugConfig extends GenericDebugNonKernelConfig { String getOptFlag() { return getCI().getNoOptFlag(); @@ -650,7 +537,6 @@ } } - class CoreFastDebugConfig extends GenericDebugNonKernelConfig { String getOptFlag() { return getCI().getOptFlag(); @@ -662,13 +548,12 @@ } } - class CoreProductConfig extends ProductConfig { CoreProductConfig() { initNames("core", "product", "jvm.dll"); init(getIncludes(), getDefines()); } -} +}*/ class KernelDebugConfig extends GenericDebugConfig { String getOptFlag() { @@ -700,6 +585,7 @@ init(getIncludes(), getDefines()); } } + abstract class CompilerInterface { abstract Vector getBaseCompilerFlags(Vector defines, Vector includes, String outDir); abstract Vector getBaseLinkerFlags(String outDir, String outDll, String platformName);