Merge pull request #65 from NicolasAnquetil/v3

New organization for famix stuff

.classpath

@@ -12,6 +12,8 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="src" path="resources"/>
 	<classpathentry kind="lib" path="lib/akuhn-util-r28011.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="lib" path="lib/org.eclipse.core.contenttype_3.6.0.v20170207-1037.jar"/>

build.xml

@@ -3,6 +3,7 @@
 	<!-- Sets variables which can later be used. -->
 	<!-- The value of a property is accessed via ${} -->
 	<property name="src.dir"      location="src" />
+	<property name="gensrc.dir"   location="gen" />
 	<property name="testsrc.dir"  location="tests" />
 	<property name="build.dir"    location="bin" />
 	<property name="docs.dir"     location="docs" />
@@ -26,6 +27,13 @@
 	</target>
 
 	<target name="compile" depends="clean, makedir">
+		<javac srcdir="${gensrc.dir}" destdir="${build.dir}" source="17" target="17" includeantruntime="false" debug="true" debuglevel="lines,vars,source">
+			<classpath>
+				<fileset dir="${dist.dir}">
+  				  <include name="*.jar"/>
+				</fileset>
+			</classpath>
+		</javac>
 		<javac srcdir="${src.dir}" destdir="${build.dir}" source="17" target="17" includeantruntime="false" debug="true" debuglevel="lines,vars,source">
 			<classpath>
 				<fileset dir="${dist.dir}">
@@ -65,7 +73,7 @@
 	<target name="rebuild">
 		<jar destfile="${verveine.jar}"
 		     basedir="${build.dir}"
-		     includes="fr/inria/verveine/extractor/java/*.class"
+		     includes="**/*.class"
 		/>
 	</target>
 
@@ -78,8 +86,8 @@
 				</fileset>
 			</classpath>
 
+			<formatter type="xml"/>
 			<formatter type="plain" usefile="false" />
-			<formatter type="plain"/>
 
 			 <batchtest fork="yes" todir="${test.report.dir}">
 			     <fileset dir="${testsrc.dir}">
@@ -98,7 +106,6 @@
   				   <include name="*.jar"/>
 				</fileset>
 			</classpath>
-			<formatter type="plain"/>
 			<formatter type="xml" />
 
 			 <batchtest fork="yes" todir="${test.report.dir}">
@@ -110,17 +117,7 @@
 		</junit>
 	</target>
 
-	<!-- Run JUnit TestLAN -->
-	<target name="test_lan">
-		<junit printsummary="on" fork="true" haltonfailure="true" haltonerror="true">
-			<classpath>
-				<fileset dir="${dist.dir}">
-  				  <include name="*.jar"/>
-				</fileset>
-			</classpath>
-			<formatter type="plain" />
-			<test name="tests.fr.inria.verveine.extractor.java.VerveineJTest_LanModel" todir="${test.report.dir}" />
-		</junit>
-	</target>
+	<!-- synonym -->
+	<target name="test" depends="junit"/>
 
 </project>