Skip to content

Commit 12d72a8

Browse files
OlegZeeOlegZee
committed
Merge remote-tracking branch 'origin/master'
2 parents 4a4ec40 + 8f49304 commit 12d72a8

File tree

6 files changed

+99
-92
lines changed

6 files changed

+99
-92
lines changed

‎.travis.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
language: csharp
22
solution: xake.sln
3-
env: VER=0.1.0
3+
env: VER=$(if [[ "${TRAVIS_TAG:0:1}" == "v" ]]; then echo ${TRAVIS_TAG:1}; else echo 0.0.0; fi;)
44
install:
55
- nuget restore xake.sln
66
- nuget install NUnit.Runners -Version 2.6.4 -OutputDirectory testrunner
77
script:
8-
- echo "module XakeConst [<Literal>] let internal Version = \"$VER.$TRAVIS_BUILD_NUMBER\"" > ./VersionInfo.fs
8+
- echo "module Xake [<Literal>] let internal Version = \"$VER.$TRAVIS_BUILD_NUMBER\"" > ./core/VersionInfo.fs
99
- xbuild /p:Configuration=Release xake.sln
1010
- mono ./testrunner/NUnit.Runners.2.6.4/tools/nunit-console.exe ./bin/XakeLibTests.dll
1111
deploy:
@@ -18,3 +18,4 @@ deploy:
1818
skip_cleanup: true
1919
on:
2020
tags: true
21+
condition: "${TRAVIS_TAG:0:1} = v"

‎XakeLibTests/XakeLibTests.fsproj‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,10 @@
5151
<Compile Include="FileTasksTests.fs" />
5252
</ItemGroup>
5353
<ItemGroup>
54-
<ProjectReference Include="..\core\XakeLib.fsproj">
55-
<Name>XakeLib</Name>
56-
<Project>{6B39C22F-6741-428D-B21A-33580AF7BD8E}</Project>
54+
<ProjectReference Include="..\core\Xake.Core.fsproj">
55+
<Name>Xake.Core</Name>
56+
<Project>{6b39c22f-6741-428d-b21a-33580af7bd8e}</Project>
57+
<Private>True</Private>
5758
</ProjectReference>
5859
</ItemGroup>
5960
<PropertyGroup>

‎core/AssemblyInfo.fs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
module XakeLib.AssemblyInfo
1+
module Xake.AssemblyInfo
22
open System.Reflection
33
open System.Runtime.CompilerServices
44

55
[<assembly: AssemblyTitle("Xake core")>]
66
[<assembly: AssemblyDescription("Xake core library")>]
77
[<assembly: AssemblyCopyright("(c) OlegZee 2014-1015")>]
8-
[<assembly: AssemblyVersion(XakeConst.Version)>]
8+
[<assembly: AssemblyVersion(Xake.Version)>]
99

1010
()

‎core/VersionInfo.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
module XakeConst [<Literal>] let internal Version = "0.1.0.0"
1+
module Xake [<Literal>] let internal Version = "0.1.0.0"

core/XakeLib.fsproj renamed to core/Xake.Core.fsproj

