From 6caf8db442502d925a66acfb753587738085c749 Mon Sep 17 00:00:00 2001 From: Youmin Ha Date: Fri, 29 Mar 2013 16:09:26 +0900 Subject: [PATCH] Revert "build: Fix node path to get from shell" This reverts commit 3312c3cdf32f8033b82d4d305c7113956731ed52. --- Makefile | 7 +++---- packaging/web-ui-fw.spec | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 2f20fc4..a0d124a 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,6 @@ PKG_VERSION = $(shell cat packaging/web-ui-fw.spec | grep Version: | sed -e "s@V THEME_NAME = default PATH := $(CURDIR)/build-tools/bin:$(PATH) -NODE = $(shell which node) JSLINT_LEVEL = 1 JSLINT = jslint --sloppy --eqeq --bitwise --forin --nomen --predef jQuery --color --plusplus --browser --jqmspace --regexp --continue @@ -105,7 +104,7 @@ js: init third_party # Building JS files... mkdir -p ${JS_LIB_OUTPUT_DIR}; \ cp -a ${JS_DIR}/* ${JS_LIB_OUTPUT_DIR}/; \ - ${NODE} $(CURDIR)/tools/moduledep.js -c ${JS_LIB_OUTPUT_DIR} > ${JS_LIB_OUTPUT_DIR}/../depData.json; \ + /usr/bin/node $(CURDIR)/tools/moduledep.js -c ${JS_LIB_OUTPUT_DIR} > ${JS_LIB_OUTPUT_DIR}/../depData.json; \ find ${JS_LIB_OUTPUT_DIR} -iname '*.js' | sort | \ while read JSFILE; do \ echo " # Building $$JSFILE"; \ @@ -125,9 +124,9 @@ js: init third_party echo " $$f"; \ fi; \ done; \ - ${NODE} $(CURDIR)/tools/moduledep.js -d ${JS_LIB_OUTPUT_DIR} ${JS_LIB_OUTPUT_DIR}/../depData.json >> ${FW_JS}; \ + /usr/bin/node $(CURDIR)/tools/moduledep.js -d ${JS_LIB_OUTPUT_DIR} ${JS_LIB_OUTPUT_DIR}/../depData.json >> ${FW_JS}; \ cp -a ${JS_DIR}/* ${JQM_LIB_PATH}/js/* ${JS_LIB_OUTPUT_DIR}/; \ - ${node} $(CURDIR)/tools/moduledep.js -c ${JS_LIB_OUTPUT_DIR} > ${JS_LIB_OUTPUT_DIR}/../depData.json; \ + /usr/bin/node $(CURDIR)/tools/moduledep.js -c ${JS_LIB_OUTPUT_DIR} > ${JS_LIB_OUTPUT_DIR}/../depData.json; \ find ${JS_LIB_OUTPUT_DIR} -iname '*.js' | xargs sed -i -e '/^\/\/>>excludeStart\(.*\);/,/^\/\/>>excludeEnd\(.*\);/d'; widgets: init third_party globalize diff --git a/packaging/web-ui-fw.spec b/packaging/web-ui-fw.spec index 7b55429..e78b8bd 100644 --- a/packaging/web-ui-fw.spec +++ b/packaging/web-ui-fw.spec @@ -1,6 +1,6 @@ Name: web-ui-fw Version: 0.2.19 -Release: 0 +Release: 1 Summary: Tizen Web UI Framework Library Group: Development/Other License: MIT -- 2.7.4