Permalink
Browse files

Fix Debug and SL4 build, IronStudio and move Chiron to Debug/Release …

…dir.
  • Loading branch information...
1 parent 33be245 commit d8d9765d43b9cc265ed07c9115564253e11b348d @tmat tmat committed Dec 30, 2011
Showing with 561 additions and 1,981 deletions.
  1. +2 −4 Hosts/Silverlight/Chiron/Chiron.csproj
  2. +24 −18 Hosts/Silverlight/Microsoft.Scripting.Silverlight/Microsoft.Scripting.Silverlight.csproj
  3. +2 −2 Hosts/Silverlight/Microsoft.Scripting.Silverlight/Settings.cs
  4. +1 −1 Hosts/Silverlight/Samples1/deploy.bat
  5. +1 −1 Hosts/Silverlight/Samples1/run.bat
  6. +1 −1 Hosts/Silverlight/Samples1/units.bat
  7. +1 −1 Hosts/Silverlight/Scripts/release.bat
  8. +1 −1 Hosts/Silverlight/Tests/test_chiron/helper.rb
  9. +2 −2 Languages/IronPython/CreateRelease.bat
  10. +4 −2 Languages/IronPython/IronPython.Modules/IronPython.Modules.csproj
  11. +3 −9 Languages/IronPython/IronPython/Runtime/PythonContext.cs
  12. +1 −1 Languages/IronPython/IronPython/Runtime/Types/DocBuilder.cs
  13. +1 −1 Languages/IronPython/IronPythonTest/IronPythonTest.csproj
  14. +3 −3 Languages/Ruby/Libraries/Builtins/KernelOps.cs
  15. +2 −2 Languages/Ruby/Libraries/Initializers.Generated.cs
  16. +2 −2 Languages/Ruby/Libraries/Open3/Open3.cs
  17. +1 −1 Languages/Ruby/Ruby/Builtins/RubyClass.cs
  18. +2 −2 Languages/Ruby/Samples/Tutorial/Rakefile
  19. +2 −2 Languages/Ruby/Scripts/CreateRelease.bat
  20. +6 −2 Msi/Ruby/Msi/Silverlight.wxi
  21. +9 −9 Msi/Ruby/Msm/IrbRedist.wxs
  22. +1 −1 Runtime/Microsoft.Dynamic/Actions/ComboActionRewriter.cs
  23. +1 −1 Runtime/Microsoft.Dynamic/Actions/Interceptor.cs
  24. +1 −1 Runtime/Microsoft.Dynamic/Debugging/DebugInfoRewriter.cs
  25. +2 −6 Runtime/Microsoft.Dynamic/Generation/CompilerHelpers.cs
  26. +0 −1 Runtime/Microsoft.Dynamic/Generation/ToDiskRewriter.cs
  27. +1 −8 Runtime/Microsoft.Dynamic/Hosting/Shell/BasicConsole.cs
  28. +7 −4 Runtime/Microsoft.Dynamic/Interpreter/Instructions/ControlFlowInstructions.cs
  29. +9 −6 Runtime/Microsoft.Dynamic/Interpreter/LightLambda.cs
  30. +11 −0 Runtime/Microsoft.Dynamic/Utils/CollectionUtils.cs
  31. +14 −7 Runtime/Microsoft.Dynamic/Utils/DynamicUtils.cs
  32. +11 −10 Runtime/Microsoft.Dynamic/Utils/ReflectionUtils.cs
  33. +26 −3 Runtime/Microsoft.Dynamic/Utils/TypeMemberCache.cs
  34. +0 −4 Runtime/Microsoft.Dynamic/Utils/WeakDictionary.cs
  35. +2 −4 Scripts/Bat/Alias.ps1
  36. +2 −4 Scripts/Bat/Alias.txt
  37. +4 −5 Solutions/Build.IronPython.proj
  38. +76 −4 Solutions/Common.proj
  39. BIN Solutions/CustomTasks/CustomTasks.dll
  40. +0 −282 Solutions/IronPython.Mono.sln
  41. +275 −8 Solutions/IronPython.sln
  42. +0 −626 Solutions/IronPythonTools.sln
  43. +9 −695 Solutions/IronStudio.sln
  44. +12 −12 Solutions/Ruby.sln
  45. +10 −57 Tools/IronStudio/IronPythonTools/IronPythonTools.csproj
  46. +1 −1 Tools/IronStudio/IronPythonTools/IronPythonTools/Project/PythonStarter.cs
  47. +1 −25 Tools/IronStudio/IronPythonToolsCore/IronPythonToolsCore.csproj
  48. +2 −22 Tools/IronStudio/IronRubyTools/IronRubyTools.csproj
  49. +1 −1 Tools/IronStudio/IronRubyTools/IronRubyTools/Project/RubyStarter.cs
  50. +0 −24 Tools/IronStudio/IronRubyToolsCore/IronRubyToolsCore.csproj
  51. +9 −41 Tools/IronStudio/IronStudio/IronStudio.csproj
  52. +2 −0 Tools/IronStudio/IronStudio/Properties/AssemblyInfo.cs
  53. +0 −26 Tools/IronStudio/IronStudioCore/IronStudioCore.csproj
  54. +0 −25 Tools/IronStudio/RemoteScriptFactory/RemoteScriptFactory.csproj
  55. BIN Util/References/MonoAndroid/1.0/System.Core.dll
  56. BIN Util/References/MonoAndroid/1.0/System.Numerics.dll
  57. BIN Util/References/MonoAndroid/1.0/System.dll
  58. BIN Util/References/MonoAndroid/1.0/mscorlib.dll
  59. BIN Util/References/Silverlight/4.0/Microsoft.CSharp.dll
  60. BIN Util/References/Silverlight/4.0/System.Core.dll
  61. BIN Util/References/Silverlight/4.0/System.Net.dll
  62. BIN Util/References/Silverlight/4.0/System.Numerics.dll
  63. BIN Util/References/Silverlight/4.0/System.Windows.Browser.dll
  64. BIN Util/References/Silverlight/4.0/System.Windows.dll
  65. BIN Util/References/Silverlight/4.0/System.Xml.dll
  66. BIN Util/References/Silverlight/4.0/System.dll
  67. BIN Util/References/Silverlight/4.0/mscorlib.dll
