Use correct version in precompiled themes (#9528)

diff --git a/theme-compiler/src/com/vaadin/buildhelpers/CompileTheme.java b/theme-compiler/src/com/vaadin/buildhelpers/CompileTheme.java
index c0bfb9aa7f2a615d42ff7d4c6bb42fc24d588076..d2c64602ab89461044e729b68a95f0127cd0bb23 100644 (file)
--- a/theme-compiler/src/com/vaadin/buildhelpers/CompileTheme.java
+++ b/theme-compiler/src/com/vaadin/buildhelpers/CompileTheme.java
@@ -14,7 +14,6 @@ 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
@@ -30,6 +29,8 @@ public class CompileTheme {
     public static void main(String[] args) throws IOException, ParseException {
         Options options = new Options();
         options.addOption("t", "theme", true, "the theme to compile");
+        options.addOption("v", "theme-version", true,
+                "the version to add to the compiled theme");
         options.addOption("f", "theme-folder", true,
                 "the folder containing the theme");
         options.addOption("s", "sprites", true, "use smartsprites");
@@ -43,11 +44,11 @@ public class CompileTheme {
         }
         String themeName = params.getOptionValue("theme");
         String themeFolder = params.getOptionValue("theme-folder");
+        String themeVersion = params.getOptionValue("theme-version");
         boolean useSprites = params.hasOption("sprites");
 
-        String version = Version.getFullVersion();
         try {
-            processSassTheme(themeFolder, themeName, useSprites, version);
+            processSassTheme(themeFolder, themeName, useSprites, themeVersion);
             System.out.println("Compiling theme " + themeName + " successful");
         } catch (Exception e) {
             System.err.println("Compiling theme " + themeName + " failed");

diff --git a/themes-compiled/build.xml b/themes-compiled/build.xml
index a3adbd654fddd85629376c4a8ae6fac3941e67bd..b5e27c882f7454d9d2408e087ef47250d29fcd9b 100644 (file)
--- a/themes-compiled/build.xml
+++ b/themes-compiled/build.xml
@@ -78,6 +78,8 @@
                        <arg value="${theme}" />
                        <arg value="--theme-folder" />
                        <arg value="${theme.result.dir}" />
+                       <arg value="--theme-version" />
+                       <arg value="${vaadin.version}" />
                        <jvmarg value="-Xss8M" />
                        <jvmarg value="-XX:MaxPermSize=256M" />
                        <jvmarg value="-Djava.awt.headless=true" />