Skip to content

Commit f605ddb

Browse files
committed
Merge branch 'release-0.16.0'
2 parents 7ac0ba0 + 016b28b commit f605ddb

File tree

87 files changed

+3373
-1207
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+3373
-1207
lines changed

.github/workflows/actions.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on: [push, pull_request]
55
jobs:
66
build:
77
runs-on: ${{ matrix.os }}
8+
continue-on-error: true
89
strategy:
910
matrix:
1011
os: [ubuntu-latest, macos-latest, windows-latest]
@@ -40,7 +41,7 @@ jobs:
4041
run: ./CompileSharpmake.sh Sharpmake.sln "${{ matrix.configuration }}"
4142

4243
- name: GenerateMdbFiles.bat
43-
if: runner.os == 'Windows'
44+
if: runner.os == 'Windows' && matrix.configuration == 'release'
4445
shell: cmd
4546
run: GenerateMdbFiles.bat
4647

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
# Samples and FunctionalTests generated projects
1414
samples/*/projects/*
15-
samples/HelloXCode/codebase/temp*
15+
samples/*/codebase/temp*
1616
Sharpmake.FunctionalTests/*/projects/*
1717
!**/reference/**/*.*
1818
## Ignore Visual Studio temporary files, build results, and
@@ -66,3 +66,6 @@ Sharpmake.VC.db
6666

6767
# Desktop Services Store on MacOS
6868
**/.DS_Store
69+
70+
# Discard tmp files
71+
[Tt]mp/

CODE_OF_CONDUCT.md

