harmony-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Salikh Zakirov <Salikh.Zaki...@Intel.com>
Subject Re: [general] More SVN restructuring thoughts... (was Re: Ant build | IOException)
Date Wed, 05 Jul 2006 10:28:01 GMT
Thorbjørn Ravn Andersen wrote:
> Garrett Rooney skrev  den 08-06-2006 16:04:
>> The basic idea is that you initially check out a copy of trunk that
>> has a few empty directories in it.  Then, svn switch says "hey, this
>> directory in my working copy that used to point to
>> $HARMONY/trunk/classpath (which is empty) should now point to
>> $HARMONY/classpath/trunk".  It'll then essentially check out the
>> contents of $HARMONY/classpath/trunk into your working copy's
>> classpath directory.  At that point you can do things like run an
>> update or a diff at the top level of your working copy and it'll
>> nicely recurse into the switched subdirectories.  If you make changes
>> in those subdirectories there and commit them they'll be committed to
>> the $HARMONY/classpath/trunk directory in the repository (or wherever
>> you had that subdirectory switched to).  Does that make sense?
> 
> The current version of dlrvm has hard wired paths so this is currently
> not easy to do.  

I am not sure what you mean by "hard wired" paths, but it perfectly
can be built from either of

    classlib
    +trunk
    drlvm
    +trunk

or

    trunk
    +classlib
    +drlvm 

directory structure. In the latter case, the 'build.bat' (build.sh for linux)
command line should be changed to

    build.bat -Dexternal.dep.CLASSLIB=../../../classlib

So I would not say that paths are "hard wired". The patch is overridable from command line.
Moreover, configuration can be made universal in a straightforward way:

--- a/build/make/build.xml
+++ b/build/make/build.xml
@@ -60,7 +60,12 @@ Version: $Revision: 1.16.2.20 $
     <target name="extern_dep">
 
         <!-- set the path root for the classlib : must be relative to the build directory
-->
-        <property name="external.dep.CLASSLIB" value="../../../../classlib/trunk" />
+        <available type="dir" property="external.dep.CLASSLIB" 
+                 file="../../../../classlib/trunk" 
+                 value="../../../../classlib/trunk" />
+        <available type="dir" property="external.dep.CLASSLIB" 
+                 file="../../../classlib" 
+                 value="../../../classlib" />
 
         <!-- some derived values -->
         <property name="external.dep.CLASSLIB.includes" value="${external.dep.CLASSLIB}/deploy/include"
/>



---------------------------------------------------------------------
Terms of use : http://incubator.apache.org/harmony/mailing.html
To unsubscribe, e-mail: harmony-dev-unsubscribe@incubator.apache.org
For additional commands, e-mail: harmony-dev-help@incubator.apache.org


Mime
View raw message