From 753585b94897f5628cf9c13d8a6c97861074febb Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Thu, 17 Mar 2016 21:31:44 +0100 Subject: Remove the mk1mf VC-WIN* builds and its supporting scripts The mk1mf build for the VC-WIN* targets is broken and the unified scheme works well enough, so we clean out the old. Reviewed-by: Andy Polyakov --- ms/do_fips.bat | 82 -------------------------------------------------------- ms/do_ms.bat | 11 -------- ms/do_nasm.bat | 7 ----- ms/do_win64a.bat | 19 ------------- ms/do_win64i.bat | 9 ------- 5 files changed, 128 deletions(-) delete mode 100644 ms/do_fips.bat delete mode 100755 ms/do_ms.bat delete mode 100755 ms/do_nasm.bat delete mode 100755 ms/do_win64a.bat delete mode 100755 ms/do_win64i.bat (limited to 'ms') diff --git a/ms/do_fips.bat b/ms/do_fips.bat deleted file mode 100644 index 73b0a3e8e4..0000000000 --- a/ms/do_fips.bat +++ /dev/null @@ -1,82 +0,0 @@ -@echo off - -SET ASM=%1 -SET EXARG= - -if NOT X%PROCESSOR_ARCHITECTURE% == X goto defined - -echo Processor Architecture Undefined: defaulting to X86 - -goto X86 - -:defined - -if %PROCESSOR_ARCHITECTURE% == x86 goto X86 - -if %PROCESSOR_ARCHITECTURE% == IA64 goto IA64 - -if %PROCESSOR_ARCHITECTURE% == AMD64 goto AMD64 - -echo Processor Architecture Unrecognized: defaulting to X86 - -:X86 -echo Auto Configuring for X86 - -SET TARGET=VC-WIN32 -if x%ASM% == xno-asm goto compile -SET ASM=nasm - -goto compile - -:IA64 - -echo Auto Configuring for IA64 -SET TARGET=VC-WIN64I - -goto compile - -:AMD64 - -echo Auto Configuring for AMD64 -SET TARGET=VC-WIN64A -if x%ASM% == xno-asm goto compile -SET ASM=nasm - -:compile - -if x%ASM% == xno-asm SET EXARG=no-asm -perl Configure %TARGET% %EXARG% fipscheck -pause - -echo on - -perl util\mkfiles.pl >MINFO -@if ERRORLEVEL 1 goto error -perl util\mk1mf.pl dll %ASM% %TARGET% >ms\ntdll.mak -@if ERRORLEVEL 1 goto error - -nmake -f ms\ntdll.mak clean -nmake -f ms\ntdll.mak -@if ERRORLEVEL 1 goto error -nmake -f ms\ntdll.mak install -@if ERRORLEVEL 1 goto error - -@echo. -@echo. -@echo. -@echo *************************** -@echo ****FIPS BUILD SUCCESS***** -@echo *************************** - -@goto end - -:error - -@echo. -@echo. -@echo. -@echo *************************** -@echo ****FIPS BUILD FAILURE***** -@echo *************************** - -:end diff --git a/ms/do_ms.bat b/ms/do_ms.bat deleted file mode 100755 index 396395f3b3..0000000000 --- a/ms/do_ms.bat +++ /dev/null @@ -1,11 +0,0 @@ - -perl util\mkfiles.pl >MINFO -perl util\mk1mf.pl no-asm VC-WIN32 >ms\nt.mak -perl util\mk1mf.pl dll no-asm VC-WIN32 >ms\ntdll.mak -if x%OSVERSION% == x goto skipce -perl util\mk1mf.pl no-asm VC-CE >ms\ce.mak -perl util\mk1mf.pl dll no-asm VC-CE >ms\cedll.mak -:skipce - -perl util\mkdef.pl 32 libcrypto > ms\libcrypto32.def -perl util\mkdef.pl 32 libssl > ms\libssl32.def diff --git a/ms/do_nasm.bat b/ms/do_nasm.bat deleted file mode 100755 index ad0cebdc27..0000000000 --- a/ms/do_nasm.bat +++ /dev/null @@ -1,7 +0,0 @@ - -perl util\mkfiles.pl >MINFO -perl util\mk1mf.pl nasm VC-WIN32 >ms\nt.mak -perl util\mk1mf.pl dll nasm VC-WIN32 >ms\ntdll.mak - -perl util\mkdef.pl 32 libcrypto > ms\libcrypto32.def -perl util\mkdef.pl 32 libssl > ms\libssl32.def diff --git a/ms/do_win64a.bat b/ms/do_win64a.bat deleted file mode 100755 index 6219a48e68..0000000000 --- a/ms/do_win64a.bat +++ /dev/null @@ -1,19 +0,0 @@ -perl util\mkfiles.pl >MINFO - -cmd /c "nasm -f win64 -v" >NUL 2>&1 -if %errorlevel% neq 0 goto ml64 - -perl ms\uplink-x86_64.pl nasm > ms\uptable.asm -nasm -f win64 -o ms\uptable.obj ms\uptable.asm -goto proceed - -:ml64 -perl ms\uplink-x86_64.pl masm > ms\uptable.asm -ml64 -c -Foms\uptable.obj ms\uptable.asm - -:proceed -perl util\mk1mf.pl VC-WIN64A >ms\nt.mak -perl util\mk1mf.pl dll VC-WIN64A >ms\ntdll.mak - -perl util\mkdef.pl 32 libcrypto > ms\libcrypto32.def -perl util\mkdef.pl 32 libssl > ms\libssl32.def diff --git a/ms/do_win64i.bat b/ms/do_win64i.bat deleted file mode 100755 index d542d85f77..0000000000 --- a/ms/do_win64i.bat +++ /dev/null @@ -1,9 +0,0 @@ - -perl util\mkfiles.pl >MINFO -perl ms\uplink-ia64.pl > ms\uptable.asm -ias -o ms\uptable.obj ms\uptable.asm -perl util\mk1mf.pl VC-WIN64I >ms\nt.mak -perl util\mk1mf.pl dll VC-WIN64I >ms\ntdll.mak - -perl util\mkdef.pl 32 libcrypto > ms\libcrypto32.def -perl util\mkdef.pl 32 libssl > ms\libssl32.def -- cgit v1.2.3