mirrors
/
vaadin-framework
mirror of https://github.com/vaadin/framework.git
Watch 1
Star 0
Fork 0
Code Issues 0 Releases 329 Wiki Activity
Browse Source

Clean up obsolete Ivy/Ant confs/targets 

This change removes publishing related Ivy files and Ant targets etc.

Further cleanup will be done in later changesets.

Change-Id: Ibe430495e85a1b0f3538072a4823c627ddac2924
tags/7.7.0.alpha1
Henri Sara 8 years ago
parent
d6134fec49
commit
606457c856
9 changed files with 2 additions and 623 deletions
Split View Show Diff Stats
  1. 1
    17
      build.xml
  2. 0
    1
      client-compiler/pom.xml
  3. 0
    230
      common.xml
  4. 0
    31
      ivysettings-publish.xml
  5. 0
    6
      ivysettings.xml
  6. 0
    4
      publish.properties
  7. 0
    130
      publish.xml
  8. 1
    195
      uitest/build.xml
  9. 0
    9
      uitest/ivy.xml

+ 1
- 17
build.xml View File

@@ -3,31 +3,15 @@
<project name="vaadin" basedir="." default="package" xmlns:ivy="antlib:org.apache.ivy.ant">
<include file="common.xml" as="common" />

<path id="vaadin.buildhelpers.classpath" location="${vaadin.basedir}/buildhelpers/result/classes" />

<!-- ================================= target: all ================================= -->
<!--<target name="all" description="Compiles all parts of the project"
depends="buildhelpers,theme-compiler,shared,server,client"> -->
<target name="package" description="Compiles and packages all modules in the project" depends="buildorder">
<subant buildpathref="build-path" target="publish-local">
</subant>
</target>

<target name="buildorder" depends="official.build.checks">
<!-- Find out a good build order -->
<ivy:buildlist reference="ivy.build.path">
<fileset dir="." includes="**/build.xml">
<exclude name="build.xml" />
<exclude name="build/**" />
<exclude name="bin/**" />
<exclude name="buildhelpers/**" />
<exclude name="all/**" />
</fileset>
</ivy:buildlist>
<path id="build-path">
<!-- <path location="buildhelpers/build.xml" /> -->
<path refid="ivy.build.path" />
<!-- <path location="all/build.xml" /> -->
<path location="uitest/build.xml" />
</path>
</target>
<target name="clean" depends="buildorder">

+ 0
- 1
client-compiler/pom.xml View File

@@ -313,5 +313,4 @@
</plugin>
</plugins>
</build>
<!--todo .javadoc.jar file -->
</project>

+ 0
- 230
common.xml View File

@@ -8,10 +8,6 @@
<dirname property="vaadin.basedir" file="${ant.file.common}" />
<property file="${vaadin.basedir}/build.properties" />

<property name="modules.producing.jar" value="shared,server,client,client-compiler,client-compiled,themes,push,widgets" />
<property name="modules.to.publish.to.maven" value="${modules.producing.jar},bom" />
<property name="modules.to.publish.to.download" value="${modules.to.publish.to.maven},all" />

<ivy:settings file="${vaadin.basedir}/ivysettings.xml" />
<ivy:settings file="${vaadin.basedir}/ivysettings.xml" id="ivysettings" />
<ivy:resolve log="download-only" file="${vaadin.basedir}/ivy-taskdefs.xml" conf="taskdefs" />
@@ -21,217 +17,12 @@
<taskdef resource="org/apache/maven/artifact/ant/antlib.xml" uri="antlib:org.apache.maven.artifact.ant" classpathref="taskdefs.classpath" />

<!-- FIXME These are not available in other files -->
<antcontrib:propertyregex property="vaadin.version.major" input="${vaadin.version}" regexp="([^\.]*)\.([^\.]*)\.([^\.]*)" select="\1" />
<antcontrib:propertyregex property="vaadin.version.minor" input="${vaadin.version}" regexp="([^\.]*)\.([^\.]*)\.([^\.]*)" select="\2" />
<antcontrib:propertyregex property="vaadin.version.revision" input="${vaadin.version}" regexp="([^\.]*)\.([^\.]*)\.([^\.]*)" select="\3" />
<filterset begintoken="@" endtoken="@" id="filter-vaadin.version">
<filter token="version" value="${vaadin.version}" />
</filterset>

