Skip to content

Commit

Permalink
Merge pull request #27 from kshvmdn/develop
Browse files Browse the repository at this point in the history
Add subqueries, attribute modifiers & interactive mode
  • Loading branch information
kashav authored Jun 4, 2017
2 parents c2d6173 + 5d60e0e commit 09ea293
Show file tree
Hide file tree
Showing 47 changed files with 3,572 additions and 1,058 deletions.
10 changes: 9 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,14 @@ vendor/
# Project-local glide cache, RE: https://github.com/Masterminds/glide/issues/736
.glide/

# Compiled executables
# Compiled binaries
fsql
debug
main
build/

# Allow cmd/fsql
!cmd/fsql

# Editor workspace directories
.vscode
14 changes: 14 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
language: go
go:
- 1.8
os:
- linux
- osx
matrix:
fast_finish: true
install:
- go get -u -v github.com/kshvmdn/fsql/...
before_script:
- go vet -v ./...
script:
- go test -v ./...
48 changes: 29 additions & 19 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,30 +1,47 @@
name := fsql
sources := $(wildcard **/*.go)
sources := $(wildcard *.go **/*.go)

build = GOOS=$(1) GOARCH=$(2) go build -o build/$(name)$(3)
build = GOOS=$(1) GOARCH=$(2) go build -o build/$(name)$(3) ./cmd/fsql
tar = cd build && tar -cvzf $(1)_$(2).tar.gz $(name)$(3) && rm $(name)$(3)
zip = cd build && zip $(1)_$(2).zip $(name)$(3) && rm $(name)$(3)

.PHONY: fsql build clean install lint

all: fsql

build: darwin linux windows

fsql: $(sources)
go build -o ./$(name) -v .

.PHONY: clean
clean:
rm -rf ./$(name) build/

lint:
${GOPATH}/bin/golint . query compare
.PHONY: fmt
fmt:
go fmt ./...

fsql: $(sources)
go build -o ./$(name) -v ./cmd/fsql

.PHONY: install
install:
go get -u -v
go get -u -v ./...

test: fsql
go test
.PHONY: lint
lint:
${GOPATH}/bin/golint ./...

.PHONY: test
test:
go test -v ./...

.PHONY: vet
vet:
go vet -v ./...

##### DARWIN BUILDS #####
darwin: build/darwin_amd64.tar.gz

build/darwin_amd64.tar.gz: $(sources)
$(call build,darwin,amd64,)
$(call tar,darwin,amd64)

##### LINUX BUILDS #####
linux: build/linux_arm.tar.gz build/linux_arm64.tar.gz build/linux_386.tar.gz build/linux_amd64.tar.gz
Expand All @@ -45,13 +62,6 @@ build/linux_arm64.tar.gz: $(sources)
$(call build,linux,arm64,)
$(call tar,linux,arm64)

##### DARWIN BUILDS #####
darwin: build/darwin_amd64.tar.gz

build/darwin_amd64.tar.gz: $(sources)
$(call build,darwin,amd64,)
$(call tar,darwin,amd64)

##### WINDOWS BUILDS #####
windows: build/windows_386.zip build/windows_amd64.zip

Expand Down
Loading

0 comments on commit 09ea293

Please sign in to comment.