Browse Source

Mono: Fix null exception in GenerateGameProject

Also fix pdb files for GodotTools.*.dll assemblies not being copied to the output directory.
Ignacio Etcheverry 6 years ago
parent
commit
caf20492cf

+ 5 - 1
modules/mono/build_scripts/godot_tools_build.py

@@ -87,7 +87,7 @@ def build(env_mono):
     target_filenames = ['GodotTools.dll', 'GodotTools.BuildLogger.dll', 'GodotTools.ProjectEditor.dll', 'DotNet.Glob.dll', 'GodotTools.Core.dll']
     target_filenames = ['GodotTools.dll', 'GodotTools.BuildLogger.dll', 'GodotTools.ProjectEditor.dll', 'DotNet.Glob.dll', 'GodotTools.Core.dll']
 
 
     if env_mono['target'] == 'debug':
     if env_mono['target'] == 'debug':
-        target_filenames += ['GodotTools.pdb', 'GodotTools.BuildLogger.dll', 'GodotTools.ProjectEditor.dll', 'GodotTools.Core.dll']
+        target_filenames += ['GodotTools.pdb', 'GodotTools.BuildLogger.pdb', 'GodotTools.ProjectEditor.pdb', 'GodotTools.Core.pdb']
 
 
     targets = [os.path.join(editor_tools_dir, filename) for filename in target_filenames]
     targets = [os.path.join(editor_tools_dir, filename) for filename in target_filenames]
 
 
@@ -102,6 +102,10 @@ def build_project_editor_only(env_mono):
     editor_tools_dir = os.path.join(output_dir, 'GodotSharp', 'Tools')
     editor_tools_dir = os.path.join(output_dir, 'GodotSharp', 'Tools')
 
 
     target_filenames = ['GodotTools.ProjectEditor.dll', 'DotNet.Glob.dll', 'GodotTools.Core.dll']
     target_filenames = ['GodotTools.ProjectEditor.dll', 'DotNet.Glob.dll', 'GodotTools.Core.dll']
+
+    if env_mono['target'] == 'debug':
+        target_filenames += ['GodotTools.ProjectEditor.pdb', 'GodotTools.Core.pdb']
+
     targets = [os.path.join(editor_tools_dir, filename) for filename in target_filenames]
     targets = [os.path.join(editor_tools_dir, filename) for filename in target_filenames]
 
 
     cmd = env_mono.CommandNoCache(targets, [], build_godot_tools_project_editor, module_dir=os.getcwd())
     cmd = env_mono.CommandNoCache(targets, [], build_godot_tools_project_editor, module_dir=os.getcwd())

+ 2 - 2
modules/mono/editor/GodotTools/GodotTools/CSharpProject.cs

@@ -11,11 +11,11 @@ namespace GodotTools
 {
 {
     public static class CSharpProject
     public static class CSharpProject
     {
     {
-        public static string GenerateGameProject(string dir, string name, IEnumerable<string> files = null)
+        public static string GenerateGameProject(string dir, string name)
         {
         {
             try
             try
             {
             {
-                return ProjectGenerator.GenGameProject(dir, name, files);
+                return ProjectGenerator.GenGameProject(dir, name, compileItems: new string[] { });
             }
             }
             catch (Exception e)
             catch (Exception e)
             {
             {