[Title] Sync with develop branch

[Type]      Bugfix
[Module]    Sub
[Priority]  Minor
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

diff --git a/package/build.linux b/package/build.linux
deleted file mode 100755 (executable)
index e2be37d..0000000
--- a/package/build.linux
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/sh -xe
-
-PROJECT_HOME="org.tizen.cli"
-BUILD=build
-PLATFORM=$BUILD_TARGET_OS
-TARGET=package/web-cli.package.$PLATFORM/data/SDK/dev_tools
-
-LIB=$SRCDIR/lib
-
-# clean
-clean()
-{
-       echo "$SRCDIR"
-       rm -rf dist lib package/web-cli.package.linux
-}
-
-# build
-build() 
-{
-       mkdir -p $LIB
-       SRC=`find $ROOTDIR -name "org.eclipse.osgi_*"`
-       cp $SRC $LIB
-
-       SRC=`find $ROOTDIR -name "org.tizen.common_*"`
-       cp $SRC $LIB
-       jar -xvf $SRC lib
-
-       SRC=`find $ROOTDIR -name "org.tizen.web.common_*"`
-       cp $SRC $LIB
-
-       SRC=`find $ROOTDIR -name "org.tizen.web.sign_*"`
-       cp $SRC $LIB
-       jar -xvf $SRC lib
-
-       cp $PROJECT_HOME/lib/*.jar lib
-
-       mkdir -p $BUILD
-       cp -r $PROJECT_HOME/src/* $BUILD
-
-       JARS=`find $DIR_LIB -name "*.jar"`
-
-       JAR=""
-       for JAR_FILE in $JARS; do
-               JAR=$JAR:$JAR_FILE
-       done
-
-       ant
-
-}
-
-# install
-install() 
-{
-       mkdir -p $TARGET/lib
-       cp -r $PROJECT_HOME/doc/install/* $TARGET
-       mv $TARGET/bin_ $TARGET/bin
-       cp -r $LIB/* $TARGET/lib
-       cp dist/*.jar $TARGET/lib
-}
-
-[ "$1" = "clean" ] && clean
-[ "$1" = "build" ] && build
-[ "$1" = "install" ] && install
-
-echo "success"

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 2d5baf0..3f958fb 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,22 +1,3 @@
-<<<<<<< HEAD
-Package: web-cli
-Version:1.0.1
-OS: linux
-Build-host-os: linux
-Maintainer: Bon-Yong Lee<bonyong.lee@samsung.com>
-Build-dependency: webapp-eplugin [linux]
-Source: emulator-manager
-Description: Tizen IDE Command Line Interface
-
-Package: web-cli
-Version:1.0.1
-OS: windows
-Build-host-os: linux
-Maintainer: Bon-Yong Lee<bonyong.lee@samsung.com>
-Build-dependency: webapp-eplugin [windows]
-Source: emulator-manager
-Description: Tizen IDE Command Line Interface
-=======
 version:1.0.5
 Maintainer: Bon-Yong Lee<bonyong.lee@samsung.com>
 
@@ -50,4 +31,3 @@ Build-host-os: ubuntu-32
 Build-dependency: webapp-eplugin [macos-64], base-ide-product [macos-64], common-eplugin [macos-64]
 Description: Tizen IDE Command Line Interface
 
->>>>>>> develop