diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2016-01-08 21:46:44 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2016-01-08 21:46:44 -0800 |
| commit | 7c459f87cdbf862208710f8d08e0853aef2c8f0b (patch) | |
| tree | ab5a88bc3dec0467c13ae63107a0c9b495846e6f /packaging/android/build.sh | |
| parent | 04d4da50c4b760e2714b020fb8becd48ed6470c9 (diff) | |
| download | subsurface-7c459f87cdbf862208710f8d08e0853aef2c8f0b.tar.gz | |
Consolidate scripts
Since commit c496d5fa05a9 ("Add helper script to pull Plasma Mobile Components
and icons") we had three different spots where we retrieved the Plasma Mobile
Components. That's a wee bit of overkill. So instead have the other two scripts
just call this one.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'packaging/android/build.sh')
| -rw-r--r-- | packaging/android/build.sh | 39 |
1 files changed, 2 insertions, 37 deletions
diff --git a/packaging/android/build.sh b/packaging/android/build.sh index 51ea947aa..2f03d4e86 100644 --- a/packaging/android/build.sh +++ b/packaging/android/build.sh @@ -290,44 +290,9 @@ else fi if [ "$SUBSURFACE_MOBILE" = "ON" ] ; then - # now bring in the latest Plasma-mobile mobile components plus a couple of icons that we need - # first, get the latest from upstream - # yes, this is a bit overkill as we clone a lot of stuff for just a few files, but this way - # we stop having to manually merge our code with upstream all the time - # as we get closer to shipping a production version we'll likely check out specific tags - # or SHAs from upstream - if [ ! -d plasma-mobile ] ; then - git clone git://github.com/KDE/plasma-mobile - fi - pushd plasma-mobile - git pull - popd - if [ ! -d breeze-icons ] ; then - git clone git://anongit.kde.org/breeze-icons - fi - pushd breeze-icons - git pull + pushd $SUBSURFACE_SOURCE + bash ./scripts/mobilecomponents.sh popd - - # now copy the components and a couple of icons into plae - MC=$SUBSURFACE_SOURCE/qt-mobile/qml/mobilecomponents - PMMC=plasma-mobile/components/mobilecomponents - BREEZE=breeze-icons - - rm -rf $MC - mkdir -p $MC/icons - cp -R $PMMC/qml/* $MC/ - cp $PMMC/fallbacktheme/*qml $MC/ - - cp $BREEZE/icons/actions/24/dialog-cancel.svg $MC/icons - cp $BREEZE/icons/actions/24/distribute-horizontal-x.svg $MC/icons - cp $BREEZE/icons/actions/24/document-edit.svg $MC/icons - cp $BREEZE/icons/actions/24/document-save.svg $MC/icons - cp $BREEZE/icons/actions/24/go-next.svg $MC/icons - cp $BREEZE/icons/actions/24/go-previous.svg $MC/icons - cp $BREEZE/icons/actions/16/view-readermode.svg $MC/icons - - echo org.kde.plasma.mobilecomponents synced from upstream fi if [ ! -z "$SUBSURFACE_MOBILE" ] ; then |