** Merged GMake C# support from branches/csharp (r630:648)

9 files changed, 181 insertions, 3 deletions

diff --git a/samples/project/CsConsoleApp/App.config b/samples/project/CsConsoleApp/App.config
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/samples/project/CsConsoleApp/App.config
diff --git a/samples/project/CsConsoleApp/Crate.bmp b/samples/project/CsConsoleApp/Crate.bmp
new file mode 100644
index 0000000..73fe985
--- /dev/null
+++ b/samples/project/CsConsoleApp/Crate.bmp
diff --git a/samples/project/CsConsoleApp/CsConsoleApp.cs b/samples/project/CsConsoleApp/CsConsoleApp.cs
new file mode 100644
index 0000000..65786ca
--- /dev/null
+++ b/samples/project/CsConsoleApp/CsConsoleApp.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Reflection;
+using System.Resources;
+
+public class CsConsoleApp
+{
+	static int Main()
+	{
+		Assembly assembly = Assembly.GetExecutingAssembly();
+		ResourceManager resx = new ResourceManager("CsConsoleApp.Resources", assembly);
+		string greeting = resx.GetString("Greeting");
+		Console.WriteLine(greeting);
+
+		Console.WriteLine("CsConsoleApp");
+
+		CsSharedLib lib = new CsSharedLib();
+		lib.DoIt();
+
+		return 0;
+	}
+}
diff --git a/samples/project/CsConsoleApp/Resources.resx b/samples/project/CsConsoleApp/Resources.resx
new file mode 100644
index 0000000..518cff0
--- /dev/null
+++ b/samples/project/CsConsoleApp/Resources.resx
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>

+<root>

+  <!-- 

+    Microsoft ResX Schema 

+    

+    Version 2.0

+    

+    The primary goals of this format is to allow a simple XML format 

+    that is mostly human readable. The generation and parsing of the 

+    various data types are done through the TypeConverter classes 

+    associated with the data types.

+    

+    Example:

+    

+    ... ado.net/XML headers & schema ...

+    <resheader name="resmimetype">text/microsoft-resx</resheader>

+    <resheader name="version">2.0</resheader>

+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>

+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>

+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>

+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>

+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">

+        <value>[base64 mime encoded serialized .NET Framework object]</value>

+    </data>

+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>

+        <comment>This is a comment</comment>

+    </data>

+                

+    There are any number of "resheader" rows that contain simple 

+    name/value pairs.

+    

+    Each data row contains a name, and value. The row also contains a 

+    type or mimetype. Type corresponds to a .NET class that support 

+    text/value conversion through the TypeConverter architecture. 

+    Classes that don't support this are serialized and stored with the 

+    mimetype set.

+    

+    The mimetype is used for serialized objects, and tells the 

+    ResXResourceReader how to depersist the object. This is currently not 

+    extensible. For a given mimetype the value must be set accordingly:

+    

+    Note - application/x-microsoft.net.object.binary.base64 is the format 

+    that the ResXResourceWriter will generate, however the reader can 

+    read any of the formats listed below.

+    

+    mimetype: application/x-microsoft.net.object.binary.base64

+    value   : The object must be serialized with 

+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter

+            : and then encoded with base64 encoding.

+    

+    mimetype: application/x-microsoft.net.object.soap.base64

+    value   : The object must be serialized with 

+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter

+            : and then encoded with base64 encoding.

+

+    mimetype: application/x-microsoft.net.object.bytearray.base64

+    value   : The object must be serialized into a byte array 

+            : using a System.ComponentModel.TypeConverter

+            : and then encoded with base64 encoding.

+    -->

+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">

+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />

+    <xsd:element name="root" msdata:IsDataSet="true">

+      <xsd:complexType>

+        <xsd:choice maxOccurs="unbounded">

+          <xsd:element name="metadata">

+            <xsd:complexType>

+              <xsd:sequence>

+                <xsd:element name="value" type="xsd:string" minOccurs="0" />

+              </xsd:sequence>

+              <xsd:attribute name="name" use="required" type="xsd:string" />

+              <xsd:attribute name="type" type="xsd:string" />

+              <xsd:attribute name="mimetype" type="xsd:string" />

+              <xsd:attribute ref="xml:space" />

+            </xsd:complexType>

+          </xsd:element>

+          <xsd:element name="assembly">

+            <xsd:complexType>

