Hello Dave!
I have now committed a build.xml at the top that defers everything to
src/argouml-build/build.xml except the creation of the build directory. With
that I think the package target (in src/argouml-build/build.xml) can be
removed. How do you feel about this Dave?
I also think that we should try to remove most of the argo.*.dir properties
that we manage and replace them with hard-coded relative paths pointing
within the project and to the other source projects. This would go for all
trunk/src/*/build.xml. argo.root.dir would mostly be replace by "..".
It is just when pointing out the tools that this magic is still needed. In
the Eclipse layout it will be ../argouml-tools and in the Repository layout
it will be ../../../tools.
The remaining problem is that the location of the result of the static
checks (checkstyle, classycle, javasrc, jdepend, pmd, javadoc) is not really
in place. My reasoning is that when working with the Eclipse layout most of
the tools and reports are not interesting since it is run from tools in the
Eclipse environment and presented in the Eclipse GUI instead. The reports
are only created by the nightly build, hudsonci, and other integration build
set-ups, or when some developer wants to generate them. That is the reason I
have not bothered that much with them when doing the first restructuring.
/Linus
Dave wrote:
> Hi Linus,
>
> I've made a change to move the build dir to <workspace>/../build.
>
> This works for me and is in the attached patch.
>
> I've not committed it because I'm not sure if the discussion has reached
> a conclusion yet.
>
> It also changes basedir=".." to basedir="." which you requested
> previously. As I made these changes, I saw lots of bits of junk
> littered around, so a cleanup is definitely necessary. The main thing
> for now is to get it all working again for 0.26.
>
> Regards,
>
> Dave
>
> On Wed, 30 Apr 2008 16:36:40 +0200, "Linus Tolke" <[EMAIL PROTECTED]>
> said:
> > Another thing to consider is perhaps the role of the
> > /trunk/src/argouml-build/build.xml. The reason for moving it lower is to
> > allow it to be checked out on the same level as the Eclipse
> > projects/subsystems. This is to be able to run the targets that builds
> > every
> > subsystem and runs the tests in every subsystem.
> >
> > The target that copies everything from each subsystem to whatever export
> > directory is not applicable. Perhaps we should split that file and move
> > the
> > copying to /trunk/build.xml to make the argouml project work just like
> > the
> > other projects for the non-Eclipse checkout. The build.xml will then
> > contain
> > more or less:
> > build each subsystem
> > copy the result of the builds to build.
> > It could also contain a run-all-tests target to increase the similarity
> > with
> > the build.xml files of the other Tigris projects. I will make an attempt
> > at
> > creating the /trunk/build.xml.
> >
> > /Linus
> >
> >
> > 2008/4/30, Dave Thompson <[EMAIL PROTECTED]>:
> > >
> > > Ok, I will try to make the change tonight, if you've not already done
> so
> > > by then.
> > >
> > > Dave
> > >
> > > On Wed, 30 Apr 2008 07:31:59 +0200, "Linus Tolke" <[EMAIL PROTECTED]>
> > > said:
> > > > None of the subprojects knows anything about the outside of their
> > > > project.
> > > > They all create their result in <workspace>/project/build and
> > > > <workspace>/project/build-eclipse.
> > > >
> > > > The file that pulls everything together (previously
> > > /trunk/src/build.xml,
> > > > now /trunk/src/argouml-build/build.xml) does however. We could also
> look
> > > > at
> > > > this from the perspective that in the Eclipse build it is unorthodox
> to
> > > > checkout the argouml-build directory and use that in the build. For
> that
> > > > reason it could be acceptable to create the <workspace>/../build
> > > > directory
> > > > then.
> > > >
> > > > Unless you fix this, Dave, I will fix it for the release 0.25.5 to
> avoid
> > > > having to change the 10 or more other Tigris projects that relies on
> > > > having
> > > > the files in argouml/build to be built. After the 0.26 release we
> could
> > > > revisit this again.
> > > >
> > > > /Linus
> > > >
> > > >
> > > > 2008/4/29, Dave Thompson <[EMAIL PROTECTED]>:
> > > > >
> > > > > Hi Linus,
> > > > >
> > > > > On an Eclipse build, if you were to create the build/ directory at
> the
> > > > > old location, it would have to be ../../build/ relative to
> > > > > argouml-build/. That would put it outside of the Eclipse
> workspace
> > > > > directory, which I assumed we would not want to do. If anyone
> were to
> > > > > check-out two workspaces alongside eachother, they would overwrite
> > > > > eachother's build dirs, because ../../build/ would be in the same
> > > place
> > > > > for both workspaces.
> > > > >
> > > > > However, I now see that this change has more implications that I
> > > > > thought, so if we're happy to accept the above, then I've no
> problem
> > > in
> > > > > going back.
> > > > >
> > > > > We have a couple of other alternatives:
> > > > > 1) Add some more magic to choose the build/ location depending on
> > > > > whether eclipse or command-line Ant initiated the build.
> > > > > 2) Add something in trunk/src/build.<sh|bat> to move build/ to
> > > ../build/
> > > > > after the build has completed.
> > > > >
> > > > > Neither of these are particularly appealing, unfortunately, I
> can't
> > > see
> > > > > a nice solution to this.
> > > > >
> > > > > Dave
> > > > >
> > > > > On Tue, 29 Apr 2008 06:15:58 +0200, "Linus Tolke" <
> [EMAIL PROTECTED]>
> > > > > said:
> > > > > > Hello Dave!
> > > > > >
> > > > > > I meant to write "build package".
> > > > > >
> > > > > > Are you saying that it is not used in the Eclipse layout and it
> was
> > > > > moved
> > > > > > because of problems it caused in the Eclipse layout? In that
> case I
> > > > > think
> > > > > > the argument is pretty weak and I would prefer to move it back
> (to
> > > avoid
> > > > > > changing the other tigris projects).
> > > > > >
> > > > > > Looking at it from another perspective, the exported jars from
> each
> > > > > > tigris
> > > > > > project that other tigris projects depends on are in
> > > > > <project-name>/build
> > > > > > (which would correspond to trunk/build in each repository). We
> are
> > > now
> > > > > > discussing if one of the projects should make this differently
> (i.e.
> > > use
> > > > > > <project-name>/src/build).
> > > > > >
> > > > > > /Linus
> > > > > >
> > > > > >
> > > > > > 2008/4/28, Dave Thompson <[EMAIL PROTECTED]>:
> > > > > > >
> > > > > > > Hi Linus,
> > > > > > >
> > > > > > > I'm not sure which package you are refering to.
> > > > > > >
> > > > > > > The build/ directory is where all the compiled jars go when
> the
> > > > > check-out
> > > > > > > is built on the command line. It is in the same relative
> location
> > > to
> > > > > the
> > > > > > > other directories whether the command line build was launched
> from
> > > an
> > > > > > > Eclipse or SVN checkout. It should not be used or created by
> a
> > > build
> > > > > > > launched from Eclipse.
> > > > > > >
> > > > > > > Dave
> > > > > > >
> > > > > > > Linus Tolke wrote:
> > > > > > >
> > > > > > > > Hello Dave!
> > > > > > > > What is the purpose of this package in the Eclipse layout?
> > > > > Shouldn't
> > > > > > > > the PDE handle this? Is it for running the argouml-cpp test
> > > cases
> > > > > from the
> > > > > > > > command line?
> > > > > > > > /Linus
> > > > > > > >
> > > > > > > > 2008/4/28, Dave Thompson <[EMAIL PROTECTED] <mailto:
> > > > > [EMAIL PROTECTED]
> > > > > > > > >>:
> > > > > > > >
> > > > > > > > Hi Linus,
> > > > > > > >
> > > > > > > > The plan was for all of the generated code to go in
> > > > > trunk/src/build.
> > > > > > > > Sorry if this wasn't clear.
> > > > > > > >
> > > > > > > > Compiling to trunk/build would create the build dir on an
> > > Eclipse
> > > > > > > > check-out alongside the Eclipse workspace dir rather than
> > > within
> > > > > it,
> > > > > > > > i.e.
> > > > > > > >
> > > > > > > > EclipseWorkspace1/argouml-app
> > > > > > > > EclipseWorkspace1/argouml-build
> > > > > > > > EclipseWorkspace1/...
> > > > > > > > EclipseWorkspace1/argouml-core-tools
> > > > > > > > build/ (*.jar in here)
> > > > > > > >
> > > > > > > > I think this might cause problems for people who keep
> > > multiple
> > > > > > > > eclipse
> > > > > > > > workspaces in the same directory. This was the only
> reason,
> > > so
> > > > > if
> > > > > > > > you
> > > > > > > > can see a better way, please let me know.
> > > > > > > >
> > > > > > > > Dave
> > > > > > > >
> > > > > > > >
> > > > > > > > On Sun, 27 Apr 2008 08:17:35 +0200, "Linus Tolke" <
> > > > > [EMAIL PROTECTED]
> > > > > > > > <mailto:[EMAIL PROTECTED]>>
> > > > > > > > said:
> > > > > > > > > Hello again Dave!
> > > > > > > > >
> > > > > > > > > I just noticed that the main integration directory
> (build
> > > > > > > > package) was
> > > > > > > > > moved
> > > > > > > > > from argouml/build to argouml/src/build (and
> > > > > > > > argouml/documentation/build
> > > > > > > > > respectively).
> > > > > > > > >
> > > > > > > > > Was this intentional? That move is not mentioned here.
> > > > > > > > >
> > > > > > > > > If so, we need to go through the other projects and
> update
> > > > > their
> > > > > > > > > dependencies and where they place their jar file. I
> just
> > > want
> > > > > to
> > > > > > > > check
> > > > > > > > > before I start updating the projects.
> > > > > > > > >
> > > > > > > > > /Linus
> > > > > > > > >
> > > > > > > > > 2008/4/20, Dave Thompson <[EMAIL PROTECTED]
> > > > > > > > <mailto:[EMAIL PROTECTED]>>:
> > > > > > > > > >
> > > > > > > > > > Hi All,
> > > > > > > > > >
> > > > > > > > > > ~~~~
> > > > > > > > > > Flag day morning is a bright and cheerful
> > > morning. Children
> > > > > > > > play in a
> > > > > > > > > > green meadow, as the warm radiant sun beams down. A
> > > yellow
> > > > > > > > butterfly
> > > > > > > > > > flutters up from the daisies in a burst of
> excitement,
> > > while
> > > > > the
> > > > > > > > > > childrens' mother smiles, as she carries a tray of
> > > freshly
> > > > > made
> > > > > > > > ginger
> > > > > > > > > > ale across the lush grass. The patriotic sound of
> > > trumpets
> > > > > > > > fills the
> > > > > > > > > > air as a large flag is hoisted up a newly painted
> > > pole...
> > > > > > > > > > ~~~~
> > > > > > > > > >
> > > > > > > > > > Ok, back to the point. The SVN repository has been
> > > > > > > > restructured. You
> > > > > > > > > > can resume your work. The main changes you will see
> > > are:
> > > > > > > > > >
> > > > > > > > > > trunk/src/app -> trunk/src/argouml-app
> > > > > > > > > > trunk/src/infra -> trunk/src/argouml-infra
> > > > > > > > > > trunk/src/model -> trunk/src/argouml-model
> > > > > > > > > > trunk/src/model-euml ->
> trunk/src/argouml-model-euml
> > > > > > > > > > trunk/src/model-mdr ->
> trunk/src/argouml-model-mdr
> > > > > > > > > >
> > > > > > > > > > This is to harmonise the directory names in working
> > > copies
> > > > > that
> > > > > > > > have
> > > > > > > > > > been checked out either through SVN or through
> Eclipse
> > > .psf
> > > > > > > > files (see
> > > > > > > > > > issue 4625). They are now the same. I've also
> modified
> > > a
> > > > > few
> > > > > > > > (i.e.
> > > > > > > > > > most) of the build.<xml|sh|bat> files to make it all
> > > > > > > > work. Most things
> > > > > > > > > > are now working again, including the documentation
> > > build.
> > > > > > > > > >
> > > > > > > > > > Getting back up and running
> > > > > > > > > > ---------------------------
> > > > > > > > > > Eclipse Users:
> > > > > > > > > > You will need to remove any of the above projects
> from
> > > your
> > > > > > > > workspace,
> > > > > > > > > > and re-import the new argouml-core-projectset.psf
> file
> > > found
> > > > > at
> > > > > > > > > > http://argouml.tigris.org/psf/. Your working copy
> will
> > > look
> > > > > > > > pretty
> > > > > > > > > > similar to before. If you take this opportunity to
> > > start a
> > > > > > > > fresh
> > > > > > > > > > workspace, make sure you set it up with the right
> > > options.
> > > > > (I
> > > > > > > > found that
> > > > > > > > > > I had to set Window > Preferences > Java > Installed
> > > JREs to
> > > > > > > > 1.5.0xx
> > > > > > > > > > before argouml would build). If you get build
> errors,
> > > > > select
> > > > > > > > all
> > > > > > > > > > projects, do a refresh, clean and rebuild.
> > > > > > > > > >
> > > > > > > > > > SVN Users:
> > > > > > > > > > Please delete your working copies, and re check-out
> from
> > > > > either:
> > > > > > > > > >
> http://argouml.tigris.org/svn/argouml/trunk/(everything)<http://argouml.tigris.org/svn/argouml/trunk/%28everything%29>
> > > > > > > > > > or
> > > > > > > > > >
> > > > > > > > > >
> http://argouml.tigris.org/svn/argouml/trunk/src/(argouml<http://argouml.tigris.org/svn/argouml/trunk/src/%28argouml>
> > > > > src
> > > > > > > > only)
> > > > > > > > > > and
> > > > > > > > > >
> http://argouml.tigris.org/svn/argouml/trunk/tools/(argouml<http://argouml.tigris.org/svn/argouml/trunk/tools/%28argouml>
> > > > > > > > tools)
> > > > > > > > > >
> > > > > > > > > > New Stuff
> > > > > > > > > > ---------
> > > > > > > > > > Eclipse users can now perform a command line build
> if
> > > they
> > > > > > > > import the
> > > > > > > > > > argouml-command-line-build-projectset.psf file. The
> new
> > > > > project
> > > > > > > > > > 'argouml-build' performs no function in Eclipse, it
> > > simply
> > > > > > > > checks out
> > > > > > > > > > the right files to allow you to do a build from a
> > > command
> > > > > > > > prompt:
> > > > > > > > > >
> > > > > > > > > > c:\workspace\argouml-build> set
> > > > > > > > JAVA_HOME=c:\progra~1\Java\jdkXXXXX
> > > > > > > > > > c:\workspace\argouml-build> build run
> > > > > > > > > >
> > > > > > > > > > or
> > > > > > > > > >
> > > > > > > > > > [/home/me/workspace/argouml-build ]$ export
> > > JAVA_HOME=/x/y/z
> > > > > > > > > > [/home/me/workspace/argouml-build ]$ ./build.sh run
> > > > > > > > > >
> > > > > > > > > > Outstanding Tasks
> > > > > > > > > > -----------------
> > > > > > > > > > Here's what's left outstanding, anyone else can pick
> > > these
> > > > > up
> > > > > > > > if they
> > > > > > > > > > want to, before I get to them:
> > > > > > > > > > * The JUnit tests ('build tests') seem to run ok,
> but
> > > the
> > > > > report
> > > > > > > > > > generation fails.
> > > > > > > > > > * Check the nightly build. If it was already
> working,
> > > have
> > > > > > > > surely
> > > > > > > > > > broken it now.
> > > > > > > > > > * Check the ability to work with external modules in
> > > both
> > > > > > > > Eclipse an on
> > > > > > > > > > the command line.
> > > > > > > > > >
> > > > > > > > > > Regards,
> > > > > > > > > >
> > > > > > > > > > Dave
> > > > > > > > > >
> > > > > > > > > >
> > > > > > >
> > > > >
> > > >
> ---------------------------------------------------------------------
> > > > > > > > > > To unsubscribe, e-mail:
> > > [EMAIL PROTECTED]
> > > > > > > > <mailto:[EMAIL PROTECTED]>
> > > > > > > > > > For additional commands, e-mail:
> > > [EMAIL PROTECTED]
> > > > > > > > <mailto:[EMAIL PROTECTED]>
> > > > > > > > > >
> > > > > > > > > >
> > > > > > > >
> > > > > > >
> > > > >
> > > >
> ---------------------------------------------------------------------
> > > > > > > > To unsubscribe, e-mail:
> [EMAIL PROTECTED]
> > > > > > > > <mailto:[EMAIL PROTECTED]>
> > > > > > > > For additional commands, e-mail:
> [EMAIL PROTECTED]
> > > > > > > > <mailto:[EMAIL PROTECTED]>
> > > > > > > >
> > > > > > > >
> > > > > > > >
> > > > > > >
> > > ---------------------------------------------------------------------
> > > > > > > To unsubscribe, e-mail: [EMAIL PROTECTED]
> > > > > > > For additional commands, e-mail: [EMAIL PROTECTED]
> > > > > > >
> > > > > > >
> > > > >
> > > > >
> ---------------------------------------------------------------------
> > > > > To unsubscribe, e-mail: [EMAIL PROTECTED]
> > > > > For additional commands, e-mail: [EMAIL PROTECTED]
> > > > >
> > > > >
> > >
> > > ---------------------------------------------------------------------
> > > To unsubscribe, e-mail: [EMAIL PROTECTED]
> > > For additional commands, e-mail: [EMAIL PROTECTED]
> > >
> > >
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: [EMAIL PROTECTED]
> For additional commands, e-mail: [EMAIL PROTECTED]
>
