[MOBY-guts] biomoby commit

[Andreas Groscurth]

groscurt
Thu Feb 21 09:13:05 EST 2008
Update of /home/repository/moby/moby-live/Java/xmls
In directory dev.open-bio.org:/tmp/cvs-serv25352/xmls

Modified Files:
	mobysyncBuild.xml 
Log Message:
Changes due to the maven building process
moby-live/Java/xmls mobysyncBuild.xml,1.2,1.3
===================================================================
RCS file: /home/repository/moby/moby-live/Java/xmls/mobysyncBuild.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- /home/repository/moby/moby-live/Java/xmls/mobysyncBuild.xml	2008/02/14 06:13:37	1.2
+++ /home/repository/moby/moby-live/Java/xmls/mobysyncBuild.xml	2008/02/21 14:13:05	1.3
@@ -23,19 +23,34 @@
 <!-- ====================================================== -->
 <target name="jar-mobysync" depends="mobysync-init,compile"
   description="Create a jar file with MobySync classes.">
+<property name="project.jar"
+      value="${maven.project.artifactId}-${maven.project.version}.jar"/>
+
+<artifact:dependencies
+    pathId="dependency.classpath"
+    filesetId="dependency.fileset">
+    <pom refid="maven.project"/>
+  </artifact:dependencies>
+
+<copy todir="${lib.dir}">
+  <fileset refid="dependency.fileset" />
+  <mapper type="flatten" />
+</copy>
+
+
   <dirname property="build.lib.dir" file="${lib.dir}"/>
   <!-- dirsep may not be portable -->
   <pathconvert pathsep=" " dirsep="/" property="build.manifest.classpath">
     <map from="${build.lib.dir}" to="."/>
     <path>
-      <fileset dir="${lib.dir}" excludes="ant_home/**" includes="*.jar"/>
+      <fileset dir="${lib.dir}" excludes="ant** jaxb**" includes="*.jar"/>
     </path>
   </pathconvert> 	
   <jar destfile="${build.lib}/MOBYSync.jar"> 
     <fileset dir="${build.classes}" includes="org/biomoby/registry/sync/**"/>
     <manifest>
       <attribute name="Built-By" value="${user.name}"/>
-      <attribute name="Class-Path" value="${build.manifest.classpath} lib/jmoby.jar lib/jmoby-others.jar"/>
+      <attribute name="Class-Path" value="${build.manifest.classpath} ./lib/${project.jar}"/>
       <attribute name="Main-Class" value="org.biomoby.registry.sync.MobySyncExecuter"/>
     </manifest> 	 
   </jar>
@@ -45,46 +60,43 @@
 <!-- Builds MobySync files for binary distribution                     -->
 <!-- ================================================================== -->
 <target name="bindist-mobysync" depends="compile,jars,jar-mobysync"
-	description="Create MOBYSync binary distribution.">
-	
-	<!-- Name of the final binary distribution (without extension) -->
-	<property name="syncdestfile" value="${dist.dir}/mobysync-${TODAY_SHORT}"/>
-	
-	<!-- Name of the final directory with binary distribution -->
-	<property name="mobysync.dir" value="mobysync"/>
-	
-	<!-- Create a binary distribution by copying all wanted files to one place -->
-	<property name="mobysync.dist" value="${build.mobysync}/${mobysync.dir}"/>
-	<delete dir="${build.mobysync}"/>
-	<mkdir dir="${mobysync.dist}"/>
-	
-	<copy todir="${mobysync.dist}/lib">
-		<fileset dir="${lib.dir}">
-			<include name="*.jar"/>
-		</fileset>
-		<fileset file="${build.lib}/jmoby.jar"/>
-		<fileset file="${build.lib}/jmoby-others.jar"/>
-	</copy>	 
-	<copy todir="${mobysync.dist}">	 
-		<fileset dir="${build.lib}" includes="MOBYSync.jar"/>
-	</copy>
-	<!--<copy file="${src.config}/Mo_config.xml" todir="${mobysync.dist}"/>-->
-
-        <property name="my.mobysync.properties"
-          location="${src.config}/mobysync.properties.template"/>
-	<copy file="${my.mobysync.properties}" todir="${mobysync.dist}"/>
-	<copy todir="${mobysync.dist}">
-		<fileset dir="${src.support}/mobysync" excludes="MANIFEST.MF"/>         
-	</copy>
-	<chmod dir="${mobysync.dist}" perm="ugo+rx" includes="run-MOBYSync" excludes="*.bat"/>
-	
-	<tar
-	    destfile="${syncdestfile}.tar.gz"
-	    basedir="${build.mobysync}"
-	    longfile="gnu"
-	    compression="gzip"/>
-	
-	<zip destfile="${syncdestfile}.zip" basedir="${build.mobysync}"/>
-	
-</target>
+  description="Create MobySync binary distribution.">
+  
+  <!-- Name of the final binary distribution (without extension) -->
+  <property name="mobysyncdestfile" value="${dist.dir}/mobysync-${TODAY_SHORT}"/>
+  
+  <!-- Name of the final directory with binary distribution -->
+  <property name="mobysync.dir" value="mobysync"/>
+  
+  <!-- Create a binary distribution by copying all wanted files to one place -->
+  <property name="mobysync.dist" value="${build.mobysync}/${mobysync.dir}"/>
+  <delete dir="${build.mobysync}"/>
+  <mkdir dir="${mobysync.dist}"/>
+  
+  <copy todir="${mobysync.dist}/lib">
+    <fileset dir="${lib.dir}">
+      <include name="*.jar"/>
+    </fileset>
+    <fileset file="${build.lib}/${maven.project.artifactId}-${maven.project.version}.jar"/>
+  </copy>	 
+  <copy todir="${mobysync.dist}">	 
+     <fileset dir="${build.lib}" includes="MOBYSync.jar"/>
+   </copy>
+
+   <property name="my.mobysync.properties"
+     location="${src.config}/mobysync.properties.template"/>
+   <copy file="${my.mobysync.properties}" tofile="${mobysync.dist}/mobysync_config.txt"/>
+
+   <copy todir="${mobysync.dist}">
+     <fileset dir="${src.support}/mobysync" excludes="MANIFEST.MF"/>         
+   </copy>
+   <chmod dir="${mobysync.dist}" perm="ugo+rx" includes="run-MOBYSync, reset" excludes="*.bat"/>
+
+   <tar
+     destfile="${mobysyncdestfile}.tar.gz"
+     basedir="${build.mobysync}"
+     longfile="gnu"
+     compression="gzip"/>
 
+   <zip destfile="${mobysyncdestfile}.zip" basedir="${build.mobysync}"/>
+</target>
\ No newline at end of file