8213591: running bin/idea.sh in Cygwin: generated project cannot be imported
Reviewed-by: erikj, stuefe, mbaesken
This commit is contained in:
parent
9a79d90cc6
commit
89b7212611
20
bin/idea.sh
20
bin/idea.sh
@ -136,17 +136,33 @@ add_replacement() {
|
|||||||
eval TO$NUM_REPLACEMENTS='$2'
|
eval TO$NUM_REPLACEMENTS='$2'
|
||||||
}
|
}
|
||||||
|
|
||||||
add_replacement "###BUILD_DIR###" "`dirname $SPEC`"
|
|
||||||
add_replacement "###MODULE_NAMES###" "$MODULE_NAMES"
|
add_replacement "###MODULE_NAMES###" "$MODULE_NAMES"
|
||||||
|
SPEC_DIR=`dirname $SPEC`
|
||||||
|
if [ "x$CYGPATH" = "x" ]; then
|
||||||
|
add_replacement "###BUILD_DIR###" "$SPEC_DIR"
|
||||||
add_replacement "###JTREG_HOME###" "$JT_HOME"
|
add_replacement "###JTREG_HOME###" "$JT_HOME"
|
||||||
add_replacement "###IMAGES_DIR###" "`dirname $SPEC`/images/jdk"
|
add_replacement "###IMAGES_DIR###" "$SPEC_DIR/images/jdk"
|
||||||
add_replacement "###ROOT_DIR###" "$TOPLEVEL_DIR"
|
add_replacement "###ROOT_DIR###" "$TOPLEVEL_DIR"
|
||||||
add_replacement "###IDEA_DIR###" "$IDEA_OUTPUT"
|
add_replacement "###IDEA_DIR###" "$IDEA_OUTPUT"
|
||||||
|
else
|
||||||
|
add_replacement "###BUILD_DIR###" "`cygpath -am $SPEC_DIR`"
|
||||||
|
add_replacement "###IMAGES_DIR###" "`cygpath -am $SPEC_DIR`/images/jdk"
|
||||||
|
add_replacement "###ROOT_DIR###" "`cygpath -am $TOPLEVEL_DIR`"
|
||||||
|
add_replacement "###IDEA_DIR###" "`cygpath -am $IDEA_OUTPUT`"
|
||||||
|
if [ "x$JT_HOME" = "x" ]; then
|
||||||
|
add_replacement "###JTREG_HOME###" ""
|
||||||
|
else
|
||||||
|
add_replacement "###JTREG_HOME###" "`cygpath -am $JT_HOME`"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
SOURCE_PREFIX="<sourceFolder url=\"file://"
|
SOURCE_PREFIX="<sourceFolder url=\"file://"
|
||||||
SOURCE_POSTFIX="\" isTestSource=\"false\" />"
|
SOURCE_POSTFIX="\" isTestSource=\"false\" />"
|
||||||
|
|
||||||
for root in $MODULE_ROOTS; do
|
for root in $MODULE_ROOTS; do
|
||||||
|
if [ "x$CYGPATH" != "x" ]; then
|
||||||
|
root=`cygpath -am $root`
|
||||||
|
fi
|
||||||
SOURCES=$SOURCES" $SOURCE_PREFIX""$root""$SOURCE_POSTFIX"
|
SOURCES=$SOURCES" $SOURCE_PREFIX""$root""$SOURCE_POSTFIX"
|
||||||
done
|
done
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user