enable gbs build with https update

Change-Id: I8a270801c7df3adb54cb201156b5b5f7f7265ea0

diff --git a/.gbs.conf b/.gbs.conf
index 9ef30250040004357e3aa8b0de3eb81f497923de..dfbc2ca7177d45c97596cacce7ca4ba3c950a75d 100755 (executable)
--- a/.gbs.conf
+++ b/.gbs.conf
@@ -1,2 +1,3 @@
 [general]
-upstream_branch=tizen_upstream
+upstream_branch = ${upstreamversion}
+upstream_tag = ${upstreamversion}

diff --git a/cmake/config/arm-tizen.cmake b/cmake/config/arm-tizen.cmake
index cf41e486578bcf2003f202962fc49f4b2730ae31..4de7e84107763efc07a466584bd6722b6f07ec76 100644 (file)
--- a/cmake/config/arm-tizen.cmake
+++ b/cmake/config/arm-tizen.cmake
@@ -18,15 +18,15 @@ set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_PROCESSOR armv7l)
 
 # Only set the compiler if not provided already
-if(NOT "${CMAKE_C_COMPILER}" STREQUAL "")
-  find_program(COMPILER_PATH ${CMAKE_C_COMPILER})
-  if(COMPILER_PATH STREQUAL "")
-    message(WARNING "Command ${CMAKE_C_COMPILER} not found")
-    unset(CMAKE_C_COMPILER)
-  endif()
-  unset(COMPILER_PATH)
-endif()
+#if(NOT "${CMAKE_C_COMPILER}" STREQUAL "")
+#  find_program(COMPILER_PATH ${CMAKE_C_COMPILER})
+#  if(COMPILER_PATH STREQUAL "")
+#    message(WARNING "Command ${CMAKE_C_COMPILER} not found")
+#    unset(CMAKE_C_COMPILER)
+#  endif()
+#  unset(COMPILER_PATH)
+#endif()
 
-if("${CMAKE_C_COMPILER}" STREQUAL "")
-  set(CMAKE_C_COMPILER arm-linux-gnueabi-gcc)
-endif()
+#if("${CMAKE_C_COMPILER}" STREQUAL "")
+#  set(CMAKE_C_COMPILER arm-linux-gnueabi-gcc)
+#endif()

diff --git a/packaging/iotjs.spec b/packaging/iotjs.spec
index 1827a9b3630f8428855f088796dcf5c08187a956..ce50637c732237e1d37e18da935bddca432f5b88 100644 (file)
--- a/packaging/iotjs.spec
+++ b/packaging/iotjs.spec
@@ -1,5 +1,5 @@
 Name: iotjs
-Version: 0.0.1
+Version: 1.0.0
 Release: 0
 Summary: IoT.js Runtime
 Group: Network & Connectivity
@@ -21,8 +21,8 @@ BuildRequires:  pkgconfig(capi-appfw-application)
 
 BuildRequires: pkgconfig(dlog)
 #for https
-#BuildRequires:  openssl-devel
-#BuildRequires:  libcurl-devel
+BuildRequires:  openssl-devel
+BuildRequires:  libcurl-devel
 ##
 #BuildRequires:  gettext
 #BuildRequires:  libtool
@@ -58,8 +58,8 @@ cp %{SOURCE1001} .
 
 %build
 ./tools/build.py --clean --buildtype=debug --target-arch=arm --target-os=tizen --target-board=artik10 \
- --no-init-submodule --no-parallel-build --no-check-test \
- --external-shared-lib=appcore-agent --iotjs-include-module=tizenappfw
+ --no-init-submodule --no-parallel-build --no-check-test
+
 %install
 #rm -rf %{buildroot}