diff options
| author | Iikka Eklund <iikka.eklund@digia.com> | 2014-02-17 15:08:55 +0200 |
|---|---|---|
| committer | Iikka Eklund <iikka.eklund@digia.com> | 2014-02-17 14:26:03 +0100 |
| commit | 1ed6313c4ee2fa7cf840205cb684c34343784441 (patch) | |
| tree | 756d1fb569dbb81b133f6c70e5ebf83e90bcaabf | |
| parent | 7ca2894abb87ec8425e5fdc26e75d975d26b6d47 (diff) | |
Fix mksrc.sh
Packaging the super repo (qt5.git) itself was broken when creating
split packages. Make the script produce the "split package" also from
the super repo itself.
Change-Id: I5f59398a2f41f0c85349dc669a9eafc03f98e52c
Reviewed-by: Samuli Piippo <samuli.piippo@digia.com>
Reviewed-by: Kalle Viironen <kalle.viironen@digia.com>
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
| -rwxr-xr-x | packaging-tools/mksrc.sh | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/packaging-tools/mksrc.sh b/packaging-tools/mksrc.sh index b50e8c5de..8e881e74e 100755 --- a/packaging-tools/mksrc.sh +++ b/packaging-tools/mksrc.sh @@ -124,6 +124,7 @@ function create_and_delete_submodule() echo " - Done zipping $_file -" ) & wait + rm -rf $_file done < $MODULES cd .. } @@ -411,6 +412,17 @@ if [ $MULTIPACK = yes -a $SINGLEMODULE = no ]; then mv $PACKAGE_NAME.* single/ echo " -- Creating archives per submodule -- " create_and_delete_submodule + echo " -- Creating archive from super repository" + create_main_file + 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 + else + mv $PACKAGE_NAME.$POSTFIX submodules_zip/$REPO_NAME-$LICENSE-src-$QTVER.$POSTFIX + fi + fi + done fi cleanup |