Merge pull request src-d#148 from camathieu/1.2-alpha5

1.2 RC1

Author: bodji

.gitignore

@@ -12,11 +12,12 @@ server/common/version.go
 release
 releases
 debs
-plik_*.cfg
+plikd_*.cfg
 *bower_components
 *node_modules
 *.log
-
+*.key
+*.crt
 # IntelliJ IDEA
 .idea
 plik.iml

.travis.yml

@@ -1,12 +1,13 @@
 language: go
 
 go:
-  - 1.5.1
+  - 1.5.2
 
 before_install:
   - npm install -g bower
 
-before_script: 
-  - make client
-  - make server
-  - cd server
+before_script:
+  - go get -u github.com/golang/lint/golint
+
+script:
+  - make test && make

Dockerfile

@@ -17,7 +17,7 @@ RUN useradd -U -d /home/plik -m -s /bin/false plik
 # Expose the plik port
 EXPOSE 8080
 
-# Copy plik 
+# Copy plik
 ADD server /home/plik/server/
 ADD clients /home/plik/clients/
 RUN chown -R plik:plik /home/plik

Makefile

@@ -24,7 +24,7 @@
 # THE SOFTWARE.
 ###
 
-RELEASE_VERSION="1.1"
+RELEASE_VERSION="1.2-RC1"
 RELEASE_DIR="release/plik-$(RELEASE_VERSION)"
 RELEASE_TARGETS=darwin-386 darwin-amd64 freebsd-386 \
 freebsd-amd64 linux-386 linux-amd64 linux-arm openbsd-386 \
@@ -36,15 +36,15 @@ GOHOSTARCH=`go env GOHOSTARCH`
 DEBROOT_SERVER=debs/server
 DEBROOT_CLIENT=debs/client
 
-all: clean frontend clients server
+all: clean clean-frontend frontend clients server
 
 ###
 # Build frontend ressources
 ###
 frontend:
 	@if [ ! -d server/public/node_modules ]; then cd server/public && npm install ; fi
 	@if [ ! -d server/public/bower_components ]; then cd server/public && node_modules/bower/bin/bower install --allow-root ; fi
-	@if [ ! -d server/public/public ]; then cd server/public && node_modules/grunt-cli/bin/grunt ; fi ;
+	@if [ ! -d server/public/public ]; then cd server/public && node_modules/grunt-cli/bin/grunt ; fi
 
 
 ###
@@ -102,7 +102,7 @@ clients:
 ##
 docker: release
 	@cp Dockerfile $(RELEASE_DIR)
-	@cd $(RELEASE_DIR) && docker build -t plik .
+	@cd $(RELEASE_DIR) && docker build -t rootgg/plik .
 
 ###
 # Make server and clients Debian packages
@@ -238,13 +238,18 @@ test:
 	done ; if [ "$$ERR" = "1" ] ; then exit 1 ; fi
 	@echo "cli client integration tests :\n" && cd client && ./test.sh
 
+###
+# Remove frontend build files
+###
+clean-frontend:
+	@rm -rf server/public/bower_components
+	@rm -rf server/public/public
+
 ###
 # Remove all build files
 ###
 clean:
 	@rm -rf server/common/version.go
-	@rm -rf server/public/bower_components
-	@rm -rf server/public/public
 	@rm -rf server/plikd
 	@rm -rf client/plik
 	@rm -rf clients
@@ -253,6 +258,11 @@ clean:
 	@rm -rf release
 	@rm -rf releases
 
+###
+# Remove all build files and node modules
+###
+clean-all: clean
+	@rm -rf server/public/node_modules
 
 ###
 # Since the client/server directories are not generated