<union id="empty.reference" />

<target name="pom.xml" description="Generates a pom.xml based on the Ivy configuration. Either for a snapshot or a release version" depends="pom.xml.release,pom.xml.snapshot">
</target>

<property name="common.jarfiles.dir" location="${vaadin.basedir}/buildhelpers/result/WebContent" />

<target name="pom.xml.release" if="build.release">
<fail unless="result.dir" message="No result.dir parameter given" />
<property name="ivy.xml" location="${result.dir}/../ivy.xml" />
<property name="pom.xml" location="${result.dir}/lib/${module.name}-${vaadin.version}.pom" />
<property name="conf" value="build, build-provided" />
<property name="vaadin.maven.version" value="${vaadin.version}" />

<ivy:makepom templatefile="${vaadin.basedir}/pom-template.xml" ivyfile="${ivy.xml}" pomfile="${pom.xml}" conf="${conf}">
<mapping conf="build" scope="compile" />
<mapping conf="build-provided" scope="provided" />
</ivy:makepom>
</target>

<target name="pom.xml.snapshot" unless="build.release">
<fail unless="result.dir" message="No result.dir parameter given" />
<property name="ivy.xml" location="${result.dir}/../ivy.xml" />
<property name="pom.xml" location="${result.dir}/lib/${module.name}-${vaadin.version}.pom" />
<property name="temp.pom.xml" location="${pom.xml}.temp" />
<property name="conf" value="build, build-provided" />
<property name="vaadin.maven.version" value="${vaadin.version.major}.${vaadin.version.minor}-SNAPSHOT" />

<ivy:makepom templatefile="${vaadin.basedir}/pom-template.xml" ivyfile="${ivy.xml}" pomfile="${temp.pom.xml}" conf="${conf}">
<mapping conf="build" scope="compile" />
<mapping conf="build-provided" scope="provided" />
</ivy:makepom>
<copy file="${temp.pom.xml}" tofile="${pom.xml}">
<filterchain>
<replacestring from="${vaadin.version}" to="${vaadin.maven.version}" />
</filterchain>
</copy>
<delete file="${temp.pom.xml}" />
</target>


<target name="sources.jar" depends="compile">
<fail unless="result.dir" message="No result.dir parameter given" />
<fail unless="module.name" message="No module.name parameter given" />
<fail unless="src" message="No src directory parameter given" />

<property name="sources.jar" location="${result.dir}/lib/${module.name}-${vaadin.version}-sources.jar" />

<jar file="${sources.jar}" compress="true">
<fileset dir="${src}">
<patternset>
<include name="**/*.java" />
<include name="**/*.properties" />
</patternset>
</fileset>
<!-- <fileset dir="${common.jarfiles.dir}" /> -->
<restrict>
<union refid="extra.jar.includes" />
<name name="*.java" />
</restrict>
</jar>

</target>

<target name="javadoc.jar" depends="dependencies">
<fail unless="result.dir" message="No result.dir parameter given" />
<fail unless="module.name" message="No module.name parameter given" />
<property name="src" location="{$result.dir}/../src" />
<property name="javadoc.dir" value="${result.dir}/javadoc" />
<property name="javadoc.jar" location="${result.dir}/lib/${module.name}-${vaadin.version}-javadoc.jar" />

<antcontrib:if>
<!--
Most straight forward way to skip javadocs is to provide
an empty javadoc.jar. Ivy publish won't allow leaving the file
out without using conf attribute. Using conf would make internal
dependency resolution unnecessary complicated.
-->
<isset property="nojavadoc" />
<then>
<jar file="${javadoc.jar}" compress="true">
<!-- <fileset dir="${common.jarfiles.dir}" /> -->
</jar>
</then>
<else>
<javadoc destdir="${javadoc.dir}" author="true" version="true" use="true" windowtitle="${module.name}">
<packageset dir="${src}" excludes="${classes.exclude}" />

