Skip to content

Commit f3a756e

Browse files
committed
Fixed an issue in Rakefile.
1 parent 06ef8c1 commit f3a756e

File tree

3 files changed

+101
-5
lines changed

3 files changed

+101
-5
lines changed

CommandLine.Dist.sln

+74
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 11.00
3+
# Visual Studio 2010
4+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommandLine", "src\libcmdline\CommandLine.csproj", "{5DEA2811-2FFA-4959-830B-CAD3ACACABEB}"
5+
EndProject
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommandLine.Demo", "src\demo\CommandLine.Demo.csproj", "{9E573FFF-4ECB-4C59-A914-C0B74D44D2E8}"
7+
EndProject
8+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Files", "Files", "{4F498B61-A7BC-4B32-9ACB-901D4F50659B}"
9+
ProjectSection(SolutionItems) = preProject
10+
CommandLine.FxCop = CommandLine.FxCop
11+
Rakefile.rb = Rakefile.rb
12+
EndProjectSection
13+
EndProject
14+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NuGet", "NuGet", "{CC062800-4709-4A04-8A0D-DD972C1BFFC5}"
15+
ProjectSection(SolutionItems) = preProject
16+
nuget\CommandLine.nuspec = nuget\CommandLine.nuspec
17+
nuget\readme.txt = nuget\readme.txt
18+
EndProjectSection
19+
EndProject
20+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{18282A82-E36C-4938-8397-C0A1166983BA}"
21+
ProjectSection(SolutionItems) = preProject
22+
doc\ChangeLog = doc\ChangeLog
23+
doc\LICENSE = doc\LICENSE
24+
README.md = README.md
25+
EndProjectSection
26+
EndProject
27+
Global
28+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
29+
Debug|Any CPU = Debug|Any CPU
30+
Debug|x86 = Debug|x86
31+
DebugTests|Any CPU = DebugTests|Any CPU
32+
DebugTests|x86 = DebugTests|x86
33+
Release|Any CPU = Release|Any CPU
34+
Release|x86 = Release|x86
35+
EndGlobalSection
36+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
37+
{5DEA2811-2FFA-4959-830B-CAD3ACACABEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
38+
{5DEA2811-2FFA-4959-830B-CAD3ACACABEB}.Debug|Any CPU.Build.0 = Debug|Any CPU
39+
{5DEA2811-2FFA-4959-830B-CAD3ACACABEB}.Debug|x86.ActiveCfg = Debug|Any CPU
40+
{5DEA2811-2FFA-4959-830B-CAD3ACACABEB}.DebugTests|Any CPU.ActiveCfg = DebugTests|Any CPU
41+
{5DEA2811-2FFA-4959-830B-CAD3ACACABEB}.DebugTests|Any CPU.Build.0 = DebugTests|Any CPU
42+
{5DEA2811-2FFA-4959-830B-CAD3ACACABEB}.DebugTests|x86.ActiveCfg = DebugTests|Any CPU
43+
{5DEA2811-2FFA-4959-830B-CAD3ACACABEB}.Release|Any CPU.ActiveCfg = Release|Any CPU
44+
{5DEA2811-2FFA-4959-830B-CAD3ACACABEB}.Release|Any CPU.Build.0 = Release|Any CPU
45+
{5DEA2811-2FFA-4959-830B-CAD3ACACABEB}.Release|x86.ActiveCfg = Release|Any CPU
46+
{9E573FFF-4ECB-4C59-A914-C0B74D44D2E8}.Debug|Any CPU.ActiveCfg = Debug|x86
47+
{9E573FFF-4ECB-4C59-A914-C0B74D44D2E8}.Debug|Any CPU.Build.0 = Debug|x86
48+
{9E573FFF-4ECB-4C59-A914-C0B74D44D2E8}.Debug|x86.ActiveCfg = Debug|x86
49+
{9E573FFF-4ECB-4C59-A914-C0B74D44D2E8}.Debug|x86.Build.0 = Debug|x86
50+
{9E573FFF-4ECB-4C59-A914-C0B74D44D2E8}.DebugTests|Any CPU.ActiveCfg = Debug|x86
51+
{9E573FFF-4ECB-4C59-A914-C0B74D44D2E8}.DebugTests|Any CPU.Build.0 = Debug|x86
52+
{9E573FFF-4ECB-4C59-A914-C0B74D44D2E8}.DebugTests|x86.ActiveCfg = Debug|x86
53+
{9E573FFF-4ECB-4C59-A914-C0B74D44D2E8}.Release|Any CPU.ActiveCfg = Release|x86
54+
{9E573FFF-4ECB-4C59-A914-C0B74D44D2E8}.Release|Any CPU.Build.0 = Release|x86
55+
{9E573FFF-4ECB-4C59-A914-C0B74D44D2E8}.Release|x86.ActiveCfg = Release|x86
56+
{9E573FFF-4ECB-4C59-A914-C0B74D44D2E8}.Release|x86.Build.0 = Release|x86
57+
EndGlobalSection
58+
GlobalSection(NestedProjects) = preSolution
59+
{CC062800-4709-4A04-8A0D-DD972C1BFFC5} = {4F498B61-A7BC-4B32-9ACB-901D4F50659B}
60+
{18282A82-E36C-4938-8397-C0A1166983BA} = {4F498B61-A7BC-4B32-9ACB-901D4F50659B}
61+
EndGlobalSection
62+
GlobalSection(MonoDevelopProperties) = preSolution
63+
StartupItem = src\demo\CommandLine.Demo.csproj
64+
Policies = $0
65+
$0.TextStylePolicy = $1
66+
$1.FileWidth = 120
67+
$1.TabsToSpaces = False
68+
$1.inheritsSet = VisualStudio
69+
$1.inheritsScope = text/plain
70+
EndGlobalSection
71+
GlobalSection(SolutionProperties) = preSolution
72+
HideSolutionNode = FALSE
73+
EndGlobalSection
74+
EndGlobal

Rakefile.rb

+22-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
require 'albacore'
1010

11-
task :default => [:build, :test]
11+
task :default => [:build]
1212

1313
if RUBY_VERSION =~ /^1\.8/
1414
class Dir
@@ -34,21 +34,34 @@ def invoke_runtime(cmd)
3434
end
3535

3636
CONFIGURATION = "Release"
37+
CONFIGURATION_TESTS = "DebugTests"
3738
BUILD_DIR = File.expand_path("build")
3839
OUTPUT_DIR = "#{BUILD_DIR}/out"
39-
BIN_DIR = "#{BUILD_DIR}/bin"
40+
OUTPUT_DIR_TESTS = "#{OUTPUT_DIR}/tests"
4041
SOURCE_DIR = File.expand_path("src")
4142
LIB_DIR = "#{SOURCE_DIR}/libcmdline"
4243

4344
msbuild :build_msbuild do |b|
4445
b.properties :configuration => CONFIGURATION, "OutputPath" => OUTPUT_DIR
4546
b.targets :Build
47+
b.solution = "CommandLine.Dist.sln"
48+
end
49+
50+
msbuild :build_msbuild_test do |b|
51+
b.properties :configuration => CONFIGURATION_TESTS, "OutputPath" => OUTPUT_DIR_TESTS
52+
b.targets :Build
4653
b.solution = "CommandLine.sln"
4754
end
4855

4956
xbuild :build_xbuild do |b|
5057
b.properties :configuration => CONFIGURATION, "OutputPath" => OUTPUT_DIR
5158
b.targets :Build
59+
b.solution = "CommandLine.Dist.sln"
60+
end
61+
62+
xbuild :build_xbuild_test do |b|
63+
b.properties :configuration => CONFIGURATION_TESTS, "OutputPath" => OUTPUT_DIR_TESTS
64+
b.targets :Build
5265
b.solution = "CommandLine.sln"
5366
end
5467

@@ -57,9 +70,14 @@ def invoke_runtime(cmd)
5770
Rake::Task[build_task].invoke
5871
end
5972

60-
task :test => :build do
73+
task :build_test => :clean do |b|
74+
build_task = is_nix() ? "build_xbuild_test" : "build_msbuild_test"
75+
Rake::Task[build_task].invoke
76+
end
77+
78+
task :test => :build_test do
6179
nunit = invoke_runtime("packages/NUnit.2.5.10.11092/tools/nunit-console.exe")
62-
sh "#{nunit} -labels #{OUTPUT_DIR}/CommandLine.Tests.dll"
80+
sh "#{nunit} -labels #{OUTPUT_DIR_TESTS}/CommandLine.Tests.dll"
6381
end
6482

6583
task :strings do

doc/ChangeLog

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
2013-01-26 Giacomo Stelluti Scala <[email protected]>
1+
2013-01-27 Giacomo Stelluti Scala <[email protected]>
2+
3+
* Fixed an issue in Rakefile. Now 'test' task is separeted form 'build' (defualt).
4+
5+
2013-01-27 Giacomo Stelluti Scala <[email protected]>
26

37
* Thanks to github user @marcells, we can reference CommandLine.dll from CommandLine.Tests.dll
48
keeping strong name.

0 commit comments

Comments
 (0)