The branch, master has been updated via d18fbda... testprogs/win32: make it possible to specify MINGW_CC via 4ce04f6... testprogs/win32/spoolss: we don't need absolute pathes to mingw locations via 38d1776... testprogs/win32/npecho: use 'rm -f' instead of 'del' on unix via d133ef9... testprogs/win32: explain how to use nmake with NMakefile via 64fa63c... testprogs/win32/spoolss: rename Makefile.mingw GNUmakefile via b00acc8... testprogs/win32/spoolss: rename Makefile => NMakefile from 572e5de... Implement missing info level SMB_FILE_LINK_INFORMATION.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit d18fbda0d0bd7d4cd702e1feb80d5803a4afcc39 Author: Stefan Metzmacher <me...@samba.org> Date: Wed May 19 13:30:58 2010 +0200 testprogs/win32: make it possible to specify MINGW_CC metze commit 4ce04f6f6fe5c485045cd870cb9ad2e3f2063659 Author: Stefan Metzmacher <me...@samba.org> Date: Wed May 19 13:58:26 2010 +0200 testprogs/win32/spoolss: we don't need absolute pathes to mingw locations metze commit 38d1776c794a0a5693d5233a0767c4f5d7440f19 Author: Stefan Metzmacher <me...@samba.org> Date: Wed May 19 11:51:56 2010 +0200 testprogs/win32/npecho: use 'rm -f' instead of 'del' on unix metze commit d133ef997d0e64e25ab7f34ff67af8ffd09e366b Author: Stefan Metzmacher <me...@samba.org> Date: Wed May 19 11:51:07 2010 +0200 testprogs/win32: explain how to use nmake with NMakefile metze commit 64fa63c3e93e254466196b04b128b9057769b405 Author: Stefan Metzmacher <me...@samba.org> Date: Wed May 19 11:11:50 2010 +0200 testprogs/win32/spoolss: rename Makefile.mingw GNUmakefile metze commit b00acc81fb79fcea30710349ef6152d3104f1423 Author: Stefan Metzmacher <me...@samba.org> Date: Wed May 19 11:10:36 2010 +0200 testprogs/win32/spoolss: rename Makefile => NMakefile metze ----------------------------------------------------------------------- Summary of changes: testprogs/win32/npecho/GNUmakefile | 5 ++- testprogs/win32/npecho/NMakefile | 3 ++ testprogs/win32/spoolss/GNUmakefile | 23 ++++++++++++++++ testprogs/win32/spoolss/Makefile | 40 --------------------------- testprogs/win32/spoolss/Makefile.mingw | 23 ---------------- testprogs/win32/spoolss/NMakefile | 43 ++++++++++++++++++++++++++++++ testprogs/win32/testmailslot/GNUmakefile | 3 +- testprogs/win32/testmailslot/NMakefile | 3 ++ 8 files changed, 77 insertions(+), 66 deletions(-) create mode 100644 testprogs/win32/spoolss/GNUmakefile delete mode 100644 testprogs/win32/spoolss/Makefile delete mode 100644 testprogs/win32/spoolss/Makefile.mingw create mode 100644 testprogs/win32/spoolss/NMakefile Changeset truncated at 500 lines: diff --git a/testprogs/win32/npecho/GNUmakefile b/testprogs/win32/npecho/GNUmakefile index 64fb79f..5b4f976 100755 --- a/testprogs/win32/npecho/GNUmakefile +++ b/testprogs/win32/npecho/GNUmakefile @@ -8,7 +8,8 @@ NPECHO2 = npecho_client2.exe npecho_server2.exe all: $(NPECHO) $(NPECHO2) -CC = i586-mingw32msvc-gcc +MINGW_CC = i586-mingw32msvc-cc +CC = $(MINGW_CC) .SUFFIXES: .c .obj .exe @@ -19,5 +20,5 @@ CC = i586-mingw32msvc-gcc $(CC) $(CFLAGS) -o $@ $< $(LIBS) clean: - del *~ *.obj *.exe + rm -f *~ *.obj *.exe diff --git a/testprogs/win32/npecho/NMakefile b/testprogs/win32/npecho/NMakefile index a0951b0..a0e61d7 100755 --- a/testprogs/win32/npecho/NMakefile +++ b/testprogs/win32/npecho/NMakefile @@ -1,3 +1,6 @@ +# +# use nmake /f NMakefile [<target>] +# INCLUDES=-I CFLAGS=$(INCLUDES) -Zi -nologo diff --git a/testprogs/win32/spoolss/GNUmakefile b/testprogs/win32/spoolss/GNUmakefile new file mode 100644 index 0000000..0321a65 --- /dev/null +++ b/testprogs/win32/spoolss/GNUmakefile @@ -0,0 +1,23 @@ +CFLAGS=-I../../../ +MINGW_CC = i586-mingw32msvc-cc +CC = $(MINGW_CC) + +LIBS=-lwinspool + +all: testspoolss.exe + +clean: + rm -vf *.exe tags + +ctags: + ctags `find . -name "*.[ch]" | grep -v include/proto.h` + ctags --c-kinds=-p -a `find /usr/i686-pc-mingw32/sys-root/mingw/include -name "*.[ch]" | grep -v /CVS/` + +proto: + mkproto.pl printlib.c --private=printlib_proto.h --public=printlib_proto_pub.h --srcdir=. --builddir=. + mkproto.pl torture.c --private=torture_proto.h --public=torture_proto_pub.h --srcdir=. --builddir=. + +testspoolss.exe: testspoolss.c printlib.c torture.c error.c + @echo Compiling testspoolss.exe + @$(CC) $(CFLAGS) $(LDFLAGS) testspoolss.c printlib.c torture.c error.c $(LIBS) -o testspoolss.exe + diff --git a/testprogs/win32/spoolss/Makefile b/testprogs/win32/spoolss/Makefile deleted file mode 100644 index 5e984d4..0000000 --- a/testprogs/win32/spoolss/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -CFLAGS = /nologo /Zi /MT /Gm- /W4 /FR /D_CRT_SECURE_NO_WARNINGS -LIBS = kernel32.lib gdi32.lib user32.lib shell32.lib \ - advapi32.lib ole32.lib ws2_32.lib rpcrt4.lib -WINSPOOL_LIBS = winspool.lib - -all: testspoolss.exe - -.cpp.obj: - cl /c $(CFLAGS) $*.cpp - -.c.obj: - cl /c $(CFLAGS) $*.c - -clean: cleantmp - -del *.dll 2>nul - -cleantmp: - -del *~ *.o *.obj *.sbr *.bsc *.pdb *.lib *.ilk *.exp 2>nul - -del test_s.c test_c.c test.h 2>nul - -############################### -# helpers -############################### - -printlib.obj: printlib.c - -error.obj: error.c - -torture.obj: torture.c - -############################### -# binaries -############################### - -testspoolss.obj: testspoolss.c - -testspoolss.exe: testspoolss.obj printlib.obj error.obj torture.obj - cl $(CFLAGS) /Fe$@ testspoolss.obj printlib.obj error.obj torture.obj \ - /link /incremental:no /subsystem:console $(LIBS) $(WINSPOOL_LIBS) - diff --git a/testprogs/win32/spoolss/Makefile.mingw b/testprogs/win32/spoolss/Makefile.mingw deleted file mode 100644 index 7c66075..0000000 --- a/testprogs/win32/spoolss/Makefile.mingw +++ /dev/null @@ -1,23 +0,0 @@ -MAKE=mingw32-make -CFLAGS=-I../../../ -I/usr/i686-pc-mingw32/sys-root/mingw/include -LDFLAGS=-L/usr/i686-pc-mingw32/sys-root/mingw/lib -CC=/usr/bin/i686-pc-mingw32-gcc -LIBS=-lwinspool - -all: testspoolss.exe - -clean: - rm -vf *.exe tags - -ctags: - ctags `find . -name "*.[ch]" | grep -v include/proto.h` - ctags --c-kinds=-p -a `find /usr/i686-pc-mingw32/sys-root/mingw/include -name "*.[ch]" | grep -v /CVS/` - -proto: - mkproto.pl printlib.c --private=printlib_proto.h --public=printlib_proto_pub.h --srcdir=. --builddir=. - mkproto.pl torture.c --private=torture_proto.h --public=torture_proto_pub.h --srcdir=. --builddir=. - -testspoolss.exe: testspoolss.c printlib.c torture.c error.c - @echo Compiling testspoolss.exe - @$(CC) $(CFLAGS) $(LDFLAGS) testspoolss.c printlib.c torture.c error.c $(LIBS) -o testspoolss.exe - diff --git a/testprogs/win32/spoolss/NMakefile b/testprogs/win32/spoolss/NMakefile new file mode 100644 index 0000000..949104e --- /dev/null +++ b/testprogs/win32/spoolss/NMakefile @@ -0,0 +1,43 @@ +# +# use nmake /f NMakefile [<target>] +# +CFLAGS = /nologo /Zi /MT /Gm- /W4 /FR /D_CRT_SECURE_NO_WARNINGS +LIBS = kernel32.lib gdi32.lib user32.lib shell32.lib \ + advapi32.lib ole32.lib ws2_32.lib rpcrt4.lib +WINSPOOL_LIBS = winspool.lib + +all: testspoolss.exe + +.cpp.obj: + cl /c $(CFLAGS) $*.cpp + +.c.obj: + cl /c $(CFLAGS) $*.c + +clean: cleantmp + -del *.dll 2>nul + +cleantmp: + -del *~ *.o *.obj *.sbr *.bsc *.pdb *.lib *.ilk *.exp 2>nul + -del test_s.c test_c.c test.h 2>nul + +############################### +# helpers +############################### + +printlib.obj: printlib.c + +error.obj: error.c + +torture.obj: torture.c + +############################### +# binaries +############################### + +testspoolss.obj: testspoolss.c + +testspoolss.exe: testspoolss.obj printlib.obj error.obj torture.obj + cl $(CFLAGS) /Fe$@ testspoolss.obj printlib.obj error.obj torture.obj \ + /link /incremental:no /subsystem:console $(LIBS) $(WINSPOOL_LIBS) + diff --git a/testprogs/win32/testmailslot/GNUmakefile b/testprogs/win32/testmailslot/GNUmakefile index c1c4215..a41fb91 100644 --- a/testprogs/win32/testmailslot/GNUmakefile +++ b/testprogs/win32/testmailslot/GNUmakefile @@ -1,6 +1,7 @@ INCLUDES=-I. CFLAGS=$(INCLUDES) -CC=i586-mingw32msvc-gcc +MINGW_CC = i586-mingw32msvc-cc +CC = $(MINGW_CC) all: testmailslot.exe diff --git a/testprogs/win32/testmailslot/NMakefile b/testprogs/win32/testmailslot/NMakefile index e307654..7551d7b 100644 --- a/testprogs/win32/testmailslot/NMakefile +++ b/testprogs/win32/testmailslot/NMakefile @@ -1,3 +1,6 @@ +# +# use nmake /f NMakefile [<target>] +# INCLUDES=-I CFLAGS=$(INCLUDES) -Zi -nologo -- Samba Shared Repository