<doctitle>&lt;h1>${module.name}&lt;/h1></doctitle>
<!-- <header><![CDATA[<script type="text/javascript" src=".html-style/style.js"></script>]]></header> -->
<bottom>${javadoc.bottom}</bottom>
<link offline="true" href="http://docs.oracle.com/javase/6/docs/api/" packagelistLoc="build/javadoc/j2se-1.6.0" />
<link offline="true" href="http://java.sun.com/j2ee/1.4/docs/api/" packagelistLoc="build/javadoc/j2ee-1.4" />
<classpath refid="classpath.compile.dependencies" />
</javadoc>

<!-- Create a javadoc jar -->
<jar file="${javadoc.jar}" compress="true">
<fileset dir="${javadoc.dir}" />
<!-- <fileset dir="${common.jarfiles.dir}" /> -->
</jar>
</else>
</antcontrib:if>
</target>

<target name="jar" depends="compile, pom.xml">
<fail unless="result.dir" message="No result.dir parameter given" />
<fail unless="module.name" message="No module.name parameter given" />

<property name="result.jar" location="${result.dir}/lib/${module.name}-${vaadin.version}.jar" />
<property name="classes" location="{$result.dir}/classes" />
<property name="src" location="{$result.dir}/../src" />

<union id="jar.files">
<fileset dir="${classes}" excludes="${classes.exclude}" erroronmissingdir="false" />
<fileset dir="${src}" excludes="${jar.exclude}" erroronmissingdir="false" />
<!-- <fileset dir="${common.jarfiles.dir}" /> -->
<union refid="extra.jar.includes" />
</union>

<jar destfile="${result.jar}" duplicate="fail" index="true">
<manifest>
<attribute name="Implementation-Vendor" value="${vaadin.vendor}" />
<attribute name="Implementation-URL" value="${vaadin.url}" />
<attribute name="Implementation-Version" value="${vaadin.version}" />
</manifest>
<union refid="jar.files" />
</jar>

<antcall target="common.make-osgi-bundle">
<param name="jar" value="${result.jar}" />
<param name="bundle-version" value="${vaadin.version}" />
<param name="bundle-name" value="${module.name}" />
<param name="bundle-symbolic" value="${module.symbolic}" />
<param name="bundle-vendor" value="${vaadin.vendor}" />
<param name="includeNumberPackages" value="${osgi.includeNumberPackages}" />
</antcall>

</target>

<!-- Add OSGi attributes to the manifest of the given jar -->
<target name="make-osgi-bundle">
<fail unless="jar" message="No jar parameter given" />
<fail unless="bundle-name" message="No bundle-name parameter given" />
<fail unless="bundle-symbolic" message="No bundle-symbolic parameter given" />
<fail unless="bundle-version" message="No bundle-version parameter given" />
<fail unless="bundle-vendor" message="No bundle-vendor parameter given" />
<fail unless="includeNumberPackages" message="No includeNumberPackages parameter given" />
<property name="bundle-manifestversion" value="2" />

<jar file="${jar}" update="true">
<manifest>
<attribute name="Bundle-Version" value="${bundle-version}" />
<attribute name="Bundle-ManifestVersion" value="${bundle-manifestversion}" />
<attribute name="Bundle-Name" value="${bundle-name}" />
<attribute name="Bundle-SymbolicName" value="${bundle-symbolic}" />
<attribute name="Bundle-Vendor" value="${bundle-vendor}" />
<attribute name="Bundle-RequiredExecutionEnvironment" value="JavaSE-${vaadin.java.version}" />
</manifest>
</jar>

