From 244546781033d21aa48f60392cf4d4fcb48fae14 Mon Sep 17 00:00:00 2001 From: Geert Jansen Date: Tue, 5 Nov 2013 08:43:40 +0100 Subject: [PATCH] build: fix windows smp build with gyp Gyp will try a parallel build if it detect the system has >1 processor. This functionality depends on the Python "multiprocessing" package. The multiprocessing package on Windows requires that the top-level module is importable as a module, see: http://docs.python.org/2/library/multiprocessing.html#windows This fixes issue #984. --- README.md | 4 ++-- android-configure | 2 +- gyp_uv => gyp_uv.py | 0 vcbuild.bat | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename gyp_uv => gyp_uv.py (100%) diff --git a/README.md b/README.md index aab9e802..ce43f6d9 100644 --- a/README.md +++ b/README.md @@ -83,14 +83,14 @@ project tree manually: Run: - $ ./gyp_uv -f make + $ ./gyp_uv.py -f make $ make -C out ### OS X Run: - $ ./gyp_uv -f xcode + $ ./gyp_uv.py -f xcode $ xcodebuild -project uv.xcodeproj -configuration Release -target All ### Android diff --git a/android-configure b/android-configure index d5c937e5..56625761 100755 --- a/android-configure +++ b/android-configure @@ -16,5 +16,5 @@ export PLATFORM=android if [ $2 -a $2 == 'gyp' ] then - ./gyp_uv -Dtarget_arch=arm -DOS=android + ./gyp_uv.py -Dtarget_arch=arm -DOS=android fi diff --git a/gyp_uv b/gyp_uv.py similarity index 100% rename from gyp_uv rename to gyp_uv.py diff --git a/vcbuild.bat b/vcbuild.bat index 1b2f865a..0b7ea481 100644 --- a/vcbuild.bat +++ b/vcbuild.bat @@ -91,7 +91,7 @@ exit /b 1 :have_gyp if not defined PYTHON set PYTHON="python" -%PYTHON% gyp_uv -Dtarget_arch=%target_arch% -Dlibrary=%library% +%PYTHON% gyp_uv.py -Dtarget_arch=%target_arch% -Dlibrary=%library% if errorlevel 1 goto create-msvs-files-failed if not exist uv.sln goto create-msvs-files-failed echo Project files generated.