diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -1,27 +1,11 @@ -# KDevelop Platform Libraries +KDevPlatform has been moved into kdevelop.git:kdevplatform/ -This repository contains the KDevelop Platform Libraries, a set of libraries used to create plugins for [KDevelop](https://www.kdevelop.org/) or other IDEs based on kdevplatform. -The idea that this repository contains -- Everything to create platform plugins -- Everything to create platform applications -- Commonly used/important plugins (e.g. VCS plugins) +For copying private branches over to the other repo, use copy-branch.sh: -## Compile +cd kdevplatform +cp copy-branch.sh.in copy-branch.sh +# adapt the 3 variables at the begin of copy-branch.sh -To compile KDevelop, please refer to the Wiki instructions: -https://community.kde.org/KDevelop/HowToCompile_v5 - -## API Documentation - -API documentation is available from: -https://api.kde.org/extragear-api/kdevelop-apidocs/kdevplatform/html/index.html - -## Contribute - -If you want to contribute to KDevelop, please read through: -https://www.kdevelop.org/contribute-kdevelop - -## Infrastructure -- [Bug tracker](https://bugs.kde.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=CONFIRMED&bug_status=ASSIGNED&bug_status=REOPENED&list_id=1408918&product=kdevplatform&query_format=advanced) -- [Phabricator (task tracker, code review and more)](https://phabricator.kde.org/dashboard/view/8/?) +# now call the script for each branch that should be copied over +./copy-branch my-branch \ No newline at end of file diff --git a/copy-branch.sh.in b/copy-branch.sh.in new file mode 100755 --- /dev/null +++ b/copy-branch.sh.in @@ -0,0 +1,57 @@ +#!/bin/bash + +# public domain +# +# template for script for copying private branches over from kdevplatform repo to kdevelop repo + +# variables which need adapting: +KDEVPLATFORM_DIR=/path/to/kdevplatform +KDEVELOP_DIR=/path/to/kdevelop +PATCHESBASE_DIR=/tmp/kdevplatform-transfer-patches + + +if [ "$1" == "" ]; then + echo "Please pass a branch as argument." + exit 1 +fi + +# commit which is last of merged ones +KDEVPLATFORM_BASECOMMIT=9362447d74c81babdd8619f52435a3cadff49521 +BRANCH=$1 +PATCHES_DIR="$PATCHESBASE_DIR/$BRANCH" + +if [ -e "$PATCHES_DIR" ]; then + echo "Directory $PATCHES_DIR already exists, please remove." + exit 1 +fi + +mkdir -p "$PATCHES_DIR" || exit 1 + +cd "$KDEVPLATFORM_DIR" + +echo "Rebasing '$BRANCH' to merged commit from master in kdevplatform..." +git rebase $KDEVPLATFORM_BASECOMMIT $BRANCH || exit 1 + +echo "Creating patches of branch '$BRANCH' against 'master' in kdevplatform..." +git format-patch $KDEVPLATFORM_BASECOMMIT...$BRANCH -o "$PATCHES_DIR" || exit 1 + +cd "$KDEVELOP_DIR" + +echo "Creating branch '$BRANCH' in kdevelop, based on 'master'..." +# for something close to last kdevplatform master +git checkout -b $BRANCH 391e53faef2fba25abbd36da7d81596cb027e3fc || exit 1 + +if [ "$?" != 0 ]; then + echo "Could not create branch '$BRANCH'." + exit 1 +fi + +echo "Applying patches for branch '$BRANCH' in kdevelop..." +git am --directory=kdevplatform "$PATCHES_DIR"/* || exit 1 + +if [ "$?" != 0 ]; then + exit 1 +fi + +echo "Rebasing '$BRANCH' to master in kdevelop..." +git rebase master $BRANCH || exit 1