Skip to content

Commit

Permalink
create a doc website and rename projects
Browse files Browse the repository at this point in the history
  • Loading branch information
rflechner committed Jul 20, 2016
1 parent fc8d8b4 commit 7e5e89b
Show file tree
Hide file tree
Showing 235 changed files with 37,745 additions and 310 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

# Suave.RestFullKit
# Suave.Swagger

Documentation: https://github.com/rflechner/Suave.RestFullKit
Documentation: https://rflechner.github.io/Suave.Swagger/#/

## Build Status

Expand Down
15 changes: 3 additions & 12 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,4 @@
### 1.0 - Unreleased
* More awesome stuff coming
* Added SourceLink for Source Indexing PDB

#### 0.5.1-beta - November 6 2013
* Improved quality of solution-wide README.md files

#### 0.5.0-beta - October 29 2013
* Improved quality of solution-wide README.md files

#### 0.0.1-beta - October 24 2013
* Changed name from fsharp-project-scaffold to FSharp.ProjectScaffold
#### 0.0.1-beta - July 20 2016
* A first tutorial
* A first DSL
* Initial release
43 changes: 30 additions & 13 deletions Suave.RestFullKit.sln → Suave.Swagger.sln
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,40 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{63297B
paket.lock = paket.lock
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{A6A6AF7D-D6E3-442D-9B1E-58CC91879BE1}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Suave.RestFullKit", "src\Suave.RestFullKit\Suave.RestFullKit.fsproj", "{EA450D1B-395E-46ED-A152-6219370A803E}"
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Suave.Swagger", "src\Suave.Swagger\Suave.Swagger.fsproj", "{EA450D1B-395E-46ED-A152-6219370A803E}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "project", "project", "{BF60BC93-E09B-4E5F-9D85-95A519479D54}"
ProjectSection(SolutionItems) = preProject
build.cmd = build.cmd
build.fsx = build.fsx
build.sh = build.sh
buildSlides.fsx = buildSlides.fsx
paket.template = paket.template
README.md = README.md
RELEASE_NOTES.md = RELEASE_NOTES.md
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{ED8079DD-2B06-4030-9F0F-DC548F98E1C4}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Suave.Swagger.Tests", "tests\Suave.Swagger.Tests\Suave.Swagger.Tests.fsproj", "{59F3A0F7-E605-4639-A1E2-6C9D534473C5}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{44CB1BFD-5012-4633-87DD-61E10D3695C9}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Suave.Swagger.PetStoreAPi", "examples\Suave.Swagger.PetStoreAPi\Suave.Swagger.PetStoreAPi.fsproj", "{92851465-0E9E-4577-A799-9E227C8A41E0}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "slides", "slides", "{2B02ED52-1738-4321-B3A5-E7C02DCEE7D9}"
ProjectSection(SolutionItems) = preProject
slides\custom.css = slides\custom.css
slides\index.fsx = slides\index.fsx
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "images", "images", "{86B411D5-ACCF-48B4-B430-9F38192B535C}"
ProjectSection(SolutionItems) = preProject
slides\images\logo.png = slides\images\logo.png
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{A6A6AF7D-D6E3-442D-9B1E-58CC91879BE1}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{83F16175-43B1-4C90-A1EE-8E351C33435D}"
ProjectSection(SolutionItems) = preProject
docs\tools\generate.fsx = docs\tools\generate.fsx
Expand All @@ -28,17 +51,10 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "content", "content", "{8E6D5255-776D-4B61-85F9-73C37AA1FB9A}"
ProjectSection(SolutionItems) = preProject
docs\content\index.fsx = docs\content\index.fsx
docs\content\rest.fsx = docs\content\rest.fsx
docs\content\tutorial.fsx = docs\content\tutorial.fsx
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{ED8079DD-2B06-4030-9F0F-DC548F98E1C4}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Suave.RestFullKit.Tests", "tests\Suave.RestFullKit.Tests\Suave.RestFullKit.Tests.fsproj", "{59F3A0F7-E605-4639-A1E2-6C9D534473C5}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{44CB1BFD-5012-4633-87DD-61E10D3695C9}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Suave.RestFullKit.PetStoreAPi", "examples\Suave.RestFullKit.PetStoreAPi\Suave.RestFullKit.PetStoreAPi.fsproj", "{92851465-0E9E-4577-A799-9E227C8A41E0}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -62,9 +78,10 @@ Global
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{83F16175-43B1-4C90-A1EE-8E351C33435D} = {A6A6AF7D-D6E3-442D-9B1E-58CC91879BE1}
{8E6D5255-776D-4B61-85F9-73C37AA1FB9A} = {A6A6AF7D-D6E3-442D-9B1E-58CC91879BE1}
{59F3A0F7-E605-4639-A1E2-6C9D534473C5} = {ED8079DD-2B06-4030-9F0F-DC548F98E1C4}
{92851465-0E9E-4577-A799-9E227C8A41E0} = {44CB1BFD-5012-4633-87DD-61E10D3695C9}
{86B411D5-ACCF-48B4-B430-9F38192B535C} = {2B02ED52-1738-4321-B3A5-E7C02DCEE7D9}
{83F16175-43B1-4C90-A1EE-8E351C33435D} = {A6A6AF7D-D6E3-442D-9B1E-58CC91879BE1}
{8E6D5255-776D-4B61-85F9-73C37AA1FB9A} = {A6A6AF7D-D6E3-442D-9B1E-58CC91879BE1}
EndGlobalSection
EndGlobal
4 changes: 0 additions & 4 deletions build.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,4 @@ if errorlevel 1 (
exit /b %errorlevel%
)

IF NOT EXIST build.fsx (
.paket\paket.exe update
packages\build\FAKE\tools\FAKE.exe init.fsx
)
packages\build\FAKE\tools\FAKE.exe build.fsx %*
13 changes: 9 additions & 4 deletions build.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ open SourceLink

// The name of the project
// (used by attributes in AssemblyInfo, name of a NuGet package and directory in 'src')
let project = "Suave.RestFullKit"
let project = "Suave.Swagger"

// Short summary of the project
// (used as description in AssemblyInfo and as a short summary for NuGet package)
Expand All @@ -45,7 +45,7 @@ let authors = [ "rflechner" ]
let tags = "suave fsharp swagger"

// File system information
let solutionFile = "Suave.RestFullKit.sln"
let solutionFile = "Suave.Swagger.sln"

// Pattern specifying assemblies to be tested using NUnit
let testAssemblies = "tests/**/bin/Release/*Tests*.dll"
Expand All @@ -56,7 +56,7 @@ let gitOwner = "rflechner"
let gitHome = "https://github.com/" + gitOwner

// The name of the project on GitHub
let gitName = "Suave.RestFullKit"
let gitName = "Suave.Swagger"

// The url for the raw files hosted
let gitRaw = environVarOrDefault "gitRaw" "https://raw.github.com/rflechner"
Expand Down Expand Up @@ -177,12 +177,16 @@ Target "NuGet" (fun _ ->
{ p with
OutputPath = "bin"
Version = release.NugetVersion
TemplateFile = "paket.template"
ReleaseNotes = toLines release.Notes})
)

