Author: rodche
Date: 2010-01-28 12:29:31 -0800 (Thu, 28 Jan 2010)
New Revision: 19065
Modified:
coreplugins/trunk/BioPAX/build.xml
Log:
fixed: META-INF and MANIFEST.MF creation (it has been accidently replacing by
another META-INF from libraries)
Modified: coreplugins/trunk/BioPAX/build.xml
===================================================================
--- coreplugins/trunk/BioPAX/build.xml 2010-01-28 20:06:19 UTC (rev 19064)
+++ coreplugins/trunk/BioPAX/build.xml 2010-01-28 20:29:31 UTC (rev 19065)
@@ -65,25 +65,20 @@
<!-- classpath without reference to yfiles -->
<path id="classpath.without.yfiles">
<pathelement path="${build.classes}"/>
- <!-- not required, because these jars are unpacked to ${build.classes}
(see target:prepare)
- <fileset dir="${basedir}/lib">
- <include name="*.jar"/>
- </fileset>
- -->
- <path refid="runtime.classpath"/>
+ <path refid="runtime.classpath"/>
</path>
<path id="test.classpath">
- <pathelement path="${build.test.classes}"/>
- <path refid="classpath.without.yfiles"/>
+ <pathelement path="${build.test.classes}"/>
+ <path refid="classpath.without.yfiles"/>
</path>
<!-- classpath with reference to yfiles -->
<path id="classpath.with.yfiles">
<path refid="classpath.without.yfiles"/>
- <fileset dir="${pathway.tools.root}/lib/">
- <include name="*.jar"/>
- </fileset>
+ <fileset dir="${pathway.tools.root}/lib/">
+ <include name="*.jar"/>
+ </fileset>
</path>
<!-- target that sets has.yfiles property -->
@@ -136,10 +131,12 @@
<mkdir dir="${jars.dir}"/>
<!-- Explicitly Include Classes from These JARs: -->
- <unjar dest="${build.classes}">
- <fileset dir="${basedir}/lib" includes="*.jar"/>
- </unjar>
+ <unjar dest="${build.classes}">
+ <fileset dir="${basedir}/lib" includes="*.jar"/>
+ </unjar>
+ <!-- delete META-INF from those unpacked libs-->
+ <delete dir="${build.classes}/META-INF"/>
<echo>"basedir ${basedir}"</echo>
</target>
@@ -156,10 +153,10 @@
<delete file="${obfuscationlog}"/>
</target>
- <!-- target to unzip yFiles library into build - required for
obfuscation -->
- <target depends="check.yfiles" if="has.yfiles" name="unzip.yfiles">
- <unzip src="${pathway.tools.root}/lib/y.jar" dest="${build.classes}"/>
- </target>
+ <!-- target to unzip yFiles library into build - required for obfuscation
-->
+ <target depends="check.yfiles" if="has.yfiles" name="unzip.yfiles">
+ <unzip src="${pathway.tools.root}/lib/y.jar" dest="${build.classes}"/>
+ </target>
<!-- target to compile all code -->
<target
depends="check.yfiles,prepare,gen.layout.file,set.classpath,unzip.yfiles"
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