<antcontrib:if>
<isset property="import-package" />
<then>
<jar file="${result.jar}" update="true">
<manifest>
<attribute name="Import-Package" value="${import-package}" />
</manifest>
</jar>
</then>
</antcontrib:if>
<antcontrib:if>
<isset property="require-bundle" />
<then>
<jar file="${result.jar}" update="true">
<manifest>
<attribute name="Require-Bundle" value="${require-bundle}" />
</manifest>
</jar>
</then>
</antcontrib:if>
<antcontrib:if>
<isset property="export-package" />
<then>
<jar file="${result.jar}" update="true">
<manifest>
<attribute name="Export-Package" value="${export-package}" />
</manifest>
</jar>
</then>
</antcontrib:if>

<ivy:resolve inline="true" organisation="com.vaadin" module="vaadin-buildhelpers" revision="${vaadin.version}" keep="true" />
<ivy:cachepath pathid="buildhelpers.classpath" />

<!-- Generate the Export-Package attribute in the manifest -->
<java classname="com.vaadin.buildhelpers.GeneratePackageExports" failonerror="true" fork="yes">
<arg value="${jar}" />
<arg line="com/vaadin com/google ${osgi.extra.package.prefixes}" />
<classpath refid="buildhelpers.classpath" />
<jvmarg value="-Dvaadin.version=${vaadin.version}" />
<jvmarg value="-DincludeNumberPackages=${includeNumberPackages}" />
</java>
</target>

<target name="compile" description="Compiles the module" depends="dependencies, directories" if="src-exists">
<fail unless="module.name" message="No module name given" />
@@ -331,27 +122,6 @@
<delete dir="${result.dir}" />
</target>

<target name="publish-local" description="Publishes the given module to the local repository">
<fail unless="result.dir" message="No result.dir parameter given" />
<property name="conf" value="*(public)" />

<ivy:resolve log="download-only" conf="${conf}" />
<ivy:publish settingsref="ivysettings" conf="${conf}" resolver="build-temp" overwrite="true" forcedeliver="true">
<!-- <artifacts pattern="${result.dir}/[artifact]-[revision].[ext]"
/> -->
<artifacts pattern="${result.dir}/lib/[artifact]-[revision](-[classifier]).[ext]" />

</ivy:publish>
</target>

<target name="publish.to.local.maven">
<property name="conf" value="*(public)" />

<ivy:resolve log="download-only" conf="${conf}" />
<ivy:publish conf="${conf}" resolver="local-maven" overwrite="true">
</ivy:publish>
</target>

<!-- Checkstyle conf -->
<property name="cs.dir" location="${vaadin.basedir}/checkstyle" />
<property name="cs.xml" location="${cs.dir}/vaadin-checkstyle.xml" />

+ 0
- 31
ivysettings-publish.xml View File

@@ -1,31 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<ivysettings>
<!-- Customized stuff -->
<!-- <include url="ivysettings.xml"/> -->
<credentials host="oss.sonatype.org" realm="Sonatype Nexus Repository Manager"
username="${sonatype.username}" passwd="${sonatype.password}">
</credentials>
<signers>
<pgp name="gpg" password="${gpg.passphrase}" />
</signers>
<resolvers>
<!-- user="${publish.sftp.user}" host="${publish.sftp.host}" keyFile="${publish.sftp.keyfile}"
keyFilePassword="${publish.sftp.keyfilepassword}" -->
<sftp name="sftp-publish" keyFile="${publish.sftp.keyfile}">
<ivy pattern="${publish.sftp.ivy.pattern}" />
<artifact pattern="${publish.sftp.artifact.pattern}" />
</sftp>
<ibiblio name="sonatype" signer="gpg"
root="https://oss.sonatype.org/content/repositories/vaadin-snapshots/"
m2compatible="true" />

<filesystem name="build-temp">
<ivy
pattern="${ivy.settings.dir}/result/artifacts/[revision]/[module]/ivy-[revision].xml" />
<artifact
pattern="${ivy.settings.dir}/result/artifacts/[revision]/[module]/[artifact]-[revision](-[classifier]).[ext]" />
</filesystem>
</resolvers>


</ivysettings>

