ticket: 6826

version_fixed: 1.9
status: resolved

pull up r24469, r24530, r24533, r24534, r24535, r24537 from trunk

 ------------------------------------------------------------------------
 r24537 | ghudson | 2010-11-30 12:46:10 -0500 (Tue, 30 Nov 2010) | 5 lines

 ticket: 6826

 Install gssapi_ext.h on Windows.  Include gssapi_ext.h in the header
 files considered by def-check.pl in verify-calling-conventions-gssapi.

 ------------------------------------------------------------------------
 r24535 | ghudson | 2010-11-26 11:37:14 -0500 (Fri, 26 Nov 2010) | 5 lines

 ticket: 6826

 Supply static ordinals for new symbols in gssapi32.def and krb5_32.def,
 for consistency with KFW 3.x.

 ------------------------------------------------------------------------
 r24534 | ghudson | 2010-11-25 15:34:06 -0500 (Thu, 25 Nov 2010) | 5 lines

 ticket: 6826

 Fix how gssapi.h is rebuilt on Windows; accidentally omitted from
 r24533.

 ------------------------------------------------------------------------
 r24533 | ghudson | 2010-11-25 15:28:30 -0500 (Thu, 25 Nov 2010) | 29 lines

 ticket: 6826
 subject: Fix Windows build
 target_version: 1.9
 tags: pullup

 Repair the Windows build.  Tested with the prepare-on-Unix method.
 Some specific changes include:

 * Removed the IPC finalizer (no longer used after r20787) from
   ccapi/lib/ccapi_ipc.c, as it was creating a difficult dependency
   chain for the pingtest build in ccapi/test.  Also updated pingtest
   to use the k5_ipc_stream interfaces since cci_stream is gone.

 * Reverted the apparently non-functional r20277.

 * klist -V prints just "Kerberos for Windows", since it has no access
   to PACKAGE_NAME and PACKAGE_VERSION from autoconf.  This should be
   addressed correctly.

 * krb5, telnet, gssftp, and NIM are removed from the build.

 * Some files had CRLFs; these were replaced with LFs and the
   svn:eol-style property set on the files.  Otherwise the CRLFs became
   CRCRLFs after the zip transfer.

 * Windows does not have opendir/readdir, so added Windows code to
   prof_parse.c for includedir.  Probable fodder for a libkrb5support
   portability shim.

 ------------------------------------------------------------------------
 r24530 | ghudson | 2010-11-23 13:50:12 -0500 (Tue, 23 Nov 2010) | 3 lines

 Set svn:eol-style on some Windows files and remove the CRs from their
 repository representations.

 ------------------------------------------------------------------------
 r24469 | ghudson | 2010-10-21 20:01:56 -0400 (Thu, 21 Oct 2010) | 3 lines

 Make it possible to override CRYPTO_IMPL_CFLAGS and CRYPTO_IMPL_LIBS at
 make time.

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-9@24553 dc483132-0cff-0310-8789-dd5450dbe970

src/appl/Makefile.in

@@ -2,5 +2,4 @@ mydir=appl
 BUILDTOP=$(REL)..
 
 SUBDIRS= sample simple user_user gss-sample
-
-
+WINSUBDIRS= gss-sample

src/appl/gss-sample/Makefile.in

@@ -1,4 +1,4 @@
-mydir=appl/gss-sample
+mydir=appl$(S)gss-sample
 BUILDTOP=$(REL)..$(S)..
 DEFINES = -DUSE_AUTOCONF_H -DGSSAPI_V2
 PROG_LIBPATH=-L$(TOPLIBD)

src/appl/sample/Makefile.in

@@ -1,3 +1,3 @@
-mydir=appl/sample
+mydir=appl$(S)sample
 SUBDIRS = sclient sserver
 BUILDTOP=$(REL)..$(S)..

src/appl/sample/sclient/Makefile.in

@@ -1,4 +1,4 @@
-mydir=appl/sample/sclient
+mydir=appl$(S)sample$(S)sclient
 
 BUILDTOP=$(REL)..$(S)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD)

src/appl/sample/sserver/Makefile.in

@@ -1,4 +1,4 @@
-mydir=appl/sample/sserver
+mydir=appl$(S)sample$(S)sserver
 
 BUILDTOP=$(REL)..$(S)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD)

src/appl/simple/Makefile.in

@@ -1,3 +1,3 @@
-mydir=appl/simple
+mydir=appl$(S)simple
 SUBDIRS = client server
 BUILDTOP=$(REL)..$(S)..

src/appl/simple/client/Makefile.in

@@ -1,4 +1,4 @@
-mydir=appl/simple/client
+mydir=appl$(S)simple$(S)client
 BUILDTOP=$(REL)..$(S)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)

src/appl/simple/server/Makefile.in

