Skip to content

Commit

Permalink
see ome#2148 - More fixes for ivyeclipse task, includes performance i…
Browse files Browse the repository at this point in the history 
…mprovements

git-svn-id: file:///home/svn/omero/trunk@6558 05709c45-44f0-0310-885b-81a1db45b4a6
  • Loading branch information
@joshmoore
joshmoore committed Apr 8, 2010
1 parent b01cd70 commit a3e59ca
Show file tree
Hide file tree
Showing 5 changed files with 74 additions and 111 deletions.
7 changes: 3 additions & 4 deletions build.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,13 +127,12 @@ def execute(args):
if len(args) > 0 and args[0] == "-hudson":
build_hudson()
elif len(args) > 0 and args[0] == "-perf":
A = list(args)
A.pop(0)
A = "-listener net.sf.antcontrib.perf.AntPerformanceListener".split() + A
args.pop(0)
A = "-listener net.sf.antcontrib.perf.AntPerformanceListener".split() + args
java_omero(A)
else:
java_omero(args)
notification(""" Finished: %s """ % " ".join(args), 0)
notification(""" Finished: %s """ % " ".join(args), 0)
except KeyboardInterrupt:
sys.stderr.write("\nCancelled by user\n")
sys.exit(2)
Expand Down
68 changes: 39 additions & 29 deletions build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,10 @@ java component.
<!-- Prevent future invocations and PermGen errors-->
<property name="ivy.done" value="done"/>
<!-- Touch the local configuration file which is no longer mandatory -->
<touch file="${basedir}/etc/local.properties"/>
<if><not><available file="${basedir}/etc/local.properties"/></not>
<then>
<touch file="${basedir}/etc/local.properties"/>
</then></if>
<installIvy/>
<ivy:buildlist reference="all.buildpath" settingsRef="ivy.toplevel">
<fileset dir="${omero.home}/components" includes="*/build.xml" excludes="**/policy/**,**/tools/**"/>
Expand Down Expand Up @@ -195,22 +198,14 @@ java component.
</target>

<target name="eclipse" depends="init">
<ivy:resolve file="ivy.xml" type="jar" conf="build" settingsRef="ivy.toplevel" log="quiet" haltonfailure="false"/>
<taskdef name="ivyeclipse" classname="IVY1016.EclipseClasspath" loaderref="ivy.loader"/>
<ivyeclipse conf="build"/>
</target>

<target name="eclipse-tests" depends="init">
<ivy:resolve file="ivy.xml" type="jar" conf="test" settingsRef="ivy.toplevel" log="quiet" haltonfailure="false"/>
<taskdef name="ivyeclipse" classname="IVY1016.EclipseClasspath" loaderref="ivy.loader"/>
<ivyeclipse conf="test"/>
<tryEclipse settingsRef="ivy.toplevel"/>
</target>

<target name="build-eclipse" description="Creates all source directories needed by eclipse in case default build is failing." depends="init">
<iterate buildpathref="all.buildpath" target="prepare"/>
<iterate buildpathref="OmeroJava.buildpath" target="prepare"/>
<iterate buildpathref="OmeroImporter.buildpath" target="prepare"/>
<iterate buildpathref="licenses.buildpath" target="prepare"/>
<iterate buildpathref="all.buildpath" target="eclipse"/>
<iterate buildpathref="OmeroJava.buildpath" target="eclipse"/>
<iterate buildpathref="OmeroImporter.buildpath" target="eclipse"/>
<iterate buildpathref="licenses.buildpath" target="eclipse"/>
<antcall target="eclipse" inheritRefs="true" inheritAll="true"/>
</target>

Expand Down Expand Up @@ -544,15 +539,12 @@ java component.
<target name="_dist" depends="init"><prepareDist/></target>
<macrodef name="prepareDist">
<sequential>
<copy file="${omero.home}/LICENSE.txt" todir="${dist.dir}/" overwrite="true"/>
<copy todir="${dist.dir}/etc" overwrite="true">
<copy file="${omero.home}/LICENSE.txt" todir="${dist.dir}/"/>
<copy todir="${dist.dir}/etc">
<fileset dir="${omero.home}/etc">
<exclude name="local.properties"/>
</fileset>
</copy>
<echo file="${dist.dir}/etc/omero.properties" append="true">
omero.version=${omero.version}
</echo>
<copy todir="${dist.dir}">
<fileset dir="${omero.home}">
<include name="sql/**"/>
Expand All @@ -567,16 +559,34 @@ omero.version=${omero.version}
<ivy:resolve file="ivy.xml" type="jar,egg" conf="client" settingsRef="ivy.toplevel" log="quiet"/>
<ivy:retrieve conf="client" pattern="${dist.dir}/lib/client/[module].[ext]" sync="false" log="quiet" settingsRef="ivy.toplevel"/>