+ 0
- 6
ivysettings.xml View File

@@ -19,12 +19,6 @@
<ivy
pattern="${user.home}/.m2/repository/[organisation]/[module]/[revision]/[module]-[revision](-[classifier]).pom" />
</filesystem>
<filesystem name="build-temp">
<ivy
pattern="${ivy.settings.dir}/result/artifacts/[revision]/[module]/ivy-[revision].xml" />
<artifact
pattern="${ivy.settings.dir}/result/artifacts/[revision]/[module]/[artifact]-[revision](-[classifier]).[ext]" />
</filesystem>
</resolvers>
<modules>
<module organisation="com.vaadin" name="vaadin-testbench"

+ 0
- 4
publish.properties View File

@@ -1,4 +0,0 @@
publish.sftp.ivy.pattern=
publish.sftp.artifact.pattern=
maven.snapshot.repository.url=https://oss.sonatype.org/content/repositories/vaadin-snapshots
maven.snapshot.repository.id=vaadin-snapshots

+ 0
- 130
publish.xml View File

@@ -1,130 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="publish" basedir="." default="" xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:antcontrib="antlib:net.sf.antcontrib" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
<include file="common.xml" as="common" />
<include file="build.xml" as="vaadin" />

<!-- Dummy value as ivysettings-publish require a value -->
<property name="publish.sftp.keyfile" value="/dummy" />
<property name="publish.sftp.ivy.pattern" value="dummy" />

<ivy:settings file="ivysettings.xml" />
<ivy:settings file="ivysettings-publish.xml" id="publish.settings" />
<property file="publish.properties" />

<target name="nightly.publish" depends="nightly.download.publish, nightly.maven.publish">

</target>

<!-- Copies the nightly build artifacts to the download server. -->
<target name="nightly.tests.publish" if="nightly.tests.publish">
<property name="file.war" location="result/artifacts/${vaadin.version}/vaadin-uitest/vaadin-uitest-${version}.war" />
<property name="target" value="${nightly.tests.publish}/${vaadin.version.major}.${vaadin.version.minor}-${build.tag}.war" />

<fail unless="ant-jsch.present" message="Please install ant-jsch.jar into ANT_HOME/lib" />
<fail unless="jsch.present" message="Please install jsch.jar into ANT_HOME/lib" />

<echo>Installing ${src} to ${target}</echo>

<scp todir="${nightly.tests.publish}" file="${file.war}">
</scp>
</target>

<target name="nightly.download.publish">
<antcontrib:foreach list="${modules.to.publish.to.download}" target="publish.module.to.download.site" param="module" />
</target>

<target name="nightly.maven.publish">
<antcontrib:foreach list="${modules.to.publish.to.maven}" target="publish.module.to.maven" param="module" />
</target>

<target name="publish.module.to.download.site">
<fail unless="module" message="No module to publish defined" />
<ivy:resolve log="download-only" file="${module}/ivy.xml" />
<ivy:publish publishivy="false" settingsref="publish.settings" conf="*(public)" resolver="sftp-publish">
<artifacts pattern="${ivy.settings.dir}/result/artifacts/[revision]/[module]/[artifact]-[revision](-[classifier]).[ext]" />
</ivy:publish>
</target>

<target name="publish.module.to.maven">
<fail unless="module" message="No module to publish defined" />
<property file="${gpg.passphrase.file}" />

<!-- Ivy should be able to handle this but this does not work at
the moment <ivy:resolve log="download-only" file="${module}/ivy.xml" /> <ivy:publish pubrevision="7.0-SNAPSHOT"
publishivy="false" settingsref="publish.settings" conf="*(public)" resolver="sonatype">
<artifacts pattern="${ivy.settings.dir}/result/artifacts/${vaadin.version}/[module]/[artifact]-${vaadin.version}(-[classifier]).[ext]"
/> </ivy:publish> -->
<property name="jar.file" location="result/artifacts/${vaadin.version}/vaadin-${module}/vaadin-${module}-${vaadin.version}.jar" />
<property name="pom.file" location="result/artifacts/${vaadin.version}/vaadin-${module}/vaadin-${module}-${vaadin.version}.pom" />

