Permalink
Browse files

Lots of small fixes

Changing .nuget/* files to be case-sensitive
Finding and replacing the term Nudo to Sake
Updating the makefile
Removing obsolete _msbuild tag
  • Loading branch information...
1 parent 0aac175 commit 069f05c734e60a31e3cc3b3ed789bfcb2d913ae7 Louis DeJardin committed Apr 24, 2012
View
Binary file not shown.
View
Binary file not shown.
@@ -8,13 +8,13 @@
<PackagesConfig Condition=" '$(OS)' == 'Windows_NT'">$([System.IO.Path]::Combine($(ProjectDir), "packages.config"))</PackagesConfig>
<PackagesDir Condition=" '$(OS)' == 'Windows_NT'">$([System.IO.Path]::Combine($(SolutionDir), "packages"))</PackagesDir>
- <!-- We need to launch nuget.exe with the mono command if we're not on windows -->
+ <!-- We need to launch NuGet.exe with the mono command if we're not on windows -->
<NuGetToolsPath Condition=" '$(OS)' != 'Windows_NT'">$(SolutionDir).nuget</NuGetToolsPath>
<PackagesConfig Condition=" '$(OS)' != 'Windows_NT' ">packages.config</PackagesConfig>
<PackagesDir Condition=" '$(OS)' != 'Windows_NT'">$(SolutionDir)packages</PackagesDir>
<!-- NuGet command -->
- <NuGetExePath>$(NuGetToolsPath)\nuget.exe</NuGetExePath>
+ <NuGetExePath>$(NuGetToolsPath)\NuGet.exe</NuGetExePath>
<NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
<NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand>
@@ -47,7 +47,7 @@
</PropertyGroup>
<Target Name="CheckPrerequisites">
- <!-- Raise an error if we're unable to locate nuget.exe -->
+ <!-- Raise an error if we're unable to locate NuGet.exe -->
<Error Condition="!Exists('$(NuGetExePath)')" Text="Unable to locate '$(NuGetExePath)'" />
</Target>
View
Binary file not shown.
View
@@ -39,7 +39,7 @@ This is another nice technique if you want to use Sake in your project and don't
#### build.cmd
@echo off
- ".nuget\nuget.exe" install -OutputDirectory packages .\packages.config
+ ".nuget\NuGet.exe" install -OutputDirectory packages .\packages.config
"packages\Sake.0.1.0-alpha\tools\sake.exe" %*
#### makefile.shade
View
@@ -14,8 +14,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".Welcome", ".Welcome", "{74
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{890674E8-6A33-4781-9978-4F616FE41C02}"
ProjectSection(SolutionItems) = preProject
- .nuget\nuget.exe = .nuget\nuget.exe
- .nuget\nuget.targets = .nuget\nuget.targets
+ .nuget\NuGet.exe = .nuget\NuGet.exe
+ .nuget\NuGet.targets = .nuget\NuGet.targets
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{B84E4C5F-147B-488D-8D69-80EBDB405A79}"
View
2 build
@@ -1,5 +1,5 @@
#!/bin/sh
-mono --runtime=v4.0 "./.nuget/nuget.exe" install ./packages.config -o packages
+mono --runtime=v4.0 "./.nuget/NuGet.exe" install ./packages.config -o packages
mono "./packages/Sake.0.1.0-alpha/tools/Sake.exe" -I "src/Sake.Library/Shared" "$@"
View
@@ -1,3 +1,3 @@
:@echo off
-"%~dp0.nuget\nuget.exe" install -OutputDirectory packages .\packages.config
-"%~dp0packages\Sake.0.1.0-alpha\tools\sake.exe" -C %~dp0 -I src\Sake.Library\Shared %*
+"%~dp0.nuget\NuGet.exe" install -OutputDirectory packages .\packages.config
+"%~dp0packages\Sake.0.1.0-alpha\tools\Sake.exe" -C %~dp0 -I src\Sake.Library\Shared %*
View
@@ -21,32 +21,34 @@ var packageDir='${Path.Combine(targetDir, "package")}'
log info='Already absent: ${targetDir}'
-#compile-for-xunit target='test-compile'
+#compile-sake target='compile' description='Compile primary project'
+ build projectFile='src/Sake/Sake.csproj' outputDir='${packageDir}'
+ copy sourceDir='src/Sake.Library/Shared' outputDir='${packageDir}/Shared' overwrite='${true}'
+
+
+#compile-for-xunit target='test-compile' description='Compile entire solution for testing'
build projectFile='Sake.sln' outputDir='${testDir}'
-#run-xunit target="test"
+#run-xunit target="test" description='Run xunit tests'
copy sourceDir='${testDir}' include='xunit.dll' outputDir='packages/xunit.runners.1.9.0.1566/tools' overwrite='${true}'
for each='var file in Files.BasePath(testDir).Include("*.Tests.dll", "Sake.Library.exe")'
xunit assemblyFile='${Path.Combine(testDir, file)}'
-#compile-sake target='compile'
- build projectFile='src/Sake/Sake.csproj' outputDir='${packageDir}'
- copy sourceDir='src/Sake.Library/Shared' outputDir='${packageDir}/Shared' overwrite='${true}'
-
-
-#run-nuget-pack target='package'
+#run-nuget-pack target='package' description='Create NuGet packages'
for each='var file in Files.Include("target/package/**/*.nuspec")'
log info='Packaging ${file}'
nuget-pack nuspecFile='${file}' extra='-NoPackageAnalysis' outputDir='${targetDir}'
-#install-nupkgs target='install'
+#install-nupkgs target='install' description='Copy NuGet packages to local repo'
var outputDir='${Environment.ExpandEnvironmentVariables("%HOMEDRIVE%%HOMEPATH%\\.nuget")}'
copy sourceDir='${targetDir}' include='*.nupkg' overwrite='${true}'
-#push-nupkgs target='deploy'
+#push-nupkgs target='deploy' description='Upload NuGet packages to gallery'
nuget-push each='var nupkgFile in Files.Include(targetDir + "/*.nupkg")'
+
+
@@ -5,7 +5,7 @@
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
-[assembly: AssemblyTitle("Nudo.Engine.Tests")]
+[assembly: AssemblyTitle("Sake.Engine.Tests")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCulture("")]
@@ -58,8 +58,8 @@
<Link>Properties\AssemblyVersionInfo.cs</Link>
</Compile>
<Compile Include="DefaultLoaderTests.cs" />
- <Compile Include="NudoEngineOptionsTests.cs" />
- <Compile Include="NudoEngineTests.cs" />
+ <Compile Include="SakeEngineOptionsTests.cs" />
+ <Compile Include="SakeEngineTests.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Starter.cs" />
</ItemGroup>
@@ -108,7 +108,7 @@
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+ <Import Project="$(SolutionDir)\.nuget\NuGet.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
@@ -4,12 +4,12 @@
namespace Sake.Engine.Tests
{
- public class NudoEngineOptionsTests
+ public class SakeEngineOptionsTests
{
private readonly IContainer _container;
private readonly SakeEngine _engine;
- public NudoEngineOptionsTests()
+ public SakeEngineOptionsTests()
{
_container = Starter.CreateContainer(new SakeSettings());
_engine = _container.Resolve<SakeEngine>();
@@ -6,14 +6,14 @@
namespace Sake.Engine.Tests
{
- public class NudoEngineTests
+ public class SakeEngineTests
{
private readonly IContainer _container;
private readonly SakeEngine _engine;
private readonly StringWriter _writer;
string Output { get { return _writer.ToString(); } }
- public NudoEngineTests()
+ public SakeEngineTests()
{
_writer = new StringWriter();
_container = Starter.CreateContainer(new SakeSettings {Output = _writer});
@@ -5,7 +5,7 @@
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
-[assembly: AssemblyTitle("Nudo.Engine")]
+[assembly: AssemblyTitle("Sake.Engine")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCulture("")]
@@ -74,7 +74,7 @@
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+ <Import Project="$(SolutionDir)\.nuget\NuGet.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
@@ -27,9 +27,9 @@ public void Execute(params string[] args)
}
catch (OptionException ex)
{
- _settings.Output.Write("Nudo: ");
+ _settings.Output.Write("Sake: ");
_settings.Output.WriteLine(ex.Message);
- _settings.Output.WriteLine("Try 'Nudo --help' for more information.");
+ _settings.Output.WriteLine("Try 'Sake --help' for more information.");
}
}
@@ -92,16 +92,11 @@ public Options Parse(params string[] args)
public void ShowHelp(Options options)
{
- _settings.Output.WriteLine("Usage: Nudo [OPTIONS]+ [target]+");
+ _settings.Output.WriteLine("Usage: Sake [OPTIONS]+ [target]+");
_settings.Output.WriteLine();
_settings.Output.WriteLine("Options:");
options.WriteOptionsDescriptions(_settings.Output);
}
}
-
- public interface INudoContainer
- {
- T Get<T>();
- }
}
@@ -12,7 +12,7 @@
<AssemblyName>Sake.Library</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
- <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\Nudo\</SolutionDir>
+ <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
<RestorePackages>true</RestorePackages>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
@@ -77,7 +77,6 @@
</None>
<None Include="Shared\_exec.shade" />
<None Include="Shared\_log.shade" />
- <None Include="Shared\_msbuild.shade" />
<None Include="Shared\_nuget-pack.shade" />
<None Include="Shared\_use-standard-lifecycle.shade" />
<None Include="Shared\_xunit.shade" />
@@ -122,7 +121,7 @@
<Folder Include="Data\Copy\" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+ <Import Project="$(SolutionDir)\.nuget\NuGet.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
@@ -1,12 +0,0 @@
-
-default msbuildPath='c:/Windows/Microsoft.NET/Framework/v4.0.30319/MSBuild.exe'
-default configuration='Release'
-
--//default workingdir='${Path.GetDirectoryName(Path.Combine(Directory.GetCurrentDirectory(), projectFile))}'
-default workingdir='${Directory.GetCurrentDirectory()}'
-default outputDir=''
-
-var OutDirPiece=''
-set OutDirPiece='OutDir=${outputDir}\;' if='!string.IsNullOrWhiteSpace(outputDir)'
-
-exec program="${msbuildPath}" commandline='${projectFile} "/p:${OutDirPiece}Configuration=Release"'
@@ -1,5 +1,5 @@
-default nugetPath='.nuget/nuget.exe'
+default nugetPath='.nuget/NuGet.exe'
default configuration='Release'
default workingdir='${Directory.GetCurrentDirectory()}'
@@ -1,5 +1,5 @@
-default nugetPath='.nuget/nuget.exe'
+default nugetPath='.nuget/NuGet.exe'
default workingdir='${Directory.GetCurrentDirectory()}'
default apiKey='${Environment.GetEnvironmentVariable("APIKEY")}'
View
@@ -71,7 +71,7 @@
</None>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+ <Import Project="$(SolutionDir)\.nuget\NuGet.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">

0 comments on commit 069f05c

Please sign in to comment.