sfos/ecl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build system: suppress some logo(copyright) information for msvc toolchains.

Browse source
This commit is contained in:
ZhangYuguo 2018-09-23 13:41:22 +00:00 • committed by Daniel Kochmański
parent a19cf59cd6
commit 5eeae0d823
6 changed files with 24 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
msvc/Makefile
View file

@ -345,7 +345,7 @@ ecl-cc.bat: util\ecl-cc.bat Makefile
eclmin.lib: eclgmp.lib eclgc.lib lsp/config.lsp eclmin.lib: eclgmp.lib eclgc.lib lsp/config.lsp
cd c cd c
$(MAKE) ECL_VERSION_NUMBER=$(ECL_VERSION_NUMBER) \ $(MAKE) /nologo ECL_VERSION_NUMBER=$(ECL_VERSION_NUMBER) \
ECL_THREADS=$(ECL_THREADS) ECL_UNICODE=$(ECL_UNICODE) \ ECL_THREADS=$(ECL_THREADS) ECL_UNICODE=$(ECL_UNICODE) \
ECL_SSE=$(ECL_SSE) ECL_WIN64=$(ECL_WIN64) \ ECL_SSE=$(ECL_SSE) ECL_WIN64=$(ECL_WIN64) \
ECL_USE_DBGHELP=$(ECL_USE_DBGHELP) \ ECL_USE_DBGHELP=$(ECL_USE_DBGHELP) \
@ -353,7 +353,7 @@ eclmin.lib: eclgmp.lib eclgc.lib lsp/config.lsp
cd .. cd ..
eclgc.lib: eclgc.lib:
cd gc cd gc
$(MAKE) $(GCFLAGS) ECL_THREADS=$(ECL_THREADS) "CFLAGS_CONFIG=$(CFLAGS_CONFIG)" "MY_CPU=$(GC_CPU)" gc.lib $(MAKE) /nologo $(GCFLAGS) ECL_THREADS=$(ECL_THREADS) "CFLAGS_CONFIG=$(CFLAGS_CONFIG)" "MY_CPU=$(GC_CPU)" gc.lib
$(CP) gc.lib ..\eclgc.lib $(CP) gc.lib ..\eclgc.lib
cd .. cd ..
if not exist ecl\gc $(MKDIR) ecl\gc if not exist ecl\gc $(MKDIR) ecl\gc
@ -366,7 +366,7 @@ eclgc.lib:
eclgmp.lib: eclgmp.lib:
cd gmp cd gmp
$(MAKE) "MPN_TYPE=$(GMP_TYPE)" "CFLAGS_CONFIG=$(CFLAGS_CONFIG)" \ $(MAKE) /nologo "MPN_TYPE=$(GMP_TYPE)" "CFLAGS_CONFIG=$(CFLAGS_CONFIG)" \
"BITS=$(GMP_BITS)" "YASM=$(YASM)" "BITS=$(GMP_BITS)" "YASM=$(YASM)"
$(CP) gmp.lib ..\eclgmp.lib $(CP) gmp.lib ..\eclgmp.lib
$(CP) gmp.h ..\ecl\gmp.h $(CP) gmp.h ..\ecl\gmp.h
@ -391,7 +391,7 @@ install:
IF EXIST "$(include)\ecl\atomic_ops" rmdir /S /Q "$(include)\ecl\atomic_ops" IF EXIST "$(include)\ecl\atomic_ops" rmdir /S /Q "$(include)\ecl\atomic_ops"
IF EXIST "ecl\atomic_ops" xcopy /S /Y "ecl\atomic_ops" "$(includedir)\atomic_ops\" IF EXIST "ecl\atomic_ops" xcopy /S /Y "ecl\atomic_ops" "$(includedir)\atomic_ops\"
cd c cd c
$(MAKE) cut.exe $(MAKE) /nologo cut.exe
cd .. cd ..
c\cut.exe < ecl\config.h > $(includedir)\ecl\config.h c\cut.exe < ecl\config.h > $(includedir)\ecl\config.h
IF NOT EXIST "$(libdir)" $(MKDIR) "$(libdir)" IF NOT EXIST "$(libdir)" $(MKDIR) "$(libdir)"
@ -408,15 +408,15 @@ install:
check: package\ecl.exe check: package\ecl.exe
cd tests cd tests
$(MAKE) $(MAKE) /nologo
recheck: package\ecl.exe recheck: package\ecl.exe
cd tests cd tests
$(MAKE) clean $(MAKE) /nologo clean
$(MAKE) $(MAKE) /nologo
package\ecl.exe: ecl2$(EXE) package\ecl.exe: ecl2$(EXE)
$(MAKE) install ECL_THREADS=$(ECL_THREADS) ECL_UNICODE=$(ECL_UNICODE) $(MAKE) /nologo install ECL_THREADS=$(ECL_THREADS) ECL_UNICODE=$(ECL_UNICODE)
windows-nsi: windows-nsi:
IF EXIST "$(TAR_DIR)" $(RMDIR) "$(TAR_DIR)" IF EXIST "$(TAR_DIR)" $(RMDIR) "$(TAR_DIR)"
@ -432,7 +432,7 @@ clean: clean_ecl clean_lisp
-$(RM) .gdbinit cinit.lib ecl_min.lib -$(RM) .gdbinit cinit.lib ecl_min.lib
-$(RM) bdwgc\*.pdb -$(RM) bdwgc\*.pdb
cd gc cd gc
-$(MAKE) $(GCFLAGS) ECL_THREADS=$(ECL_THREADS) "CFLAGS_CONFIG=$(CFLAGS_CONFIG)" "MY_CPU=$(GC_CPU)" clean -$(MAKE) /nologo $(GCFLAGS) ECL_THREADS=$(ECL_THREADS) "CFLAGS_CONFIG=$(CFLAGS_CONFIG)" "MY_CPU=$(GC_CPU)" clean
cd .. cd ..
-for %h in (gc.h gc_local_alloc.h gc_pthread_redirects.h \ -for %h in (gc.h gc_local_alloc.h gc_pthread_redirects.h \
gc_config_macros.h leak_detector.h gc_typed.h \ gc_config_macros.h leak_detector.h gc_typed.h \
@ -441,7 +441,7 @@ clean: clean_ecl clean_lisp
-$(RMDIR) ecl\gc\private -$(RMDIR) ecl\gc\private
-$(RMDIR) ecl\gc -$(RMDIR) ecl\gc
cd gmp cd gmp
-$(MAKE) "MPN_TYPE=$(GMP_TYPE)" "CFLAGS_CONFIG=$(CFLAGS_CONFIG)" \ -$(MAKE) /nologo "MPN_TYPE=$(GMP_TYPE)" "CFLAGS_CONFIG=$(CFLAGS_CONFIG)" \
"BITS=$(GMP_BITS)" "YASM=$(YASM)" clean "BITS=$(GMP_BITS)" "YASM=$(YASM)" clean
cd .. cd ..
-$(RM) ecl\gmp.h -$(RM) ecl\gmp.h
@ -454,7 +454,7 @@ clean_ecl:
ecl-cc.bat ecl.rc ecl.res) \ ecl-cc.bat ecl.rc ecl.res) \
do $(RM) %i do $(RM) %i
cd c cd c
-$(MAKE) ECL_VERSION_NUMBER=$(ECL_VERSION_NUMBER) \ -$(MAKE) /nologo ECL_VERSION_NUMBER=$(ECL_VERSION_NUMBER) \
ECL_THREADS=$(ECL_THREADS) ECL_UNICODE=$(ECL_UNICODE) \ ECL_THREADS=$(ECL_THREADS) ECL_UNICODE=$(ECL_UNICODE) \
ECL_SSE=$(ECL_SSE) ECL_WIN64=$(ECL_WIN64) \ ECL_SSE=$(ECL_SSE) ECL_WIN64=$(ECL_WIN64) \
ECL_USE_DBGHELP=$(ECL_USE_DBGHELP) \ ECL_USE_DBGHELP=$(ECL_USE_DBGHELP) \

