Skip to content

Commit

Permalink
Merge pull request ome#6384 from jburel/scripts_update
Browse files Browse the repository at this point in the history
Scripts update
  • Loading branch information
jburel authored Apr 24, 2024
2 parents 1d201f5 + d5df861 commit f898e8e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions components/tools/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,20 +37,20 @@
</echo>
<mkdir dir="target/lib/server"/>
<!-- Look for file above src -->
<property name="filegz" value="../../../omero-scripts-${versions.omero-scripts}.tar.gz" />
<property name="filegz" value="../../../omero_scripts-${versions.omero-scripts}.tar.gz" />
<if>
<available file="${filegz}"/>
<then>
<copy file="${filegz}" todir="target/downloads/scripts"/>
</then>
<else>
<download pkg="omero-scripts" file="omero-scripts-${versions.omero-scripts}.tar.gz" expected="${versions.omero-scripts-md5}"
<download pkg="omero-scripts" file="omero_scripts-${versions.omero-scripts}.tar.gz" expected="${versions.omero-scripts-md5}"
where="target/downloads/scripts"/>
</else>
</if>
<untar src="target/downloads/scripts/omero-scripts-${versions.omero-scripts}.tar.gz" dest="target/downloads/scripts" compression="gzip"/>
<untar src="target/downloads/scripts/omero_scripts-${versions.omero-scripts}.tar.gz" dest="target/downloads/scripts" compression="gzip"/>
<copy todir="target/lib/scripts">
<fileset dir="target/downloads/scripts/omero-scripts-${versions.omero-scripts}" includes="omero/**/*,README*"/>
<fileset dir="target/downloads/scripts/omero_scripts-${versions.omero-scripts}" includes="omero/**/*,README*"/>
</copy>
<copy todir="${dist.dir}">
<fileset dir="target" includes="*.war,var/**/*,etc/**/*,lib/**/*,include/**/*" followsymlinks="false">
Expand Down
2 changes: 1 addition & 1 deletion etc/omero.properties
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ versions.omero-scripts-url=${versions.omero-pypi}
versions.omero-blitz=5.7.2
versions.omero-common-test=5.6.4
versions.omero-gateway=5.9.0
versions.omero-scripts=5.7.3
versions.omero-scripts=5.8.2
versions.OMEZarrReader=0.3.1
## Global overrides, if empty ignored
versions.bioformats=

0 comments on commit f898e8e

Please sign in to comment.