Skip to content

Commit c070b84

Browse files
committed
mega-melt: deal with digit-leading version props
There are a couple of artifacts in pom-scijava that begin with a digit: * sc.fiji:3D_Blob_Segmentation * sc.fiji:3D_Objects_Counter * sc.fiji:3D_Viewer Prior to d0bf752, these used a "Fiji_" or "ImageJ_" prefix for their version properties. But this was standardized to a leading underscore instead, for consistency. So, for backwards compatibility with older pom-scijava parents, we need to set: A) the version props with Fiji/ImageJ prefix; and B) the version props with underscore prefix. Otherwise, these components might not get their versions pinned properly for builds of older components.
1 parent 3196faa commit c070b84

1 file changed

Lines changed: 16 additions & 6 deletions

File tree

tests/run.sh

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,16 +100,26 @@ grep -qF "[ERROR]" "$meltingPotLog" &&
100100
# been improved to include a strategy for dealing with components with same
101101
# artifactId but different groupIds. For now, we just prune these overrides.
102102
buildScript="$meltingPotDir/build.sh"
103-
buildScriptBackup="$buildScript.original"
103+
buildScriptTemp="$buildScript.tmp"
104104
echo &&
105105
printf 'Adjusting melting pot build script... ' &&
106-
mv "$buildScript" "$buildScriptBackup" &&
107-
awk '!/-D(annotations|antlr|jocl|kryo|minlog|opencsv|trove4j)\.version/' "$buildScriptBackup" > "$buildScript" &&
106+
cp "$buildScript" "$buildScript.original" &&
107+
mv -f "$buildScript" "$buildScriptTemp" &&
108+
awk '!/-D(annotations|antlr|jocl|kryo|minlog|opencsv|trove4j)\.version/' "$buildScriptTemp" > "$buildScript" &&
109+
# HACK: Add leading underscore to version properties that start with a digit.
110+
mv -f "$buildScript" "$buildScriptTemp" &&
111+
sed -E 's; -D([0-9][^ ]*);& -D_\1;' "$buildScriptTemp" > "$buildScript" &&
112+
# HACK: Add non-standard version properties used prior to
113+
# pom-scijava 32.0.0-beta-1; see d0bf752070d96a2613c42e4e1ab86ebdd07c29ee.
114+
mv -f "$buildScript" "$buildScriptTemp" &&
115+
sed -E 's; -Dsc.fiji.3D_Blob_Segmentation\.version=([^ ]*);& -DFiji_3D_Blob_Segmentation.version=\1;' "$buildScriptTemp" > "$buildScript" &&
116+
mv -f "$buildScript" "$buildScriptTemp" &&
117+
sed -E 's; -Dsc.fiji.(3D_Objects_Counter|3D_Viewer)\.version=([^ ]*);& -DImageJ_\1.version=\2;' "$buildScriptTemp" > "$buildScript" &&
108118
# HACK: Add non-standard net.imagej:ij version property used prior to
109119
# pom-scijava 28.0.0; see 7d2cc442b107b3ac2dcb799d282f2c0b5822649d.
110-
mv "$buildScript" "$buildScriptBackup" &&
111-
sed -E 's_ -Dij\.version=([^ ]*)_& -Dimagej1.version=\1_' "$buildScriptBackup" > "$buildScript" ||
112-
die 'Error adjusting melting pot build script!'
120+
mv -f "$buildScript" "$buildScriptTemp" &&
121+
sed -E 's; -Dij\.version=([^ ]*);& -Dimagej1.version=\1;' "$buildScriptTemp" > "$buildScript" &&
122+
rm "$buildScriptTemp" || die 'Error adjusting melting pot build script!'
113123
echo 'Done!'
114124

115125
echo &&

0 commit comments

Comments
 (0)