committed (admittedly) untested changes for batch files to respect %MAKEPANDA_THIRDPARTY%

This commit is contained in:
rdb 2010-12-01 20:38:26 +00:00
parent 304dd37afa
commit 5d7cf87d82
4 changed files with 22 additions and 10 deletions

View File

@ -6,9 +6,12 @@ REM and the python interpreter. If we can find both, then
REM run 'expandimports'. REM run 'expandimports'.
REM REM
set thirdparty=thirdparty
if defined MAKEPANDA_THIRDPARTY set thirdparty=%MAKEPANDA_THIRDPARTY%
if not exist makepanda\expandimports.py goto :missing1 if not exist makepanda\expandimports.py goto :missing1
if not exist thirdparty\win-python\python.exe goto :missing2 if not exist %thirdparty%\win-python\python.exe goto :missing2
thirdparty\win-python\python.exe makepanda\expandimports.py %* %thirdparty%\win-python\python.exe makepanda\expandimports.py %*
goto done goto done
:missing1 :missing1

View File

@ -6,9 +6,12 @@ REM and the python interpreter. If we can find both, then
REM run 'makechm'. REM run 'makechm'.
REM REM
set thirdparty=thirdparty
if defined MAKEPANDA_THIRDPARTY set thirdparty=%MAKEPANDA_THIRDPARTY%
if not exist makepanda\makechm.py goto :missing1 if not exist makepanda\makechm.py goto :missing1
if not exist thirdparty\win-python\python.exe goto :missing2 if not exist %thirdparty%\win-python\python.exe goto :missing2
thirdparty\win-python\python.exe makepanda\makechm.py %* %thirdparty%\win-python\python.exe makepanda\makechm.py %*
goto done goto done
:missing1 :missing1

View File

@ -6,9 +6,12 @@ REM and the python interpreter. If we can find both, then
REM run 'makedocs'. REM run 'makedocs'.
REM REM
set thirdparty=thirdparty
if defined MAKEPANDA_THIRDPARTY set thirdparty=%MAKEPANDA_THIRDPARTY%
if not exist makepanda\makedocs.py goto :missing1 if not exist makepanda\makedocs.py goto :missing1
if not exist thirdparty\win-python\python.exe goto :missing2 if not exist %thirdparty%\win-python\python.exe goto :missing2
thirdparty\win-python\python.exe makepanda\makedocs.py %* %thirdparty%\win-python\python.exe makepanda\makedocs.py %*
goto done goto done
:missing1 :missing1

View File

@ -6,17 +6,20 @@ REM and the python interpreter. If we can find both, then
REM run 'makepanda'. REM run 'makepanda'.
REM REM
set thirdparty=thirdparty
if defined MAKEPANDA_THIRDPARTY set thirdparty=%MAKEPANDA_THIRDPARTY%
if not exist makepanda\makepanda.py goto :missing1 if not exist makepanda\makepanda.py goto :missing1
if %PROCESSOR_ARCHITECTURE% == AMD64 goto :AMD64 if %PROCESSOR_ARCHITECTURE% == AMD64 goto :AMD64
if not exist thirdparty\win-python\python.exe goto :missing2 if not exist %thirdparty%\win-python\python.exe goto :missing2
thirdparty\win-python\python.exe makepanda\makepanda.py %* %thirdparty%\win-python\python.exe makepanda\makepanda.py %*
if errorlevel 1 if x%1 == x--slavebuild exit 1 if errorlevel 1 if x%1 == x--slavebuild exit 1
goto done goto done
:AMD64 :AMD64
if not exist thirdparty\win-python-x64\python.exe goto :missing2 if not exist %thirdparty%\win-python-x64\python.exe goto :missing2
thirdparty\win-python-x64\python.exe makepanda\makepanda.py %* %thirdparty%\win-python-x64\python.exe makepanda\makepanda.py %*
if errorlevel 1 if x%1 == x--slavebuild exit 1 if errorlevel 1 if x%1 == x--slavebuild exit 1
goto done goto done