demo: Fix tizen function namespace in demo

[platform/framework/web/web-ui-fw.git] / Makefile

diff --git a/Makefile b/Makefile
old mode 100644 (file)
new mode 100755 (executable)
index acf3e23..f12346e
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ SHELL := /bin/bash
 ## Project setting
 DEBUG ?= yes
 PROJECT_NAME = tizen-web-ui-fw
-VERSION = 0.1
+VERSION = 0.2
 VERSION_COMPAT =
 PKG_VERSION = $(shell cat packaging/web-ui-fw.spec | grep Version: | sed -e "s@Version:\s*@@" )
 THEME_NAME = default
@@ -49,7 +49,7 @@ FW_LIBS_JS = ${JS_OUTPUT_ROOT}/${PROJECT_NAME}-libs.js
 FW_THEME_CSS_FILE = ${PROJECT_NAME}-theme.css
 FW_WIDGET_CSS_FILE = ${WIDGET_CSS_OUTPUT_ROOT}/${PROJECT_NAME}-widget.css
 
-GEO_VERSION = jquery-geo-1.0a4
+GEO_VERSION = jquery-geo-1.0b2
 
 LIBS_JS_FILES = jlayout/jquery.sizes.js \
                                jlayout/jlayout.border.js \
@@ -60,7 +60,7 @@ LIBS_JS_FILES = jlayout/jquery.sizes.js \
                                jquery.easing.1.3.js \
                                jquery.tmpl.js \
                                jquery.mobile.js \
-                               ${GEO_VERSION}/js/jquery.geo.head.js \
+                               ${GEO_VERSION}/js/jsrender.js \
                                ${GEO_VERSION}/js/jquery.mousewheel.js \
                                ${GEO_VERSION}/js/jquery.geo.core.js \
                                ${GEO_VERSION}/js/jquery.geo.geographics.js \
@@ -74,7 +74,7 @@ JQUERY_MOBILE_CSS = submodules/jquery-mobile/compiled/jquery.mobile.structure.cs
                     $(NULL)
 JQUERY_MOBILE_IMAGES = submodules/jquery-mobile/css/themes/default/images
 
-JQM_VERSION = jquery-mobile-1.1.0
+JQM_VERSION = jquery-mobile-1.2.0
 JQM_LIB_PATH = $(CURDIR)/libs/js/${JQM_VERSION}
 
 JQUERY = jquery-1.7.1.js
@@ -92,7 +92,7 @@ LIBS_CSS_FILES +=\
 endif
 
 
-all: libs_prepare third_party widgets libs_cleanup loader themes version_compat compress
+all: libs_prepare third_party widgets libs_cleanup loader themes version version_compat compress
 
 libs_prepare:
        # Prepare libs/ build...
@@ -183,7 +183,6 @@ widgets: init third_party
 
 loader: widgets globalize
        cat 'src/loader/loader.js' >> ${FW_JS}
-       echo '(function($$){$$.tizen.frameworkData.pkgVersion="$(PKG_VERSION)";}(jQuery));' >> ${FW_JS}
 
 
 globalize: widgets
@@ -195,6 +194,9 @@ globalize: widgets
 themes:
        make -C src/themes || exit $?
 
+version: loader themes
+       echo '(function($$){$$.tizen.frameworkData.pkgVersion="$(PKG_VERSION)";}(jQuery));' >> ${FW_JS}
+       echo "$(PKG_VERSION)" > ${FRAMEWORK_ROOT}/../VERSION
 
 compress: widgets loader themes
        # Javacript code compressing