From f1eb75aab06940561e32360819bf5105cf0a0236 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 4 Jul 2016 11:24:13 +0200 Subject: package/angularjs: drop modules selection and simplify The angular modules are very small compared to angular: ls -lahS target/var/www total 228K -rw-r--r-- 1 peko peko 142K Jul 4 16:06 angular.js -rw-r--r-- 1 peko peko 23K Jul 4 16:06 angular-animate.js -rw-r--r-- 1 peko peko 11K Jul 4 16:06 angular-message-format.js -rw-r--r-- 1 peko peko 5.9K Jul 4 16:06 angular-sanitize.js -rw-r--r-- 1 peko peko 4.3K Jul 4 16:06 angular-route.js drwxr-xr-x 2 peko peko 4.0K Jul 4 16:06 . drwxr-xr-x 5 peko peko 4.0K Jul 4 15:58 .. -rw-r--r-- 1 peko peko 3.7K Jul 4 16:06 angular-aria.js -rw-r--r-- 1 peko peko 3.6K Jul 4 16:06 angular-resource.js -rw-r--r-- 1 peko peko 3.6K Jul 4 16:06 angular-touch.js -rw-r--r-- 1 peko peko 2.6K Jul 4 16:06 angular-messages.js -rw-r--r-- 1 peko peko 1.7K Jul 4 16:06 angular-loader.js -rw-r--r-- 1 peko peko 1.4K Jul 4 16:06 angular-cookies.js So drop the suboptions and simplify the package logic. Signed-off-by: "Yann E. MORIN" Cc: Arnout Vandecappelle Cc: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/angularjs/angularjs.mk | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) (limited to 'package/angularjs/angularjs.mk') diff --git a/package/angularjs/angularjs.mk b/package/angularjs/angularjs.mk index 60dbdb6d30..08a4b60845 100644 --- a/package/angularjs/angularjs.mk +++ b/package/angularjs/angularjs.mk @@ -17,23 +17,11 @@ define ANGULARJS_EXTRACT_CMDS rmdir $(@D)/angular-$(ANGULARJS_VERSION) endef -ANGULARJS_FILES = angular - -ANGULARJS_MODULES = animate aria cookies message-format messages resource \ - route sanitize touch - -ifeq ($(BR2_ANGULARJS_MODULES),y) -ANGULARJS_FILES += $(foreach mod,$(ANGULARJS_MODULES),\ - $(if $(BR2_ANGULARJS_MODULE_$(call UPPERCASE,$(mod))),\ - angular-$(mod))) -else -ANGULARJS_FILES += $(foreach mod,$(ANGULARJS_MODULES),angular-$(mod)) -endif - +# install .min.js as .js define ANGULARJS_INSTALL_TARGET_CMDS - $(foreach f,$(ANGULARJS_FILES),\ - $(INSTALL) -m 0644 -D $(@D)/$(f).min.js \ - $(TARGET_DIR)/var/www/$(f).js$(sep)) + $(foreach f,$(notdir $(wildcard $(@D)/*.min.js)), + $(INSTALL) -m 0644 -D $(@D)/$(f) \ + $(TARGET_DIR)/var/www/$(f:.min.js=.js)$(sep)) endef $(eval $(generic-package)) -- cgit v1.2.3