Merge pull request #234 from m-tmatma/feature/add-appveyor-username-t…

…o-artifacts

artifacts の名前に appveyor の名前を含める (構成要素の順序調整)

appveyor.yml

@@ -21,4 +21,4 @@ build_script:
     echo appveyor_yml
 
 artifacts:
-- path: 'sakura-$(platform)-$(configuration)*.zip'
+- path: 'sakura-*$(platform)-$(configuration)*.zip'

zipArtifacts.bat

@@ -10,9 +10,21 @@ if "%platform%" == "x64" (
 @rem ----------------------------------------------------------------
 @rem prepare environment variable
 @rem ----------------------------------------------------------------
+@echo checking APPVEYOR_ACCOUNT_NAME %APPVEYOR_ACCOUNT_NAME%
+set BUILD_ACCOUNT=
+if "%APPVEYOR_ACCOUNT_NAME%" == "sakuraeditor" (
+	set BUILD_ACCOUNT=
+) else if "%APPVEYOR_ACCOUNT_NAME%" == "" (
+	set BUILD_ACCOUNT=
+) else (
+	set BUILD_ACCOUNT=%APPVEYOR_ACCOUNT_NAME%
+)
+
 @echo checking APPVEYOR_BUILD_NUMBER %APPVEYOR_BUILD_NUMBER%
 if not "%APPVEYOR_BUILD_NUMBER%" == "" (
 	set BUILD_NUMBER=build%APPVEYOR_BUILD_NUMBER%
+) else (
+	set BUILD_NUMBER=buildLocal
 )
 
 @echo checking APPVEYOR_REPO_TAG_NAME %APPVEYOR_REPO_TAG_NAME%
@@ -45,8 +57,10 @@ if "%ALPHA%" == "1" (
 @rem ----------------------------------------------------------------
 set BASENAME=sakura
 
-@echo adding platform and configuration
-set BASENAME=%BASENAME%-%platform%-%configuration%
+@echo adding BUILD_ACCOUNT
+if not "%BUILD_ACCOUNT%" == "" (
+	set BASENAME=%BASENAME%-%BUILD_ACCOUNT%
+)
 @echo BASENAME = %BASENAME%
 
 @echo adding TAG_NAME
@@ -73,12 +87,28 @@ if not "%SHORTHASH%" == "" (
 )
 @echo BASENAME = %BASENAME%
 
+@echo adding platform and configuration
+set BASENAME=%BASENAME%-%platform%-%configuration%
+@echo BASENAME = %BASENAME%
+
 @echo adding RELEASE_PHASE
 if not "%RELEASE_PHASE%" == "" (
 	set BASENAME=%BASENAME%-%RELEASE_PHASE%
 )
 @echo BASENAME = %BASENAME%
 
+@rem ---------------------- BASENAME ---------------------------------
+@rem "sakura"
+@rem BUILD_ACCOUNT: (option) APPVEYOR_ACCOUNT_NAME
+@rem TAG_NAME     : (option) tag Name
+@rem PR_NAME      : (option) PRxxx (xxx is a PR number)
+@rem BUILD_NUMBER : (option) buildYYY or "buildLocal" (YYY is build number)
+@rem SHORTHASH    : (option) hash or "buildLocal" (hash is leading 8 charactors)
+@rem platform     : Platform ("Win32" or "x64")
+@rem configuration: Configuration ("Debug" or "Release")
+@rem RELEASE_PHASE: (option) "alpha" (x64 build only)
+@rem ----------------------------------------------------------------
+
 @echo on
 
 @rem ----------------------------------------------------------------