5
msvc/c/Makefile
View file

@ -43,7 +43,6 @@ ECL_USE_DBGHELP_FLAG=0
# Programs used by "make": # Programs used by "make":
# #
TRUE_CC = cl
CC = cl CC = cl
CFLAGS = -c $(ECL_CFLAGS) -DECL_BUILD -DECL_API="__declspec(dllexport)" -I./ -I../ -I$(srcdir) -I$(top_srcdir)/bdwgc/include -I$(top_srcdir)/bdwgc/include/private -I$(srcdir)/unicode CFLAGS = -c $(ECL_CFLAGS) -DECL_BUILD -DECL_API="__declspec(dllexport)" -I./ -I../ -I$(srcdir) -I$(top_srcdir)/bdwgc/include -I$(top_srcdir)/bdwgc/include/private -I$(srcdir)/unicode
@ -145,7 +144,7 @@ cut.exe: $(top_srcdir)/util/cut.c
..\eclmin.lib: $(OBJS:.obj=.c) all_symbols.c $(OBJS) all_symbols.obj all_symbols2.obj ..\eclmin.lib: $(OBJS:.obj=.c) all_symbols.c $(OBJS) all_symbols.obj all_symbols2.obj
-$(RM) $@ -$(RM) $@
$(LINK) -lib -out:$@ $(OBJS) $(LINK) -lib -nologo -out:$@ $(OBJS)
clean: clean:
-for %f in ($(OBJS:.obj=.c) all_symbols.c) do $(RM) %f -for %f in ($(OBJS:.obj=.c) all_symbols.c) do $(RM) %f
@ -162,7 +161,7 @@ clean:
# Build rules # Build rules
$(DPP): $(srcdir)/dpp.c $(srcdir)/symbols_list2.h ../ecl/config.h ../ecl/config-internal.h $(DPP): $(srcdir)/dpp.c $(srcdir)/symbols_list2.h ../ecl/config.h ../ecl/config-internal.h
$(TRUE_CC) -I.. -I./ $(srcdir)/dpp.c -o $@ $(CC) /nologo -I.. -I./ $(srcdir)/dpp.c /Fe$@
$(HFILES): ../ecl/config.h.msvc6 ../ecl/config-internal.h.msvc6 Makefile $(HFILES): ../ecl/config.h.msvc6 ../ecl/config-internal.h.msvc6 Makefile
-mkdir ..\ecl\impl -mkdir ..\ecl\impl
cut.exe "@ECL_FPE_CODE@" "$(srcdir:\=/)/arch/$(ECL_FPE_CODE)" \ cut.exe "@ECL_FPE_CODE@" "$(srcdir:\=/)/arch/$(ECL_FPE_CODE)" \

