diff -r 9191895df19d -r 1a9b9cfcef41 src/share/tools/ProjectCreator/FileTreeCreatorVC10.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/tools/ProjectCreator/FileTreeCreatorVC10.java Thu Mar 29 16:43:21 2012 +0200 @@ -0,0 +1,142 @@ +import static java.nio.file.FileVisitResult.CONTINUE; + +import java.io.IOException; +import java.nio.file.FileSystems; +import java.nio.file.FileVisitResult; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.attribute.BasicFileAttributes; +import java.util.Stack; +import java.util.Vector; + +public class FileTreeCreatorVC10 extends FileTreeCreator { + + public FileTreeCreatorVC10(Path startDir, Vector allConfigs, WinGammaPlatformVC10 wg) { + super(startDir, allConfigs, wg); + } + + @Override + public FileVisitResult visitFile(Path file, BasicFileAttributes attr) { + DirAttributes currentFileAttr = attributes.peek().clone(); + boolean usePch = false; + boolean disablePch = false; + boolean useIgnore = false; + String fileName = file.getFileName().toString(); + + // TODO hideFile + + // usePch applies to all configs for a file. + if (fileName.equals(BuildConfig.getFieldString(null, "UseToGeneratePch"))) { + usePch = true; + } + + for (BuildConfig cfg : allConfigs) { + if (cfg.lookupHashFieldInContext("IgnoreFile", fileName) != null) { + useIgnore = true; + currentFileAttr.setIgnore(cfg); + } else if (cfg.matchesIgnoredPath(file.toAbsolutePath().toString())) { + useIgnore = true; + currentFileAttr.setIgnore(cfg); + } + + if (cfg.lookupHashFieldInContext("DisablePch", fileName) != null) { + disablePch = true; + currentFileAttr.setDisablePch(cfg); + } + + Vector rv = new Vector(); + cfg.collectRelevantVectors(rv, "AdditionalFile"); + for(String addFile : rv) { + if (addFile.equals(fileName)) { + // supress any ignore + // TODO - may need some adjustments + if (file.toAbsolutePath().toString().contains(cfg.get("Flavour"))) { + currentFileAttr.removeFromIgnored(cfg); + } + } + } + } + + String tagName = wg.getFileTagFromSuffix(fileName); + String fileLoc = vcProjLocation.relativize(file).toString(); + + if (!useIgnore && !disablePch && !usePch) { + wg.tag(tagName, new String[] { "Include", fileLoc}); + } else { + wg.startTag( + tagName, + new String[] { "Include", fileLoc}); + + for (BuildConfig cfg : allConfigs) { + boolean ignore = currentFileAttr.hasIgnore(cfg); + if (ignore) { + wg.tagData("ExcludedFromBuild", "true", "Condition", "'$(Configuration)|$(Platform)'=='" + cfg.get("Name") + "'"); + } + if (usePch) { + wg.tagData("PrecompiledHeader", "Create", "Condition", "'$(Configuration)|$(Platform)'=='" + cfg.get("Name") + "'"); + } + if (disablePch) { + wg.tag("PrecompiledHeader", "Condition", "'$(Configuration)|$(Platform)'=='" + cfg.get("Name") + "'"); + } + } + wg.endTag(); + } + + String filter = startDir.relativize(file.getParent().toAbsolutePath()).toString(); + wg.addFilterDependency(fileLoc, filter); + + return CONTINUE; + } + + @Override + public FileVisitResult preVisitDirectory(Path path, BasicFileAttributes attrs) + throws IOException { + Boolean hide = false; + // TODO remove attrs, if path is matched in this dir, then it is too in every subdir. + // And we will check anyway + DirAttributes newAttr = attributes.peek().clone(); + + // check per config ignorePaths! + for (BuildConfig cfg : allConfigs) { + if (cfg.matchesIgnoredPath(path.toAbsolutePath().toString())) { + newAttr.setIgnore(cfg); + } + + // Hide is always on all configs. And additional files are never hiddden + if (cfg.matchesHidePath(path.toAbsolutePath().toString())) { + hide = true; + break; + } + } + + if (!hide) { + String name = startDir.relativize(path.toAbsolutePath()).toString(); + if (!"".equals(name)) { + wg.addFilter(name); + } + + attributes.push(newAttr); + return super.preVisitDirectory(path, attrs); + } else { + return FileVisitResult.SKIP_SUBTREE; + } + } + + @Override + public FileVisitResult postVisitDirectory(Path dir, IOException exc) { + //end matching attributes set by ignorepath + attributes.pop(); + return CONTINUE; + } + + @Override + public FileVisitResult visitFileFailed(Path file, IOException exc) { + return CONTINUE; + } + + public void writeFileTree() throws IOException { + Files.walkFileTree(this.startDir, this); + } + + + } \ No newline at end of file