Compiling error in Linux

[mersinliali]

Hi,
I have just got the GAE source by git. It is the first time I use git. I could see the revision number when it was svn update and report the bugs or errors with that number attached in the subject. Is there a way to learn which revision I pull by git? Therefore I can report anything wrong systematically.

Now, what I have is:

(click to show/hide)

......
......
[ 32%] Built target blendnorm
Scanning dependencies of target gae_mapeditor
[ 33%] Building CXX object source/map_editor/CMakeFiles/gae_mapeditor.dir/renderer.cpp.o
[ 34%] Building CXX object source/game/CMakeFiles/glestadv.dir/pch.cpp.o
[ 34%] Building CXX object source/map_editor/CMakeFiles/gae_mapeditor.dir/map_maker.cpp.o
[ 34%] Building CXX object source/game/CMakeFiles/glestadv.dir/ai/ai.cpp.o
[ 35%] Building CXX object source/map_editor/CMakeFiles/gae_mapeditor.dir/program.cpp.o
In file included from /home/Glest/glestae_git/source/game/prototypes/faction_type.h:15,
                 from /home/Glest/glestae_git/source/game/prototypes/tech_tree.h:19,
                 from /home/Glest/glestae_git/source/game/world/world.h:19,
                 from /home/Glest/glestae_git/source/game/ai/ai.h:18,
                 from /home/Glest/glestae_git/source/game/ai/ai.cpp:13:
/home/Glest/glestae_git/source/game/prototypes/unit_type.h: In member function 'Glest::ProtoTypes::CloakClass Glest::ProtoTypes::UnitType::getCloakClass() const':
/home/Glest/glestae_git/source/game/prototypes/unit_type.h:143: error: operands to ?: have different types 'Glest::ProtoTypes::CloakClass' and 'Glest::ProtoTypes::CloakClass::Enum'
[ 35%] Building CXX object source/map_editor/CMakeFiles/gae_mapeditor.dir/main.cpp.o

*** 1 errors, 0 warnings
make[2]: *** [source/game/CMakeFiles/glestadv.dir/ai/ai.cpp.o] Error 1
make[1]: *** [source/game/CMakeFiles/glestadv.dir/all] Error 2
make[1]: *** Waiting for unfinished jobs....
[ 36%] Building CXX object source/map_editor/CMakeFiles/gae_mapeditor.dir/map.cpp.o
Linking CXX executable gae_mapeditor
[ 36%] Built target gae_mapeditor
make: *** [all] Error 2

Best regards,
Ali

[Cygal]

git log -1 will show you the last registered commit, which is the last revision if you did not commit anything locally. Don't try to apply too much of you svn knowledge to git: it is decentralized whereas svn is not.

[John.d.h]

I'm getting the same compile error here as well.

[silnarm]

Thanks guys, will be pushing a fix shortly.

As Cygal has pointed out, git is quite different to svn, there are no sequential revision numbers, git calculates a hash to identify all commits, while these are long the first 6 or so digits should be sufficient to identify a commit.

So, at time of writing, head (refs/heads/master) is currently at commit 'eee8ac...'

If you have just done git pull then get a compile error, just saying you're on 'head' would also be fine.

Cheers.

Edit: Fix is in (and head of master is now at 4da367b..)