Visitar URL original
Make the DLR a submodule of IronPython (#117) · JayDevOps/ironpython3@b528185 · GitHub
Skip to content

Commit b528185

Browse files
slideslide
authored
Make the DLR a submodule of IronPython (IronLanguages#117)
* Make the DLR a submodule of IronPython * Add submodule init * Trying to fix the submodules file * Remove v2 and silverlight * Update DLR submodule to latest master * More Linux fixes * env should be on same line * Fix check for stdlib directory * Fix typo
1 parent f6c69ac commit b528185

30 files changed

Lines changed: 183 additions & 309 deletions

‎.gitattributes‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@
2323
*.vdproj text eol=crlf
2424

2525

26+
# Declare files that will always have LF line endings on checkout
27+
.gitmodules text eol=lf
28+
29+
2630
# Denote all files that are truly binary and should not be modified.
2731
*.png binary
2832
*.jpg binary

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ bin/
1717
BuildInfo.Generated.cs
1818
CurrentVersion.Generated.cs
1919
.local-dlr-path.props
20-
packages.config
2120

2221
TestResult.xml
2322
Solutions/TestResults/
@@ -55,3 +54,5 @@ Util/References
5554

5655
/NuGet.config
5756
*.bak
57+
__pycache__/
58+
.vscode/

‎.gitmodules‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[submodule "Src/DLR"]
2+
path = Src/DLR
3+
url = https://github.com/IronLanguages/dlr.git
4+
branch = master

‎.travis.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: csharp
22

33
env:
4-
- CONFIGURATION=Release
4+
- CONFIGURATION=Release FLAVOUR=release
55

66
mono:
77
- latest
@@ -14,7 +14,8 @@ before_install:
1414
- mono nuget.exe install NUnitLite
1515

1616
script:
17-
- xbuild Build.proj /t:Build "/p:Mono=true;BuildFlavour=$CONFIGURATION"
17+
- git submodule update --init --recursive
18+
- make $FLAVOUR
1819
- pushd bin/$CONFIGURATION
1920
- mono ./IronPythonTest.exe --result:all-result.xml
2021

‎Build/Common.proj‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,10 @@
5757

5858
<PropertyGroup Condition="'$(ReferencedPlatform)' == ''">
5959
<ReferencedPlatform>net40</ReferencedPlatform>
60-
<ReferencedPlatform
61-
Condition="'$(Configuration)' == 'v2Release' or '$(Configuration)' == 'v2Debug'">net35</ReferencedPlatform>
6260
<ReferencedPlatform
6361
Condition="'$(Configuration)' == 'v45Release' or '$(Configuration)' == 'v45Debug'">net45</ReferencedPlatform>
6462
<ReferencedPlatform
6563
Condition="'$(Configuration)' == 'Win8Release' or '$(Configuration)' == 'Win8Debug'">wincore45</ReferencedPlatform>
66-
<ReferencedPlatform
67-
Condition="'$(Configuration)' == 'Silverlight5Release' or '$(Configuration)' == 'Silverlight5Debug'">sl5</ReferencedPlatform>
6864
<ReferencedPlatform
6965
Condition="'$(Configuration)' == 'AndroidRelease' or '$(Configuration)' == 'AndroidDebug'">android</ReferencedPlatform>
7066
</PropertyGroup>
@@ -75,9 +71,6 @@
7571

7672
<DlrReferences>$(RootDir)\Util\References\DynamicLanguageRuntime.$(DlrVersion)\lib\$(ReferencedPlatform)</DlrReferences>
7773
<WpfReferences>$(RootDir)\Util\References\WPF\4.0</WpfReferences>
78-
79-
<!-- If this file exists it will be used to load the DLR assemblies. -->
80-
<LocalDlrPathProperties>$(RootDir)\.local-dlr-path.props</LocalDlrPathProperties>
8174
</PropertyGroup>
8275

8376
<!-- References -->
@@ -113,11 +106,4 @@
113106
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
114107
<DefineConstants>$(Features);$(SignedSym);$(PlatformSymbols);DEBUG;TRACE</DefineConstants>
115108
</PropertyGroup>
116-
117-
<!-- Include the DLR references here since they're a bit complicated.
118-
If a project doesn't need them it can set 'ExcludeDlrReferences=true'.
119-
120-
Use a separate import file to avoid confusing Visual Studio.
121-
-->
122-
<Import Project="dlr-refs.props" Condition=" '$(ExcludeDlrReferences)' != 'true' " />
123109
</Project>

‎Build/Templates/BuildInfo.Template.cs‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,10 @@ internal static class BuildInfo {{
88
false;
99
#endif
1010

11-
internal const bool IsCLR2 =
12-
#if CLR2
13-
true;
14-
#else
15-
false;
16-
#endif
17-
1811
internal const bool IsCLR4 =
1912
#if CLR4
2013
true;
2114
#else
2215
false;
2316
#endif
24-
25-
internal const bool IsSilverlight =
26-
#if SILVERLIGHT
27-
true;
28-
#else
29-
false;
30-
#endif
31-
}}
17+
}}

‎Build/dlr-refs.props‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎Build/net40.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<Features>$(Features);FEATURE_PDBEMIT</Features>
3636
<Features>$(Features);FEATURE_METADATA_READER</Features>
3737
<Features>$(Features);FEATURE_COM</Features>
38-
<Features>$(Features);FEATURE_WPF</Features>
38+
<Features Condition=" '$(OS)' != 'Unix' ">$(Features);FEATURE_WPF</Features>
3939
<Features>$(Features);FEATURE_FULL_CONSOLE</Features>
4040
<Features>$(Features);FEATURE_BASIC_CONSOLE</Features>
4141
<Features>$(Features);FEATURE_SERIALIZATION</Features>

0 commit comments

Comments
 (0)