asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #30489 from neikeq/fix-nullexc-on-gengameproj

Browse source 
Mono: Fix null exception in GenerateGameProject
This commit is contained in:
Ignacio Roldán Etcheverry 2019-07-10 15:40:25 +02:00 committed by GitHub
commit 8b778f6234
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/mono/build_scripts/godot_tools_build.py
View file

@ -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())

4
modules/mono/editor/GodotTools/GodotTools/CSharpProject.cs
View file

@ -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)
{ {