Permalink
Browse files

wp7: use IronRuby binaries from rhodes folder

  • Loading branch information...
1 parent d64a445 commit 69ec67bc1d967ef51c06dbd1642aae8864b2887b genywind committed with dmitrys Apr 28, 2011
Showing with 31 additions and 17 deletions.
  1. +1 −0 .gitignore
  2. +5 −5 platform/wp7/RhoRubyLib/RhoRubyLib.csproj
  3. +24 −11 platform/wp7/build/wp.rake
  4. +1 −1 platform/wp7/rhodes/Rhodes.csproj
View
@@ -37,6 +37,7 @@ platform/iphone/*/rholog.txt
platform/win32/**/*.pch
platform/wm/**/*.pch
platform/wp7/bin/*
+platform/wp7/IronRuby/bin/*
platform/wp7/WPApplication/rho/*
platform/wp7/WPApplication/obj/*
platform/wp7/WPApplication/Bin/*
@@ -46,21 +46,21 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="IronRuby">
- <HintPath>..\..\..\..\ironruby\bin\Silverlight3$(Configuration)\IronRuby.dll</HintPath>
+ <HintPath>..\ironruby\bin\Silverlight3$(Configuration)\IronRuby.dll</HintPath>
</Reference>
<Reference Include="IronRuby.Libraries">
- <HintPath>..\..\..\..\ironruby\bin\Silverlight3$(Configuration)\IronRuby.Libraries.dll</HintPath>
+ <HintPath>..\ironruby\bin\Silverlight3$(Configuration)\IronRuby.Libraries.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Phone" />
<Reference Include="Microsoft.Phone.Interop" />
<Reference Include="Microsoft.Scripting">
- <HintPath>..\..\..\..\ironruby\bin\Silverlight3$(Configuration)\Microsoft.Scripting.dll</HintPath>
+ <HintPath>..\ironruby\bin\Silverlight3$(Configuration)\Microsoft.Scripting.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Scripting.Core">
- <HintPath>..\..\..\..\ironruby\bin\Silverlight3$(Configuration)\Microsoft.Scripting.Core.dll</HintPath>
+ <HintPath>..\ironruby\bin\Silverlight3$(Configuration)\Microsoft.Scripting.Core.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Dynamic">
- <HintPath>..\..\..\..\ironruby\bin\Silverlight3$(Configuration)\Microsoft.Dynamic.dll</HintPath>
+ <HintPath>..\ironruby\bin\Silverlight3$(Configuration)\Microsoft.Dynamic.dll</HintPath>
</Reference>
<Reference Include="System.Windows" />
<Reference Include="system" />
View
@@ -92,31 +92,44 @@ end
end
task :ironruby => ["config:wp"] do
+ iron_path = ""
if $config["env"]["paths"]["ironruby"].nil?
- chdir "../ironruby/Solutions"
+ iron_path = "../ironruby"
else
- chdir $config["env"]["paths"]["ironruby"]+"\\Solutions"
+ iron_path = $config["env"]["paths"]["ironruby"]
end
+ cp_r File.join( $config["build"]["wppath"], "IronRuby/Languages"), iron_path
+
+ chdir File.join( iron_path, "Solutions" )
args = ['Ruby.sln', '/property:Configuration=Silverlight3Release']
-
- if (!File.exists? "../bin/Silverlight3Release/Microsoft.Dynamic.dll") &&
- (!File.exists? "../bin/Silverlight3Release/Microsoft.Scripting.dll") &&
- (!File.exists? "../bin/Silverlight3Release/Microsoft.Scripting.Core.dll") &&
- (!File.exists? "../bin/Silverlight3Release/IronRuby.Libraries.dll") &&
- (!File.exists? "../bin/Silverlight3Release/IronRuby.dll" )
- puts "\nThe following step may take several minutes or more to complete depending on your processor speed\n\n"
+
+ #if (!File.exists? "../bin/Silverlight3Release/Microsoft.Dynamic.dll") &&
+ # (!File.exists? "../bin/Silverlight3Release/Microsoft.Scripting.dll") &&
+ # (!File.exists? "../bin/Silverlight3Release/Microsoft.Scripting.Core.dll") &&
+ # (!File.exists? "../bin/Silverlight3Release/IronRuby.Libraries.dll") &&
+ # (!File.exists? "../bin/Silverlight3Release/IronRuby.dll" )
+ # puts "\nThe following step may take several minutes or more to complete depending on your processor speed\n\n"
Jake.run($msbuild,args)
unless $? == 0
puts "Error building"
exit 1
end
- end
+ #end
chdir $startdir
+
+ iron_release = File.join( $config["build"]["wppath"], "IronRuby/bin/Silverlight3Release")
+ rm_rf iron_release
+ mkdir_p iron_release
+ cp File.join( iron_path, "bin/Silverlight3Release/IronRuby.dll" ), iron_release
+ cp File.join( iron_path, "bin/Silverlight3Release/IronRuby.Libraries.dll" ), iron_release
+ cp File.join( iron_path, "bin/Silverlight3Release/Microsoft.Dynamic.dll" ), iron_release
+ cp File.join( iron_path, "bin/Silverlight3Release/Microsoft.Scripting.dll" ), iron_release
+ cp File.join( iron_path, "bin/Silverlight3Release/Microsoft.Scripting.Core.dll" ), iron_release
end
- task :rhodes => ["config:wp", "build:wp:rhobundle", "build:wp:ironruby"] do
+ task :rhodes => ["config:wp", "build:wp:rhobundle"] do
out_dir = $startdir + "/"+ $config["build"]["wppath"] +"/rhodes"
cp $app_path + "/icon/icon.png", out_dir if File.exists? $app_path + "/icon/icon.ico"
@@ -56,7 +56,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="IronRuby.Libraries">
- <HintPath>..\..\..\..\ironruby\bin\Silverlight3$(Configuration)\IronRuby.Libraries.dll</HintPath>
+ <HintPath>..\ironruby\bin\Silverlight3$(Configuration)\IronRuby.Libraries.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Phone" />
<Reference Include="Microsoft.Phone.Interop" />

0 comments on commit 69ec67b

Please sign in to comment.