Skip to content
This repository has been archived by the owner on May 14, 2024. It is now read-only.

Commit

Permalink
0.3.2
Browse files Browse the repository at this point in the history
Updated GJSON/SJSON vendor libraries.
Moved build.sh to resources directory.
  • Loading branch information
tidwall committed Nov 6, 2016
1 parent e92f879 commit 1964ac8
Show file tree
Hide file tree
Showing 9 changed files with 515 additions and 89 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## [0.3.2] - 2016-10-17
### Added
- JSET, JGET, JDEL commands for working with JSON documents.

### Changed
- Moved build.sh into resources direction to avoid confusion about
which to use: build.sh or make.
- Updated GJSON/SJSON vendored libraries.

## [0.2.2] - 2016-10-17
### Added
- Added BACKUP command
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
all:
@./build.sh
@resources/build.sh
clean:
@rm -f summitdb-server
@rm -rf redis-3.2.4
Expand All @@ -20,4 +20,4 @@ redis-cli:
cd .. && \
rm -rf redis-3.2.4
package:
@NOCOPY=1 ./build.sh package
@NOCOPY=1 resources/build.sh package
6 changes: 3 additions & 3 deletions build.sh → resources/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ PROTECTED_MODE="no"

export GO15VENDOREXPERIMENT=1

cd $(dirname "${BASH_SOURCE[0]}")
cd $(dirname "${BASH_SOURCE[0]}")/../
OD="$(pwd)"

# temp directory for storing isolated environment.
Expand Down Expand Up @@ -34,13 +34,13 @@ package(){
echo Packaging $1 Binary
bdir=summitdb-${VERSION}-$2-$3
rm -rf packages/$bdir && mkdir -p packages/$bdir
GOOS=$2 GOARCH=$3 ./build.sh
GOOS=$2 GOARCH=$3 ${BASH_SOURCE[0]} # ./build.sh
if [ "$2" == "windows" ]; then
mv summitdb-server packages/$bdir/summitdb-server.exe
else
mv summitdb-server packages/$bdir
fi
cp README.md packages/$bdir
cp README.md LICENSE CHANGELOG.md packages/$bdir
cd packages
if [ "$2" == "linux" ]; then
tar -zcf $bdir.tar.gz $bdir
Expand Down
30 changes: 26 additions & 4 deletions vendor/github.com/tidwall/gjson/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 25 additions & 4 deletions vendor/github.com/tidwall/gjson/gjson.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

39 changes: 31 additions & 8 deletions vendor/github.com/tidwall/gjson/gjson_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions vendor/github.com/tidwall/sjson/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 1964ac8

Please sign in to comment.