svn commit: r17342 - trunk/src/argouml-core-model-euml/build.xml

Author: andreas
Date: 2009-09-22 08:00:17-0700
New Revision: 17342

Modified:
   trunk/src/argouml-core-model-euml/build.xml

Log:
Added new euml2 jar version and some copy commands for jars.


Modified: trunk/src/argouml-core-model-euml/build.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-euml/build.xml?view=diff&pathrev=17342&r1=17341&r2=17342
==============================================================================
--- trunk/src/argouml-core-model-euml/build.xml	(original)
+++ trunk/src/argouml-core-model-euml/build.xml	2009-09-22 08:00:17-0700
@@ -20,7 +20,7 @@
 
     <!-- argo.root.dir should be passed in to make sure it is correct -->
     <property name="argo.root.dir" location="../.."/>
-    <property name="argo.build.dir" value="${argo.root.dir}/build"/>
+    <property name="argo.build.dir" value="${argo.root.dir}/src/argouml-build/build"/>
 
     <property name="build.dir" location="build"/>
     <property name="build.classes" value="${build.dir}/classes"/>
@@ -38,20 +38,21 @@
     <property name="result.jar" value="argouml-euml.jar"/>
 
     <path id="euml.run.classpath">
-      <pathelement location="${argo.euml.dir}/lib/emf/org.eclipse.emf.common_2.3.0.v200708072030.jar"/>
-      <pathelement location="${argo.euml.dir}/lib/emf/org.eclipse.emf.ecore.change.edit_2.3.0.v200708072030.jar"/>
-      <pathelement location="${argo.euml.dir}/lib/emf/org.eclipse.emf.ecore.change_2.3.0.v200708072030.jar"/>
-      <pathelement location="${argo.euml.dir}/lib/emf/org.eclipse.emf.ecore.edit_2.3.0.v200708072030.jar"/>
-      <pathelement location="${argo.euml.dir}/lib/emf/org.eclipse.emf.ecore.xmi_2.3.1.v200708072030.jar"/>
-      <pathelement location="${argo.euml.dir}/lib/emf/org.eclipse.emf.ecore_2.3.1.v200708072030.jar"/>
-      <pathelement location="${argo.euml.dir}/lib/emf/org.eclipse.emf.edit_2.3.1.v200708072030.jar"/>
-      <pathelement location="${argo.euml.dir}/lib/emf/org.eclipse.emf.mapping.ecore2xml_2.3.0.v200708072030.jar"/>
-      <pathelement location="${argo.euml.dir}/lib/emf/org.eclipse.emf.mapping_2.3.0.v200708072030.jar"/>
-      <pathelement location="${argo.euml.dir}/lib/uml2/org.eclipse.uml2.common.edit_1.3.0.v200706251652.jar"/>
-      <pathelement location="${argo.euml.dir}/lib/uml2/org.eclipse.uml2.common_1.3.1.v200707311200.jar"/>
-      <pathelement location="${argo.euml.dir}/lib/uml2/org.eclipse.uml2.uml.edit_2.1.0.v200706251652.jar"/>
-      <pathelement location="${argo.euml.dir}/lib/uml2/org.eclipse.uml2.uml.resources_2.1.0.v200706251652.jar"/>
-      <pathelement location="${argo.euml.dir}/lib/uml2/org.eclipse.uml2.uml_2.1.1.v200707311200.jar"/>
+      <pathelement location="lib/emf/org.eclipse.emf.common_2.4.0.v200902171115.jar"/>
+      <pathelement location="lib/emf/org.eclipse.emf.ecore.change.edit_2.4.0.v200902171115.jar"/>
+      <pathelement location="lib/emf/org.eclipse.emf.ecore.change_2.4.0.v200902171115.jar"/>
+      <pathelement location="lib/emf/org.eclipse.emf.ecore.edit_2.4.1.v200902171115.jar"/>
+      <pathelement location="lib/emf/org.eclipse.emf.ecore.xmi_2.4.1.v200902171115.jar"/>
+      <pathelement location="lib/emf/org.eclipse.emf.ecore_2.4.2.v200902171115.jar"/>
+      <pathelement location="lib/emf/org.eclipse.emf.edit_2.4.2.v200902171115.jar"/>
+      <pathelement location="lib/emf/org.eclipse.emf.mapping.ecore2xml_2.4.0.v200902171115.jar"/>
+      <pathelement location="lib/emf/org.eclipse.emf.mapping.ecore_2.4.0.v200902171115.jar"/>
+      <pathelement location="lib/emf/org.eclipse.emf.mapping_2.4.0.v200902171115.jar"/>
+      <pathelement location="lib/uml2/org.eclipse.uml2.common.edit_1.4.0.v200805131030.jar"/>
+      <pathelement location="lib/uml2/org.eclipse.uml2.common_1.4.0.v200805131030.jar"/>
+      <pathelement location="lib/uml2/org.eclipse.uml2.uml.edit_2.2.0.v200805131030.jar"/>
+      <pathelement location="lib/uml2/org.eclipse.uml2.uml.resources_2.2.0.v200805131030.jar"/>
+      <pathelement location="lib/uml2/org.eclipse.uml2.uml_2.2.2.v200811051031.jar"/>
     </path>
 
     <path id="euml.compile.classpath">
@@ -60,7 +61,13 @@
 
     <path id="compile.classpath">
       <pathelement location="${argo.build.dir}/log4j.jar"/>
-        <pathelement location="${argo.build.dir}/argouml-model.jar"/>
+      <pathelement location="${argo.build.dir}/argouml-model.jar"/>
+      <fileset dir="../argouml-core-infra/build/">
+        <include name="*.jar"/>
+      </fileset>
+      <fileset dir="../argouml-core-model/build/">
+        <include name="*.jar"/>
+      </fileset>
       <path refid="euml.compile.classpath"/>
     </path>
 
@@ -168,9 +175,11 @@
   <!-- =================================================================== -->
   <target name="install" depends="jar"
           description="Copy the ${result.jar} file to the ArgoUML directory.">
-    <copy todir="${argo.build.dir}">
+    <copy todir="${argo.build.dir}" flatten="true">
       <fileset dir="${build.dir}" includes="*.jar"/>
-      <fileset dir="${lib.dir}" includes="*.jar"/>
+      <fileset dir="${lib.dir}">
+        <include name="**/*.jar"/>
+      </fileset>
     </copy>
   </target>

------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2398423

To unsubscribe from this discussion, e-mail: [[email protected]].