archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8269760: idea.sh should not invoke cygpath directly

Browse source 
Reviewed-by: mcimadamore, erikj
This commit is contained in:
Jorn Vernee 2021-07-05 10:24:31 +00:00
parent 73198968e2
commit 76783cd8cb
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
bin/idea.sh
View file

@ -153,14 +153,14 @@ add_replacement "###MODULE_NAMES###" "$MODULE_NAMES"
add_replacement "###VCS_TYPE###" "$VCS_TYPE" add_replacement "###VCS_TYPE###" "$VCS_TYPE"
SPEC_DIR=`dirname $SPEC` SPEC_DIR=`dirname $SPEC`
if [ "x$CYGPATH" != "x" ]; then if [ "x$CYGPATH" != "x" ]; then
add_replacement "###BUILD_DIR###" "`cygpath -am $SPEC_DIR`" add_replacement "###BUILD_DIR###" "`$CYGPATH -am $SPEC_DIR`"
add_replacement "###IMAGES_DIR###" "`cygpath -am $SPEC_DIR`/images/jdk" add_replacement "###IMAGES_DIR###" "`$CYGPATH -am $SPEC_DIR`/images/jdk"
add_replacement "###ROOT_DIR###" "`cygpath -am $TOPLEVEL_DIR`" add_replacement "###ROOT_DIR###" "`$CYGPATH -am $TOPLEVEL_DIR`"
add_replacement "###IDEA_DIR###" "`cygpath -am $IDEA_OUTPUT`" add_replacement "###IDEA_DIR###" "`$CYGPATH -am $IDEA_OUTPUT`"
if [ "x$JT_HOME" = "x" ]; then if [ "x$JT_HOME" = "x" ]; then
add_replacement "###JTREG_HOME###" "" add_replacement "###JTREG_HOME###" ""
else else
add_replacement "###JTREG_HOME###" "`cygpath -am $JT_HOME`" add_replacement "###JTREG_HOME###" "`$CYGPATH -am $JT_HOME`"
fi fi
elif [ "x$WSL_DISTRO_NAME" != "x" ]; then elif [ "x$WSL_DISTRO_NAME" != "x" ]; then
add_replacement "###BUILD_DIR###" "`wslpath -am $SPEC_DIR`" add_replacement "###BUILD_DIR###" "`wslpath -am $SPEC_DIR`"
@ -185,7 +185,7 @@ SOURCE_POSTFIX="\" isTestSource=\"false\" />"
for root in $MODULE_ROOTS; do for root in $MODULE_ROOTS; do
if [ "x$CYGPATH" != "x" ]; then if [ "x$CYGPATH" != "x" ]; then
root=`cygpath -am $root` root=`$CYGPATH -am $root`
elif [ "x$WSL_DISTRO_NAME" != "x" ]; then elif [ "x$WSL_DISTRO_NAME" != "x" ]; then
root=`wslpath -am $root` root=`wslpath -am $root`
fi fi
@ -225,10 +225,10 @@ CP=$ANT_HOME/lib/ant.jar
rm -rf $CLASSES; mkdir $CLASSES rm -rf $CLASSES; mkdir $CLASSES
if [ "x$CYGPATH" != "x" ] ; then ## CYGPATH may be set in env.cfg if [ "x$CYGPATH" != "x" ] ; then ## CYGPATH may be set in env.cfg
JAVAC_SOURCE_FILE=`cygpath -am $IDEA_OUTPUT/src/idea/IdeaLoggerWrapper.java` JAVAC_SOURCE_FILE=`$CYGPATH -am $IDEA_OUTPUT/src/idea/IdeaLoggerWrapper.java`
JAVAC_SOURCE_PATH=`cygpath -am $IDEA_OUTPUT/src` JAVAC_SOURCE_PATH=`$CYGPATH -am $IDEA_OUTPUT/src`
JAVAC_CLASSES=`cygpath -am $CLASSES` JAVAC_CLASSES=`$CYGPATH -am $CLASSES`
JAVAC_CP=`cygpath -am $CP` JAVAC_CP=`$CYGPATH -am $CP`
JAVAC=javac JAVAC=javac
elif [ "x$WSL_DISTRO_NAME" != "x" ]; then elif [ "x$WSL_DISTRO_NAME" != "x" ]; then
JAVAC_SOURCE_FILE=`realpath --relative-to=./ $IDEA_OUTPUT/src/idea/IdeaLoggerWrapper.java` JAVAC_SOURCE_FILE=`realpath --relative-to=./ $IDEA_OUTPUT/src/idea/IdeaLoggerWrapper.java`