Commit:    4f7f5afca695a0f74fea4ba783dde6d7960807fa
Author:    Anatol Belski <[email protected]>         Wed, 12 Jul 2017 19:47:10 +0200
Parents:   ec7a5d072881bc9db32daa1a4a945b81e77d8dff
Branches:  master

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

Log:
rmtools_setvars should be the only one that has to be setup

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


Diff:
diff --git a/bin/rmtools_setvars.bat b/bin/rmtools_setvars.bat
deleted file mode 100644
index 76d2c50..0000000
--- a/bin/rmtools_setvars.bat
+++ /dev/null
@@ -1,20 +0,0 @@
-@echo off
-
-rem RMTOOLS specific, not expected to depend on the SDK
-
-set PHP_RMTOOLS_PHP_SDK_ROOT_PATH=c:\php-snap-build\php-sdk
-
-set PHP_RMTOOLS_BIN_PATH=%~dp0
-set PHP_RMTOOLS_BIN_PATH=%PHP_RMTOOLS_BIN_PATH:~0,-1%
-
-for %%a in ("%PHP_RMTOOLS_BIN_PATH%") do set PHP_RMTOOLS_ROOT_PATH=%%~dpa
-rem remove trailing slash
-set PHP_RMTOOLS_ROOT_PATH=%PHP_RMTOOLS_ROOT_PATH:~0,-1%
-
-set PHP_RMTOOLS_SCRIPT_PATH=%PHP_RMTOOLS_ROOT_PATH%\script
-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 PATH=%PHP_RMTOOLS_BIN_PATH%;%PATH%
-
diff --git a/bin/rmtools_setvars.bat-dist b/bin/rmtools_setvars.bat-dist
new file mode 100644
index 0000000..76d2c50
--- /dev/null
+++ b/bin/rmtools_setvars.bat-dist
@@ -0,0 +1,20 @@
+@echo off
+
+rem RMTOOLS specific, not expected to depend on the SDK
+
+set PHP_RMTOOLS_PHP_SDK_ROOT_PATH=c:\php-snap-build\php-sdk
+
+set PHP_RMTOOLS_BIN_PATH=%~dp0
+set PHP_RMTOOLS_BIN_PATH=%PHP_RMTOOLS_BIN_PATH:~0,-1%
+
+for %%a in ("%PHP_RMTOOLS_BIN_PATH%") do set PHP_RMTOOLS_ROOT_PATH=%%~dpa
+rem remove trailing slash
+set PHP_RMTOOLS_ROOT_PATH=%PHP_RMTOOLS_ROOT_PATH:~0,-1%
+
+set PHP_RMTOOLS_SCRIPT_PATH=%PHP_RMTOOLS_ROOT_PATH%\script
+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 PATH=%PHP_RMTOOLS_BIN_PATH%;%PATH%
+
diff --git a/bin/snap-x64.bat b/bin/snap-x64.bat
new file mode 100644
index 0000000..c95aaba
--- /dev/null
+++ b/bin/snap-x64.bat
@@ -0,0 +1,10 @@
+@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-x64.bat -t 
%PHP_RMTOOLS_BIN_PATH%\snapshot_task.bat --task-args "phpmaster all"
+
diff --git a/bin/snap-x64.bat-dist b/bin/snap-x64.bat-dist
deleted file mode 100644
index c95aaba..0000000
--- a/bin/snap-x64.bat-dist
+++ /dev/null
@@ -1,10 +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-x64.bat -t 
%PHP_RMTOOLS_BIN_PATH%\snapshot_task.bat --task-args "phpmaster all"
-
diff --git a/bin/snap.bat-dist b/bin/snap.bat-dist
deleted file mode 100644
index 425e9e9..0000000
--- a/bin/snap.bat-dist
+++ /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"
diff --git a/snap.bat b/snap.bat
new file mode 100644
index 0000000..425e9e9
--- /dev/null
+++ b/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"


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

Reply via email to