From fe3d86ed1a0d07d750aec2e79b6f09d51eeb7a9f Mon Sep 17 00:00:00 2001 From: Matti Paaso Date: Fri, 13 Mar 2015 14:27:26 +0200 Subject: Adding handling for vxworks src build Change-Id: I373fbe95fc162bc181294cf8e39633516f85b9da Reviewed-by: Jani Heikkinen --- packaging-tools/mksrc.sh | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) (limited to 'packaging-tools/mksrc.sh') diff --git a/packaging-tools/mksrc.sh b/packaging-tools/mksrc.sh index d5ab6f6e0..fdc127308 100755 --- a/packaging-tools/mksrc.sh +++ b/packaging-tools/mksrc.sh @@ -50,6 +50,7 @@ SKIPSYNCQT=no STRICT=1 NESTED_SUBMODULE_SKIP_LIST=("qtwebengine/src/3rdparty") SUBMODULES_WITH_NESTED_SUBMODULES_LIST=("qtwebengine") +PRODUCT_NAME='' function usage() { @@ -67,6 +68,7 @@ function usage() echo "--single-module tar any single git repository (that might live outside the supermodule)" echo "--skip-syncqt do not run syncqt by default" echo "-S don't run in strict mode" + echo "--product-name Additional product name for src package" } function cleanup() @@ -143,6 +145,9 @@ function create_and_delete_submodule() continue fi _file=$submodule-$LICENSE-src-$QTVER + if [ $PRODUCT_NAME ]; then + _file=$submodule-$PRODUCT_NAME-$LICENSE-src-$QTVER + fi mv $submodule $_file echo " - Creating archives - " ( tar c $_file | tee \ @@ -247,6 +252,11 @@ while test $# -gt 0; do shift STRICT=0 ;; + --product-name) + shift + PRODUCT_NAME=$1 + shift + ;; *) echo "Error: Unknown option $1" usage @@ -264,9 +274,17 @@ fi REPO_NAME=$(basename $REPO_DIR) if [ $SINGLEMODULE = no ]; then - PACKAGE_NAME=qt-everywhere-$LICENSE-src-$QTVER + if [ $PRODUCT_NAME ]; then + PACKAGE_NAME=qt-everywhere-$PRODUCT_NAME-$LICENSE-src-$QTVER + else + PACKAGE_NAME=qt-everywhere-$LICENSE-src-$QTVER + fi else - PACKAGE_NAME=$REPO_NAME-$LICENSE-src-$QTVER + if [ $PRODUCT_NAME ]; then + PACKAGE_NAME=$REPO_NAME-$PRODUCT_NAME-$LICENSE-src-$QTVER + else + PACKAGE_NAME=$REPO_NAME-$LICENSE-src-$QTVER + fi fi MODULES=$CUR_DIR/submodules.txt _TMP_DIR=$CUR_DIR/$PACKAGE_NAME @@ -485,9 +503,17 @@ if [ $MULTIPACK = yes -a $SINGLEMODULE = no ]; then for POSTFIX in "7z" "zip" "tar.gz" "tar.xz"; do if [ -f $PACKAGE_NAME.$POSTFIX ]; then if [[ $POSTFIX == *"tar"* ]]; then - mv $PACKAGE_NAME.$POSTFIX submodules_tar/$REPO_NAME-$LICENSE-src-$QTVER.$POSTFIX + if [ $PRODUCT_NAME ]; then + mv $PACKAGE_NAME.$POSTFIX submodules_tar/$REPO_NAME-$PRODUCT_NAME-$LICENSE-src-$QTVER.$POSTFIX + else + mv $PACKAGE_NAME.$POSTFIX submodules_tar/$REPO_NAME-$LICENSE-src-$QTVER.$POSTFIX + fi else - mv $PACKAGE_NAME.$POSTFIX submodules_zip/$REPO_NAME-$LICENSE-src-$QTVER.$POSTFIX + if [ $PRODUCT_NAME ]; then + mv $PACKAGE_NAME.$POSTFIX submodules_zip/$REPO_NAME-$PRODUCT_NAME-$LICENSE-src-$QTVER.$POSTFIX + else + mv $PACKAGE_NAME.$POSTFIX submodules_zip/$REPO_NAME-$LICENSE-src-$QTVER.$POSTFIX + fi fi fi done -- cgit v1.2.3