Browse Source

Fix build scripts for BOM (#17025)

Change-Id: Ia59a2423d8e22e15a978dd73baf08b5fa6388ea6
tags/7.5.0.beta1
Henri Sara 9 years ago
parent
commit
b826bb17ee
3 changed files with 4 additions and 4 deletions
  1. 2
    2
      all/build.xml
  2. 0
    1
      all/ivy.xml
  3. 2
    1
      common.xml

+ 2
- 2
all/build.xml View File

</then> </then>
<else> <else>
<!-- Unpack all source files to javadoc.temp.dir --> <!-- Unpack all source files to javadoc.temp.dir -->
<antcontrib:foreach list="${modules.to.publish.to.maven}"
<antcontrib:foreach list="${modules.producing.jar}"
target="unzip.to.javadoctemp" param="module" /> target="unzip.to.javadoctemp" param="module" />


<property name="javadoc.dir" location="${result.dir}/javadoc" /> <property name="javadoc.dir" location="${result.dir}/javadoc" />


<target name="copy-jars"> <target name="copy-jars">
<delete dir="${temp.dir}" /> <delete dir="${temp.dir}" />
<antcontrib:foreach list="${modules.to.publish.to.maven}"
<antcontrib:foreach list="${modules.producing.jar}"
target="fetch.module.and.dependencies" param="module" /> target="fetch.module.and.dependencies" param="module" />
<!-- All jars are now in temp.dir. Still need to separate vaadin <!-- All jars are now in temp.dir. Still need to separate vaadin
and deps --> and deps -->

+ 0
- 1
all/ivy.xml View File

rev="${vaadin.version}" /> rev="${vaadin.version}" />
<dependency org="com.vaadin" name="vaadin-push" rev="${vaadin.version}" /> <dependency org="com.vaadin" name="vaadin-push" rev="${vaadin.version}" />
<dependency org="com.vaadin" name="vaadin-widgets" rev="${vaadin.version}" /> <dependency org="com.vaadin" name="vaadin-widgets" rev="${vaadin.version}" />
<dependency org="com.vaadin" name="vaadin-bom" rev="${vaadin.version}" />


</dependencies> </dependencies>



+ 2
- 1
common.xml View File

<property name="gwt.basedir" location="${vaadin.basedir}/../gwt" /> <property name="gwt.basedir" location="${vaadin.basedir}/../gwt" />
<property file="${vaadin.basedir}/build.properties" /> <property file="${vaadin.basedir}/build.properties" />


<property name="modules.to.publish.to.maven" value="shared,server,client,client-compiler,client-compiled,themes,push,widgets,bom" />
<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" /> <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" />

Loading…
Cancel
Save