Name files correctly

xdebug · Dec 3, 2017 · 11f19eb · 11f19eb
1 parent d7ca36e
commit 11f19eb
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/.appveyor/build_task.cmd b/.appveyor/build_task.cmd
@@ -20,6 +20,10 @@ setlocal enableextensions enabledelayedexpansion
 
 	if "%ZTS_STATE%"=="enable" set ZTS_SHORT=ts
 	if "%ZTS_STATE%"=="disable" set ZTS_SHORT=nts
+	if "%ZTS_STATE%"=="enable" set ZTS_IN_FILENAME=
+	if "%ZTS_STATE%"=="disable" set ZTS_IN_FILENAME=-nts
+	if "%PHP_SDK_ARCH%"=="x86" set ARCH_IN_FILENAME=
+	if "%PHP_SDK_ARCH%"=="disable" set ARCH_IN_FILENAME=-x86_64
 
 	cd /d C:\projects\php-src
 
@@ -60,10 +64,9 @@ setlocal enableextensions enabledelayedexpansion
 	if not exist "%APPVEYOR_BUILD_FOLDER%\build\ext\php_xdebug.dll" exit /b 3
 
 	xcopy %APPVEYOR_BUILD_FOLDER%\LICENSE %APPVEYOR_BUILD_FOLDER%\php_xdebug-%PHP_REL%-!ZTS_SHORT!-%PHP_BUILD_CRT%-%PHP_SDK_ARCH%\ /y /f
-	xcopy %APPVEYOR_BUILD_FOLDER%\examples %APPVEYOR_BUILD_FOLDER%\php_xdebug-%PHP_REL%-!ZTS_SHORT!-%PHP_BUILD_CRT%-%PHP_SDK_ARCH%\examples\ /y /f
-	xcopy %APPVEYOR_BUILD_FOLDER%\build\ext\php_xdebug.dll %APPVEYOR_BUILD_FOLDER%\php_xdebug-%PHP_REL%-!ZTS_SHORT!-%PHP_BUILD_CRT%-%PHP_SDK_ARCH%\ /y /f
-	7z a php_xdebug-%PHP_REL%-!ZTS_SHORT!-%PHP_BUILD_CRT%-%PHP_SDK_ARCH%.zip %APPVEYOR_BUILD_FOLDER%\php_xdebug-%PHP_REL%-!ZTS_SHORT!-%PHP_BUILD_CRT%-%PHP_SDK_ARCH%\*
-	appveyor PushArtifact php_xdebug-%PHP_REL%-!ZTS_SHORT!-%PHP_BUILD_CRT%-%PHP_SDK_ARCH%.zip -FileName php_xdebug-%APPVEYOR_REPO_TAG_NAME%-%PHP_REL%-!ZTS_SHORT!-%PHP_BUILD_CRT%-%PHP_SDK_ARCH%.zip
+	xcopy %APPVEYOR_BUILD_FOLDER%\build\ext\php_xdebug.dll %APPVEYOR_BUILD_FOLDER%\php_xdebug-%PHP_REL%-!ZTS_SHORT!-%PHP_BUILD_CRT%-%PHP_SDK_ARCH%\php_xdebug-%APPVEYOR_REPO_TAG_NAME%-%PHP_REL%-%PHP_BUILD_CRT%!ZTS_IN_FILENAME!!ARCH_IN_FILENAME!.dll /y /f
+	7z a php_xdebug-%APPVEYOR_REPO_TAG_NAME%-%PHP_REL%-%PHP_BUILD_CRT%!ZTS_IN_FILENAME!!ARCH_IN_FILENAME!.zip %APPVEYOR_BUILD_FOLDER%\php_xdebug-%PHP_REL%-!ZTS_SHORT!-%PHP_BUILD_CRT%-%PHP_SDK_ARCH%\*
+	appveyor PushArtifact php_xdebug-%APPVEYOR_REPO_TAG_NAME%-%PHP_REL%-%PHP_BUILD_CRT%!ZTS_IN_FILENAME!!ARCH_IN_FILENAME!.zip -FileName php_xdebug-%APPVEYOR_REPO_TAG_NAME%-%PHP_REL%-%PHP_BUILD_CRT%!ZTS_IN_FILENAME!!ARCH_IN_FILENAME!.zip
 
-	move build\ext\php_xdebug.dll artifacts\php_xdebug-%PHP_REL%-!ZTS_SHORT!-%PHP_BUILD_CRT%-%PHP_SDK_ARCH%.dll
+	rem move build\ext\php_xdebug.dll artifacts\php_xdebug-%PHP_REL%-!ZTS_SHORT!-%PHP_BUILD_CRT%-%PHP_SDK_ARCH%.dll
 endlocal