diff options
| author | montellese <montellese@xbmc.org> | 2013-11-06 19:53:19 +0100 |
|---|---|---|
| committer | montellese <montellese@xbmc.org> | 2014-04-29 19:53:07 +0200 |
| commit | 1cbe98eac59c67efbb38a197401e6c16b9153b39 (patch) | |
| tree | 479f115578670cd7f060bf65d4f38dea045ff510 | |
| parent | 6c6577c210800ef8d17e57403477c4014bd0fcf1 (diff) | |
[win32] auto-generate ServiceDescription.h on demand
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | project/BuildDependencies/scripts/0_package.list | 1 | ||||
| -rw-r--r-- | project/VS2010Express/XBMC.vcxproj | 88 | ||||
| -rw-r--r-- | project/VS2010Express/XBMC.vcxproj.filters | 18 |
4 files changed, 109 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 68497a369e..d026040a59 100644 --- a/.gitignore +++ b/.gitignore @@ -352,6 +352,7 @@ lib/cpluff/stamp-h1 /project/BuildDependencies/scripts/tmp /project/BuildDependencies/bin/swig /project/BuildDependencies/bin/doxygen +/project/BuildDependencies/bin/json-rpc # /project/VS2008Express /project/VS2008Express/Debug @@ -605,6 +606,7 @@ lib/cpluff/stamp-h1 # /xbmc/interfaces/ /xbmc/interfaces/Makefile +/xbmc/interfaces/json-rpc/ServiceDescription.h /xbmc/interfaces/python/Makefile /xbmc/interfaces/python/generated/ /xbmc/interfaces/python/test/Makefile diff --git a/project/BuildDependencies/scripts/0_package.list b/project/BuildDependencies/scripts/0_package.list index db802e6e79..832731393f 100644 --- a/project/BuildDependencies/scripts/0_package.list +++ b/project/BuildDependencies/scripts/0_package.list @@ -9,6 +9,7 @@ boost-1.46.1-headers-win32.7z dnssd-541-win32.zip doxygen-1.8.2-win32.7z gnutls-3.2.3-win32.zip +jsonschemabuilder-1.0.0-win32-2.7z lame_enc-3.99.5-win32.7z libass-0.10.2-win32.7z libbluray-0.4.0-win32.zip diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj index c640130b51..4f6b069f1e 100644 --- a/project/VS2010Express/XBMC.vcxproj +++ b/project/VS2010Express/XBMC.vcxproj @@ -2899,6 +2899,94 @@ </CustomBuild> </ItemGroup> <ItemGroup> + <CustomBuild Include="..\..\xbmc\interfaces\json-rpc\schema\license.txt"> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug (DirectX)|Win32'">CALL ..\BuildDependencies\bin\json-rpc\JsonSchemaBuilder.bat</Command> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug (DirectX)|Win32'">Generating ServiceDescription.h for JSON-RPC API</Message> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug (DirectX)|Win32'">%(RelativeDir)..\ServiceDescription.h</Outputs> + <Command Condition="'$(Configuration)|$(Platform)'=='Release (DirectX)|Win32'">CALL ..\BuildDependencies\bin\json-rpc\JsonSchemaBuilder.bat</Command> + <Message Condition="'$(Configuration)|$(Platform)'=='Release (DirectX)|Win32'">Generating ServiceDescription.h for JSON-RPC API</Message> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">Generating ServiceDescription.h for JSON-RPC API</Message> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">Generating ServiceDescription.h for JSON-RPC API</Message> + <Message Condition="'$(Configuration)|$(Platform)'=='Release (OpenGL)|Win32'">Generating ServiceDescription.h for JSON-RPC API</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">CALL ..\BuildDependencies\bin\json-rpc\JsonSchemaBuilder.bat</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">CALL ..\BuildDependencies\bin\json-rpc\JsonSchemaBuilder.bat</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='Release (OpenGL)|Win32'">CALL ..\BuildDependencies\bin\json-rpc\JsonSchemaBuilder.bat</Command> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">%(RelativeDir)..\ServiceDescription.h</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">%(RelativeDir)..\ServiceDescription.h</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release (DirectX)|Win32'">%(RelativeDir)..\ServiceDescription.h</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release (OpenGL)|Win32'">%(RelativeDir)..\ServiceDescription.h</Outputs> + </CustomBuild> + <CustomBuild Include="..\..\xbmc\interfaces\json-rpc\schema\methods.json"> + <FileType>Document</FileType> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug (DirectX)|Win32'">CALL ..\BuildDependencies\bin\json-rpc\JsonSchemaBuilder.bat</Command> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug (DirectX)|Win32'">Generating ServiceDescription.h for JSON-RPC API</Message> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug (DirectX)|Win32'">%(RelativeDir)..\ServiceDescription.h</Outputs> + <Command Condition="'$(Configuration)|$(Platform)'=='Release (DirectX)|Win32'">CALL ..\BuildDependencies\bin\json-rpc\JsonSchemaBuilder.bat</Command> + <Message Condition="'$(Configuration)|$(Platform)'=='Release (DirectX)|Win32'">Generating ServiceDescription.h for JSON-RPC API</Message> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">Generating ServiceDescription.h for JSON-RPC API</Message> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">Generating ServiceDescription.h for JSON-RPC API</Message> + <Message Condition="'$(Configuration)|$(Platform)'=='Release (OpenGL)|Win32'">Generating ServiceDescription.h for JSON-RPC API</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">CALL ..\BuildDependencies\bin\json-rpc\JsonSchemaBuilder.bat</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">CALL ..\BuildDependencies\bin\json-rpc\JsonSchemaBuilder.bat</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='Release (OpenGL)|Win32'">CALL ..\BuildDependencies\bin\json-rpc\JsonSchemaBuilder.bat</Command> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">%(RelativeDir)..\ServiceDescription.h</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">%(RelativeDir)..\ServiceDescription.h</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release (DirectX)|Win32'">%(RelativeDir)..\ServiceDescription.h</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release (OpenGL)|Win32'">%(RelativeDir)..\ServiceDescription.h</Outputs> + </CustomBuild> + <CustomBuild Include="..\..\xbmc\interfaces\json-rpc\schema\notifications.json"> + <FileType>Document</FileType> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug (DirectX)|Win32'">CALL ..\BuildDependencies\bin\json-rpc\JsonSchemaBuilder.bat</Command> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug (DirectX)|Win32'">Generating ServiceDescription.h for JSON-RPC API</Message> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug (DirectX)|Win32'">%(RelativeDir)..\ServiceDescription.h</Outputs> + <Command Condition="'$(Configuration)|$(Platform)'=='Release (DirectX)|Win32'">CALL ..\BuildDependencies\bin\json-rpc\JsonSchemaBuilder.bat</Command> + <Message Condition="'$(Configuration)|$(Platform)'=='Release (DirectX)|Win32'">Generating ServiceDescription.h for JSON-RPC API</Message> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">Generating ServiceDescription.h for JSON-RPC API</Message> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">Generating ServiceDescription.h for JSON-RPC API</Message> + <Message Condition="'$(Configuration)|$(Platform)'=='Release (OpenGL)|Win32'">Generating ServiceDescription.h for JSON-RPC API</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">CALL ..\BuildDependencies\bin\json-rpc\JsonSchemaBuilder.bat</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">CALL ..\BuildDependencies\bin\json-rpc\JsonSchemaBuilder.bat</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='Release (OpenGL)|Win32'">CALL ..\BuildDependencies\bin\json-rpc\JsonSchemaBuilder.bat</Command> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">%(RelativeDir)..\ServiceDescription.h</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">%(RelativeDir)..\ServiceDescription.h</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release (DirectX)|Win32'">%(RelativeDir)..\ServiceDescription.h</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release (OpenGL)|Win32'">%(RelativeDir)..\ServiceDescription.h</Outputs> + </CustomBuild> + <CustomBuild Include="..\..\xbmc\interfaces\json-rpc\schema\types.json"> + <FileType>Document</FileType> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug (DirectX)|Win32'">CALL ..\BuildDependencies\bin\json-rpc\JsonSchemaBuilder.bat</Command> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug (DirectX)|Win32'">Generating ServiceDescription.h for JSON-RPC API</Message> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug (DirectX)|Win32'">%(RelativeDir)..\ServiceDescription.h</Outputs> + <Command Condition="'$(Configuration)|$(Platform)'=='Release (DirectX)|Win32'">CALL ..\BuildDependencies\bin\json-rpc\JsonSchemaBuilder.bat</Command> + <Message Condition="'$(Configuration)|$(Platform)'=='Release (DirectX)|Win32'">Generating ServiceDescription.h for JSON-RPC API</Message> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">Generating ServiceDescription.h for JSON-RPC API</Message> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">Generating ServiceDescription.h for JSON-RPC API</Message> + <Message Condition="'$(Configuration)|$(Platform)'=='Release (OpenGL)|Win32'">Generating ServiceDescription.h for JSON-RPC API</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">CALL ..\BuildDependencies\bin\json-rpc\JsonSchemaBuilder.bat</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">CALL ..\BuildDependencies\bin\json-rpc\JsonSchemaBuilder.bat</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='Release (OpenGL)|Win32'">CALL ..\BuildDependencies\bin\json-rpc\JsonSchemaBuilder.bat</Command> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">%(RelativeDir)..\ServiceDescription.h</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">%(RelativeDir)..\ServiceDescription.h</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release (DirectX)|Win32'">%(RelativeDir)..\ServiceDescription.h</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release (OpenGL)|Win32'">%(RelativeDir)..\ServiceDescription.h</Outputs> + </CustomBuild> + <CustomBuild Include="..\..\xbmc\interfaces\json-rpc\schema\version.txt"> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug (DirectX)|Win32'">CALL ..\BuildDependencies\bin\json-rpc\JsonSchemaBuilder.bat</Command> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug (DirectX)|Win32'">Generating ServiceDescription.h for JSON-RPC API</Message> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug (DirectX)|Win32'">%(RelativeDir)..\ServiceDescription.h</Outputs> + <Command Condition="'$(Configuration)|$(Platform)'=='Release (DirectX)|Win32'">CALL ..\BuildDependencies\bin\json-rpc\JsonSchemaBuilder.bat</Command> + <Message Condition="'$(Configuration)|$(Platform)'=='Release (DirectX)|Win32'">Generating ServiceDescription.h for JSON-RPC API</Message> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">Generating ServiceDescription.h for JSON-RPC API</Message> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">Generating ServiceDescription.h for JSON-RPC API</Message> + <Message Condition="'$(Configuration)|$(Platform)'=='Release (OpenGL)|Win32'">Generating ServiceDescription.h for JSON-RPC API</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">CALL ..\BuildDependencies\bin\json-rpc\JsonSchemaBuilder.bat</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">CALL ..\BuildDependencies\bin\json-rpc\JsonSchemaBuilder.bat</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='Release (OpenGL)|Win32'">CALL ..\BuildDependencies\bin\json-rpc\JsonSchemaBuilder.bat</Command> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">%(RelativeDir)..\ServiceDescription.h</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">%(RelativeDir)..\ServiceDescription.h</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release (DirectX)|Win32'">%(RelativeDir)..\ServiceDescription.h</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release (OpenGL)|Win32'">%(RelativeDir)..\ServiceDescription.h</Outputs> + </CustomBuild> <None Include="..\..\xbmc\interfaces\swig\ControlListAddItemMethods.i" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> diff --git a/project/VS2010Express/XBMC.vcxproj.filters b/project/VS2010Express/XBMC.vcxproj.filters index b536eb3bb1..49d367057d 100644 --- a/project/VS2010Express/XBMC.vcxproj.filters +++ b/project/VS2010Express/XBMC.vcxproj.filters @@ -313,6 +313,9 @@ <Filter Include="settings\lib"> <UniqueIdentifier>{4de9ae04-448d-4ebe-bde5-5ec2a61270c0}</UniqueIdentifier> </Filter> + <Filter Include="interfaces\json-rpc\schema"> + <UniqueIdentifier>{e04e47ca-d34d-41e7-aaea-5f18cd802cd9}</UniqueIdentifier> + </Filter> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\xbmc\win32\pch.cpp"> @@ -6117,6 +6120,21 @@ <Filter>interfaces\swig</Filter> </CustomBuild> <CustomBuild Include="..\..\xbmc\GitRevision.h" /> + <CustomBuild Include="..\..\xbmc\interfaces\json-rpc\schema\types.json"> + <Filter>interfaces\json-rpc\schema</Filter> + </CustomBuild> + <CustomBuild Include="..\..\xbmc\interfaces\json-rpc\schema\notifications.json"> + <Filter>interfaces\json-rpc\schema</Filter> + </CustomBuild> + <CustomBuild Include="..\..\xbmc\interfaces\json-rpc\schema\methods.json"> + <Filter>interfaces\json-rpc\schema</Filter> + </CustomBuild> + <CustomBuild Include="..\..\xbmc\interfaces\json-rpc\schema\version.txt"> + <Filter>interfaces\json-rpc\schema</Filter> + </CustomBuild> + <CustomBuild Include="..\..\xbmc\interfaces\json-rpc\schema\license.txt"> + <Filter>interfaces\json-rpc\schema</Filter> + </CustomBuild> </ItemGroup> <ItemGroup> <None Include="..\..\xbmc\interfaces\swig\ControlListAddItemMethods.i"> |