Lines changed: 75 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,76 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4-
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{6B39C22F-6741-428D-B21A-33580AF7BD8E}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<RootNamespace>Xake.Core</RootNamespace>
10-
<AssemblyName>Xake.Core</AssemblyName>
11-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
12-
<Name>XakeLib</Name>
13-
<TargetFrameworkProfile />
14-
</PropertyGroup>
15-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
16-
<DebugSymbols>true</DebugSymbols>
17-
<DebugType>full</DebugType>
18-
<Optimize>false</Optimize>
19-
<Tailcalls>false</Tailcalls>
20-
<OutputPath>..\bin\Debug</OutputPath>
21-
<DefineConstants>DEBUG;TRACE</DefineConstants>
22-
<WarningLevel>3</WarningLevel>
23-
<StartAction>Program</StartAction>
24-
<StartProgram>C:\Program Files (x86)\Microsoft SDKs\F#\3.0\Framework\v4.0\Fsi.exe</StartProgram>
25-
<StartWorkingDirectory>C:\projects\ar9\Source</StartWorkingDirectory>
26-
<StartArguments>\projects\Mine\xake\samples\ar\build.fsx</StartArguments>
27-
</PropertyGroup>
28-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
29-
<DebugType>none</DebugType>
30-
<Optimize>true</Optimize>
31-
<Tailcalls>true</Tailcalls>
32-
<OutputPath>..\bin</OutputPath>
33-
<DefineConstants>TRACE</DefineConstants>
34-
<WarningLevel>3</WarningLevel>
35-
<DocumentationFile>..\bin\Xake.Core.XML</DocumentationFile>
36-
<DebugSymbols>false</DebugSymbols>
37-
</PropertyGroup>
38-
<ItemGroup>
39-
<Reference Include="mscorlib" />
40-
<Reference Include="System" />
41-
<Reference Include="System.Core" />
42-
<Reference Include="System.Windows.Forms" />
43-
<Reference Include="FSharp.Core">
44-
<Private>True</Private>
45-
</Reference>
46-
</ItemGroup>
47-
<ItemGroup>
48-
<Compile Include="Logging.fs" />
49-
<Compile Include="Types.fs" />
50-
<Compile Include="Pickler.fs" />
51-
<Compile Include="Fileset.fs" />
52-
<Compile Include="Database.fs" />
53-
<Compile Include="Core.fs" />
54-
<Compile Include="WorkerPool.fs" />
55-
<Compile Include="XakeScript.fs" />
56-
<Compile Include="Common.fs" />
57-
<Compile Include="FileTasks.fs" />
58-
<Compile Include="ResourceFileset.fs" />
59-
<Compile Include="DotNetFwk.fs" />
60-
<Compile Include="DotnetTasks.fs" />
61-
<None Include="filesets.fsx" />
62-
<Compile Include="VersionInfo.fs" />
63-
<Compile Include="AssemblyInfo.fs" />
64-
</ItemGroup>
65-
<PropertyGroup>
66-
<MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
67-
</PropertyGroup>
68-
<Import Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets" Condition=" Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')" />
69-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
70-
Other similar extension points exist, see Microsoft.Common.targets.
71-
<Target Name="BeforeBuild">
72-
</Target>
73-
<Target Name="AfterBuild">
74-
</Target>
75-
-->
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4+
<PropertyGroup>
5+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7+
<ProjectGuid>{6B39C22F-6741-428D-B21A-33580AF7BD8E}</ProjectGuid>
8+
<OutputType>Library</OutputType>
9+
<RootNamespace>Xake.Core</RootNamespace>
10+
<AssemblyName>Xake.Core</AssemblyName>
11+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
12+
<Name>Xake.Core</Name>
13+
<TargetFrameworkProfile />
14+
</PropertyGroup>
15+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
16+
<DebugSymbols>true</DebugSymbols>
17+
<DebugType>full</DebugType>
18+
<Optimize>false</Optimize>
19+
<Tailcalls>false</Tailcalls>
20+
<OutputPath>..\bin\Debug</OutputPath>
21+
<DefineConstants>DEBUG;TRACE</DefineConstants>
22+
<WarningLevel>3</WarningLevel>
23+
<StartAction>Program</StartAction>
24+
<StartProgram>C:\Program Files (x86)\Microsoft SDKs\F#\3.0\Framework\v4.0\Fsi.exe</StartProgram>
25+
<StartWorkingDirectory>C:\projects\ar9\Source</StartWorkingDirectory>
26+
<StartArguments>\projects\Mine\xake\samples\ar\build.fsx</StartArguments>
27+
</PropertyGroup>
28+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
29+
<DebugType>none</DebugType>
30+
<Optimize>true</Optimize>
31+
<Tailcalls>true</Tailcalls>
32+
<OutputPath>..\bin</OutputPath>
33+
<DefineConstants>TRACE</DefineConstants>
34+
<WarningLevel>3</WarningLevel>
35+
<DocumentationFile>..\bin\Xake.Core.XML</DocumentationFile>
36+
<DebugSymbols>false</DebugSymbols>
37+
</PropertyGroup>
38+
<ItemGroup>
39+
<Reference Include="mscorlib" />
40+
<Reference Include="System" />
41+
<Reference Include="System.Core" />
42+
<Reference Include="System.Windows.Forms" />
43+
<Reference Include="FSharp.Core">
44+
<Private>True</Private>
45+
</Reference>
46+
</ItemGroup>
47+
<ItemGroup>
48+
<Compile Include="Logging.fs" />
49+
<Compile Include="Types.fs" />
50+
<Compile Include="Pickler.fs" />
51+
<Compile Include="Fileset.fs" />
52+
<Compile Include="Database.fs" />
53+
<Compile Include="Core.fs" />
54+
<Compile Include="WorkerPool.fs" />
55+
<Compile Include="XakeScript.fs" />
56+
<Compile Include="Common.fs" />
57+
<Compile Include="FileTasks.fs" />
58+
<Compile Include="ResourceFileset.fs" />
59+
<Compile Include="DotNetFwk.fs" />
60+
<Compile Include="DotnetTasks.fs" />
61+
<None Include="filesets.fsx" />
62+
<Compile Include="VersionInfo.fs" />
63+
<Compile Include="AssemblyInfo.fs" />
64+
</ItemGroup>
65+
<PropertyGroup>
66+
<MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
67+
</PropertyGroup>
68+
<Import Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets" Condition=" Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')" />
69+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
70+
Other similar extension points exist, see Microsoft.Common.targets.
71+
<Target Name="BeforeBuild">
72+
</Target>
73+
<Target Name="AfterBuild">
74+
</Target>
75+
-->
7676
</Project>

