[Yanel-commits] rev 41906 - in public/yanel/trunk: .
src/build/resource-types src/resources/xml
guillaume at wyona.com
guillaume at wyona.com
Thu Mar 12 09:27:40 CET 2009
Author: guillaume
Date: 2009-03-12 09:27:39 +0100 (Thu, 12 Mar 2009)
New Revision: 41906
Modified:
public/yanel/trunk/src/build/resource-types/resource-type.build.xml
public/yanel/trunk/src/resources/xml/build.xml
public/yanel/trunk/yanel.sh
Log:
Removed obsolete $HOME/.ant-global.properties support,
with better traces for `build -f ...`.
Also removed duplicate Ant code for build the XML resource-type.
This also gives us for free:
- `build -f ...` support
- copying of classpath standard resource files (resource*.xml, yanel-htdocs/**, htdocs/**) into the delivered JAR.
Issue: 6898
Modified: public/yanel/trunk/src/build/resource-types/resource-type.build.xml
===================================================================
--- public/yanel/trunk/src/build/resource-types/resource-type.build.xml 2009-03-11 22:56:31 UTC (rev 41905)
+++ public/yanel/trunk/src/build/resource-types/resource-type.build.xml 2009-03-12 08:27:39 UTC (rev 41906)
@@ -12,19 +12,12 @@
<!-- 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="${resource.home.dir}/src/build/dependencies.xml"/>
<target name="init" description="Initialize build" depends="dependencies">
- <echo>Initialize build</echo>
-
- <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"/>
Modified: public/yanel/trunk/src/resources/xml/build.xml
===================================================================
--- public/yanel/trunk/src/resources/xml/build.xml 2009-03-11 22:56:31 UTC (rev 41905)
+++ public/yanel/trunk/src/resources/xml/build.xml 2009-03-12 08:27:39 UTC (rev 41906)
@@ -1,67 +1,3 @@
-<?xml version="1.0"?>
-
-<project name="yanel-resource" default="compile">
-<!--
-<project name="yanel-resource" default="install-jar">
--->
-
- <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>
-
- <target name="install-jar" description="Place jar file for this resource into local maven repository" depends="init, clean, compile" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
- <copy file="src/build/pom.xml" tofile="build/lib/pom.xml"/>
-
- <replace file="build/lib/pom.xml" value="${resource.version}">
- <replacetoken>@VERSION@</replacetoken>
- </replace>
- <replace file="build/lib/pom.xml" value="${resource.name}">
- <replacetoken>@NAME@</replacetoken>
- </replace>
-
- <artifact:pom id="maven.project.core" file="build/lib/pom.xml"/>
- <artifact:install file="build/lib/yanel-resource-${resource.name}-${resource.version}.jar">
- <pom refid="maven.project.core"/>
- </artifact:install>
- </target>
+<project name="yanel-xml-resource">
+ <import file="${yanel.source.home}/src/build/resource-types/resource-type.build.xml"/>
</project>
Modified: public/yanel/trunk/yanel.sh
===================================================================
--- public/yanel/trunk/yanel.sh 2009-03-11 22:56:31 UTC (rev 41905)
+++ public/yanel/trunk/yanel.sh 2009-03-12 08:27:39 UTC (rev 41906)
@@ -59,21 +59,14 @@
echo "INFO: Building Yanel..."
shift
-# ----- Check for .ant-global.properties
-if [ -f $HOME/.ant-global.properties ];then
- echo "INFO: $HOME/.ant-global.properties exists!"
-else
- echo ""
- echo "WARNING: No $HOME/.ant-global.properties file exists! Setting property 'yanel.home' within .ant-global.properties is optional, but makes development of individual resources and realms much more efficiently!"
- #echo "Press enter/return to continue ..."
- #read answer
- echo ""
-fi
-
# One might want to use the option "-f" for building resources, e.g. "./yanel.sh build -f src/resources/xml/build.xml" instead having to build everything
-#FIXME: this very example seems not to work anymore because properties are initialized too late in the Ant build file (e.g. Maven URL to fetch dependancies), YMMV...
if [ "$1" = "-f" ];then
$OUR_ANT -f $2 $3 -Dyanel.source.home=$SCRIPT_DIR
+ error=$?
+ if [ $error -ne 0 ];then
+ echo "WARN: Some resource-types may not yet support the '-f' option, please refer to bug 6898 for how to implement it."
+ exit $error
+ fi
exit 0
fi
# Build everything by default
More information about the Yanel-commits
mailing list