Cool_Tools/vgmstream
1
0
Fork 0
mirror of https://github.com/vgmstream/vgmstream.git synced 2024-11-24 06:50:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move version.bat/h to root and use it for all Visual Studio modules

Browse Source
This commit is contained in:
bnnm 2017-01-15 23:09:37 +01:00
parent b44e3ec617
commit 2c9acb9cf2
13 changed files with 30 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fb2k/foo_input_vgmstream.vcxproj
View File

@ -85,7 +85,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
</Link> </Link>
<PreBuildEvent> <PreBuildEvent>
<Command>"$(ProjectDir)version.bat" "$(ProjectDir)version.h" VERSION</Command> <Command>"$(ProjectDir)..\version.bat" "$(ProjectDir)..\version.h" VERSION</Command>
</PreBuildEvent> </PreBuildEvent>
<PreBuildEvent> <PreBuildEvent>
<Message>Generating version.h</Message> <Message>Generating version.h</Message>
@ -112,7 +112,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
</Link> </Link>
<PreBuildEvent> <PreBuildEvent>
<Command>"$(ProjectDir)version.bat" "$(ProjectDir)version.h" VERSION</Command> <Command>"$(ProjectDir)..\version.bat" "$(ProjectDir)..\version.h" VERSION</Command>
</PreBuildEvent> </PreBuildEvent>
<PreBuildEvent> <PreBuildEvent>
<Message>Generating version.h</Message> <Message>Generating version.h</Message>
@ -122,7 +122,6 @@
<ClInclude Include="foo_prefs.h" /> <ClInclude Include="foo_prefs.h" />
<ClInclude Include="foo_vgmstream.h" /> <ClInclude Include="foo_vgmstream.h" />
<ClInclude Include="resource.h" /> <ClInclude Include="resource.h" />
<ClInclude Include="version.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="foo_input_vgmstream.rc" /> <ResourceCompile Include="foo_input_vgmstream.rc" />

3
fb2k/foo_input_vgmstream.vcxproj.filters
View File

@ -24,9 +24,6 @@
<ClInclude Include="resource.h"> <ClInclude Include="resource.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="version.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="foo_input_vgmstream.rc"> <ResourceCompile Include="foo_input_vgmstream.rc">

4
fb2k/in_vgmstream.cpp
View File

@ -23,8 +23,10 @@ extern "C" {
#include "../src/vgmstream.h" #include "../src/vgmstream.h"
} }
#include "foo_vgmstream.h" #include "foo_vgmstream.h"
#include "version.h"
#ifndef VERSION
#include "../version.h"
#endif
#ifndef VERSION #ifndef VERSION
#define PLUGIN_VERSION __DATE__ #define PLUGIN_VERSION __DATE__
#else #else

6
test/test.c
View File

@ -14,8 +14,10 @@
#endif #endif
#ifndef VERSION #ifndef VERSION
/* To include the git version number / commit in test.exe, compile outside of Visual Studio and make sure git / sh is in the current PATH */ #include "../version.h"
#define VERSION "" #endif
#ifndef VERSION
#define VERSION "(unknown version)"
#endif #endif
#define BUFSIZE 0x8000 #define BUFSIZE 0x8000

4
test/test.vcxproj
View File

@ -86,7 +86,7 @@
<TargetMachine>MachineX86</TargetMachine> <TargetMachine>MachineX86</TargetMachine>
</Link> </Link>
<PreBuildEvent> <PreBuildEvent>
<Command>"$(ProjectDir)version.bat" "$(ProjectDir)version.h" VERSION</Command> <Command>"$(ProjectDir)..\version.bat" "$(ProjectDir)..\version.h" VERSION</Command>
</PreBuildEvent> </PreBuildEvent>
<PreBuildEvent> <PreBuildEvent>
<Message>Generating version.h</Message> <Message>Generating version.h</Message>
@ -114,7 +114,7 @@
<TargetMachine>MachineX86</TargetMachine> <TargetMachine>MachineX86</TargetMachine>
</Link> </Link>
<PreBuildEvent> <PreBuildEvent>
<Command>"$(ProjectDir)version.bat" "$(ProjectDir)version.h" VERSION</Command> <Command>"$(ProjectDir)..\version.bat" "$(ProjectDir)..\version.h" VERSION</Command>
</PreBuildEvent> </PreBuildEvent>
<PreBuildEvent> <PreBuildEvent>
<Message>Generating version.h</Message> <Message>Generating version.h</Message>

11
fb2k/version.bat → version.bat
View File

@ -1,5 +1,8 @@
@echo off @echo off
REM creates or updates version.h
REM params: $1=filename (usually version.h), $2=VARNAME (usually VERSION)
setlocal enableextensions enabledelayedexpansion setlocal enableextensions enabledelayedexpansion
cd /d "%~dp0" cd /d "%~dp0"
@ -10,7 +13,7 @@ if not "%version%"=="" set version=!version:^:=_!
if not "%version%"=="" goto :gotversion if not "%version%"=="" goto :gotversion
if exist "..\version.mk" goto :getversion if exist "version.mk" goto :getversion
echo Git cannot be found, nor can version.mk. Generating unknown version. echo Git cannot be found, nor can version.mk. Generating unknown version.
@ -20,7 +23,7 @@ goto :gotversion
:getversion :getversion
for /f "delims== tokens=2" %%v in (..\version.mk) do set version=%%v for /f "delims== tokens=2" %%v in (version.mk) do set version=%%v
set version=!version:^"=! set version=!version:^"=!
set version=!version: =! set version=!version: =!
@ -34,8 +37,8 @@ echo %version_out%> %1_temp
if %version%==unknown goto :skipgenerate if %version%==unknown goto :skipgenerate
echo # static version string; update manually before and after every release.> "..\version.mk" echo # static version string; update manually before and after every release.> "version.mk"
echo %version_mk%>> "..\version.mk" echo %version_mk%>> "version.mk"
:skipgenerate :skipgenerate

