[Yanel-commits] rev 44570 - in public/yanel/trunk/src: contributions/resources/lookup contributions/resources/xinha resources/tinymce

[guillaume at wyona.com]

Author: guillaume
Date: 2009-09-02 16:34:04 +0200 (Wed, 02 Sep 2009)
New Revision: 44570

Modified:
   public/yanel/trunk/src/contributions/resources/lookup/build.xml
   public/yanel/trunk/src/contributions/resources/xinha/build.xml
   public/yanel/trunk/src/resources/tinymce/build.xml
Log:
Now using Yanel's default build script which does the same and more, namely it supports building under Eclipse!

Issue: 7089
Issue: 6967


Modified: public/yanel/trunk/src/contributions/resources/lookup/build.xml
===================================================================
--- public/yanel/trunk/src/contributions/resources/lookup/build.xml	2009-09-02 14:23:50 UTC (rev 44569)
+++ public/yanel/trunk/src/contributions/resources/lookup/build.xml	2009-09-02 14:34:04 UTC (rev 44570)
@@ -1,56 +1,3 @@
-<?xml version="1.0"?>
-
-<project name="yanel-resource" default="compile">
-
-  <!-- For example set within build.sh ... -->
-  <property name="yanel.home" value="${yanel.source.home}"/>
-  <!-- See yanel.home ... -->
-  <property file="${user.home}/.ant-global.properties"/>
-  <echo>YANEL_HOME is set to: ${yanel.home}</echo>
-  <property file="${yanel.home}/src/build/local.build.properties"/>
-  <property file="${yanel.home}/src/build/build.properties"/>
-
-  <import file="src/build/dependencies.xml"/>
-
-  <target name="init" description="Initialize build" depends="dependencies">
-    <echo>Initialize build</echo>
-
-    <dirname property="resource.home.dir" file="${ant.file}"/>
-    <echo>Resource Home Directory: ${resource.home.dir}</echo>
-
-    <property file="${resource.home.dir}/src/build/local.build.properties"/>
-    <property file="${resource.home.dir}/src/build/build.properties"/>
-
-    <path id="classpath">
-      <pathelement path="${maven2.cp}"/>
-    </path>
-    <property name="resource.build.dir" value="${resource.home.dir}/build"/>
-    <property name="resource.classes.dir" value="${resource.build.dir}/classes"/>
-    <property name="resource.lib.dir" value="${resource.build.dir}/lib"/>
-    <property name="resource.java.dir" value="${resource.home.dir}/src/java"/>
-  </target>
-
-  <target name="compile" description="Compile Java classes" depends="init">
-
-    <mkdir dir="${resource.classes.dir}"/>
-    <javac srcdir="${resource.java.dir}" destdir="${resource.classes.dir}"
-      classpathref="classpath"
-      debug="true"
-    />
-    <mkdir dir="${resource.lib.dir}"/>
-    <jar destfile="${resource.lib.dir}/yanel-resource-${resource.name}-${resource.version}.jar"
-      basedir="${resource.classes.dir}"
-    />
-  </target>
-
-  <target name="clean" depends="init">
-    <delete dir="${resource.build.dir}"/>
-  </target>
-
-  <target name="copy-dependencies" depends="init">
-    <copy todir="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/lib">
-      <fileset refid="maven2.resource.fileset"/>
-      <mapper type="flatten"/>
-    </copy>
-  </target>
+<project name="Yanel-lookup-RT">
+  <import file="${yanel.source.home}/src/build/resource-types/resource-type.build.xml"/>
 </project>

Modified: public/yanel/trunk/src/contributions/resources/xinha/build.xml
===================================================================
--- public/yanel/trunk/src/contributions/resources/xinha/build.xml	2009-09-02 14:23:50 UTC (rev 44569)
+++ public/yanel/trunk/src/contributions/resources/xinha/build.xml	2009-09-02 14:34:04 UTC (rev 44570)
@@ -1,79 +1,3 @@
-<?xml version="1.0"?>
-
-<project name="yanel-resource" default="compile">
-
-  <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-
-  <property name="yanel.home" value="${yanel.source.home}"/>
-  <property file="${user.home}/.ant-global.properties"/>
-  <echo>YANEL_HOME is set to: ${yanel.home}</echo>
-
-  <property file="${yanel.home}/src/build/local.build.properties"/>
-  <property file="${yanel.home}/src/build/build.properties"/>
-  
-  <import file="src/build/dependencies.xml"/>
-
-  <target name="init" description="Initialize build" depends="dependencies">
-    <echo>Initialize build</echo>
-
-    <dirname property="resource.home.dir" file="${ant.file}"/>
-    <echo>Resource Home Directory: ${resource.home.dir}</echo>
-
-    <property file="${resource.home.dir}/src/build/local.build.properties"/>
-    <property file="${resource.home.dir}/src/build/build.properties"/>
-
-    <path id="classpath">
-      <pathelement path="${maven2.cp}"/>
-      <pathelement path="${maven2.resource.cp}"/>
-    </path>
-    <property name="resource.build.dir" value="${resource.home.dir}/build"/>
-    <property name="resource.classes.dir" value="${resource.build.dir}/classes"/>
-    <property name="resource.lib.dir" value="${resource.build.dir}/lib"/>
-    <property name="resource.java.dir" value="${resource.home.dir}/src/java"/>
-    <property name="resource.resource.xml" value="${resource.home.dir}/resource.xml"/>
-    <xmlproperty prefix="resource.resource.xml" file="${resource.resource.xml}"/>
-  </target>
-
-  <target name="compile" description="Compile Java classes" depends="init">
-
-    <mkdir dir="${resource.classes.dir}"/>
-    <javac srcdir="${resource.java.dir}" destdir="${resource.classes.dir}"
-      classpathref="classpath"
-      debug="true"
-    />
-    
-    <propertyregex property="new.resource.java.classname.fs.path"
-             input="${resource.resource.xml.resource(class)}"
-             regexp="[.]"
-             replace="/"
-             global="true"
-             casesensitive="false" />
-             <echo>${new.resource.java.classname.fs.path}</echo>
-    <propertyregex property="new.resource.java.class.fs.path"
-             input="${new.resource.java.classname.fs.path}"
-             regexp="\/[^/]*$"
-             replace=""
-             global="true"
-             casesensitive="false" />
-             <echo>${resource.classes.dir}/${new.resource.java.class.fs.path}</echo>
-    <copy todir="${resource.classes.dir}/${new.resource.java.class.fs.path}">
-      <fileset dir="${resource.home.dir}" includes="resource**,htdocs/**,yanel-htdocs/**"/>
-    </copy>             
-    <mkdir dir="${resource.lib.dir}"/>
-    <jar destfile="${resource.lib.dir}/yanel-resource-${resource.name}-${resource.version}.jar"
-      basedir="${resource.classes.dir}">
-      <fileset dir="${resource.classes.dir}"/>
-    </jar>
-  </target>
-
-  <target name="clean" depends="init">
-    <delete dir="${resource.build.dir}"/>
-  </target>
-
-  <target name="copy-dependencies" depends="init">
-    <copy todir="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/lib">
-      <fileset refid="maven2.resource.fileset"/>
-      <mapper type="flatten"/>
-    </copy>
-  </target>
+<project name="Yanel-Xinha-RT">
+  <import file="${yanel.source.home}/src/build/resource-types/resource-type.build.xml"/>
 </project>