+              <xsd:attribute name="alias" type="xsd:string" />

+              <xsd:attribute name="name" type="xsd:string" />

+            </xsd:complexType>

+          </xsd:element>

+          <xsd:element name="data">

+            <xsd:complexType>

+              <xsd:sequence>

+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />

+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />

+              </xsd:sequence>

+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />

+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />

+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />

+              <xsd:attribute ref="xml:space" />

+            </xsd:complexType>

+          </xsd:element>

+          <xsd:element name="resheader">

+            <xsd:complexType>

+              <xsd:sequence>

+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />

+              </xsd:sequence>

+              <xsd:attribute name="name" type="xsd:string" use="required" />

+            </xsd:complexType>

+          </xsd:element>

+        </xsd:choice>

+      </xsd:complexType>

+    </xsd:element>

+  </xsd:schema>

+  <resheader name="resmimetype">

+    <value>text/microsoft-resx</value>

+  </resheader>

+  <resheader name="version">

+    <value>2.0</value>

+  </resheader>

+  <resheader name="reader">

+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

+  </resheader>

+  <resheader name="writer">

+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

+  </resheader>

+  <data name="Greeting" xml:space="preserve">

+    <value>Hi there!</value>

+  </data>

+</root>
\ No newline at end of file
diff --git a/samples/project/CsConsoleApp/premake4.lua b/samples/project/CsConsoleApp/premake4.lua
new file mode 100644
index 0000000..e3e6c01
--- /dev/null
+++ b/samples/project/CsConsoleApp/premake4.lua
@@ -0,0 +1,12 @@
+project "CsConsoleApp"
+
+	kind     "ConsoleApp"
+	language "C#"
+	
+	files   { "*.cs", "*.bmp", "App.config", "Resources.resx" }
+	
+	libdirs { "../lib" }
+	links { "CsSharedLib", "CppSharedLib", "System" }
+	
+	configuration "Crate.bmp"
+		buildaction "Embed"
diff --git a/samples/project/CsSharedLib/CsSharedLib.cs b/samples/project/CsSharedLib/CsSharedLib.cs
new file mode 100644
index 0000000..1c68e0f
--- /dev/null
+++ b/samples/project/CsSharedLib/CsSharedLib.cs
@@ -0,0 +1,9 @@
+using System;
+
+public class CsSharedLib
+{
+	public void DoIt()
+	{
+		Console.WriteLine("CsSharedLib");
+	}
+}
diff --git a/samples/project/CsSharedLib/premake4.lua b/samples/project/CsSharedLib/premake4.lua
new file mode 100644
index 0000000..e8df542
--- /dev/null
+++ b/samples/project/CsSharedLib/premake4.lua
@@ -0,0 +1,11 @@
+project "CsSharedLib"
+
+	kind     "SharedLib"
+	language "C#"
+	files    { "*.cs" }
+
+	configuration "Debug"
+		targetdir "lib/debug"
+		
+	configuration "Release"
+		targetdir "lib/release"
diff --git a/samples/project/premake4 b/samples/project/premake4
index 2c6c4a3..872817e 100644
--- a/samples/project/premake4
+++ b/samples/project/premake4
@@ -1,2 +1,3 @@
 #!/bin/sh
-../../bin/debug/premake4 /scripts=../../src $1 $2 $3 $4 $5 $6
+
+../../bin/debug/premake4 /scripts=../../src $1 $2 $3 $4 $5 $6 $7
diff --git a/samples/project/premake4.lua b/samples/project/premake4.lua
index b5a1788..b39956b 100644
--- a/samples/project/premake4.lua
+++ b/samples/project/premake4.lua
@@ -1,8 +1,6 @@
 solution "PremakeTestbox"
 	configurations { "Debug", "Release" }
 	
-	location "build"
-	
 	configuration "Debug"
 		targetdir "bin/debug"
 		flags   { "Symbols" }
@@ -15,13 +13,16 @@ solution "PremakeTestbox"
 	
 	
 include "CppConsoleApp"
+include "CsConsoleApp"
 include "CppWindowedApp"
 include "CppSharedLib"
+include "CsSharedLib"
 include "CppStaticLib"
 
 function onclean()
 	os.rmdir("bin")
 	os.rmdir("CppSharedLib/lib")
 	os.rmdir("CppStaticLib/lib")
+	os.rmdir("CsSharedLib/lib")
 end