Skip to content

Commit 1407dbd

Browse files
JakeGinnivanJakeGinnivan
committed
Merge
2 parents a4e6ec8 + 5493e45 commit 1407dbd

File tree

285 files changed

+6623
-144203
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

285 files changed

+6623
-144203
lines changed

‎.hgignore‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ UpgradeLog*.*
4848
[Rr]elease/
4949
[Tt]humbs.db
5050
_UpgradeReport_Files
51-
_[Rr]e[Ss]harper.*/
51+
_[Rr]e[Ss]harper.*
52+
*.[Rr]e[Ss]harper
5253
hgignore[.-]*
5354
ignore[.-]*
5455
svnignore[.-]*
@@ -66,5 +67,8 @@ glob:Tools\*.nupkg
6667
Views\Extensions\*
6768
glob:src/FunnelWeb.sln.docstates
6869
glob:build/NuGet/*
69-
src/FunnelWeb.Web/App_Data/FunnelWeb.sdf
70+
*.sdf
71+
*.mdf
72+
*.ldf
7073
AppHarbourConfig.xml
74+
packages/*

‎README.md‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
# FunnelWeb
2+
3+
FunnelWeb is an open source blog engine, built by developers for developers. Instead of fancy quotes and oodles of widgets, we focus on letting you post beautiful code samples, keeping your markup clean and valid, and encouraging collaboration with rich comments. FunnelWeb is easy to install, and has an active community.
4+
5+
# Markdown
6+
7+
FunnelWeb is built on top of [Markdown](http://daringfireball.net/projects/markdown/) which is a HTML abstraction layer allowing you to author your articles in a clean text format which will be transformed to HTML for serving on your site.
8+
9+
For editing we recommend that you use [Downmarker](https://github.com/Code52/DownmarkerWPF) which is just like Windows Live Writer but for Markdown.
10+
11+
# Installing
12+
13+
Really we recommend that you grab the code from this repository and run the `build.bat` file. This will generate you an output that you can publish onto your server and run through the installer.
14+
15+
If you're not a fan of running bleeding edge software you can [download a stable build](http://hg.funnelweblog.com/release/downloads).
16+
17+
Lastly you need to modify the `my.config` file which contains your login information and SQL connection information.
18+
19+
# Be involved
20+
21+
* Found a bug? [Let us know](http://hg.funnelweblog.com/release/issues?status=new&status=open)!
22+
* Got a question? [Drop us a line](https://groups.google.com/forum/?fromgroups#!forum/funnelweblog)!
23+
* Fixed something? Send us a pull request on [Bitbucket](http://hg.funnelweblog.com/dev) or [GitHub](https://github.com/funnelweblog/FunnelWeb)!
24+
25+
# License
26+
27+
FunnelWeb is licensed under the New BSD license.
28+
29+
==============================================================================
30+
31+
Copyright (c) 2009, FunnelWeb Contributors
32+
All rights reserved.
33+
34+
Redistribution and use in source and binary forms, with or without
35+
modification, are permitted provided that the following conditions are met:
36+
37+
- Redistributions of source code must retain the above copyright notice,
38+
this list of conditions and the following disclaimer.
39+
- Redistributions in binary form must reproduce the above copyright notice,
40+
this list of conditions and the following disclaimer in the documentation
41+
and/or other materials provided with the distribution.
42+
- Neither the name of FunnelWeb nor the names of its contributors may be used
43+
to endorse or promote products derived from this software without specific
44+
prior written permission.
45+
46+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
47+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
48+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
49+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
50+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
51+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
52+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
53+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
54+
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
55+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

‎build/build.proj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<PropertyGroup>
88
<Root>$(MSBuildStartupDirectory)</Root>
99
<nunitconsoleexe>$(Root)\lib\NUnit\exe\nunit-console-x86.exe</nunitconsoleexe>
10-
<NuGet>$(Root)\build\lib\NuGet.exe</NuGet>
10+
<NuGet>$(Root)\src\.nuget\NuGet.exe</NuGet>
1111
</PropertyGroup>
1212

1313
<PropertyGroup>

‎build/lib/NuGet.exe‎

-335 KB
Binary file not shown.

‎src/.nuget/NuGet.Config‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<solution>
4+
<add key="disableSourceControlIntegration" value="true" />
5+
</solution>
6+
</configuration>

‎src/.nuget/NuGet.exe‎

554 KB
Binary file not shown.

‎src/.nuget/NuGet.targets‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
5+
6+
<!-- Windows specific commands -->
7+
<NuGetToolsPath Condition=" '$(OS)' == 'Windows_NT'">$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath>
8+
<PackagesConfig Condition=" '$(OS)' == 'Windows_NT'">$([System.IO.Path]::Combine($(ProjectDir), "packages.config"))</PackagesConfig>
9+
<PackagesDir Condition=" '$(OS)' == 'Windows_NT'">$([System.IO.Path]::Combine($(SolutionDir), "packages"))</PackagesDir>
10+
11+
<!-- We need to launch nuget.exe with the mono command if we're not on windows -->
12+
<NuGetToolsPath Condition=" '$(OS)' != 'Windows_NT'">$(SolutionDir).nuget</NuGetToolsPath>
13+
<PackagesConfig Condition=" '$(OS)' != 'Windows_NT' ">packages.config</PackagesConfig>
14+
<PackagesDir Condition=" '$(OS)' != 'Windows_NT'">$(SolutionDir)packages</PackagesDir>
15+
16+
<!-- NuGet command -->
17+
<NuGetExePath>$(NuGetToolsPath)\nuget.exe</NuGetExePath>
18+
<NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
19+
<NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand>
20+
21+
<PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
22+
23+
<!-- Package sources used to restore packages. By default will used the registered sources under %APPDATA%\NuGet\NuGet.Config -->
24+
<PackageSources>""</PackageSources>
25+
26+
<!-- Enable the restore command to run before builds -->
27+
<RestorePackages Condition="$(RestorePackages) == ''">false</RestorePackages>
28+
29+
<!-- Property that enables building a package from a project -->
30+
<BuildPackage Condition="$(BuildPackage) == ''">false</BuildPackage>
31+
32+
<!-- Commands -->
33+
<RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source $(PackageSources) -o "$(PackagesDir)"</RestoreCommand>
34+
<BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -p Configuration=$(Configuration) -o "$(PackageOutputDir)" -symbols</BuildCommand>
35+
36+
<!-- Make the build depend on restore packages -->
37+
<BuildDependsOn Condition="$(RestorePackages) == 'true'">
38+
RestorePackages;
39+
$(BuildDependsOn);
40+
</BuildDependsOn>
41+
42+
<!-- Make the build depend on restore packages -->
43+
<BuildDependsOn Condition="$(BuildPackage) == 'true'">
44+
$(BuildDependsOn);
45+
BuildPackage;
46+
</BuildDependsOn>
47+
</PropertyGroup>
48+
49+
<Target Name="CheckPrerequisites">
50+
<!-- Raise an error if we're unable to locate nuget.exe -->
51+
<Error Condition="!Exists('$(NuGetExePath)')" Text="Unable to locate '$(NuGetExePath)'" />
52+
</Target>
53+
54+
<Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">
55+
<Exec Command="$(RestoreCommand)"
56+
Condition="'$(OS)' != 'Windows_NT' And Exists('$(PackagesConfig)')" />
57+
58+
<Exec Command="$(RestoreCommand)"
59+
LogStandardErrorAsError="true"
60+
Condition="'$(OS)' == 'Windows_NT' And Exists('$(PackagesConfig)')" />
61+
</Target>
62+
63+
<Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites">
64+
<Exec Command="$(BuildCommand)"
65+
Condition=" '$(OS)' != 'Windows_NT' " />
66+
67+
<Exec Command="$(BuildCommand)"
68+
LogStandardErrorAsError="true"
69+
Condition=" '$(OS)' == 'Windows_NT' " />
70+
</Target>
71+
</Project>

0 commit comments

Comments
 (0)