Modified: public/yanel/trunk/src/resources/tinymce/build.xml
===================================================================
--- public/yanel/trunk/src/resources/tinymce/build.xml	2009-09-02 14:23:50 UTC (rev 44569)
+++ public/yanel/trunk/src/resources/tinymce/build.xml	2009-09-02 14:34:04 UTC (rev 44570)
@@ -1,80 +1,3 @@
-<?xml version="1.0"?>
-
-<project name="yanel-resource" default="compile">
-
-  <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-
-  <property name="yanel.home" value="${yanel.source.home}"/>
-  <property file="${user.home}/.ant-global.properties"/>
-  <echo>YANEL_HOME is set to: ${yanel.home}</echo>
-
-  <property file="${yanel.home}/src/build/local.build.properties"/>
-  <property file="${yanel.home}/src/build/build.properties"/>
-  
-  <import file="src/build/dependencies.xml"/>
-
-  <target name="init" description="Initialize build" depends="dependencies">
-    <echo>Initialize build</echo>
-
-    <dirname property="resource.home.dir" file="${ant.file}"/>
-    <echo>Resource Home Directory: ${resource.home.dir}</echo>
-
-    <property file="${resource.home.dir}/src/build/local.build.properties"/>
-    <property file="${resource.home.dir}/src/build/build.properties"/>
-
-    <path id="classpath">
-      <pathelement path="${maven2.cp}"/>
-      <pathelement path="${maven2.resource.cp}"/>
-    </path>
-    <property name="resource.build.dir" value="${resource.home.dir}/build"/>
-    <property name="resource.classes.dir" value="${resource.build.dir}/classes"/>
-    <property name="resource.lib.dir" value="${resource.build.dir}/lib"/>
-    <property name="resource.java.dir" value="${resource.home.dir}/src/java"/>
-    <property name="resource.resource.xml" value="${resource.home.dir}/resource.xml"/>
-    <xmlproperty prefix="resource.resource.xml" file="${resource.resource.xml}"/>
-    
-  </target>
-
-  <target name="compile" description="Compile Java classes" depends="init">
-
-    <mkdir dir="${resource.classes.dir}"/>
-    <javac srcdir="${resource.java.dir}" destdir="${resource.classes.dir}"
-      classpathref="classpath"
-      debug="true"
-    />
-    
-    <propertyregex property="new.resource.java.classname.fs.path"
-             input="${resource.resource.xml.resource(class)}"
-             regexp="[.]"
-             replace="/"
-             global="true"
-             casesensitive="false" />
-             <echo>${new.resource.java.classname.fs.path}</echo>
-    <propertyregex property="new.resource.java.class.fs.path"
-             input="${new.resource.java.classname.fs.path}"
-             regexp="\/[^/]*$"
-             replace=""
-             global="true"
-             casesensitive="false" />
-             <echo>hilfes${resource.classes.dir}/${new.resource.java.class.fs.path}</echo>
-    <copy todir="${resource.classes.dir}/${new.resource.java.class.fs.path}">
-      <fileset dir="${resource.home.dir}" includes="resource**,htdocs/**,yanel-htdocs/**"/>
-    </copy>             
-    <mkdir dir="${resource.lib.dir}"/>
-    <jar destfile="${resource.lib.dir}/yanel-resource-${resource.name}-${resource.version}.jar"
-      basedir="${resource.classes.dir}">
-      <fileset dir="${resource.classes.dir}"/>
-    </jar>
-  </target>
-
-  <target name="clean" depends="init">
-    <delete dir="${resource.build.dir}"/>
-  </target>
-
-  <target name="copy-dependencies" depends="init">
-    <copy todir="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/lib">
-      <fileset refid="maven2.resource.fileset"/>
-      <mapper type="flatten"/>
-    </copy>
-  </target>
+<project name="Yanel-TinyMCE-RT">
+  <import file="${yanel.source.home}/src/build/resource-types/resource-type.build.xml"/>
 </project>