Reviewers: Lex, Description: Hi Lex,
could you review this tiny patch for me? It fixes a problem we had introduced by moving all SOYC resources to a subdirectory: when people were using the -resources flag to actually point at the directory that contains the css and image files, the dashboard would fail. With this patch, we would allow both possible paths. Thanks, kathrin Please review this at http://gwt-code-reviews.appspot.com/61815 Affected files: dev/core/src/com/google/gwt/soyc/MakeTopLevelHtmlForPerm.java Index: dev/core/src/com/google/gwt/soyc/MakeTopLevelHtmlForPerm.java =================================================================== --- dev/core/src/com/google/gwt/soyc/MakeTopLevelHtmlForPerm.java (revision 6018) +++ dev/core/src/com/google/gwt/soyc/MakeTopLevelHtmlForPerm.java (working copy) @@ -281,24 +281,36 @@ } String inputFileName = "roundedCorners.css"; File inputFile = new File(classPath + RESOURCES_PATH + inputFileName); + if (!inputFile.exists()) { + inputFile = new File(classPath + inputFileName); + } File outputFile = getOutFile("roundedCorners.css"); copyFileOrDirectory(inputFile, outputFile, classPath, RESOURCES_PATH + inputFileName, false); inputFileName = "classLevel.css"; File inputFile2 = new File(classPath + RESOURCES_PATH + inputFileName); + if (!inputFile2.exists()) { + inputFile2 = new File(classPath + inputFileName); + } File outputFile2 = getOutFile("classLevel.css"); copyFileOrDirectory(inputFile2, outputFile2, classPath, RESOURCES_PATH + inputFileName, false); inputFileName = "common.css"; File inputFile3 = new File(classPath + RESOURCES_PATH + inputFileName); + if (!inputFile3.exists()) { + inputFile3 = new File(classPath + inputFileName); + } File outputFile3 = getOutFile("common.css"); copyFileOrDirectory(inputFile3, outputFile3, classPath, RESOURCES_PATH + inputFileName, false); inputFileName = "images"; File inputDir = new File(classPath + RESOURCES_PATH + "images"); + if (!inputDir.exists()) { + inputDir = new File(classPath + "images"); + } File outputDir = getOutFile("images"); copyFileOrDirectory(inputDir, outputDir, classPath, inputFileName, true); --~--~---------~--~----~------------~-------~--~----~ http://groups.google.com/group/Google-Web-Toolkit-Contributors -~----------~----~----~----~------~----~------~--~---
