You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by do...@apache.org on 2008/10/31 17:51:44 UTC

svn commit: r709472 - in /ofbiz/trunk/specialpurpose: ldap/build.xml webpos/build.xml

Author: doogie
Date: Fri Oct 31 09:51:44 2008
New Revision: 709472

URL: http://svn.apache.org/viewvc?rev=709472&view=rev
Log:
Make these like all the other build xmls.

Modified:
    ofbiz/trunk/specialpurpose/ldap/build.xml
    ofbiz/trunk/specialpurpose/webpos/build.xml

Modified: ofbiz/trunk/specialpurpose/ldap/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ldap/build.xml?rev=709472&r1=709471&r2=709472&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ldap/build.xml (original)
+++ ofbiz/trunk/specialpurpose/ldap/build.xml Fri Oct 31 09:51:44 2008
@@ -19,89 +19,46 @@
 -->
 
 <project name="OFBiz - LDAP Component" default="jar" basedir=".">
+    <import file="../../common.xml"/>
 
     <!-- ================================================================== -->
     <!-- Initialization of all property settings                            -->
     <!-- ================================================================== -->
 
-    <target name="init">
-        <property environment="env"/>
-        <property name="desc" value="LDAP Component"/>
-        <property name="name" value="ofbiz-ldap"/>
-        <property name="ofbiz.home.dir" value="../.."/>
-        <property name="src.dir" value="src"/>
-        <property name="dtd.dir" value="dtd"/>
-        <property name="lib.dir" value="lib"/>
-        <property name="build.dir" value="build"/>
-    </target>
-
-    <target name="classpath">
-        <path id="local.class.path">
-            <fileset dir="${lib.dir}" includes="*.jar"/>
-            <fileset dir="../../framework/base/lib" includes="*.jar"/>
-            <fileset dir="../../framework/base/lib/commons" includes="*.jar"/>
-            <fileset dir="../../framework/base/lib/j2eespecs" includes="*.jar"/>
-            <fileset dir="../../framework/base/build/lib" includes="*.jar"/>
-            <fileset dir="../../framework/entity/lib" includes="*.jar"/>
-            <fileset dir="../../framework/entity/build/lib" includes="*.jar"/>
-            <fileset dir="../../framework/security/build/lib" includes="*.jar"/>
-            <fileset dir="../../framework/service/lib" includes="*.jar"/>
-            <fileset dir="../../framework/service/build/lib" includes="*.jar"/>
-            <fileset dir="../../framework/minilang/build/lib" includes="*.jar"/>
-            <fileset dir="../../framework/widget/build/lib" includes="*.jar"/>
-            <fileset dir="../../framework/webapp/lib" includes="*.jar"/>
-            <fileset dir="../../framework/webapp/build/lib" includes="*.jar"/>
-            <fileset dir="../../framework/common/build/lib" includes="*.jar"/>
-        </path>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- Removes all created files and directories                          -->
-    <!-- ================================================================== -->
-
-    <target name="clean" depends="clean-lib">
-        <delete dir="${build.dir}"/>
-    </target>
-
-    <target name="clean-lib" depends="init">
-        <delete dir="${build.dir}/lib"/>
-    </target>
+    <property name="desc" value="LDAP Component"/>
+    <property name="name" value="ofbiz-ldap"/>
 
-    <!-- ================================================================== -->
-    <!-- Makes sure the needed directory structure is in place              -->
-    <!-- ================================================================== -->
-
-    <target name="prepare" depends="clean-lib">
-        <mkdir dir="${build.dir}/classes"/>
-        <mkdir dir="${build.dir}/lib"/>
-    </target>
-
-    <target name="prepare-docs" depends="init">
-        <mkdir dir="${build.dir}/javadocs"/>
-    </target>
+    <path id="local.class.path">
+        <fileset dir="${lib.dir}" includes="*.jar"/>
+        <fileset dir="../../framework/base/lib" includes="*.jar"/>
+        <fileset dir="../../framework/base/lib/commons" includes="*.jar"/>
+        <fileset dir="../../framework/base/lib/j2eespecs" includes="*.jar"/>
+        <fileset dir="../../framework/base/build/lib" includes="*.jar"/>
+        <fileset dir="../../framework/entity/lib" includes="*.jar"/>
+        <fileset dir="../../framework/entity/build/lib" includes="*.jar"/>
+        <fileset dir="../../framework/security/build/lib" includes="*.jar"/>
+        <fileset dir="../../framework/service/lib" includes="*.jar"/>
+        <fileset dir="../../framework/service/build/lib" includes="*.jar"/>
+        <fileset dir="../../framework/minilang/build/lib" includes="*.jar"/>
+        <fileset dir="../../framework/widget/build/lib" includes="*.jar"/>
+        <fileset dir="../../framework/webapp/lib" includes="*.jar"/>
+        <fileset dir="../../framework/webapp/build/lib" includes="*.jar"/>
+        <fileset dir="../../framework/common/build/lib" includes="*.jar"/>
+    </path>
 
     <!-- ================================================================== -->
     <!-- Compilation of the source files                                                                                                                         -->
     <!-- ================================================================== -->
 
