From 0ef39934285e95277d3ae94bacc62d59f592209c Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Thu, 12 Aug 2010 11:12:51 -0400 Subject: [PATCH] Windows: build tptserver on Windows Build the pthreaded ptserver on Windows Change-Id: I556610a7ae7d14e0ec1955e70b72e2edc6912529 Reviewed-on: http://gerrit.openafs.org/3327 Tested-by: BuildBot Reviewed-by: Derrick Brashear --- src/tptserver/NTMakefile | 269 ++++++++++++++++++++++++++++++++++++++ src/tptserver/pt_util.rc | 17 +++ src/tptserver/ptclient.rc | 17 +++ src/tptserver/pts.rc | 17 +++ src/tptserver/ptserver.rc | 17 +++ 5 files changed, 337 insertions(+) create mode 100644 src/tptserver/NTMakefile create mode 100644 src/tptserver/pt_util.rc create mode 100644 src/tptserver/ptclient.rc create mode 100644 src/tptserver/pts.rc create mode 100644 src/tptserver/ptserver.rc diff --git a/src/tptserver/NTMakefile b/src/tptserver/NTMakefile new file mode 100644 index 000000000..b23134424 --- /dev/null +++ b/src/tptserver/NTMakefile @@ -0,0 +1,269 @@ +# Copyright 2000, International Business Machines Corporation and others. +# All Rights Reserved. +# +# This software has been released under the terms of the IBM Public +# License. For details, see the LICENSE file in the top-level source +# directory or online at http://www.openafs.org/dl/license10.html + +# Override default definitions in NTMakefile.$(SYS_NAME) before including. + +RELDIR=tptserver +!INCLUDE ..\config\NTMakefile.$(SYS_NAME) +!include ..\config\NTMakefile.version +AFSDEV_AUXCDEFINES = -DAFS_USE_GETTIMEOFDAY -DSUPERGROUPS -DAFS_PTHREAD_ENV + +SRC_DIR = ..\ptserver + +LWP = ..\lwp + +############################################################################ +# Definitions for installing header files + +INCFILEDIR = $(DESTDIR)\include + +INCFILES =\ + $(INCFILEDIR)\afs\ptserver.h \ + $(INCFILEDIR)\afs\ptint.h \ + $(INCFILEDIR)\afs\pterror.h \ + ptopcodes.h \ + $(INCFILEDIR)\afs\ptclient.h \ + $(INCFILEDIR)\afs\ptuser.h + +############################################################################ +# build afsprot.lib + +LIBFILE = $(DESTDIR)\lib\afs\mtafsprot.lib + +LIBOBJS =\ + $(OUT)\ptuser.obj \ + $(OUT)\pterror.obj \ + $(OUT)\ptint.cs.obj \ + $(OUT)\AFS_component_version_number.obj + +PTINT_XDR_OBJ = $(OUT)\ptint.xdr.obj + +$(LIBOBJS) $(PTINT_XDR_OBJ): $(SRC_DIR)\$$(@B).c + $(C2OBJ) -I$(SRC_DIR) $** + +$(LIBFILE): $(LIBOBJS) $(PTINT_XDR_OBJ) + $(LIBARCH) + +############################################################################ +# build LWP objects + +LWP_OBJS = $(OUT)\lock.obj $(OUT)\fasttime.obj $(OUT)\threadname.obj + +$(LWP_OBJS): $(LWP)\$$(@B).C + $(C2OBJ) -I$(LWP) $** + +############################################################################ +# build ptserver.exe + +PTSERVER = $(DESTDIR)\root.server\usr\afs\bin\ptserver.exe + +PTUTILS_OBJ = $(OUT)\ptutils.obj + +UTILS_OBJ = $(OUT)\utils.obj + +$(PTUTILS_OBJ) $(UTILS_OBJ): $(SRC_DIR)\$$(@B).c + $(C2OBJ) -I$(SRC_DIR) $** + +PTSERVER_EXEOBJS =\ + $(OUT)\ptint.ss.obj \ + $(OUT)\ptserver.obj \ + $(OUT)\ptprocs.obj + +MAP_OBJ = $(OUT)\map.obj + +PTSERVER_EXERES = $(OUT)\ptserver.res + +$(PTSERVER_EXEOBJS) $(MAP_OBJ): $(SRC_DIR)\$$(@B).c + $(C2OBJ) -I$(SRC_DIR) $** + +PTSERVER_EXELIBS =\ + $(DESTDIR)\lib\afs\mtafsubik.lib \ + $(DESTDIR)\lib\afsauthent.lib \ + $(DESTDIR)\lib\afsrpc.lib \ +# $(DESTDIR)\lib\afsrxkad.lib \ + $(DESTDIR)\lib\afsrxstat.lib \ +# $(DESTDIR)\lib\afsdes.lib \ + $(DESTDIR)\lib\afs\afscom_err.lib \ + $(DESTDIR)\lib\afs\mtafsutil.lib \ + $(DESTDIR)\lib\afs\afsaudit.lib \ + $(DESTDIR)\lib\afs\afseventlog.lib \ + $(DESTDIR)\lib\afs\afsreg.lib \ + $(DESTDIR)\lib\libafsconf.lib \ + $(DESTDIR)\lib\afs\afspioctl.lib \ + $(DESTDIR)\lib\afs\afsprocmgmt.lib \ + $(DESTDIR)\lib\afspthread.lib + +$(PTSERVER): $(PTSERVER_EXEOBJS) $(PTUTILS_OBJ) $(PTINT_XDR_OBJ) $(UTILS_OBJ) $(MAP_OBJ) $(LWP_OBJS) $(PTSERVER_EXERES) $(RXKADOBJS) $(PTSERVER_EXELIBS) + $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib + $(_VC_MANIFEST_EMBED_EXE) + $(EXEPREP) + $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) + +############################################################################ +# build pts.exe + +PTS = $(DESTDIR)\bin\pts.exe +PTCLIENT = $(DESTDIR)\bin\ptclient.exe +PT_UTIL = $(DESTDIR)\bin\pt_util.exe + +PTS_EXEOBJS =\ + $(OUT)\pts.obj + +$(PTS_EXEOBJS): $(SRC_DIR)\$$(@B).c + $(C2OBJ) -I$(SRC_DIR) $** + +PTS_EXERES = $(OUT)\pts.res + +PTCLIENT_EXEOBJS =\ + $(OUT)\ptclient.obj \ + $(OUT)\display.obj + +$(PTCLIENT_EXEOBJS): $(SRC_DIR)\$$(@B).c + $(C2OBJ) -I$(SRC_DIR) $** + +PTCLIENT_EXERES = $(OUT)\ptclient.res + +PT_UTIL_EXEOBJS = \ + $(OUT)\pt_util.obj \ + $(OUT)\ubik.obj + +$(PT_UTIL_EXEOBJS): $(SRC_DIR)\$$(@B).c + $(C2OBJ) -I$(SRC_DIR) $** + +PT_UTIL_EXERES = $(OUT)\pt_util.res + +PTS_EXELIBS =\ + $(DESTDIR)\lib\afsauthent.lib \ + $(DESTDIR)\lib\afsrxkad.lib \ + $(DESTDIR)\lib\afsdes.lib \ + $(DESTDIR)\lib\afsrpc.lib \ + $(DESTDIR)\lib\afs\afsauth.lib \ + $(DESTDIR)\lib\afs\afscom_err.lib \ + $(DESTDIR)\lib\afs\mtafsutil.lib \ + $(DESTDIR)\lib\afs\mtafsubik.lib \ + $(DESTDIR)\lib\afs\afscmd.lib \ + $(DESTDIR)\lib\afs\afsreg.lib \ + $(DESTDIR)\lib\afs\afseventlog.lib \ + $(DESTDIR)\lib\afs\afspioctl.lib \ + $(DESTDIR)\lib\libafsconf.lib \ + $(DESTDIR)\lib\afspthread.lib + +$(PTS): $(PTS_EXEOBJS) $(PTINT_XDR_OBJ) $(OUT)\ptuser.obj $(OUT)\pterror.obj $(PTS_EXELIBS) + $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib + $(_VC_MANIFEST_EMBED_EXE) + $(EXEPREP) + $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) + +$(PTCLIENT): $(PTCLIENT_EXEOBJS) $(PTINT_XDR_OBJ) $(OUT)\ptuser.obj $(OUT)\pterror.obj $(PTS_EXELIBS) + $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib + $(_VC_MANIFEST_EMBED_EXE) + $(EXEPREP) + $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) + +$(PT_UTIL): $(PT_UTIL_EXEOBJS) $(PTUTILS_OBJ) $(UTILS_OBJ) $(MAP_OBJ) $(PTINT_XDR_OBJ) $(OUT)\ptuser.obj $(OUT)\pterror.obj $(PTS_EXELIBS) + $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib + $(_VC_MANIFEST_EMBED_EXE) + $(EXEPREP) + $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) + + +############################################################################ +# generate versioninfo resources + +$(OUT)\ptserver.res: AFS_component_version_number.h + +$(OUT)\pts.res: AFS_component_version_number.h + +$(OUT)\ptclient.res: AFS_component_version_number.h + +$(OUT)\pt_util.res: AFS_component_version_number.h + +############################################################################ +# install pts, ptserver and mtafsprot.lib + +install: $(LIBFILE) $(PTSERVER) $(PTS) $(PTCLIENT) $(PT_UTIL) $(OUT)\readgroup.exe \ + $(OUT)\readpwd.exe $(OUT)\testpt.exe $(OUT)\db_verify.exe \ + $(DESTDIR)\root.server\usr\afs\bin\pts.exe \ + $(DESTDIR)\root.server\usr\afs\bin\ptclient.exe \ + $(DESTDIR)\root.server\usr\afs\bin\pt_util.exe \ + $(INCFILEDIR)\afs\prserver.h $(INCFILEDIR)\afs\print.h \ + $(INCFILEDIR)\afs\prerror.h $(INCFILEDIR)\afs\prclient.h + +install_libutils: $(LIBFILE) $(PTS) + +# install various exe's and header files +$(DESTDIR)\root.server\usr\afs\bin\pts.exe: $(PTS) + $(COPY) $(PTS) $(DESTDIR)\root.server\usr\afs\bin\pts.exe + +$(DESTDIR)\root.server\usr\afs\bin\ptclient.exe: $(PTCLIENT) + $(COPY) $(PTCLIENT) $(DESTDIR)\root.server\usr\afs\bin\ptclient.exe + +$(DESTDIR)\root.server\usr\afs\bin\pt_util.exe: $(PT_UTIL) + $(COPY) $(PT_UTIL) $(DESTDIR)\root.server\usr\afs\bin\pt_util.exe + +$(INCFILEDIR)\afs\prserver.h: $(INCFILEDIR)\afs\ptserver.h + $(COPY) $(INCFILEDIR)\afs\ptserver.h $(INCFILEDIR)\afs\prserver.h + +$(INCFILEDIR)\afs\print.h: $(INCFILEDIR)\afs\ptint.h + $(COPY) $(INCFILEDIR)\afs\ptint.h $(INCFILEDIR)\afs\print.h + +$(INCFILEDIR)\afs\prerror.h: $(INCFILEDIR)\afs\pterror.h + $(COPY) $(INCFILEDIR)\afs\pterror.h $(INCFILEDIR)\afs\prerror.h + +$(INCFILEDIR)\afs\prclient.h: $(INCFILEDIR)\afs\ptclient.h + $(COPY) $(INCFILEDIR)\afs\ptclient.h $(INCFILEDIR)\afs\prclient.h + $(ECHO) #define ERROR_TABLE_BASE_pr ERROR_TABLE_BASE_PT >> $(INCFILEDIR)\afs\prclient.h + +############################################################################ +# clean up + +clean:: + $(DEL) $(OUT)\readgroup.exe $(OUT)\readpwd.exe $(OUT)\db_verify.exe $(OUT)\testpt.exe + $(DEL) $(PTS) $(PTCLIENT) $(PT_UTIL) + +############################################################################ +# tests? +TEST_LIBS = $(PTS_EXELIBS) + +TEST_OBJS = \ + $(OUT)\readgroup.obj \ + $(OUT)\readpwd.obj \ + $(OUT)\testpt.obj \ + $(OUT)\db_verify.obj + +$(TEST_OBJS): $(SRC_DIR)\$$(@B).c + $(C2OBJ) -I$(SRC_DIR) $** + +$(OUT)\readgroup.exe: $(OUT)\readgroup.obj $(LIBFILE) $(TEST_LIBS) + $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib + $(_VC_MANIFEST_EMBED_EXE) + $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) + +$(OUT)\readpwd.exe: $(OUT)\readpwd.obj $(LIBFILE) $(TEST_LIBS) + $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib + $(_VC_MANIFEST_EMBED_EXE) + $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) + +$(OUT)\testpt.exe: $(OUT)\testpt.obj $(LIBFILE) $(TEST_LIBS) + $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib + $(_VC_MANIFEST_EMBED_EXE) + $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) + +$(OUT)\db_verify.exe: $(OUT)\db_verify.obj $(OUT)\pterror.obj $(OUT)\display.obj $(LIBFILE) $(TEST_LIBS) + $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib + $(_VC_MANIFEST_EMBED_EXE) + $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) + +mkdir: diff --git a/src/tptserver/pt_util.rc b/src/tptserver/pt_util.rc new file mode 100644 index 000000000..47aac9b61 --- /dev/null +++ b/src/tptserver/pt_util.rc @@ -0,0 +1,17 @@ +/* + * Copyright 2000, International Business Machines Corporation and others. + * All Rights Reserved. + * + * This software has been released under the terms of the IBM Public + * License. For details, see the LICENSE file in the top-level source + * directory or online at http://www.openafs.org/dl/license10.html + */ + +/* Define VERSIONINFO resource */ + +#define AFS_VERINFO_FILE_DESCRIPTION "AFS Protection Database Utility (Threaded)" +#define AFS_VERINFO_NAME "pt_util" +#define AFS_VERINFO_FILENAME "pt_util.exe" + +#include "AFS_component_version_number.h" +#include "..\config\NTVersioninfo.rc" diff --git a/src/tptserver/ptclient.rc b/src/tptserver/ptclient.rc new file mode 100644 index 000000000..27a36590e --- /dev/null +++ b/src/tptserver/ptclient.rc @@ -0,0 +1,17 @@ +/* + * Copyright 2000, International Business Machines Corporation and others. + * All Rights Reserved. + * + * This software has been released under the terms of the IBM Public + * License. For details, see the LICENSE file in the top-level source + * directory or online at http://www.openafs.org/dl/license10.html + */ + +/* Define VERSIONINFO resource */ + +#define AFS_VERINFO_FILE_DESCRIPTION "AFS Protection Database Command (Threaded)" +#define AFS_VERINFO_NAME "ptclient" +#define AFS_VERINFO_FILENAME "ptclient.exe" + +#include "AFS_component_version_number.h" +#include "..\config\NTVersioninfo.rc" diff --git a/src/tptserver/pts.rc b/src/tptserver/pts.rc new file mode 100644 index 000000000..46c41579d --- /dev/null +++ b/src/tptserver/pts.rc @@ -0,0 +1,17 @@ +/* + * Copyright 2000, International Business Machines Corporation and others. + * All Rights Reserved. + * + * This software has been released under the terms of the IBM Public + * License. For details, see the LICENSE file in the top-level source + * directory or online at http://www.openafs.org/dl/license10.html + */ + +/* Define VERSIONINFO resource */ + +#define AFS_VERINFO_FILE_DESCRIPTION "AFS Protection Database Command (Threaded)" +#define AFS_VERINFO_NAME "pts" +#define AFS_VERINFO_FILENAME "pts.exe" + +#include "AFS_component_version_number.h" +#include "..\config\NTVersioninfo.rc" diff --git a/src/tptserver/ptserver.rc b/src/tptserver/ptserver.rc new file mode 100644 index 000000000..6046561f8 --- /dev/null +++ b/src/tptserver/ptserver.rc @@ -0,0 +1,17 @@ +/* + * Copyright 2000, International Business Machines Corporation and others. + * All Rights Reserved. + * + * This software has been released under the terms of the IBM Public + * License. For details, see the LICENSE file in the top-level source + * directory or online at http://www.openafs.org/dl/license10.html + */ + +/* Define VERSIONINFO resource */ + +#define AFS_VERINFO_FILE_DESCRIPTION "AFS Protection Database Server (Threaded)" +#define AFS_VERINFO_NAME "ptserver" +#define AFS_VERINFO_FILENAME "ptserver.exe" + +#include "AFS_component_version_number.h" +#include "..\config\NTVersioninfo.rc" -- 2.39.5