mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2026-01-15 21:52:11 +01:00
374 lines
20 KiB
Diff
374 lines
20 KiB
Diff
From 12106f49081f61243c1b8dc74d2b716c14105f0b Mon Sep 17 00:00:00 2001
|
|
From: Carlo Landmeter <clandmeter@gmail.com>
|
|
Date: Wed, 5 Dec 2012 00:43:21 +0100
|
|
Subject: [PATCH] Remove rpcgen check as it is not needed anymore
|
|
|
|
---
|
|
configure.ac | 5 -----
|
|
1 file changed, 5 deletions(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 8cb254e..a06405c 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -21,11 +21,6 @@ fi
|
|
# We always want 64 bit file offsets
|
|
CFLAGS="${CFLAGS} -D_FILE_OFFSET_BITS=64"
|
|
|
|
-AC_CHECK_PROG([HAVE_RPCGEN], [rpcgen], [yes], [no])
|
|
-if test x$HAVE_RPCGEN != xyes; then
|
|
- AC_MSG_ERROR([Can not find required program])
|
|
-fi
|
|
-
|
|
#option: examples
|
|
AC_ARG_ENABLE([examples],
|
|
[AC_HELP_STRING([--enable-examples],
|
|
--
|
|
1.7.10
|
|
|
|
From ec70621f42e2074b454637813c1985b35552b2b3 Mon Sep 17 00:00:00 2001
|
|
From: Ronnie Sahlberg <ronniesahlberg@gmail.com>
|
|
Date: Tue, 4 Dec 2012 18:55:32 -0800
|
|
Subject: [PATCH] Remove all remaining references to RPC
|
|
|
|
---
|
|
configure.ac | 26 ----------------------
|
|
mount/Makefile.am | 4 ++--
|
|
nfs/Makefile.am | 4 ++--
|
|
nlm/Makefile.am | 4 ++--
|
|
portmap/Makefile.am | 4 ++--
|
|
rquota/Makefile.am | 4 ++--
|
|
win32/win32build.bat | 58 +++++++++++++++++---------------------------------
|
|
win32build.bat | 58 +++++++++++++++++---------------------------------
|
|
8 files changed, 50 insertions(+), 112 deletions(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index a06405c..1183bd2 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -68,19 +68,7 @@ fi
|
|
AC_SUBST(MAYBE_EXAMPLES)
|
|
|
|
|
|
-AC_ARG_ENABLE(tirpc,
|
|
- [AC_HELP_STRING([--enable-tirpc],
|
|
- [enable use of TI-RPC @<:@default=no@:>@])],
|
|
- enable_tirpc=$enableval,
|
|
- enable_tirpc='no')
|
|
-
|
|
case $host in
|
|
- *darwin*)
|
|
- RPCGENFLAGS=-DU_INT64_PLATTFORM_TYPE="u_int64_t"
|
|
- ;;
|
|
- *cygwin*)
|
|
- RPCGENFLAGS=-DU_INT64_PLATTFORM_TYPE="u_int64_t"
|
|
- ;;
|
|
*solaris*)
|
|
AC_CHECK_HEADERS([sys/filio.h])
|
|
AC_CHECK_HEADERS([sys/sockio.h])
|
|
@@ -93,8 +81,6 @@ case $host in
|
|
;;
|
|
esac
|
|
|
|
-AC_SUBST(RPCGENFLAGS)
|
|
-
|
|
# check for SA_LEN
|
|
dnl Check if sockaddr data structure includes a "sa_len"
|
|
AC_CHECK_MEMBER([struct sockaddr.sa_len],
|
|
@@ -105,18 +91,6 @@ AC_CHECK_MEMBER([struct sockaddr.sa_len],
|
|
#include <sys/socket.h>
|
|
])
|
|
|
|
-LIBNFS_PC_REQ_PRIVATE=
|
|
-
|
|
-if test "$enable_tirpc" = "yes"; then
|
|
- PKG_CHECK_MODULES(TIRPC, libtirpc, [],
|
|
- AC_MSG_ERROR([unable to locate libtirpc files]))
|
|
- CFLAGS="${CFLAGS} ${TIRPC_CFLAGS}"
|
|
- LIBS="${LIBS} ${TIRPC_LIBS}"
|
|
- LIBNFS_PC_REQ_PRIVATE="${LIBNFS_PC_REQ_PRIVATE} libtirpc"
|
|
-fi
|
|
-
|
|
-AC_SUBST(LIBNFS_PC_REQ_PRIVATE)
|
|
-
|
|
#output
|
|
AC_CONFIG_FILES([Makefile]
|
|
[include/Makefile]
|
|
diff --git a/mount/Makefile.am b/mount/Makefile.am
|
|
index e05df7d..9dadbf8 100644
|
|
--- a/mount/Makefile.am
|
|
+++ b/mount/Makefile.am
|
|
@@ -18,5 +18,5 @@ mount-stamp : mount.x
|
|
touch mount-stamp
|
|
|
|
compile_rpc:
|
|
- rpcgen -h @RPCGENFLAGS@ mount.x | sed -e "s/#include <rpc\/rpc.h>//" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" > libnfs-raw-mount.h
|
|
- rpcgen -c @RPCGENFLAGS@ mount.x | sed -e "s/#include \".*mount.h\"/#include \"libnfs-xdr.h\"\n#include \"libnfs-raw-mount.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n buf = NULL;/" > libnfs-raw-mount.c
|
|
+ rpcgen -h mount.x | sed -e "s/#include <rpc\/rpc.h>//" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" > libnfs-raw-mount.h
|
|
+ rpcgen -c mount.x | sed -e "s/#include \".*mount.h\"/#include \"libnfs-xdr.h\"\n#include \"libnfs-raw-mount.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n buf = NULL;/" > libnfs-raw-mount.c
|
|
diff --git a/nfs/Makefile.am b/nfs/Makefile.am
|
|
index 0f1c80e..d6f75a0 100644
|
|
--- a/nfs/Makefile.am
|
|
+++ b/nfs/Makefile.am
|
|
@@ -18,5 +18,5 @@ nfs-stamp : nfs.x
|
|
touch nfs-stamp
|
|
|
|
compile_rpc:
|
|
- rpcgen -h @RPCGENFLAGS@ nfs.x | sed -e "s/#include <rpc\/rpc.h>//" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" > libnfs-raw-nfs.h
|
|
- rpcgen -c @RPCGENFLAGS@ nfs.x | sed -e "s/#include \".*nfs.h\"/#include \"libnfs-xdr.h\"\n#include \"libnfs-raw-nfs.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n buf = NULL;/" > libnfs-raw-nfs.c
|
|
+ rpcgen -h nfs.x | sed -e "s/#include <rpc\/rpc.h>//" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" > libnfs-raw-nfs.h
|
|
+ rpcgen -c nfs.x | sed -e "s/#include \".*nfs.h\"/#include \"libnfs-xdr.h\"\n#include \"libnfs-raw-nfs.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n buf = NULL;/" > libnfs-raw-nfs.c
|
|
diff --git a/nlm/Makefile.am b/nlm/Makefile.am
|
|
index 18d2ddc..d6dd13c 100644
|
|
--- a/nlm/Makefile.am
|
|
+++ b/nlm/Makefile.am
|
|
@@ -18,5 +18,5 @@ nlm-stamp : nlm.x
|
|
touch nlm-stamp
|
|
|
|
compile_rpc:
|
|
- rpcgen -h @RPCGENFLAGS@ nlm.x | sed -e "s/#include <rpc\/rpc.h>//" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" > libnfs-raw-nlm.h
|
|
- rpcgen -c @RPCGENFLAGS@ nlm.x | sed -e "s/#include \".*nlm.h\"/#include \"libnfs-xdr.h\"\n#include \"libnfs-raw-nlm.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n buf = NULL;/" > libnfs-raw-nlm.c
|
|
+ rpcgen -h nlm.x | sed -e "s/#include <rpc\/rpc.h>//" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" > libnfs-raw-nlm.h
|
|
+ rpcgen -c nlm.x | sed -e "s/#include \".*nlm.h\"/#include \"libnfs-xdr.h\"\n#include \"libnfs-raw-nlm.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n buf = NULL;/" > libnfs-raw-nlm.c
|
|
diff --git a/portmap/Makefile.am b/portmap/Makefile.am
|
|
index 5b21870..2234964 100644
|
|
--- a/portmap/Makefile.am
|
|
+++ b/portmap/Makefile.am
|
|
@@ -18,5 +18,5 @@ portmap-stamp : portmap.x
|
|
touch portmap-stamp
|
|
|
|
compile_rpc:
|
|
- rpcgen -h @RPCGENFLAGS@ portmap.x | sed -e "s/#include <rpc\/rpc.h>//" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" > libnfs-raw-portmap.h
|
|
- rpcgen -c @RPCGENFLAGS@ portmap.x | sed -e "s/#include \".*portmap.h\"/#include \"libnfs-zdr.h\"\n#include \"libnfs-raw-portmap.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n buf = NULL;/" > libnfs-raw-portmap.c
|
|
+ rpcgen -h portmap.x | sed -e "s/#include <rpc\/rpc.h>//" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" > libnfs-raw-portmap.h
|
|
+ rpcgen -c portmap.x | sed -e "s/#include \".*portmap.h\"/#include \"libnfs-zdr.h\"\n#include \"libnfs-raw-portmap.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n buf = NULL;/" > libnfs-raw-portmap.c
|
|
diff --git a/rquota/Makefile.am b/rquota/Makefile.am
|
|
index ad2db51..07b22df 100644
|
|
--- a/rquota/Makefile.am
|
|
+++ b/rquota/Makefile.am
|
|
@@ -18,5 +18,5 @@ rquota-stamp : rquota.x
|
|
touch rquota-stamp
|
|
|
|
compile_rpc:
|
|
- rpcgen -h @RPCGENFLAGS@ rquota.x | sed -e "s/#include <rpc\/rpc.h>//" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" > libnfs-raw-rquota.h
|
|
- rpcgen -c @RPCGENFLAGS@ rquota.x | sed -e "s/#include \".*rquota.h\"/#include \"libnfs-xdr.h\"\n#include \"libnfs-raw-rquota.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n buf = NULL;/" > libnfs-raw-rquota.c
|
|
+ rpcgen -h rquota.x | sed -e "s/#include <rpc\/rpc.h>//" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" > libnfs-raw-rquota.h
|
|
+ rpcgen -c rquota.x | sed -e "s/#include \".*rquota.h\"/#include \"libnfs-xdr.h\"\n#include \"libnfs-raw-rquota.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n buf = NULL;/" > libnfs-raw-rquota.c
|
|
diff --git a/win32/win32build.bat b/win32/win32build.bat
|
|
index 55317ec..b923e63 100644
|
|
--- a/win32/win32build.bat
|
|
+++ b/win32/win32build.bat
|
|
@@ -3,69 +3,51 @@ rem set the
|
|
rem
|
|
|
|
rem EDIT THESE
|
|
-set ONCRPC_BASE_DIR=C:\MinGW\msys\1.0\home\Administrator\src\oncrpc-win32\
|
|
set LIBNFS_BASE_DIR=..
|
|
rem END EDIT
|
|
|
|
-set RPCINCLUDE="%ONCRPC_BASE_DIR%\win32\include"
|
|
-set RPCDLL="%ONCRPC_BASE_DIR%\win32\bin\oncrpc.dll"
|
|
-set RPCLIB="%ONCRPC_BASE_DIR%\win32\bin\oncrpc.lib"
|
|
-set RPCGEN="%ONCRPC_BASE_DIR%\win32\bin\rpcgen.exe"
|
|
-
|
|
|
|
cd %LIBNFS_BASE_DIR%
|
|
|
|
-rem generate NFS from .x
|
|
+rem NFS
|
|
rem
|
|
-copy nfs\nfs.x nfs\libnfs-raw-nfs.x
|
|
-%RPCGEN% -h nfs\libnfs-raw-nfs.x > nfs\libnfs-raw-nfs.h
|
|
-%RPCGEN% -c nfs\libnfs-raw-nfs.x > nfs\libnfs-raw-nfs.c
|
|
-cl /I. /Iinclude /Iwin32 /I%RPCINCLUDE% -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0501 -MDd nfs\libnfs-raw-nfs.c -Fonfs\libnfs-raw-nfs.obj
|
|
-cl /I. /Iinclude /Iwin32 /I%RPCINCLUDE% -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0501 -MDd nfs\nfs.c -Fonfs\nfs.obj
|
|
-cl /I. /Iinclude /Iwin32 /I%RPCINCLUDE% -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0501 -MDd nfs\nfsacl.c -Fonfs\nfsacl.obj
|
|
+cl /I. /Iinclude /Iwin32 -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0501 -MDd nfs\libnfs-raw-nfs.c -Fonfs\libnfs-raw-nfs.obj
|
|
+cl /I. /Iinclude /Iwin32 -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0501 -MDd nfs\nfs.c -Fonfs\nfs.obj
|
|
+cl /I. /Iinclude /Iwin32 -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0501 -MDd nfs\nfsacl.c -Fonfs\nfsacl.obj
|
|
|
|
|
|
|
|
rem
|
|
-rem generate RQUOTA from .x
|
|
+rem RQUOTA
|
|
rem
|
|
-copy rquota\rquota.x rquota\libnfs-raw-rquota.x
|
|
-%RPCGEN% -h rquota\libnfs-raw-rquota.x > rquota\libnfs-raw-rquota.h
|
|
-%RPCGEN% -c rquota\libnfs-raw-rquota.x > rquota\libnfs-raw-rquota.c
|
|
-cl /I. /Iinclude /Iwin32 /I%RPCINCLUDE% -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0501 -MDd rquota\libnfs-raw-rquota.c -Forquota\libnfs-raw-rquota.obj
|
|
-cl /I. /Iinclude /Iwin32 /I%RPCINCLUDE% -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0501 -MDd rquota\rquota.c -Forquota\rquota.obj
|
|
+cl /I. /Iinclude /Iwin32 -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0501 -MDd rquota\libnfs-raw-rquota.c -Forquota\libnfs-raw-rquota.obj
|
|
+cl /I. /Iinclude /Iwin32 -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0501 -MDd rquota\rquota.c -Forquota\rquota.obj
|
|
|
|
|
|
|
|
rem
|
|
-rem generate PORTMAP from .x
|
|
+rem PORTMAP
|
|
rem
|
|
-copy portmap\portmap.x portmap\libnfs-raw-portmap.x
|
|
-%RPCGEN% -h portmap\libnfs-raw-portmap.x > portmap\libnfs-raw-portmap.h
|
|
-%RPCGEN% -c portmap\libnfs-raw-portmap.x > portmap\libnfs-raw-portmap.c
|
|
-cl /I. /Iinclude /Iwin32 /I%RPCINCLUDE% -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0501 -MDd portmap\libnfs-raw-portmap.c -Foportmap\libnfs-raw-portmap.obj
|
|
-cl /I. /Iinclude /Iwin32 /I%RPCINCLUDE% -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0501 -MDd portmap\portmap.c -Foportmap\portmap.obj
|
|
+cl /I. /Iinclude /Iwin32 -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0501 -MDd portmap\libnfs-raw-portmap.c -Foportmap\libnfs-raw-portmap.obj
|
|
+cl /I. /Iinclude /Iwin32 -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0501 -MDd portmap\portmap.c -Foportmap\portmap.obj
|
|
|
|
|
|
rem
|
|
-rem generate MOUNT from .x
|
|
+rem MOUNT
|
|
rem
|
|
-copy mount\mount.x mount\libnfs-raw-mount.x
|
|
-%RPCGEN% -h mount\libnfs-raw-mount.x > mount\libnfs-raw-mount.h
|
|
-%RPCGEN% -c mount\libnfs-raw-mount.x > mount\libnfs-raw-mount.c
|
|
-cl /I. /Iinclude /Iwin32 /I%RPCINCLUDE% -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0501 -MDd mount\libnfs-raw-mount.c -Fomount\libnfs-raw-mount.obj
|
|
-cl /I. /Iinclude /Iwin32 /I%RPCINCLUDE% -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0501 -MDd mount\mount.c -Fomount\mount.obj
|
|
+cl /I. /Iinclude /Iwin32 -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0501 -MDd mount\libnfs-raw-mount.c -Fomount\libnfs-raw-mount.obj
|
|
+cl /I. /Iinclude /Iwin32 -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0501 -MDd mount\mount.c -Fomount\mount.obj
|
|
|
|
|
|
|
|
rem
|
|
rem generate core part of library
|
|
rem
|
|
-cl /I. /Iinclude /Iwin32 /I%RPCINCLUDE% -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0501 -MDd lib\init.c -Folib\init.obj
|
|
-cl /I. /Iinclude /Iwin32 /I%RPCINCLUDE% -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0501 -MDd -D_U_="" lib\pdu.c -Folib\pdu.obj
|
|
-cl /I. /Iinclude /Iwin32 /I%RPCINCLUDE% -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0501 -MDd -D_U_="" lib\socket.c -Folib\socket.obj
|
|
-cl /I. /Iinclude /Iwin32 /I%RPCINCLUDE% /Imount /Infs -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0501 -MDd -D_U_="" lib\libnfs.c -Folib\libnfs.obj
|
|
-cl /I. /Iinclude /Iwin32 /I%RPCINCLUDE% /Imount /Infs -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0501 -MDd -D_U_="" lib\libnfs-sync.c -Folib\libnfs-sync.obj
|
|
+cl /I. /Iinclude /Iwin32 -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0501 -MDd lib\init.c -Folib\init.obj
|
|
+cl /I. /Iinclude /Iwin32 -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0501 -MDd -D_U_="" lib\pdu.c -Folib\pdu.obj
|
|
+cl /I. /Iinclude /Iwin32 -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0501 -MDd -D_U_="" lib\socket.c -Folib\socket.obj
|
|
+cl /I. /Iinclude /Iwin32 /Imount /Infs -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0501 -MDd -D_U_="" lib\libnfs.c -Folib\libnfs.obj
|
|
+cl /I. /Iinclude /Iwin32 /Imount /Infs -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0501 -MDd -D_U_="" lib\libnfs-sync.c -Folib\libnfs-sync.obj
|
|
|
|
rem
|
|
rem generate win32 compat layer
|
|
@@ -79,14 +61,14 @@ rem create a linklibrary/dll
|
|
rem
|
|
lib /out:lib\libnfs.lib /def:lib\libnfs-win32.def nfs\nfs.obj nfs\nfsacl.obj nfs\libnfs-raw-nfs.obj rquota\rquota.obj rquota\libnfs-raw-rquota.obj mount\mount.obj mount\libnfs-raw-mount.obj portmap\portmap.obj portmap\libnfs-raw-portmap.obj lib\init.obj lib\pdu.obj lib\socket.obj lib\libnfs.obj lib\libnfs-sync.obj win32\win32_compat.obj
|
|
|
|
-link /DLL /out:lib\libnfs.dll /DEBUG /DEBUGTYPE:cv lib\libnfs.exp nfs\nfs.obj nfs\nfsacl.obj nfs\libnfs-raw-nfs.obj rquota\rquota.obj rquota\libnfs-raw-rquota.obj mount\mount.obj mount\libnfs-raw-mount.obj portmap\portmap.obj portmap\libnfs-raw-portmap.obj lib\init.obj lib\pdu.obj lib\socket.obj lib\libnfs.obj lib\libnfs-sync.obj win32\win32_compat.obj %RPCLIB% ws2_32.lib
|
|
+link /DLL /out:lib\libnfs.dll /DEBUG /DEBUGTYPE:cv lib\libnfs.exp nfs\nfs.obj nfs\nfsacl.obj nfs\libnfs-raw-nfs.obj rquota\rquota.obj rquota\libnfs-raw-rquota.obj mount\mount.obj mount\libnfs-raw-mount.obj portmap\portmap.obj portmap\libnfs-raw-portmap.obj lib\init.obj lib\pdu.obj lib\socket.obj lib\libnfs.obj lib\libnfs-sync.obj win32\win32_compat.obj ws2_32.lib
|
|
|
|
|
|
|
|
rem
|
|
rem build a test application
|
|
rem
|
|
-cl /I. /Iinclude /Iwin32 /I%RPCINCLUDE% /Imount /Infs -Zi -Od -DWIN32 -D_WIN32_WINNT=0x0501 -MDd -D_U_="" examples\nfsclient-sync.c lib\libnfs.lib %RPCLIB% WS2_32.lib kernel32.lib mswsock.lib advapi32.lib wsock32.lib advapi32.lib
|
|
+cl /I. /Iinclude /Iwin32 /Imount /Infs -Zi -Od -DWIN32 -D_WIN32_WINNT=0x0501 -MDd -D_U_="" examples\nfsclient-sync.c lib\libnfs.lib WS2_32.lib kernel32.lib mswsock.lib advapi32.lib wsock32.lib advapi32.lib
|
|
|
|
|
|
|
|
diff --git a/win32build.bat b/win32build.bat
|
|
index e690fa2..86641e3 100755
|
|
--- a/win32build.bat
|
|
+++ b/win32build.bat
|
|
@@ -2,65 +2,47 @@ rem build script for win32
|
|
rem set the
|
|
rem
|
|
|
|
-rem EDIT THESE
|
|
-set RPCINCLUDE="C:\...where my rpc includes live...\include"
|
|
-set RPCDLL="C:\...where my rpc DLL can be found...\rpc.dll"
|
|
-set RPCLIB="C:\...where my rpc link library can be found...\rpc.lib"
|
|
-set RPCGEN="C:\...where my rpcgen executable lives...\rpcgen.exe"
|
|
|
|
|
|
-
|
|
-rem generate NFS from .x
|
|
+rem NFS
|
|
rem
|
|
-copy nfs\nfs.x nfs\libnfs-raw-nfs.x
|
|
-%RPCGEN% -h nfs\libnfs-raw-nfs.x > nfs\libnfs-raw-nfs.h
|
|
-%RPCGEN% -c nfs\libnfs-raw-nfs.x > nfs\libnfs-raw-nfs.c
|
|
-cl /I. /Iinclude /I%RPCINCLUDE% -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0600 -MDd nfs\libnfs-raw-nfs.c -Fonfs\libnfs-raw-nfs.obj
|
|
-cl /I. /Iinclude /I%RPCINCLUDE% -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0600 -MDd nfs\nfs.c -Fonfs\nfs.obj
|
|
-cl /I. /Iinclude /I%RPCINCLUDE% -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0600 -MDd nfs\nfsacl.c -Fonfs\nfsacl.obj
|
|
+cl /I. /Iinclude -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0600 -MDd nfs\libnfs-raw-nfs.c -Fonfs\libnfs-raw-nfs.obj
|
|
+cl /I. /Iinclude -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0600 -MDd nfs\nfs.c -Fonfs\nfs.obj
|
|
+cl /I. /Iinclude -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0600 -MDd nfs\nfsacl.c -Fonfs\nfsacl.obj
|
|
|
|
|
|
|
|
rem
|
|
-rem generate RQUOTA from .x
|
|
+rem RQUOTA
|
|
rem
|
|
-copy rquota\rquota.x rquota\libnfs-raw-rquota.x
|
|
-%RPCGEN% -h rquota\libnfs-raw-rquota.x > rquota\libnfs-raw-rquota.h
|
|
-%RPCGEN% -c rquota\libnfs-raw-rquota.x > rquota\libnfs-raw-rquota.c
|
|
-cl /I. /Iinclude /I%RPCINCLUDE% -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0600 -MDd rquota\libnfs-raw-rquota.c -Forquota\libnfs-raw-rquota.obj
|
|
-cl /I. /Iinclude /I%RPCINCLUDE% -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0600 -MDd rquota\rquota.c -Forquota\rquota.obj
|
|
+cl /I. /Iinclude -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0600 -MDd rquota\libnfs-raw-rquota.c -Forquota\libnfs-raw-rquota.obj
|
|
+cl /I. /Iinclude -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0600 -MDd rquota\rquota.c -Forquota\rquota.obj
|
|
|
|
|
|
|
|
rem
|
|
-rem generate PORTMAP from .x
|
|
+rem PORTMAP
|
|
rem
|
|
-copy portmap\portmap.x portmap\libnfs-raw-portmap.x
|
|
-%RPCGEN% -h portmap\libnfs-raw-portmap.x > portmap\libnfs-raw-portmap.h
|
|
-%RPCGEN% -c portmap\libnfs-raw-portmap.x > portmap\libnfs-raw-portmap.c
|
|
-cl /I. /Iinclude /I%RPCINCLUDE% -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0600 -MDd portmap\libnfs-raw-portmap.c -Foportmap\libnfs-raw-portmap.obj
|
|
-cl /I. /Iinclude /I%RPCINCLUDE% -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0600 -MDd portmap\portmap.c -Foportmap\portmap.obj
|
|
+cl /I. /Iinclude -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0600 -MDd portmap\libnfs-raw-portmap.c -Foportmap\libnfs-raw-portmap.obj
|
|
+cl /I. /Iinclude -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0600 -MDd portmap\portmap.c -Foportmap\portmap.obj
|
|
|
|
|
|
rem
|
|
-rem generate MOUNT from .x
|
|
+rem MOUNT
|
|
rem
|
|
-copy mount\mount.x mount\libnfs-raw-mount.x
|
|
-%RPCGEN% -h mount\libnfs-raw-mount.x > mount\libnfs-raw-mount.h
|
|
-%RPCGEN% -c mount\libnfs-raw-mount.x > mount\libnfs-raw-mount.c
|
|
-cl /I. /Iinclude /I%RPCINCLUDE% -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0600 -MDd mount\libnfs-raw-mount.c -Fomount\libnfs-raw-mount.obj
|
|
-cl /I. /Iinclude /I%RPCINCLUDE% -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0600 -MDd mount\mount.c -Fomount\mount.obj
|
|
+cl /I. /Iinclude -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0600 -MDd mount\libnfs-raw-mount.c -Fomount\libnfs-raw-mount.obj
|
|
+cl /I. /Iinclude -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0600 -MDd mount\mount.c -Fomount\mount.obj
|
|
|
|
|
|
|
|
rem
|
|
rem generate core part of library
|
|
rem
|
|
-cl /I. /Iinclude /I%RPCINCLUDE% -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0600 -MDd lib\init.c -Folib\init.obj
|
|
-cl /I. /Iinclude /I%RPCINCLUDE% -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0600 -MDd -D_U_="" lib\pdu.c -Folib\pdu.obj
|
|
-cl /I. /Iinclude /I%RPCINCLUDE% -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0600 -MDd -D_U_="" lib\socket.c -Folib\socket.obj
|
|
-cl /I. /Iinclude /I%RPCINCLUDE% /Imount /Infs -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0600 -MDd -D_U_="" lib\libnfs.c -Folib\libnfs.obj
|
|
-cl /I. /Iinclude /I%RPCINCLUDE% /Imount /Infs -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0600 -MDd -D_U_="" lib\libnfs-sync.c -Folib\libnfs-sync.obj
|
|
+cl /I. /Iinclude -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0600 -MDd lib\init.c -Folib\init.obj
|
|
+cl /I. /Iinclude -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0600 -MDd -D_U_="" lib\pdu.c -Folib\pdu.obj
|
|
+cl /I. /Iinclude -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0600 -MDd -D_U_="" lib\socket.c -Folib\socket.obj
|
|
+cl /I. /Iinclude /Imount /Infs -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0600 -MDd -D_U_="" lib\libnfs.c -Folib\libnfs.obj
|
|
+cl /I. /Iinclude /Imount /Infs -Zi -Od -c -DWIN32 -D_WIN32_WINNT=0x0600 -MDd -D_U_="" lib\libnfs-sync.c -Folib\libnfs-sync.obj
|
|
|
|
|
|
|
|
@@ -69,14 +51,14 @@ rem create a linklibrary/dll
|
|
rem
|
|
lib /out:lib\libnfs.lib /def:lib\libnfs-win32.def nfs\nfs.obj nfs\nfsacl.obj nfs\libnfs-raw-nfs.obj rquota\rquota.obj rquota\libnfs-raw-rquota.obj mount\mount.obj mount\libnfs-raw-mount.obj portmap\portmap.obj portmap\libnfs-raw-portmap.obj lib\init.obj lib\pdu.obj lib\socket.obj lib\libnfs.obj lib\libnfs-sync.obj
|
|
|
|
-link /DLL /out:lib\libnfs.dll /DEBUG /DEBUGTYPE:cv lib\libnfs.exp nfs\nfs.obj nfs\nfsacl.obj nfs\libnfs-raw-nfs.obj rquota\rquota.obj rquota\libnfs-raw-rquota.obj mount\mount.obj mount\libnfs-raw-mount.obj portmap\portmap.obj portmap\libnfs-raw-portmap.obj lib\init.obj lib\pdu.obj lib\socket.obj lib\libnfs.obj lib\libnfs-sync.obj %RPCLIB% ws2_32.lib
|
|
+link /DLL /out:lib\libnfs.dll /DEBUG /DEBUGTYPE:cv lib\libnfs.exp nfs\nfs.obj nfs\nfsacl.obj nfs\libnfs-raw-nfs.obj rquota\rquota.obj rquota\libnfs-raw-rquota.obj mount\mount.obj mount\libnfs-raw-mount.obj portmap\portmap.obj portmap\libnfs-raw-portmap.obj lib\init.obj lib\pdu.obj lib\socket.obj lib\libnfs.obj lib\libnfs-sync.obj ws2_32.lib
|
|
|
|
|
|
|
|
rem
|
|
rem build a test application
|
|
rem
|
|
-cl /I. /Iinclude /I%RPCINCLUDE% /Imount /Infs -Zi -Od -DWIN32 -D_WIN32_WINNT=0x0600 -MDd -D_U_="" examples\nfsclient-sync.c lib\libnfs.lib %RPCLIB% WS2_32.lib kernel32.lib mswsock.lib advapi32.lib wsock32.lib advapi32.lib
|
|
+cl /I. /Iinclude /Imount /Infs -Zi -Od -DWIN32 -D_WIN32_WINNT=0x0600 -MDd -D_U_="" examples\nfsclient-sync.c lib\libnfs.lib WS2_32.lib kernel32.lib mswsock.lib advapi32.lib wsock32.lib advapi32.lib
|
|
|
|
|
|
|
|
--
|
|
1.7.10
|
|
|