krb5 commit: Remove kerbsrc.win

Benjamin Kaduk kaduk at MIT.EDU
Tue Sep 25 10:57:22 EDT 2012


https://github.com/krb5/krb5/commit/96ff6f5d0dd8e73bb245ee2724c7f31aeae885d1
commit 96ff6f5d0dd8e73bb245ee2724c7f31aeae885d1
Author: Ben Kaduk <kaduk at mit.edu>
Date:   Fri Sep 21 13:01:06 2012 -0400

    Remove kerbsrc.win
    
    It has been unloved and broken repeatedly for many years, requiring
    updating of several variables whenever new directories are added
    and similar tedia.  It was originally intended to avoid the need
    for Unix utilities on Windows, but Microsoft provides the Utilities
    and SDK for UNIX-based Applications which is enough rope to do a
    native build.
    
    Leave behind a warning message to anyone who does try to build the
    target.
    
    Clean up some now-unused infrastructure in the build system.
    
    ticket: 7367 (new)

 src/Makefile.in           |   65 +++++++--------------------------------------
 src/config/win-post.in    |    2 +-
 src/config/winexclude.sed |   19 -------------
 3 files changed, 11 insertions(+), 75 deletions(-)

diff --git a/src/Makefile.in b/src/Makefile.in
index 8c29d4a..aac8bfc 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -327,53 +327,12 @@ ren2long:
 	-sh config/ren2long
 
 #
-# Builds the file that distributes Kerberos sources for DOS and 
-# Macintosh sites from the source tree on Unix.
+# Helper for the windows build
 #
