From 64aebf0b9f5d38e9739b0c55828603df08231cc0 Mon Sep 17 00:00:00 2001
From: LaurentGom <LaurentGom@4e206d99-4929-0410-ac5d-dfc041789085>
Date: Fri, 29 Jan 2010 22:10:15 +0000
Subject: [PATCH] Fixed output paths in SFML.Net project files Moved files
related to the documentation into /doc
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1384 4e206d99-4929-0410-ac5d-dfc041789085
---
dotnet/{ => doc/build}/MainPage.html | 20 +++++++--------
dotnet/{ => doc/build}/SFML.ndoc | 31 +++++++++++++-----------
dotnet/src/Audio/sfml-audio.csproj | 8 +++---
dotnet/src/Graphics/sfml-graphics.csproj | 6 ++---
dotnet/src/Window/sfml-window.csproj | 6 ++---
5 files changed, 37 insertions(+), 34 deletions(-)
rename dotnet/{ => doc/build}/MainPage.html (70%)
rename dotnet/{ => doc/build}/SFML.ndoc (51%)
diff --git a/dotnet/MainPage.html b/dotnet/doc/build/MainPage.html
similarity index 70%
rename from dotnet/MainPage.html
rename to dotnet/doc/build/MainPage.html
index a8001135..727d3789 100644
--- a/dotnet/MainPage.html
+++ b/dotnet/doc/build/MainPage.html
@@ -31,38 +31,38 @@ Here is a short example in C#, to show you how simple it is to use SFML.Net :
<span style="color:blue">static void</span> Main(<span style="color:blue">string</span>[] args)
{
<span style="color:#008000">// Create the main window</span>
- <span style="color:#2B91AF">RenderWindow</span> app = <span style="color:blue">new</span> <span style="color:#2B91AF">RenderWindow</span>(<span style="color:blue">new</span> <span style="color:#2B91AF">VideoMode</span>(800, 600), <span style="color:#A31515">"SFML window"</span>);
- app.Closed += <span style="color:blue">new</span> <span style="color:#2B91AF">EventHandler</span>(OnClose);
+ <span style="color:#2B91AF">RenderWindow</span> window = <span style="color:blue">new</span> <span style="color:#2B91AF">RenderWindow</span>(<span style="color:blue">new</span> <span style="color:#2B91AF">VideoMode</span>(800, 600), <span style="color:#A31515">"SFML window"</span>);
+ window.Closed += <span style="color:blue">new</span> <span style="color:#2B91AF">EventHandler</span>(OnClose);
<span style="color:#008000">// Load a sprite to display</span>
<span style="color:#2B91AF">Image</span> image = <span style="color:blue">new</span> <span style="color:#2B91AF">Image</span>(<span style="color:#A31515">"cute_image.jpg"</span>);
<span style="color:#2B91AF">Sprite</span> sprite = <span style="color:blue">new</span> <span style="color:#2B91AF">Sprite</span>(image);
<span style="color:#008000">// Create a graphical string to display</span>
- <span style="color:#2B91AF">Font</span> arial = <span style="color:blue">new</span> <span style="color:#2B91AF">Font</span>(<span style="color:#A31515">"arial.ttf"</span>);
- <span style="color:#2B91AF">String2D</span> text = <span style="color:blue">new</span> <span style="color:#2B91AF">String2D</span>(<span style="color:#A31515">"Hello SFML.Net"</span>, arial);
+ <span style="color:#2B91AF">Font</span> font = <span style="color:blue">new</span> <span style="color:#2B91AF">Font</span>(<span style="color:#A31515">"arial.ttf"</span>);
+ <span style="color:#2B91AF">Text</span> text = <span style="color:blue">new</span> <span style="color:#2B91AF">Text</span>(<span style="color:#A31515">"Hello SFML.Net"</span>, font);
<span style="color:#008000">// Load a music to play</span>
<span style="color:#2B91AF">Music</span> music = <span style="color:blue">new</span> Music(<span style="color:#A31515">"nice_music.ogg"</span>);
music.Play();
<span style="color:#008000">// Start the game loop</span>
- <span style="color:blue">while</span> (app.IsOpened())
+ <span style="color:blue">while</span> (window.IsOpened())
{
<span style="color:#008000">// Process events</span>
- app.DispatchEvents();
+ window.DispatchEvents();
<span style="color:#008000">// Clear screen</span>
- app.Clear();
+ window.Clear();
<span style="color:#008000">// Draw the sprite</span>
- app.Draw(sprite);
+ window.Draw(sprite);
<span style="color:#008000">// Draw the string</span>
- app.Draw(text);
+ window.Draw(text);
<span style="color:#008000">// Update the window</span>
- app.Display();
+ window.Display();
}
}
}
diff --git a/dotnet/SFML.ndoc b/dotnet/doc/build/SFML.ndoc
similarity index 51%
rename from dotnet/SFML.ndoc
rename to dotnet/doc/build/SFML.ndoc
index 89133d9b..71518f8b 100644
--- a/dotnet/SFML.ndoc
+++ b/dotnet/doc/build/SFML.ndoc
@@ -1,20 +1,27 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<project SchemaVersion="2.0">
<assemblies>
- <assembly location=".\lib\sfmlnet-graphics.dll" documentation=".\lib\graphics-doc.xml" />
- <assembly location=".\lib\sfmlnet-window.dll" documentation=".\lib\window-doc.xml" />
- <assembly location=".\lib\sfmlnet-audio.dll" documentation=".\lib\audio-doc.xml" />
+ <assembly location="..\..\lib\sfmlnet-audio.dll" documentation=".\audio-doc.xml" />
+ <assembly location="..\..\lib\sfmlnet-graphics.dll" documentation=".\graphics-doc.xml" />
+ <assembly location="..\..\lib\sfmlnet-window.dll" documentation=".\window-doc.xml" />
</assemblies>
<documenters>
<documenter name="MSDN-Help2">
<property name="PlugInNamespace" value="ms.vscc" />
- <property name="OutputDirectory" value=".\doc\" />
- <property name="HtmlHelpName" value="Documentation" />
- <property name="Title" value="An NDoc documented library" />
+ <property name="OutputDirectory" value="..\html\" />
+ <property name="HtmlHelpName" value="SFML.Net" />
+ <property name="Title" value="SFML.Net documentation" />
+ </documenter>
+ <documenter name="XML">
+ <property name="OutputFile" value=".\doc\doc.xml" />
+ </documenter>
+ <documenter name="Intellisense">
+ <property name="OutputDirectory" value="..\intellisense\" />
+ <property name="DocumentProtected" value="False" />
</documenter>
<documenter name="MSDN-CHM">
<property name="RootPageFileName" value=".\MainPage.html" />
- <property name="OutputDirectory" value=".\doc\" />
+ <property name="OutputDirectory" value="..\" />
<property name="HtmlHelpName" value="SFML.Net" />
<property name="Title" value="SFML.Net documentation" />
<property name="IncrementalBuild" value="True" />
@@ -22,14 +29,10 @@
<property name="DocumentProtected" value="False" />
<property name="CleanIntermediates" value="True" />
</documenter>
- <documenter name="Intellisense">
- <property name="OutputDirectory" value=".\intellisense\" />
- <property name="DocumentProtected" value="False" />
- </documenter>
<documenter name="MSDN-Web">
- <property name="OutputDirectory" value=".\doc\" />
- <property name="HtmlHelpName" value="Documentation" />
- <property name="Title" value="An NDoc documented library" />
+ <property name="OutputDirectory" value="..\msdn\" />
+ <property name="HtmlHelpName" value="SFML.Net" />
+ <property name="Title" value="SFML.Net documentation" />
</documenter>
</documenters>
</project>
\ No newline at end of file
diff --git a/dotnet/src/Audio/sfml-audio.csproj b/dotnet/src/Audio/sfml-audio.csproj
index e0c831a2..aef39ea7 100644
--- a/dotnet/src/Audio/sfml-audio.csproj
+++ b/dotnet/src/Audio/sfml-audio.csproj
@@ -3,7 +3,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.50727</ProductVersion>
+ <ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{0B202C4D-A457-47FE-84A3-031DD878C6BE}</ProjectGuid>
<OutputType>Library</OutputType>
@@ -22,12 +22,12 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
+ <OutputPath>..\..\lib\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <DocumentationFile>bin\audio-doc.xml</DocumentationFile>
+ <DocumentationFile>..\..\doc\build\audio-doc.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -37,7 +37,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <DocumentationFile>bin\audio-doc.xml</DocumentationFile>
+ <DocumentationFile>..\..\doc\build\audio-doc.xml</DocumentationFile>
</PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
diff --git a/dotnet/src/Graphics/sfml-graphics.csproj b/dotnet/src/Graphics/sfml-graphics.csproj
index 1c6850be..5314c534 100644
--- a/dotnet/src/Graphics/sfml-graphics.csproj
+++ b/dotnet/src/Graphics/sfml-graphics.csproj
@@ -22,12 +22,12 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
+ <OutputPath>..\..\lib\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <DocumentationFile>bin\graphics-doc.xml</DocumentationFile>
+ <DocumentationFile>..\..\doc\build\graphics-doc.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -37,7 +37,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <DocumentationFile>bin\graphics-doc.xml</DocumentationFile>
+ <DocumentationFile>..\..\doc\build\graphics-doc.xml</DocumentationFile>
</PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
diff --git a/dotnet/src/Window/sfml-window.csproj b/dotnet/src/Window/sfml-window.csproj
index 3449efc3..02db5316 100644
--- a/dotnet/src/Window/sfml-window.csproj
+++ b/dotnet/src/Window/sfml-window.csproj
@@ -22,12 +22,12 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
+ <OutputPath>..\..\lib\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <DocumentationFile>bin\window-doc.xml</DocumentationFile>
+ <DocumentationFile>..\..\doc\build\window-doc.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -37,7 +37,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <DocumentationFile>bin\window-doc.xml</DocumentationFile>
+ <DocumentationFile>..\..\doc\build\window-doc.xml</DocumentationFile>
</PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.