From 932b00ad7e6d4ff47ca5054afe346e88bc189b49 Mon Sep 17 00:00:00 2001 From: "kh5325.kim" Date: Tue, 10 Sep 2013 19:22:51 +0900 Subject: [PATCH] Fixed native_install() to work stand-alone Change-Id: Icafa0fd114e76762404a73430ae8d4bff083ad80 --- package/build.linux | 20 +++++++++++--------- package/changelog | 3 +++ package/pkginfo.manifest | 2 +- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/package/build.linux b/package/build.linux index df7c6a2..0ea39d5 100755 --- a/package/build.linux +++ b/package/build.linux @@ -108,6 +108,7 @@ native_install() { case ${TARGET_OS} in ubuntu-32|ubuntu-64|macos-64) cp -rf ${SRCDIR}/${PROJECT_HOME}/doc/install/native_bin/* ${NATIVE_TARGET}/bin + cp $PROJECT_HOME/doc/install/bin_/common.sh ${NATIVE_TARGET}/bin rm ${NATIVE_TARGET}/bin/*.bat ;; windows-32|windows-64) @@ -118,6 +119,7 @@ native_install() { exit 1 ;; esac + cp -r $PROJECT_HOME/doc/install/conf ${NATIVE_TARGET}/conf || true cp -rf ${NATIVE_LIB}/* ${NATIVE_TARGET}/lib || true cp ${SRCDIR}/dist/*.jar ${NATIVE_TARGET}/lib || true cp -rf ${SRCDIR}/package/addingFiles/template ${NATIVE_TARGET}/ || true @@ -141,12 +143,12 @@ xmlsec-*.jar install() { - mkdir -p $TARGET/lib + mkdir -p $TARGET/lib # copy command case ${TARGET_OS} in ubuntu-32|ubuntu-64|macos-64) - cp -r $PROJECT_HOME/doc/install/bin_ $TARGET/bin + cp -r $PROJECT_HOME/doc/install/bin_ $TARGET/bin rm $TARGET/bin/*.bat ;; windows-32|windows-64) @@ -159,13 +161,13 @@ install() ;; esac cp -r $PROJECT_HOME/doc/install/conf $TARGET/conf || true - cp -r $PROJECT_HOME/doc/install/sample $TARGET/sample || true - cp -r $PROJECT_HOME/doc/install/realm $TARGET/realm || true - cp -r $PROJECT_HOME/doc/install/document/* $TARGET || true - cp -r $LIB/* $TARGET/lib || true - cp dist/*.jar $TARGET/lib || true - # native-cli install - native_install + cp -r $PROJECT_HOME/doc/install/sample $TARGET/sample || true + cp -r $PROJECT_HOME/doc/install/realm $TARGET/realm || true + cp -r $PROJECT_HOME/doc/install/document/* $TARGET || true + cp -r $LIB/* $TARGET/lib || true + cp dist/*.jar $TARGET/lib || true + # native-cli install + native_install } [ "$1" = "clean" ] && clean diff --git a/package/changelog b/package/changelog index 667472e..c452ed2 100644 --- a/package/changelog +++ b/package/changelog @@ -1,3 +1,6 @@ +* 2.1.37 +- IDE cannot genarate .tpk file when user installed native-development without web-development. fixed it +== kh5325.kim 2013-09-10 * 2.1.36 - IDE cannot genarate .tpk file when user installed native-development without web-development. fixed it == gune.kim 2013-09-06 diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest index 3889c2d..9f1efa4 100644 --- a/package/pkginfo.manifest +++ b/package/pkginfo.manifest @@ -1,4 +1,4 @@ -Version:2.1.36 +Version:2.1.37 Maintainer: Bon-Yong Lee, gyeongseok seo Package: web-cli -- 2.7.4