Target "PublishNuget" (fun _ ->
let nugetkey = Environment.GetEnvironmentVariable "nugetkey"
Paket.Push(fun p ->
{ p with
PublishUrl = "https://www.myget.org/F/romcyber/api/v2/package"
ApiKey = nugetkey
WorkingDir = "bin" })
)

Expand Down Expand Up @@ -377,6 +381,7 @@ Target "All" DoNothing
==> "Build"
==> "CopyBinaries"
==> "RunTests"
==> "NuGet"
==> "GenerateReferenceDocs"
==> "GenerateDocs"
==> "All"
Expand All @@ -387,7 +392,7 @@ Target "All" DoNothing
#else
=?> ("SourceLink", Pdbstr.tryFind().IsSome )
#endif
==> "NuGet"
// ==> "NuGet"
==> "BuildPackage"

"CleanDocs"
Expand Down
94 changes: 25 additions & 69 deletions build.sh
Original file line number Diff line number Diff line change
@@ -1,77 +1,33 @@
#!/usr/bin/env bash

set -eu

cd `dirname $0`

PAKET_BOOTSTRAPPER_EXE=.paket/paket.bootstrapper.exe
PAKET_EXE=.paket/paket.exe
FAKE_EXE=packages/build/FAKE/tools/FAKE.exe

FSIARGS=""
FSIARGS2=""
OS=${OS:-"unknown"}
if [ "$OS" != "Windows_NT" ]
#!/bin/bash
if test "$OS" = "Windows_NT"
then
# Can't use FSIARGS="--fsiargs -d:MONO" in zsh, so split it up
# (Can't use arrays since dash can't handle them)
FSIARGS="--fsiargs"
FSIARGS2="-d:MONO"
fi
# use .Net

run() {
if [ "$OS" != "Windows_NT" ]
then
mono "$@"
else
"$@"
.paket/paket.bootstrapper.exe
exit_code=$?
if [ $exit_code -ne 0 ]; then
exit $exit_code
fi
}

yesno() {
# NOTE: Defaults to NO
read -p "$1 [y/N] " ynresult
case "$ynresult" in
[yY]*) true ;;
*) false ;;
esac
}
.paket/paket.exe restore
exit_code=$?
if [ $exit_code -ne 0 ]; then
exit $exit_code
fi

set +e
run $PAKET_BOOTSTRAPPER_EXE
bootstrapper_exitcode=$?
set -e
packages/FAKE/tools/FAKE.exe $@ --fsiargs -d:MONO build.fsx
else
# use mono
mono .paket/paket.bootstrapper.exe
exit_code=$?
if [ $exit_code -ne 0 ]; then
exit $exit_code
fi

if [ "$OS" != "Windows_NT" ] &&
[ $bootstrapper_exitcode -ne 0 ] &&
[ $(certmgr -list -c Trust | grep X.509 | wc -l) -le 1 ] &&
[ $(certmgr -list -c -m Trust | grep X.509 | wc -l) -le 1 ]
then
echo "Your Mono installation has no trusted SSL root certificates set up."
echo "This may result in the Paket bootstrapper failing to download Paket"
echo "because Github's SSL certificate can't be verified. One way to fix"
echo "this issue would be to download the list of SSL root certificates"
echo "from the Mozilla project by running the following command:"
echo ""
echo " mozroots --import --sync"
echo ""
echo "This will import over 100 SSL root certificates into your Mono"
echo "certificate repository."
echo ""
if yesno "Run 'mozroots --import --sync' now?"
then
mozroots --import --sync
else
echo "Attempting to continue without running mozroots. This might fail."
mono .paket/paket.exe restore
exit_code=$?
if [ $exit_code -ne 0 ]; then
exit $exit_code
fi
# Re-run bootstrapper whether or not the user ran mozroots, because maybe
# they fixed the problem in a separate terminal window.
run $PAKET_BOOTSTRAPPER_EXE
mono packages/FAKE/tools/FAKE.exe $@ --fsiargs -d:MONO build.fsx
fi

run $PAKET_EXE restore

[ ! -e build.fsx ] && run $PAKET_EXE update
[ ! -e build.fsx ] && run $FAKE_EXE init.fsx
run $FAKE_EXE "$@" $FSIARGS $FSIARGS2 build.fsx

Loading

0 comments on commit 7e5e89b

Please sign in to comment.