Browse Source

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

rdb 15 years ago
parent
commit
5d7cf87d82
4 changed files with 22 additions and 10 deletions
  1. 5 2
      makepanda/expandimports.bat
  2. 5 2
      makepanda/makechm.bat
  3. 5 2
      makepanda/makedocs.bat
  4. 7 4
      makepanda/makepanda.bat

+ 5 - 2
makepanda/expandimports.bat

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

+ 5 - 2
makepanda/makechm.bat

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

+ 5 - 2
makepanda/makedocs.bat

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

+ 7 - 4
makepanda/makepanda.bat

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