diff --git a/python/build/build-debug-binaries/build-debug-binaries.iml b/python/build/build-debug-binaries/build-debug-binaries.iml new file mode 100644 index 000000000000..5c388319d4ba --- /dev/null +++ b/python/build/build-debug-binaries/build-debug-binaries.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/python/build/build-debug-binaries/src/build.gradle b/python/build/build-debug-binaries/src/build.gradle new file mode 100644 index 000000000000..6ed4dc05159d --- /dev/null +++ b/python/build/build-debug-binaries/src/build.gradle @@ -0,0 +1,68 @@ +import org.apache.tools.ant.taskdefs.condition.Os + +plugins { + id "com.jetbrains.python.envs" version "0.0.19" +} + +ext { + pydevDir = new File(projectDir, '/../../../helpers/pydev/') +} + +envs { + def customBuildDir = System.getenv().get("PYCHARM_BUILD_DIR") + project.buildDir = customBuildDir? new File(customBuildDir): buildDir + bootstrapDirectory = new File(buildDir, 'pythons') + envsDirectory = new File(buildDir, 'envs') + + conda "Miniconda3_64", "Miniconda3-latest", "64" + + condaenv "py27_64", "2.7", "Miniconda3_64", ["cython"] + condaenv "py34_64", "3.4", "Miniconda3_64", ["cython"] + condaenv "py35_64", "3.5", "Miniconda3_64", ["cython"] + condaenv "py36_64", "3.6", "Miniconda3_64", ["cython"] + + if (Os.isFamily(Os.FAMILY_WINDOWS)) { + conda "Miniconda3_32", "Miniconda3-latest", "32" + + condaenv "py27_32", "2.7", "Miniconda3_32", ["cython"] + condaenv "py34_32", "3.4", "Miniconda3_32", ["cython"] + condaenv "py35_32", "3.5", "Miniconda3_32", ["cython"] + condaenv "py36_32", "3.6", "Miniconda3_32", ["cython"] + } +} + +task buildBinariesOnWindows(dependsOn: 'build_envs') << { + exec { + workingDir pydevDir + + environment PYTHONPATH: pydevDir, + MINICONDA32_ENVS: envs.envsDirectory, + MINICONDA64_ENVS: envs.envsDirectory + + commandLine "${envs.envsDirectory}/py27_32/python.exe", "build_tools/build_binaries_windows.py" + } +} + +task buildBinariesOnMac(dependsOn: 'build_envs') << { + exec { + workingDir pydevDir + + environment PYTHONPATH: pydevDir, + MINICONDA64_ENVS: envs.envsDirectory + + commandLine "${envs.envsDirectory}/py36_64/bin/python", "build_tools/build_binaries_osx.py" + } +} + +task buildBinaries() { + if (Os.isFamily(Os.FAMILY_WINDOWS)) { + dependsOn buildBinariesOnWindows + } + else if (Os.isFamily(Os.FAMILY_MAC)) { + dependsOn buildBinariesOnMac + } +} + +task wrapper(type: Wrapper) << { + gradleVersion = '4.2' +} \ No newline at end of file diff --git a/python/build/build-debug-binaries/src/gradle/wrapper/gradle-wrapper.jar b/python/build/build-debug-binaries/src/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 000000000000..736fb7d3f94c Binary files /dev/null and b/python/build/build-debug-binaries/src/gradle/wrapper/gradle-wrapper.jar differ diff --git a/python/build/build-debug-binaries/src/gradle/wrapper/gradle-wrapper.properties b/python/build/build-debug-binaries/src/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000000..52dd1f04434c --- /dev/null +++ b/python/build/build-debug-binaries/src/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-bin.zip diff --git a/python/build/build-debug-binaries/src/gradlew b/python/build/build-debug-binaries/src/gradlew new file mode 100755 index 000000000000..cccdd3d517fc --- /dev/null +++ b/python/build/build-debug-binaries/src/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/python/build/build-debug-binaries/src/gradlew.bat b/python/build/build-debug-binaries/src/gradlew.bat new file mode 100644 index 000000000000..f9553162f122 --- /dev/null +++ b/python/build/build-debug-binaries/src/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/python/helpers/pydev/_pydevd_bundle/pydevd_cython_darwin_27_64.so b/python/helpers/pydev/_pydevd_bundle/pydevd_cython_darwin_27_64.so new file mode 100644 index 000000000000..961012a8d976 Binary files /dev/null and b/python/helpers/pydev/_pydevd_bundle/pydevd_cython_darwin_27_64.so differ diff --git a/python/helpers/pydev/_pydevd_bundle/pydevd_cython_darwin_34_64.so b/python/helpers/pydev/_pydevd_bundle/pydevd_cython_darwin_34_64.so new file mode 100644 index 000000000000..94e5bec20cf6 Binary files /dev/null and b/python/helpers/pydev/_pydevd_bundle/pydevd_cython_darwin_34_64.so differ diff --git a/python/helpers/pydev/_pydevd_bundle/pydevd_cython_darwin_35_64.cpython-35m-darwin.so b/python/helpers/pydev/_pydevd_bundle/pydevd_cython_darwin_35_64.cpython-35m-darwin.so new file mode 100644 index 000000000000..5af22faf59a0 Binary files /dev/null and b/python/helpers/pydev/_pydevd_bundle/pydevd_cython_darwin_35_64.cpython-35m-darwin.so differ diff --git a/python/helpers/pydev/_pydevd_bundle/pydevd_cython_darwin_36_64.cpython-36m-darwin.so b/python/helpers/pydev/_pydevd_bundle/pydevd_cython_darwin_36_64.cpython-36m-darwin.so new file mode 100644 index 000000000000..baa863fc2cfe Binary files /dev/null and b/python/helpers/pydev/_pydevd_bundle/pydevd_cython_darwin_36_64.cpython-36m-darwin.so differ diff --git a/python/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_darwin_36_64.cpython-36m-darwin.so b/python/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_darwin_36_64.cpython-36m-darwin.so new file mode 100644 index 000000000000..81eb1885af9f Binary files /dev/null and b/python/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_darwin_36_64.cpython-36m-darwin.so differ diff --git a/python/helpers/pydev/build.gradle b/python/helpers/pydev/build.gradle deleted file mode 100644 index 90dcc468e8fa..000000000000 --- a/python/helpers/pydev/build.gradle +++ /dev/null @@ -1,43 +0,0 @@ -import org.apache.tools.ant.taskdefs.condition.Os - -plugins { - id "com.jetbrains.python.envs" version "0.0.10" -} - -envs { - project.buildDir = new File(System.getenv().getOrDefault("PYCHARM_BUILD_DIR", buildDir)) - bootstrapDirectory = new File(buildDir, 'pythons') - envsDirectory = new File(buildDir, 'envs') - minicondaVersion = 'latest' - packages = ["cython", "pip", "setuptools"] - - conda "py27_64", "2.7", ["wheel", "twine"], false - conda "py34_64", "3.4", ["wheel", "twine"], false - conda "py35_64", "3.5", ["wheel", "twine"], false - conda "py36_64", "3.6", ["wheel", "twine"], false - conda "py27_32", "2.7", ["wheel", "twine"], false - conda "py34_32", "3.4", ["wheel", "twine"], false - conda "py35_32", "3.5", ["wheel", "twine"], false - conda "py36_32", "3.6", ["wheel", "twine"], false -} - -task buildBinariesOnWindows(dependsOn: 'build_envs') << { - exec { - workingDir projectDir - - environment PYTHONPATH: projectDir, - MINICONDA32_ENVS: envs.envsDirectory, - MINICONDA64_ENVS: envs.envsDirectory - - commandLine "${envs.envsDirectory}/py27_32/python.exe", "build_tools/build_binaries_windows.py" - } -} - -task buildBinaries() { - if (Os.isFamily(Os.FAMILY_WINDOWS)) { - dependsOn buildBinariesOnWindows - } - else if (Os.isFamily(Os.FAMILY_MAC)) { - dependsOn buildOnMac - } -} diff --git a/python/helpers/pydev/build_tools/build.py b/python/helpers/pydev/build_tools/build.py index 179f20e0cacd..63a3f0d83bb5 100644 --- a/python/helpers/pydev/build_tools/build.py +++ b/python/helpers/pydev/build_tools/build.py @@ -81,15 +81,17 @@ def get_environment_from_batch_command(env_cmd, initial=None): proc.communicate() return result -def remove_binaries(): + +def remove_binaries(suffixes): for f in os.listdir(os.path.join(root_dir, '_pydevd_bundle')): - if f.endswith('.pyd'): - remove_if_exists(os.path.join(root_dir, '_pydevd_bundle', f)) + for suffix in suffixes: + if f.endswith(suffix): + remove_if_exists(os.path.join(root_dir, '_pydevd_bundle', f)) + def build(): if '--no-remove-binaries' not in sys.argv: - remove_binaries() - + remove_binaries(['.pyd', '.so']) os.chdir(root_dir) @@ -159,7 +161,7 @@ if __name__ == '__main__': if use_cython == 'YES': build() elif use_cython == 'NO': - remove_binaries() + remove_binaries(['.pyd', '.so']) elif use_cython is None: # Regular process if '--no-regenerate-files' not in sys.argv: diff --git a/python/helpers/pydev/build_tools/build_binaries_osx.py b/python/helpers/pydev/build_tools/build_binaries_osx.py new file mode 100644 index 000000000000..9289ac925b41 --- /dev/null +++ b/python/helpers/pydev/build_tools/build_binaries_osx.py @@ -0,0 +1,66 @@ + +from __future__ import unicode_literals + +import os +import subprocess +import sys + +miniconda64_envs = os.getenv('MINICONDA64_ENVS') +python_installations = [ + r'%s/py27_64/bin/python' % miniconda64_envs, + r'%s/py34_64/bin/python' % miniconda64_envs, + r'%s/py35_64/bin/python' % miniconda64_envs, + r'%s/py36_64/bin/python' % miniconda64_envs, + ] +root_dir = os.path.dirname(os.path.dirname(__file__)) + + +def list_binaries(): + for f in os.listdir(os.path.join(root_dir, '_pydevd_bundle')): + if f.endswith('.so'): + yield f + + +def extract_version(python_install): + return python_install.split('/')[-3][2:] + + +def main(): + from generate_code import generate_dont_trace_files + from generate_code import generate_cython_module + + # First, make sure that our code is up to date. + generate_dont_trace_files() + generate_cython_module() + + for python_install in python_installations: + assert os.path.exists(python_install) + + from build import remove_binaries + remove_binaries(['.so']) + + for f in list_binaries(): + raise AssertionError('Binary not removed: %s' % (f,)) + + for i, python_install in enumerate(python_installations): + new_name = 'pydevd_cython_%s_%s' % (sys.platform, extract_version(python_install)) + args = [ + python_install, os.path.join(root_dir, 'build_tools', 'build.py'), '--no-remove-binaries', '--target-pyd-name=%s' % new_name, '--force-cython'] + if i != 0: + args.append('--no-regenerate-files') + if extract_version(python_install).startswith('36'): + name_frame_eval = 'pydevd_frame_evaluator_%s_%s' % (sys.platform, extract_version(python_install)) + args.append('--target-pyd-frame-eval=%s' % name_frame_eval) + print('Calling: %s' % (' '.join(args))) + subprocess.check_call(args) + + +if __name__ == '__main__': + main() + +''' +To run do: +cd /D x:\PyDev.Debugger +export PYTHONPATH="x:\PyDev.Debugger" +C:\tools\Miniconda32\envs\py27_32\python build_tools\build_binaries_osx.py +''' diff --git a/python/helpers/pydev/build_tools/build_binaries_windows.py b/python/helpers/pydev/build_tools/build_binaries_windows.py index 1c8980e8f6e5..60a409515b5b 100644 --- a/python/helpers/pydev/build_tools/build_binaries_windows.py +++ b/python/helpers/pydev/build_tools/build_binaries_windows.py @@ -105,7 +105,7 @@ def main(): assert os.path.exists(python_install) from build import remove_binaries - remove_binaries() + remove_binaries(['.pyd']) for f in list_binaries(): raise AssertionError('Binary not removed: %s' % (f,))