diff options
| -rw-r--r-- | src/ChangeLog | 10 | ||||
| -rw-r--r-- | src/Makefile.in | 106 | ||||
| -rw-r--r-- | src/wconfig.c | 56 |
3 files changed, 120 insertions, 52 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index b1229366d..cad41b5bb 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,13 @@ +Fri Apr 18 11:38:51 1997 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in (CLEANUP): Add MIT files to the windows zip file (if + the mit directory exists) + +Thu Apr 17 16:15:15 1997 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * wconfig.c (main): Add arguments to allow specification of + the --mit, --nomit, --ignore=XXX options. + Fri Mar 28 02:18:20 1997 Tom Yu <tlyu@mit.edu> * aclocal.m4 (KRB5_LIB_AUX): add lib$(LIB)$(SHLIBVEXT) to the list diff --git a/src/Makefile.in b/src/Makefile.in index 63daddb83..c137d1328 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -121,6 +121,7 @@ config-windows:: makefile-windows ##DOS##MKFDEP= wconfig.exe config\pre.in config\post.in \ ##DOS## config\windows.in config\win-post.in +##DOS##WCONFIG= .\wconfig $(WFLAGS) ##DOS##makefile-windows:: $(MKFDEP) makefile \ ##DOS## clients\makefile clients\kdestroy\makefile \ @@ -150,91 +151,91 @@ config-windows:: makefile-windows ##DOS## config\rm.bat wconfig.obj msvc.pdb ##DOS##makefile: makefile.in $(MKFDEP) -##DOS## .\wconfig config < $@.in > $@ +##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##clients\makefile: clients\makefile.in $(MKFDEP) -##DOS## .\wconfig config < $@.in > $@ +##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##clients\kdestroy\makefile: clients\kdestroy\makefile.in $(MKFDEP) -##DOS## .\wconfig config < $@.in > $@ +##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##clients\kinit\makefile: clients\kinit\makefile.in $(MKFDEP) -##DOS## .\wconfig config < $@.in > $@ +##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##clients\klist\makefile: clients\klist\makefile.in $(MKFDEP) -##DOS## .\wconfig config < $@.in > $@ +##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##include\makefile: include\makefile.in $(MKFDEP) -##DOS## .\wconfig config < $@.in > $@ +##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##include\krb5\makefile: include\krb5\makefile.in $(MKFDEP) -##DOS## .\wconfig config < $@.in > $@ +##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##lib\makefile: lib\makefile.in $(MKFDEP) -##DOS## .\wconfig config < $@.in > $@ +##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##lib\crypto\makefile: lib\crypto\makefile.in $(MKFDEP) -##DOS## .\wconfig config < $@.in > $@ +##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##lib\crypto\crc32\makefile: lib\crypto\crc32\makefile.in $(MKFDEP) -##DOS## .\wconfig config < $@.in > $@ +##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##lib\crypto\des\makefile: lib\crypto\des\makefile.in $(MKFDEP) -##DOS## .\wconfig config < $@.in > $@ +##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##lib\crypto\sha\makefile: lib\crypto\sha\makefile.in $(MKFDEP) -##DOS## .\wconfig config < $@.in > $@ +##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##lib\crypto\md4\makefile: lib\crypto\md4\makefile.in $(MKFDEP) -##DOS## .\wconfig config < $@.in > $@ +##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##lib\crypto\md5\makefile: lib\crypto\md5\makefile.in $(MKFDEP) -##DOS## .\wconfig config < $@.in > $@ +##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##lib\crypto\os\makefile: lib\crypto\os\makefile.in $(MKFDEP) -##DOS## .\wconfig config < $@.in > $@ +##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##lib\des425\makefile: lib\des425\makefile.in $(MKFDEP) -##DOS## .\wconfig config < $@.in > $@ +##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##lib\gssapi\makefile: lib\gssapi\makefile.in $(MKFDEP) -##DOS## .\wconfig config < $@.in > $@ +##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##lib\gssapi\generic\makefile: lib\gssapi\generic\makefile.in $(MKFDEP) -##DOS## .\wconfig config < $@.in > $@ +##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##lib\gssapi\mechglue\makefile: lib\gssapi\mechglue\makefile.in $(MKFDEP) -##DOS## .\wconfig config < $@.in > $@ +##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##lib\gssapi\krb5\makefile: lib\gssapi\krb5\makefile.in $(MKFDEP) -##DOS## .\wconfig config < $@.in > $@ +##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##lib\kadm\makefile: lib\kadm\makefile.in $(MKFDEP) -##DOS## .\wconfig config < $@.in > $@ +##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##lib\krb4\makefile: lib\krb4\makefile.in $(MKFDEP) -##DOS## .\wconfig config < $@.in > $@ +##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##lib\krb5\makefile: lib\krb5\makefile.in $(MKFDEP) -##DOS## .\wconfig config < $@.in > $@ +##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##lib\krb5\asn.1\makefile: lib\krb5\asn.1\makefile.in $(MKFDEP) -##DOS## .\wconfig config < $@.in > $@ +##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##lib\krb5\ccache\makefile: lib\krb5\ccache\makefile.in $(MKFDEP) -##DOS## .\wconfig config < $@.in > $@ +##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##lib\krb5\ccache\file\makefile: lib\krb5\ccache\file\makefile.in $(MKFDEP) -##DOS## .\wconfig config < $@.in > $@ +##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##lib\krb5\ccache\stdio\makefile: lib\krb5\ccache\stdio\makefile.in $(MKFDEP) -##DOS## .\wconfig config < $@.in > $@ +##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##lib\krb5\error_tables\makefile: lib\krb5\error_tables\makefile.in $(MKFDEP) -##DOS## .\wconfig config < $@.in > $@ +##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##lib\krb5\free\makefile: lib\krb5\free\makefile.in $(MKFDEP) -##DOS## .\wconfig config < $@.in > $@ +##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##lib\krb5\keytab\makefile: lib\krb5\keytab\makefile.in $(MKFDEP) -##DOS## .\wconfig config < $@.in > $@ +##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##lib\krb5\keytab\file\makefile: lib\krb5\keytab\file\makefile.in $(MKFDEP) -##DOS## .\wconfig config < $@.in > $@ +##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##lib\krb5\krb\makefile: lib\krb5\krb\makefile.in $(MKFDEP) -##DOS## .\wconfig config < $@.in > $@ +##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##lib\krb5\os\makefile: lib\krb5\os\makefile.in $(MKFDEP) -##DOS## .\wconfig config < $@.in > $@ +##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##lib\krb5\posix\makefile: lib\krb5\posix\makefile.in $(MKFDEP) -##DOS## .\wconfig config < $@.in > $@ +##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##lib\krb5\rcache\makefile: lib\krb5\rcache\makefile.in $(MKFDEP) -##DOS## .\wconfig config < $@.in > $@ +##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##util\et\makefile: util\et\makefile.in $(MKFDEP) -##DOS## .\wconfig config < $@.in > $@ +##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##util\profile\makefile: util\profile\makefile.in $(MKFDEP) -##DOS## .\wconfig config < $@.in > $@ +##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##util\windows\makefile: util\windows\makefile.in $(MKFDEP) -##DOS## .\wconfig config < $@.in > $@ +##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##windows\Makefile: windows\Makefile.in $(MKFDEP) -##DOS## .\wconfig config < $@.in > $@ +##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##windows\cns\Makefile: windows\cns\Makefile.in $(MKFDEP) -##DOS## .\wconfig config < $@.in > $@ +##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##windows\gina\Makefile: windows\gina\Makefile.in $(MKFDEP) -##DOS## .\wconfig config < $@.in > $@ +##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##windows\gss\Makefile: windows\gss\Makefile.in $(MKFDEP) -##DOS## .\wconfig config < $@.in > $@ +##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##windows\wintel\Makefile: windows\wintel\Makefile.in $(MKFDEP) -##DOS## .\wconfig config < $@.in > $@ +##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##wconfig.exe: wconfig.c ##DOS## SET CL=/nologo @@ -294,6 +295,9 @@ MACFILES= mac/* mac/kconfig/* mac/libraries/* mac/telnet-k5-auth/* \ include/krb5/stock/* include/sys/* \ ./patchlevel.h +MITWINFILES= mit/windows/include/* +MITWINBINARYFILES= mit/windows/lib/* + WINBINARYFILES= windows/*/*.ico windows/*/*.doc windows/*/*.hlp windows/*/*.hpj # @@ -331,6 +335,10 @@ kerbsrc.win: kerbsrc.zip winfile.list: echo $(FILES) $(WINFILES) | tr ' ' \\012 | \ sed -f config/winexclude.sed > winfile.list + if test -d mit ; then \ + echo $(MITWINFILES) | tr ' ' \\012 | \ + sed -f config/winexclude.sed >> winfile.list ; \ + fi MAC_SUBDIRS = lib util macfile.list: @@ -346,21 +354,33 @@ kerbsrc.zip: dos-Makefile awk-windows-mac winfile.list rm -f kerbsrc.zip $(ZIP) -Dlk kerbsrc.zip `cat winfile.list` $(ZIP) -Dk kerbsrc.zip $(WINBINARYFILES) + if test -d mit ; then \ + $(ZIP) -Dk kerbsrc.zip $(MITWINBINARYFILES) ; \ + fi rm -f $(CLEANUP) kerbsrc-nt.zip: awk-windows-mac winfile.list rm -f kerbsrc-nt.zip $(ZIP) -Dl kerbsrc-nt.zip `cat winfile.list` $(ZIP) -D kerbsrc-nt.zip $(WINBINARYFILES) + if test -d mit ; then \ + $(ZIP) -D kerbsrc-nt.zip $(MITWINBINARYFILES) ; \ + fi rm -f $(CLEANUP) dos-zipfiles: dos-Makefile awk-windows-mac winfile.list rm -f kerbsrc.zip $(ZIP) -Dlk kerbsrc.zip `cat winfile.list` $(ZIP) -Dk kerbsrc.zip $(WINBINARYFILES) + if test -d mit ; then \ + $(ZIP) -Dk kerbsrc.zip $(MITWINBINARYFILES) ; \ + fi rm -f kerbsrc-nt.zip $(ZIP) -Dl kerbsrc-nt.zip `cat winfile.list` $(ZIP) -D kerbsrc-nt.zip $(WINBINARYFILES) + if test -d mit ; then \ + $(ZIP) -D kerbsrc-nt.zip $(MITWINBINARYFILES) ; \ + fi rm -f $(CLEANUP) Macfile: macfile.list diff --git a/src/wconfig.c b/src/wconfig.c index 1974b863e..0800396b2 100644 --- a/src/wconfig.c +++ b/src/wconfig.c @@ -40,22 +40,48 @@ #include <string.h> static int copy_file (char *path, char *fname); +void add_ignore_list(char *str); + +int mit_specific = 0; int main(int argc, char *argv[]) { + char *ignore_str = "--ignore="; + int ignore_len; + + ignore_len = strlen(ignore_str); + argc--; argv++; + while ((argc > 1) && *argv[0] == '-') { + if (!strcmp(*argv, "--mit")) { + mit_specific = 1; + argc--; argv++; + continue; + } + if (!strcmp(*argv, "--nomit")) { + mit_specific = 0; + argc--; argv++; + continue; + } + if (!strncmp(*argv, ignore_str, ignore_len)) { + add_ignore_list((*argv)+ignore_len); + argc--; argv++; + } + } - if (argc == 2) /* Config directory given */ - copy_file (argv[1], "\\windows.in"); /* Send out prefix */ + if (mit_specific) + add_ignore_list("MIT##"); + + if (argc > 0) /* Config directory given */ + copy_file (*argv, "\\windows.in"); /* Send out prefix */ - copy_file("", "-"); + copy_file("", "-"); - if (argc == 2) /* Config directory given */ - copy_file (argv[1], "\\win-post.in"); /* Send out postfix */ - - return 0; + if (argc > 0) /* Config directory given */ + copy_file (*argv, "\\win-post.in"); /* Send out postfix */ + return 0; } -char *ignore_list[] = { +char *ignore_list[32] = { "DOS##", "DOS", #ifdef _MSDOS @@ -64,8 +90,20 @@ char *ignore_list[] = { #ifdef _WIN32 "WIN32##", #endif - 0 }; + +/* + * Add a new item to the ignore list + */ +void add_ignore_list(char *str) +{ + char **cpp; + + for (cpp = ignore_list; *cpp; cpp++) + ; + *cpp = str; +} + /* * |