Skip to content

Commit 8d6d43c

Browse files
jerboaagalderz
andcommitted
8251193: bin/idea.sh is generating wrong folder definitions for JVMCI modules
Co-authored-by: Galder Zamarreno <galder@redhat.com> Reviewed-by: mcimadamore
1 parent 70d5cac commit 8d6d43c

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

bin/idea.sh

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,18 @@ for root in $MODULE_ROOTS; do
184184
elif [ "x$WSL_DISTRO_NAME" != "x" ]; then
185185
root=`wslpath -am $root`
186186
fi
187-
SOURCES=$SOURCES" $SOURCE_PREFIX""$root""$SOURCE_POSTFIX"
187+
188+
VM_CI="jdk.internal.vm.ci/share/classes"
189+
VM_COMPILER="src/jdk.internal.vm.compiler/share/classes"
190+
if test "${root#*$VM_CI}" != "$root" || test "${root#*$VM_COMPILER}" != "$root"; then
191+
for subdir in "$root"/*; do
192+
if [ -d "$subdir" ]; then
193+
SOURCES=$SOURCES" $SOURCE_PREFIX""$subdir"/src"$SOURCE_POSTFIX"
194+
fi
195+
done
196+
else
197+
SOURCES=$SOURCES" $SOURCE_PREFIX""$root""$SOURCE_POSTFIX"
198+
fi
188199
done
189200

190201
add_replacement "###SOURCE_ROOTS###" "$SOURCES"

0 commit comments

Comments
 (0)