From 0c22e5e1d3951000f8a014f7fc95cc8a19d2d504 Mon Sep 17 00:00:00 2001 From: "shingil.kang" Date: Mon, 30 Dec 2013 02:12:30 +0900 Subject: [PATCH] CLI: split the new cli package into three packages name of each packages : new-native-cli, new-web-cli, new-common-cli Change-Id: I62e6bed5c60dc0f10f0b203b78316afd0333c04d Signed-off-by: shingil.kang --- package/build.linux | 228 +++++++++++++++------ ....install.linux => new-common-cli.install.linux} | 4 +- ...li.remove.linux => new-common-cli.remove.linux} | 1 - package/pkginfo.manifest | 94 +++++++-- 4 files changed, 243 insertions(+), 84 deletions(-) rename package/{new-cli.install.linux => new-common-cli.install.linux} (97%) rename package/{new-cli.remove.linux => new-common-cli.remove.linux} (99%) diff --git a/package/build.linux b/package/build.linux index 240d739..2c95ceb 100755 --- a/package/build.linux +++ b/package/build.linux @@ -9,18 +9,32 @@ LIB=$SRCDIR/lib NATIVE_LIB=${SRCDIR}/native-lib #newcli NCLI_PROJECT_HOME="org.tizen.ncli.ide" -NCLI_PACKAGE_DIR=package/new-cli.package.$PLATFORM -NCLI_TARGET=${NCLI_PACKAGE_DIR}/data/tools/ide -NCLI_TOOLS_TARGET=${NCLI_PACKAGE_DIR}/data/tools NCLI_DEFAULT_CONFIG=tizen-default-config +NCLI_LIB_FOLDER=lib-ncli NCLI_LIB=${SRCDIR}/lib-ncli +NCLI_COMMON_LIB=${SRCDIR}/lib-ncli-common +NCLI_COMMON_PACKAGE_DIR=package/new-common-cli.package.$PLATFORM +NCLI_COMMON_TARGET=${NCLI_COMMON_PACKAGE_DIR}/data/tools/ide +NCLI_COMMON_TOOLS_TARGET=${NCLI_COMMON_PACKAGE_DIR}/data/tools +NCLI_WEB_LIB=${SRCDIR}/lib-ncli-web +NCLI_WEB_PACKAGE_DIR=package/new-web-cli.package.$PLATFORM +NCLI_WEB_TARGET=${NCLI_WEB_PACKAGE_DIR}/data/tools/ide +NCLI_WEB_TOOLS_TARGET=${NCLI_WEB_PACKAGE_DIR}/data/tools +NCLI_NATIVE_LIB=${SRCDIR}/lib-ncli-native +NCLI_NATIVE_PACKAGE_DIR=package/new-native-cli.package.$PLATFORM +NCLI_NATIVE_TARGET=${NCLI_NATIVE_PACKAGE_DIR}/data/tools/ide +NCLI_NATIVE_TOOLS_TARGET=${NCLI_NATIVE_PACKAGE_DIR}/data/tools + # clean clean() { + echo "clean" echo "$SRCDIR" - rm -rf dist lib package/web-cli.package.linux - rm -rf ${NATIVE_LIB} package/native-cli.package.${TARGET_OS} - rm -rf ${NCLI_LIB} package/new-cli.package.${TARGET_OS} + + rm -rf dist + rm -rf ${LIB} ${NATIVE_LIB} ${NCLI_LIB} ${NCLI_COMMON_LIB} ${NCLI_WEB_LIB} ${NCLI_NATIVE_LIB} + rm -rf package/web-cli.package.${TARGET_OS} package/native-cli.package.${TARGET_OS} + rm -rf package/new-web-cli.package.${TARGET_OS} package/new-native-cli.package.${TARGET_OS} package/new-common-cli.package.${TARGET_OS} } # build @@ -31,8 +45,8 @@ clean() # and then native_build and newcli_build is called build() { - echo $LIB - mkdir -p $LIB + echo $LIB + mkdir -p $LIB SRC_LIST=" org.eclipse.osgi_* @@ -74,23 +88,30 @@ build() esac done - cp $PROJECT_HOME/lib/*.jar $LIB + cp $PROJECT_HOME/lib/*.jar $LIB - mkdir -p $BUILD - cp -r $PROJECT_HOME/src/* $BUILD - # native-cli build - native_build - # newcli build - newcli_build - ant + mkdir -p $BUILD + cp -r $PROJECT_HOME/src/* $BUILD -} + echo "native-cli build" + native_build + + echo "common-newcli build" + new_common_cli_build + + echo "web-newcli build" + new_web_cli_build + echo "native-newcli build" + new_native_cli_build + echo "make new cli jar" + new_cli_jar_build +} native_build() { - mkdir -p ${NATIVE_LIB} - mkdir -p ${NATIVE_TARGET}/bin + mkdir -p ${NATIVE_LIB} + mkdir -p ${NATIVE_TARGET}/bin case ${TARGET_OS} in ubuntu-32|ubuntu-64|macos-64) @@ -129,42 +150,68 @@ native_build() { done } -newcli_build() { - mkdir -p ${NCLI_LIB} - mkdir -p ${NCLI_TARGET}/bin +new_common_cli_build() { + mkdir -p ${NCLI_COMMON_LIB} + mkdir -p ${NCLI_COMMON_TARGET}/bin SRC_LIST=" - org.eclipse.cdt.core_* org.eclipse.equinox.common_* org.eclipse.osgi_* org.eclipse.ui.console_* - org.eclipse.cdt.core.linux.x86_* org.eclipse.core.resources_* org.eclipse.core.jobs_* - org.eclipse.cdt.managedbuilder.core_* org.tizen.common.sdblib_* - org.tizen.web.sign_* - org.tizen.nativecommon_* - org.tizen.nativecpp.misc_* - org.eclipse.cdt.ui_* com.ibm.icu_* - org.tizen.nativeappcommon_* - org.tizen.nativecpp_* - org.tizen.nativecpp.template_* " for SRC in ${SRC_LIST} do TARGET=`find $ROOTDIR -name "${SRC}" | head -1` - cp -r ${TARGET} ${NCLI_LIB} + cp -r ${TARGET} ${NCLI_COMMON_LIB} done INCLUDING_LIB_SRC_LIST=" - org.tizen.common_* + org.tizen.common_* org.tizen.common.builder_* org.tizen.common.sign_* org.tizen.common.verrari_* org.tizen.common.verrari.realm_* + " + for SRC in ${INCLUDING_LIB_SRC_LIST} + do + TARGET=`find $ROOTDIR -name "${SRC}" | head -1` + case "${TARGET}" in + *.jar) + cp ${TARGET} ${NCLI_COMMON_LIB} + cd ${NCLI_COMMON_LIB} + jar -xvf ${TARGET} lib + mv lib/* ./ + cd - + ;; + *) + cp -rf ${TARGET} ${NCLI_COMMON_LIB} + find -name '*.jar' -exec cp {} ${NCLI_COMMON_LIB} \; + ;; + esac + done + + cp $NCLI_PROJECT_HOME/lib/*.jar $NCLI_COMMON_LIB +} + +new_web_cli_build() { + mkdir -p ${NCLI_WEB_LIB} + + SRC_LIST=" + org.tizen.web.sign_* + " + + for SRC in ${SRC_LIST} + do + TARGET=`find $ROOTDIR -name "${SRC}" | head -1` + cp -r ${TARGET} ${NCLI_WEB_LIB} + done + + INCLUDING_LIB_SRC_LIST=" org.tizen.web.builder_* org.tizen.web.common_* org.tizen.web.compressor.minifier.core_* @@ -177,24 +224,57 @@ newcli_build() { TARGET=`find $ROOTDIR -name "${SRC}" | head -1` case "${TARGET}" in *.jar) - cp ${TARGET} ${NCLI_LIB} - cd ${NCLI_LIB} + cp ${TARGET} ${NCLI_WEB_LIB} + cd ${NCLI_WEB_LIB} jar -xvf ${TARGET} lib mv lib/* ./ cd - ;; *) - cp -rf ${TARGET} ${NCLI_LIB} - find -name '*.jar' -exec cp {} ${NCLI_LIB} \; + cp -rf ${TARGET} ${NCLI_WEB_LIB} + find -name '*.jar' -exec cp {} ${NCLI_WEB_LIB} \; ;; esac done - - cp $NCLI_PROJECT_HOME/lib/*.jar $NCLI_LIB - mkdir -p $BUILD - cp -r $NCLI_PROJECT_HOME/src/* $BUILD } +new_native_cli_build() { + mkdir -p ${NCLI_NATIVE_LIB} + + SRC_LIST=" + org.eclipse.cdt.core_* + org.eclipse.cdt.core.linux.x86_* + org.eclipse.cdt.managedbuilder.core_* + org.tizen.nativecommon_* + org.tizen.nativecpp.misc_* + org.eclipse.cdt.ui_* + org.tizen.nativeappcommon_* + org.tizen.nativecpp_* + org.tizen.nativecpp.template_* + " + + for SRC in ${SRC_LIST} + do + TARGET=`find $ROOTDIR -name "${SRC}" | head -1` + cp -r ${TARGET} ${NCLI_NATIVE_LIB} + done +} + +new_cli_jar_build() +{ + #get source + mkdir -p $BUILD + cp -r $NCLI_PROJECT_HOME/src/* $BUILD + + #get build-dependency libraries + mkdir -p ${NCLI_LIB} + cp -r ${NCLI_COMMON_LIB}/*.jar ${NCLI_LIB} + cp -r ${NCLI_WEB_LIB}/*.jar ${NCLI_LIB} + cp -r ${NCLI_NATIVE_LIB}/*.jar ${NCLI_LIB} + + #build using ant + ant +} # install # - Make a directory structure for the zip file.(DIBS package) @@ -226,10 +306,14 @@ install() cp -r $PROJECT_HOME/doc/install/document/* $TARGET || true cp -r $LIB/* $TARGET/lib || true cp dist/*.jar $TARGET/lib || true - # native-cli install + echo "native-cli install" native_install - # ncli install - newcli_install + echo "common-ncli install" + new_common_cli_install + echo "web-ncli install" + new_web_cli_install + echo "native-ncli install" + new_native_cli_install } native_install() { @@ -269,22 +353,22 @@ slf4j-log4j*.jar } -#ncli install -newcli_install() { - mkdir -p $NCLI_TARGET/lib-ncli - cp -r $NCLI_LIB/* $NCLI_TARGET/lib-ncli || true - cp ${SRCDIR}/dist/tizen-new-cli.jar $NCLI_TARGET/lib-ncli || true +#common ncli install +new_common_cli_install() { + mkdir -p $NCLI_COMMON_TARGET/lib-ncli + cp -r $NCLI_COMMON_LIB/* $NCLI_COMMON_TARGET/lib-ncli || true + cp ${SRCDIR}/dist/tizen-new-cli.jar $NCLI_COMMON_TARGET/lib-ncli || true case ${TARGET_OS} in ubuntu-32|ubuntu-64|macos-64) - cp -r $NCLI_PROJECT_HOME/tizen.sh $NCLI_TARGET/bin || true - cp ${SRCDIR}/dist/tizen-autocomplete.jar $NCLI_TARGET/lib-ncli || true - cp -r $NCLI_PROJECT_HOME/tizen-autocomplete $NCLI_TARGET/bin || true + cp -r $NCLI_PROJECT_HOME/tizen.sh $NCLI_COMMON_TARGET/bin || true + cp ${SRCDIR}/dist/tizen-autocomplete.jar $NCLI_COMMON_TARGET/lib-ncli || true + cp -r $NCLI_PROJECT_HOME/tizen-autocomplete $NCLI_COMMON_TARGET/bin || true ;; windows-32|windows-64) - cp -r $NCLI_PROJECT_HOME/tizen.bat $NCLI_TARGET/bin || true + cp -r $NCLI_PROJECT_HOME/tizen.bat $NCLI_COMMON_TARGET/bin || true ;; *) echo "${TARGET_OS} is not support yet." @@ -292,28 +376,36 @@ newcli_install() { ;; esac # Copy configuration files - cp -r $NCLI_PROJECT_HOME/resources $NCLI_TARGET/conf-ncli || true - cp $NCLI_PROJECT_HOME/$NCLI_DEFAULT_CONFIG $NCLI_TOOLS_TARGET/.tizen-cli-config || true + cp -r $NCLI_PROJECT_HOME/resources $NCLI_COMMON_TARGET/conf-ncli || true + cp $NCLI_PROJECT_HOME/$NCLI_DEFAULT_CONFIG $NCLI_COMMON_TOOLS_TARGET/.tizen-cli-config || true -dependency_jars=" -log4j-*.jar -slf4j-api-*.jar -slf4j-log4j*.jar -args4j-*.jar -" - for i in ${dependency_jars} - do - cp -rf ${NCLI_LIB}/${i} ${NCLI_TARGET}/lib-ncli - done + dependency_jars=" + log4j-*.jar + slf4j-api-*.jar + slf4j-log4j*.jar + args4j-*.jar + " + for i in ${dependency_jars} + do + cp -rf ${NCLI_LIB}/${i} ${NCLI_COMMON_TARGET}/lib-ncli + done } +#web ncli install +new_web_cli_install() { + mkdir -p $NCLI_WEB_TARGET/lib-ncli + cp -r $NCLI_WEB_LIB/* $NCLI_WEB_TARGET/lib-ncli || true +} - +#native ncli install +new_native_cli_install() { + mkdir -p $NCLI_NATIVE_TARGET/lib-ncli + cp -r $NCLI_NATIVE_LIB/* $NCLI_NATIVE_TARGET/lib-ncli || true +} [ "$1" = "clean" ] && clean [ "$1" = "build" ] && build [ "$1" = "install" ] && install echo "success" - diff --git a/package/new-cli.install.linux b/package/new-common-cli.install.linux similarity index 97% rename from package/new-cli.install.linux rename to package/new-common-cli.install.linux index 62811a1..35a90a0 100644 --- a/package/new-cli.install.linux +++ b/package/new-common-cli.install.linux @@ -18,15 +18,13 @@ sed -i "s:CLI_LIB_PATH:\"${CLI_LIB_PATH}\":g" ${TIZEN_COMPLETION_SCRIPT} sed -i "s:SPAWN_LIB_PATH:\"${SPAWN_LIB_PATH}\":g" ${TIZEN_COMPLETION_SCRIPT} sed -i "s:CLI_LOG_FILE:\"${CLI_LOG_FILE}\":g" ${LOG4J_CONFIG} - - gksudo "mv ${TIZEN_COMPLETION_SCRIPT} ${TIZEN_COMPLETION_PATH}" gksudo "ln -s ${TIZEN_NEWCLI_SH} ${TIZEN_COMPLETION_LINK_PATH}" cd ${CLI_LIB_PATH} jar xf org.eclipse.cdt.core.linux.x86*.jar os -. /etc/bash_complete +#. /etc/bash_completion exit 0 diff --git a/package/new-cli.remove.linux b/package/new-common-cli.remove.linux similarity index 99% rename from package/new-cli.remove.linux rename to package/new-common-cli.remove.linux index 3e06906..a8d7fdb 100644 --- a/package/new-cli.remove.linux +++ b/package/new-common-cli.remove.linux @@ -11,4 +11,3 @@ gksudo "rm ${TIZEN_COMPLETION_LINK_PATH}" complete -r _tizen tizen exit 0; - diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest index 063734f..edb9757 100644 --- a/package/pkginfo.manifest +++ b/package/pkginfo.manifest @@ -1,5 +1,5 @@ -Version:2.1.40 -Maintainer: Bon-Yong Lee, gyeongseok seo +Version:2.1.41 +Maintainer: Bon-Yong Lee, gyeongseok seo , Shingil Kang Package: web-cli OS: ubuntu-32 @@ -71,37 +71,107 @@ Build-dependency: nativecommon-eplugin [macos-64], base-ide-product [macos-64], Install-dependency: sdb [macos-64] Description: Tizen IDE Command Line Interface -Package: new-cli +Package: new-native-cli OS: ubuntu-32 Build-host-os: ubuntu-32 Build-dependency: nativecommon-eplugin [ubuntu-32], base-ide-product [ubuntu-32], common-eplugin [ubuntu-32], nativecpp-ext-eplugin [ubuntu-32] -Install-dependency: sdb [ubuntu-32] +Install-dependency: new-common-cli [ubuntu-32], smart-build-interface [ubuntu-32] Description: New Tizen IDE Command Line Interface -Package: new-cli +Package: new-native-cli OS: ubuntu-64 Build-host-os: ubuntu-64 Build-dependency: nativecommon-eplugin [ubuntu-64], base-ide-product [ubuntu-64], common-eplugin [ubuntu-64], nativecpp-ext-eplugin [ubuntu-64] -Install-dependency: sdb [ubuntu-64] +Install-dependency: new-common-cli [ubuntu-64], smart-build-interface [ubuntu-64] Description: New Tizen IDE Command Line Interface -Package: new-cli +Package: new-native-cli OS: windows-32 Build-host-os: ubuntu-32 Build-dependency: nativecommon-eplugin [windows-32], base-ide-product [windows-32], common-eplugin [windows-32], nativecpp-ext-eplugin [windows-32] -Install-dependency: sdb [windows-32] +Install-dependency: new-common-cli [windows-32], smart-build-interface [windows-32] Description: New Tizen IDE Command Line Interface -Package: new-cli +Package: new-native-cli OS: windows-64 Build-host-os: ubuntu-64 Build-dependency: nativecommon-eplugin [windows-64], base-ide-product [windows-64], common-eplugin [windows-64], nativecpp-ext-eplugin [windows-64] -Install-dependency: sdb [windows-64] +Install-dependency: new-common-cli [windows-64], smart-build-interface [windows-64] Description: New Tizen IDE Command Line Interface -Package: new-cli +Package: new-native-cli OS: macos-64 Build-host-os: ubuntu-64 Build-dependency: nativecommon-eplugin [macos-64], base-ide-product [macos-64], common-eplugin [macos-64], nativecpp-ext-eplugin [macos-64] -Install-dependency: sdb [macos-64] +Install-dependency: new-common-cli [macos-64], smart-build-interface [macos-64] Description: New Tizen IDE Command Line Interface + +Package: new-web-cli +OS: ubuntu-32 +Build-host-os: ubuntu-32 +Build-dependency: base-ide-product [ubuntu-32], common-eplugin [ubuntu-32] +Install-dependency: new-common-cli [ubuntu-32] +Description: New Web Tizen IDE Command Line Interface + +Package: new-web-cli +OS: ubuntu-64 +Build-host-os: ubuntu-64 +Build-dependency: base-ide-product [ubuntu-64], common-eplugin [ubuntu-64] +Install-dependency: new-common-cli [ubuntu-64] +Description: New Web Tizen IDE Command Line Interface + +Package: new-web-cli +OS: windows-32 +Build-host-os: ubuntu-32 +Build-dependency: base-ide-product [windows-32], common-eplugin [windows-32] +Install-dependency: new-common-cli [windows-32] +Description: New Web Tizen IDE Command Line Interface + +Package: new-web-cli +OS: windows-64 +Build-host-os: ubuntu-64 +Build-dependency: base-ide-product [windows-64], common-eplugin [windows-64] +Install-dependency: new-common-cli [windows-64] +Description: New Web Tizen IDE Command Line Interface + +Package: new-web-cli +OS: macos-64 +Build-host-os: ubuntu-64 +Build-dependency: base-ide-product [macos-64], common-eplugin [macos-64] +Install-dependency: new-common-cli [macos-64] +Description: New Web Tizen IDE Command Line Interface + +Package: new-common-cli +OS: ubuntu-32 +Build-host-os: ubuntu-32 +Build-dependency: base-ide-product [ubuntu-32], common-eplugin [ubuntu-32] +Install-dependency: sdb [ubuntu-32], certificate-generator [ubuntu-32] +Description: New Common Tizen IDE Command Line Interface + +Package: new-common-cli +OS: ubuntu-64 +Build-host-os: ubuntu-64 +Build-dependency: base-ide-product [ubuntu-64], common-eplugin [ubuntu-64] +Install-dependency: sdb [ubuntu-64], certificate-generator [ubuntu-64] +Description: New Common Tizen IDE Command Line Interface + +Package: new-common-cli +OS: windows-32 +Build-host-os: ubuntu-32 +Build-dependency: base-ide-product [windows-32], common-eplugin [windows-32] +Install-dependency: sdb [windows-32], certificate-generator[windows-32] +Description: New Common Tizen IDE Command Line Interface + +Package: new-common-cli +OS: windows-64 +Build-host-os: ubuntu-64 +Build-dependency: base-ide-product [windows-64], common-eplugin [windows-64] +Install-dependency: sdb [windows-64], certificate-generator [windows-64] +Description: New Common Tizen IDE Command Line Interface + +Package: new-common-cli +OS: macos-64 +Build-host-os: ubuntu-64 +Build-dependency: base-ide-product [macos-64], common-eplugin [macos-64] +Install-dependency: sdb [macos-64], certificate-generator [macos-64] +Description: New Common Tizen IDE Command Line Interface -- 2.7.4