summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/build.sh41
1 files changed, 2 insertions, 39 deletions
diff --git a/scripts/build.sh b/scripts/build.sh
index 2c470ef94..b28cffd83 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -170,45 +170,8 @@ fi
# pull the plasma-mobile components from upstream if building Subsurface-mobile
if [ "$SUBSURFACE_EXECUTABLE" = "MobileExecutable" ] ; 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
- cd $SRC
- 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
- popd
-
- # now copy the components and a couple of icons into plae
- MC=$SRC/subsurface/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
+ cd $SRC/subsurface
+ bash ./scripts/mobilecomponents.sh
fi
# finally, build Subsurface