From c78069eb3ece1b450c8fe911bf3c3a4dafef02c3 Mon Sep 17 00:00:00 2001 From: Teemu Suo-Anttila Date: Thu, 22 Mar 2018 16:36:14 +0200 Subject: Remove unnecessary buildhelpers module (#10742) --- all/pom.xml | 1 - buildhelpers/pom.xml | 100 ------------- .../java/com/vaadin/buildhelpers/CompileTheme.java | 159 --------------------- .../com/vaadin/buildhelpers/ManifestWriter.java | 159 --------------------- client-compiled/pom.xml | 7 - compatibility-client-compiled/pom.xml | 7 - compatibility-themes/pom.xml | 6 - pom.xml | 11 -- themes/pom.xml | 6 - 9 files changed, 456 deletions(-) delete mode 100644 buildhelpers/pom.xml delete mode 100644 buildhelpers/src/main/java/com/vaadin/buildhelpers/CompileTheme.java delete mode 100644 buildhelpers/src/main/java/com/vaadin/buildhelpers/ManifestWriter.java diff --git a/all/pom.xml b/all/pom.xml index c3297d3c90..f84b9aa4ca 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -345,7 +345,6 @@ false - com.vaadin.buildhelpers false https://docs.oracle.com/javase/8/docs/api/ diff --git a/buildhelpers/pom.xml b/buildhelpers/pom.xml deleted file mode 100644 index c28dd68097..0000000000 --- a/buildhelpers/pom.xml +++ /dev/null @@ -1,100 +0,0 @@ - - - 4.0.0 - - com.vaadin - vaadin-root - 8.4-SNAPSHOT - - - com.vaadin - vaadin-buildhelpers - vaadin-buildhelpers - jar - - https://vaadin.com/ - Vaadin build helpers - - - - commons-io - commons-io - - - commons-cli - commons-cli - - - com.vaadin - vaadin-sass-compiler - - - - com.carrotsearch - smartsprites - - - - - - - - ${project.basedir}/../eclipse - eclipse - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - - - checkstyle - - process-sources - - - - - org.apache.maven.plugins - maven-jar-plugin - - - false - - true - - - - - - maven-deploy-plugin - - true - - - - - - - - - maven-source-plugin - - true - - - - org.sonatype.plugins - nexus-staging-maven-plugin - - true - - - - - - diff --git a/buildhelpers/src/main/java/com/vaadin/buildhelpers/CompileTheme.java b/buildhelpers/src/main/java/com/vaadin/buildhelpers/CompileTheme.java deleted file mode 100644 index 4cb5d70019..0000000000 --- a/buildhelpers/src/main/java/com/vaadin/buildhelpers/CompileTheme.java +++ /dev/null @@ -1,159 +0,0 @@ -/* - * Copyright 2000-2016 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -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.internal.ScssStylesheet; - -/** - * 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("v", "version", true, - "the Vaadin version to compile for"); - CommandLineParser parser = new PosixParser(); - CommandLine params = parser.parse(options, args); - if (!params.hasOption("theme") || !params.hasOption("theme-folder") - || !params.hasOption("version")) { - // 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"); - String version = params.getOptionValue("version"); - - // Regular theme - try { - processSassTheme(themeFolder, themeName, "styles", version); - System.out.println( - "Compiling theme " + themeName + " styles successful"); - } catch (Exception e) { - System.err - .println("Compiling theme " + themeName + " styles failed"); - e.printStackTrace(); - } - // Legacy theme w/o .themename{} wrapping - try { - String legacyFile = themeFolder + File.separator + themeName - + File.separator + "legacy-styles.scss"; - if (new File(legacyFile).exists()) { - processSassTheme(themeFolder, themeName, "legacy-styles", - version); - System.out.println("Compiling theme " + themeName - + " legacy-styles successful"); - } - } catch (Exception e) { - System.err.println( - "Compiling theme " + themeName + " legacy-styles failed"); - e.printStackTrace(); - } - } - - private static void processSassTheme(String themeFolder, String themeName, - String variant, String version) throws Exception { - - StringBuilder cssHeader = new StringBuilder(); - - String stylesCssDir = themeFolder + File.separator + themeName - + File.separator; - - String stylesCssName = stylesCssDir + variant + ".css"; - - // Process as SASS file - String sassFile = stylesCssDir + variant + ".scss"; - - ScssStylesheet scss = ScssStylesheet.get(sassFile); - if (scss == null) { - throw new IllegalArgumentException( - "SASS file: " + sassFile + " not found"); - } - scss.compile(); - String filteredScss = scss.printState().replace("@version@", version); - - BufferedWriter out = new BufferedWriter(new FileWriter(stylesCssName)); - out.write(cssHeader.toString()); - out.write(filteredScss); - out.close(); - - System.out.println("Compiled CSS to " + stylesCssName + " (" - + filteredScss.length() + " bytes)"); - - createSprites(themeFolder, themeName); - File oldCss = new File(stylesCssName); - File newCss = new File(stylesCssDir + variant + "-sprite.css"); - - if (newCss.exists()) { - // Theme contained sprites. Renamed "styles-sprite.css" -> - // "styles.css" - oldCss.delete(); - - boolean ok = newCss.renameTo(oldCss); - if (!ok) { - throw new RuntimeException( - "Rename " + newCss + " -> " + oldCss + " failed"); - } - } - - } - - private static void createSprites(String themeFolder, String themeName) - throws FileNotFoundException, IOException { - try { - // Try loading the class separately from using it to avoid - // hiding other classpath issues - Class smartSpritesClass = org.carrot2.labs.smartsprites.SmartSprites.class; - } catch (NoClassDefFoundError e) { - System.err.println( - "Could not find smartsprites. No sprites were generated. The theme should still work."); - return; - } - - String[] parameters = { "--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); - System.out.println("Generated sprites"); - - } -} diff --git a/buildhelpers/src/main/java/com/vaadin/buildhelpers/ManifestWriter.java b/buildhelpers/src/main/java/com/vaadin/buildhelpers/ManifestWriter.java deleted file mode 100644 index c82303e3e1..0000000000 --- a/buildhelpers/src/main/java/com/vaadin/buildhelpers/ManifestWriter.java +++ /dev/null @@ -1,159 +0,0 @@ -/* - * Copyright 2000-2016 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.buildhelpers; - -import java.io.BufferedReader; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.util.Date; -import java.util.jar.Manifest; - -public class ManifestWriter { - StringBuilder buffer = new StringBuilder(); - - public ManifestWriter() { - } - - /** - * Writes a manifest attribute to a temporary buffer. - * - * @param name - * Attribute name - * @param value - * Attribute value - */ - public void writeAttribute(String name, String value) { - int linelen = name.length() + 2; - buffer.append(name); - buffer.append(": "); - - String remainingValue = value; - while (linelen + remainingValue.length() > 72) { - int fitsLine = 72 - linelen; - buffer.append(remainingValue.substring(0, fitsLine) + "\n "); - remainingValue = remainingValue.substring(fitsLine); - linelen = 1; - } - buffer.append(remainingValue + "\n"); - } - - /** - * Writes the manifest to given JAR file. - * - * The manifest must be created with {@code #writeAttribute(String, String)} - * before calling this write. - * - * @param jarFilename - * File name of the JAR in which the manifest is written - * @return 0 on success, nonzero value on error - */ - int updateJar(String jarFilename) { - int status = 0; - - // Determine a temporary file name - String newMfPrefix = "vaadin-manifest-" + (new Date()).getTime(); - File newMfFile = null; - try { - newMfFile = File.createTempFile(newMfPrefix, ".mf"); - } catch (IOException e) { - System.err.println("Creating temp file failed"); - status = 1; - } - - // Write the manifest to the temporary file - if (status == 0) { - FileOutputStream fos = null; - try { - fos = new FileOutputStream(newMfFile); - fos.write(getBytes()); - fos.close(); - } catch (IOException e) { - System.err.println( - "Writing to file '" + newMfFile.getAbsolutePath() - + "' failed because: " + e.getMessage()); - status = 1; - } - } - - // Check that the manifest is OK - if (status == 0) { - Manifest checkMf = new Manifest(); - FileInputStream is; - try { - is = new FileInputStream(newMfFile); - checkMf.read(is); - } catch (IOException e) { - System.err.println( - "Reading from file '" + newMfFile.getAbsolutePath() - + "' failed because: " + e.getMessage()); - status = 1; - } - } - - // Update the manifest in the Jar - if (status == 0) { - System.out.println("Updating manifest in JAR " + jarFilename); - try { - // The "mf" order must correspond with manifest-jarfile order - Process process = Runtime.getRuntime() - .exec(new String[] { "jar", "umf", - newMfFile.getAbsolutePath(), jarFilename }); - int exitValue = process.waitFor(); - if (exitValue != 0) { - InputStream jarErr = process.getErrorStream(); - BufferedReader reader = new BufferedReader( - new InputStreamReader(jarErr)); - while (reader.ready()) { - System.err.println("jar: " + reader.readLine()); - } - System.err.println( - "The 'jar' command returned with exit value " - + exitValue); - status = 1; - } - } catch (IOException e) { - System.err.println( - "Failed to execute 'jar' command. " + e.getMessage()); - status = 1; - } catch (InterruptedException e) { - System.err - .println("Execution of 'jar' command was interrupted. " - + e.getMessage()); - status = 1; - } - } - - // Remove the temporary file - if (newMfFile != null) { - newMfFile.delete(); - } - - return status; - } - - @Override - public String toString() { - return buffer.toString(); - } - - public byte[] getBytes() { - return buffer.toString().getBytes(); - } -} diff --git a/client-compiled/pom.xml b/client-compiled/pom.xml index 8c089c8c26..96c8d56f05 100644 --- a/client-compiled/pom.xml +++ b/client-compiled/pom.xml @@ -51,13 +51,6 @@ provided - - ${project.groupId} - vaadin-buildhelpers - ${project.version} - provided - - org.osgi osgi.core diff --git a/compatibility-client-compiled/pom.xml b/compatibility-client-compiled/pom.xml index 48dc8823f5..4651acabdc 100644 --- a/compatibility-client-compiled/pom.xml +++ b/compatibility-client-compiled/pom.xml @@ -44,13 +44,6 @@ provided - - com.vaadin - vaadin-buildhelpers - ${project.version} - provided - - org.osgi osgi.core diff --git a/compatibility-themes/pom.xml b/compatibility-themes/pom.xml index 27e1480bcf..13386000a6 100644 --- a/compatibility-themes/pom.xml +++ b/compatibility-themes/pom.xml @@ -27,12 +27,6 @@ ${project.version} provided - - ${project.groupId} - vaadin-buildhelpers - ${project.version} - provided - com.vaadin diff --git a/pom.xml b/pom.xml index 6c5566c734..f9ce461479 100644 --- a/pom.xml +++ b/pom.xml @@ -541,13 +541,6 @@ classpath:/eclipse/VaadinJavaConventions.xml - - - ${project.groupId} - vaadin-buildhelpers - ${project.version} - - org.codehaus.mojo @@ -614,7 +607,6 @@ true - buildhelpers shared push server @@ -662,7 +654,6 @@ ${project.version} - buildhelpers shared push server @@ -729,7 +720,6 @@ ${project.version} - buildhelpers shared push server @@ -796,7 +786,6 @@ ${project.version} - buildhelpers shared push server diff --git a/themes/pom.xml b/themes/pom.xml index 9ba2e9910c..1b6d4ea79f 100644 --- a/themes/pom.xml +++ b/themes/pom.xml @@ -22,12 +22,6 @@ ${project.version} provided - - ${project.groupId} - vaadin-buildhelpers - ${project.version} - provided - com.vaadin -- cgit v1.2.3