ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-06-21 15:08:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Build system to copy DataFiles to output path.

Browse source
This commit is contained in:
the_fiddler 2007-11-11 23:25:17 +00:00
parent 7b3dbb96ff
commit 36e7308e19
3 changed files with 39 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
Build/Build.exe
View file

Binary file not shown.

4
Build/Prebuild.xml
View file

@ -128,7 +128,9 @@
<Files> <Files>
<Match path="." pattern="*.cs" recurse="true"/> <Match path="." pattern="*.cs" recurse="true"/>
<Match path="./Data" pattern="*.*" buildAction="None" copyToOutput="Always"/> <Match path="../Examples/Data" pattern="*.*" recurse="true" buildAction="None" copyToOutput="Always"/>
<Match path="./Data" pattern="*.txt" recurse="true" buildAction="None" copyToOutput="Always"/>
<Match path="./Data" pattern="*.glsl" recurse="true" buildAction="None" copyToOutput="Always"/>
<Match path="../OpenTK" pattern="OpenTK.dll.config" buildAction="None" copyToOutput="Always"/> <Match path="../OpenTK" pattern="OpenTK.dll.config" buildAction="None" copyToOutput="Always"/>
</Files> </Files>

42
Source/Build/Build.cs
View file

@ -11,6 +11,7 @@ using System.Collections.Generic;
using System.Text; using System.Text;
using System.IO; using System.IO;
using System.Diagnostics; using System.Diagnostics;
using System.Text.RegularExpressions;
#endregion #endregion
@ -31,6 +32,8 @@ namespace OpenTK.Build
static string PrebuildXml = Path.Combine(ToolPath, "Prebuild.xml"); static string PrebuildXml = Path.Combine(ToolPath, "Prebuild.xml");
static Regex DataFiles = new Regex(@"(\.jpg|\.txt|\.glsl)", RegexOptions.Compiled | RegexOptions.IgnoreCase);
enum BuildMode enum BuildMode
{ {
Default = 0, Default = 0,
@ -251,11 +254,6 @@ namespace OpenTK.Build
Directory.CreateDirectory(ExamplePath); Directory.CreateDirectory(ExamplePath);
Directory.CreateDirectory(DataPath); Directory.CreateDirectory(DataPath);
// Handled by Prebuild.exe now.
// Copy Data files for the Examples.
//foreach (string file in Directory.GetFiles(DataSourcePath))
// File.Copy(file, Path.Combine(DataPath, Path.GetFileName(file)));
// Move the libraries and the config files. // Move the libraries and the config files.
FindFiles(SourcePath, "*.dll", dll_matches); FindFiles(SourcePath, "*.dll", dll_matches);
foreach (string m in dll_matches) foreach (string m in dll_matches)
@ -283,6 +281,9 @@ namespace OpenTK.Build
File.Move(m, Path.Combine(ExamplePath, Path.GetFileName(m))); File.Move(m, Path.Combine(ExamplePath, Path.GetFileName(m)));
} }
// Copy example data.
FileCopy(DataSourcePath, DataPath, DataFiles);
// Then the rest of the exes. // Then the rest of the exes.
FindFiles(SourcePath, "*.exe", exe_matches); FindFiles(SourcePath, "*.exe", exe_matches);
foreach (string m in exe_matches) foreach (string m in exe_matches)
@ -362,7 +363,7 @@ namespace OpenTK.Build
p.WaitForExit(); p.WaitForExit();
} }
catch (Exception e) catch (Exception)
{ {
Console.WriteLine("Failed to execute process: {0}", p.ProcessName); Console.WriteLine("Failed to execute process: {0}", p.ProcessName);
} }
@ -379,5 +380,34 @@ namespace OpenTK.Build
Console.WriteLine(e.Data.TrimEnd('\n')); Console.WriteLine(e.Data.TrimEnd('\n'));
} }
} }
static void FileCopy(string srcdir, string destdir, Regex match)
{
//DirectoryInfo dir;
//FileInfo[] files;
//DirectoryInfo[] dirs;
string tmppath;
//determine if the destination directory exists, if not create it
if (!Directory.Exists(destdir))
Directory.CreateDirectory(destdir);
if (!Directory.Exists(srcdir))
throw new ArgumentException("source dir doesn't exist -> " + srcdir);
string[] files = Directory.GetFiles(srcdir);
foreach (string f in files)
//if (Path.GetExtension(f).ToLower() == ext.ToLower())
if (match.IsMatch(Path.GetExtension(f)))
File.Copy(f, Path.Combine(destdir, Path.GetFileName(f)), true);
foreach (string dir in Directory.GetDirectories(srcdir))
{
string name = dir.Substring(dir.LastIndexOf(Path.DirectorySeparatorChar)+1);
if (!name.StartsWith("."))
FileCopy(dir, Path.Combine(destdir, name), match);
}
}
} }
} }