Make the DLR a submodule of IronPython (#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

.gitattributes

@@ -23,6 +23,10 @@
 *.vdproj text eol=crlf
 
 
+# Declare files that will always have LF line endings on checkout
+.gitmodules text eol=lf
+
+
 # Denote all files that are truly binary and should not be modified.
 *.png binary
 *.jpg binary

.gitignore

@@ -17,7 +17,6 @@ bin/
 BuildInfo.Generated.cs
 CurrentVersion.Generated.cs
 .local-dlr-path.props
-packages.config
 
 TestResult.xml
 Solutions/TestResults/
@@ -55,3 +54,5 @@ Util/References
 
 /NuGet.config
 *.bak
+__pycache__/
+.vscode/

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "Src/DLR"]
+	path = Src/DLR
+	url = https://github.com/IronLanguages/dlr.git
+	branch = master

.travis.yml

@@ -1,7 +1,7 @@
 language: csharp
 
 env:
-  - CONFIGURATION=Release
+  - CONFIGURATION=Release FLAVOUR=release
 
 mono:
   - latest
@@ -14,7 +14,8 @@ before_install:
   - mono nuget.exe install NUnitLite
 
 script:
-  - xbuild Build.proj /t:Build "/p:Mono=true;BuildFlavour=$CONFIGURATION"
+  - git submodule update --init --recursive
+  - make $FLAVOUR
   - pushd bin/$CONFIGURATION
   - mono ./IronPythonTest.exe --result:all-result.xml
 

Build/Common.proj

@@ -57,14 +57,10 @@
 
   <PropertyGroup Condition="'$(ReferencedPlatform)' == ''">
     <ReferencedPlatform>net40</ReferencedPlatform>
-    <ReferencedPlatform
-        Condition="'$(Configuration)' == 'v2Release' or '$(Configuration)' == 'v2Debug'">net35</ReferencedPlatform>
     <ReferencedPlatform
         Condition="'$(Configuration)' == 'v45Release' or '$(Configuration)' == 'v45Debug'">net45</ReferencedPlatform>
     <ReferencedPlatform
         Condition="'$(Configuration)' == 'Win8Release' or '$(Configuration)' == 'Win8Debug'">wincore45</ReferencedPlatform>
-    <ReferencedPlatform
-        Condition="'$(Configuration)' == 'Silverlight5Release' or '$(Configuration)' == 'Silverlight5Debug'">sl5</ReferencedPlatform>
     <ReferencedPlatform
         Condition="'$(Configuration)' == 'AndroidRelease' or '$(Configuration)' == 'AndroidDebug'">android</ReferencedPlatform>
   </PropertyGroup>
@@ -75,9 +71,6 @@
 
     <DlrReferences>$(RootDir)\Util\References\DynamicLanguageRuntime.$(DlrVersion)\lib\$(ReferencedPlatform)</DlrReferences>
     <WpfReferences>$(RootDir)\Util\References\WPF\4.0</WpfReferences>
-
-    <!-- If this file exists it will be used to load the DLR assemblies. -->
-    <LocalDlrPathProperties>$(RootDir)\.local-dlr-path.props</LocalDlrPathProperties>
   </PropertyGroup>
 
   <!-- References -->
@@ -113,11 +106,4 @@
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
     <DefineConstants>$(Features);$(SignedSym);$(PlatformSymbols);DEBUG;TRACE</DefineConstants>
   </PropertyGroup>
-
-  <!-- Include the DLR references here since they're a bit complicated.
-       If a project doesn't need them it can set 'ExcludeDlrReferences=true'. 
-       
-       Use a separate import file to avoid confusing Visual Studio.
-  -->  
-  <Import Project="dlr-refs.props" Condition=" '$(ExcludeDlrReferences)' != 'true' " />
 </Project>

Build/Templates/BuildInfo.Template.cs

@@ -8,24 +8,10 @@ internal static class BuildInfo {{
         false;
 #endif
 
-    internal const bool IsCLR2 =
-#if CLR2
-        true;
-#else
-        false;
-#endif
-
     internal const bool IsCLR4 =
 #if CLR4
         true;
 #else
         false;
 #endif
-
-    internal const bool IsSilverlight =
-#if SILVERLIGHT
-        true;
-#else
-        false;
-#endif
-}}
+}}

Build/net40.props

@@ -35,7 +35,7 @@
     <Features>$(Features);FEATURE_PDBEMIT</Features>
     <Features>$(Features);FEATURE_METADATA_READER</Features>
     <Features>$(Features);FEATURE_COM</Features>
-    <Features>$(Features);FEATURE_WPF</Features>
+    <Features Condition=" '$(OS)' != 'Unix' ">$(Features);FEATURE_WPF</Features>
     <Features>$(Features);FEATURE_FULL_CONSOLE</Features>
     <Features>$(Features);FEATURE_BASIC_CONSOLE</Features>
     <Features>$(Features);FEATURE_SERIALIZATION</Features>