From: Hyokeun Jeon Date: Tue, 1 Oct 2019 10:35:06 +0000 (+0900) Subject: Separate Web App templates X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6735d58ea2747d79f4045cb04faf786daca501ec;hp=46dcd609542cdd751b2dfb6c9d60647e072c5adb;p=scm%2Fmeta%2Fabs.git Separate Web App templates Change-Id: If4792db935ab461fcf5d58490f1e5a21de490b43 --- diff --git a/abs b/abs index 8cdb08d..bafea7a 100755 --- a/abs +++ b/abs @@ -517,10 +517,10 @@ class Sdk(object): out = self._run('package', main_args + ['--', '"%s"' % final_app]) #Append arch to web binary - if final_app.endswith('.wgt'): - final_app_with_arch = final_app.replace('.wgt', '-%s.wgt' % self.arch) - os.rename(final_app, final_app_with_arch) - final_app = final_app_with_arch + #if final_app.endswith('.wgt'): + # final_app_with_arch = final_app.replace('.wgt', '-%s.wgt' % self.arch) + # os.rename(final_app, final_app_with_arch) + # final_app = final_app_with_arch #Copy tpk to output directory if conf == 'Debug' and manual_strip == False : diff --git a/build-wgt.template b/build-wgt.template new file mode 100644 index 0000000..5e50135 --- /dev/null +++ b/build-wgt.template @@ -0,0 +1,101 @@ +#!/bin/bash +set -x + +ABS_CMD=/home/build/abs +SHARE_ROOT=__SHARE_ROOT__ +BUILD_ROOT=__BUILD_ROOT__ +SDK_PATH=__SDK_PATH__ +PROFILE=__PROFILE__ +PACKAGE=__PACKAGE__ +BUILD_MODE=__BUILD_MODE__ +PARALLEL_JOBS=__PARALLEL_JOBS__ +TMP_DIR=${BUILD_ROOT}/${PACKAGE}/_abs_out_ +SDK_CMD=$SDK_PATH/tools/ide/bin/tizen +LIST="$SDK_CMD list rootstrap " +BUILD_TYPE=__BUILD_TYPE__ + +chown -R build:build $SHARE_ROOT +su - build -c "cp $SHARE_ROOT/abs/abs $BUILD_ROOT/" +su - build -c "unzip $SHARE_ROOT/${PACKAGE}.zip -d $BUILD_ROOT/ > /dev/null" + +function _clear { + mv ${TMP_DIR}/*.log ${SHARE_ROOT} + exit $1 +} + +UPDATER="$SDK_PATH/update-manager/update-manager-cli.bin" +if [ ! -f $UPDATER ]; then + UPDATER="$SDK_PATH/package-manager/package-manager-cli.bin" +fi + +export DISPLAY=:0 +show_info=`su - build -c "$UPDATER show-info"` +echo "$show_info" +tizen_studio_version=`su - build -c "tizen version"` +echo "$tizen_studio_version" +su - build -c "df -hT" + +echo $tizen_studio_version >> $SHARE_ROOT/tizen_studio_version +tizen_studio_distribution="" +IFS=$'\n' read -d '' -r -a arr <<< "$show_info" +for i in "${arr[@]}"; do + if [[ $i == $"Distribution"*" : "* ]] && [[ ! $i == *ID* ]]; then + ret=`echo "${i##*: }"`; + if [ ! -z $ret ]; then + tizen_studio_distribution=$ret + fi + fi +done +echo $tizen_studio_distribution >> $SHARE_ROOT/tizen_studio_distribution + +rs_list=`su - build -c "tizen list rootstrap | grep .*.core.private.* | cut -d ' ' -f 1"` +#FIXME: remove hard-coded expression +if [ "${PROFILE}" = "da-hfp" ]; then + rs_list=`su - build -c "tizen list rootstrap | grep ${PROFILE}-.*device.core.private.* | cut -d ' ' -f 1"` +fi +echo $rs_list > $SHARE_ROOT/rsver +if [[ ! $rs_list =~ [0-9]{8}_[0-9] ]]; then + conf=`cat ${SDK_PATH}/tools/smart-build-interface/plugins/${rs_list}.xml` + dateversion=`echo $conf | sed "s/.*(\([0-9]\{8\}_[0-9]\{1\}\).*/\1/"` + echo ${rs_list}.${dateversion} > $SHARE_ROOT/rsver +fi + +# Inject tidlc path +TIDLC_PATH=`sed -n '/tidl/p' /home/build/.bashrc | cut -f2 -d':'` +if [ ! -z ${TIDLC_PATH} ]; then echo "PATH=\$PATH:${TIDLC_PATH}" >> /home/build/.profile; fi +su - build -c "tidlc --version" + +for rs in $rs_list; do + echo "BUILDING START TIME: `date`" + #if [[ $rs == *"64.core"* ]]; then + # echo "SKIP! 64-bit not supported!"; continue; + #else + su - build -c "${ABS_CMD} build -r $rs -w ${BUILD_ROOT}/${PACKAGE} -s ABS -t wgt" + #fi + count=`ls -1 ${TMP_DIR}/*.tpk 2>/dev/null | wc -l` + if [ $count != 0 ]; then + mv ${TMP_DIR}/*.tpk ${SHARE_ROOT} + else + mv ${TMP_DIR}/*.wgt ${SHARE_ROOT} + fi + ret=$?; echo "BUILDING FINISH TIME: `date`" + if [ $ret != 0 ]; then + echo $rs build fail; _clear 8 + fi + break +done + +#FIXME: Check 64 bit rootstraps for mobile profile. +#if [[ $BUILD_TYPE = "SUBMIT" ]] && [[ $PROFILE = "mobile" ]]; then +# if [[ $rs_list = *"device64"* ]] && [[ $rs_list = *"emulator64"* ]]; then +# echo "OK. $PROFILE have 64 bit rootstraps" +# else +# echo "NOK. $PROFILE does not have 64 bit rootstraps" +# echo "$PROFILE does not have 64 bit rootstraps" > ${SHARE_ROOT}/build_rootstrap_check.log +# _clear 9 +# fi +#fi + +_clear 0 +su - build -c "df -hT" + diff --git a/spec-wgt.template b/spec-wgt.template new file mode 100644 index 0000000..468b1a6 --- /dev/null +++ b/spec-wgt.template @@ -0,0 +1,35 @@ +Name: __OBS_PACKAGE_NAME__ +__VCS__ +Summary: __SUMMARY__ +Version: __VERSION__ +Release: 1 +Group: __GROUP__ +License: __LICENSE__ +Source0: %{name}-%{version}.tar.gz + +BuildRequires: pkgconfig(libtzplatform-config) +Requires(post): /usr/bin/__APP_TYPE__-backend + +%define internal_name __TIZEN_STUDIO_PACKAGE_NAME__ +%define preload___APP_TYPE___path %{TZ_SYS_RO_APP}/.preload-__APP_TYPE__ + +%description +__VCS_DESCRIPTION__ +This is a container package which have preload TPK/WGT files + +%prep +%setup -q + +%build + +%install +rm -rf %{buildroot} +mkdir -p %{buildroot}/%{preload___APP_TYPE___path} +install %{internal_name}-%{version}.__APP_TYPE__ %{buildroot}/%{preload___APP_TYPE___path}/ + +%post + +%files +%defattr(-,root,root,-) +%{preload___APP_TYPE___path}/* +