mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-01-08 15:09:39 +07:00
Startup scripts unified a bit; regression in Java lookup on Macs fixed
This commit is contained in:
Roman Shevchenko
113
bin/nix/idea.sh
113
bin/nix/idea.sh
@@ -6,49 +6,45 @@
|
||||
#
|
||||
|
||||
# ---------------------------------------------------------------------
|
||||
# Before you run IntelliJ IDEA specify the location of the
|
||||
# JDK 1.6 installation directory which will be used for running IDEA
|
||||
# ---------------------------------------------------------------------
|
||||
[ `uname -s` = "Darwin" ] && OS_TYPE="MAC" || OS_TYPE="NOT_MAC"
|
||||
# Before you run IntelliJ IDEA specify the location of the
|
||||
# JDK 1.6 installation directory which will be used for running it.
|
||||
|
||||
if [ -z "$IDEA_JDK" ]; then
|
||||
IDEA_JDK=$JDK_HOME
|
||||
# if jdk still isn't defined and JAVA_HOME looks correct. "tools.jar" isn't included in Mac OS Java bundle
|
||||
if [ -z "$IDEA_JDK" ] && ([ "$OS_TYPE" = "MAC" -a -x "$JAVA_HOME/bin/java" ] || [ -f "$JAVA_HOME/lib/tools.jar" ]); then
|
||||
IDEA_JDK=$JAVA_HOME
|
||||
JDK="$IDEA_JDK"
|
||||
if [ -z "$JDK" ]; then
|
||||
[ `uname -s` = "Darwin" ] && OS_TYPE="MAC" || OS_TYPE="NOT_MAC"
|
||||
JDK="$JDK_HOME"
|
||||
# if JDK_HOME not defined and JAVA_HOME looks correct (tools.jar isn't included in Mac OS X Java bundle)
|
||||
if [ -z "$JDK" ] && ([ "$OS_TYPE" = "MAC" -a -x "$JAVA_HOME/bin/java" ] || [ -f "$JAVA_HOME/lib/tools.jar" ]); then
|
||||
JDK="$JAVA_HOME"
|
||||
fi
|
||||
|
||||
if [ -z "$IDEA_JDK" ]; then
|
||||
# Try to get the jdk path from java binary path
|
||||
if [ -z "$JDK" ]; then
|
||||
# try to get the JDK path from java binary path
|
||||
JAVA_BIN_PATH=`which java`
|
||||
|
||||
if [ -n "$JAVA_BIN_PATH" ]; then
|
||||
# Mac readlink doesn't support -f option.
|
||||
[ "$OS_TYPE" = "MAC" ] && CANONICALIZE_OPTION="" || CANONICALIZE_OPTION="-f"
|
||||
|
||||
JAVA_LOCATION=`readlink $CANONICALIZE_OPTION $JAVA_BIN_PATH`
|
||||
case "$JAVA_LOCATION" in
|
||||
*/jre/bin/java)
|
||||
JAVA_LOCATION=`echo "$JAVA_LOCATION" | xargs dirname | xargs dirname | xargs dirname` ;;
|
||||
*)
|
||||
JAVA_LOCATION=`echo "$JAVA_LOCATION" | xargs dirname | xargs dirname` ;;
|
||||
esac
|
||||
|
||||
if [ "$OS_TYPE" = "MAC" ]; then
|
||||
JAVA_LOCATION=`readlink "$JAVA_BIN_PATH" | xargs dirname | xargs dirname | xargs dirname`
|
||||
if [ -x "$JAVA_LOCATION/CurrentJDK/Home/bin/java" ]; then
|
||||
IDEA_JDK="$JAVA_LOCATION/CurrentJDK/Home"
|
||||
JDK="$JAVA_LOCATION/CurrentJDK/Home"
|
||||
fi
|
||||
else
|
||||
JAVA_LOCATION=`readlink -f "$JAVA_BIN_PATH"`
|
||||
case "$JAVA_LOCATION" in
|
||||
*/jre/bin/java)
|
||||
JAVA_LOCATION=`echo "$JAVA_LOCATION" | xargs dirname | xargs dirname | xargs dirname` ;;
|
||||
*)
|
||||
JAVA_LOCATION=`echo "$JAVA_LOCATION" | xargs dirname | xargs dirname` ;;
|
||||
esac
|
||||
if [ -x "$JAVA_LOCATION/bin/java" ]; then
|
||||
IDEA_JDK="$JAVA_LOCATION"
|
||||
JDK="$JAVA_LOCATION"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ -z "$IDEA_JDK" ]; then
|
||||
if [ -z "$JDK" ]; then
|
||||
echo ERROR: cannot start IntelliJ IDEA.
|
||||
echo No JDK found to run IDEA. Please validate either IDEA_JDK, JDK_HOME or JAVA_HOME environment variable points to valid JDK installation.
|
||||
echo No JDK found. Please validate either IDEA_JDK, JDK_HOME or JAVA_HOME environment variable points to valid JDK installation.
|
||||
echo
|
||||
echo Press Enter to continue.
|
||||
read IGNORE
|
||||
@@ -57,19 +53,19 @@ if [ -z "$IDEA_JDK" ]; then
|
||||
fi
|
||||
|
||||
VERSION_LOG='/tmp/java.version.log'
|
||||
$IDEA_JDK/bin/java -version 2> $VERSION_LOG
|
||||
$JDK/bin/java -version 2> $VERSION_LOG
|
||||
grep 'OpenJDK' $VERSION_LOG
|
||||
OPEN_JDK=$?
|
||||
grep '64-Bit' $VERSION_LOG
|
||||
BITS=$?
|
||||
rm $VERSION_LOG
|
||||
if [ $OPEN_JDK -eq 0 ]; then
|
||||
echo WARNING: You are launching IDE using OpenJDK Java runtime
|
||||
echo WARNING: You are launching IDE using OpenJDK Java runtime.
|
||||
echo
|
||||
echo THIS IS STRICTLY UNSUPPORTED DUE TO KNOWN PERFORMANCE AND GRAPHICS PROBLEMS
|
||||
echo THIS IS STRICTLY UNSUPPORTED DUE TO KNOWN PERFORMANCE AND GRAPHICS PROBLEMS!
|
||||
echo
|
||||
echo NOTE: If you have both Sun JDK and OpenJDK installed
|
||||
echo please validate either IDEA_JDK or JDK_HOME environment variable points to valid Sun JDK installation
|
||||
echo please validate either IDEA_JDK, JDK_HOME, or JAVA_HOME environment variable points to valid Sun JDK installation.
|
||||
echo
|
||||
echo Press Enter to continue.
|
||||
read IGNORE
|
||||
@@ -81,50 +77,50 @@ else
|
||||
fi
|
||||
|
||||
#--------------------------------------------------------------------------
|
||||
# Ensure the IDEA_HOME var for this script points to the
|
||||
# Ensure the IDE_HOME var for this script points to the
|
||||
# home directory where IntelliJ IDEA is installed on your system.
|
||||
|
||||
SCRIPT_LOCATION=$0
|
||||
# Step through symlinks to find where the script really is
|
||||
# step through symlinks to find where the script really is
|
||||
while [ -L "$SCRIPT_LOCATION" ]; do
|
||||
SCRIPT_LOCATION=`readlink -e "$SCRIPT_LOCATION"`
|
||||
done
|
||||
|
||||
IDEA_HOME=`dirname "$SCRIPT_LOCATION"`/..
|
||||
IDEA_BIN_HOME=`dirname "$SCRIPT_LOCATION"`
|
||||
|
||||
export JAVA_HOME
|
||||
export IDEA_HOME
|
||||
IDE_HOME=`dirname "$SCRIPT_LOCATION"`/..
|
||||
IDE_BIN_HOME=`dirname "$SCRIPT_LOCATION"`
|
||||
|
||||
if [ -n "$IDEA_PROPERTIES" ]; then
|
||||
IDEA_PROPERTIES_PROPERTY=-Didea.properties.file=$IDEA_PROPERTIES
|
||||
IDE_PROPERTIES_PROPERTY="-Didea.properties.file=\"$IDEA_PROPERTIES\""
|
||||
fi
|
||||
|
||||
if [ -z "$IDEA_MAIN_CLASS_NAME" ]; then
|
||||
IDEA_MAIN_CLASS_NAME="com.intellij.idea.Main"
|
||||
MAIN_CLASSNAME="$IDEA_MAIN_CLASS_NAME"
|
||||
if [ -z "$MAIN_CLASS_NAME" ]; then
|
||||
MAIN_CLASS_NAME="com.intellij.idea.Main"
|
||||
fi
|
||||
|
||||
if [ -z "$IDEA_VM_OPTIONS" ]; then
|
||||
IDEA_VM_OPTIONS="$IDEA_HOME/bin/idea.vmoptions"
|
||||
VM_OPTIONS_FILE="$IDEA_VM_OPTIONS"
|
||||
if [ -z "$VM_OPTIONS_FILE" ]; then
|
||||
VM_OPTIONS_FILE="$IDE_BIN_HOME/idea.vmoptions"
|
||||
fi
|
||||
|
||||
[ -f "$IDEA_HOME/Contents/Info.plist" ] && BUNDLE_TYPE="MAC" || BUNDLE_TYPE="NOT_MAC"
|
||||
|
||||
# If vmoptions file exists - use it
|
||||
if [ -r "$IDEA_VM_OPTIONS" ]; then
|
||||
JVM_ARGS=`tr '\n' ' ' < "$IDEA_VM_OPTIONS"`
|
||||
|
||||
# don't extract vm options from Info.plist in mac bundle
|
||||
# if VM options file exists - use it
|
||||
if [ -r "$VM_OPTIONS_FILE" ]; then
|
||||
JVM_ARGS=`tr '\n' ' ' < "$VM_OPTIONS_FILE"`
|
||||
JVM_ARGS="$JVM_ARGS -Djb.vmOptionsFile=\"$VM_OPTIONS_FILE\""
|
||||
# only extract properties (not VM options) from Info.plist
|
||||
INFO_PLIST_PARSER_OPTIONS=""
|
||||
else
|
||||
[ "$BUNDLE_TYPE" = "MAC" ] && [ "$BITS" == "64" ] && INFO_PLIST_PARSER_OPTIONS=" 64" || INFO_PLIST_PARSER_OPTIONS=" 32"
|
||||
[ "$BITS" == "64" ] && INFO_PLIST_PARSER_OPTIONS=" 64" || INFO_PLIST_PARSER_OPTIONS=" 32"
|
||||
fi
|
||||
|
||||
# In MacOS ./Contents/Info.plist describes all vm options & system properties
|
||||
[ "$OS_TYPE" = "MAC" ] && [ "$BUNDLE_TYPE" = "MAC" ] && [ -z "$IDEA_PROPERTIES_PROPERTY" ] && MAC_IDEA_PROPERTIES="`osascript \"$IDEA_BIN_HOME/info_plist_parser.scpt\"$INFO_PLIST_PARSER_OPTIONS`" || MAC_IDEA_PROPERTIES=""
|
||||
REQUIRED_JVM_ARGS="-Xbootclasspath/a:../lib/boot.jar -Didea.paths.selector=@@system_selector@@ $IDEA_PROPERTIES_PROPERTY $REQUIRED_JVM_ARGS $MAC_IDEA_PROPERTIES"
|
||||
# in Mac OS X ./Contents/Info.plist describes all VM options & system properties
|
||||
if [ -f "$IDE_HOME/Contents/Info.plist" -a -z "$IDE_PROPERTIES_PROPERTY" ]; then
|
||||
MAC_VM_OPTIONS="`osascript \"$IDE_BIN_HOME/info_plist_parser.scpt\"$INFO_PLIST_PARSER_OPTIONS`"
|
||||
fi
|
||||
|
||||
JVM_ARGS=`eval echo $JVM_ARGS $REQUIRED_JVM_ARGS`
|
||||
REQUIRED_JVM_ARGS="-Xbootclasspath/a:../lib/boot.jar -Didea.paths.selector=@@system_selector@@ $IDE_PROPERTIES_PROPERTY $REQUIRED_JVM_ARGS"
|
||||
|
||||
JVM_ARGS="$JVM_ARGS $REQUIRED_JVM_ARGS $MAC_VM_OPTIONS"
|
||||
|
||||
CLASSPATH=../lib/bootstrap.jar
|
||||
CLASSPATH=$CLASSPATH:../lib/util.jar
|
||||
@@ -132,16 +128,15 @@ CLASSPATH=$CLASSPATH:../lib/jdom.jar
|
||||
CLASSPATH=$CLASSPATH:../lib/log4j.jar
|
||||
CLASSPATH=$CLASSPATH:../lib/extensions.jar
|
||||
CLASSPATH=$CLASSPATH:../lib/trove4j.jar
|
||||
CLASSPATH=$CLASSPATH:$IDEA_JDK/lib/tools.jar
|
||||
CLASSPATH=$CLASSPATH:$JDK/lib/tools.jar
|
||||
CLASSPATH=$CLASSPATH:$IDEA_CLASSPATH
|
||||
|
||||
export CLASSPATH
|
||||
|
||||
LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH
|
||||
export LD_LIBRARY_PATH
|
||||
|
||||
cd "$IDEA_BIN_HOME"
|
||||
cd "$IDE_BIN_HOME"
|
||||
while true ; do
|
||||
$IDEA_JDK/bin/java $JVM_ARGS -Djb.restart.code=88 $IDEA_MAIN_CLASS_NAME $*
|
||||
eval $JDK/bin/java $JVM_ARGS -Djb.restart.code=88 $MAIN_CLASS_NAME $*
|
||||
test $? -ne 88 && break
|
||||
done
|
||||
|
||||
@@ -192,7 +192,7 @@ public class VMOptions {
|
||||
|
||||
@NotNull
|
||||
private static String doGetSettingsFilePath() {
|
||||
String vmOptionsFile = System.getProperty("idea.vmOptionsFile");
|
||||
String vmOptionsFile = System.getProperty("jb.vmOptionsFile");
|
||||
if (!StringUtil.isEmptyOrSpaces(vmOptionsFile)) return vmOptionsFile;
|
||||
|
||||
final String productName = ApplicationNamesInfo.getInstance().getProductName().toLowerCase();
|
||||
|
||||
Reference in New Issue
Block a user