[scribus-dev] Tables GSoC - Weekly Report #2

[Elvis Stansvik]

Hi Jain,

2011/6/13 Jain Basil Aliyas <jainbasil at gmail.com>:
> Hi Estan,
>
> While trying to push my changes, I had to perform a git pull first. This
> pulled some changes, like scribus/tests etc. Now, I am unable to build the
> code.

Right, I'm really sorry about that. It's me who wrongly turned on
building of tests, even when the CMake variable WITH_TESTS is not
defined, and there were some old tests by avox in there who doesn't
compile.

I've fixed this in my branch, but until that reaches your branch by
the next merge by malex, you can just remove line 11 in
scribus/CMakeLists.txt:

ADD_SUBDIRECTORY(tests)

and you should be able to build again.

I think malex tried to fix it in both our repos in commit
58a9420d133b82c59c6806a2f8a28d075327c512 by not including index.h, but
that's not enough since there was code depending on this missing file.
The above should let you compile again though (I have proper fixes for
compilation in my branch, so that building with WITH_TEST defined will
compile again).

Again, sorry for the inconvenience!

Elvis

> Error Log:
> [ 78%] Built target Scribus
> [ 78%] Built target cellareatests
> [ 78%] Building CXX object
> scribus/tests/CMakeFiles/scribus_tests_lib.dir/testIndex.cpp.o
> /Users/jain/Projects/gsoc11scripter/Scribus/scribus/tests/testIndex.cpp: In
> member function ‘void TestIndex::empty()’:
> /Users/jain/Projects/gsoc11scripter/Scribus/scribus/tests/testIndex.cpp:27:
> error: ‘Index’ was not declared in this scope
> /Users/jain/Projects/gsoc11scripter/Scribus/scribus/tests/testIndex.cpp:27:
> error: expected `;' before ‘idx’
> /Users/jain/Projects/gsoc11scripter/Scribus/scribus/tests/testIndex.cpp:28:
> error: ‘idx’ was not declared in this scope
> /Users/jain/Projects/gsoc11scripter/Scribus/scribus/tests/testIndex.cpp:29:
> error: ‘idx’ was not declared in this scope
> /Users/jain/Projects/gsoc11scripter/Scribus/scribus/tests/testIndex.cpp:30:
> error: ‘idx’ was not declared in this scope
> /Users/jain/Projects/gsoc11scripter/Scribus/scribus/tests/testIndex.cpp:31:
> error: ‘idx’ was not declared in this scope
> /Users/jain/Projects/gsoc11scripter/Scribus/scribus/tests/testIndex.cpp:32:
> error: ‘idx’ was not declared in this scope
> /Users/jain/Projects/gsoc11scripter/Scribus/scribus/tests/testIndex.cpp:33:
> error: ‘idx’ was not declared in this scope
> /Users/jain/Projects/gsoc11scripter/Scribus/scribus/tests/testIndex.cpp: In
> member function ‘void TestIndex::add()’:
> /Users/jain/Projects/gsoc11scripter/Scribus/scribus/tests/testIndex.cpp:39:
> error: ‘Index’ was not declared in this scope
> /Users/jain/Projects/gsoc11scripter/Scribus/scribus/tests/testIndex.cpp:39:
> error: expected `;' before ‘idx’
> /Users/jain/Projects/gsoc11scripter/Scribus/scribus/tests/testIndex.cpp:40:
> error: ‘idx’ was not declared in this scope
> make[2]: ***
> [scribus/tests/CMakeFiles/scribus_tests_lib.dir/testIndex.cpp.o] Error 1
> make[1]: *** [scribus/tests/CMakeFiles/scribus_tests_lib.dir/all] Error 2
> make: *** [all] Error 2
>
> Do we have any extra dependencies added ?
>
> On Sun, Jun 12, 2011 at 11:15 PM, Elvis Stansvik <elvstone at gmail.com> wrote:
>>
>> 2011/6/12 Elvis Stansvik <elvstone at gmail.com>:
>> > ...
>> > I do however have one non-code-related concern which turned up while
>> > writing this report; I noticed that after malex did the updating of my
>> > gsoc11tables Git repo from your internal SVN, some of my old commits
>> > started showing up twice in `git log'. As an example, my very first
>> > commit "Add a (very) rough first prototype of a table style." is now
>> > visible as both:
>> >
>> > 0b17201cf816a883b80daae139f24c6a7c093939 and
>> > 0a8327820da7a88952744ac4a97314f075018869
>> >
>> > in the Git history or gsoc11tables. The second one is the one that
>> > turned up after the merging and it has malex as commiter and me as
>> > author (Git makes a difference between the two). I'm no Git expert,
>> > but think this may be due to the pushing of SVN changes into the Git
>> > repo is done using git-svn. Ideally we would have no such duplicates,
>> > but I'm not sure how to achieve it. So; malex, do you think you could
>> > look into this? If it's not possible then it's not possible, but it's
>> > kind of annoying when trying to work out the history of things when
>> > old commits show up as if they were new. Maybe ask someone really
>> > git-wizard person about it.
>>
>> malex just informed me on IRC that he's aware of the issue and will
>> fix it *thumbs up*.
>>
>> Elvis
>>
>> _______________________________________________
>> scribus-dev mailing list
>> scribus-dev at lists.scribus.net
>> http://lists.scribus.net/mailman/listinfo/scribus-dev
>
> Thanks,
>
> --
> jain basil aliyas.
> http://blog.jainbasil.net
>
> _______________________________________________
> scribus-dev mailing list
> scribus-dev at lists.scribus.net
> http://lists.scribus.net/mailman/listinfo/scribus-dev
>
>