mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Consolidate scripts

Browse source 
Since commit c496d5fa05 ("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>
This commit is contained in:
Dirk Hohndel 2016-01-08 21:46:44 -08:00
parent 04d4da50c4
commit 7c459f87cd
2 changed files with 4 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
packaging/android/build.sh
View file

@ -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
pushd $SUBSURFACE_SOURCE
bash ./scripts/mobilecomponents.sh
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=$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

41
scripts/build.sh
View file

@ -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