<antcontrib:if>
<available file="${jar.file}"/>
<then>
<artifact:mvn failonerror="true">
<arg value="gpg:sign-and-deploy-file" />
<sysproperty key="file" value="${jar.file}" />
<sysproperty key="pomFile" value="${pom.file}" />
<sysproperty key="repositoryId" value="${maven.snapshot.repository.id}" />
<sysproperty key="url" value="${maven.snapshot.repository.url}" />
<sysproperty key="gpg.passphrase" value="${gpg.passphrase}" />
<sysproperty key="retryFailedDeploymentCount" value="10" />
</artifact:mvn>
</then>
<else>
<artifact:mvn failonerror="true">
<arg value="gpg:sign-and-deploy-file" />
<sysproperty key="file" value="${pom.file}" />
<sysproperty key="pomFile" value="${pom.file}" />
<sysproperty key="generatePom" value="false" />
<sysproperty key="packaging" value="pom" />
<sysproperty key="repositoryId" value="${maven.snapshot.repository.id}" />
<sysproperty key="url" value="${maven.snapshot.repository.url}" />
<sysproperty key="gpg.passphrase" value="${gpg.passphrase}" />
<sysproperty key="retryFailedDeploymentCount" value="10" />
</artifact:mvn>
</else>
</antcontrib:if>
</target>

<!-- Use this to publish to local Maven repo -->
<!-- If you have compiled a snapshot build with: -->
<!-- ant -Dvaadin.version=7.x.x.zzz package -->
<!-- Publish with: -->
<!-- ant -f publish.xml -Dvaadin.version=7.x.x.zzz local.maven.publish -->
<!-- Note that if the build is a snapshot build, it will be installed as -->
<!-- 7.x-SNAPSHOT. -->
<target name="local.maven.publish">
<antcontrib:foreach list="${modules.to.publish.to.maven}" target="publish.module.to.local.maven" param="module" />
</target>

<target name="publish.module.to.local.maven">
<fail unless="module" message="No module to publish defined" />

<property name="jar.file" location="result/artifacts/${vaadin.version}/vaadin-${module}/vaadin-${module}-${vaadin.version}.jar" />
<property name="javadoc.file" location="result/artifacts/${vaadin.version}/vaadin-${module}/vaadin-${module}-${vaadin.version}-javadoc.jar" />
<property name="sources.file" location="result/artifacts/${vaadin.version}/vaadin-${module}/vaadin-${module}-${vaadin.version}-sources.jar" />
<property name="pom.file" location="result/artifacts/${vaadin.version}/vaadin-${module}/vaadin-${module}-${vaadin.version}.pom" />

<antcontrib:if>
<available file="${jar.file}"/>
<then>
<artifact:mvn failonerror="true">
<arg value="install:install-file" />
<sysproperty key="file" value="${jar.file}" />
<sysproperty key="pomFile" value="${pom.file}" />
<sysproperty key="javadoc" value="${javadoc.file}" />
<sysproperty key="sources" value="${sources.file}" />
</artifact:mvn>
</then>
<else>
<artifact:mvn failonerror="true">
<arg value="install:install-file" />
<sysproperty key="file" value="${pom.file}" />
<sysproperty key="pomFile" value="${pom.file}" />
<sysproperty key="generatePom" value="false" />
<sysproperty key="packaging" value="pom" />
</artifact:mvn>
</else>
</antcontrib:if>
</target>
</project>

+ 1
- 195
uitest/build.xml View File

@@ -1,6 +1,6 @@
<?xml version="1.0"?>

<project name="vaadin-uitest" basedir="." default="publish-local"
<project name="vaadin-uitest" basedir="." default="compile"
xmlns:ivy="antlib:org.apache.ivy.ant">
<description>
Provides a uitest WAR containing Vaadin UI tests
@@ -59,104 +59,6 @@
</javac>
</target>

