Re: [general] More SVN restructuring thoughts... (was Re: Ant build | IOException)
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. Is this kind of working tree manipulation easy to automate as ant scripts? -- Thorbjørn - Terms of use : http://incubator.apache.org/harmony/mailing.html To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [general] More SVN restructuring thoughts... (was Re: Ant build | IOException)
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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: [general] More SVN restructuring thoughts... (was Re: Ant build | IOException)
On 6/8/06, Oliver Deakin [EMAIL PROTECTED] wrote: Would /classlib and /drlvm be checked out in your local workspace as peers to /trunk or would they be checked out under /trunk/classlib etc. and linked to the right bit of SVN from there? i.e. if you wanted to make local changes to classlib, say, and be able to incorporate them into your global build under /trunk, but also generate patches against the code in svn under /classlib/trunk for submission, where would the code you are making changes to be checked out to in the above diagram? (my knowledge of svn switch is somewhat slim...) 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? -garrett - Terms of use : http://incubator.apache.org/harmony/mailing.html To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [general] More SVN restructuring thoughts... (was Re: Ant build | IOException)
That's great, thanks Garrett. Sound like a very sensible, simple way to approach global builds. Regards, Oliver Garrett Rooney wrote: On 6/8/06, Oliver Deakin [EMAIL PROTECTED] wrote: Would /classlib and /drlvm be checked out in your local workspace as peers to /trunk or would they be checked out under /trunk/classlib etc. and linked to the right bit of SVN from there? i.e. if you wanted to make local changes to classlib, say, and be able to incorporate them into your global build under /trunk, but also generate patches against the code in svn under /classlib/trunk for submission, where would the code you are making changes to be checked out to in the above diagram? (my knowledge of svn switch is somewhat slim...) 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? -garrett - Terms of use : http://incubator.apache.org/harmony/mailing.html To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] -- Oliver Deakin IBM United Kingdom Limited - Terms of use : http://incubator.apache.org/harmony/mailing.html To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
