update
This commit is contained in:
42
.CondaPkg/env/Library/lib/nmake/nmakehlp.c
vendored
42
.CondaPkg/env/Library/lib/nmake/nmakehlp.c
vendored
@@ -4,8 +4,8 @@
|
||||
*
|
||||
* This is used to fix limitations within nmake and the environment.
|
||||
*
|
||||
* Copyright (c) 2002 by David Gravereaux.
|
||||
* Copyright (c) 2006 by Pat Thoyts
|
||||
* Copyright (c) 2002 David Gravereaux.
|
||||
* Copyright (c) 2006 Pat Thoyts
|
||||
*
|
||||
* See the file "license.terms" for information on usage and redistribution of
|
||||
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
||||
@@ -19,7 +19,6 @@
|
||||
#pragma comment (lib, "kernel32.lib")
|
||||
#endif
|
||||
#include <stdio.h>
|
||||
#include <math.h>
|
||||
|
||||
/*
|
||||
* This library is required for x64 builds with _some_ versions of MSVC
|
||||
@@ -31,7 +30,7 @@
|
||||
#endif
|
||||
|
||||
/* ISO hack for dumb VC++ */
|
||||
#ifdef _MSC_VER
|
||||
#if defined(_WIN32) && defined(_MSC_VER) && _MSC_VER < 1900
|
||||
#define snprintf _snprintf
|
||||
#endif
|
||||
|
||||
@@ -207,25 +206,25 @@ CheckForCompilerFeature(
|
||||
|
||||
hProcess = GetCurrentProcess();
|
||||
|
||||
ZeroMemory(&pi, sizeof(PROCESS_INFORMATION));
|
||||
ZeroMemory(&si, sizeof(STARTUPINFO));
|
||||
memset(&pi, 0, sizeof(PROCESS_INFORMATION));
|
||||
memset(&si, 0, sizeof(STARTUPINFO));
|
||||
si.cb = sizeof(STARTUPINFO);
|
||||
si.dwFlags = STARTF_USESTDHANDLES;
|
||||
si.hStdInput = INVALID_HANDLE_VALUE;
|
||||
|
||||
ZeroMemory(&sa, sizeof(SECURITY_ATTRIBUTES));
|
||||
memset(&sa, 0, sizeof(SECURITY_ATTRIBUTES));
|
||||
sa.nLength = sizeof(SECURITY_ATTRIBUTES);
|
||||
sa.lpSecurityDescriptor = NULL;
|
||||
sa.bInheritHandle = FALSE;
|
||||
|
||||
/*
|
||||
* Create a non-inheritible pipe.
|
||||
* Create a non-inheritable pipe.
|
||||
*/
|
||||
|
||||
CreatePipe(&Out.pipe, &h, &sa, 0);
|
||||
|
||||
/*
|
||||
* Dupe the write side, make it inheritible, and close the original.
|
||||
* Dupe the write side, make it inheritable, and close the original.
|
||||
*/
|
||||
|
||||
DuplicateHandle(hProcess, h, hProcess, &si.hStdOutput, 0, TRUE,
|
||||
@@ -272,7 +271,7 @@ CheckForCompilerFeature(
|
||||
if (!ok) {
|
||||
DWORD err = GetLastError();
|
||||
int chars = snprintf(msg, sizeof(msg) - 1,
|
||||
"Tried to launch: \"%s\", but got error [%u]: ", cmdline, err);
|
||||
"Tried to launch: \"%s\", but got error [%lu]: ", cmdline, err);
|
||||
|
||||
FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_IGNORE_INSERTS|
|
||||
FORMAT_MESSAGE_MAX_WIDTH_MASK, 0L, err, 0, (LPSTR)&msg[chars],
|
||||
@@ -343,13 +342,13 @@ CheckForLinkerFeature(
|
||||
|
||||
hProcess = GetCurrentProcess();
|
||||
|
||||
ZeroMemory(&pi, sizeof(PROCESS_INFORMATION));
|
||||
ZeroMemory(&si, sizeof(STARTUPINFO));
|
||||
memset(&pi, 0, sizeof(PROCESS_INFORMATION));
|
||||
memset(&si, 0, sizeof(STARTUPINFO));
|
||||
si.cb = sizeof(STARTUPINFO);
|
||||
si.dwFlags = STARTF_USESTDHANDLES;
|
||||
si.hStdInput = INVALID_HANDLE_VALUE;
|
||||
|
||||
ZeroMemory(&sa, sizeof(SECURITY_ATTRIBUTES));
|
||||
memset(&sa, 0, sizeof(SECURITY_ATTRIBUTES));
|
||||
sa.nLength = sizeof(SECURITY_ATTRIBUTES);
|
||||
sa.lpSecurityDescriptor = NULL;
|
||||
sa.bInheritHandle = TRUE;
|
||||
@@ -361,7 +360,7 @@ CheckForLinkerFeature(
|
||||
CreatePipe(&Out.pipe, &h, &sa, 0);
|
||||
|
||||
/*
|
||||
* Dupe the write side, make it inheritible, and close the original.
|
||||
* Dupe the write side, make it inheritable, and close the original.
|
||||
*/
|
||||
|
||||
DuplicateHandle(hProcess, h, hProcess, &si.hStdOutput, 0, TRUE,
|
||||
@@ -406,7 +405,7 @@ CheckForLinkerFeature(
|
||||
if (!ok) {
|
||||
DWORD err = GetLastError();
|
||||
int chars = snprintf(msg, sizeof(msg) - 1,
|
||||
"Tried to launch: \"%s\", but got error [%u]: ", cmdline, err);
|
||||
"Tried to launch: \"%s\", but got error [%lu]: ", cmdline, err);
|
||||
|
||||
FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_IGNORE_INSERTS|
|
||||
FORMAT_MESSAGE_MAX_WIDTH_MASK, 0L, err, 0, (LPSTR)&msg[chars],
|
||||
@@ -593,7 +592,7 @@ list_free(list_item_t **listPtrPtr)
|
||||
* SubstituteFile --
|
||||
* As windows doesn't provide anything useful like sed and it's unreliable
|
||||
* to use the tclsh you are building against (consider x-platform builds -
|
||||
* eg compiling AMD64 target from IX86) we provide a simple substitution
|
||||
* e.g. compiling AMD64 target from IX86) we provide a simple substitution
|
||||
* option here to handle autoconf style substitutions.
|
||||
* The substitution file is whitespace and line delimited. The file should
|
||||
* consist of lines matching the regular expression:
|
||||
@@ -619,7 +618,7 @@ SubstituteFile(
|
||||
if (fp != NULL) {
|
||||
|
||||
/*
|
||||
* Build a list of substutitions from the first filename
|
||||
* Build a list of substitutions from the first filename
|
||||
*/
|
||||
|
||||
sp = fopen(substitutions, "rt");
|
||||
@@ -727,11 +726,13 @@ static int LocateDependencyHelper(const char *dir, const char *keypath)
|
||||
int keylen, ret;
|
||||
WIN32_FIND_DATA finfo;
|
||||
|
||||
if (dir == NULL || keypath == NULL)
|
||||
if (dir == NULL || keypath == NULL) {
|
||||
return 2; /* Have no real error reporting mechanism into nmake */
|
||||
}
|
||||
dirlen = strlen(dir);
|
||||
if ((dirlen + 3) > sizeof(path))
|
||||
if (dirlen > sizeof(path) - 3) {
|
||||
return 2;
|
||||
}
|
||||
strncpy(path, dir, dirlen);
|
||||
strncpy(path+dirlen, "\\*", 3); /* Including terminating \0 */
|
||||
keylen = strlen(keypath);
|
||||
@@ -797,8 +798,9 @@ static int LocateDependency(const char *keypath)
|
||||
|
||||
for (i = 0; i < (sizeof(paths)/sizeof(paths[0])); ++i) {
|
||||
ret = LocateDependencyHelper(paths[i], keypath);
|
||||
if (ret == 0)
|
||||
if (ret == 0) {
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
22
.CondaPkg/env/Library/lib/nmake/rules.vc
vendored
22
.CondaPkg/env/Library/lib/nmake/rules.vc
vendored
@@ -79,10 +79,11 @@ NEED_TK_SOURCE = 0
|
||||
# 3. Determine the compiler and linker versions
|
||||
# 4. Build the nmakehlp helper application
|
||||
# 5. Determine the supported compiler options and features
|
||||
# 6. Parse the OPTS macro value for user-specified build configuration
|
||||
# 7. Parse the STATS macro value for statistics instrumentation
|
||||
# 8. Parse the CHECKS macro for additional compilation checks
|
||||
# 9. Extract Tcl, and possibly Tk, version numbers from the headers
|
||||
# 6. Extract Tcl, Tk, and possibly extensions, version numbers from the
|
||||
# headers
|
||||
# 7. Parse the OPTS macro value for user-specified build configuration
|
||||
# 8. Parse the STATS macro value for statistics instrumentation
|
||||
# 9. Parse the CHECKS macro for additional compilation checks
|
||||
# 10. Based on this selected configuration, construct the output
|
||||
# directory and file paths
|
||||
# 11. Construct the paths where the package is to be installed
|
||||
@@ -816,7 +817,6 @@ DOTSEPARATED=$(DOTSEPARATED:b=.)
|
||||
# configuration (ignored for Tcl itself)
|
||||
# _USE_64BIT_TIME_T - forces a build using 64-bit time_t for 32-bit build
|
||||
# (CRT library should support this, not needed for Tcl 9.x)
|
||||
# TCL_UTF_MAX=3 - forces a build using UTF-16 internally (not recommended).
|
||||
# Further, LINKERFLAGS are modified based on above.
|
||||
|
||||
# Default values for all the above
|
||||
@@ -882,11 +882,6 @@ USE_THREAD_ALLOC= 0
|
||||
!message *** Force 64-bit time_t
|
||||
_USE_64BIT_TIME_T = 1
|
||||
!endif
|
||||
|
||||
!if [nmakehlp -f $(OPTS) "utf16"]
|
||||
!message *** Force UTF-16 internally
|
||||
TCL_UTF_MAX = 3
|
||||
!endif
|
||||
!endif
|
||||
|
||||
# Yes, it's weird that the "symbols" option controls DEBUG and
|
||||
@@ -1344,7 +1339,7 @@ INCLUDE_INSTALL_DIR = $(_INSTALLDIR)\..\include
|
||||
# and switches are specific to it.
|
||||
# The following macros are defined, names are for historical compatibility:
|
||||
# OPTDEFINES - /Dxxx C macro flags based on user-specified OPTS
|
||||
# COMPILERFLAGS - /Dxxx C macro flags independent of any configuration opttions
|
||||
# COMPILERFLAGS - /Dxxx C macro flags independent of any configuration options
|
||||
# crt - Compiler switch that selects the appropriate C runtime
|
||||
# cdebug - Compiler switches related to debug AND optimizations
|
||||
# cwarn - Compiler switches that set warning levels
|
||||
@@ -1426,9 +1421,6 @@ OPTDEFINES = $(OPTDEFINES) /D_USE_64BIT_TIME_T=1
|
||||
# _ATL_XP_TARGETING - Newer SDK's need this to build for XP
|
||||
COMPILERFLAGS = /D_ATL_XP_TARGETING
|
||||
!endif
|
||||
!if "$(TCL_UTF_MAX)" == "3"
|
||||
OPTDEFINES = $(OPTDEFINES) /DTCL_UTF_MAX=3
|
||||
!endif
|
||||
|
||||
# Like the TEA system only set this non empty for non-Tk extensions
|
||||
# Note: some extensions use PACKAGE_NAME and others use PACKAGE_TCLNAME
|
||||
@@ -1597,7 +1589,7 @@ DLLCMD = $(link32) $(dlllflags) -out:$@ $(baselibs) $(tcllibs) $(tklibs)
|
||||
CONEXECMD = $(link32) $(conlflags) -out:$@ $(baselibs) $(tcllibs) $(tklibs)
|
||||
GUIEXECMD = $(link32) $(guilflags) -out:$@ $(baselibs) $(tcllibs) $(tklibs)
|
||||
RESCMD = $(rc32) -fo $@ -r -i "$(GENERICDIR)" -i "$(TMP_DIR)" \
|
||||
$(TCL_INCLUDES) \
|
||||
$(TCL_INCLUDES) /DSTATIC_BUILD=$(STATIC_BUILD) \
|
||||
/DDEBUG=$(DEBUG) -d UNCHECKED=$(UNCHECKED) \
|
||||
/DCOMMAVERSION=$(RCCOMMAVERSION) \
|
||||
/DDOTVERSION=\"$(DOTVERSION)\" \
|
||||
|
||||
Reference in New Issue
Block a user