From 51a4f1dff448c20cec7e95ea9521599391aabacd Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Fri, 15 Jan 2010 14:45:32 +0300 Subject: [PATCH] include vmoptions and correct sh script in pycharm tar.gz --- python/build/pycharm.sh | 60 +++++++++++++++++++++++++++++++++ python/build/pycharm_build.gant | 8 ++++- 2 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 python/build/pycharm.sh diff --git a/python/build/pycharm.sh b/python/build/pycharm.sh new file mode 100644 index 000000000000..1e4284e42361 --- /dev/null +++ b/python/build/pycharm.sh @@ -0,0 +1,60 @@ +#!/bin/sh +# +# ------------------------------------------------------ +# PyCharm Startup Script for Unix +# ------------------------------------------------------ +# + +# --------------------------------------------------------------------- +# Before you run PyCharm specify the location of the +# JDK 1.6 installation directory which will be used for running PyCharm +# --------------------------------------------------------------------- +if [ -z "$PYCHARM_JDK" ]; then + PYCHARM_JDK=$JDK_HOME + if [ -z "$PYCHARM_JDK" ]; then + echo ERROR: cannot start PyCharm. + echo No JDK found to run PyCharm. Please validate either PYCHARM_JDK or JDK_HOME points to valid JDK installation + fi +fi + +#-------------------------------------------------------------------------- +# Ensure the PYCHARM_HOME var for this script points to the +# home directory where PyCharm is installed on your system. + +PYCHARM_HOME=`dirname "$0"`/.. +PYCHARM_BIN_HOME=`dirname "$0"` + +export JAVA_HOME +export PYCHARM_HOME + +if [ -n "$PYCHARM_PROPERTIES" ]; then + PYCHARM_PROPERTIES_PROPERTY=-Didea.properties.file=$PYCHARM_PROPERTIES +fi + +if [ -z "$PYCHARM_MAIN_CLASS_NAME" ]; then + PYCHARM_MAIN_CLASS_NAME="com.intellij.idea.Main" +fi + +if [ -z "$PYCHARM_VM_OPTIONS" ]; then + PYCHARM_VM_OPTIONS="$PYCHARM_HOME/bin/pycharm.vmoptions" +fi + +REQUIRED_JVM_ARGS="-Xbootclasspath/a:../lib/boot.jar -Didea.platform.prefix=Python -Didea.no.jre.check=true $PYCHARM_PROPERTIES_PROPERTY $REQUIRED_JVM_ARGS" +JVM_ARGS=`tr '\n' ' ' < "$PYCHARM_VM_OPTIONS"` +JVM_ARGS="$JVM_ARGS $REQUIRED_JVM_ARGS" + +CLASSPATH=../lib/bootstrap.jar +CLASSPATH=$CLASSPATH:../lib/util.jar +CLASSPATH=$CLASSPATH:../lib/jdom.jar +CLASSPATH=$CLASSPATH:../lib/log4j.jar +CLASSPATH=$CLASSPATH:../lib/extensions.jar +CLASSPATH=$CLASSPATH:../lib/trove4j.jar +CLASSPATH=$CLASSPATH:$PYCHARM_CLASSPATH + +export CLASSPATH + +LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH + +cd "$PYCHARM_BIN_HOME" +exec $PYCHARM_JDK/bin/java $JVM_ARGS $PYCHARM_MAIN_CLASS_NAME $* diff --git a/python/build/pycharm_build.gant b/python/build/pycharm_build.gant index 09bd7df5c098..6ee8475a274f 100644 --- a/python/build/pycharm_build.gant +++ b/python/build/pycharm_build.gant @@ -258,7 +258,13 @@ def buildTarGz() { } tarfileset(dir: "$home/community/bin/linux", prefix: "$tarRoot/bin") tarfileset(dir: "$home/community/bin/nix", filemode: "755", prefix: "$tarRoot/bin") { - include(name: "*.sh") + include(name: "inspect*.sh") + } + tarfileset(dir: "$home/python/build", filemode: "755", prefix: "$tarRoot/bin") { + include(name: "pycharm.sh") + } + tarfileset(dir: "$home/python/build", fullpath: "$tarRoot/bin/pycharm.vmoptions") { + include(name: "pycharm.exe.vmoptions") } }