Added themes-compiled module (#9299)

2 files changed, 114 insertions, 121 deletions

diff --git a/theme-compiler/src/com/vaadin/buildhelpers/CompileDefaultTheme.java b/theme-compiler/src/com/vaadin/buildhelpers/CompileDefaultTheme.java
deleted file mode 100755
index 5b17ae4902..0000000000
--- a/theme-compiler/src/com/vaadin/buildhelpers/CompileDefaultTheme.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package com.vaadin.buildhelpers;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileWriter;
-import java.io.IOException;
-
-import com.vaadin.sass.ScssStylesheet;
-
-/**
- * Helper to combine css divided into separate per component dirs into one to
- * optimize http requests.
- */
-public class CompileDefaultTheme {
-
-    private static final String ARG_VERSION = "-version";
-
-    private static final String THEME_DIR = "./WebContent/VAADIN/themes/";
-    private static final String BASE = "base";
-    private static final String RUNO = "runo";
-    private static final String REINDEER = "reindeer";
-    private static final String LIFERAY = "liferay";
-    private static final String CHAMELEON = "chameleon";
-
-    /**
-     * @param args
-     * @throws IOException
-     */
-    public static void main(String[] args) throws IOException {
-        String ver = null;
-        for (int i = 0; i < args.length; i++) {
-            if (ARG_VERSION.equals(args[i])) {
-                if (args.length >= i) {
-                    ver = args[i + 1];
-                }
-                break;
-            }
-        }
-
-        for (String themeName : new String[] { BASE, RUNO, LIFERAY, CHAMELEON }) {
-            try {
-                processSassTheme(themeName, false, ver);
-                System.out.println("Compiling theme " + themeName
-                        + " successful");
-            } catch (Exception e) {
-                System.err.println("Compiling theme " + themeName + " failed");
-                e.printStackTrace();
-            }
-        }
-
-        // Compile Reindeer last, since it requires the spriting operation
-        // (makes testing the other themes a bit faster, since you don't need to
-        // wait for the spriting operation to finish before the theme CSS is
-        // compiled)
-        for (String themeName : new String[] { REINDEER }) {
-            try {
-                processSassTheme(themeName, true, ver);
-                System.out.println("Compiling theme " + themeName
-                        + " successful");
-            } catch (Exception e) {
-                System.err.println("Compiling theme " + themeName + " failed");
-                e.printStackTrace();
-            }
-        }
-    }
-
-    private static void processSassTheme(String themeName,
-            boolean useSmartSprites, String version) throws Exception {
-
-        StringBuffer cssHeader = new StringBuffer();
-
-        // Theme version
-        if (version == null) {
-            version = "9.9.9.INTERNAL-DEBUG-BUILD";
-        }
-        version = version.replaceAll("\\.", "_");
-        cssHeader.append(".v-theme-version:after {content:\"" + version
-                + "\";}\n");
-        cssHeader.append(".v-theme-version-" + version + " {display: none;}\n");
-
-        String stylesCssDir = THEME_DIR + themeName + "/";
-        String stylesCssName = stylesCssDir + "styles.css";
-
-        // Process as SASS file
-        ScssStylesheet scss = ScssStylesheet.get(stylesCssDir + "styles.scss");
-        scss.compile();
-
-        BufferedWriter out = new BufferedWriter(new FileWriter(stylesCssName));
-        out.write(cssHeader.toString());
-        out.write(scss.toString());
-        out.close();
-
-        System.out.println("Compiled CSS to " + stylesCssName + " ("
-                + scss.toString().length() + " bytes)");
-
-        if (useSmartSprites) {
-            createSprites(themeName);
-            System.out.println("Used SmartSprites to create sprites");
-            File oldCss = new File(stylesCssName);
-            oldCss.delete();
-
-            File newCss = new File(stylesCssDir + "styles-sprite.css");
-            boolean ok = newCss.renameTo(oldCss);
-            if (!ok) {
-                System.out.println("Rename " + newCss + " -> " + oldCss
-                        + " failed");
-            }
-        }
-    }
-
-    private static void createSprites(String themeName)
-            throws FileNotFoundException, IOException {
-        String[] parameters = new String[] { "--sprite-png-depth", "AUTO",
-                "--css-file-suffix", "-sprite", "--css-file-encoding", "UTF-8",
-                "--root-dir-path", THEME_DIR + themeName, "--log-level", "WARN" };
-
-        org.carrot2.labs.smartsprites.SmartSprites.main(parameters);
-
-    }
-}
diff --git a/theme-compiler/src/com/vaadin/buildhelpers/CompileTheme.java b/theme-compiler/src/com/vaadin/buildhelpers/CompileTheme.java
new file mode 100644
index 0000000000..c0bfb9aa7f
--- /dev/null
+++ b/theme-compiler/src/com/vaadin/buildhelpers/CompileTheme.java
@@ -0,0 +1,114 @@
+package com.vaadin.buildhelpers;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileWriter;
+import java.io.IOException;
+
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.HelpFormatter;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+import org.apache.commons.cli.PosixParser;
+
+import com.vaadin.sass.ScssStylesheet;
+import com.vaadin.shared.Version;
+
+/**
+ * Helper to combine css divided into separate per component dirs into one to
+ * optimize http requests.
+ */
+public class CompileTheme {
+
+    /**
+     * @param args
+     * @throws IOException
+     * @throws ParseException
+     */
+    public static void main(String[] args) throws IOException, ParseException {
+        Options options = new Options();
+        options.addOption("t", "theme", true, "the theme to compile");
+        options.addOption("f", "theme-folder", true,
+                "the folder containing the theme");
+        options.addOption("s", "sprites", true, "use smartsprites");
+        CommandLineParser parser = new PosixParser();
+        CommandLine params = parser.parse(options, args);
+        if (!params.hasOption("theme") || !params.hasOption("theme-folder")) {
+            // automatically generate the help statement
+            HelpFormatter formatter = new HelpFormatter();
+            formatter.printHelp(CompileTheme.class.getName(), options);
+            return;
+        }
+        String themeName = params.getOptionValue("theme");
+        String themeFolder = params.getOptionValue("theme-folder");
+        boolean useSprites = params.hasOption("sprites");
+
+        String version = Version.getFullVersion();
+        try {
+            processSassTheme(themeFolder, themeName, useSprites, version);
+            System.out.println("Compiling theme " + themeName + " successful");
+        } catch (Exception e) {
+            System.err.println("Compiling theme " + themeName + " failed");
+            e.printStackTrace();
+        }
+    }
+
+    private static void processSassTheme(String themeFolder, String themeName,
+            boolean useSmartSprites, String version) throws Exception {
+
+        StringBuffer cssHeader = new StringBuffer();
+
+        version = version.replaceAll("\\.", "_");
+        cssHeader.append(".v-theme-version:after {content:\"" + version
+                + "\";}\n");
+        cssHeader.append(".v-theme-version-" + version + " {display: none;}\n");
+
+        String stylesCssDir = themeFolder + File.separator + themeName
+                + File.separator;
+        String stylesCssName = stylesCssDir + "styles.css";
+
+        // Process as SASS file
+        String sassFile = stylesCssDir + "styles.scss";
+        ScssStylesheet scss = ScssStylesheet.get(sassFile);
+        if (scss == null) {
+            throw new IllegalArgumentException("SASS file: " + sassFile
+                    + " not found");
+        }
+        scss.compile();
+
+        BufferedWriter out = new BufferedWriter(new FileWriter(stylesCssName));
+        out.write(cssHeader.toString());
+        out.write(scss.toString());
+        out.close();
+
+        System.out.println("Compiled CSS to " + stylesCssName + " ("
+                + scss.toString().length() + " bytes)");
+
+        if (useSmartSprites) {
+            createSprites(themeFolder, themeName);
+            System.out.println("Used SmartSprites to create sprites");
+            File oldCss = new File(stylesCssName);
+            oldCss.delete();
+
+            File newCss = new File(stylesCssDir + "styles-sprite.css");
+            boolean ok = newCss.renameTo(oldCss);
+            if (!ok) {
+                System.out.println("Rename " + newCss + " -> " + oldCss
+                        + " failed");
+            }
+        }
+    }
+
+    private static void createSprites(String themeFolder, String themeName)
+            throws FileNotFoundException, IOException {
+        String[] parameters = new String[] { "--sprite-png-depth", "AUTO",
+                "--css-file-suffix", "-sprite", "--css-file-encoding", "UTF-8",
+                "--root-dir-path", themeFolder + File.separator + themeName,
+                "--log-level", "WARN" };
+
+        org.carrot2.labs.smartsprites.SmartSprites.main(parameters);
+
+    }
+}