Koldun/mapserver
1
0
Fork 0
forked from MTSR/mapserver
Code Pull Requests Activity

rollup in the relase build

Browse Source
This commit is contained in:
NatureFreshMilk 2019-09-19 11:51:55 +02:00
parent ddf90b174a
commit e98eabb554
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -15,6 +15,7 @@ BINARIES += $(OUT_DIR)/mapserver-windows-x86.exe
BINARIES += $(OUT_DIR)/mapserver-windows-x86-64.exe BINARIES += $(OUT_DIR)/mapserver-windows-x86-64.exe
BINARIES += $(OUT_DIR)/mapserver-linux-arm BINARIES += $(OUT_DIR)/mapserver-linux-arm
JS_BUNDLE = static/js/bundle.js
all: $(STATIC_VFS) all: $(STATIC_VFS)
go build go build
@ -32,13 +33,16 @@ test: $(OUT_DIR)
$(ENV) go test ./... $(ENV) go test ./...
clean: clean:
rm -rf $(STATIC_VFS) test-output rm -rf $(STATIC_VFS) $(JS_BUNDLE) test-output
rm -rf $(OUT_DIR) rm -rf $(OUT_DIR)
jshint: jshint:
jshint static/js/*.js static/js/components static/js/map static/js/util jshint static/js/*.js static/js/components static/js/map static/js/util
$(STATIC_VFS): $(JS_BUNDLE):
cd static/js && rollup -c rollup.config.js
$(STATIC_VFS): $(JS_BUNDLE)
go generate go generate
$(OUT_DIR)/mapserver-linux-x86_64: $(OUT_DIR) $(OUT_DIR)/mapserver-linux-x86_64: $(OUT_DIR)

3
docker_builder/Dockerfile
View File

@ -17,3 +17,6 @@ RUN luarocks install luacheck
# jshint # jshint
RUN apt-get install -y nodejs npm RUN apt-get install -y nodejs npm
RUN npm install -g jshint RUN npm install -g jshint
# rollup
RUN npm install -g rollup

2
static/js/rollup.config.js
View File

@ -1,5 +1,5 @@
module.exports = { export default {
input: 'main.js', input: 'main.js',
output: { output: {
file :'bundle.js', file :'bundle.js',