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]
