Commit Graph
10039 Commits
Author SHA1 Message Date
nhmall 43935698e0 TRAVIS CI updated to include Windows and osx testing
TRAVIS CI added Windows to their platform list in late 2018.

Update the .travis.yml file to include a pair of Windows in
machines in the testing suite, one built with visual studio
command line tools and the other with mingw gcc tools.

The visual studio build is currently using nmake with the
sys/winnt/Makefile.msc Makefile from our distribution,
That's the same process we've been using for building
our binaries, pretty much.

BRH may be able to modernize it over the next couple of
weeks to use the msbuild process instead.

I went with the HINTS environment variable on windows
for consistent self-documenting purposes, even though
the environment variable isn't used on windows.

included:
   os: linux
   Compiler: gcc C
   HINTS=linux

   os: linux
   Compiler: clang C
   HINTS=linux

   os: linux
   Compiler: gcc C
   HINTS=linux-x11

   os: linux
   Compiler: gcc C
   HINTS=linux-qt5

   os: linux
   Compiler: gcc C
   HINTS=linux-minimal

   os: windows
   language: shell
   HINTS=Windows-visual-studio

   os: windows
   HINTS=Windows-mingw

excluded:
   os: osx
   Compiler: clang
   Xcode: xcode10.2 C
   HINTS=macosx10.14
2019-11-06 17:25:44 +02:00
nhmall 29002ccf0b No PDCurses right out-of-the-box; requires an edit 2019-11-06 17:25:44 +02:00
nhmall 0c7e740b44 update Windows Makefiles to support TRAVIS CI builds 2019-11-06 17:25:44 +02:00
PatR de44286d79 curses+EDIT_GETLIN again
Turns the "fix" in commit 319dcf4746
handled removing the default answer for single-line-prompt plus
multi-line-answer but not for multi-line-prompt plus long-enough-
answer-to-reach-another-line.  The logic wasn't quite right and I
misunderstood what is stored in linestarts[] so even correct logic
wouldn't have solved things.
2019-11-06 17:25:44 +02:00
nhmall be94808d67 build fix for Windows if pdcurses is included after recent changes
cursmain.o : error LNK2001: unresolved external symbol _erase_char
cursmesg.o : error LNK2001: unresolved external symbol _erase_char
cursmain.o : error LNK2001: unresolved external symbol _kill_char
cursmesg.o : error LNK2001: unresolved external symbol _kill_char
2019-11-06 17:25:44 +02:00
nhmall 0b861f64e6 merge bit 2019-11-06 17:25:44 +02:00
nhmall a7e3129919 Merge branch 'NetHack-3.6' 2019-11-05 11:02:24 -05:00
nhmall e8c5da768e updated Guidebook.txt 2019-11-05 09:18:25 -05:00
nhmall 26121fca9a deafness left "Perhaps that why you cannot move it" message orphaned 2019-11-04 23:08:15 -05:00
nhmall 86aa5634a7 chasonr's msdos Makefile.gcc pdcurses build changes
# Please enter the commit message for your changes. Lines starting

closes #243
2019-11-04 22:50:04 -05:00
nhmall 9daa598e86 Merge branch 'chasonr-msdos-build-363' into NetHack-3.6 2019-11-04 22:47:21 -05:00
nhmall b66a2cd093 Merge branch 'msdos-build-363' of https://github.com/chasonr/NetHack into chasonr-msdos-build-363 2019-11-04 22:46:35 -05:00
Bart House d4ff00cd40 Updated windows directory paths to latest iteration of design. 2019-11-04 19:34:03 -08:00
Ray Chason 59c6425f4c Deal with FreeDOS bugs when building pdcurses.a 2019-11-04 22:26:47 -05:00
nhw_cron a778cf3e06 This is cron-daily v1-Oct-31-2019. files updated: Files 2019-11-04 21:53:52 -05:00
PatR 7efdec7f5e fix symset:curses S_tree
Symbol set changes...

curses:
  S_tree (use plus-or-minus sign instead of accidental horizontal line);
  S_bars (switch from default '#' to not-equals sign);

DECgraphics:
  S_altar (switch from default '_' to 'pi');
  S_bars (switch from 'pi' to not-equals sign);

DECgraphics_2: get rid of this commented out set since its contents are
  now folded into DECgraphics.

