Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/xanilla #8

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file modified CHANGELOG.md
100644 → 100755
Empty file.
66 changes: 0 additions & 66 deletions Generate/Template.swift

This file was deleted.

60 changes: 0 additions & 60 deletions Generate/main.swift

This file was deleted.

Empty file modified LICENSE
100644 → 100755
Empty file.
32 changes: 5 additions & 27 deletions Makefile
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,15 @@ SWIFTC=swiftc

ifeq ($(shell uname -s), Darwin)
XCODE=$(shell xcode-select -p)
SDK=$(XCODE)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk
TARGET=x86_64-apple-macosx10.10
SDK=$(XCODE)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk
TARGET=x86_64-apple-macosx10.14
SWIFTC=swiftc -target $(TARGET) -sdk $(SDK) -Xlinker -all_load
endif

LIBS=Frank Curassow Commander Inquiline Nest
TEST_LIBS=$(LIBS) Spectre
GENERATE_LIBS=$(LIBS) PathKit Stencil
LIBS=Curassow Inquiline Nest

SWIFT_ARGS=$(foreach lib,$(LIBS),-Xlinker .build/debug/$(lib).a)
TEST_SWIFT_ARGS=$(foreach lib,$(TEST_LIBS),-Xlinker .build/debug/$(lib).a)
GENERATE_SWIFT_ARGS=$(foreach lib,$(GENERATE_LIBS),-Xlinker .build/debug/$(lib).a)

frank:
@echo "Building Frank"
Xanilla:
@echo "Building Xanilla"
@swift build

test: frank
@.build/debug/spectre-build

example: frank
@$(SWIFTC) -o example/example \
example/example.swift \
-I.build/debug \
$(SWIFT_ARGS)

generator: frank
@$(SWIFTC) -o Generate/generator \
Generate/main.swift \
-I.build/debug \
$(GENERATE_SWIFT_ARGS)

generate: generator
Generate/generator
61 changes: 61 additions & 0 deletions Package.resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
{
"object": {
"pins": [
{
"package": "Commander",
"repositoryURL": "https://github.com/kylef/Commander.git",
"state": {
"branch": null,
"revision": "4c320a3507d621d27f89514eb576664becfee643",
"version": "0.6.1"
}
},
{
"package": "Curassow",
"repositoryURL": "https://github.com/starplayr/Curassow.git",
"state": {
"branch": null,
"revision": "dd8a376316b31b4c2e14b256fdfd4cc27464c973",
"version": "0.6.1"
}
},
{
"package": "fd",
"repositoryURL": "https://github.com/kylef/fd.git",
"state": {
"branch": null,
"revision": "dfba099fcc4c6f16979f1de4b4f3387da66170c2",
"version": "0.2.2"
}
},
{
"package": "Inquiline",
"repositoryURL": "https://github.com/starplayr/Inquiline.git",
"state": {
"branch": null,
"revision": "3b507f7f7a1b916e57408e3c93f3df2749cbfe02",
"version": "0.4.0"
}
},
{
"package": "Nest",
"repositoryURL": "https://github.com/nestproject/Nest.git",
"state": {
"branch": null,
"revision": "0ff8ca36dfe6c4b0b8043cd100da8da56cbcf334",
"version": "0.4.0"
}
},
{
"package": "Spectre",
"repositoryURL": "https://github.com/kylef/Spectre.git",
"state": {
"branch": null,
"revision": "e46b75cf03ad5e563b4b0a5068d3d6f04d77d80b",
"version": "0.7.2"
}
}
]
},
"version": 1
}
2 changes: 1 addition & 1 deletion Package.swift
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import PackageDescription


let package = Package(
name: "Frank",
name: "Xanilla",
dependencies: [
.Package(url: "https://github.com/nestproject/Nest.git", majorVersion: 0, minor: 4),
.Package(url: "https://github.com/nestproject/Inquiline.git", majorVersion: 0, minor: 4),
Expand Down
8 changes: 4 additions & 4 deletions README.md
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# Frank
# Xanilla is a fork of Frank

Frank is a DSL for quickly writing web applications in Swift with type-safe
path routing.
Xanilla is a Swift based SiriusXM Radio backend for StarPlayrX Radio client. The backend can also run standalone from StarPlayr. It is loosely based on SXM.py. The goal is a 100% Swift embedded or external web server for personal use.

This API is unfinished. As its updated it will be pushed. We are in the process of upgrading the Swift 3.x code in Frank's depnedencies as Swift 3.x will be removed soon from macOS Systems. We have hopes to bring this emdedded web server to iOS clients or at the very least have an API that an iOS client could access externally.

##### `Sources/main.swift`

```swift
import Frank

// Handle GET requests to path /
get { request in
Expand Down
Binary file added Reference Files/Xanilla.pdf
Binary file not shown.
Loading