Code Review
/
src
/
xds
/
xds-agent.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fixed webapp build error in prod mode
[src/xds/xds-agent.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
0f19a24
..
dc185a7
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,5
+1,5
@@
###########################################################################
###########################################################################
-# Copyright 2017 IoT.bzh
+# Copyright 2017
-2018
IoT.bzh
#
# author: Sebastien Douheret <sebastien@iot.bzh>
#
#
# author: Sebastien Douheret <sebastien@iot.bzh>
#
@@
-49,7
+49,7
@@
endif
HOST_GOOS=$(shell go env GOOS)
HOST_GOARCH=$(shell go env GOARCH)
ARCH=$(HOST_GOOS)-$(HOST_GOARCH)
HOST_GOOS=$(shell go env GOOS)
HOST_GOARCH=$(shell go env GOARCH)
ARCH=$(HOST_GOOS)-$(HOST_GOARCH)
-REPOPATH=g
ithub.com/iotbzh
/$(TARGET)
+REPOPATH=g
errit.automotivelinux.org/gerrit/src/xds
/$(TARGET)
EXT=
ifeq ($(HOST_GOOS), windows)
EXT=
ifeq ($(HOST_GOOS), windows)
@@
-58,7
+58,7
@@
endif
mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
ROOT_SRCDIR := $(patsubst %/,%,$(dir $(mkfile_path)))
mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
ROOT_SRCDIR := $(patsubst %/,%,$(dir $(mkfile_path)))
-ROOT_GOPRJ := $(abspath $(ROOT_SRCDIR)/../../../..)
+ROOT_GOPRJ := $(abspath $(ROOT_SRCDIR)/../../../..
/../..
)
LOCAL_BINDIR := $(ROOT_SRCDIR)/bin
LOCAL_TOOLSDIR := $(ROOT_SRCDIR)/tools/${HOST_GOOS}
PACKAGE_DIR := $(ROOT_SRCDIR)/package
LOCAL_BINDIR := $(ROOT_SRCDIR)/bin
LOCAL_TOOLSDIR := $(ROOT_SRCDIR)/tools/${HOST_GOOS}
PACKAGE_DIR := $(ROOT_SRCDIR)/package
@@
-95,7
+95,10
@@
endif
ifeq ($(SUB_VERSION), )
PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-$(VERSION).zip
else
ifeq ($(SUB_VERSION), )
PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-$(VERSION).zip
else
- PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-$(VERSION)_$(SUB_VERSION).zip
+ # only use dot as separator to allow rpm packaging (see version .spec file)
+ PK_VER := $(subst _,.,$(subst -,,$(VERSION)))
+ PK_SBVER := $(subst _,.,$(subst -,,$(SUB_VERSION)))
+ PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-$(PK_VER).$(PK_SBVER).zip
endif
endif
@@
-129,16
+132,24
@@
clean:
.PHONY: distclean
distclean: clean
.PHONY: distclean
distclean: clean
- cd $(ROOT_SRCDIR) && rm -rf $(LOCAL_BINDIR) ./tools ./glide.lock ./vendor ./*.zip ./webapp/node_modules ./webapp/dist
+ (cd $(ROOT_SRCDIR) && rm -rf $(LOCAL_BINDIR) ./tools ./glide.lock ./vendor ./*.zip ./webapp/dist ./webapp/node_modules)
webapp: webapp/install
webapp: webapp/install
+ifneq ($(SKIP_WEBAPP_BUILD), true)
cd webapp && npm run $(WEBAPP_BUILD_RULE)
cd webapp && npm run $(WEBAPP_BUILD_RULE)
+else
+ @echo "Skipping webapp build (SKIP_WEBAPP_BUILD var is set)"
+endif
webapp/debug:
cd webapp && npm run watch
webapp/install:
webapp/debug:
cd webapp && npm run watch
webapp/install:
+ifneq ($(SKIP_WEBAPP_BUILD), true)
(cd webapp && npm install)
(cd webapp && npm install)
+else
+ @echo "Skipping webapp install (SKIP_WEBAPP_BUILD var is set)"
+endif
@if [ -d ${DESTDIR}/usr/local/etc ]; then rm -rf ${DESTDIR}/usr; fi
.PHONY: install
@if [ -d ${DESTDIR}/usr/local/etc ]; then rm -rf ${DESTDIR}/usr; fi
.PHONY: install
@@
-167,25
+178,25
@@
package-all:
@echo "# Build linux amd64..."
GOOS=linux GOARCH=amd64 RELEASE=1 make -f $(ROOT_SRCDIR)/Makefile package
@echo "# Build windows amd64..."
@echo "# Build linux amd64..."
GOOS=linux GOARCH=amd64 RELEASE=1 make -f $(ROOT_SRCDIR)/Makefile package
@echo "# Build windows amd64..."
- GOOS=windows GOARCH=amd64 RELEASE=1 make -f $(ROOT_SRCDIR)/Makefile package
+ GOOS=windows GOARCH=amd64 RELEASE=1
SKIP_WEBAPP_BUILD=true
make -f $(ROOT_SRCDIR)/Makefile package
@echo "# Build darwin amd64..."
@echo "# Build darwin amd64..."
- GOOS=darwin GOARCH=amd64 RELEASE=1 make -f $(ROOT_SRCDIR)/Makefile package
+ GOOS=darwin GOARCH=amd64 RELEASE=1
SKIP_WEBAPP_BUILD=true
make -f $(ROOT_SRCDIR)/Makefile package
make -f $(ROOT_SRCDIR)/Makefile clean
vendor: tools/glide glide.yaml
$(LOCAL_TOOLSDIR)/glide install --strip-vendor
vendor/debug: vendor
make -f $(ROOT_SRCDIR)/Makefile clean
vendor: tools/glide glide.yaml
$(LOCAL_TOOLSDIR)/glide install --strip-vendor
vendor/debug: vendor
- (cd vendor/g
ithub.com/iotbzh
&& \
- rm -rf xds-common
&& ln -s ../../../../xds-common
&& \
- rm -rf xds-server
&& ln -s ../../../../xds-server
)
+ (cd vendor/g
errit.automotivelinux.org/gerrit/src/xds
&& \
+ rm -rf xds-common
.git && ln -s ../../../../../../xds-common xds-common.git
&& \
+ rm -rf xds-server
.git && ln -s ../../../../../../xds-server xds-server.git
)
.PHONY: tools/glide
tools/glide:
@test -f $(LOCAL_TOOLSDIR)/glide || { \
echo "Downloading glide"; \
mkdir -p $(LOCAL_TOOLSDIR); \
.PHONY: tools/glide
tools/glide:
@test -f $(LOCAL_TOOLSDIR)/glide || { \
echo "Downloading glide"; \
mkdir -p $(LOCAL_TOOLSDIR); \
- curl --silent -L https://glide.sh/get | GOBIN=$(LOCAL_TOOLSDIR) sh; \
+ curl --silent -
-connect-timeout 60 --retry 3 -
L https://glide.sh/get | GOBIN=$(LOCAL_TOOLSDIR) sh; \
}
.PHONY: tools/syncthing
}
.PHONY: tools/syncthing
@@
-211,7
+222,7
@@
checkgover:
.PHONY: help
help:
@echo "Main supported rules:"
.PHONY: help
help:
@echo "Main supported rules:"
- @echo " all (default)"
+ @echo " all
(default)"
@echo " build"
@echo " package"
@echo " install"
@echo " build"
@echo " package"
@echo " install"