Skip to content

Commit

Permalink
Fix release and remove fileToBolt utility
Browse files Browse the repository at this point in the history
  • Loading branch information
Charles-Antoine Mathieu committed Oct 19, 2017
1 parent 9ff6861 commit ee6a6e1
Show file tree
Hide file tree
Showing 67 changed files with 3 additions and 10,145 deletions.
29 changes: 3 additions & 26 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -79,26 +79,6 @@ servers: frontend
$(build) -o $$SERVER_PATH ; \
done


###
# Build plik utils for all architectures
###
utils: servers
@cd utils && for util in `ls *.go` ; do \
for target in $(RELEASE_TARGETS) ; do \
UTIL_DIR=../servers/$$target/utils; \
UTIL_BASE=`basename $$util .go`; \
UTIL_PATH=$$UTIL_DIR/$$UTIL_BASE; \
mkdir -p $$UTIL_DIR; \
export GOOS=`echo $$target | cut -d "-" -f 1`; \
if [ $$GOOS = "windows" ] ; then UTIL_PATH=$$UTIL_DIR/$$UTIL_BASE.exe ; fi ; \
if [ -e $$UTIL_PATH ] ; then continue ; fi ; \
echo "Compiling plik util file2bolt for $$target to $$UTIL_PATH"; \
$(build) -o $$UTIL_PATH $$util ; \
done ; \
done


###
# Build plik client for the current architecture
###
Expand Down Expand Up @@ -126,9 +106,9 @@ clients:
done
@mkdir -p clients/bash && cp client/plik.sh clients/bash

##
###
# Build docker
##
###
docker: release
@cp Dockerfile $(RELEASE_DIR)
@cd $(RELEASE_DIR) && docker build -t rootgg/plik .
Expand Down Expand Up @@ -189,7 +169,6 @@ debs-client: clients
###
release-template: clean frontend clients
@mkdir -p $(RELEASE_DIR)/server/public
@mkdir -p $(RELEASE_DIR)/server/utils

@cp -R clients $(RELEASE_DIR)
@cp -R changelog $(RELEASE_DIR)
Expand All @@ -215,21 +194,19 @@ release: release-template server
###
# Build release archives for all architectures
###
releases: release-template servers utils
releases: release-template servers

@mkdir -p releases

@cd release && for target in $(RELEASE_TARGETS) ; do \
SERVER_PATH=../servers/$$target/plikd; \
UTIL_DIR=../servers/$$target/utils; \
OS=`echo $$target | cut -d "-" -f 1`; \
ARCH=`echo $$target | cut -d "-" -f 2`; \
if [ $$OS = "darwin" ] ; then OS="macos" ; fi ; \
if [ $$OS = "windows" ] ; then SERVER_PATH=../servers/$$target/plikd.exe ; fi ; \
if [ $$ARCH = "386" ] ; then ARCH="32bits" ; fi ; \
if [ $$ARCH = "amd64" ] ; then ARCH="64bits" ; fi ; \
cp -R $$SERVER_PATH plik-$(RELEASE_VERSION)/server; \
cp -R $$UTIL_DIR plik-$(RELEASE_VERSION)/server; \
if [ $$OS = "windows" ] ; then \
TARBALL_NAME=plik-$(RELEASE_VERSION)-$$OS-$$ARCH.zip; \
echo "Packaging plik release for $$target to $$TARBALL_NAME"; \
Expand Down
113 changes: 0 additions & 113 deletions utils/file2bolt.go

This file was deleted.

3 changes: 0 additions & 3 deletions utils/get_releases.sh

This file was deleted.

3 changes: 0 additions & 3 deletions utils/vendor/github.com/BurntSushi/toml/COMPATIBLE

This file was deleted.

14 changes: 0 additions & 14 deletions utils/vendor/github.com/BurntSushi/toml/COPYING

This file was deleted.

19 changes: 0 additions & 19 deletions utils/vendor/github.com/BurntSushi/toml/Makefile

This file was deleted.

Loading

0 comments on commit ee6a6e1

Please sign in to comment.