From kde-buildsystem  Sat May 21 21:29:43 2011
From: Dirk Mueller <mueller () kde ! org>
Date: Sat, 21 May 2011 21:29:43 +0000
To: kde-buildsystem
Subject: Re: KDE 4.7 Beta1 (4.6.80) tarballs uploaded (try#1)
Message-Id: <201105212329.43359.mueller () kde ! org>
X-MARC-Message: https://marc.info/?l=kde-buildsystem&m=130601337331752
MIME-Version: 1
Content-Type: multipart/mixed; boundary="--Boundary-00=_H7C2Nh8cql5Aqwb"

--Boundary-00=_H7C2Nh8cql5Aqwb
Content-Type: Text/Plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit

On Saturday 21 May 2011, Eric Hameleers wrote:

> The turn of events with KDE 4.7.x is most unfortunate. I noticed an
> explosion of source tarballs.

Yes, I started to resemble the git layout in the tarballs, given that I had a 
pain in the ass of work to do with reverting the git splitting for the 4.6 
branch releases. I'll attach them for reference, but those scripts are ugly. 
I'm not aware of a better solution though, unless we use git submodules or 
maintain those scripts in the SVN.

> Dirk, are instructions available on how
> to re-assemble sources back to the original set? Or else, are
> instructions available on how to compile the bigger all-comprising
> packages where the separated applications and libraries are included
> again, like was the case all the time up to 4.7?

I don't have those available at the moment. I used scripts to reassemble them 
to original tarballs, but I haven't properly pushed this into KDE git back 
yet. 

Can I get the opinion of the other distro packagers as well please? Personally 
I was much more happy with the previous module-based layout, though I can cope 
reasonable with the current situation as well. Any other opinon?

Eric, thanks for sharing your thoughts. I hope we can find a solution that 
suits your needs as well. If all else fails, I'm willing to give maintaining 
those reassembling-scripts a try, but it is an extra effort, given that the 
tarballs are much different from how developers build it, so regressions in the 
build system are likely. 

Greetings,
Dirk

--Boundary-00=_H7C2Nh8cql5Aqwb
Content-Type: application/x-shellscript;
  name="setup-kdeedu.sh"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="setup-kdeedu.sh"

#!/bin/bash
# vim: sw=4 et

set -x
set -e

setup_branch_checkout()
{
    git branch --track 4.6 remotes/origin/4.6
    git checkout 4.6
}

svn export -N $BASE/tags/KDE/4.6.2/kdeedu
(
    cd kdeedu

    for d in blinken cantor kalgebra kalzium kanagram kbruch kgeography khangman kig kiten klettres kmplot kstars ktouch kturtle kwordquiz libkdeedu parley rocs step; do

        git clone git@git.kde.org:$d
        ( cd $d; setup_branch_checkout )
    done


    git clone git@git.kde.org:marble
    (cd marble; git checkout kde-4.6 )

)

--Boundary-00=_H7C2Nh8cql5Aqwb
Content-Type: application/x-shellscript;
  name="setup-kdegraphics.sh"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="setup-kdegraphics.sh"

#!/bin/bash
# vim: sw=4 et

set -x
set -e

setup_branch_checkout()
{
    git branch --track KDE/4.6 remotes/origin/KDE/4.6
    git checkout KDE/4.6
}

svn export $BASE/branches/KDE/4.6/kdegraphics
(
    cd kdegraphics

    for d in kamera kgamma kcolorchooser gwenview kolourpaint ksaneplugin ksnapshot kruler svgpart; do
        rm -rf $d
        rm -rf doc/$d
        sed -i -e "s,add_subdirectory.*$d.*,," doc/CMakeLists.txt

        git clone git@git.kde.org:$d
        ( cd $d; setup_branch_checkout )
    done

    (
        cd libs
        for d in libkdcraw libkexiv2 libkipi libksane; do
            rm -rf $d
            git clone git@git.kde.org:$d
            (cd $d; setup_branch_checkout )
        done
    )

    rm -rf strigi-analyzer
    git clone git@git.kde.org:kdegraphics-strigi-analyzer strigi-analyzer
    ( cd strigi-analyzer; setup_branch_checkout )

    rm -rf thumbnailers
    git clone git@git.kde.org:kdegraphics-thumbnailers thumbnailers
    ( cd thumbnailers; setup_branch_checkout )

)

--Boundary-00=_H7C2Nh8cql5Aqwb
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
Kde-buildsystem mailing list
Kde-buildsystem@kde.org
https://mail.kde.org/mailman/listinfo/kde-buildsystem

--Boundary-00=_H7C2Nh8cql5Aqwb--