mirror of
https://git.do.srb2.org/STJr/UltimateZoneBuilder.git
synced 2025-01-31 04:40:55 +00:00
Specify git.exe instead of just 'git' for compatibility with my environment with Cygwin git...
This commit is contained in:
parent
3d156a3be8
commit
95a9d28798
9 changed files with 16 additions and 16 deletions
BIN
Build/SlimDX.dll
BIN
Build/SlimDX.dll
Binary file not shown.
|
@ -1,4 +1,4 @@
|
|||
URL http://devbuilds.drdteam.org/gzdbbf/
|
||||
FileName Builder.exe
|
||||
UpdateName GZDoom_Builder_Bugfix-r[REVNUM].7z
|
||||
UpdaterName GZDB_Updater-x86.7z
|
||||
UpdateName GZDoom_Builder_Bugfix-r[REVNUM]-x64.7z
|
||||
UpdaterName GZDB_Updater-x64.7z
|
|
@ -21,8 +21,8 @@ CALL "%STUDIODIR%\Common7\Tools\vsvars32.bat"
|
|||
|
||||
MKDIR "Release"
|
||||
|
||||
git checkout "Source/Core/Properties/AssemblyInfo.cs" > NUL
|
||||
git checkout "Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs" > NUL
|
||||
git.exe checkout "Source/Core/Properties/AssemblyInfo.cs" > NUL
|
||||
git.exe checkout "Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs" > NUL
|
||||
|
||||
ECHO.
|
||||
ECHO Writing GIT log file...
|
||||
|
@ -31,7 +31,7 @@ IF EXIST "Release\Changelog.xml" DEL /F /Q "Release\Changelog.xml" > NUL
|
|||
(
|
||||
echo [OB]?xml version="1.0" encoding="UTF-8"?[CB]
|
||||
echo [OB]log[CB]
|
||||
git log master --since=2012-04-17 --pretty=format:"[OB]logentry commit=\"%%h\"[CB]%%n[OB]author[CB]%%an[OB]/author[CB]%%n[OB]date[CB]%%aI[OB]/date[CB]%%n[OB]msg[CB]%%B[OB]/msg[CB]%%n[OB]/logentry[CB]"
|
||||
git.exe log master --since=2012-04-17 --pretty=format:"[OB]logentry commit=\"%%h\"[CB]%%n[OB]author[CB]%%an[OB]/author[CB]%%n[OB]date[CB]%%aI[OB]/date[CB]%%n[OB]msg[CB]%%B[OB]/msg[CB]%%n[OB]/logentry[CB]"
|
||||
echo [OB]/log[CB]
|
||||
) >"Release\Changelog.xml"
|
||||
IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL
|
||||
|
@ -180,8 +180,8 @@ IF NOT EXIST "Release\GZDB-Bugfix Setup.exe" GOTO FILEFAIL
|
|||
|
||||
REN "Release\GZDB-Bugfix Setup.exe" "GZDB-Bugfix R%REVISIONNUMBER% Setup.exe"
|
||||
|
||||
git checkout "Source\Core\Properties\AssemblyInfo.cs" > NUL
|
||||
git checkout "Source\Plugins\BuilderModes\Properties\AssemblyInfo.cs" > NUL
|
||||
git.exe checkout "Source\Core\Properties\AssemblyInfo.cs" > NUL
|
||||
git.exe checkout "Source\Plugins\BuilderModes\Properties\AssemblyInfo.cs" > NUL
|
||||
|
||||
ECHO.
|
||||
ECHO. BUILD DONE !
|
||||
|
|
|
@ -30,6 +30,6 @@ using CodeImp.DoomBuilder;
|
|||
// Build Number
|
||||
// Revision
|
||||
//
|
||||
[assembly: AssemblyVersion("2.3.0.3041")]
|
||||
[assembly: AssemblyVersion("2.3.0.3050")]
|
||||
[assembly: NeutralResourcesLanguageAttribute("en")]
|
||||
[assembly: AssemblyHash("e1b9f31")]
|
||||
[assembly: AssemblyHash("3d156a3")]
|
||||
|
|
|
@ -29,5 +29,5 @@ using System.Resources;
|
|||
// Build Number
|
||||
// Revision
|
||||
//
|
||||
[assembly: AssemblyVersion("2.3.0.3041")]
|
||||
[assembly: AssemblyVersion("2.3.0.3050")]
|
||||
[assembly: NeutralResourcesLanguageAttribute("en")]
|
||||
|
|
Binary file not shown.
|
@ -15,7 +15,7 @@ namespace mxd.VersionFromGIT
|
|||
{
|
||||
#region ======================== Constants
|
||||
|
||||
private const string GIT_INFO = "@echo off\r\ngit rev-list --count origin/master\r\ngit rev-parse --short=7 origin/master";
|
||||
private const string GIT_INFO = "@echo off\r\ngit.exe rev-list --count origin/master\r\ngit.exe rev-parse --short=7 origin/master";
|
||||
|
||||
#endregion
|
||||
|
||||
|
|
Binary file not shown.
|
@ -26,8 +26,8 @@ ECHO.
|
|||
|
||||
MKDIR "GIT_Build"
|
||||
|
||||
git checkout "Source/Core/Properties/AssemblyInfo.cs" > NUL
|
||||
git checkout "Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs" > NUL
|
||||
git.exe checkout "Source/Core/Properties/AssemblyInfo.cs" > NUL
|
||||
git.exe checkout "Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs" > NUL
|
||||
|
||||
ECHO.
|
||||
ECHO Writing GIT log file...
|
||||
|
@ -36,7 +36,7 @@ IF EXIST "GIT_Build\Changelog.xml" DEL /F /Q "GIT_Build\Changelog.xml" > NUL
|
|||
(
|
||||
echo [OB]?xml version="1.0" encoding="UTF-8"?[CB]
|
||||
echo [OB]log[CB]
|
||||
git log master --since=2012-04-17 --pretty=format:"[OB]logentry commit=\"%%h\"[CB]%%n[OB]author[CB]%%an[OB]/author[CB]%%n[OB]date[CB]%%aI[OB]/date[CB]%%n[OB]msg[CB]%%B[OB]/msg[CB]%%n[OB]/logentry[CB]"
|
||||
git.exe log master --since=2012-04-17 --pretty=format:"[OB]logentry commit=\"%%h\"[CB]%%n[OB]author[CB]%%an[OB]/author[CB]%%n[OB]date[CB]%%aI[OB]/date[CB]%%n[OB]msg[CB]%%B[OB]/msg[CB]%%n[OB]/logentry[CB]"
|
||||
echo [OB]/log[CB]
|
||||
) >"GIT_Build\Changelog.xml"
|
||||
IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL
|
||||
|
@ -216,8 +216,8 @@ IF EXIST "Build\Changelog.txt" DEL /F /Q "Build\Changelog.txt" > NUL
|
|||
@ECHO %REVISIONNUMBER%> .\GIT_Build\Version.txt
|
||||
@ (ECHO %REVISIONNUMBER% && ECHO %EXEREVISIONNUMBER%) > .\GIT_Build\Versions.txt
|
||||
|
||||
git checkout "Source\Core\Properties\AssemblyInfo.cs" > NUL
|
||||
git checkout "Source\Plugins\BuilderModes\Properties\AssemblyInfo.cs" > NUL
|
||||
git.exe checkout "Source\Core\Properties\AssemblyInfo.cs" > NUL
|
||||
git.exe checkout "Source\Plugins\BuilderModes\Properties\AssemblyInfo.cs" > NUL
|
||||
|
||||
ECHO.
|
||||
ECHO. BUILD DONE !
|
||||
|
|
Loading…
Reference in a new issue