<target name="testing-widgetset" depends="dependencies,compile">
<property name="module"
value="com.vaadin.tests.widgetset.TestingWidgetSet" />
<property name="style" value="OBF" />
<property name="localWorkers" value="6" />
<property name="extraParams" value="" />
<property name="module.output.dir" location="${result.dir}/VAADIN/widgetsets" />
<property name="work.dir" location="${result.dir}/work" />

<mkdir dir="${module.output.dir}" />

<echo>Compiling ${module} to ${module.output.dir}</echo>

<!-- compile the module -->
<java classname="com.google.gwt.dev.Compiler" classpathref="classpath.compile.dependencies"
failonerror="yes" fork="yes" maxmemory="512m">
<classpath location="src" />
<classpath location="${classes}" />
<arg value="-workDir" />
<arg value="${work.dir}" />
<arg value="-logLevel" />
<arg value="TRACE" />
<arg value="-war" />
<arg value="${module.output.dir}" />
<arg value="-style" />
<arg value="${style}" />

<arg value="-localWorkers" />
<arg value="${localWorkers}" />
<arg value="-strict" />
<arg line="${extraParams}" />
<arg value="${module}" />

<sysproperty key="vFailIfNotSerializable" value="true" />

<jvmarg value="-Xss8M" />
<jvmarg value="-XX:MaxPermSize=256M" />
<jvmarg value="-Djava.awt.headless=true" />
</java>

</target>

<target name="war"
depends="dependencies, compile, compile-test-themes, testing-widgetset">
<property name="result.dir" location="result" />
<property name="classes" location="${result.dir}/classes" />
<property name="WebContent.dir" location="${vaadin.basedir}/WebContent" />
<property name="deps.dir" location="${result.dir}/deps" />
<property name="src" location="${result.dir}/../src" />

<ivy:resolve log="download-only" resolveid="common"
conf="build" />
<ivy:cachepath pathid="classpath.runtime.dependencies"
conf="build" />

<delete dir="${deps.dir}" />
<mkdir dir="${deps.dir}" />

<copy todir="${deps.dir}" flatten="true">
<path refid="classpath.runtime.dependencies" />
</copy>

<delete>
<!-- Avoid including some potentially conflicting jars in the
war -->
<fileset dir="${deps.dir}" includes="jetty-*.jar" />
<fileset dir="${deps.dir}" includes="servlet-api-*.jar" />
</delete>

<war destfile="${result.war}" duplicate="fail" index="true">
<!-- <fileset dir="${common.jarfiles.dir}" /> -->
<fileset dir="${result.dir}">
<include name="VAADIN/widgetsets/**/*" />
<include name="VAADIN/themes/tests-valo*/**" />
</fileset>
<fileset dir="${WebContent.dir}">
<include name="statictestfiles/**" />
<include name="VAADIN/themes/tests-*/**" />
<!-- Scss themes compiled and included above -->
<exclude name="VAADIN/themes/tests-valo*/**" />
<include name="VAADIN/themes/reindeer-tests/**" />
<include name="VAADIN/jquery.atmosphere.js" />
<include name="WEB-INF/*.xml" />
<include name="WEB-INF/web.xml.2.4" />
</fileset>
<classes dir="${classes}" />
<classes dir="${src}" />
<lib dir="${deps.dir}" />
</war>

</target>

<target name="publish-local" depends="war">
<antcall target="common.publish-local">
<param name="conf" value="build" />
</antcall>
</target>

<target name="clean">
<antcall target="common.clean" />
</target>
@@ -247,101 +149,5 @@
</delete>
</target>