(The IBMgraphics one is just whitespace; delete a <space> that precedes
a <tab>.)
2019-11-04 10:42:14 -08:00
nhmall 2170b9946b Merge branch 'NetHack-3.6' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6 2019-11-04 12:33:01 -05:00
nhmall 25edd16945 code maintenance bit to white-list current "You hear" instances
Flag existing occurrences of "You hear" as "Deaf-aware" so
that a grep for that string in the future doesn't need to
trigger further investigation of those.
2019-11-04 12:28:25 -05:00
PatR fbc790a34d dipping into holy/unholy water while blind
Something I realized while following up a newsgroup post.  If you
knew an item's bless/curse state and dipped it into water while
blind, the bknown flag stayed set and you learned the item's new
bless/curse state without seeing any "glows blue/black/&c" feedback.
Clear the flag unless you know that the potion being dipped into is
water (or is clear if not water has not been discovered) and also
know the water potion's own bless/curse state.
2019-11-04 09:14:18 -08:00
Pasi Kallinen efbef0f22c Fix unleashable message given for non-leashed monster 2019-11-04 18:58:22 +02:00
nhmall f07bf610b8 Merge branch 'NetHack-3.6' 2019-11-04 01:18:24 -05:00
nhmall 93f95dd051 more deafness-related message corrections 2019-11-04 00:36:54 -05:00
Bart House c92544750a Merge branch 'NetHack-3.6' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6 2019-11-03 18:46:44 -08:00
Bart House a5080da898 Dismiss the splash dialog when user hits window close. 2019-11-03 18:46:33 -08:00
PatR f29a6b164d fix #H9392 - deafness vs music
Music wasn't using You_hear() so needs to handle Deaf itself.  Have
it give alternate messages for sounds being emitted from instruments.

This doesn't implement the suggestion that a Deaf hero shouldn't be
able to produce the same music as a non-deaf one.
2019-11-03 18:12:55 -08:00
Bart House 6b88a19365 Added new map_mode tiles_fit_to_screen for Windows NetHackW.exe 2019-11-03 17:59:39 -08:00
Bart House 2244720133 Built windows store package. 2019-11-03 17:39:18 -08:00
Bart House 7c5a2adfa5 Lock TROUBLEPREFIX after parsing sysconf. 2019-11-03 14:07:11 -08:00
Bart House da85259782 Fixes to template files . 2019-11-03 14:06:49 -08:00
Bart House f0707fee6e More tweaks to how windows deals with directory paths. 2019-11-03 13:31:17 -08:00
Bart House 0b23cac8ab Formatting changes to .nethackrc discussion for windows. 2019-11-03 08:03:01 -08:00
Bart House ecc8e7b9b0 Merge branch 'NetHack-3.6' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6 2019-11-03 07:52:46 -08:00
Bart House 395c970add Changes to windows based discussion of .nethackrc. 2019-11-03 07:52:33 -08:00
nhmall ffec86b244 Merge branch 'NetHack-3.6' 2019-11-02 22:53:46 -04:00
nhmall 9319e3577b use new Windows file names 2019-11-02 22:43:25 -04:00
nhmall a259d03460 Windows Makefile catch-up bits 2019-11-02 22:33:34 -04:00
Bart House 11018da6b8 Renamed configuration file for windows to .nethackrc.
Also adjusted name of template files populated during windows builds.
2019-11-02 19:11:26 -07:00
Bart House 2b73494296 Updated guidebook to discuss new loc and name of configuration file on win. 2019-11-02 18:18:48 -07:00
Bart House 4ab976d6fd Renamed defaults.nh to .nethackrc for windows. 2019-11-02 18:18:02 -07:00
Bart House 2b9e6a057b Removed the redundant #if definded(MSDOS). 2019-11-02 18:17:10 -07:00
PatR 2c1edc860c couple of Guidebook.tex bits
More symbols:  I left out a word on the continutation line for S_stone
and S_tool has been forcing narrow space where ordinary <comma><space>
was intended.
2019-11-02 17:15:54 -07:00
Bart House 9e309ab37a Merge branch 'NetHack-3.6' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6 2019-11-02 16:57:57 -07:00
Bart House ee1817f4ec Updates to fixes36.3 for recent work. 2019-11-02 16:57:43 -07:00
PatR d7354fe78c Guidebook.tex catch up, Guideboon.mn bits
Guidebook.tex not tested.  The \, in the continuation of S_stone is
a narrow space in LaTeX.  It should be \hspace{ width of '(' } but
I don't remember how to measure something in LaTeX or TeX.

Guidebook.mn is getting two small changes:  I forgot about the
guideline that each sentence be on its own line.  Also, this adds the
fix for wide lines in the dungeoneers list although the reordering
accompanying a recent change might have made that moot (unless some
future reordering puts wide names on the same line again, assuming
that was the issue).
2019-11-02 16:05:39 -07:00
Bart House 3a315a7c76 Make type Win10 and gWin10 local to win10.c module. 2019-11-02 12:10:13 -07:00
Bart House 0bbedb2933 Fix cut and paste error in output string. 2019-11-02 11:51:20 -07:00
Bart House 4e11038871 Merge branch 'NetHack-3.6' 2019-11-02 11:40:19 -07:00
Bart House 33149eed0e Move is_desktop_bridge() api to win10 wrapper. 2019-11-02 11:39:11 -07:00
nhmall 28a4c65caa Merge branch 'NetHack-3.6' 2019-11-02 12:12:59 -04:00
nhmall 91a8522871 Merge branch 'NetHack-3.6' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6 2019-11-02 09:32:22 -04:00