[asterisk-scf-commits] asterisk-scf/release/slice.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  067d8f5af43b78921aad0a7218c84cbc84f4f4c1 (commit)
      from  51ea2042feb9c0732d20f43cd83b19e24d36e0ee (commit)

Summary of changes:
 build.xml |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)


- Log -----------------------------------------------------------------
commit 067d8f5af43b78921aad0a7218c84cbc84f4f4c1
Author: David M. Lee <dlee at digium.com>
Date:   Fri Feb 4 09:21:55 2011 -0600

    Display a more meaningful error when ICE_HOME is not set.

diff --git a/build.xml b/build.xml
index b2459bb..16add0c 100644
--- a/build.xml
+++ b/build.xml
@@ -13,8 +13,6 @@
 
     <include file="install-ice-jar.xml" as="ice"/>
 
-    <taskdef name="slice2java" classpath="${env.ICE_HOME}/lib/ant-ice.jar"
-             classname="Slice2JavaTask"/>
 
     <path id="maven-ant-tasks.classpath"
           path="lib/maven-ant-tasks-${mvn.version}.jar"/>
@@ -22,7 +20,12 @@
              uri="antlib:org.apache.maven.artifact.ant"
              classpathref="maven-ant-tasks.classpath"/>
 
-    <target name="generate-sources"
+    <target name="init" depends="ice.fail-if-no-ice-home">
+        <taskdef name="slice2java" classpath="${env.ICE_HOME}/lib/ant-ice.jar"
+                 classname="Slice2JavaTask"/>
+    </target>
+
+    <target name="generate-sources" depends="init"
             description="Generate .java files from .slice sources">
         <mkdir dir="${slice2java-dir}"/>
         <slice2java outputdir="${slice2java-dir}">

-----------------------------------------------------------------------


-- 
asterisk-scf/release/slice.git