Author: laylaoesper
Date: 2010-07-23 14:33:18 -0700 (Fri, 23 Jul 2010)
New Revision: 21015
Added:
csplugins/trunk/soc/layla/SemanticSummary/jars/
csplugins/trunk/soc/layla/SemanticSummary/jars/SemanticSummary.jar
Modified:
csplugins/trunk/soc/layla/SemanticSummary/build.xml
Log:
Making the build.xml file work along with various other related fixes. Also,
moving the location of the jar file.
Modified: csplugins/trunk/soc/layla/SemanticSummary/build.xml
===================================================================
--- csplugins/trunk/soc/layla/SemanticSummary/build.xml 2010-07-23 21:29:39 UTC
(rev 21014)
+++ csplugins/trunk/soc/layla/SemanticSummary/build.xml 2010-07-23 21:33:18 UTC
(rev 21015)
@@ -1,65 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="semantic_summary" default="all">
+<!-- =================================================================== -->
+<!-- Plugin build file -->
+<!-- =================================================================== -->
- <!--
- ********************************
- * TO DEFINE PATH TO CYTOSCAPE: *
- ********************************
- - Either set an environment variable called CYTOSCAPE_HOME
- pointing to your Cytoscape 2.6 installation
+<project name = "semantic_summary" default="all" basedir=".">
- - or place a file called "semantic_summary.properties" in the same
directory as this build.xml
- file that contains a line like this (choose one depending on your
platform and adjust to the
- actual installation directory and the version you are using):
+ <!-- The build directory -->
+ <!-- All files generated by ant go here -->
+ <property name="build.dir" value="${basedir}/build"/>
- Apple:
- CYTOSCAPE_HOME=/Applications/Cytoscape_v2.6.3
- Linux:
- CYTOSCAPE_HOME=/usr/local/Cytoscape_v2.6.3
- Windows:
- CYTOSCAPE_HOME=C:/Program Files/Cytoscape-v2.6.3
-
- (cytoscape.jar and lib/*jar are needed for compiling the plugin)
- -->
+ <!-- The java source directory-->
+ <property name="src.dir" value="${basedir}/src"/>
- <property file="semantic_summary.properties" />
- <property file="plugin.props" />
+ <!-- The lib directory -->
+ <!-- Contains all third-party JAR files, required for compilation -->
+ <property name="lib.dir" value="${basedir}/lib"/>
- <property environment="env" />
- <condition property="CYTOSCAPE_HOME" value="${env.CYTOSCAPE_HOME}"
else="C:/Program Files/Cytoscape-v2.7.0" >
- <available file="${env.CYTOSCAPE_HOME}/cytoscape.jar" />
- </condition>
+ <!-- The doc directory -->
+ <!-- Contains all external documentation -->
+ <property name="doc.dir" value="${basedir}/doc"/>
- <condition property="releaseSuffix" value="-${pluginReleaseSuffix}"
else="">
- <and>
- <isset property="pluginReleaseSuffix" />
- <not>
- <equals arg1="${pluginReleaseSuffix}" arg2=""
trim="true"/>
- </not>
- </and>
- </condition>
+ <!-- Define the Cytoscape directories -->
+ <property name="cytoscape.dir" value="C:/Program
Files/Cytoscape_v2.7.0"/>
+ <property name="cytoscape.lib.dir" value="${cytoscape.dir}/lib"/>
- <echo message="Using Cytoscape in ${CYTOSCAPE_HOME}" />
+ <!-- Property Files -->
+ <property file="plugin.props" />
+
+ <!-- Build Files names -->
+ <property name="src_release_root.dir" value="${build.dir}/release_src"/>
+ <property name="binary_release.dir" value="${build.dir}/release_bin"/>
+
+ <!-- Jar Files -->
+ <property name="jars.dir" value="${basedir}/jars"/>
- <!-- Uncomment the following property if no tests compilation is needed
-->
- <!--
- <property name="skip.tests" value="true"/>
- -->
-
- <!-- Compiler options -->
-
- <property name="compiler.debug" value="on"/>
- <property name="compiler.generate.no.warnings" value="off"/>
- <property name="compiler.args" value=""/>
- <property name="compiler.max.memory" value="128m"/>
- <patternset id="ignored.files">
- <exclude name="**/CVS/**"/>
- <exclude name="**/SCCS/**"/>
- <exclude name="**/RCS/**"/>
- <exclude name="**/rcs/**"/>
- <exclude name="**/.DS_Store/**"/>
- <exclude name="**/.svn/**"/>
- </patternset>
+
+ <!-- ============ Compilation Control Options =======================
-->
+ <property name="compile.debug" value="true"/>
+ <property name="compile.deprecation" value="true"/>
+ <property name="compile.optimize" value="true"/>
<patternset id="compiler.resources">
<include name="**/?*.properties"/>
<include name="**/?*.xml"/>
@@ -70,196 +49,115 @@
<include name="**/?*.html"/>
<include name="**/?*.dtd"/>
<include name="**/?*.tld"/>
+ <include name="**/?*.txt"/>
<exclude name="**/?*.ai"/>
<exclude name="**/?*.AI"/>
</patternset>
+
- <!-- Application Server Libraries -->
-
- <!-- Modules -->
-
- <!-- Module semantic_summary -->
-
- <dirname property="module.semantic_summary.basedir" file="${ant.file}"/>
-
- <property name="compiler.args.semantic_summary"
value="${compiler.args}"/>
-
- <property name="semantic_summary.output.dir"
value="${module.semantic_summary.basedir}/classes"/>
- <property name="semantic_summary.jars.dir"
value="${module.semantic_summary.basedir}/jars"/>
- <property name="semantic_summary.testoutput.dir"
value="${module.semantic_summary.basedir}/classes"/>
- <property name="semantic_summary.bin_release.dir"
value="${module.semantic_summary.basedir}/release_bin"/>
- <property name="semantic_summary.src_release_root.dir"
value="${module.semantic_summary.basedir}/release_src"/>
-
- <path id="semantic_summary.module.bootclasspath">
- <!-- Paths to be included in compilation bootclasspath -->
- </path>
-
- <path id="semantic_summary.module.classpath">
- <pathelement location="${CYTOSCAPE_HOME}/cytoscape.jar" />
- <fileset dir="${CYTOSCAPE_HOME}/lib">
- <include name="**/*.jar" />
+ <!-- ==================== Compilation Classpath ======================
-->
+
+ <path id="compile.classpath">
+ <pathelement path="${build.dir}/classes"/>
+ <fileset dir="${lib.dir}">
+ <include name="*.jar"/>
</fileset>
- </path>
-
- <patternset id="excluded.from.module.semantic_summary">
- <patternset refid="ignored.files"/>
- </patternset>
-
- <patternset id="excluded.from.compilation.semantic_summary">
- <patternset refid="excluded.from.module.semantic_summary"/>
- </patternset>
-
- <path id="semantic_summary.module.sourcepath">
- <dirset dir="${module.semantic_summary.basedir}">
- <include name="src"/>
- </dirset>
- </path>
-
- <!-- Targets:
- all ~~~~~~~~+ init
- + clean ~~~~~~~~~~~~~~~~+
clean.module.semantic_summary
- |
- + compile ~~~~~~~~~~~~~~+
compile.module.semantic_summary ~~~~+
compile.module.semantic_summary.production
- |
|
- |
+ compile.module.semantic_summary.tests
- + buildID
- |
- + jars
-
- release ~~~~+ binary_release (jars)
- |
- + source_release
- -->
+ <fileset dir="${cytoscape.dir}/lib">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${cytoscape.dir}">
+ <include name="cytoscape.jar"/>
+ </fileset>
+ </path>
- <target name="compile.module.semantic_summary"
depends="compile.module.semantic_summary.production,compile.module.semantic_summary.tests"
description="Compile module semantic_summary"/>
+ <!-- ==================== Clean Target ===============================
-->
+ <target name="clean"
+ description="Deletes all build files and starts fresh">
+ <delete dir="${build.dir}"/>
+ <delete file="${basedir}/SemanticSummary.jar"/>
+ <delete file="${jars.dir}/SemanticSummary.jar"/>
+ </target>
- <target name="compile.module.semantic_summary.production"
description="Compile module semantic_summary; production classes">
- <mkdir dir="${semantic_summary.output.dir}"/>
- <javac destdir="${semantic_summary.output.dir}"
- debug="${compiler.debug}"
- nowarn="${compiler.generate.no.warnings}"
- memoryMaximumSize="${compiler.max.memory}"
- source="1.5"
- target="1.5"
- fork="true">
- <compilerarg line="${compiler.args.semantic_summary}"/>
- <bootclasspath
refid="semantic_summary.module.bootclasspath"/>
- <classpath refid="semantic_summary.module.classpath"/>
- <src refid="semantic_summary.module.sourcepath"/>
- </javac>
+ <!-- ==================== Compile Target
============================= -->
+ <target name="compile" depends="prepare"
+ description="Compiles all Java source files">
+ <mkdir dir="${build.dir}/classes"/>
+ <javac srcdir="${src.dir}"
+ source="1.5"
+ destdir="${build.dir}/classes"
+ debug="${compile.debug}"
+ deprecation="${compile.deprecation}"
+ optimize="${compile.optimize}">
+ <classpath refid="compile.classpath"/>
+ </javac>
+
+ <copy todir="${build.dir}/classes">
+ <fileset dir="${basedir}/src">
+ <patternset refid="compiler.resources" />
+ <type type="file" />
+ </fileset>
+ </copy>
- <copy todir="${semantic_summary.output.dir}">
- <fileset dir="${module.semantic_summary.basedir}/src">
- <patternset refid="compiler.resources"/>
- <type type="file"/>
- </fileset>
- </copy>
- </target>
+ </target>
- <target name="compile.module.semantic_summary.tests"
depends="compile.module.semantic_summary.production" description="compile
module semantic_summary; test classes" unless="skip.tests"/>
+ <!-- ==================== Jar Target
================================= -->
+ <target name="jar" depends="compile"
+ description="Creates Plugin Jar: SemanticSummary.jar">
+ <unzip dest="${build.dir}/classes">
+ <fileset dir="${lib.dir}">
+ <include name="*.jar"/>
+ </fileset>
+ </unzip>
+ <copy file="${basedir}/plugin.props"
todir="${build.dir}/classes/cytoscape/csplugins/semanticsummary" />
+ <jar destfile="${jars.dir}/SemanticSummary.jar"
+ basedir="${build.dir}/classes">
+ <manifest>
+ <attribute name="Cytoscape-Plugin"
+
value="cytoscape.csplugins.semanticsummary.SemanticSummaryPlugin"/>
+ </manifest>
+ </jar>
+ </target>
- <target name="clean.module.semantic_summary" description="cleanup
module">
- <delete dir="${semantic_summary.output.dir}"/>
- <delete dir="${semantic_summary.jars.dir}"/>
- <delete dir="${semantic_summary.testoutput.dir}"/>
- <delete dir="${semantic_summary.bin_release.dir}"/>
- <delete dir="${semantic_summary.src_release_root.dir}"/>
- </target>
+ <!-- ==================== All ========================== -->
+ <target name="all" depends="source_release,binary_release"/>
- <target name="init" description="Build initialization">
- <!-- Perform any build initialization in this target -->
- </target>
- <target name="jars"
depends="compile.module.semantic_summary.production, buildID"
description="Creates jar file for semantic_summary">
- <copy file="${module.semantic_summary.basedir}/plugin.props"
todir="${semantic_summary.output.dir}/cytoscape/csplugins/semanticsummary/" />
- <property
file="${semantic_summary.output.dir}/cytoscape/csplugins/semanticsummary/buildID.props"
/>
- <echo message="Build: ${build.number} from SVN: ${svn.revision}
by: ${build.us...@${build.host} at: ${build.timestamp}" />
+ <!-- ==================== Prepare Target
============================= -->
+ <target name="prepare" depends="clean">
+ <!-- Create build directories as needed -->
+ <mkdir dir="${build.dir}"/>
+ <mkdir dir="${build.dir}/classes"/>
+ </target>
- <mkdir dir="${semantic_summary.jars.dir}"/>
- <jar jarfile="${semantic_summary.jars.dir}/SemanticSummary.jar"
basedir="${semantic_summary.output.dir}" >
- <manifest>
- <attribute name="Cytoscape-Plugin"
value="cytoscape.csplugins.semanticsummary.Semantic_Summary_Plugin"/>
- </manifest>
- </jar>
- </target>
-
- <target name="buildID" description="write to buildID.props">
- <!-- increment build number -->
- <buildnumber />
-
- <!-- read build number -->
- <property file="build.number" />
-
- <!-- get svn version -->
- <exec executable="svnversion" outputproperty="svn.revision"
failifexecutionfails="false" errorproperty="">
- <arg value="${module.semantic_summary.basedir}" />
- </exec>
-
- <!-- get ${USER} and ${HOSTNAME} depending on OS -->
- <property environment="env" />
- <exec executable="whoami" osfamily="unix"
failifexecutionfails="false" outputproperty="env.USERNAME"/>
- <property name="build.user" value="${env.USERNAME}" />
- <exec executable="hostname" osfamily="unix"
failifexecutionfails="false" outputproperty="env.COMPUTERNAME"/>
- <property name="build.host" value="${env.COMPUTERNAME}"/>
-
- <!-- write to property file -->
- <propertyfile
file="${semantic_summary.output.dir}/cytoscape/csplugins/semanticsummary/buildID.props"
comment="SemanticSummaryPlugin build ID">
- <entry key="build.number" value="${build.number}"
/>
- <entry key="svn.revision"
value="${svn.revision}"/>
- <entry key="build.user" value="${build.user}"/>
- <entry key="build.host" value="${build.host}"/>
- <entry key="build.timestamp" type="date"
value="now" pattern="yyyy/MM/dd HH:mm:ss Z (z)"/>
- </propertyfile>
- </target>
-
- <target name="release_source" description="Make a
source-code release">
- <property name="semantic_summary.src_release.dir"
value="${semantic_summary.src_release_root.dir}/SemanticSummaryPlugin_v${pluginVersion}"/>
- <mkdir dir="${semantic_summary.src_release_root.dir}"/>
- <mkdir dir="${semantic_summary.src_release.dir}"/>
- <mkdir dir="${semantic_summary.src_release.dir}/src"/>
- <copy todir="${semantic_summary.src_release.dir}/src">
- <fileset dir="${module.semantic_summary.basedir}/src">
- <patternset refid="ignored.files"/>
- <type type="file"/>
- </fileset>
- </copy>
-
- <mkdir dir="${semantic_summary.src_release.dir}/resources"/>
- <copy todir="${semantic_summary.src_release.dir}/resources">
- <fileset
dir="${module.semantic_summary.basedir}/resources">
- <patternset refid="ignored.files"/>
- <type type="file"/>
- </fileset>
- </copy>
-
- <copy file="build.xml" todir
="${semantic_summary.src_release.dir}" />
- <copy file="plugin.props" todir
="${semantic_summary.src_release.dir}" />
- <copy file="doc/LICENSE.txt" todir
="${semantic_summary.src_release.dir}" />
- <copy file="doc/README.TXT" todir
="${semantic_summary.src_release.dir}" />
-<!-- <copy file="semantic_summary.properties" todir
="${semantic_summary.src_release.dir}" /> -->
- <tar
destfile="SemanticSummaryPlugin_v${pluginVersion}${releaseSuffix}_src.tar.gz"
basedir="${semantic_summary.src_release_root.dir}"
- compression="gzip" longfile="gnu" />
- <zip
destfile="SemanticSummaryPlugin_v${pluginVersion}${releaseSuffix}_src.zip"
basedir="${semantic_summary.src_release_root.dir}" />
- </target>
+ <!-- ==================== Source Release
============================= -->
+ <target name="source_release" depends="jar">
+ <property name="src_release.dir"
value="${src_release_root.dir}/SemanticSummaryPlugin_v${pluginVersion}"/>
+ <mkdir dir="${src_release_root.dir}"/>
+ <mkdir dir="${src_release.dir}"/>
+ <mkdir dir="${src_release.dir}/src"/>
+ <copy todir="${src_release.dir}/src">
+ <fileset dir="${basedir}/src">
+ </fileset>
+ </copy>
+ <copy file="build.xml" todir="${src_release.dir}"/>
+ <copy file="plugin.props" todir="${src_release.dir}"/>
+ <copy file="doc/LICENSE.TXT"
todir="${src_release.dir}"/>
+ <copy file="doc/README.TXT" todir="${src_release.dir}"/>
+ <tar
destfile="SemanticSummaryPlugin_v${pluginVersion}${pluginReleaseSuffix}_src.tar.gz"
basedir="${src_release_root.dir}" compression="gzip" longfile="gnu"/>
+ <zip
destfile="SemanticSummaryPlugin_v${pluginVersion}${pluginReleaseSuffix}_src.zip"
basedir="${src_release_root.dir}"/>
+ </target>
- <target name="release_binary" depends="jars" description="Make a
binary-release">
- <mkdir dir="${semantic_summary.bin_release.dir}"/>
- <copy file="${semantic_summary.jars.dir}/SemanticSummary.jar"
todir ="${semantic_summary.bin_release.dir}" />
- <copy file="doc/LICENSE.txt"
todir ="${semantic_summary.bin_release.dir}" />
- <copy file="doc/README.TXT" todir
="${semantic_summary.bin_release.dir}" />
- <zip
destfile="SemanticSummaryPlugin_v${pluginVersion}${releaseSuffix}.zip"
basedir="${semantic_summary.bin_release.dir}" />
- </target>
-
- <target name="release" depends="release_binary, release_source"
description="Make a release"/>
+ <!-- ==================== Binary Release
============================= -->
+ <target name="binary_release" depends="jar" description="Make a
binary-release">
+ <mkdir dir="${binary_release.dir}"/>
+ <copy file="${jars.dir}/SemanticSummary.jar"
todir="${binary_release.dir}" />
+ <copy file="doc/LICENSE.txt"
todir="${binary_release.dir}" />
+ <copy file="doc/README.TXT"
todir="${binary_release.dir}" />
+ <zip
destfile="SemanticSummaryPlugin_v${pluginVersion}${pluginReleaseSuffix}.zip"
basedir="${binary_release.dir}" />
+ </target>
+
+ </project>
- <target name="compile" depends="compile.module.semantic_summary"
description="Compile all"/>
- <target name="clean" depends="clean.module.semantic_summary"
description="cleanup all"/>
- <target name="all" depends="init, clean,
compile.module.semantic_summary, buildID, jars" description="build all"/>
-</project>
-
-
-
-
Added: csplugins/trunk/soc/layla/SemanticSummary/jars/SemanticSummary.jar
===================================================================
(Binary files differ)
Property changes on:
csplugins/trunk/soc/layla/SemanticSummary/jars/SemanticSummary.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
--
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.
