Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rakefile fixes #267

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ bin
obj
_ReSharper.*
*.csproj.user
*.userprefs
*.resharper.user
*.ReSharper.user
*.suo
Expand Down
9 changes: 3 additions & 6 deletions rakefile.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# vim: tabstop=4:softtabstop=4:shiftwidth=4:noexpandtab
# vim: tabstop=4:softtabstop=4:shiftwidth=4:noexpandtab
require 'fuburake'

@solution = FubuRake::Solution.new do |sln|
Expand Down Expand Up @@ -35,11 +35,9 @@
desc "Creates the gem for fubu.exe"
task :create_gem => [:compile] do
require "rubygems/package"
include FileUtils
cleanDirectory 'bin';
include FileUtils
cleanDirectory 'bin'
cleanDirectory 'pkg'
mkdir 'bin'
mkdir 'pkg'

Dir.mkdir 'bin' unless Dir.exists?('bin')
Dir.mkdir 'pkg' unless Dir.exists?('pkg')
Expand Down Expand Up @@ -78,4 +76,3 @@
FileUtils.mv "ripple-cli-#{@solution.options[:build_number]}.gem", "pkg/ripple-cli-#{@solution.options[:build_number]}.gem"

end

4 changes: 2 additions & 2 deletions ripple
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!C:/Ruby/bin/ruby.exe
#!/usr/bin/env ruby
#
# This file was generated by RubyGems.
#
Expand All @@ -12,4 +12,4 @@ end
cmd << File.dirname(__FILE__) + "/ripple.exe " + ARGV.join(' ')

result = system(cmd)
exit 1 unless result
exit 1 unless result
File renamed without changes.
43 changes: 33 additions & 10 deletions src/ripple.sln
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,6 @@ Global
{0DB48F71-0998-4421-8EB5-7B8020BF37B0}.Release|Mixed Platforms.Build.0 = Release|x86
{0DB48F71-0998-4421-8EB5-7B8020BF37B0}.Release|x86.ActiveCfg = Release|x86
{0DB48F71-0998-4421-8EB5-7B8020BF37B0}.Release|x86.Build.0 = Release|x86
{734921D6-8BB4-4B57-9D5A-ACF9BD515D49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{734921D6-8BB4-4B57-9D5A-ACF9BD515D49}.Debug|Any CPU.Build.0 = Debug|Any CPU
{734921D6-8BB4-4B57-9D5A-ACF9BD515D49}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{734921D6-8BB4-4B57-9D5A-ACF9BD515D49}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{734921D6-8BB4-4B57-9D5A-ACF9BD515D49}.Debug|x86.ActiveCfg = Debug|Any CPU
{734921D6-8BB4-4B57-9D5A-ACF9BD515D49}.Release|Any CPU.ActiveCfg = Release|Any CPU
{734921D6-8BB4-4B57-9D5A-ACF9BD515D49}.Release|Any CPU.Build.0 = Release|Any CPU
{734921D6-8BB4-4B57-9D5A-ACF9BD515D49}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{734921D6-8BB4-4B57-9D5A-ACF9BD515D49}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{734921D6-8BB4-4B57-9D5A-ACF9BD515D49}.Release|x86.ActiveCfg = Release|Any CPU
{5F6B1A70-3A36-4A4D-90F5-884B7413A79E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5F6B1A70-3A36-4A4D-90F5-884B7413A79E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5F6B1A70-3A36-4A4D-90F5-884B7413A79E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
Expand All @@ -49,6 +39,39 @@ Global
{5F6B1A70-3A36-4A4D-90F5-884B7413A79E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{5F6B1A70-3A36-4A4D-90F5-884B7413A79E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{5F6B1A70-3A36-4A4D-90F5-884B7413A79E}.Release|x86.ActiveCfg = Release|Any CPU
{734921D6-8BB4-4B57-9D5A-ACF9BD515D49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{734921D6-8BB4-4B57-9D5A-ACF9BD515D49}.Debug|Any CPU.Build.0 = Debug|Any CPU
{734921D6-8BB4-4B57-9D5A-ACF9BD515D49}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{734921D6-8BB4-4B57-9D5A-ACF9BD515D49}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{734921D6-8BB4-4B57-9D5A-ACF9BD515D49}.Debug|x86.ActiveCfg = Debug|Any CPU
{734921D6-8BB4-4B57-9D5A-ACF9BD515D49}.Release|Any CPU.ActiveCfg = Release|Any CPU
{734921D6-8BB4-4B57-9D5A-ACF9BD515D49}.Release|Any CPU.Build.0 = Release|Any CPU
{734921D6-8BB4-4B57-9D5A-ACF9BD515D49}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{734921D6-8BB4-4B57-9D5A-ACF9BD515D49}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{734921D6-8BB4-4B57-9D5A-ACF9BD515D49}.Release|x86.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = ripple\ripple.csproj
Policies = $0
$0.TextStylePolicy = $1
$1.FileWidth = 120
$1.EolMarker = Windows
$1.inheritsSet = VisualStudio
$1.inheritsScope = text/plain
$1.scope = text/x-csharp
$0.CSharpFormattingPolicy = $2
$2.ElseIfNewLinePlacement = SameLine
$2.AfterDelegateDeclarationParameterComma = True
$2.inheritsSet = Mono
$2.inheritsScope = text/x-csharp
$2.scope = text/x-csharp
$0.TextStylePolicy = $3
$3.FileWidth = 120
$3.inheritsSet = VisualStudio
$3.inheritsScope = text/plain
$3.scope = text/plain
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
5 changes: 5 additions & 0 deletions src/ripple/Local/NuspecDocument.cs
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,11 @@ public IEnumerable<PublishedAssembly> FindPublishedAssemblies()
var assemblyReference = element.Attribute("src").Value;
assemblyReference = assemblyReference.Replace('\\', Path.DirectorySeparatorChar);

if (Platform.IsUnix ())
{
assemblyReference = assemblyReference.Replace ('\\', '/');
}

yield return new PublishedAssembly(nuspecDirectory, assemblyReference, path);
}
}
Expand Down
3 changes: 3 additions & 0 deletions src/ripple/MSBuild/ProjFile.cs
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,9 @@ public void AddAssemblies(Dependency dep, IEnumerable<IPackageAssemblyReference>
var nugetDir = _solution.NugetFolderFor(dep.Name);
var assemblyPath = nugetDir.AppendPath(assem.Path);
var hintPath = assemblyPath.PathRelativeTo(_filename.ParentDirectory());
if (Platform.IsUnix()) {
hintPath.Replace (Path.DirectorySeparatorChar, '\\');
}

if (AddReference(assemblyName, hintPath) == ReferenceStatus.Changed)
{
Expand Down