Getting Angband from Github and compiling it

[Tobias]

In that case you should check out: https://github.com/angband/angband.

I had seen it but I can't find the search function no matter how much I look.

[Magnate]

No I meant on the website. In the old days the you could search the commit log from the trac.rephial.org site. Or maybe I am remembering wrong.

Your memory is correct - trac integrates very well with svn, and the browsing was cool. We *could* set up trac to browse the git repo online, but it's crushingly slow - trac and git do not like each other much. So as d_m says, you're better off browsing the commits at github itself. Just go to the official repo (link in d_m's reply) and click the Commits button.

[d_m]

No I meant on the website. In the old days the you could search the commit log from the trac.rephial.org site. Or maybe I am remembering wrong.

In that case you should check out: https://github.com/angband/angband.

[Tobias]

Depends on what you mean. You can do things like "git log" and just scroll around to read it, or you can do "git log | grep 'hello world'" to search for 'hello world'. You can also do "git grep" if you want to find a particular piece of sourcecode (or something) that is no longer there.

No I meant on the website. In the old days the you could search the commit log from the trac.rephial.org site. Or maybe I am remembering wrong.

[d_m]

Also, how can you search the online tree, or the commit log, like you could on the old system?

Depends on what you mean. You can do things like "git log" and just scroll around to read it, or you can do "git log | grep 'hello world'" to search for 'hello world'. You can also do "git grep" if you want to find a particular piece of sourcecode (or something) that is no longer there.

And what is the easiest way to restore a single file to the official state?

git checkout FILE will revert FILE to its current state in HEAD. This will be the same as the official state as long as you aren't committing to the repo yourself.

[Tobias]

Thanks Magnate, I will try this sometime.

Also, how can you search the online tree, or the commit log, like you could on the old system?

And what is the easiest way to restore a single file to the official state?

[Magnate]

I meant, the online fork on github. How do I rebase this to a newer main version?

1. Clone your fork locally using "git clone http://github.com/yourID/angband". You now have a local repo which tracks your fork as a remote called "origin".

2. Add the official repo as a remote with "git remote add official http://github.com/angband/angband".

3. Update your local tracking of the official repo with "git fetch official".

4. Merge the latest official changes into your local repo with "git merge official/master".

5. Push those changes up to your github repo with "git push origin master".

This assumes you have not strayed from your master branch in your local repo during this whole exercise.

[Tobias]

If you branched from the official github repository, then 'git pull' should automatically merge them in for you.

I meant, the online fork on github. How do I rebase this to a newer main version?

[takkaria]

How do you pull changes from the main repo into your personal fork?

If you branched from the official github repository, then 'git pull' should automatically merge them in for you.

[Tobias]

How do you pull changes from the main repo into your personal fork?

[takkaria]

Did not thunk of that it might be a simple mis-spelling:

https://github.com/angband/angband/blob/master/src/z-file.c#L18

#ifdef WINDOWS
# include <windows.h>
# include <io.h>
# include <direct.h>
#endif

Actually, it's not just a simple misspelling, because that works absolutely fine when building the game for me. But if it fixes it for you, excellent.

[Spacebux]

do you not mean dirent.h?

Did not thunk of that it might be a simple mis-spelling:

https://github.com/angband/angband/blob/master/src/z-file.c#L18

#ifdef WINDOWS
# include <windows.h>
# include <io.h>
# include <direct.h>
#endif

[takkaria]

Yeah, that is what I was doing...

It couldn't locate that certain header file, so I yanked that section out of the code, and it compiles.

direct.h <-- file not found... so, no directory creation for me.

-SBux-

do you not mean dirent.h?

[Spacebux]

To build for Windows, you're supposed to cd into src and then run "make -f Makefile.win"... is that what you're doing?

Yeah, that is what I was doing...

It couldn't locate that certain header file, so I yanked that section out of the code, and it compiles.

direct.h <-- file not found... so, no directory creation for me.

-SBux-

[d_m]

To build for Windows, you're supposed to cd into src and then run "make -f Makefile.win"... is that what you're doing?