-ZIP=zip
-FILES= ./* appl/* appl/gss-sample/* \
-	clients/* clients/kdestroy/* clients/kinit/* clients/klist/* \
-	clients/kpasswd/* clients/kvno/* clients/kcpytkt/* clients/kdeltkt/* \
-	clients/kswitch/* config/* include/* \
-	include/krb5/* lib/* lib/crypto/* lib/crypto/krb/* \
-	lib/crypto/krb/prf/* lib/crypto/krb/checksum/* lib/crypto/krb/old/* \
-	lib/crypto/krb/raw/* lib/crypto/krb/arcfour/* lib/crypto/krb/dk/* \
-	lib/crypto/builtin/aes/* lib/crypto/builtin/enc_provider/* \
-	lib/crypto/builtin/des/* lib/crypto/builtin/md5/* \
-	lib/crypto/builtin/camellia/* lib/crypto/builtin/md4/* \
-	lib/crypto/builtin/hash_provider/* lib/crypto/builtin/sha2/* \
-	lib/crypto/builtin/sha1/* lib/crypto/builtin/* \
-	lib/crypto/crypto_tests/* \
-	lib/gssapi/* lib/gssapi/generic/* lib/gssapi/krb5/* \
-	lib/gssapi/mechglue/* lib/gssapi/spnego/* \
-	lib/krb5/* lib/krb5/asn.1/* lib/krb5/krb/* \
-	lib/krb5/ccache/* lib/krb5/ccache/ccapi/* \
-	lib/krb5/error_tables/* \
-	lib/krb5/keytab/* lib/krb5/os/* lib/krb5/posix/* lib/krb5/rcache/* \
-	lib/krb5/unicode/* lib/krb5/unicode/utbm/* lib/krb5/unicode/ure/* \
-	lib/krb5/unicode/ucdata/* \
-	util/* util/et/* util/profile/* util/profile/testmod/* util/support/*
-
-WINFILES= \
-	ccapi/* ccapi/common/* ccapi/common/win/* ccapi/common/win/OldCC/* \
-	ccapi/lib/* ccapi/lib/win/* ccapi/lib/win/OldCC/* \
-	ccapi/server/* ccapi/server/win/* \
-	ccapi/test/* \
-	util/windows/* util/wshelper/* windows/* \
-	windows/leash/htmlhelp/* windows/leash/htmlhtlp/html/* \
-	windows/leash/res/* \
-	windows/leashdll/res/* \
-	windows/include/* windows/include/arpa/* \
-	windows/lib/* windows/cns/* \
-	windows/wintel/* windows/gina/* windows/ms2mit/* \
-	windows/kfwlogon/* windows/leashdll/* windows/leash/*
-
-WINBINARYFILES=	windows/*/*.ico windows/*/*.doc windows/*/*.hlp \
-	windows/*/*.hpj
+TOPLEVEL=dummy
 
 #
-# Part of building the PC release has to be done on Unix. This includes
-# anything the requires awk.
+# Building error tables requires awk.
 #
 AWK = awk
 AH  = util/et/et_h.awk
@@ -401,15 +360,16 @@ ETOUT =	\
 HOUT =	$(INC)krb5/krb5.h $(GG)gssapi.h $(PR)profile.h
 
 CLEANUP= Makefile $(ETOUT) $(HOUT) \
-	include/profile.h include/osconf.h \
-	winfile.list
+	include/profile.h include/osconf.h
 
 
-kerbsrc.win: kerbsrc.zip
+kerbsrc.win: kerbsrc-is-obsolete
 
-winfile.list:
-	echo $(FILES) $(WINFILES) | tr ' ' \\012 | \
-		sed -f config/winexclude.sed > winfile.list
+kerbsrc-is-obsolete:
+	@echo "kerbsrc.zip is no longer supported.  It was intended to avoid"
+	@echo "needing Unix utilities on Windows, but these utilities are now"
+	@echo "available through the Utilities and SDK for UNIX-based"
+	@echo "Applications."
 
 dos-Makefile:
 	cat config/win-pre.in Makefile.in config/win-post.in | \
@@ -418,11 +378,6 @@ dos-Makefile:
 
 prep-windows: dos-Makefile awk-windows-mac
 
-kerbsrc.zip: dos-Makefile awk-windows-mac winfile.list
-	rm -f kerbsrc.zip
-	$(ZIP) - at Dl kerbsrc.zip < winfile.list
-	$(ZIP) -D kerbsrc.zip $(WINBINARYFILES)
-	rm -f $(CLEANUP)
 
 $(INC)asn1_err.h: $(AH) $(ET)asn1_err.et
 	$(AWK) -f $(AH) outfile=$@ $(ET)asn1_err.et
diff --git a/src/config/win-post.in b/src/config/win-post.in
index 6046e62..e7164ff 100644
--- a/src/config/win-post.in
+++ b/src/config/win-post.in
@@ -29,7 +29,7 @@ DLL_FILE_DEF=/DKRB5_DLL_FILE
 
 # Build the Makefile unless we are in the top-level
 #(where there is already an explicit rule).
-!if !defined(ZIP) && !defined(WINFILES)
+!if !defined(TOPLEVEL)
 Makefile: Makefile.in $(BUILDTOP)\config\win-pre.in $(BUILDTOP)\config\win-post.in
 	$(WCONFIG) $(BUILDTOP)\config < Makefile.in > Makefile
 !endif
diff --git a/src/config/winexclude.sed b/src/config/winexclude.sed
deleted file mode 100644
index 199cf44..0000000
--- a/src/config/winexclude.sed
+++ /dev/null
@@ -1,19 +0,0 @@
-/autoconf.h$/d
-/t_mddriver$/d
-/test_parse$/d
-/test_profile$/d
-/\.orig$/d
-/\.rej/d
-/\.ico$/d
-/\.doc$/d
-/\.hlp$/d
-/\.hpj$/d
-/\.o$/d
-/\.a$/d
-/\.zip$/d
-/\.tar$/d
-/\.lib$/d
-/\.dll$/d
-/~$/d
-/winfile.list$/d
-/macfile.list$/d


More information about the cvs-krb5 mailing list