Merge pull request #11 from AndrewDRX/development

Enhancement: Custom CSPROJ

src/cscompiler/CSCompiler.hx

@@ -2,6 +2,9 @@ package cscompiler;
 
 #if (macro || cs_runtime)
 
+import sys.io.File;
+
+import haxe.io.Path;
 import haxe.macro.Expr;
 import haxe.macro.Type;
 
@@ -24,6 +27,7 @@ using reflaxe.helpers.TypeHelper;
 // ---
 
 import cscompiler.components.*;
+import cscompiler.config.Define;
 
 /**
 	The class that manages the generation of the C# code.
@@ -126,18 +130,31 @@ namespace Haxe {
 	}
 
 	/**
-		Generates the .csproj file.
+		Adds a .csproj file to the output directory.
+
+		If the Define `no-csproj` is specified, then nothing is added.
+
+		Otherwise, if the Define `csproj` specifies a path to an existing
+		.csproj file, then that is used.
+
+		Otherwise, a default .csproj is generated.
 	**/
 	function setupCsProj() {
-		if(!Context.defined("no-csproj")) {
-			appendToExtraFile("build.csproj", csProjContent());
+		if (D_NoCsproj.isDefined()) {
+			return;
+		}
+		if (!D_Csproj.isDefined()) {
+			appendToExtraFile("build.csproj", csProjDefaultContent());
+			return;
 		}
+		final path = new Path(Context.resolvePath(D_Csproj.getValue()));
+		appendToExtraFile('${path.file}.${path.ext}', File.getContent(path.toString()));
 	}
 
 	/**
-		Returns the content of the .csproj file.
+		Returns the default content of the .csproj file.
 	**/
-	function csProjContent() {
+	function csProjDefaultContent() {
 		return StringTools.trim('
 <Project Sdk="Microsoft.NET.Sdk">
 

src/cscompiler/config/Define.hx

@@ -5,21 +5,41 @@ package cscompiler.config;
 import reflaxe.helpers.Context; // same as haxe.macro.Context
 
 /**
-    Lists all the custom defines available for configuring Reflaxe/C#.
+	Lists all the custom defines available for configuring Reflaxe/C#.
 **/
 @:using(cscompiler.config.Define.DefineTools)
 enum abstract Define(String) from String to String {
+	/**
+		-D csproj=[path to file]
+
+		When set, the csproj at the specified path will be used for C#
+		instead of an auto-generated csproj.
+
+		This will be ignored when the `Define` `no-csproj` is set.
+	**/
+	var D_Csproj = "csproj";
+
 	/**
 		-D namespace_style=[default|pascal]
 
-        Default value: `default`
+		Default value: `default`
 
 		Determines how namespace names are generated for C#.
 
-        If set to `pascal`, snake-case package names are converted
-        to pascal-case C# namespaces.
+		If set to `pascal`, snake-case package names are converted
+		to pascal-case C# namespaces.
 	**/
 	var D_NamespaceStyle = "namespace_style";
+
+	/**
+		-D no-csproj
+
+		When set, a csproj file will not be generated C#.
+
+		This also applies to any csproj file specified with
+		the Define `csproj`.
+	**/
+	var D_NoCsproj = "no-csproj";
 }
 
 /**

test/tests/Define_Csproj/.gitignore

@@ -0,0 +1,5 @@
+build
+out
+out-legacy-cs
+intended/bin
+intended/obj

test/tests/Define_Csproj/Main.hx

@@ -0,0 +1,3 @@
+package;
+
+function main() { }

test/tests/Define_Csproj/Test.csproj

@@ -0,0 +1,10 @@
+<!-- THIS IS NOT THE DEFAULT CSPROJ -->
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<OutputType>Exe</OutputType>
+		<TargetFramework>net6.0</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+		<StartupObject>Haxe.HaxeBoot</StartupObject>
+	</PropertyGroup>
+</Project>

test/tests/Define_Csproj/Test_Specified.hxml

@@ -0,0 +1,6 @@
+# The following are added automatically:
+# -lib csharp
+# --custom-target rcs=out
+
+-main Main
+-D csproj=Test.csproj

test/tests/Define_Csproj/Test_Unspecified.hxml

@@ -0,0 +1,5 @@
+# The following are added automatically:
+# -lib csharp
+# --custom-target rcs=out
+
+-main Main

test/tests/Define_Csproj/intended/Test_Specified/HaxeBoot.cs

@@ -0,0 +1,7 @@
+namespace Haxe {
+	class HaxeBoot {
+		static void Main(string[] args) {
+			haxe.root.Main_Fields_.main();
+		}
+	}
+}

test/tests/Define_Csproj/intended/Test_Specified/Main.cs

@@ -0,0 +1,7 @@
+namespace haxe.root {
+	class Main_Fields_ {
+		public static void main() {
+
+		}
+	}
+}

test/tests/Define_Csproj/intended/Test_Specified/Test.csproj

@@ -0,0 +1,10 @@
+<!-- THIS IS NOT THE DEFAULT CSPROJ -->
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<OutputType>Exe</OutputType>
+		<TargetFramework>net6.0</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+		<StartupObject>Haxe.HaxeBoot</StartupObject>
+	</PropertyGroup>
+</Project>

test/tests/Define_Csproj/intended/Test_Specified/_GeneratedFiles.txt

@@ -0,0 +1,3 @@
+Main.cs
+Test.csproj
+HaxeBoot.cs

test/tests/Define_Csproj/intended/Test_Unspecified/HaxeBoot.cs

@@ -0,0 +1,7 @@
+namespace Haxe {
+	class HaxeBoot {
+		static void Main(string[] args) {
+			haxe.root.Main_Fields_.main();
+		}
+	}
+}

test/tests/Define_Csproj/intended/Test_Unspecified/Main.cs

@@ -0,0 +1,7 @@
+namespace haxe.root {
+	class Main_Fields_ {
+		public static void main() {
+
+		}
+	}
+}

test/tests/Define_Csproj/intended/Test_Unspecified/_GeneratedFiles.txt

@@ -0,0 +1,3 @@
+Main.cs
+build.csproj
+HaxeBoot.cs

test/tests/Define_Csproj/intended/Test_Unspecified/build.csproj

@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+<PropertyGroup>
+	<OutputType>Exe</OutputType>
+	<TargetFramework>net6.0</TargetFramework>
+	<ImplicitUsings>enable</ImplicitUsings>
+	<Nullable>enable</Nullable>
+	<StartupObject>Haxe.HaxeBoot</StartupObject>
+</PropertyGroup>
+
+</Project>