summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorHenri Sara <hesara@vaadin.com>2016-04-18 14:40:54 +0300
committerVaadin Code Review <review@vaadin.com>2016-04-19 06:57:26 +0000
commita3acd70b259a266d99ab5ebef95ff6e38147d442 (patch)
treeb8412f4937709ae8f8566160c3b39f3de10b8e2f /build
parentfd36d5ccc01578b705990daa602da23ab39bcacb (diff)
downloadvaadin-framework-a3acd70b259a266d99ab5ebef95ff6e38147d442.tar.gz
vaadin-framework-a3acd70b259a266d99ab5ebef95ff6e38147d442.zip
Remove ide.xml and related files
As a replacement, run Maven targets in sub-modules: - "mvn install" in client-compiled for DefaultWidgetSet - "mvn install" in uitest for TestingWidgetSet and test themes - "mvn install" in themes for main themes - "mvn install" in push for vaadinPush.js More specific targets can also be used when using workspace artifact resolution in an IDE. Change-Id: I6de2d4fbe0d61f08ccd3a63a356635876f588ddd
Diffstat (limited to 'build')
-rw-r--r--build/common.xml53
-rwxr-xr-xbuild/ide.xml214
-rw-r--r--build/ivy.xml102
3 files changed, 0 insertions, 369 deletions
diff --git a/build/common.xml b/build/common.xml
deleted file mode 100644
index 9220cf6612..0000000000
--- a/build/common.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-
-<project xmlns:antcontrib="antlib:net.sf.antcontrib" xmlns:artifact="antlib:org.apache.maven.artifact.ant" xmlns:ivy="antlib:org.apache.ivy.ant" name="common" basedir="../" default="init-deps">
-
- <property name="ivy.install.version" value="2.2.0" />
- <property name="ivy.jar.name" value="ivy-${ivy.install.version}.jar" />
- <property name="ivy.jar.dir" value="${user.home}/.ant/lib" />
- <property name="ivy.jar.file" value="${ivy.jar.dir}/${ivy.jar.name}" />
-
- <target name="init-deps" description="Configure Ivy dependency management and load common task definitions" depends="init-taskdefs" unless="deps.initialized">
- <property name="deps.initialized" value="1" />
- </target>
-
- <target name="check-ivy-installed">
- <available property="ivy.installed" file="${ivy.jar.file}" />
- <available property="ivy.installed" classname="org.apache.ivy.ant.IvyConfigure" />
- <antcall target="common.ivy-download" />
- </target>
-
- <target name="ivy-download" unless="ivy.installed">
- <mkdir dir="${ivy.jar.dir}" />
- <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar" dest="${ivy.jar.file}" usetimestamp="true" />
- </target>
-
- <target name="ivy-configure" depends="check-ivy-installed" unless="deps.initialized">
- <!-- Ivy task definitions -->
- <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpath="${ivy.jar.file}" />
- <!-- Ivy settings -->
- <property name="ivy.settings.file" value="${project.root}/build/ivy/ivysettings.xml" />
- <ivy:configure />
- </target>
-
- <target name="init-taskdefs" depends="ivy-configure" unless="deps.initialized">
- <echo>Loading Ant tasks</echo>
- <ivy:resolve log="download-only" file="${project.root}/build/ivy/ivy.xml" conf="taskdefs" />
- <ivy:cachepath pathid="taskdefs.classpath" conf="taskdefs" />
- <taskdef resource="emma_ant.properties" classpathref="taskdefs.classpath" />
-
- <!-- ant contrib required for flow control (for loop, if, property
- override) -->
- <!-- Note that we have to use a namespace to avoid clash when running
- sub-ant. -->
- <taskdef uri="antlib:net.sf.antcontrib" resource="net/sf/antcontrib/antlib.xml" classpathref="taskdefs.classpath" />
-
- <!-- ant contrib for Maven integration -->
- <taskdef resource="org/apache/maven/artifact/ant/antlib.xml" uri="antlib:org.apache.maven.artifact.ant" classpathref="taskdefs.classpath" />
-
- <!-- jarjar -->
- <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpathref="taskdefs.classpath" />
-
- </target>
-
-</project>
diff --git a/build/ide.xml b/build/ide.xml
deleted file mode 100755
index 83b0028c41..0000000000
--- a/build/ide.xml
+++ /dev/null
@@ -1,214 +0,0 @@
-<?xml version="1.0"?>
-
-<project xmlns:antcontrib="antlib:net.sf.antcontrib" xmlns:artifact="antlib:org.apache.maven.artifact.ant" xmlns:ivy="antlib:org.apache.ivy.ant" name="Build script for IDE users" basedir=".." default="theme-and-default-widgetset">
- <property name="work.dir" location="work" />
- <property file="build.properties" />
-
- <!-- Setting this to 0 disables the parallel compilation -->
- <property name="threadsPerProcessor" value="1" />
-
- <target name="resolve" unless="resolve.done">
- <ivy:resolve log="download-only" file="build/ivy.xml" conf="ide" />
- <ivy:cachepath pathid="early.deps" conf="early" />
- <ivy:resolve log="download-only" file="build/ivy.xml" conf="ide" />
- <ivy:cachepath pathid="ide.deps" conf="ide" />
-
- <path id="classpath">
- <path refid="early.deps" />
- <path location="bin" />
- <path location="build/classes" />
- <path location="server/src/main/java" />
- <path location="server/src/main/resources" />
- <path location="shared/src/main/java" />
- <path location="shared/src/main/java-templates" />
- <path location="uitest/src" />
- <path location="client/src/main/java" />
- <path location="client/src/main/resources" />
- <path refid="ide.deps" />
- </path>
- <property name="resolve.done" value="true" />
- </target>
-
- <target name="theme-and-default-widgetset" depends="resolve">
- <!-- threadCount is ignored unless threadsPerProcessor is 0 -->
- <parallel threadsPerProcessor="${threadsPerProcessor}" threadCount="1">
- <antcall target="default-widgetset" inheritRefs="true" />
- <antcall target="themes" inheritRefs="true" />
- <antcall target="vaadinPush.js" inheritRefs="true" />
- </parallel>
- </target>
-
- <target name="themes" depends="resolve">
- <!-- threadCount is ignored unless threadsPerProcessor is 0 -->
- <parallel threadsPerProcessor="${threadsPerProcessor}" threadCount="1">
- <antcall target="compile-theme" inheritRefs="true">
- <param name="theme" value="base" />
- </antcall>
- <antcall target="compile-theme" inheritRefs="true">
- <param name="theme" value="runo" />
- </antcall>
- <antcall target="compile-theme" inheritRefs="true">
- <param name="theme" value="reindeer" />
- </antcall>
- <antcall target="compile-theme" inheritRefs="true">
- <param name="theme" value="chameleon" />
- </antcall>
- <antcall target="compile-theme" inheritRefs="true">
- <param name="theme" value="liferay" />
- </antcall>
- <antcall target="compile-theme" inheritRefs="true">
- <param name="theme" value="valo" />
- </antcall>
- <antcall target="compile-test-theme" inheritRefs="true">
- <param name="theme" value="tests-valo" />
- </antcall>
- <antcall target="compile-test-theme" inheritRefs="true">
- <param name="theme" value="tests-valo-dark" />
- </antcall>
- <antcall target="compile-test-theme" inheritRefs="true">
- <param name="theme" value="tests-valo-metro" />
- </antcall>
- <antcall target="compile-test-theme" inheritRefs="true">
- <param name="theme" value="tests-valo-flat" />
- </antcall>
- <antcall target="compile-test-theme" inheritRefs="true">
- <param name="theme" value="tests-valo-flatdark" />
- </antcall>
- <antcall target="compile-test-theme" inheritRefs="true">
- <param name="theme" value="tests-valo-facebook" />
- </antcall>
- <antcall target="compile-test-theme" inheritRefs="true">
- <param name="theme" value="tests-valo-blueprint" />
- </antcall>
- <antcall target="compile-test-theme" inheritRefs="true">
- <param name="theme" value="tests-valo-light" />
- </antcall>
- <antcall target="compile-test-theme" inheritRefs="true">
- <param name="theme" value="tests-valo-disabled-animations" />
- </antcall>
- <antcall target="compile-test-theme" inheritRefs="true">
- <param name="theme" value="tests-valo-no-font-awesome" />
- </antcall>
- </parallel>
- </target>
-
- <target name="compile-theme" depends="resolve">
- <java classname="com.vaadin.buildhelpers.CompileTheme" failonerror="yes" fork="yes">
- <classpath refid="classpath" />
- <jvmarg value="-Djava.awt.headless=true" />
- <arg value="--theme" />
- <arg value="${theme}" />
- <!-- this assumes "mvn package" has been run for vaadin-themes -->
- <arg value="--theme-folder" />
- <arg value="themes/target/classes/VAADIN/themes" />
- <arg value="--version" />
- <arg value="${vaadin.version}" />
- </java>
-
- </target>
-
- <target name="compile-test-theme" depends="resolve">
- <java classname="com.vaadin.buildhelpers.CompileTheme" failonerror="yes" fork="yes">
- <classpath refid="classpath" />
- <jvmarg value="-Djava.awt.headless=true" />
- <arg value="--theme" />
- <arg value="${theme}" />
- <arg value="--theme-folder" />
- <!-- TODO relative paths in these are broken -->
- <arg value="uitest/target/classes/VAADIN/themes" />
- <arg value="--version" />
- <arg value="${vaadin.version}" />
- </java>
-
- </target>
-
-
- <target name="default-widgetset">
- <antcall target="compile-widgetset" inheritRefs="true">
- <param name="widgetset" value="com.vaadin.DefaultWidgetSet" />
- <param name="widgetset.output.dir" location="client-compiled/target/classes/VAADIN/widgetsets" />
- </antcall>
- </target>
-
- <target name="testing-widgetset">
- <antcall target="compile-widgetset" inheritRefs="true">
- <param name="widgetset" value="com.vaadin.tests.widgetset.TestingWidgetSet" />
- <param name="widgetset.output.dir" location="uitest/target/classes/VAADIN/widgetsets" />
- </antcall>
- </target>
-
- <target name="compile-widgetset" depends="resolve">
- <property name="module" value="${widgetset}" />
- <property name="module.output.dir" location="${widgetset.output.dir}" />
- <property name="logLevel" value="TRACE" />
- <property name="style" value="PRETTY" />
- <property name="localWorkers" value="2" />
- <!-- Whether assertions should be compiled into the widgetset.
- Either "-ea" to enable or "" to disable. -->
- <property name="assertions" value="-ea" />
- <property name="extraParams" value="" />
-
- <property name="gwt.usearchives" value="true" />
- <property name="gwt.persistentunitcache" value="false" />
-
- <mkdir dir="${module.output.dir}" />
-
- <echo>Compiling ${module} to ${module.output.dir} with parameters -logLevel ${logLevel} -style ${style} -localWorkers ${localWorkers} ${assertions} -strict ${extraParams}</echo>
-
- <!--<ivy:resolve log="download-only" inline="true" organisation="javax.validation" module="validation-api"
- revision="1.0.0.GA"/> -->
-
- <!-- TODO this does not work -->
-
- <!-- compile the module -->
- <java classname="com.google.gwt.dev.Compiler" classpathref="classpath" failonerror="yes" fork="yes" maxmemory="512m">
- <arg value="-workDir" />
- <arg value="${work.dir}" />
- <arg value="-logLevel" />
- <arg value="${logLevel}" />
- <arg value="-war" />
- <arg value="${module.output.dir}" />
- <arg value="-style" />
- <arg value="${style}" />
- <arg value="-localWorkers" />
- <arg value="${localWorkers}" />
- <arg line="${assertions}" />
- <arg value="-strict" />
- <arg line="${extraParams}" />
- <arg value="${module}" />
-
- <sysproperty key="vFailIfNotSerializable" value="true" />
-
- <jvmarg value="-Xss8M" />
- <jvmarg value="-Xmx1G" />
- <jvmarg value="-XX:MaxPermSize=256M" />
- <jvmarg value="-Djava.awt.headless=true" />
- <jvmarg value="-Dgwt.usearchives=${gwt.usearchives}" />
- <jvmarg value="-Dgwt.persistentunitcache=${gwt.persistentunitcache}" />
- </java>
- </target>
- <!-- TODO this should probably be removed - compiles the file to the wrong location -->
- <target name="vaadinPush.js" depends="resolve">
- <property name="project.root" location="."/>
- <ivy:resolve log="download-only" file="${project.root}/ivy-taskdefs.xml" conf="taskdefs" />
- <ivy:cachepath pathid="taskdefs.classpath" conf="taskdefs" />
- <!-- ant contrib for Maven integration -->
- <taskdef resource="org/apache/maven/artifact/ant/antlib.xml" uri="antlib:org.apache.maven.artifact.ant" classpathref="taskdefs.classpath" />
-
- <!-- Must fork to avoid ExitException -->
- <artifact:mvn pom="${project.root}/push/pom.xml" fork="true" mavenVersion="3.0.4">
- <arg value="package"/>
- </artifact:mvn>
-
- <property name="js.output.dir" location="WebContent" />
- <property name="push.js.dir" location="${basedir}/push/target/classes/" />
- <copy todir="${js.output.dir}">
- <fileset dir="${push.js.dir}" includes="VAADIN/vaadinPush*" excludes="**/*.gz">
- </fileset>
- </copy>
- </target>
-
- <target name="clean-unitcache">
- <delete dir="WebContent/VAADIN/gwt-unitCache" />
- </target>
-</project>
diff --git a/build/ivy.xml b/build/ivy.xml
deleted file mode 100644
index 79fccc0e54..0000000000
--- a/build/ivy.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE ivy-module [
-<!-- Keep the version number in sync with push/pom.xml -->
- <!ENTITY atmosphere.runtime.version "2.2.7.vaadin1">
-
- <!ENTITY atmosphere.js.version "2.2.13.vaadin3">
-
- <!ENTITY jetty.version "8.1.12.v20130726">
-]>
-<ivy-module version="2.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
- xmlns:m="http://ant.apache.org/ivy/maven">
-
- <info organisation="com.vaadin" module="vaadin-ide"
- revision="${vaadin.version}" />
-
- <configurations>
- <conf name="build" />
- <conf name="ide" visibility="private" />
- <!-- Dependencies that must be early on the classpath for ide.xml -->
- <conf name="early" visibility="private" />
- </configurations>
- <dependencies>
- <!-- Dependencies from uitest -->
-
-<!--
- <dependency org="javax.validation" name="validation-api"
- rev="1.0.0.GA" conf="ide -> default,sources" />
- <dependency org="javax.servlet" name="javax.servlet-api"
- rev="3.0.1" conf="ide -> default" />
- <dependency org="org.eclipse.jetty" name="jetty-server"
- rev="&jetty.version;" conf="ide->default">
- <exclude org="org.eclipse.jetty.orbit"></exclude>
- </dependency>
- <dependency org="org.eclipse.jetty" name="jetty-servlets"
- rev="&jetty.version;" conf="ide->default">
- <exclude org="org.eclipse.jetty.orbit"></exclude>
- </dependency>
- <dependency org="org.eclipse.jetty" name="jetty-websocket"
- rev="&jetty.version;" conf="ide->default">
- <exclude org="org.eclipse.jetty.orbit"></exclude>
- </dependency>
- <dependency org="org.eclipse.jetty" name="jetty-webapp"
- rev="&jetty.version;" conf="ide->default">
- <exclude org="org.eclipse.jetty.orbit"></exclude>
- </dependency>
- <dependency org="org.eclipse.jetty" name="jetty-util"
- rev="&jetty.version;" conf="ide->default">
- <exclude org="org.eclipse.jetty.orbit"></exclude>
- </dependency>
- <dependency org="org.mortbay.jetty" name="jetty-runner"
- rev="&jetty.version;" conf="ide->default">
- <exclude org="org.eclipse.jetty.orbit"></exclude>
- </dependency>
- <dependency org="com.jcraft" name="jsch" rev="0.1.52"
- conf="ide->default" />
- <dependency org="commons-codec" name="commons-codec"
- rev="1.5" conf="ide->default" />
- <dependency org="commons-io" name="commons-io"
- rev="${commons-io.version}" conf="ide->default" />
- <dependency org="com.vaadin" name="vaadin-testbench"
- rev="4.0.3" conf="ide -> default" />
- <dependency org="commons-lang" name="commons-lang"
- rev="2.6" conf="ide -> default" />
-
- <dependency org="org.eclipse.jgit" name="org.eclipse.jgit"
- rev="3.5.1.201410131835-r" conf="ide->default">
- <exclude org="org.apache.httpcomponents"></exclude>
- </dependency>
--->
-
- <!-- Vaadin dependencies -->
-
- <dependency org="com.vaadin" name="vaadin-client-compiler"
- rev="${vaadin.version}" conf="ide -> default" transitive="true" />
- <dependency org="com.vaadin" name="vaadin-server"
- rev="${vaadin.version}" conf="ide -> default" transitive="true" />
- <dependency org="com.vaadin" name="vaadin-push"
- rev="${vaadin.version}" conf="ide -> default" transitive="true" />
- <dependency org="com.vaadin" name="vaadin-buildhelpers"
- rev="${vaadin.version}" conf="ide -> default" transitive="true" />
-
- <!-- Liferay Portal Service -->
- <dependency org="com.liferay.portal" name="portal-service"
- rev="6.0.2" conf="ide -> default" />
-
- <!-- Needed by SmartSprites -->
- <dependency org="com.google.guava" name="guava"
- rev="14.0.1" conf="early->default" />
- <dependency org="org.ow2.asm" name="asm"
- rev="5.0.3" conf="early->default" />
-
- <!-- version overrides -->
-
- <!-- remove cssparser override once sass-compiler is updated -->
- <override org="net.sourceforge.cssparser" module="cssparser"
- rev="0.9.11" />
-
- </dependencies>
-
-</ivy-module>