6
msvc/gc/Makefile
View file

@ -32,13 +32,13 @@ OBJS= alloc.obj reclaim.obj allchblk.obj misc.obj mach_dep.obj os_dep.obj mark_r
all: gc.lib all: gc.lib
{$(srcdir)\extra}.c{}.obj: {$(srcdir)\extra}.c{}.obj:
$(CC) -c -DWIN32 -D_MT $(CFLAGS_CONFIG) -Iinclude -I$(AO_INCLUDE_DIR) $(THREADS_FLAGS) -I$(srcdir)\include $< /Fo$*.obj $(CC) -nologo -c -DWIN32 -D_MT $(CFLAGS_CONFIG) -Iinclude -I$(AO_INCLUDE_DIR) $(THREADS_FLAGS) -I$(srcdir)\include $< /Fo$*.obj
{$(srcdir)}.c{}.obj: {$(srcdir)}.c{}.obj:
$(CC) -c -DWIN32 -D_MT $(CFLAGS_CONFIG) -Iinclude -I$(AO_INCLUDE_DIR) $(THREADS_FLAGS) -I$(srcdir)\include $< /Fo$*.obj $(CC) -nologo -c -DWIN32 -D_MT $(CFLAGS_CONFIG) -Iinclude -I$(AO_INCLUDE_DIR) $(THREADS_FLAGS) -I$(srcdir)\include $< /Fo$*.obj
{$(srcdir)}.cpp{}.obj: {$(srcdir)}.cpp{}.obj:
$(CC) -c -DWIN32 -D_MT $(CFLAGS_CONFIG) -Iinclude -I$(AO_INCLUDE_DIR) $(THREADS_FLAGS) -I$(srcdir)\include $< /Fo$*.obj $(CC) -nologo -c -DWIN32 -D_MT $(CFLAGS_CONFIG) -Iinclude -I$(AO_INCLUDE_DIR) $(THREADS_FLAGS) -I$(srcdir)\include $< /Fo$*.obj
gc.lib: $(OBJS) gc.lib: $(OBJS)
!if "$(CPU)" == "i386" !if "$(CPU)" == "i386"