0
fb2k/version.h → version.h Executable file → Normal file
View File

5
winamp/in_vgmstream.c
View File

@ -23,7 +23,10 @@
#include "resource.h" #include "resource.h"
#ifndef VERSION #ifndef VERSION
#define VERSION #include "../version.h"
#endif
#ifndef VERSION
#define VERSION "(unknown version)"
#endif #endif
#define APP_NAME "vgmstream plugin" #define APP_NAME "vgmstream plugin"

4
winamp/in_vgmstream.vcxproj
View File

@ -88,7 +88,7 @@
<TargetMachine>MachineX86</TargetMachine> <TargetMachine>MachineX86</TargetMachine>
</Link> </Link>
<PreBuildEvent> <PreBuildEvent>
<Command>"$(ProjectDir)version.bat" "$(ProjectDir)version.h" VERSION</Command> <Command>"$(ProjectDir)..\version.bat" "$(ProjectDir)..\version.h" VERSION</Command>
</PreBuildEvent> </PreBuildEvent>
<PreBuildEvent> <PreBuildEvent>
<Message>Generating version.h</Message> <Message>Generating version.h</Message>
@ -118,7 +118,7 @@
<TargetMachine>MachineX86</TargetMachine> <TargetMachine>MachineX86</TargetMachine>
</Link> </Link>
<PreBuildEvent> <PreBuildEvent>
<Command>"$(ProjectDir)version.bat" "$(ProjectDir)version.h" VERSION</Command> <Command>"$(ProjectDir)..\version.bat" "$(ProjectDir)..\version.h" VERSION</Command>
</PreBuildEvent> </PreBuildEvent>
<PreBuildEvent> <PreBuildEvent>
<Message>Generating version.h</Message> <Message>Generating version.h</Message>

7
xmp-vgmstream/DllMain.c
View File

@ -16,11 +16,12 @@
#include "../src/formats.h" #include "../src/formats.h"
#include "../src/vgmstream.h" #include "../src/vgmstream.h"
#include "xmpin.h" #include "xmpin.h"
#include "version.h"
#ifndef VERSION #ifndef VERSION
#define VERSION #include "../version.h"
#endif
#ifndef VERSION
#define VERSION "(unknown version)"
#endif #endif
static XMPFUNC_IN *xmpfin; static XMPFUNC_IN *xmpfin;

50
xmp-vgmstream/version.bat
View File

@ -1,50 +0,0 @@
@echo off
setlocal enableextensions enabledelayedexpansion
cd /d "%~dp0"
for /f %%v in ('git describe --always --tag') do set version=%%v
set version=!version:^:=_!
if not "%version%"=="" goto :gotversion
if exist "..\version.mk" goto :getversion
echo Git cannot be found, nor can version.mk. Generating unknown version.
set version=unknown
goto :gotversion
:getversion
for /f "delims== tokens=2" %%v in (..\version.mk) do set version=%%v
set version=!version:^"=!
set version=!version: =!
:gotversion
set version_out=#define %2 "%version%"
set version_mk=%2 = "%version%"
echo %version_out%> %1_temp
if %version%==unknown goto :skipgenerate
echo # static version string; update manually before and after every release.> "..\version.mk"
echo %version_mk%>> "..\version.mk"
:skipgenerate
echo n | comp %1_temp %1 > NUL 2> NUL
if not errorlevel 1 goto exit
copy /y %1_temp %1 > NUL 2> NUL
:exit
del %1_temp

5
xmp-vgmstream/xmp-vgmstream.vcxproj
View File

@ -66,7 +66,7 @@
<ModuleDefinitionFile>xmpin.def</ModuleDefinitionFile> <ModuleDefinitionFile>xmpin.def</ModuleDefinitionFile>
</Link> </Link>
<PreBuildEvent> <PreBuildEvent>
<Command>"$(ProjectDir)version.bat" "$(ProjectDir)version.h" VERSION</Command> <Command>"$(ProjectDir)..\version.bat" "$(ProjectDir)..\version.h" VERSION</Command>
</PreBuildEvent> </PreBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@ -89,14 +89,13 @@
<ModuleDefinitionFile>xmpin.def</ModuleDefinitionFile> <ModuleDefinitionFile>xmpin.def</ModuleDefinitionFile>
</Link> </Link>
<PreBuildEvent> <PreBuildEvent>
<Command>"$(ProjectDir)version.bat" "$(ProjectDir)version.h" VERSION</Command> <Command>"$(ProjectDir)..\version.bat" "$(ProjectDir)..\version.h" VERSION</Command>
</PreBuildEvent> </PreBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="DllMain.c" /> <ClCompile Include="DllMain.c" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="version.h" />
<ClInclude Include="xmpfunc.h" /> <ClInclude Include="xmpfunc.h" />
<ClInclude Include="xmpin.h" /> <ClInclude Include="xmpin.h" />
</ItemGroup> </ItemGroup>

1
xmp-vgmstream/xmp-vgmstream.vcxproj.filters
View File

@ -4,7 +4,6 @@
<ClCompile Include="DllMain.c" /> <ClCompile Include="DllMain.c" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="version.h" />
<ClInclude Include="xmpfunc.h" /> <ClInclude Include="xmpfunc.h" />
<ClInclude Include="xmpin.h" /> <ClInclude Include="xmpin.h" />
</ItemGroup> </ItemGroup>