svn commit: r585267 - in /ofbiz/trunk/framework: base/build.xml build.xml

[doogie-3]

Author: doogie
Date: Tue Oct 16 14:31:21 2007
New Revision: 585267

URL: http://svn.apache.org/viewvc?rev=585267&view=rev
Log:
Update ofbiz.jar at the top-level whenever framework/base is built.
Also, clean said file at the same time.  Based on patch from
https://issues.apache.org/jira/browse/OFBIZ-1283.

Modified:
    ofbiz/trunk/framework/base/build.xml
    ofbiz/trunk/framework/build.xml

Modified: ofbiz/trunk/framework/base/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/build.xml?rev=585267&r1=585266&r2=585267&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/build.xml (original)
+++ ofbiz/trunk/framework/base/build.xml Tue Oct 16 14:31:21 2007
@@ -49,6 +49,7 @@
 
     <target name="clean" depends="clean-lib">
         <delete dir="${build.dir}"/>
+        <delete file="../../ofbiz.jar"/>
     </target>
 
     <target name="clean-lib" depends="init">
@@ -117,6 +118,10 @@
     
     <target name="jar" depends="classes">
         <jar jarfile="${build.dir}/lib/ofbiz.jar" basedir="${build.dir}/classes/start" manifest="${src.dir}/start/org/ofbiz/base/start/Start.mf"/>
+        <!-- copy the ofbiz.jar file -->
+        <copy todir="${basedir}/../..">
+            <fileset dir="${build.dir}/lib" includes="ofbiz.jar"/>
+        </copy>
         <jar jarfile="${build.dir}/lib/ofbiz-base.jar" basedir="${build.dir}/classes/base"/>        
     </target>    
     

Modified: ofbiz/trunk/framework/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/build.xml?rev=585267&r1=585266&r2=585267&view=diff
==============================================================================
--- ofbiz/trunk/framework/build.xml (original)
+++ ofbiz/trunk/framework/build.xml Tue Oct 16 14:31:21 2007
@@ -115,7 +115,6 @@
         <subant target="clean">
             <filelist refid="framework-builds"/>
         </subant>
-        <delete file="ofbiz.jar"/>
         <echo message="[clean] ========== Done Cleaning Framework =========="/>
     </target>
 
@@ -133,11 +132,6 @@
         <subant inheritall="false">
             <filelist refid="framework-builds"/>
         </subant>
-
-        <!-- copy the ofbiz.jar file -->
-        <copy todir="${basedir}/..">
-            <fileset dir="base/build/lib" includes="ofbiz.jar"/>
-        </copy>
         
         <echo message="[build] ========== Done Building Framework (Compile) =========="/>
     </target>

[David E Jones-2]

Not sure if I like this... My preference would be that each build  
file only owns its directory and below. This change makes a lower  
level build file manage something higher level.

What if the framework or base directories move, or we want more build  
flexibility?

I can see how if you build just the base component or just the  
framework directory that the ofbiz.jar file won't get updated. In a  
way that would be expected though...

If anyone else has an opinion on this please chime in. It's not a big  
deal, but is one of those things that could make life difficult in  
the future and just need to be changed back.

-David


On Oct 16, 2007, at 3:31 PM, [hidden email] wrote:

> Author: doogie
> Date: Tue Oct 16 14:31:21 2007
> New Revision: 585267
>
> URL: http://svn.apache.org/viewvc?rev=585267&view=rev
> Log:
> Update ofbiz.jar at the top-level whenever framework/base is built.
> Also, clean said file at the same time.  Based on patch from
> https://issues.apache.org/jira/browse/OFBIZ-1283.
>
> Modified:
>     ofbiz/trunk/framework/base/build.xml
>     ofbiz/trunk/framework/build.xml
>
> Modified: ofbiz/trunk/framework/base/build.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/ 
> build.xml?rev=585267&r1=585266&r2=585267&view=diff
> ======================================================================
> ========
> --- ofbiz/trunk/framework/base/build.xml (original)
> +++ ofbiz/trunk/framework/base/build.xml Tue Oct 16 14:31:21 2007
> @@ -49,6 +49,7 @@
>
>      <target name="clean" depends="clean-lib">
>          <delete dir="${build.dir}"/>
> +        <delete file="../../ofbiz.jar"/>
>      </target>
>
>      <target name="clean-lib" depends="init">
> @@ -117,6 +118,10 @@
>
>      <target name="jar" depends="classes">
>          <jar jarfile="${build.dir}/lib/ofbiz.jar" basedir="$
> {build.dir}/classes/start" manifest="${src.dir}/start/org/ofbiz/
> base/start/Start.mf"/>
> +        <!-- copy the ofbiz.jar file -->
> +        <copy todir="${basedir}/../..">
> +            <fileset dir="${build.dir}/lib" includes="ofbiz.jar"/>
> +        </copy>
>          <jar jarfile="${build.dir}/lib/ofbiz-base.jar" basedir="$
> {build.dir}/classes/base"/>
>      </target>
>
>
> Modified: ofbiz/trunk/framework/build.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/build.xml?
> rev=585267&r1=585266&r2=585267&view=diff
> ======================================================================
> ========
> --- ofbiz/trunk/framework/build.xml (original)
> +++ ofbiz/trunk/framework/build.xml Tue Oct 16 14:31:21 2007
> @@ -115,7 +115,6 @@
>          <subant target="clean">
>              <filelist refid="framework-builds"/>
>          </subant>
> -        <delete file="ofbiz.jar"/>
>          <echo message="[clean] ========== Done Cleaning Framework  
> =========="/>
>      </target>
>
> @@ -133,11 +132,6 @@
>          <subant inheritall="false">
>              <filelist refid="framework-builds"/>
>          </subant>
> -
> -        <!-- copy the ofbiz.jar file -->
> -        <copy todir="${basedir}/..">
> -            <fileset dir="base/build/lib" includes="ofbiz.jar"/>
> -        </copy>
>
>          <echo message="[build] ========== Done Building Framework  
> (Compile) =========="/>
>      </target>
>
>

[Adam Heath-2]

David E Jones wrote:

>
> Not sure if I like this... My preference would be that each build file
> only owns its directory and below. This change makes a lower level build
> file manage something higher level.
>
> What if the framework or base directories move, or we want more build
> flexibility?
>
> I can see how if you build just the base component or just the framework
> directory that the ofbiz.jar file won't get updated. In a way that would
> be expected though...
>
> If anyone else has an opinion on this please chime in. It's not a big
> deal, but is one of those things that could make life difficult in the
> future and just need to be changed back.

In that argument, framework/build.xml should not update it either, and
only the top-level.

The reason why I did this, is quite often I'd cd into framework/base,
and just run ant there.  Then I'd wonder why my changes hadn't taken
place, because the ofbiz.jar at the top-level hadn't been updated.

Maybe a better change would to not copy the file at all, and just modify
the startup to pull from framework/base.