Hello all!
On second thought, this was probably not such a good idea. I now think that
we should work to eventually remove the argo.root.dir directory.
The problem that you are addressing, Luis, is probably that to build the
other tigris projects, they have historically relied on having a whole set
of jars in ../argouml/build. This still works in the Repository layout if
the argouml/build.xml file is called that copies from
argouml/src/argouml-build/build to argouml/build. This does not, however
work in the Eclipse layout and since we try to allow the build.xml to work
also in the Eclipse layout this gets complicated. The only solution I can
think of is to have the argouml-build/build.xml create and copy all files to
../argouml/build instead of build. That would allow the other tigris
projects to assume that everything is in ../argouml/build both in the
Eclipse layout and in the Repository layout. I don't like the solution very
much though. It is more appealing to have it within argouml-build.
Furthermore the argo.tools.dir must be handled in some way. It should point
to ../argouml/tools or ../argouml-core-tools depending on the repository
layout.
Note that I am trying to get rid of most of the properties specifying
directories and instead use relative paths. I think that will simplify
things a lot.
/Linus
2008/5/6, Linus Tolke <[EMAIL PROTECTED]>:
>
> Great Luis!
>
> I think we need to define where argo.root.dir will point in the different
> layouts.
>
> I have now added to the Cookbook the suggestion that argo.root.dir points
> ot
> <checkout>/argouml in the Repository layout and
> <ws> in the Eclipse layout
>
> /Linus
>
>
> 2008/5/6, Luis Sergio Oliveira <[EMAIL PROTECTED]>:
> >
> > Luis Sergio Oliveira wrote:
> >
> > > Linus Tolke wrote:
> > >
> > > > Hello all!
> > > > The problem with the other jar files is probably that they are
> > > > simply not build because of errors cause by the changes to the
> > > > structure. I
> > > > am grateful that you pitch in and fix this (I saw some fixed when
> > > > updating).
> > > > I also noticed that the build directory that the subprojects rely
> > > > on in the Repository layout, was not created because the resulting build
> > > > directory was moved. We will resolve that before I proceed.
> > > > /Linus
> > > >
> > > Hello Linus,
> > >
> > > I made some corrections to the following module's build files:
> > > * argouml-classfile
> > > * argouml-csharp
> > > * argouml-idl
> > > * argouml-php
> > > * argouml-python
> > > * argouml-ruby
> > >
> > > These have some of the problems that the C++ build file had after the
> > > repository restructuring, and I may apply some of the same medicine,
> > > which I
> > > hope will work with SVN style checkout and eclipse style checkout...
> > >
> > > Improved version, which really works in both structures:
> > Index: argouml-classfile/build.xml
> > ===================================================================
> > --- argouml-classfile/build.xml (revision 109)
> > +++ argouml-classfile/build.xml (working copy)
> > @@ -18,15 +18,31 @@
> > <!-- Load ArgoUML properties -->
> > <!-- we really need an absolute path for argo.root.dir -->
> > <!-- if it is set in a property file before now, it must be absolute
> > -->
> > - <property name="argo.root.dir" value="${basedir}/../argouml" />
> > + <condition property="argo.root.dir"
> > + value="${basedir}/../argouml"
> > + else="${basedir}/..">
> > + <available file="${basedir}/../argouml"/>
> > + </condition>
> > <!-- Read the override file to get base paths for default.properties
> > correct for when running this from the Eclipse setup. -->
> > <property file="${override.build.properties}"/>
> >
> > + <condition property="argo.src.dir"
> > + value="${argo.root.dir}/src"
> > + else="${argo.root.dir}">
> > + <available file="${argo.root.dir}/src"/>
> > + </condition>
> > + <condition property="argo.build.dir"
> > + value="${argo.src.dir}/argouml-build/build"
> > + else="${argo.root.dir}/build">
> > + <available file="${argo.root.dir}/src"/>
> > + </condition>
> > + <property name="argo.app.dir" value="${argo.src.dir}/argouml-app"/>
> > +
> > <!-- If not set by the override file we still need this one for
> > antlr. -->
> > - <property name="argo.src.dir"
> > value="${argo.root.dir}/src/app/src"/>
> > + <property name="argo.app.src.dir" value="${argo.app.dir}/src"/>
> >
> > - <property file="${argo.src.dir}/default.properties"/>
> > + <property file="${argo.app.src.dir}/default.properties"/>
> >
> >
> > I'll commit this mess tomorrow night in the above projects and in
> > argouml-cpp unless someone complains. It guaranties working command line
> > build in both checkout structures, although I'm with a strong opinion of
> > making the build files work only for compile, install and similar targets in
> > the SVN command line checkout structure.
> >
> > Regards,
> >
> > Luis
> >
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: [EMAIL PROTECTED]
> > For additional commands, e-mail: [EMAIL PROTECTED]
> >
> >
>
