From 2480f21e5b2463bd5ac82980f44386277f24c51f Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Thu, 10 Mar 2016 14:40:19 +0100 Subject: correctly build on android --- scripts/mobilecomponents.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'scripts/mobilecomponents.sh') diff --git a/scripts/mobilecomponents.sh b/scripts/mobilecomponents.sh index 590481468..6d535fa26 100755 --- a/scripts/mobilecomponents.sh +++ b/scripts/mobilecomponents.sh @@ -14,17 +14,17 @@ if [ ! -d "$SRC/subsurface" ] || [ ! -d "qt-mobile" ] || [ ! -d "subsurface-core exit 1 fi -# now bring in the latest Plasma-mobile mobile components plus a couple of icons that we need +# now bring in the latest Kirigami 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 +if [ ! -d kirigami ] ; then + git clone git://github.com/KDE/kirigami fi -pushd plasma-mobile +pushd kirigami git pull popd if [ ! -d breeze-icons ] ; then @@ -36,7 +36,7 @@ popd # now copy the components and a couple of icons into plae MC=$SRC/subsurface/qt-mobile/qml/mobilecomponents -PMMC=plasma-mobile/components/mobilecomponents +PMMC=kirigami/src BREEZE=breeze-icons rm -rf $MC -- cgit v1.2.3-70-g09d2 From 2069526e74505e873140f7be35871db7acbc084d Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Thu, 31 Mar 2016 18:10:24 -0500 Subject: Update script to pull Kirigami Now with it's own repository and slightly different paths. Signed-off-by: Dirk Hohndel --- scripts/mobilecomponents.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'scripts/mobilecomponents.sh') diff --git a/scripts/mobilecomponents.sh b/scripts/mobilecomponents.sh index 590481468..0ead42258 100755 --- a/scripts/mobilecomponents.sh +++ b/scripts/mobilecomponents.sh @@ -21,10 +21,10 @@ fi # 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 +if [ ! -d kirigami ] ; then + git clone git://anongit.kde.org/kirigami.git fi -pushd plasma-mobile +pushd kirigami git pull popd if [ ! -d breeze-icons ] ; then @@ -35,14 +35,14 @@ 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 +MC=$SRC/subsurface/qt-mobile/qml/kirigami +PMMC=kirigami/src/qml BREEZE=breeze-icons rm -rf $MC mkdir -p $MC/icons -cp -R $PMMC/qml/* $MC/ -cp $PMMC/fallbacktheme/*qml $MC/ +cp -R $PMMC/* $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 @@ -55,4 +55,4 @@ cp $BREEZE/icons/actions/24/application-menu.svg $MC/icons cp $BREEZE/icons/actions/22/gps.svg $MC/icons cp $BREEZE/icons/actions/24/trash-empty.svg $MC/icons -echo org.kde.plasma.mobilecomponents synced from upstream +echo org.kde.plasma.kirigami synced from upstream -- cgit v1.2.3-70-g09d2 From fba14709bc0ffd5d434886bcb2383a119efb18f2 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Fri, 1 Apr 2016 16:40:07 -0500 Subject: Disable kirigami plugin when copying the components Signed-off-by: Dirk Hohndel --- scripts/mobilecomponents.sh | 3 +++ 1 file changed, 3 insertions(+) (limited to 'scripts/mobilecomponents.sh') diff --git a/scripts/mobilecomponents.sh b/scripts/mobilecomponents.sh index ac3d1c1c4..844d359c3 100755 --- a/scripts/mobilecomponents.sh +++ b/scripts/mobilecomponents.sh @@ -44,6 +44,9 @@ mkdir -p $MC/icons cp -R $PMMC/* $MC/ cp $PMMC/../fallbacktheme/*qml $MC/ +# fix plugin requirement +sed -i -e 's/^plugin kirigamiplugin/# plugin kirigamiplugin/' $PMMC/kirigami/qmldir + 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 -- cgit v1.2.3-70-g09d2 From f19ffb28c6913036e3a15a09976293231b6e3f4b Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Fri, 1 Apr 2016 20:11:56 -0500 Subject: Minor tweak to script to pull Kirigami This just allows the script to be used when you are working locally on Kirigami to test changes - no point in waiting for a pull from upstream then. The only goal is to copy the files over. Signed-off-by: Dirk Hohndel --- scripts/mobilecomponents.sh | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) (limited to 'scripts/mobilecomponents.sh') diff --git a/scripts/mobilecomponents.sh b/scripts/mobilecomponents.sh index 844d359c3..7300ca2bd 100755 --- a/scripts/mobilecomponents.sh +++ b/scripts/mobilecomponents.sh @@ -14,6 +14,10 @@ if [ ! -d "$SRC/subsurface" ] || [ ! -d "qt-mobile" ] || [ ! -d "subsurface-core exit 1 fi +if [ "$1" = "-nopull" ] ; then + NOPULL=1 +fi + # now bring in the latest Kirigami 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 @@ -24,15 +28,19 @@ cd $SRC if [ ! -d kirigami ] ; then git clone git://github.com/KDE/kirigami fi -pushd kirigami -git pull -popd +if [ "$NOPULL" = "" ] ; then + pushd kirigami + git pull + popd +fi if [ ! -d breeze-icons ] ; then git clone git://anongit.kde.org/breeze-icons fi -pushd breeze-icons -git pull -popd +if [ "$NOPULL" = "" ] ; then + pushd breeze-icons + git pull + popd +fi # now copy the components and a couple of icons into plae MC=$SRC/subsurface/qt-mobile/qml/kirigami @@ -45,7 +53,7 @@ cp -R $PMMC/* $MC/ cp $PMMC/../fallbacktheme/*qml $MC/ # fix plugin requirement -sed -i -e 's/^plugin kirigamiplugin/# plugin kirigamiplugin/' $PMMC/kirigami/qmldir +sed -i -e 's/^plugin kirigamiplugin/# plugin kirigamiplugin/' $MC/qmldir cp $BREEZE/icons/actions/24/dialog-cancel.svg $MC/icons cp $BREEZE/icons/actions/24/distribute-horizontal-x.svg $MC/icons -- cgit v1.2.3-70-g09d2