@@ -1,4 +1,4 @@
-mydir=appl/simple/server
+mydir=appl$(S)simple$(S)server
 BUILDTOP=$(REL)..$(S)..$(S)..
 
 LOCALINCLUDES= -I.. -I$(srcdir)/..

src/appl/user_user/Makefile.in

@@ -1,4 +1,4 @@
-mydir=appl/user_user
+mydir=appl$(S)user_user
 BUILDTOP=$(REL)..$(S)..
 DEFINES = -DDEBUG
 PROG_LIBPATH=-L$(TOPLIBD)

src/ccapi/Makefile.in

@@ -2,32 +2,4 @@ mydir=ccapi
 BUILDTOP=$(REL)..
 
 SUBDIRS= lib server test
-
-all-windows:: 
-	@echo Making in ccapi\lib\win
-	cd lib\win
-	cd
-	$(MAKE) -$(MFLAGS)
-	@echo Making in ccapi\server\win
-	cd ..\..\server\win
-	cd
-	$(MAKE) -$(MFLAGS)
-	@echo Making in ccapi\test
-	cd ..\..\test
-	cd
-	$(MAKE) -$(MFLAGS)
-
-clean-windows:: 
-	@echo Making clean in ccapi\lib\win
-	cd lib\win
-	cd
-	$(MAKE) -$(MFLAGS) clean
-	@echo Making clean in ccapi\server\win
-	cd ..\..\server\win
-	cd
-	$(MAKE) -$(MFLAGS) clean
-	@echo Making clean in ccapi\test
-	cd ..\..\test
-	cd
-	$(MAKE) -$(MFLAGS) clean
-
+WINSUBDIRS= lib\win server\win test

src/ccapi/common/Makefile.in

@@ -1,4 +1,4 @@
-mydir=ccapi/common
+mydir=ccapi$(S)common
 BUILDTOP=$(REL)..$(S)..
 SUBDIRS=unix
 

src/ccapi/common/unix/Makefile.in

@@ -1,4 +1,4 @@
-mydir=ccapi/common/unix
+mydir=ccapi$(S)common$(S)unix
 BUILDTOP=$(REL)..$(S)..$(S)..
 
 STLIBOBJS=

src/ccapi/lib/Makefile.in

@@ -1,4 +1,4 @@
-mydir=ccapi/lib
+mydir=ccapi$(S)lib
 BUILDTOP=$(REL)..$(S)..
 SUBDIRS=unix
 LOCALINCLUDES=-I$(srcdir)/../common -I.

src/ccapi/lib/ccapi_context.c

@@ -114,7 +114,6 @@ static void cci_thread_fini (void)
 
     remove_error_table(&et_CAPI_error_table);
     cci_context_change_time_thread_fini ();
-    cci_ipc_thread_fini ();
 }
 
 

src/ccapi/lib/ccapi_ipc.c

@@ -36,13 +36,6 @@ cc_int32 cci_ipc_thread_init (void)
 
 /* ------------------------------------------------------------------------ */
 
-void cci_ipc_thread_fini (void)
-{
-    cci_os_ipc_thread_fini ();
-}
-
-/* ------------------------------------------------------------------------ */
-
 static cc_int32 _cci_ipc_send (enum cci_msg_id_t  in_request_name,
                                cc_int32           in_launch_server,
                                cci_identifier_t   in_identifier,

src/ccapi/lib/ccapi_ipc.h

@@ -30,7 +30,6 @@
 #include "cci_common.h"
 
 cc_int32 cci_ipc_thread_init (void);
-void cci_ipc_thread_fini (void);
 
 cc_int32 cci_ipc_send (enum cci_msg_id_t  in_request_name,
                        cci_identifier_t   in_identifier,

src/ccapi/lib/ccapi_os_ipc.h

@@ -30,7 +30,6 @@
 #include "cci_common.h"
 
 cc_int32 cci_os_ipc_thread_init (void);
-void cci_os_ipc_thread_fini (void);
 
 cc_int32 cci_os_ipc (cc_int32      in_launch_server,
                      k5_ipc_stream in_request_stream,

src/ccapi/lib/mac/ccapi_os_ipc.c

@@ -40,14 +40,6 @@ cc_int32 cci_os_ipc_thread_init (void)
 
 /* ------------------------------------------------------------------------ */
 
-void cci_os_ipc_thread_fini (void)
-{
-    /* k5_ipc_send_request handles all thread data for us */
-    return;
-}
-
-/* ------------------------------------------------------------------------ */
-
 cc_int32 cci_os_ipc (cc_int32      in_launch_server,
                      k5_ipc_stream in_request_stream,
                      k5_ipc_stream *out_reply_stream)

src/ccapi/lib/unix/Makefile.in

@@ -1,4 +1,4 @@
-mydir=ccapi/lib/unix
+mydir=ccapi$(S)lib$(S)unix
 BUILDTOP=$(REL)..$(S)..$(S)..
 LOCALINCLUDES= -I$(srcdir)/.. -I$(srcdir)/../../common