Commit:    c33d8befb0ae9788af2b5d09fc645e5de6dc1ccf
Author:    Anatol Belski <[email protected]>         Wed, 12 Jul 2017 20:11:24 +0200
Parents:   f167bcacec0febf5b70ec06383963ca73b708eb4
Branches:  master

Link:       
http://git.php.net/?p=web/rmtools.git;a=commitdiff;h=c33d8befb0ae9788af2b5d09fc645e5de6dc1ccf

Log:
parametrize paths

Changed paths:
  M  bin/pecl_build_next.bat
  M  bin/rmtools_setvars.bat-dist
  A  bin/snap.bat
  D  snap.bat


Diff:
diff --git a/bin/pecl_build_next.bat b/bin/pecl_build_next.bat
index 6ad084c..4fd4e6e 100644
--- a/bin/pecl_build_next.bat
+++ b/bin/pecl_build_next.bat
@@ -9,7 +9,11 @@ if not exist %~dp0rmtools_setvars.bat (
 )
 call %dp0rmtools_setvars.bat 
 
-cd c:\pecl-in-pkg
+if not exist %PHP_RMTOOLS_PECL_IN_PKG_PATH% (
+       echo %PHP_RMTOOLS_PECL_IN_PKG_PATH% does not exist
+       exit /b 3
+)
+cd %PHP_RMTOOLS_PECL_IN_PKG_PATH%
 
 for /r %%i in (*) do (
        call "%PHP_RMTOOLS_BIN_PATH%\pecl_build_all.bat" --upload 
--aggregate-mail --package=%%i
@@ -17,7 +21,11 @@ for /r %%i in (*) do (
        goto ONLY_ONE
 )
 
-cd c:\pecl-in-pkg-nomail
+if not exist %PHP_RMTOOLS_PECL_IN_PKG_NOMAIL_PATH% (
+       echo %PHP_RMTOOLS_PECL_IN_PKG_NOMAIL_PATH% does not exist
+       exit /b 3
+)
+cd %PHP_RMTOOLS_PECL_IN_PKG_NOMAIL_PATH%
 
 for /r %%i in (*) do (
        call "%PHP_RMTOOLS_BIN_PATH%\pecl_build_all.bat" --upload --package=%%i
@@ -25,7 +33,11 @@ for /r %%i in (*) do (
        goto ONLY_ONE
 )
 
-cd c:\pecl-in-snap
+if not exist %PHP_RMTOOLS_PECL_IN_SNAP_PATH% (
+       echo %PHP_RMTOOLS_PECL_IN_SNAP_PATH% does not exist
+       exit /b 3
+)
+cd %PHP_RMTOOLS_PECL_IN_SNAP_PATH%
 
 for /r %%i in (*) do (
        call "%PHP_RMTOOLS_BIN_PATH%\pecl_build_all.bat" --upload --is-snap 
--aggregate-mail --package=%%i
@@ -33,7 +45,11 @@ for /r %%i in (*) do (
        goto ONLY_ONE
 )
 
-cd c:\pecl-in-snap-nomail
+if not exist %PHP_RMTOOLS_PECL_IN_SNAP_NOMAIL_PATH% (
+       echo %PHP_RMTOOLS_PECL_IN_SNAP_NOMAIL_PATH% does not exist
+       exit /b 3
+)
+cd %PHP_RMTOOLS_PECL_IN_SNAP_NOMAIL_PATH%
 
 for /r %%i in (*) do (
        call "%PHP_RMTOOLS_BIN_PATH%\pecl_build_all.bat" --upload --is-snap 
--package=%%i
@@ -41,7 +57,11 @@ for /r %%i in (*) do (
        goto ONLY_ONE
 )
 
-cd c:\pecl-in-snap-pre
+if not exist %PHP_RMTOOLS_PECL_IN_SNAP_PRE_PATH% (
+       echo %PHP_RMTOOLS_PECL_IN_SNAP_PRE_PATH% does not exist
+       exit /b 3
+)
+cd %PHP_RMTOOLS_PECL_IN_SNAP_PRE_PATH%
 
 for /r %%i in (*) do (
        call "%PHP_RMTOOLS_BIN_PATH%\pecl_snap_pre.bat" --upload --is-snap 
--aggregate-mail --package=%%i
@@ -49,7 +69,11 @@ for /r %%i in (*) do (
        goto ONLY_ONE
 )
 
-cd c:\pecl-in-snap-nomail-pre
+if not exist %PHP_RMTOOLS_PECL_IN_SNAP_NOMAIL_PRE_PATH% (
+       echo %PHP_RMTOOLS_PECL_IN_SNAP_NOMAIL_PRE_PATH% does not exist
+       exit /b 3
+)
+cd %PHP_RMTOOLS_PECL_IN_SNAP_NOMAIL_PRE_PATH%
 
 for /r %%i in (*) do (
        call "%PHP_RMTOOLS_BIN_PATH%\pecl_snap_pre.bat" --upload --is-snap 
--package=%%i
diff --git a/bin/rmtools_setvars.bat-dist b/bin/rmtools_setvars.bat-dist
index 76d2c50..92f6b07 100644
--- a/bin/rmtools_setvars.bat-dist
+++ b/bin/rmtools_setvars.bat-dist
@@ -16,5 +16,12 @@ set PHP_RMTOOLS_LOCK_PATH=%PHP_RMTOOLS_ROOT_PATH%\locks
 set PHP_RMTOOLS_LOG_PATH=%PHP_RMTOOLS_ROOT_PATH%\logs
 set PHP_RMTOOLS_TMP_PATH=%PHP_RMTOOLS_ROOT_PATH%\tmp
 
+set PHP_RMTOOLS_PECL_IN_PKG_PATH=c:\pecl-in-pkg
+set PHP_RMTOOLS_PECL_IN_PKG_NOMAIL_PATH=c:\pecl-in-pkg-nomail
+set PHP_RMTOOLS_PECL_IN_SNAP_PATH=c:\pecl-in-pkg
+set PHP_RMTOOLS_PECL_IN_SNAP_NOMAIL_PATH=c:\pecl-in-pkg-nomail
+set PHP_RMTOOLS_PECL_IN_SNAP_PRE_PATH=c:\pecl-in-snap-pre
+set PHP_RMTOOLS_PECL_IN_SNAP_NOMAIL_PRE_PATH=c:\pecl-in-snap-nomail-pre
+
 set PATH=%PHP_RMTOOLS_BIN_PATH%;%PATH%
 
diff --git a/bin/snap.bat b/bin/snap.bat
new file mode 100644
index 0000000..425e9e9
--- /dev/null
+++ b/bin/snap.bat
@@ -0,0 +1,9 @@
+@echo off
+
+if not exist %~dp0rmtools_setvars.bat (
+       echo RMTOOLS is not setup, create %~dp0rmtools_setvars.bat
+       exit /b 3
+)
+call %~dp0rmtools_setvars.bat
+
+call %PHP_RMTOOLS_PHP_SDK_ROOT_PATH%\phpsdk-vc15-x86.bat -t 
%PHP_RMTOOLS_BIN_PATH%\bin\snapshot_task.bat --task-args "phpmaster all"
diff --git a/snap.bat b/snap.bat
deleted file mode 100644
index 425e9e9..0000000
--- a/snap.bat
+++ /dev/null
@@ -1,9 +0,0 @@
-@echo off
-
-if not exist %~dp0rmtools_setvars.bat (
-       echo RMTOOLS is not setup, create %~dp0rmtools_setvars.bat
-       exit /b 3
-)
-call %~dp0rmtools_setvars.bat
-
-call %PHP_RMTOOLS_PHP_SDK_ROOT_PATH%\phpsdk-vc15-x86.bat -t 
%PHP_RMTOOLS_BIN_PATH%\bin\snapshot_task.bat --task-args "phpmaster all"


--
PHP Webmaster List Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to