diff --git a/usp-js/Makefile b/usp-js/Makefile index c52f61e29..b3458168d 100644 --- a/usp-js/Makefile +++ b/usp-js/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=usp-js -PKG_VERSION:=0.0.1 +PKG_VERSION:=1.0.0 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/usp-js.git @@ -17,26 +17,54 @@ PKG_MIRROR_HASH:=skip PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=LICENSE +PKG_BUILD_DEPENDS:=node-yarn/host include $(INCLUDE_DIR)/package.mk -define Package/usp-js +define Package/usp-js/default SECTION:=libs CATEGORY:=Libraries TITLE:=A JS library for USP(TR369) protocol - DEPENDS:=+quickjs +quickjs-websocket endef define Package/usp-js/description A JS library to provide USP(TR369) protocol functionality for an usp controller. endef -define Build/Compile - cd $(PKG_BUILD_DIR) && npm install @types/node --save-dev && yarn qjs +define Package/usp-js-quickjs + $(Package/usp-js/default) + TITLE += (QuickJS) + DEPENDS:=+quickjs +quickjs-websocket + VARIANT:=quickjs + DEFAULT_VARIANT:=1 endef -define Package/usp-js/install +define Package/usp-js-nodejs + $(Package/usp-js/default) + TITLE += (NodeJS) + DEPENDS:=+node + VARIANT:=nodejs +endef + +ifeq ($(BUILD_VARIANT),nodejs) +define Build/Compile + cd $(PKG_BUILD_DIR) && yarn install && yarn build +endef +else +define Build/Compile + cd $(PKG_BUILD_DIR) && yarn install && yarn qjs +endef +endif + +define Package/usp-js-quickjs/install $(INSTALL_DIR) $(1)/usr/lib/usp-js $(CP) $(PKG_BUILD_DIR)/qjs/* $(1)/usr/lib/usp-js/ endef -$(eval $(call BuildPackage,usp-js)) +define Package/usp-js-nodejs/install + $(INSTALL_DIR) $(1)/usr/lib/node_modules/usp-js + $(CP) $(PKG_BUILD_DIR)/node/* $(1)/usr/lib/node_modules/usp-js/ + $(CP) $(PKG_BUILD_DIR)/node_modules $(1)/usr/lib/usp-js/ +endef + +$(eval $(call BuildPackage,usp-js-nodejs)) +$(eval $(call BuildPackage,usp-js-quickjs))