<target name="compile-test-themes">
<antcall target="compile-theme">
<param name="theme" value="tests-valo" />
</antcall>
<antcall target="compile-theme">
<param name="theme" value="tests-valo-dark" />
</antcall>
<antcall target="compile-theme">
<param name="theme" value="tests-valo-metro" />
</antcall>
<antcall target="compile-theme">
<param name="theme" value="tests-valo-flat" />
</antcall>
<antcall target="compile-theme">
<param name="theme" value="tests-valo-flatdark" />
</antcall>
<antcall target="compile-theme">
<param name="theme" value="tests-valo-facebook" />
</antcall>
<antcall target="compile-theme">
<param name="theme" value="tests-valo-blueprint" />
</antcall>
<antcall target="compile-theme">
<param name="theme" value="tests-valo-light" />
</antcall>
<antcall target="compile-theme">
<param name="theme" value="tests-valo-disabled-animations" />
</antcall>
<antcall target="compile-theme">
<param name="theme" value="tests-valo-no-font-awesome" />
</antcall>

</target>
<target name="compile-theme" depends="copy-theme">
<fail unless="theme"
message="You must give the theme name to compile in the 'theme' parameter" />

<ivy:resolve log="download-only" resolveid="common"
conf="compile-theme" />
<ivy:cachepath pathid="classpath.compile.theme"
conf="compile-theme" />
<ivy:cachepath pathid="classpath.runtime.theme"
conf="build" />

<echo>Compiling ${theme}</echo>
<mkdir dir="${theme.result.dir}" />

<!-- compile the theme -->
<java classname="com.vaadin.buildhelpers.CompileTheme"
classpathref="classpath.compile.theme" failonerror="yes"
fork="yes" maxmemory="512m">
<arg value="--theme" />
<arg value="${theme}" />
<arg value="--theme-folder" />
<arg value="${theme.result.dir}" />
<arg value="--version" />
<arg value="${vaadin.version}" />
<jvmarg value="-Xss8M" />
<jvmarg value="-XX:MaxPermSize=256M" />
<jvmarg value="-Djava.awt.headless=true" />
</java>

</target>

<target name="copy-theme">
<fail unless="theme"
message="You must give the theme name to copy n the 'theme' parameter" />
<property name="theme.source.dir" location="../themes/src/main/resources/VAADIN/themes" />
<property name="webcontent.source.dir" location="../WebContent/VAADIN/themes" />

<copy todir="${theme.result.dir}">
<fileset dir="${theme.source.dir}">
<include name="${theme}/**/*.scss" />
</fileset>
<filterset refid="filter-vaadin.version" />
</copy>
<copy todir="${theme.result.dir}">
<fileset dir="${theme.source.dir}">
<exclude name="${theme}/**/*.scss" />
</fileset>
</copy>
<copy todir="${theme.result.dir}">
<fileset dir="${webcontent.source.dir}">
<include name="${theme}/**/*.scss" />
</fileset>
<filterset refid="filter-vaadin.version" />
</copy>
<copy todir="${theme.result.dir}">
<fileset dir="${webcontent.source.dir}">
<exclude name="${theme}/**/*.scss" />
</fileset>
</copy>

</target>


</project>

+ 0
- 9
uitest/ivy.xml View File

@@ -15,11 +15,7 @@
<conf name="build-provided" visibility="private" />
<conf name="ide" visibility="private" />
<conf name="jetty-run" visibility="private" />
<conf name="compile-theme" visibility="private" />
</configurations>
<publications>
<artifact type="war" ext="war" />
</publications>
<dependencies defaultconf="build" defaultconfmapping="build,ide->default">
<!-- API DEPENDENCIES -->
<dependency org="javax.portlet" name="portlet-api"
@@ -114,11 +110,6 @@
<dependency org="commons-lang" name="commons-lang"
rev="2.6" conf="build,ide -> default" />

<dependency org="com.vaadin" name="vaadin-sass-compiler"
rev="${vaadin.sass.version}" conf="compile-theme->default" />

<dependency org="com.vaadin" name="vaadin-buildhelpers"
rev="${vaadin.version}" conf="compile-theme->default" />
<dependency org="org.eclipse.jgit" name="org.eclipse.jgit"
rev="3.5.1.201410131835-r" conf="ide,build->default">
<exclude org="org.apache.httpcomponents"></exclude>

Write Preview
Loading…
Cancel
Save