MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Revert "Merge branch 'master' of git.labs.intellij.net:idea/ultimate""

Browse Source 
This reverts commit 3a2ad1f6c248ce02e860be14b796981de7ccfeee.
This commit is contained in:
Dmitry Trofimov
2011-02-04 17:17:18 +03:00
parent 819731653c
commit 67bcf88cbd
25 changed files with 193 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/build/pycharm.sh
+2 -2
View File
@@ -26,7 +26,7 @@ if [ -z "$PYCHARM_JDK" ]; then
fi
if [ -z "$PYCHARM_JDK" ]; then
echo ERROR: cannot start PyCharm.
echo No JDK found to run PyCharm. Please validate either PYCHARM_JDK, JDK_HOME or JAVA_HOME points to valid JDK installation.
echo No JDK found to run PyCharm. Please validate either PYCHARM_JDK, JDK_HOME or JAVA_HOME environment variable points to valid JDK installation.
echo
echo Press Enter to continue.
read IGNORE
@@ -47,7 +47,7 @@ if [ $OPEN_JDK -eq 0 ]; then
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 PYCHARM_JDK or JDK_HOME points to valid Sun JDK installation
echo please validate either PYCHARM_JDK or JDK_HOME environment variable points to valid Sun JDK installation
echo
echo Press Enter to continue.
read IGNORE
python/build/pycharm_build.gant
+1 -1
View File
@@ -280,7 +280,7 @@ def build_searchable_options() {
ant.copy(file: "$home/build/idea.license", todir: paths.ideaSystem)
ant.copy(file: "$home/build/pycharm.license", todir: paths.ideaSystem)
ant.java(classname: "com.intellij.idea.Main", fork: "true") {
jvmarg(line: "-ea -Xmx250m -Didea.home.path=$home -Didea.system.path=${paths.ideaSystem} -Didea.config.path=${paths.ideaConfig} -Didea.platform.prefix=Python")
jvmarg(line: "-ea -Xmx250m -Didea.home.path=$home -Didea.system.path=${paths.ideaSystem} -Didea.config.path=${paths.ideaConfig} -Didea.platform.prefix=Python -Didea.no.jre.check=true")
jvmarg(value: "-Xbootclasspath/a:${boot.output}")
arg(line: "traverseUI ${dest_dir}/searchableOptions.xml")