From: nhmall Date: Fri, 4 Feb 2022 16:01:20 +0000 (-0500) Subject: more .gitattributes updates X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5d4fc4591d95bd571dbf07865679ca230d83793c;p=nethack more .gitattributes updates --- diff --git a/dat/GENFILES b/dat/GENFILES index eaf994740..2613ad90e 100755 --- a/dat/GENFILES +++ b/dat/GENFILES @@ -29,15 +29,15 @@ T (tile files optionally generated for X ports at playground creation time) F pet_mark.xbm F rip.xpm F x11tiles -T (files generated for Qt interface on Mac OS X) +T (files generated for Qt interface on macOS) F nethack.icns F Info.plist -T (files generated for win32 at compile time) +T (files generated for windows at compile time) F porthelp F dlb.lst -T (files generated for win32 tty at compile time) +T (files generated for windows tty at compile time) F ttyoptions -T (files generated for win32 gui at compile time) +T (files generated for windows gui at compile time) F guioptions T (files generated by makedefs at playground creation time) F data diff --git a/include/.gitattributes b/include/.gitattributes index 9fe9921df..4f7426c2b 100644 --- a/include/.gitattributes +++ b/include/.gitattributes @@ -1,15 +1,4 @@ * NH_filestag=(file%s_for_all_versions) -..files NH_filegenerated=win32api.h,tile.h,date.h - -win32api.h NH_filesgentag=(file%s_for_win32_that_are_moved_into_include_at_compile_time) - -tile.h NH_filesgentag=(file%s_for_tiles_support_copied_from_win/share_at_compile_time) - -dgn_comp.h NH_filesgentag=(file%s_generated_by_yacc_(or_copied_from_sys/share)_at_compile_time) -lev_comp.h NH_filesgentag=>dgn_comp.h - -date.h NH_filesgentag=(file%s_generated_by_makedefs_at_compile_time) - wintty.h NH_filestag=(file%s_for_tty_versions) tile2x11.h NH_filestag=(file%s_for_X_versions) @@ -17,24 +6,4 @@ winX.h NH_filestag=>tile2x11.h xwindow.h NH_filestag=>tile2x11.h xwindowp.h NH_filestag=>tile2x11.h -qt_clust.h NH_filestag=(file%s_for_Qt_versions) -qt_kde0.h NH_filestag=>qt_clust.h -qt_win.h NH_filestag=>qt_clust.h -qt_xpms.h NH_filestag=>qt_clust.h -qttableview.h NH_filestag=>qt_clust.h - -bitmfile.h NH_filestag=(file%s_for_GEM_versions) -gem_rsc.h NH_filestag=>bitmfile.h -load_img.h NH_filestag=>bitmfile.h -wingem.h NH_filestag=>bitmfile.h - -winGnome.h NH_filestag=(file%s_for_GNOME_versions) -mac-carbon.h NH_filestag=(file%s_for_various_Macintosh_versions) -mac-qt.h NH_filestag=>mac-carbon.h -mac-term.h NH_filestag=>mac-carbon.h -macconf.h NH_filestag=>mac-carbon.h -macpopup.h NH_filestag=>mac-carbon.h -mactty.h NH_filestag=>mac-carbon.h -macwin.h NH_filestag=>mac-carbon.h -mttypriv.h NH_filestag=>mac-carbon.h diff --git a/outdated/include/.gitattributes b/outdated/include/.gitattributes new file mode 100644 index 000000000..1a19fc9b6 --- /dev/null +++ b/outdated/include/.gitattributes @@ -0,0 +1,17 @@ +* NH_filestag=(file%s_for_all_versions) + +bitmfile.h NH_filestag=(file%s_for_GEM_versions) +gem_rsc.h NH_filestag=>bitmfile.h +load_img.h NH_filestag=>bitmfile.h +wingem.h NH_filestag=>bitmfile.h + +winGnome.h NH_filestag=(file%s_for_GNOME_versions) + +mac-carbon.h NH_filestag=(file%s_for_various_Macintosh_versions) +mac-qt.h NH_filestag=>mac-carbon.h +mac-term.h NH_filestag=>mac-carbon.h +macconf.h NH_filestag=>mac-carbon.h +macpopup.h NH_filestag=>mac-carbon.h +mactty.h NH_filestag=>mac-carbon.h +macwin.h NH_filestag=>mac-carbon.h +mttypriv.h NH_filestag=>mac-carbon.h diff --git a/win/win32/.gitattributes b/win/win32/.gitattributes index a5b91f10d..147c2d21d 100644 --- a/win/win32/.gitattributes +++ b/win/win32/.gitattributes @@ -8,4 +8,4 @@ *.props NH_header=no resource.h NH_header=no nhresource.h NH_header=no -* NH_filestag=(file%s_for_Windows_versions_-_tested_up_to_Windows_10) +* NH_filestag=(file%s_for_Windows_versions_-_tested_up_to_Windows_11)