<!-- Must update the jars with the modified omero.properties file in order for the version to be updated -->
<jar update="true" destfile="${dist.dir}/lib/server/blitz.jar">
<fileset dir="etc" includes="omero.properties"/>
</jar>
<jar update="true" destfile="${dist.dir}/lib/client/omero_client.jar">
<fileset dir="etc" includes="omero.properties"/>
</jar>
<jar update="true" destfile="${dist.dir}/lib/client/OmeroImporter.jar">
<fileset dir="etc" includes="omero.properties"/>
</jar>
<loadproperties srcFile="${dist.dir}/etc/omero.properties">
<filterchain>
<headfilter skip="20" lines="-1"/>
<prefixlines prefix="dist.check."/>
</filterchain>
</loadproperties>
<if><not><equals arg1="${dist.check.omero.version}" arg2="${omero.version}"/></not>
<then>
<!-- Setting version -->
<copy todir="${dist.dir}/etc" overwrite="true">
<fileset dir="${omero.home}/etc" includes="omero.properties"/>
</copy>
<echo file="${dist.dir}/etc/omero.properties" append="true">
omero.version=${omero.version}
</echo>

<!-- Must update the jars with the modified omero.properties file in order for the version to be updated -->
<jar update="true" destfile="${dist.dir}/lib/server/blitz.jar">
<fileset dir="${dist.dir}/etc" includes="omero.properties"/>
</jar>
<jar update="true" destfile="${dist.dir}/lib/client/omero_client.jar">
<fileset dir="${dist.dir}/etc" includes="omero.properties"/>
</jar>
<jar update="true" destfile="${dist.dir}/lib/client/OmeroImporter.jar">
<fileset dir="${dist.dir}/etc" includes="omero.properties"/>
</jar>
</then>
</if>
</sequential>
</macrodef>

Expand Down
25 changes: 25 additions & 0 deletions components/antlib/resources/global.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,31 @@
</sequential>
</macrodef>

<macrodef name="tryEclipse">
<attribute name="settingsRef"/>
<sequential>
<trycatch>
<try>
<ivy:resolve file="test.xml" type="jar" conf="test" settingsRef="@{settingsRef}" log="quiet"/>
<taskdef name="ivyeclipse" classname="IVY1016.EclipseClasspath" loaderref="ivy.loader"/>
<ivyeclipse conf="test"/>
</try>
<catch>
<echo>

***************************************************************************
Tests are not compiled. Run "test-compile". Falling back to regular eclipse
***************************************************************************

</echo>
<ivy:resolve file="ivy.xml" type="jar" conf="build" settingsRef="@{settingsRef}" log="quiet"/>
<taskdef name="ivyeclipse" classname="IVY1016.EclipseClasspath" loaderref="ivy.loader"/>
<ivyeclipse conf="build"/>
</catch>
</trycatch>
</sequential>
</macrodef>

<!--
These classpaths are used by all components, and amount to only the deps.lib.dir
directory within each component. That directory is configured using deps-retrieve,
Expand Down
21 changes: 7 additions & 14 deletions components/antlib/resources/lifecycle.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,25 +52,18 @@
<property name="test.with.fail" value="true"/>
</target>

<target name="eclipse" depends="retrieve">
<ivy:resolve file="ivy.xml" type="jar" conf="build" settingsRef="ivy.${ant.project.name}" log="quiet"/>
<taskdef name="ivyeclipse" classname="IVY1016.EclipseClasspath" loaderref="ivy.loader"/>
<ivyeclipse conf="build"/>
<target name="eclipse" depends="prepare">
<tryEclipse settingsRef="ivy.${ant.project.name}"/>
</target>

<target name="eclipse-tests" depends="retrieve">
<ivy:resolve file="test.xml" type="jar" conf="test" settingsRef="ivy.${ant.project.name}" log="quiet"/>
<taskdef name="ivyeclipse" classname="IVY1016.EclipseClasspath" loaderref="ivy.loader"/>
<ivyeclipse conf="test"/>
</target>

<target name="retrieve" unless="retrieve.done">
<target name="retrieve" unless="retrieve.done">
<property name="retrieve.done" value="true"/>
<installIvy/>
<installIvy/>
<property name="retrieve.done" value="true"/>
<ivy:retrieve settingsRef="ivy.${ant.project.name}" pattern="${deps.lib.dir}/[artifact].[ext]" log="quiet" sync="false" symlink="true"/>
</target>

<target name="prepare" depends="retrieve,eclipse">
<target name="prepare" depends="retrieve">
<mkdir dir="${deps.lib.dir}"/>
<defineClasspath/>
<defineVariables/>
Expand Down Expand Up @@ -257,7 +250,7 @@ omero.version=${omero.version}
<flattenmapper/>
</pathconvert>
<property name="mf.classpath.and.jars" value="../../etc ${mf.classpath} services.jar extensions.jar"/>
<jar destfile="${target.dir}/${ivy.module}.jar">
<jar destfile="${target.dir}/${ivy.module}.jar" update="true">
<manifest>
<attribute name="Class-Path" value="${mf.classpath.and.jars}"/>
<attribute name="Main-Class" value="${main.class}"/>
Expand Down
64 changes: 0 additions & 64 deletions components/romio/.classpath
View file

This file was deleted.

0 comments on commit a3e59ca

Please sign in to comment.