-    <target name="classes" depends="prepare,classpath">
-        <javac debug="on" source="1.5" deprecation="on" destdir="${build.dir}/classes">
-            <classpath>
-                <path refid="local.class.path"/>
-            </classpath>
-            <src path="${src.dir}"/>
-        </javac>
-    </target>
-
-    <target name="jar" depends="classes">
-        <jar jarfile="${build.dir}/lib/${name}.jar" basedir="${build.dir}/classes"/>
+    <target name="classes" depends="prepare">
+        <javac15/>
     </target>
 
     <!-- ================================================================== -->
     <!-- Build JavaDoc                                                      -->
     <!-- ================================================================== -->
 
-    <target name="docs" depends="prepare-docs,classpath">
+    <target name="docs" depends="prepare-docs">
         <javadoc packagenames="org.ofbiz.*"
                  classpathref="local.class.path"
                  destdir="${build.dir}/javadocs"
@@ -109,7 +66,4 @@
             <sourcepath path="${src.dir}"/>
         </javadoc>
     </target>
-
-    <target name="all" depends="jar,docs"/>
-
 </project>

Modified: ofbiz/trunk/specialpurpose/webpos/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/build.xml?rev=709472&r1=709471&r2=709472&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/build.xml (original)
+++ ofbiz/trunk/specialpurpose/webpos/build.xml Fri Oct 31 09:51:44 2008
@@ -19,102 +19,49 @@
 -->
 
 <project name="OFBiz - Web Pos Component" default="jar" basedir=".">
+    <import file="../../common.xml"/>
 
     <!-- ================================================================== -->
     <!-- Initialization of all property settings                            -->
     <!-- ================================================================== -->
 
-    <target name="init">
-        <property environment="env"/>
-        <property name="desc" value="Web Pos Component"/>
-        <property name="name" value="ofbiz-webpos"/>
-        <property name="ofbiz.home.dir" value="../.."/>
-        <property name="src.dir" value="src"/>
-        <property name="dtd.dir" value="dtd"/>
-        <property name="lib.dir" value="lib"/>
-        <property name="build.dir" value="build"/>
-    </target>
-
-    <target name="classpath">
-        <path id="local.class.path">
-            <fileset dir="../../framework/base/lib" includes="*.jar"/>
-            <fileset dir="../../framework/base/lib/j2eespecs" includes="*.jar"/>
-            <fileset dir="../../framework/base/build/lib" includes="*.jar"/>
-            <fileset dir="../../framework/entity/lib" includes="*.jar"/>
-            <fileset dir="../../framework/entity/build/lib" includes="*.jar"/>
-            <fileset dir="../../framework/security/build/lib" includes="*.jar"/>
-            <fileset dir="../../framework/service/lib" includes="*.jar"/>
-            <fileset dir="../../framework/service/build/lib" includes="*.jar"/>
-            <fileset dir="../../framework/minilang/build/lib" includes="*.jar"/>
-            <fileset dir="../../framework/common/build/lib" includes="*.jar"/>
-            <fileset dir="../../framework/webapp/build/lib" includes="*.jar"/>
-            <fileset dir="../../specialpurpose/pos/build/lib" includes="*.jar"/> <!-- to be removed -->
-            <fileset dir="../../applications/party/build/lib" includes="*.jar"/>
-            <fileset dir="../../applications/product/build/lib" includes="*.jar"/>
-            <fileset dir="../../applications/marketing/build/lib" includes="*.jar"/>
-            <fileset dir="../../applications/order/build/lib" includes="*.jar"/>
-            <fileset dir="../../applications/accounting/build/lib" includes="*.jar"/>
-            <fileset dir="../../applications/securityext/build/lib" includes="*.jar"/>
-        </path>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- Removes all created files and directories                          -->
-    <!-- ================================================================== -->
+    <property name="desc" value="Web Pos Component"/>
+    <property name="name" value="ofbiz-webpos"/>
 