‎xake.sln‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,24 +30,32 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Wiki", "Wiki", "{75E5F305-B
3030
docs\todo.md = docs\todo.md
3131
EndProjectSection
3232
EndProject
33-
Project("{f2a71f9b-5d33-465a-a702-920d77279786}") = "XakeLib", "core\XakeLib.fsproj", "{6B39C22F-6741-428D-B21A-33580AF7BD8E}"
33+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Xake.Core", "core\Xake.Core.fsproj", "{6B39C22F-6741-428D-B21A-33580AF7BD8E}"
3434
EndProject
35-
Project("{f2a71f9b-5d33-465a-a702-920d77279786}") = "XakeLibTests", "XakeLibTests\XakeLibTests.fsproj", "{5B7A9196-F7F9-47E6-ABC7-381432F613B2}"
35+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "XakeLibTests", "XakeLibTests\XakeLibTests.fsproj", "{5B7A9196-F7F9-47E6-ABC7-381432F613B2}"
36+
EndProject
37+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Project files", "Project files", "{CA08F45F-D8B4-46D4-B7EC-38C68C7AF0B2}"
38+
ProjectSection(SolutionItems) = preProject
39+
.travis.yml = .travis.yml
40+
EndProjectSection
3641
EndProject
3742
Global
3843
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3944
Debug|Any CPU = Debug|Any CPU
4045
Release|Any CPU = Release|Any CPU
4146
EndGlobalSection
4247
GlobalSection(ProjectConfigurationPlatforms) = postSolution
43-
{5B7A9196-F7F9-47E6-ABC7-381432F613B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
44-
{5B7A9196-F7F9-47E6-ABC7-381432F613B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
45-
{5B7A9196-F7F9-47E6-ABC7-381432F613B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
46-
{5B7A9196-F7F9-47E6-ABC7-381432F613B2}.Release|Any CPU.Build.0 = Release|Any CPU
4748
{6B39C22F-6741-428D-B21A-33580AF7BD8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4849
{6B39C22F-6741-428D-B21A-33580AF7BD8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
4950
{6B39C22F-6741-428D-B21A-33580AF7BD8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
5051
{6B39C22F-6741-428D-B21A-33580AF7BD8E}.Release|Any CPU.Build.0 = Release|Any CPU
52+
{5B7A9196-F7F9-47E6-ABC7-381432F613B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
53+
{5B7A9196-F7F9-47E6-ABC7-381432F613B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
54+
{5B7A9196-F7F9-47E6-ABC7-381432F613B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
55+
{5B7A9196-F7F9-47E6-ABC7-381432F613B2}.Release|Any CPU.Build.0 = Release|Any CPU
56+
EndGlobalSection
57+
GlobalSection(SolutionProperties) = preSolution
58+
HideSolutionNode = FALSE
5159
EndGlobalSection
5260
GlobalSection(NestedProjects) = preSolution
5361
{4A657E43-9D03-4C2F-8D2C-D1F265ACDFBD} = {5DF9487A-79E1-412A-BF67-5F02999A1988}
@@ -57,7 +65,4 @@ Global
5765
GlobalSection(MonoDevelopProperties) = preSolution
5866
StartupItem = core\XakeLib.fsproj
5967
EndGlobalSection
60-
GlobalSection(SolutionProperties) = preSolution
61-
HideSolutionNode = FALSE
62-
EndGlobalSection
6368
EndGlobal

0 commit comments

Comments
 (0)