From: Jeffrey Altman Date: Tue, 23 Mar 2004 04:45:29 +0000 (+0000) Subject: doug-nsis-20040322 X-Git-Tag: openafs-devel-1_3_62~10 X-Git-Url: https://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=5865e9cbd8f3b7c91e0bdd6cd4c1bbe1f10bdaa0;hp=08845d854861dd7c4b1cefce61e49e4e8d01dc2b doug-nsis-20040322 apply patch to include more header and lib files. ==================== This delta was composed from multiple commits as part of the CVS->Git migration. The checkin message with each commit was inconsistent. The following are the additional commit messages. ==================== Fix doug's patch. remote extraneous colons Move (once again) the DependsOnXXX values to the right place. (how did these end up back in NetworkProvider?) --- diff --git a/src/WINNT/install/NSIS/OpenAFS.nsi b/src/WINNT/install/NSIS/OpenAFS.nsi index fcf8bcd..fa8ebb8 100644 --- a/src/WINNT/install/NSIS/OpenAFS.nsi +++ b/src/WINNT/install/NSIS/OpenAFS.nsi @@ -674,13 +674,13 @@ skipremove: ; I do not have time to track this down so I am simply going to disable it WriteRegDWORD HKLM "SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\Parameters" "NoFindLanaByName" 1 - strcpy $REG_SUB_KEY "SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider" + strcpy $REG_SUB_KEY "SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon" strcpy $REG_VALUE "DependOnGroup" strcpy $REG_DATA_1 "PNP_TDI" strcpy $REG_DATA_2 "" strcpy $REG_DATA_3 "" Call RegWriteMultiStr - strcpy $REG_SUB_KEY "SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider" + strcpy $REG_SUB_KEY "SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon" strcpy $REG_VALUE "DependOnService" strcpy $REG_DATA_1 "Tcpip" strcpy $REG_DATA_2 "NETBIOS" @@ -1127,161 +1127,11 @@ SectionEnd Section "Software Development Kit (SDK)" secSDK - SetOutPath "$INSTDIR\Client\Program" + SetOutPath "$INSTDIR\Client\Program\lib" + File /r "${AFS_CLIENT_LIBDIR}\*.*" - File "${AFS_BUILD_INCDIR}\afs\cm_config.h" - File "${AFS_BUILD_INCDIR}\afs\kautils.h" - File "${AFS_CLIENT_LIBDIR}\libafsconf.lib" - File "${AFS_CLIENT_LIBDIR}\afsauthent.lib" - - ; Client_headers - SetOutPath "$INSTDIR\Client\Program\Include" - File "${AFS_BUILD_INCDIR}\lock.h" - File "${AFS_BUILD_INCDIR}\lwp.h" - File "${AFS_BUILD_INCDIR}\preempt.h" - File "${AFS_BUILD_INCDIR}\timer.h" - File "${AFS_BUILD_INCDIR}\des.h" - File "${AFS_BUILD_INCDIR}\des_conf.h" - File "${AFS_BUILD_INCDIR}\mit-cpyright.h" - ;File "${AFS_BUILD_INCDIR}\des-odd.h" - File "${AFS_BUILD_INCDIR}\crypt.h" - File "${AFS_BUILD_INCDIR}\pthread.h" - File "${AFS_BUILD_INCDIR}\dbrpc.h" - File "${AFS_BUILD_INCDIR}\basic.h" - File "${AFS_BUILD_INCDIR}\osidebug.h" - File "${AFS_BUILD_INCDIR}\osiltype.h" - File "${AFS_BUILD_INCDIR}\osistatl.h" - File "${AFS_BUILD_INCDIR}\trylock.h" - File "${AFS_BUILD_INCDIR}\main.h" - File "${AFS_BUILD_INCDIR}\osibasel.h" - File "${AFS_BUILD_INCDIR}\osifd.h" - File "${AFS_BUILD_INCDIR}\osiqueue.h" - File "${AFS_BUILD_INCDIR}\osiutils.h" - File "${AFS_BUILD_INCDIR}\osi.h" - File "${AFS_BUILD_INCDIR}\osidb.h" - File "${AFS_BUILD_INCDIR}\osilog.h" - File "${AFS_BUILD_INCDIR}\osisleep.h" - File "${AFS_BUILD_INCDIR}\perf.h" - File "${AFS_BUILD_INCDIR}\ubik.h" - File "${AFS_BUILD_INCDIR}\ubik_int.h" - - - - SetOutPath "$INSTDIR\Client\Program\Include\afs" - File "${AFS_BUILD_INCDIR}\afs\afs_args.h" - File "${AFS_BUILD_INCDIR}\afs\debug.h" - File "${AFS_BUILD_INCDIR}\afs\param.h" - File "${AFS_BUILD_INCDIR}\afs\afs_sysnames.h" - ;File "${AFS_BUILD_INCDIR}\afs\permit_xprt.h" - File "${AFS_BUILD_INCDIR}\afs\stds.h" - File "${AFS_BUILD_INCDIR}\afs\icl.h" - File "${AFS_BUILD_INCDIR}\afs\procmgmt.h" - File "${AFS_BUILD_INCDIR}\afs\afsutil.h" - File "${AFS_BUILD_INCDIR}\afs\assert.h" - File "${AFS_BUILD_INCDIR}\afs\dirent.h" - File "${AFS_BUILD_INCDIR}\afs\errors.h" - File "${AFS_BUILD_INCDIR}\afs\itc.h" - File "${AFS_BUILD_INCDIR}\afs\vice.h" - File "${AFS_BUILD_INCDIR}\afs\pthread_glock.h" - File "${AFS_BUILD_INCDIR}\afs\errmap_nt.h" - File "${AFS_BUILD_INCDIR}\afs\dirpath.h" - File "${AFS_BUILD_INCDIR}\afs\ktime.h" - File "${AFS_BUILD_INCDIR}\afs\fileutil.h" - File "${AFS_BUILD_INCDIR}\afs\secutil_nt.h" - File "${AFS_BUILD_INCDIR}\afs\com_err.h" - File "${AFS_BUILD_INCDIR}\afs\error_table.h" - ;File "${AFS_BUILD_INCDIR}\afs\mit_sipb-cr.h" - File "${AFS_BUILD_INCDIR}\afs\cmd.h" - File "${AFS_BUILD_INCDIR}\afs\rxgen_consts.h" - File "${AFS_BUILD_INCDIR}\afs\afsint.h" - File "${AFS_BUILD_INCDIR}\afs\afscbint.h" - File "${AFS_BUILD_INCDIR}\afs\audit.h" - File "${AFS_BUILD_INCDIR}\afs\acl.h" - File "${AFS_BUILD_INCDIR}\afs\prs_fs.h" - File "${AFS_BUILD_INCDIR}\afs\afsd.h" - File "${AFS_BUILD_INCDIR}\afs\cm.h" - File "${AFS_BUILD_INCDIR}\afs\cm_buf.h" - File "${AFS_BUILD_INCDIR}\afs\cm_cell.h" - File "${AFS_BUILD_INCDIR}\afs\cm_config.h" - File "${AFS_BUILD_INCDIR}\afs\cm_conn.h" - File "${AFS_BUILD_INCDIR}\afs\cm_ioctl.h" - File "${AFS_BUILD_INCDIR}\afs\cm_scache.h" - File "${AFS_BUILD_INCDIR}\afs\cm_server.h" - File "${AFS_BUILD_INCDIR}\afs\cm_user.h" - File "${AFS_BUILD_INCDIR}\afs\cm_utils.h" - File "${AFS_BUILD_INCDIR}\afs\fs_utils.h" - File "${AFS_BUILD_INCDIR}\afs\krb.h" - File "${AFS_BUILD_INCDIR}\afs\krb_prot.h" - File "${AFS_BUILD_INCDIR}\afs\smb.h" - File "${AFS_BUILD_INCDIR}\afs\smb3.h" - File "${AFS_BUILD_INCDIR}\afs\smb_iocons.h" - File "${AFS_BUILD_INCDIR}\afs\smb_ioctl.h" - File "${AFS_BUILD_INCDIR}\afs\afsrpc.h" - File "${AFS_BUILD_INCDIR}\afs\afssyscalls.h" - File "${AFS_BUILD_INCDIR}\afs\pioctl_nt.h" - File "${AFS_BUILD_INCDIR}\afs\auth.h" - File "${AFS_BUILD_INCDIR}\afs\cellconfig.h" - File "${AFS_BUILD_INCDIR}\afs\keys.h" - File "${AFS_BUILD_INCDIR}\afs\ptserver.h" - File "${AFS_BUILD_INCDIR}\afs\ptint.h" - File "${AFS_BUILD_INCDIR}\afs\pterror.h" - File "${AFS_BUILD_INCDIR}\afs\ptint.h" - File "${AFS_BUILD_INCDIR}\afs\pterror.h" - File "${AFS_BUILD_INCDIR}\afs\ptclient.h" - File "${AFS_BUILD_INCDIR}\afs\prserver.h" - File "${AFS_BUILD_INCDIR}\afs\print.h" - File "${AFS_BUILD_INCDIR}\afs\prerror.h" - File "${AFS_BUILD_INCDIR}\afs\prclient.h" - File "${AFS_BUILD_INCDIR}\afs\kautils.h" - File "${AFS_BUILD_INCDIR}\afs\kauth.h" - File "${AFS_BUILD_INCDIR}\afs\kaport.h" - File "${AFS_BUILD_INCDIR}\afs\vl_opcodes.h" - File "${AFS_BUILD_INCDIR}\afs\vlserver.h" - File "${AFS_BUILD_INCDIR}\afs\vldbint.h" - File "${AFS_BUILD_INCDIR}\afs\usd.h" - File "${AFS_BUILD_INCDIR}\afs\bubasics.h" - File "${AFS_BUILD_INCDIR}\afs\butc.h" - File "${AFS_BUILD_INCDIR}\afs\bumon.h" - File "${AFS_BUILD_INCDIR}\afs\butm.h" - File "${AFS_BUILD_INCDIR}\afs\tcdata.h" - File "${AFS_BUILD_INCDIR}\afs\budb.h" - ;File "${AFS_BUILD_INCDIR}\afs\budb_errors.h" - File "${AFS_BUILD_INCDIR}\afs\budb_client.h" - File "${AFS_BUILD_INCDIR}\afs\dir.h" - File "${AFS_BUILD_INCDIR}\afs\fssync.h" - File "${AFS_BUILD_INCDIR}\afs\ihandle.h" - File "${AFS_BUILD_INCDIR}\afs\nfs.h" - File "${AFS_BUILD_INCDIR}\afs\ntops.h" - File "${AFS_BUILD_INCDIR}\afs\partition.h" - File "${AFS_BUILD_INCDIR}\afs\viceinode.h" - File "${AFS_BUILD_INCDIR}\afs\vnode.h" - File "${AFS_BUILD_INCDIR}\afs\volume.h" - File "${AFS_BUILD_INCDIR}\afs\voldefs.h" - File "${AFS_BUILD_INCDIR}\afs\volser.h" - File "${AFS_BUILD_INCDIR}\afs\volint.h" - File "${AFS_BUILD_INCDIR}\afs\fs_stats.h" - File "${AFS_BUILD_INCDIR}\afs\bosint.h" - File "${AFS_BUILD_INCDIR}\afs\bnode.h" - - - SetOutPath "$INSTDIR\Client\Program\Include\rx" - File "${AFS_BUILD_INCDIR}\rx\rx.h" - File "${AFS_BUILD_INCDIR}\rx\rx_packet.h" - File "${AFS_BUILD_INCDIR}\rx\rx_user.h" - File "${AFS_BUILD_INCDIR}\rx\rx_event.h" - File "${AFS_BUILD_INCDIR}\rx\rx_queue.h" - File "${AFS_BUILD_INCDIR}\rx\rx_globals.h" - File "${AFS_BUILD_INCDIR}\rx\rx_clock.h" - File "${AFS_BUILD_INCDIR}\rx\rx_misc.h" - File "${AFS_BUILD_INCDIR}\rx\rx_multi.h" - File "${AFS_BUILD_INCDIR}\rx\rx_null.h" - File "${AFS_BUILD_INCDIR}\rx\rx_lwp.h" - File "${AFS_BUILD_INCDIR}\rx\rx_pthread.h" - File "${AFS_BUILD_INCDIR}\rx\rx_xmit_nt.h" - File "${AFS_BUILD_INCDIR}\rx\xdr.h" - File "${AFS_BUILD_INCDIR}\rx\rxkad.h" - - + SetOutPath "$INSTDIR\Client\Program\Include" + File /r "${AFS_BUILD_INCDIR}\*.*" ; Client Sample SetOutPath "$INSTDIR\Client\Program\Sample"