Lines changed: 132 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,132 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
We as members, contributors, and leaders pledge to make participation in our
6+
community a harassment-free experience for everyone, regardless of age, body
7+
size, visible or invisible disability, ethnicity, sex characteristics, gender
8+
identity and expression, level of experience, education, socio-economic status,
9+
nationality, personal appearance, race, caste, color, religion, or sexual identity
10+
and orientation.
11+
12+
We pledge to act and interact in ways that contribute to an open, welcoming,
13+
diverse, inclusive, and healthy community.
14+
15+
## Our Standards
16+
17+
Examples of behavior that contributes to a positive environment for our
18+
community include:
19+
20+
* Demonstrating empathy and kindness toward other people
21+
* Being respectful of differing opinions, viewpoints, and experiences
22+
* Giving and gracefully accepting constructive feedback
23+
* Accepting responsibility and apologizing to those affected by our mistakes,
24+
and learning from the experience
25+
* Focusing on what is best not just for us as individuals, but for the
26+
overall community
27+
28+
Examples of unacceptable behavior include:
29+
30+
* The use of sexualized language or imagery, and sexual attention or
31+
advances of any kind
32+
* Trolling, insulting or derogatory comments, and personal or political attacks
33+
* Public or private harassment
34+
* Publishing others' private information, such as a physical or email
35+
address, without their explicit permission
36+
* Other conduct which could reasonably be considered inappropriate in a
37+
professional setting
38+
39+
## Enforcement Responsibilities
40+
41+
Community leaders are responsible for clarifying and enforcing our standards of
42+
acceptable behavior and will take appropriate and fair corrective action in
43+
response to any behavior that they deem inappropriate, threatening, offensive,
44+
or harmful.
45+
46+
Community leaders have the right and responsibility to remove, edit, or reject
47+
comments, commits, code, wiki edits, issues, and other contributions that are
48+
not aligned to this Code of Conduct, and will communicate reasons for moderation
49+
decisions when appropriate.
50+
51+
## Scope
52+
53+
This Code of Conduct applies within all community spaces, and also applies when
54+
an individual is officially representing the community in public spaces.
55+
Examples of representing our community include using an official e-mail address,
56+
posting via an official social media account, or acting as an appointed
57+
representative at an online or offline event.
58+
59+
## Enforcement
60+
61+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
62+
reported to the community leaders responsible for enforcement at
63+
64+
All complaints will be reviewed and investigated promptly and fairly.
65+
66+
All community leaders are obligated to respect the privacy and security of the
67+
reporter of any incident.
68+
69+
## Enforcement Guidelines
70+
71+
Community leaders will follow these Community Impact Guidelines in determining
72+
the consequences for any action they deem in violation of this Code of Conduct:
73+
74+
### 1. Correction
75+
76+
**Community Impact**: Use of inappropriate language or other behavior deemed
77+
unprofessional or unwelcome in the community.
78+
79+
**Consequence**: A private, written warning from community leaders, providing
80+
clarity around the nature of the violation and an explanation of why the
81+
behavior was inappropriate. A public apology may be requested.
82+
83+
### 2. Warning
84+
85+
**Community Impact**: A violation through a single incident or series
86+
of actions.
87+
88+
**Consequence**: A warning with consequences for continued behavior. No
89+
interaction with the people involved, including unsolicited interaction with
90+
those enforcing the Code of Conduct, for a specified period of time. This
91+
includes avoiding interactions in community spaces as well as external channels
92+
like social media. Violating these terms may lead to a temporary or
93+
permanent ban.
94+
95+
### 3. Temporary Ban
96+
97+
**Community Impact**: A serious violation of community standards, including
98+
sustained inappropriate behavior.
99+
100+
**Consequence**: A temporary ban from any sort of interaction or public
101+
communication with the community for a specified period of time. No public or
102+
private interaction with the people involved, including unsolicited interaction
103+
with those enforcing the Code of Conduct, is allowed during this period.
104+
Violating these terms may lead to a permanent ban.
105+
106+
### 4. Permanent Ban
107+
108+
**Community Impact**: Demonstrating a pattern of violation of community
109+
standards, including sustained inappropriate behavior, harassment of an
110+
individual, or aggression toward or disparagement of classes of individuals.
111+
112+
**Consequence**: A permanent ban from any sort of public interaction within
113+
the community.
114+
115+
## Attribution
116+
117+
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
118+
version 2.0, available at
119+
[https://www.contributor-covenant.org/version/2/0/code_of_conduct.html][v2.0].
120+
121+
Community Impact Guidelines were inspired by
122+
[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
123+
124+
For answers to common questions about this code of conduct, see the FAQ at
125+
[https://www.contributor-covenant.org/faq][FAQ]. Translations are available
126+
at [https://www.contributor-covenant.org/translations][translations].
127+
128+
[homepage]: https://www.contributor-covenant.org
129+
[v2.0]: https://www.contributor-covenant.org/version/2/0/code_of_conduct.html
130+
[Mozilla CoC]: https://github.com/mozilla/diversity
131+
[FAQ]: https://www.contributor-covenant.org/faq
132+
[translations]: https://www.contributor-covenant.org/translations

CONTRIBUTING.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
## Contributing
2+
3+
### Tests
4+
5+
We will only accept merge requests that pass every tests. The unit tests are written with NUnit and the regression tests are ran by comparing the samples' output with a reference output. You can run the regression_tests.py script after having built the solution in Visual Studio to run the regression tests.
6+
7+
Because the regression tests just do a direct comparison with the output, it is possible to get a false negative after having done a good change. In that case, please update the tests so they match the output after your change. You can run the UpdateSamplesOutput.bat and UpdateSharpmakeProjects.bat batch files to automatically overwrite the reference output files.
8+
9+
Naturally, we also recommend that you put your own tests after fixing a bug or adding a feature to help us avoid regressions.
10+
11+
Functional tests are generating test projects and building them to test functionality
12+
13+
used toolset for functional tests:
14+
15+
tools\FastBuild - v1.01. http://www.fastbuild.org
16+
17+
### Additional Platforms
18+
19+
If you want to add support for an additional platform, please make sure that the platform is open and that you are not breaking your NDA. Ubisoft has not published platform support for most video game consoles for that exact reason. We will not accept merge requests for new platforms that are not completely open for development.

Intro.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ class MySolution : Solution
200200
The entry point is the Main, a function called once and found in the main .sharpmake.cs file passed to Sharpmake.exe:
201201

202202
```csharp
203-
static class Main
203+
public static class Main
204204
{
205205
[Sharpmake.Main]
206206
public static void SharpmakeMain(Sharpmake.Arguments arguments)
@@ -224,7 +224,7 @@ class MyArguments
224224
}
225225
}
226226

227-
static class Main
227+
public static class Main
228228
{
229229
public static MyArguments Arguments = new MyArguments();
230230

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ functionality
7979

8080
used toolset for functional tests:
8181

82-
tools\FastBuild - v1.01. http://www.fastbuild.org
82+
tools\FastBuild - v1.04. http://www.fastbuild.org
8383

8484

8585

Sharpmake.Application/Program.cs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,9 @@ private static int Main()
175175
// This GC gives a little bit better results than the other ones. "LowLatency" is giving really bad results(twice slower than the other ones).
176176
System.Runtime.GCSettings.LatencyMode = System.Runtime.GCLatencyMode.SustainedLowLatency;
177177

178+
AppDomain currentDomain = AppDomain.CurrentDomain;
179+
currentDomain.UnhandledException += AppDomain_UnhandledException;
180+
178181
Mutex oneInstanceMutex = null;
179182
Argument parameters = new Argument();
180183
ExitCode exitCode = ExitCode.Success;
@@ -412,6 +415,14 @@ private static void AppDomain_AssemblyLoad(object sender, AssemblyLoadEventArgs
412415
LogSharpmakeExtensionLoaded(args.LoadedAssembly);
413416
}
414417

418+
private static void AppDomain_UnhandledException(object sender, UnhandledExceptionEventArgs unhandledExceptionEventArgs)
419+
{
420+
LogWriteLine(Environment.NewLine + "Unhandled exception Error:");
421+
LogWriteLine(Util.GetCompleteExceptionMessage(unhandledExceptionEventArgs.ExceptionObject as Exception, "\t"));
422+
423+
Environment.Exit((int)ExitCode.UnknownError);
424+
}
425+
415426
private static void LogSharpmakeExtensionLoaded(Assembly extensionAssembly)
416427
{
417428
if (extensionAssembly == null)

Sharpmake.Application/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@
4343
//
4444
// You can specify all the values or you can default the Build and Revision Numbers
4545
// by using the '*' as shown below:
46-
[assembly: AssemblyVersion("0.15.1.0")]
46+
[assembly: AssemblyVersion("0.16.0.0")]
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
projects/
2+
blob/
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Diagnostics;
4+
using System.IO;
5+
using System.Linq;
6+
using System.Reflection;
7+
using Sharpmake;
8+
9+
namespace SharpmakeGen.FunctionalTests
10+
{
11+
public abstract class LibProjectBase : CSharpProject
12+
{
13+
public LibProjectBase()
14+
: base(typeof(Target))
15+
{
16+
RootPath = @"[project.SharpmakeCsPath]";
17+
SourceRootPath = @"[project.RootPath]\codebase\[project.Name]";
18+
}
19+
20+
[Configure]
21+
public virtual void ConfigureAll(Configuration conf, Target target)
22+
{
23+
conf.ProjectFileName = "[project.Name]_[target.DevEnv]_[target.Platform]";
24+
conf.ProjectPath = @"[project.SharpmakeCsPath]\projects";
25+
26+
conf.Output = Configuration.OutputType.DotNetClassLibrary;
27+
28+
conf.IntermediatePath = @"[conf.ProjectPath]\build\[conf.Name]\[project.Name]";
29+
conf.TargetPath = @"[conf.ProjectPath]\output\[conf.Name]";
30+
31+
// .lib files must be with the .obj files when running in fastbuild distributed mode or we'll have missing symbols due to merging of the .pdb
32+
conf.TargetLibraryPath = "[conf.IntermediatePath]";
33+
}
34+
}
35+
}

0 commit comments

Comments
 (0)