8309501: Remove workaround in bin/idea.sh for non standard JVMCI file layout

Reviewed-by: dnsimon, erikj
This commit is contained in:
Tom Rodriguez 2023-06-06 15:53:54 +00:00
parent 9188142698
commit 7edd0540e0

View File

@ -193,17 +193,7 @@ for root in $MODULE_ROOTS; do
root=`wslpath -am $root` root=`wslpath -am $root`
fi fi
VM_CI="jdk.internal.vm.ci/share/classes" SOURCES=$SOURCES" $SOURCE_PREFIX""$root""$SOURCE_POSTFIX"
VM_COMPILER="src/jdk.internal.vm.compiler/share/classes"
if test "${root#*$VM_CI}" != "$root" || test "${root#*$VM_COMPILER}" != "$root"; then
for subdir in "$root"/*; do
if [ -d "$subdir" ]; then
SOURCES=$SOURCES" $SOURCE_PREFIX""$subdir"/src"$SOURCE_POSTFIX"
fi
done
else
SOURCES=$SOURCES" $SOURCE_PREFIX""$root""$SOURCE_POSTFIX"
fi
done done
add_replacement "###SOURCE_ROOTS###" "$SOURCES" add_replacement "###SOURCE_ROOTS###" "$SOURCES"
@ -274,4 +264,4 @@ $BOOT_JDK/bin/$JAVAC -d $JAVAC_CLASSES -sourcepath $JAVAC_SOURCE_PATH -cp $JAVAC
if [ "x$WSL_DISTRO_NAME" != "x" ]; then if [ "x$WSL_DISTRO_NAME" != "x" ]; then
rm -rf $ANT_TEMP rm -rf $ANT_TEMP
fi fi