Merge branch 'origin/master'

This commit is contained in:
atanasovg
2014-06-05 14:04:48 +03:00
15 changed files with 411 additions and 69 deletions

View File

@@ -241,6 +241,14 @@
<ItemGroup>
<TypeScriptCompile Include="ui\core\view.d.ts" />
<TypeScriptCompile Include="ui\core\observable.ts" />
<TypeScriptCompile Include="ui\dialogs\dialogs.android.ts">
<DependentUpon>dialogs.d.ts</DependentUpon>
</TypeScriptCompile>
<TypeScriptCompile Include="ui\dialogs\dialogs.d.ts" />
<TypeScriptCompile Include="ui\dialogs\dialogs.ios.ts">
<DependentUpon>dialogs.d.ts</DependentUpon>
</TypeScriptCompile>
<TypeScriptCompile Include="ui\dialogs\index.ts" />
<Content Include="_references.ts" />
<Content Include="image-source\Readme.md" />
<Content Include="http\Readme.md" />
@@ -259,6 +267,9 @@
<Folder Include="Deploy\Full\" />
<Folder Include="Deploy\xCode\" />
</ItemGroup>
<ItemGroup>
<Content Include="ui\dialogs\Readme.md" />
</ItemGroup>
<PropertyGroup Condition="'$(Configuration)' == 'Full'">
<TypeScriptModuleKind>commonjs</TypeScriptModuleKind>
<TypeScriptRemoveComments>True</TypeScriptRemoveComments>
@@ -351,7 +362,15 @@
<UsingTask TaskName="BuildTasks.CopyForPlatformBuildTask" AssemblyFile="../../Build/lib/BuildTasks.dll" />
<Target Name="AfterBuild">
<CopyForPlatformBuildTask TargetPlatform="$(TargetOS)" IncludeTests="$(CopyTests)" Platforms="iOS;Android" InputFiles="@(GeneratedJavascript)" DestinationFolder="$(OutputPath)\$(Configuration)\" JSConfigFile="$(JSConfig)" AppMainJSFile="$(JSMainFile)" ProjectDir="$(ProjectDir)" />
<Exec Condition=" '$(Configuration)' == 'Documentation'" Command="node ../../Documentation/Src/TypeScriptAPIExtractor/app.js @(TypeScriptCompile) $(IntermediateOutputPath)\api.xml" IgnoreExitCode="true" IgnoreStandardErrorWarningFormat="false" LogStandardErrorAsError="true" />
<Exec Condition=" '$(Configuration)' == 'Documentation' " Command='rd /q /s "../../Documentation/Docs/"' />
<Exec Condition=" '$(Configuration)' == 'Documentation' " Command='md "../../Documentation/Docs/"' />
<Exec Condition=" '$(Configuration)' == 'Documentation' " Command='node ../../Documentation/Src/SnippetsExtractor/app.js -noclean -source bin\Documentation\Tests -destination ../../Documentation/Docs/' />
<Exec Condition=" '$(Configuration)' == 'Documentation' " Command="node ../../Documentation/Src/TypeScriptAPIExtractor/app.js @(TypeScriptCompile) $(IntermediateOutputPath)\api.xml" IgnoreExitCode="true" IgnoreStandardErrorWarningFormat="false" LogStandardErrorAsError="true" />
<Exec Condition=" '$(Configuration)' == 'Documentation' " Command='"../../Documentation/Src/XMLAPIPrinting/bin/Release/XMLAPIPrinting.exe" $(IntermediateOutputPath)\api.xml "../../Documentation/Docs/"' />
</Target>
<PropertyGroup>
<PostBuildEvent>