[Yanel-commits] rev 44911 - in public/yanel/trunk: src/build
src/build/targets src/neutron tools
guillaume at wyona.com
guillaume at wyona.com
Tue Sep 29 15:25:46 CEST 2009
Author: guillaume
Date: 2009-09-29 15:25:46 +0200 (Tue, 29 Sep 2009)
New Revision: 44911
Added:
public/yanel/trunk/src/neutron/pom.xml
Removed:
public/yanel/trunk/src/build/pom-neutron.xml
Modified:
public/yanel/trunk/src/build/build.xml
public/yanel/trunk/src/build/targets/build-artifacts.build.xml
public/yanel/trunk/tools/
Log:
Now using Yanel-independant scripts to build Neutron's Maven artifact.
Issue: 4963
Modified: public/yanel/trunk/src/build/build.xml
===================================================================
--- public/yanel/trunk/src/build/build.xml 2009-09-29 12:26:14 UTC (rev 44910)
+++ public/yanel/trunk/src/build/build.xml 2009-09-29 13:25:46 UTC (rev 44911)
@@ -2,6 +2,7 @@
<project name="yanel-main" default="deploy"
xmlns:yanel="http://www.wyona.org/yanel/1.0"
+ xmlns:wyona-tools="http://www.wyona.org/tools/1.0"
xmlns:svnant="antlib:org.tigris.subversion.svnant"
>
@@ -148,7 +149,7 @@
</target>
<target name="install-neutron-jar" description="Install Neutron implementation JAR" depends="compile-neutron-classes">
- <yanel:install-wyona-jar id="neutron"/>
+ <wyona-tools:install-jar source-home="${yanel.source.home}" version="${yanel.source.version}" id="neutron"/>
</target>
<target name="compile-neutron" depends="compile-neutron-classes, install-neutron-jar">
Deleted: public/yanel/trunk/src/build/pom-neutron.xml
===================================================================
--- public/yanel/trunk/src/build/pom-neutron.xml 2009-09-29 12:26:14 UTC (rev 44910)
+++ public/yanel/trunk/src/build/pom-neutron.xml 2009-09-29 13:25:46 UTC (rev 44911)
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-
-<project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>wyona-org-neutron</groupId>
- <artifactId>wyona-neutron</artifactId>
- <version>@VERSION@</version>
-
-<!--
- <dependencies>
- <dependency>
- <groupId>wyona-org-yanel</groupId>
- <artifactId>yanel-core</artifactId>
- <version>@VERSION@</version>
- </dependency>
- </dependencies>
--->
-</project>
-
Modified: public/yanel/trunk/src/build/targets/build-artifacts.build.xml
===================================================================
--- public/yanel/trunk/src/build/targets/build-artifacts.build.xml 2009-09-29 12:26:14 UTC (rev 44910)
+++ public/yanel/trunk/src/build/targets/build-artifacts.build.xml 2009-09-29 13:25:46 UTC (rev 44911)
@@ -2,7 +2,10 @@
xmlns:artifact="antlib:org.apache.maven.artifact.ant"
>
+ <import file="${yanel.source.home}/tools/apache-ant_extras/artifacts.build.xml"/>
+
<!-- Install a Yanel JAR: core, impl, webapp, cmdl, etc. -->
+ <!--TODO REFACTORME using macros of generic script above: -->
<macrodef name="install-jar" uri="http://www.wyona.org/yanel/1.0">
<attribute name="id"/>
<attribute name="package-dir" default="@{id}"/>
@@ -42,44 +45,4 @@
</sequential>
</macrodef>
- <!-- Install Neutron JAR -->
- <macrodef name="install-wyona-jar" uri="http://www.wyona.org/yanel/1.0">
- <attribute name="id"/>
- <attribute name="package-dir" default="@{id}"/>
- <attribute name="classes-dir" default="${classes.dir}"/>
- <attribute name="sources-dir" default="${yanel.source.home}/src/@{package-dir}/java"/>
- <element name="jar-elements" optional="true" implicit="true"/>
- <sequential>
-
- <mkdir dir="${yanel.source.home}/build/lib"/>
- <jar destfile="${yanel.source.home}/build/lib/wyona-@{id}-${yanel.source.version}.jar"
- basedir="@{classes-dir}"
- includes="org/wyona/@{package-dir}/**"
- >
- <jar-elements/>
- </jar>
-
- <copy file="${yanel.source.home}/src/build/pom-@{id}.xml" todir="${yanel.source.home}/build/lib"/>
- <replace file="${yanel.source.home}/build/lib/pom-@{id}.xml" value="${yanel.source.version}">
- <replacetoken>@VERSION@</replacetoken>
- </replace>
-
- <mkdir dir="${yanel.source.home}/build/lib"/>
- <jar destfile="${yanel.source.home}/build/lib/wyona-@{id}-${yanel.source.version}-sources.jar"
- basedir="@{sources-dir}"
- includes="org/wyona/@{package-dir}/**"
- >
- <jar-elements/>
- </jar>
-
- <artifact:pom id="@{id}.project" file="${yanel.source.home}/build/lib/pom-@{id}.xml"/>
-
- <artifact:install file="${yanel.source.home}/build/lib/wyona-@{id}-${yanel.source.version}.jar">
- <pom refid="@{id}.project"/>
- <attach file="${yanel.source.home}/build/lib/wyona-@{id}-${yanel.source.version}-sources.jar" classifier="sources"/>
- </artifact:install>
-
- </sequential>
- </macrodef>
-
</project>
Copied: public/yanel/trunk/src/neutron/pom.xml (from rev 44809, public/yanel/trunk/src/build/pom-neutron.xml)
===================================================================
--- public/yanel/trunk/src/neutron/pom.xml (rev 0)
+++ public/yanel/trunk/src/neutron/pom.xml 2009-09-29 13:25:46 UTC (rev 44911)
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>wyona-org-neutron</groupId>
+ <artifactId>wyona-neutron</artifactId>
+ <version>@VERSION@</version>
+
+<!--
+ <dependencies>
+ <dependency>
+ <groupId>wyona-org-yanel</groupId>
+ <artifactId>yanel-core</artifactId>
+ <version>@VERSION@</version>
+ </dependency>
+ </dependencies>
+-->
+</project>
+
Property changes on: public/yanel/trunk/src/neutron/pom.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Property changes on: public/yanel/trunk/tools
___________________________________________________________________
Name: svn:externals
- apache-ant -r42276 http://svn.wyona.com/repos/public/0_tools/apache-ant-1.7.1
apache-ant_extras -r42238 http://svn.wyona.com/repos/public/0_tools/apache-ant-1.7.1_extras
eclipse.settings http://svn.wyona.com/repos/public/0_tools/eclipse-3.settings
+ apache-ant -r42265 http://svn.wyona.com/repos/public/0_tools/apache-ant-1.7.1
apache-ant_extras -r44910 http://svn.wyona.com/repos/public/0_tools/apache-ant-1.7.1_extras
eclipse.settings http://svn.wyona.com/repos/public/0_tools/eclipse-3.settings
More information about the Yanel-commits
mailing list