@@ -18,15 +18,13 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'v2Release|AnyCPU' ">
</PropertyGroup>
<ItemGroup>
- <Reference Include="System" />
- <Reference Include="System.configuration" />
- <Reference Include="System.Core" />
+ <Reference Include="System.Configuration" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Web" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Windows.Forms" />
- <Reference Include="System.XML" />
+ <Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="AppManifestTemplate.cs" />
@@ -13,21 +13,6 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Silverlight4Release|AnyCPU' ">
</PropertyGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\..\Runtime\Microsoft.Scripting.Core\Microsoft.Scripting.Core.csproj" Condition=" '$(TargetFrameworkVersion)' == 'v3.5' ">
- <Project>{2AE75F5A-CD1F-4925-9647-AF4D1C282FB4}</Project>
- <Name>Microsoft.Scripting.Core</Name>
- <Private>False</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Runtime\Microsoft.Scripting\Microsoft.Scripting.csproj">
- <Project>{02FF0909-F5AD-48CF-A86A-345E721B7E40}</Project>
- <Name>Microsoft.Scripting</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Runtime\Microsoft.Dynamic\Microsoft.Dynamic.csproj">
- <Project>{EB66B766-6354-4208-A3D4-AACBDCB5C3B3}</Project>
- <Name>Microsoft.Dynamic</Name>
- </ProjectReference>
- </ItemGroup>
<ItemGroup>
<Compile Include="..\SilverlightVersion.cs">
<Link>Properties\SilverlightVersion.cs</Link>
@@ -51,13 +36,34 @@
<ItemGroup>
<EmbeddedResource Include="agdlr.css" />
<EmbeddedResource Include="agdlr.js" />
+ <EmbeddedResource Include="init.rb" />
+ <EmbeddedResource Include="repl_formatter.py" />
+ <EmbeddedResource Include="repl_formatter.rb" />
</ItemGroup>
<ItemGroup>
- <EmbeddedResource Include="init.rb" />
+ <Reference Include="System.Windows, Version=2.0.5.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>$(FrameworkReferences)\System.Windows.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Windows.Browser, Version=2.0.5.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>$(FrameworkReferences)\System.Windows.Browser.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
- <EmbeddedResource Include="repl_formatter.py" />
- <EmbeddedResource Include="repl_formatter.rb" />
+ <ProjectReference Include="..\..\..\Runtime\Microsoft.Scripting.Core\Microsoft.Scripting.Core.csproj" Condition=" '$(TargetFrameworkVersion)' == 'v3.5' ">
+ <Project>{2AE75F5A-CD1F-4925-9647-AF4D1C282FB4}</Project>
+ <Name>Microsoft.Scripting.Core</Name>
+ <Private>False</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Runtime\Microsoft.Scripting\Microsoft.Scripting.csproj">
+ <Project>{02FF0909-F5AD-48CF-A86A-345E721B7E40}</Project>
+ <Name>Microsoft.Scripting</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Runtime\Microsoft.Dynamic\Microsoft.Dynamic.csproj">
+ <Project>{EB66B766-6354-4208-A3D4-AACBDCB5C3B3}</Project>
+ <Name>Microsoft.Dynamic</Name>
+ </ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
</Project>
@@ -165,7 +165,7 @@ private static string GetAndValidateEntryPoint
var vfs = BrowserPAL.PAL.VirtualFilesystem;
var stream = vfs.GetFile(entryPoint);
if (stream == null) {
- throw new ApplicationException(
+ throw new Exception(
string.Format(
"Application expected to have an entry point called {0}, but was not found (check the {1})",
entryPoint, BrowserPAL.PAL.VirtualFilesystem.Name()));
@@ -201,7 +201,7 @@ private static string GetAndValidateEntryPoint
var tempStream = BrowserPAL.PAL.VirtualFilesystem.GetFile(file);
if (tempStream != null) {
if (entryPoint != null) {
- throw new ApplicationException(string.Format(
+ throw new Exception(string.Format(
"Application can only have one entry point, but found two: {0}, {1}",
_entryPoint, file
));
@@ -4,7 +4,7 @@ echo Building samples
call %~dp0build.bat
echo Building dlr.xap
-%~dp0..\..\..\Bin\"Silverlight Release"\Chiron.exe /s /d:%~dp0dlr\dlr /z:%~dp0dlr\dlr.xap /e:"/dlr-slvx"
+%~dp0..\..\..\Bin\Release\Chiron.exe /s /d:%~dp0dlr\dlr /z:%~dp0dlr\dlr.xap /e:"/dlr-slvx"
echo Deploying samples
if not exist C:\inetpub\wwwroot\gestalt ( mkdir C:\inetpub\wwwroot\gestalt )
@@ -1,3 +1,3 @@
@echo off
call %~dp0build.bat
-%~dp0..\..\..\Bin\"Silverlight Release"\Chiron.exe /n /b:%~dp0index.html
+%~dp0..\..\..\Bin\Release\Chiron.exe /n /b:%~dp0index.html
@@ -1,3 +1,3 @@
@echo off
call %~dp0build.bat
-%DLR_ROOT%"\Bin\Silverlight Debug\Chiron.exe" /n /b:units/index.html
+%DLR_ROOT%"\Bin\Debug\Chiron.exe" /n /b:units/index.html
@@ -15,7 +15,7 @@ if errorlevel 1 goto BUILDFAIL
echo Build dlr.xap
mkdir "%~dp0release\dlr"
-%~dp0"..\..\..\Bin\Silverlight %config%\Chiron.exe" /d:"%~dp0release-dlrxap" /x:"%~dp0release\dlr\dlr.xap" /s
+%~dp0"..\..\..\Bin\%config%\Chiron.exe" /d:"%~dp0release-dlrxap" /x:"%~dp0release\dlr\dlr.xap" /s
echo Copy slvx files to release
@@ -4,7 +4,7 @@ def load_rspec
end
def load_constants
- $BUILD ||= "Silverlight3#{ARGV.first || "Debug"}"
+ $BUILD ||= "#{ARGV.first || "Debug"}"
$BUILD_PATH ||= File.join(File.expand_path(ENV['DLR_ROOT']), "bin", $BUILD)
$CHIRON ||= File.join($BUILD_PATH, "Chiron.exe")
$DIR ||= File.join(File.expand_path(File.dirname(__FILE__)), "fixtures")
@@ -74,8 +74,8 @@ mkdir Silverlight\bin
copy %DLR_ROOT%\Bin\Silverlight4%BUILD_FLAVOR%\Microsoft.Dynamic.dll Silverlight\bin\
copy %DLR_ROOT%\Bin\Silverlight4%BUILD_FLAVOR%\Microsoft.Scripting.dll Silverlight\bin\
copy %DLR_ROOT%\Bin\Silverlight4%BUILD_FLAVOR%\Microsoft.Scripting.Silverlight.dll Silverlight\bin\
-copy %DLR_ROOT%\Bin\Silverlight4%BUILD_FLAVOR%\Chiron.exe Silverlight\bin\
-copy %DLR_ROOT%\Bin\Silverlight4%BUILD_FLAVOR%\Chiron.exe.config Silverlight\bin\
+copy %DLR_ROOT%\Bin\%BUILD_FLAVOR%\Chiron.exe Silverlight\bin\
+copy %DLR_ROOT%\Bin\%BUILD_FLAVOR%\Chiron.exe.config Silverlight\bin\
copy %DLR_ROOT%\Bin\Silverlight4%BUILD_FLAVOR%\IronPython.dll Silverlight\bin\
copy %DLR_ROOT%\Bin\Silverlight4%BUILD_FLAVOR%\IronPython.Modules.dll Silverlight\bin\
@@ -42,7 +42,6 @@
<Compile Include="NativeSignal.cs" />
<Compile Include="GlobalSuppressions.cs" />
<Compile Include="mmap.cs" />
- <Compile Include="Properties\BuildInfo.Generated.cs" />
<Compile Include="signal.cs" />
<Compile Include="zipimport.cs" />
<Compile Include="zlib\Compress.cs" />
@@ -141,4 +140,7 @@
<Name>IronPython</Name>
</ProjectReference>
</ItemGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Import Project="$(SolutionDir)Versioning.targets" /> <Target Name="BeforeBuild" DependsOnTargets="GenerateBuildInfo" /></Project>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <Import Project="$(SolutionDir)Versioning.targets" />
+ <Target Name="BeforeBuild" DependsOnTargets="GenerateBuildInfo" />
+</Project>
@@ -73,7 +73,7 @@ public sealed partial class PythonContext : LanguageContext {
private readonly PythonOverloadResolverFactory _sharedOverloadResolverFactory;
private readonly PythonBinder _binder;
private readonly SysModuleDictionaryStorage _sysDict = new SysModuleDictionaryStorage();
-#if FEATURE_ASSEMBLY_RESOLVE
+#if FEATURE_ASSEMBLY_RESOLVE && FEATURE_FILESYSTEM
private readonly AssemblyResolveHolder _resolveHolder;
#if !CLR2
private readonly HashSet<Assembly> _loadedAssemblies = new HashSet<Assembly>();
@@ -1316,9 +1316,9 @@ private sealed class OptimizedBuiltinHasher {
}
#region Assembly Loading
+#if FEATURE_ASSEMBLY_RESOLVE && FEATURE_FILESYSTEM
internal Assembly LoadAssemblyFromFile(string file) {
-#if FEATURE_ASSEMBLY_RESOLVE
// check all files in the path...
List path;
if (TryGetSystemPath(out path)) {
@@ -1335,17 +1335,11 @@ private sealed class OptimizedBuiltinHasher {
}
}
}
-#endif
return null;
}
-#if FEATURE_ASSEMBLY_RESOLVE
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2001:AvoidCallingProblematicMethods", MessageId = "System.Reflection.Assembly.LoadFile")]
-#if CLR2
- private static bool TryLoadAssemblyFromFileWithPath(string path, out Assembly res) {
-#else
internal bool TryLoadAssemblyFromFileWithPath(string path, out Assembly res) {
-#endif
if (File.Exists(path) && Path.IsPathRooted(path)) {
try {
res = Assembly.LoadFile(path);
@@ -1433,7 +1427,7 @@ class AssemblyResolveHolder {
public override void Shutdown() {
object callable;
-#if FEATURE_ASSEMBLY_RESOLVE
+#if FEATURE_ASSEMBLY_RESOLVE && FEATURE_FILESYSTEM
UnhookAssemblyResolve();
#endif
@@ -12,7 +12,7 @@
*
*
* ***************************************************************************/
-#if !WIN8
+#if !WIN8 && !SILVERLIGHT
using System.Xml;
using System.Xml.XPath;
#endif
@@ -57,7 +57,7 @@
<Compile Include="TypeDescriptor.cs" />
<AppDesigner Include="Properties\" />
</ItemGroup>
- <ItemGroup Condition=" '$(IsFullFramework)' == 'true' ">
+ <ItemGroup Condition=" '$(IsFullFramework)' == 'true' and '$(TargetFrameworkVersion)' != 'v3.5'" >
<Reference Include="System.Xaml" />
<Reference Include="WindowsBase" />
</ItemGroup>
@@ -291,7 +291,7 @@ internal ThrowCatchUnwinder(object label, object returnValue)
exception = new RuntimeError();
}
-#if DEBUG && FEATURE_THREAD
+#if DEBUG && FEATURE_THREAD && !SILVERLIGHT
if (RubyOptions.UseThreadAbortForSyncRaise) {
RubyUtils.RaiseAsyncException(Thread.CurrentThread, exception);
}
@@ -308,7 +308,7 @@ internal ThrowCatchUnwinder(object label, object returnValue)
public static void RaiseException(object self, [NotNull]MutableString/*!*/ message) {
Exception exception = RubyExceptionData.InitializeException(new RuntimeError(message.ToString()), message);
-#if DEBUG && FEATURE_THREAD
+#if DEBUG && FEATURE_THREAD && !SILVERLIGHT
if (RubyOptions.UseThreadAbortForSyncRaise) {
RubyUtils.RaiseAsyncException(Thread.CurrentThread, exception);
}
@@ -326,7 +326,7 @@ internal ThrowCatchUnwinder(object label, object returnValue)
object self, object/*!*/ obj, [Optional]object arg, [Optional]RubyArray backtrace) {
Exception exception = CreateExceptionToRaise(respondToStorage, storage0, storage1, setBackTraceStorage, obj, arg, backtrace);
-#if DEBUG && FEATURE_THREAD
+#if DEBUG && FEATURE_THREAD && !SILVERLIGHT
if (RubyOptions.UseThreadAbortForSyncRaise) {
RubyUtils.RaiseAsyncException(Thread.CurrentThread, exception);
}
@@ -11978,12 +11978,12 @@ public sealed class Open3LibraryInitializer : IronRuby.Builtins.LibraryInitializ
protected override void LoadModules() {
- #if !SILVERLIGHT
+ #if FEATURE_PROCESS
DefineGlobalModule("Open3", typeof(IronRuby.StandardLibrary.Open3.Open3), 0x00000008, null, LoadOpen3_Class, null, IronRuby.Builtins.RubyModule.EmptyArray);
#endif
}
- #if !SILVERLIGHT
+ #if FEATURE_PROCESS
private static void LoadOpen3_Class(IronRuby.Builtins.RubyModule/*!*/ module) {
DefineLibraryMethod(module, "popen3", 0x21,
0x00020004U,
@@ -12,7 +12,7 @@
*
*
* ***************************************************************************/
-#if FEATURE_CRYPTOGRAPHY
+#if FEATURE_PROCESS
using System.Diagnostics;
using IronRuby.Builtins;
@@ -21,7 +21,7 @@
namespace IronRuby.StandardLibrary.Open3 {
- [RubyModule("Open3", BuildConfig = "!SILVERLIGHT")]
+ [RubyModule("Open3", BuildConfig = "FEATURE_PROCESS")]
public static class Open3 {
[RubyMethod("popen3", RubyMethodAttributes.PublicSingleton)]
public static RubyArray/*!*/ OpenPipe(
@@ -1433,7 +1433,7 @@ private sealed class ClrOverloadInfo {
}
}
- private IEnumerable<OverloadInfo>/*!*/ GetConstructors(Type/*!*/ type) {
+ private IEnumerable<ReflectionOverloadInfo>/*!*/ GetConstructors(Type/*!*/ type) {
return
from ctor in type.GetDeclaredConstructors()
where !ctor.IsStatic && (Context.DomainManager.Configuration.PrivateBinding || ctor.IsPublic)
@@ -25,8 +25,8 @@ if ENV["DLR_ROOT"]
IRONRUBY_LIBS = "#{root}/Languages/Ruby/Libs"
GEMS = "#{root}/External.LCA_RESTRICTED/Languages/Ruby/ruby-1.8.6p368/lib/ruby/gems/1.8/gems"
- chiron = "#{root}/Bin/Silverlight3Debug/Chiron.exe"
- chiron = "#{root}/Bin/Silverlight3Release/Chiron.exe" unless File.exist?(chiron)
+ chiron = "#{root}/Bin/Debug/Chiron.exe"
+ chiron = "#{root}/Bin/Release/Chiron.exe" unless File.exist?(chiron)
raise "Could not find Chiron.exe. Do you have a build of Silverlight? If not, type 'bsd'" unless File.exist?(chiron)
CHIRON = chiron
else
@@ -41,8 +41,8 @@ pushd Silverlight\bin
copy %SRC_SL_BIN%\Microsoft.Dynamic.dll .
copy %SRC_SL_BIN%\Microsoft.Scripting.dll .
copy %SRC_SL_BIN%\Microsoft.Scripting.Silverlight.dll .
-copy %SRC_SL_BIN%\Chiron.exe .
-copy %SRC_SL_BIN%\Chiron.exe.config .
+copy %SRC_BIN%\Chiron.exe .
+copy %SRC_BIN%\Chiron.exe.config .
copy %SRC_SL_BIN%\IronRuby.dll .
copy %SRC_SL_BIN%\IronRuby.Libraries.dll .
@@ -5,14 +5,18 @@
<File Name="Microsoft.Scripting.dll" />
<File Name="Microsoft.Dynamic.dll" />
<File Name="Microsoft.Scripting.Silverlight.dll" />
- <File Name="Chiron.exe" />
- <File Name="Chiron.exe.Config" />
<File Name="IronRuby.dll" />
<File Name="IronRuby.Libraries.dll" />
<File Name="IronRuby.Libraries.Yaml.dll" />
<File Name="System.Numerics.dll" />
</Component>
</Directory>
+ <Directory Id="Dir_Silverlight_bin" Name="bin" FileSource="$(var.OutputPath)">
+ <Component Id="Comp_Chiron" DiskId="1" Guid="504F28C5-1607-42FD-8425-4309699017C4">
+ <File Name="Chiron.exe" />
+ <File Name="Chiron.exe.Config" />
+ </Component>
+ </Directory>
<Directory Id="Dir_Silverlight_script" Name="script" FileSource="$(var.SilverlightScriptDir)">
<Component Id="Comp_SLScript" DiskId="1" Guid="AD564294-EAF6-44E2-994E-D6570B4546BC">
<File Name="server" />
Oops, something went wrong.

0 comments on commit d8d9765

Please sign in to comment.