You should be able to use subtree merge to incorporate the external repo (submodule) into your repository, while retaining the ability to Pull from the external to get latest updates.
-Kevin On Mon, Sep 16, 2013 at 8:46 AM, Kirill <kasper_khar...@ukr.net> wrote: > Thanks a lot! > > > --- Исходное сообщение --- > От кого: "Tomasz Olszak" <olszak.tom...@gmail.com> > Дата: 16 сентября 2013, 17:31:11 > > >> 2013/9/16 Kirill <kasper_khar...@ukr.net> >> > Hello Sirs, >> > >> > >> > I have a problem with building a project for Tizen which contains git >> > submodule. >> > >> > >> > I develop a project for Tizen using EFL library. As a build system GBS is >> > used. >> > >> > >> > The project uses Google C++ Testing Framework (googletest) for unit tests. >> > >> > Sources of googletest are located within a project (in a subdirectory) and >> > are >> > >> > build with other sources. >> > >> > >> > When I put googletest sources directly into a subdirectory of the main >> > >> > repository, everything is fine. But, when I add a googletest as a git >> > submodule >> > >> > inside the same directory, GBS build system can't find sources of >> > googletest. >> > >> > >> > [ 9s] Cannot find source file: >> > >> > [ 9s] >> > >> > [ 9s] >> > /home/abuild/rpmbuild/BUILD/org.tizen.orion-0.2.10/tests/googletest/src/gtest-all.cc >> > >> > >> > In both cases sources location are the same. As I understand, in the >> > second case >> > >> > GBS don't copy the sources from the submodule? >> > >> > >> > Is there any way to tell GBS how to use sources from a git submodule? >> > >> > >> > Thanks, >> > >> > Kirill >> > >> > _______________________________________________ >> > >> > Application-dev mailing list >> > Application-dev@lists.tizen.org >> > https://lists.tizen.org/listinfo/application-dev >> >> gbs creates source package from you repository and unpacks it in gbs chroot >> so you clearly don't have submodule source in target build environment. >> >> >> >> I think there are 3 approaches: >> 1. Add googletest sources to your repo >> 2. Add googletest tarball as Source* in you project spec file (I haven't >> done this yet so I don't know if it will work) >> >> 3. Create additional project( rpm package) with googletest sources and add >> BuildRequires(googletest sources) in your app package spec file. This way >> before building your app gbs will download and extract googletest sources in >> some place (described in googletest spec file). >> >> >> >> -- >> regards / pozdrawiam, Tomasz Olszak >> Qt for Tizen | http://qt-project.org/wiki/Tizen >> >> Qt Certified Developer | http://qt-project.orghttp://linkedin.com/in/tolszak > _______________________________________________ > Application-dev mailing list > Application-dev@lists.tizen.org > https://lists.tizen.org/listinfo/application-dev _______________________________________________ Application-dev mailing list Application-dev@lists.tizen.org https://lists.tizen.org/listinfo/application-dev
