diff --git a/appveyor.yml b/appveyor.yml index f065fc09..347dfffc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -67,7 +67,7 @@ after_build: - del /Q %Mupen64PluginsDir_x64%\*.lib %Mupen64PluginsDir_x64%\*.exp - del /Q %Mupen64PluginsDir%\*.lib %Mupen64PluginsDir%\*.exp - cd %BUILD_PATH% - - ps: $env:revision = git describe --always + - ps: $env:revision = git rev-parse --short HEAD - set archive_name=GLideN64-%revision%-@fname.7z - forfiles /p %BUILD_PATH% /c "cmd /c 7z a %archive_name% @path\*" diff --git a/projects/msvc/GLideN64_builder.cmd b/projects/msvc/GLideN64_builder.cmd index 447651be..a81cb9c8 100644 --- a/projects/msvc/GLideN64_builder.cmd +++ b/projects/msvc/GLideN64_builder.cmd @@ -171,7 +171,7 @@ call :mbcl "%MBM64%" "%DPROJ%" "_mupenplus" goto pjqt :cini - set MSG=Failed to copy some project files to:^&echo %~1 + set MSG=Failed to copy some project files to:^& echo %~1 if %ESIM%==1 md "%~1" 2>nul set errorlevel=0 copy /y ini\GLideN64.custom.ini "%~1\" @@ -202,14 +202,15 @@ call :cini "%M64CL%" %DMN% :pkg -for /f "tokens=1" %%R in ('git describe --always') do set "REV=%%R" +for /f "tokens=1" %%R in ('git rev-parse --short HEAD') do set "REV=%%R" set MSG=The route could not be accessed:^& echo %BUILDROUTE% pushd "%BUILDROUTE%" %ERR% -set MOD=the compressed files -if %NO7%==1 set MOD=the plugins& goto z7 -for /f "tokens=*" %%Z in ('dir /ad /b *_%ARCH%') do 7z a -t%KAP% "GLideN64-%REV%-%%Z.%KAP%" ".\%%Z\*" -:z7 +set MOD=the plugins +if %NO7%==0 ( + set MOD=the compressed files + for /f "tokens=*" %%Z in ('dir /ad /b *_%ARCH%') do 7z a -t%KAP% "GLideN64-%REV%-%%Z.%KAP%" ".\%%Z\*" +) if "%ARCH%"=="x64" ( if %BOTH%==1 set ARCH=x86& goto X86