4
src/cmp/cmpmain.lsp
View file

@ -160,9 +160,9 @@ the environment variable TMPDIR to a different value." template))
(progn (progn
(with-open-file (f "static_lib.tmp" :direction :output (with-open-file (f "static_lib.tmp" :direction :output
:if-does-not-exist :create :if-exists :supersede) :if-does-not-exist :create :if-exists :supersede)
(format f "/DEBUGTYPE:CV /OUT:~A ~A ~{~&\"~A\"~}" (format f "/OUT:~A ~A ~{~&\"~A\"~}"
output-name o-name ld-flags)) output-name o-name ld-flags))
(safe-run-program "link" '("-lib" "@static_lib.tmp"))) (safe-run-program "link" '("-lib -nologo" "@static_lib.tmp")))
(when (probe-file "static_lib.tmp") (when (probe-file "static_lib.tmp")
(cmp-delete-file "static_lib.tmp")))) (cmp-delete-file "static_lib.tmp"))))

2
src/compile.lsp.in
View file

@ -340,7 +340,7 @@
:if-does-not-exist :create) :if-does-not-exist :create)
(write-line "id ICON \"ecl.ico\"" s)) (write-line "id ICON \"ecl.ico\"" s))
(ext:copy-file #p"src:util;ecl.ico" "ecl.ico") (ext:copy-file #p"src:util;ecl.ico" "ecl.ico")
#+msvc (ext:system "rc /r ecl.rc") #+msvc (ext:system "rc /nologo /r ecl.rc")
#-msvc (ext:system "windres ecl.rc -O coff ecl.res")) #-msvc (ext:system "windres ecl.rc -O coff ecl.res"))
(si::pathname-translations "SYS" '(("**;*.*.*" "@true_builddir@/**/*.*"))) (si::pathname-translations "SYS" '(("**;*.*.*" "@true_builddir@/**/*.*")))

6
src/h/ecl-cmp.h
View file

@ -21,11 +21,15 @@
* defined */ * defined */
#define _WINSOCKAPI_ #define _WINSOCKAPI_
#endif /* __CYGWIN__ */ #endif /* __CYGWIN__ */
#if defined(__clang__)
/* Disable a couple of clang's more annoying diagnostics */ /* Disable a couple of clang's more annoying diagnostics */
#pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wreturn-type"
#pragma clang diagnostic ignored "-Wunused-value" #pragma clang diagnostic ignored "-Wunused-value"
#pragma clang diagnostic ignored "-Wparentheses-equality" #pragma clang diagnostic ignored "-Wparentheses-equality"
#elif defined(_MSC_VER)
#pragma warning(disable:4715) //not all control paths return a value
#pragma warning(disable:4716) //must return a value
#endif
#include <ecl/ecl.h> #include <ecl/ecl.h>
#include <math.h> /* for inline mathematics */ #include <math.h> /* for inline mathematics */
#include <ecl/ecl-inl.h> #include <ecl/ecl-inl.h>