Merge branch 'develop'

Adding forgotten grunt task to make file: template
@companje This would add build info, create main.js.out which was used in later concat tasks. Without this task the final code would lack the main.js code.
2017-06-23 12:36:16 +02:00 · 2017-06-23 12:28:35 +02:00
1 changed files with 2 additions and 2 deletions
--- a/4
+++ b/4
@ -48,9 +48,9 @@ define Build/Compile
 	# grunt can access git info
 	npm install
 ifeq ($(CONFIG_DOODLE3D_CLIENT_MINIFY_JS),y)
-	grunt gitinfo less autoprefixer cssmin concat uglify
+	grunt gitinfo template less autoprefixer cssmin concat uglify
 else
-	grunt gitinfo less autoprefixer cssmin concat
+	grunt gitinfo template less autoprefixer cssmin concat
 endif
 	# Copy compiled files to build dir
 	$(CP) www $(PKG_BUILD_DIR)/
Author	SHA1	Message	Date
peteruithoven	f8032d7411	Merge branch 'develop'	2017-06-23 12:36:16 +02:00
peteruithoven	2acb06c3ed	Adding forgotten grunt task to make file: template @companje This would add build info, create main.js.out which was used in later concat tasks. Without this task the final code would lack the main.js code.	2017-06-23 12:28:35 +02:00