Make extension script a little more friendly. It will fail and print an error when...

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@1705 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/custom/extension-build.xml b/custom/extension-build.xml
index 2f9ba37..4c9bbce 100644 (file)
--- a/custom/extension-build.xml
+++ b/custom/extension-build.xml
@@ -53,31 +53,40 @@
 
     <!-- Initialize everything we need. -->
     <!-- The properties loaded here are scoped to this particular extension build -->
-    <target name="ext-build-init" description="Sets up everything to prepare for the build">
-        <echo message="Loading build property files" />
-        <!-- 
-          Load extension specific properties if available. We can not set the extension's build.properties 
-          file name in the extension-build.properties file because if we read that file first the extension 
-          build properties won't be able to override properties in it as properties are immutable once set.
-        -->
-        <if>
-               <not>
-                       <available file="${ext.root}/build.properties"/>
-               </not>
-            <then>
-                <fail message="No build.properties file found for extension in ${ext.root}; this file is required."/>
-            </then>
-        </if>
-        <property file="${ext.root}/build.properties" />
-
-        <!-- Load default properties -->
-        <echo message="Loading build property defaults ${exts.dir}/default-build.properties" />
-        <property file="${exts.dir}/extension-build.properties" />
-
-        <!-- Create needed directories -->
-        <mkdir dir="${ext.dist}" />
-        <mkdir dir="${ext.classes}" />
-    </target>
+       <target name="ext-build-init" description="Sets up everything to prepare for the build">
+               <echo message="Loading build property files" />
+               <!-- 
+               Load extension specific properties if available. We can not set the extension's build.properties 
+               file name in the extension-build.properties file because if we read that file first the extension 
+               build properties won't be able to override properties in it as properties are immutable once set.
+               -->
+               <if>
+                       <not>
+                               <available file="${ext.root}/build.properties"/>
+                       </not>
+                       <then>
+                               <fail message="No build.properties file found for extension in ${ext.root}; this file is required."/>
+                       </then>
+               </if>
+               <property file="${ext.root}/build.properties" />
+
+               <!-- Load default properties -->
+               <echo message="Loading build property defaults ${exts.dir}/default-build.properties" />
+               <property file="${exts.dir}/extension-build.properties" />
+
+               <if>
+                       <not>
+                               <isset property="ext.name" />
+                       </not>
+                       <then>
+                               <fail message="The extension ${ext.root} does not contain the required (ext.name) property in its build.properties file."/>
+                       </then>
+               </if>
+
+               <!-- Create needed directories -->
+               <mkdir dir="${ext.dist}" />
+               <mkdir dir="${ext.classes}" />
+       </target>
 
     <!-- Compiles the extension -->
     <target name="ext-compile" description="Compiles an extension">
@@ -216,4 +225,4 @@
         </for>
     </target>
 
-</project>
\ No newline at end of file
+</project>