Author: rloach
Date: 2006-08-09 17:23:01 -0400 (Wed, 09 Aug 2006)
New Revision: 63568
Added:
trunk/tao/examples/LuaExamples/Functions/Data/LuaExamples.Functions.lua
trunk/tao/examples/LuaExamples/Simple/Data/LuaExamples.Simple.lua
Removed:
trunk/tao/examples/LuaExamples/Functions/Data/LuaExamples.Functions.Script.lua
trunk/tao/examples/LuaExamples/Simple/Data/LuaExamples.Simple.Script.lua
Modified:
trunk/tao/build.sh
trunk/tao/examples/LuaExamples/Functions/Functions.cs
trunk/tao/examples/LuaExamples/Simple/Simple.cs
trunk/tao/src/Tao.Lua/prebuild.xml
Log:
Fix build.sn, rename Lua example scripts.
Modified: trunk/tao/build.sh
===================================================================
--- trunk/tao/build.sh 2006-08-09 21:20:35 UTC (rev 63567)
+++ trunk/tao/build.sh 2006-08-09 21:23:01 UTC (rev 63568)
@@ -2,16 +2,16 @@
# Builds the Tao Framework using both Prebuild and NAnt
# Create NAnt Project Files
-other/Prebuild/Prebuild.exe /target nant /file prebuild.xml
+mono other/Prebuild/Prebuild.exe /target nant /file prebuild.xml
# Build Solutions Using NAnt
-mnant -t:mono-2.0 -buildfile:src/Tao.Cg/Tao.Cg.build build-release
-mnant -t:mono-2.0 -buildfile:src/Tao.DevIl/Tao.DevIl.build build-release
-mnant -t:mono-2.0 -buildfile:src/Tao.Ode/Tao.Ode.build build-release
-mnant -t:mono-2.0 -buildfile:src/Tao.OpenGl/Tao.OpenGl.build build-release
-mnant -t:mono-2.0 -buildfile:src/Tao.PhysFs/Tao.PhysFs.build build-release
-mnant -t:mono-2.0 -buildfile:src/Tao.Sdl/Tao.Sdl.build build-release
-mnant -t:mono-2.0 -buildfile:src/Tao.Lua/Tao.Lua.build build-release
+mono NAnt.exe -t:mono-2.0 -buildfile:src/Tao.Cg/Tao.Cg.build build-release
+mono NAnt.exe -t:mono-2.0 -buildfile:src/Tao.DevIl/Tao.DevIl.build
build-release
+mono NAnt.exe -t:mono-2.0 -buildfile:src/Tao.Ode/Tao.Ode.build build-release
+mono NAnt.exe -t:mono-2.0 -buildfile:src/Tao.OpenGl/Tao.OpenGl.build
build-release
+mono NAnt.exe -t:mono-2.0 -buildfile:src/Tao.PhysFs/Tao.PhysFs.build
build-release
+mono NAnt.exe -t:mono-2.0 -buildfile:src/Tao.Sdl/Tao.Sdl.build build-release
+mono NAnt.exe -t:mono-2.0 -buildfile:src/Tao.Lua/Tao.Lua.build build-release
# Copy Builds to Bin Directory
cp -f src/Tao.Cg/bin/Release/*.dll dist/bin/*.*
Deleted:
trunk/tao/examples/LuaExamples/Functions/Data/LuaExamples.Functions.Script.lua
===================================================================
---
trunk/tao/examples/LuaExamples/Functions/Data/LuaExamples.Functions.Script.lua
2006-08-09 21:20:35 UTC (rev 63567)
+++
trunk/tao/examples/LuaExamples/Functions/Data/LuaExamples.Functions.Script.lua
2006-08-09 21:23:01 UTC (rev 63568)
@@ -1,3 +0,0 @@
-io.write("Running ", _VERSION, "\n")
-a = my_function(1, 2, 3, "abc", "def")
-io.write("my_function() returned ", a, "\n")
\ No newline at end of file
Copied: trunk/tao/examples/LuaExamples/Functions/Data/LuaExamples.Functions.lua
(from rev 63559,
trunk/tao/examples/LuaExamples/Functions/Data/LuaExamples.Functions.Script.lua)
Modified: trunk/tao/examples/LuaExamples/Functions/Functions.cs
===================================================================
--- trunk/tao/examples/LuaExamples/Functions/Functions.cs 2006-08-09
21:20:35 UTC (rev 63567)
+++ trunk/tao/examples/LuaExamples/Functions/Functions.cs 2006-08-09
21:23:01 UTC (rev 63568)
@@ -46,7 +46,7 @@
{
string filePath = Path.Combine("..", "..");
string fileDirectory = "Data";
- string fileName = "LuaExamples.Functions.Script.lua";
+ string fileName = "LuaExamples.Functions.lua";
if (File.Exists(fileName))
{
filePath = "";
Deleted:
trunk/tao/examples/LuaExamples/Simple/Data/LuaExamples.Simple.Script.lua
===================================================================
--- trunk/tao/examples/LuaExamples/Simple/Data/LuaExamples.Simple.Script.lua
2006-08-09 21:20:35 UTC (rev 63567)
+++ trunk/tao/examples/LuaExamples/Simple/Data/LuaExamples.Simple.Script.lua
2006-08-09 21:23:01 UTC (rev 63568)
@@ -1,3 +0,0 @@
--- Simple example to test Lua
-
-print "Hello, World!"
\ No newline at end of file
Copied: trunk/tao/examples/LuaExamples/Simple/Data/LuaExamples.Simple.lua (from
rev 63559,
trunk/tao/examples/LuaExamples/Simple/Data/LuaExamples.Simple.Script.lua)
Modified: trunk/tao/examples/LuaExamples/Simple/Simple.cs
===================================================================
--- trunk/tao/examples/LuaExamples/Simple/Simple.cs 2006-08-09 21:20:35 UTC
(rev 63567)
+++ trunk/tao/examples/LuaExamples/Simple/Simple.cs 2006-08-09 21:23:01 UTC
(rev 63568)
@@ -35,7 +35,7 @@
{
string filePath = Path.Combine("..", "..");
string fileDirectory = "Data";
- string fileName = "LuaExamples.Simple.Script.lua";
+ string fileName = "LuaExamples.Simple.lua";
if (File.Exists(fileName))
{
filePath = "";
Modified: trunk/tao/src/Tao.Lua/prebuild.xml
===================================================================
--- trunk/tao/src/Tao.Lua/prebuild.xml 2006-08-09 21:20:35 UTC (rev 63567)
+++ trunk/tao/src/Tao.Lua/prebuild.xml 2006-08-09 21:23:01 UTC (rev 63568)
@@ -81,7 +81,7 @@
<Files>
<File>AssemblyInfo.cs</File>
<File>Simple.cs</File>
- <File buildAction="Content">Data\\simple.lua</File>
+ <File buildAction="Content">Data\\LuaExamples.Simple.lua</File>
</Files>
</Project>
<Project name="LuaExamples.Functions"
path="..\\..\\examples\\LuaExamples\\Functions" language="C#" type="Exe"
startupObject="LuaExamples.Functions">
@@ -110,7 +110,7 @@
<Files>
<File>AssemblyInfo.cs</File>
<File>Functions.cs</File>
- <File buildAction="Content">Data\\functions.lua</File>
+ <File
buildAction="Content">Data\\LuaExamples.Functions.lua</File>
</Files>
</Project>
</Solution>
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
