build: Run normal config.py script from configure.bat

peter-b · peter-b · commit d6aed7640084 · 2017-02-06T11:55:14.000Z
Rework the `configure.bat` script to run the new `config.py` script
rather than running gyp directly, and remove redundant checks.

This patch does _not_ move the checks for SDKs into `config.py`.
If running `config.py` directly, you presumably know what you are
doing and can add `-Dms_speech_sdk5=C:\path` directly; if you
don't, the gyp input files already provide suitable default values.
diff --git a/configure.bat b/configure.bat
@@ -9,27 +9,10 @@ SET warnings=0
 REM Not all versions of windows the the %programfiles(x86)% variable
 IF NOT DEFINED programfiles(x86) SET programfiles(x86)=%programfiles%
 
-REM When calling configure.bat from the command line, BUILD_EDITION is not defined
-IF NOT DEFINED BUILD_EDITION SET BUILD_EDITION="community"
-
 REM Note: to test whether a directory exists in batch script, you need to check
 REM whether a file within that directory exists. Easiest way to do this is to
 REM add the "*" wildcard after the directory
 
-REM Attempt to locate a copy of Perl
-WHERE /Q perl 1>NUL 2>NUL
-IF %ERRORLEVEL% NEQ 0 (
-  IF EXIST C:\perl64\bin\perl.exe (
-    SET extra_options=%extra_options% -Dperl="C:/perl64/bin/perl.exe"
-  ) ELSE IF EXIST C:\perl\bin\perl.exe (
-    SET extra_options=%extra_options% -Dperl="C:/perl/bin/perl.exe"
-  ) ELSE (
-    ECHO >&2 Error: could not locate a copy of perl
-    PAUSE
-    EXIT 1
-  )
-)
-
 REM Attempt to locate a copy of Python
 WHERE /Q python 1>NUL 2>NUL
 IF %ERRORLEVEL% NEQ 0 (
@@ -74,13 +57,8 @@ IF EXIST "%programfiles(x86)%\Microsoft Speech SDK\*" (
 REM Pause so any warnings can be seen
 IF %warnings% NEQ 0 PAUSE
 
-REM Community or commercial?
-IF /I %BUILD_EDITION% == commercial (
-  SET gypfile="../livecode-commercial.gyp"
-)
-
 REM Run the configure step
-%python% gyp\gyp_main.py --format msvs --depth . --generator-output build-win-x86/livecode -Gmsvs_version=2010 %extra_options% %gypfile%
+%python% config.py --platform win-x86 %extra_options% %gypfile%
 PAUSE
 
 REM Pause if there was an error so that the user gets a chance to see it
