Author: mattip <[email protected]> Branch: Changeset: r91206:064a4230a254 Date: 2017-05-08 21:56 +0300 http://bitbucket.org/pypy/pypy/changeset/064a4230a254/
Log: update prebuilt external dependencies for win32 diff --git a/pypy/doc/windows.rst b/pypy/doc/windows.rst --- a/pypy/doc/windows.rst +++ b/pypy/doc/windows.rst @@ -120,7 +120,7 @@ Download the versions of all the external packages from https://bitbucket.org/pypy/pypy/downloads/local_5.8.zip (for post-5.7.1 builds) with sha256 checksum -``f1510452293f22e84d6059464e11f4c62ffd0e2ee97a52be9195bec8a70c6dce`` or +``fbe769bf3a4ab6f5a8b0a05b61930fc7f37da2a9a85a8f609cf5a9bad06e2554`` or https://bitbucket.org/pypy/pypy/downloads/local_2.4.zip (for 2.4 release and later) or https://bitbucket.org/pypy/pypy/downloads/local.zip @@ -128,9 +128,9 @@ Then expand it into the base directory (base_dir) and modify your environment to reflect this:: - set PATH=<base_dir>\bin;<base_dir>\tcltk\bin;%PATH% - set INCLUDE=<base_dir>\include;<base_dir>\tcltk\include;%INCLUDE% - set LIB=<base_dir>\lib;<base_dir>\tcltk\lib;%LIB% + set PATH=<base_dir>\bin;%PATH% + set INCLUDE=<base_dir>\include;%INCLUDE% + set LIB=<base_dir>\lib;%LIB% Now you should be good to go. If you choose this method, you do not need to download/build anything else. @@ -236,6 +236,9 @@ copy out32\*.lib <somewhere in LIB> xcopy /S include\openssl <somewhere in INCLUDE> +For tests you will also need the dlls:: + nmake -f ms\ntdll.mak install + copy out32dll\*.dll <somewhere in PATH> TkInter module support ~~~~~~~~~~~~~~~~~~~~~~ @@ -245,18 +248,17 @@ directory found for the release script, create the dlls, libs, headers and runtime by running:: - svn export http://svn.python.org/projects/external/tcl-8.5.2.1 tcl85 - svn export http://svn.python.org/projects/external/tk-8.5.2.0 tk85 - cd tcl85\win - nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=0 INSTALLDIR=..\..\tcltk clean all - nmake -f makefile.vc DEBUG=0 INSTALLDIR=..\..\tcltk install - cd ..\..\tk85\win - nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl85 clean all - nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl85 install - -Now you should have a tcktk\bin, tcltk\lib, and tcltk\include directory ready -for use. The release packaging script will pick up the tcltk runtime in the lib -directory and put it in the archive. + svn export http://svn.python.org/projects/external/tcl-8.5.2.1 tcl85 + svn export http://svn.python.org/projects/external/tk-8.5.2.0 tk85 + cd tcl85\win + nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=0 INSTALLDIR=..\..\tcltk clean all + nmake -f makefile.vc DEBUG=0 INSTALLDIR=..\..\tcltk install + cd ..\..\tk85\win + nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl85 clean all + nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl85 install + copy ..\..\tcltk\bin\* <somewhere in PATH> + copy ..\..\tcltk\lib\*.lib <somewhere in LIB> + xcopy /S ..\..\tcltk\include <somewhere in INCLUDE> The lzma compression library ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pypy/tool/release/package.py b/pypy/tool/release/package.py --- a/pypy/tool/release/package.py +++ b/pypy/tool/release/package.py @@ -161,9 +161,9 @@ tktcldir = p.dirpath().join('..').join('lib') shutil.copytree(str(tktcldir), str(pypydir.join('tcl'))) except WindowsError: - print >>sys.stderr, """Packaging Tk runtime failed. -tk85.dll and tcl85.dll found, expecting to find runtime in ..\\lib -directory next to the dlls, as per build instructions.""" + print >>sys.stderr, r"""Packaging Tk runtime failed. +tk85.dll and tcl85.dll found in %s, expecting to find runtime in %s +directory next to the dlls, as per build instructions.""" %(p, tktcldir) import traceback;traceback.print_exc() raise MissingDependenciesError('Tk runtime') _______________________________________________ pypy-commit mailing list [email protected] https://mail.python.org/mailman/listinfo/pypy-commit
