Getting Angband from Github and compiling it

[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.

[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.

[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.

[Max Stats]

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.

If you click "Commits" in the bar at the top of the screen, it will show you a list of commits grouped by date, starting with the most recent. Is that it?

[konijn_]

(Pav - I thought I'd offer this because the stickied SVN thread is now out-of-date for V - feel free to nuke it if it's not helpful enough. Maybe it's obsolete now we have nightlies?)

This tutorial assumes that you are using git at a command line. If you are using git via a GUI or IDE, you probably know all this already. Besides, there are too many possible GUIs to cover them all.

First off, awesome !! Github is what I've been ranting about without being able to put a name or technology on it.

Second off, I forked Angband and it wont compile for Cygwin with .win ( which wants me to use Ming ?? ) , the .std compiles till it hits wiz-stats.c and then dies on this :

wiz-stats.c:1107: error: `for' loop initial declaration used outside C99 mode
wiz-stats.c:1115: error: `for' loop initial declaration used outside C99 mode

And the crapton of warnings... makes my eyes bleed and sigh deeply. Are these warnings only visible in cygwin or do we no longer care about clean compiles ?

T.

[konijn_]

First off, awesome !! Github is what I've been ranting about without being able to put a name or technology on it.

Second off, I forked Angband and it wont compile for Cygwin with .win ( which wants me to use Ming ?? ) , the .std compiles till it hits wiz-stats.c and then dies on this :

wiz-stats.c:1107: error: `for' loop initial declaration used outside C99 mode
wiz-stats.c:1115: error: `for' loop initial declaration used outside C99 mode

And the crapton of warnings... makes my eyes bleed and sigh deeply. Are these warnings only visible in cygwin or do we no longer care about clean compiles ?

T.

As always, when flaming, I find stuff out.
I guess you dont see the warnings because of
-Wno-unused-parameter -Wno-missing-field-initializers -std=c99 -Wdeclaration-after-statement

which is most interesting.

Also, I read the docs which said 'Cygwin is not advised' which stinks for me personally since I need cygwin and Ming and cygwin dont play nice together ( or at least havent played nicely together in the past )

I will reply to myself with anything else of interest.

T.

-or- I could just keep editing this message.

Whoever took care of the Mac Port is a frickin genius !!! It compiles and works beautifully....

T.

[konijn_]

direct <> dirent

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.

Greetings,

see http://en.wikipedia.org/wiki/Direct.h and http://en.wikipedia.org/wiki/Dirent.h

I would vote to use dirent.h, since it is posix and direct.h is a c++ header file ?

T.

[d_m]

Hey Konijn, Good to see you again!

The Windows port is in a weird state, sadly. Right now only one of the active devs uses Windows (Mingw) and everyone else cross-compiles (also with Mingw) and plays the Windows port with WINE. So... support is a bit bad for other situations (Cygwin and MSVC++ for instance) simply because we can't support them very well without using them.

If you haven't already, I would strongly recommend creating yourself a Github account and forking angband, to make it easy to send us patches, suggestsions, features, etc.

If you made a patch to Makefile.win that will allow things to work with Cygwin, that would be great. I haven't had time to fully understand your comment about dirent.h versus direct.h but I will try to. Even though I mostly use Linux I'm trying to improve the Windows port (I just checked in PNG support which was mostly written by Blue Baron but hacked in by me), so please feel free to send me feedback about it.

Thanks!

[konijn_]

Hey Konijn, Good to see you again!

The Windows port is in a weird state, sadly. Right now only one of the active devs uses Windows (Mingw) and everyone else cross-compiles (also with Mingw) and plays the Windows port with WINE. So... support is a bit bad for other situations (Cygwin and MSVC++ for instance) simply because we can't support them very well without using them.

If you haven't already, I would strongly recommend creating yourself a Github account and forking angband, to make it easy to send us patches, suggestsions, features, etc.

If you made a patch to Makefile.win that will allow things to work with Cygwin, that would be great. I haven't had time to fully understand your comment about dirent.h versus direct.h but I will try to. Even though I mostly use Linux I'm trying to improve the Windows port (I just checked in PNG support which was mostly written by Blue Baron but hacked in by me), so please feel free to send me feedback about it.

Thanks!

Greetings, for direct vs dirent, there is an another forum post that discusses that direct.h is not available under cygwin, but dirent.h is. I just downloaded VC Studio 10, so I will try my luck with that.

T.

[Spacebux]

Greetings, for direct vs dirent, there is an another forum post that discusses that direct.h is not available under cygwin, but dirent.h is. I just downloaded VC Studio 10, so I will try my luck with that.

T.

I cropped the offending part of the code from z-file.c and commented out that dirent.h/direct.h part to get past that compilation error. I also brought forward the old make file from 3.2.0. That's how I was able to get the code to compile (using Cygwin, I could not get mingw to compile, actually), yet, the program only runs now from a cygwin prompt. I couldn't get the DLL fixed (haven't attempted it either, I'm NOT a Windoze expert, but I play one on TV).

-SBux-

[jens]

How to commit to GitHub?

I forked angband a while ago, and have been fetching the changes to look at it. Now I felt it was time to start contributing a bit. So, I've made some code changes I'd like to share, but can't get it to work...

This is what I did:
// make sure I have latest version
git fetch upstream
git merge upstream/master

// create my own branch
git branch feelings
git checkout feelings

// code
Edited the file I wanted to edit (using Notepad), copied the folder (to not mess up the Git folder with compilation junk), compiled and tested. OK, everything is working, time to commit.

// commit
git push git@github.com:jenschou/angband.git feelings

// check result

https://github.com/jenschou/angband/commits/feelings

##

So nothing happened, except I created a new branch on the remote repo. I can mention that I also did push master, and tried to change the url of origin so I don't have to write the url each time.

So, how do I manage to commit to my online repo? Which I suppose is a prerequisite to making a pull request...

[d_m]

I'm about to run, so I don't have time to look at what you did. But this is a procedure that I guarantee will work:

# assuming you have a remote called official (could be upstream or whatever)

git fetch --all
git checkout official/staging
git checkout -b MYNEWBRANCH

#make some changes

git commit -m "look some changes" -a
git push origin MYNEWBRANCH

# go to github and see your new branch with your code changes.

[jens]

git commit -m "look some changes" -a

Yeay, it works! I have now successfully sent a pull request :-)

The thing I had missed was to make my local commit. I had read the start-up tutorials, and there when talking about contributing they only mentioned how to push your commits. I assumed that pushing commits meant commiting as well, but nope.

I tried to enter a better commit message, but I don't know vim, so it seems a bit of a hassle. How do you guys generally do it? Because when checking your commits you don't generally use one liners...

[d_m]

Yeay, it works! I have now successfully sent a pull request :-)

The thing I had missed was to make my local commit. I had read the start-up tutorials, and there when talking about contributing they only mentioned how to push your commits. I assumed that pushing commits meant commiting as well, but nope.

I tried to enter a better commit message, but I don't know vim, so it seems a bit of a hassle. How do you guys generally do it? Because when checking your commits you don't generally use one liners...

If you don't want to use vim, you can change which editor gets used by modifying your .bashrc/.profile, and adding something like:

export EDITOR=emacs

If you are a beginner you could use nano. I like emacs pretty well and other developers like vim.

[jens]

Neither are very easy to use on Windows... Though I did have Emacs installed in a previous version. Now I know how to insert text, and exit again from vim, and thats all I'll need, so I guess I can keep using it :-)