-    <target name="clean" depends="clean-lib">
-        <delete dir="${build.dir}"/>
-    </target>
-
-    <target name="clean-lib" depends="init">
-        <delete dir="${build.dir}/lib"/>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- Makes sure the needed directory structure is in place              -->
-    <!-- ================================================================== -->
-
-    <target name="prepare" depends="clean-lib">
-        <mkdir dir="${build.dir}/classes"/>
-        <mkdir dir="${build.dir}/lib"/>
-    </target>
-
-    <target name="prepare-docs" depends="init">
-        <mkdir dir="${build.dir}/javadocs"/>
-    </target>
+    <path id="local.class.path">
+        <fileset dir="../../framework/base/lib" includes="*.jar"/>
+        <fileset dir="../../framework/base/lib/j2eespecs" includes="*.jar"/>
+        <fileset dir="../../framework/base/build/lib" includes="*.jar"/>
+        <fileset dir="../../framework/entity/lib" includes="*.jar"/>
+        <fileset dir="../../framework/entity/build/lib" includes="*.jar"/>
+        <fileset dir="../../framework/security/build/lib" includes="*.jar"/>
+        <fileset dir="../../framework/service/lib" includes="*.jar"/>
+        <fileset dir="../../framework/service/build/lib" includes="*.jar"/>
+        <fileset dir="../../framework/minilang/build/lib" includes="*.jar"/>
+        <fileset dir="../../framework/common/build/lib" includes="*.jar"/>
+        <fileset dir="../../framework/webapp/build/lib" includes="*.jar"/>
+        <fileset dir="../../specialpurpose/pos/build/lib" includes="*.jar"/> <!-- to be removed -->
+        <fileset dir="../../applications/party/build/lib" includes="*.jar"/>
+        <fileset dir="../../applications/product/build/lib" includes="*.jar"/>
+        <fileset dir="../../applications/marketing/build/lib" includes="*.jar"/>
+        <fileset dir="../../applications/order/build/lib" includes="*.jar"/>
+        <fileset dir="../../applications/accounting/build/lib" includes="*.jar"/>
+        <fileset dir="../../applications/securityext/build/lib" includes="*.jar"/>
+    </path>
 
     <!-- ================================================================== -->
     <!-- Compilation of the source files                                                                                                                         -->
     <!-- ================================================================== -->
 
-    <target name="classes" depends="prepare,classpath">
-      <javac debug="on" source="1.5" deprecation="on" destdir="${build.dir}/classes">
-            <classpath>
-                <path refid="local.class.path"/>
-            </classpath>
-            <src path="${src.dir}"/>
-        </javac>
-        <!-- also put the DTDs in the jar file... -->
-        <copy todir="${build.dir}/classes">
-            <!--<fileset dir="${dtd.dir}" includes="*.dtd"/>-->
-            <fileset dir="${src.dir}" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.groovy,**/*.logic,**/*.js,**/*.jacl,**/*.py"/>
-        </copy>
-        
-        <!-- now add the NOTICE and LICENSE files to allow the jar file to be distributed alone -->
-        <copy todir="${build.dir}/classes/META-INF">
-            <fileset dir="${ofbiz.home.dir}" includes="NOTICE,LICENSE"/>
-        </copy>
-    </target>
-
-    <target name="jar" depends="classes">
-        <jar jarfile="${build.dir}/lib/${name}.jar" basedir="${build.dir}/classes"/>
+    <target name="classes" depends="prepare">
+        <javac15/>
     </target>
 
     <!-- ================================================================== -->
     <!-- Build JavaDoc                                                      -->
     <!-- ================================================================== -->
 
-    <target name="docs" depends="prepare-docs,classpath">
+    <target name="docs" depends="prepare-docs">
         <javadoc packagenames="org.ofbiz.webpos.*"
                  classpathref="local.class.path"
                  destdir="${build.dir}/javadocs"
@@ -122,6 +69,4 @@
             <sourcepath path="${src.dir}"/>
         </javadoc>
     </target>
-
-    <target name="all" depends="jar,docs"/>
 </project>