From 028ab92bf7211261d37908dd73df76292cb75e4c Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Mon, 10 Jul 2006 20:59:06 +0200 Subject: [PATCH] make_progs: Generate the .gitignore file. Ignore generated programs from the top-level .gitignore. --- programs/.gitignore | 37 +++++++++++++++++++++++++++++ programs/clock/.gitignore | 1 - programs/cmdlgtst/.gitignore | 1 - programs/control/.gitignore | 1 - programs/eject/.gitignore | 1 - programs/expand/.gitignore | 1 - programs/explorer/.gitignore | 1 - programs/hh/.gitignore | 1 - programs/icinfo/.gitignore | 1 - programs/iexplore/.gitignore | 1 - programs/make_progs | 24 +++++++++++++++++++ programs/msiexec/.gitignore | 1 - programs/notepad/.gitignore | 1 - programs/oleview/.gitignore | 1 - programs/progman/.gitignore | 1 - programs/regedit/.gitignore | 1 - programs/regsvr32/.gitignore | 1 - programs/rpcss/.gitignore | 1 - programs/rundll32/.gitignore | 1 - programs/start/.gitignore | 1 - programs/taskmgr/.gitignore | 1 - programs/uninstaller/.gitignore | 1 - programs/view/.gitignore | 1 - programs/wcmd/.gitignore | 1 - programs/wineboot/.gitignore | 1 - programs/winebrowser/.gitignore | 1 - programs/winecfg/.gitignore | 1 - programs/wineconsole/.gitignore | 1 - programs/winedbg/.gitignore | 1 - programs/winefile/.gitignore | 1 - programs/winemenubuilder/.gitignore | 1 - programs/winemine/.gitignore | 1 - programs/winepath/.gitignore | 1 - programs/winetest/.gitignore | 1 - programs/winevdm/.gitignore | 1 - programs/winhelp/.gitignore | 1 - programs/winver/.gitignore | 1 - programs/wordpad/.gitignore | 1 - 38 files changed, 61 insertions(+), 36 deletions(-) delete mode 100644 programs/control/.gitignore delete mode 100644 programs/eject/.gitignore delete mode 100644 programs/expand/.gitignore delete mode 100644 programs/explorer/.gitignore delete mode 100644 programs/hh/.gitignore delete mode 100644 programs/icinfo/.gitignore delete mode 100644 programs/iexplore/.gitignore delete mode 100644 programs/rpcss/.gitignore delete mode 100644 programs/rundll32/.gitignore delete mode 100644 programs/wineboot/.gitignore delete mode 100644 programs/winebrowser/.gitignore delete mode 100644 programs/winemenubuilder/.gitignore delete mode 100644 programs/winepath/.gitignore delete mode 100644 programs/winevdm/.gitignore delete mode 100644 programs/winver/.gitignore diff --git a/programs/.gitignore b/programs/.gitignore index 98c564fefa8..7320986ff70 100644 --- a/programs/.gitignore +++ b/programs/.gitignore @@ -1,3 +1,40 @@ +# Automatically generated by make_dlls; DO NOT EDIT!! /Makeprog.rules /wineapploader /winelauncher +clock/clock +cmdlgtst/cmdlgtst +control/control +eject/eject +expand/expand +explorer/explorer +hh/hh +icinfo/icinfo +iexplore/iexplore +msiexec/msiexec +notepad/notepad +oleview/oleview +progman/progman +regedit/regedit +regsvr32/regsvr32 +rpcss/rpcss +rundll32/rundll32 +start/start +taskmgr/taskmgr +uninstaller/uninstaller +view/view +wcmd/wcmd +wineboot/wineboot +winebrowser/winebrowser +winecfg/winecfg +wineconsole/wineconsole +winedbg/winedbg +winefile/winefile +winemenubuilder/winemenubuilder +winemine/winemine +winepath/winepath +winetest/winetest +winevdm/winevdm +winhelp/winhelp +winver/winver +wordpad/wordpad diff --git a/programs/clock/.gitignore b/programs/clock/.gitignore index c10b08c9540..2a5104452f2 100644 --- a/programs/clock/.gitignore +++ b/programs/clock/.gitignore @@ -1,2 +1 @@ -/clock /rsrc.res diff --git a/programs/cmdlgtst/.gitignore b/programs/cmdlgtst/.gitignore index fa7cadc4467..f4621f2c3a3 100644 --- a/programs/cmdlgtst/.gitignore +++ b/programs/cmdlgtst/.gitignore @@ -1,3 +1,2 @@ /about.ico /cmdlgr.res -/cmdlgtst diff --git a/programs/control/.gitignore b/programs/control/.gitignore deleted file mode 100644 index 8a32ae2e06e..00000000000 --- a/programs/control/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/control diff --git a/programs/eject/.gitignore b/programs/eject/.gitignore deleted file mode 100644 index 1f146347750..00000000000 --- a/programs/eject/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/eject diff --git a/programs/expand/.gitignore b/programs/expand/.gitignore deleted file mode 100644 index 757a202602e..00000000000 --- a/programs/expand/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/expand diff --git a/programs/explorer/.gitignore b/programs/explorer/.gitignore deleted file mode 100644 index 3dd7babb120..00000000000 --- a/programs/explorer/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/explorer diff --git a/programs/hh/.gitignore b/programs/hh/.gitignore deleted file mode 100644 index ba30b9cacd9..00000000000 --- a/programs/hh/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/hh diff --git a/programs/icinfo/.gitignore b/programs/icinfo/.gitignore deleted file mode 100644 index 7392049be21..00000000000 --- a/programs/icinfo/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/icinfo diff --git a/programs/iexplore/.gitignore b/programs/iexplore/.gitignore deleted file mode 100644 index 0e0d7ca81cc..00000000000 --- a/programs/iexplore/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/iexplore diff --git a/programs/make_progs b/programs/make_progs index b6898084a32..e854ed9cb21 100755 --- a/programs/make_progs +++ b/programs/make_progs @@ -187,3 +187,27 @@ EOF close NEWMAKE; rename "Makefile.in.new", "Makefile.in"; printf "Successfully updated Makefile.in\n"; + +################################################################ +# .gitignore file + +open GITIGNORE, ">.gitignore.new" or die "cannot create .gitignore.new"; +print GITIGNORE "# Automatically generated by make_dlls; DO NOT EDIT!!\n"; + +my @ignores = +( + "/Makeprog.rules", + "/wineapploader", + "/winelauncher", +); + +foreach my $dir (sort keys %alldirs) +{ + push @ignores, "$dir/$dir"; +} + +print GITIGNORE join("\n", sort @ignores) . "\n"; + +close GITIGNORE; +rename ".gitignore.new", ".gitignore"; +printf "Successfully updated .gitignore\n"; diff --git a/programs/msiexec/.gitignore b/programs/msiexec/.gitignore index 0dd572fb4b7..7bf2122bfb0 100644 --- a/programs/msiexec/.gitignore +++ b/programs/msiexec/.gitignore @@ -1,3 +1,2 @@ -/msiexec /msiexec.ico /rsrc.res diff --git a/programs/notepad/.gitignore b/programs/notepad/.gitignore index 0259bdadb37..2a5104452f2 100644 --- a/programs/notepad/.gitignore +++ b/programs/notepad/.gitignore @@ -1,2 +1 @@ -/notepad /rsrc.res diff --git a/programs/oleview/.gitignore b/programs/oleview/.gitignore index 4be2a55f6ad..57b12b54aaa 100644 --- a/programs/oleview/.gitignore +++ b/programs/oleview/.gitignore @@ -1,3 +1,2 @@ -/oleview /rsrc.res /toolbar.bmp diff --git a/programs/progman/.gitignore b/programs/progman/.gitignore index 4e6cd2e4aa3..2a5104452f2 100644 --- a/programs/progman/.gitignore +++ b/programs/progman/.gitignore @@ -1,2 +1 @@ -/progman /rsrc.res diff --git a/programs/regedit/.gitignore b/programs/regedit/.gitignore index a76cda5841d..aa199d6c7de 100644 --- a/programs/regedit/.gitignore +++ b/programs/regedit/.gitignore @@ -2,7 +2,6 @@ /computer.ico /folder.ico /folderopen.ico -/regedit /regedit.ico /rsrc.res /string.ico diff --git a/programs/regsvr32/.gitignore b/programs/regsvr32/.gitignore index 40b9e1efa38..06e12651ebd 100644 --- a/programs/regsvr32/.gitignore +++ b/programs/regsvr32/.gitignore @@ -1,2 +1 @@ -/regsvr32 /regsvr32.res diff --git a/programs/rpcss/.gitignore b/programs/rpcss/.gitignore deleted file mode 100644 index c5ab3e6be18..00000000000 --- a/programs/rpcss/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/rpcss diff --git a/programs/rundll32/.gitignore b/programs/rundll32/.gitignore deleted file mode 100644 index 5d4d128c34f..00000000000 --- a/programs/rundll32/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/rundll32 diff --git a/programs/start/.gitignore b/programs/start/.gitignore index 239d61c2e81..2a5104452f2 100644 --- a/programs/start/.gitignore +++ b/programs/start/.gitignore @@ -1,2 +1 @@ /rsrc.res -/start diff --git a/programs/taskmgr/.gitignore b/programs/taskmgr/.gitignore index f0e2786e4ff..4457658a7be 100644 --- a/programs/taskmgr/.gitignore +++ b/programs/taskmgr/.gitignore @@ -1,5 +1,4 @@ /font.bmp -/taskmgr /taskmgr.ico /taskmgr.res /trayicon.bmp diff --git a/programs/uninstaller/.gitignore b/programs/uninstaller/.gitignore index a79fd3aa46c..910c476a71c 100644 --- a/programs/uninstaller/.gitignore +++ b/programs/uninstaller/.gitignore @@ -1,3 +1,2 @@ /rsrc.res -/uninstaller /uninstaller.ico diff --git a/programs/view/.gitignore b/programs/view/.gitignore index ed6ee4d766e..84a7c2da417 100644 --- a/programs/view/.gitignore +++ b/programs/view/.gitignore @@ -1,2 +1 @@ -/view /viewrc.res diff --git a/programs/wcmd/.gitignore b/programs/wcmd/.gitignore index 40ac2f9a828..98f93eab84f 100644 --- a/programs/wcmd/.gitignore +++ b/programs/wcmd/.gitignore @@ -1,3 +1,2 @@ -/wcmd /wcmd.ico /wcmdrc.res diff --git a/programs/wineboot/.gitignore b/programs/wineboot/.gitignore deleted file mode 100644 index 02334bc781e..00000000000 --- a/programs/wineboot/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/wineboot diff --git a/programs/winebrowser/.gitignore b/programs/winebrowser/.gitignore deleted file mode 100644 index 05bbedfa221..00000000000 --- a/programs/winebrowser/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/winebrowser diff --git a/programs/winecfg/.gitignore b/programs/winecfg/.gitignore index 78f927ab0b0..b996cdd0fdb 100644 --- a/programs/winecfg/.gitignore +++ b/programs/winecfg/.gitignore @@ -1,4 +1,3 @@ /idb_checkbox.bmp /idb_wine.bmp -/winecfg /winecfg.res diff --git a/programs/wineconsole/.gitignore b/programs/wineconsole/.gitignore index 52435c9d529..7f01abde5ae 100644 --- a/programs/wineconsole/.gitignore +++ b/programs/wineconsole/.gitignore @@ -1,2 +1 @@ -/wineconsole /wineconsole_res.res diff --git a/programs/winedbg/.gitignore b/programs/winedbg/.gitignore index f000570c40f..f920a230eea 100644 --- a/programs/winedbg/.gitignore +++ b/programs/winedbg/.gitignore @@ -1,5 +1,4 @@ /dbg.tab.c /dbg.tab.h /lex.yy.c -/winedbg /winedbg.man diff --git a/programs/winefile/.gitignore b/programs/winefile/.gitignore index a6ce9fff00b..537475c7e37 100644 --- a/programs/winefile/.gitignore +++ b/programs/winefile/.gitignore @@ -2,5 +2,4 @@ /images.bmp /rsrc.res /toolbar.bmp -/winefile /winefile.ico diff --git a/programs/winemenubuilder/.gitignore b/programs/winemenubuilder/.gitignore deleted file mode 100644 index b8bbf5c4e94..00000000000 --- a/programs/winemenubuilder/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/winemenubuilder diff --git a/programs/winemine/.gitignore b/programs/winemine/.gitignore index f97effe8271..bcef963ccc8 100644 --- a/programs/winemine/.gitignore +++ b/programs/winemine/.gitignore @@ -2,5 +2,4 @@ /leds.bmp /mines.bmp /rsrc.res -/winemine /winemine.ico diff --git a/programs/winepath/.gitignore b/programs/winepath/.gitignore deleted file mode 100644 index 790d7bd949c..00000000000 --- a/programs/winepath/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/winepath diff --git a/programs/winetest/.gitignore b/programs/winetest/.gitignore index 309abfb3a88..7d0effb0c42 100644 --- a/programs/winetest/.gitignore +++ b/programs/winetest/.gitignore @@ -1,5 +1,4 @@ /dist.res /tests.rc /wine.ico -/winetest /winetest.res diff --git a/programs/winevdm/.gitignore b/programs/winevdm/.gitignore deleted file mode 100644 index edeb5420294..00000000000 --- a/programs/winevdm/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/winevdm diff --git a/programs/winhelp/.gitignore b/programs/winhelp/.gitignore index 5128fe5b203..e5e7bff2a9b 100644 --- a/programs/winhelp/.gitignore +++ b/programs/winhelp/.gitignore @@ -1,3 +1,2 @@ /lex.yy.c /rsrc.res -/winhelp diff --git a/programs/winver/.gitignore b/programs/winver/.gitignore deleted file mode 100644 index 147ca3e97d4..00000000000 --- a/programs/winver/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/winver diff --git a/programs/wordpad/.gitignore b/programs/wordpad/.gitignore index 538e2efffd5..57b12b54aaa 100644 --- a/programs/wordpad/.gitignore +++ b/programs/wordpad/.gitignore @@ -1,3 +1,2 @@ /rsrc.res /toolbar.bmp -/wordpad