Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Remove accidental commit of merge conflict, resolved to original code. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
538be101355591aabb1854d009fa1d38 |
| User & Date: | dkf 2012-08-27 17:47:58 |
Context
|
2012-08-27
| ||
| 19:48 | Generate -errorcode values to go with errors. Generate messages and postscript using Tcl_Obj API, not the string result API. check-in: 961ae24a user: dkf tags: trunk | |
| 17:50 | merge trunk Closed-Leaf check-in: b20a0d33 user: dkf tags: tk-errorcodes | |
| 17:47 | Remove accidental commit of merge conflict, resolved to original code. check-in: 538be101 user: dkf tags: trunk | |
|
2012-08-25
| ||
| 01:55 | 3554026 3561016 Better fix from Emiliano Gavilan. check-in: ca2a716c user: dgp tags: trunk | |
Changes
Changes to win/buildall.vc.bat.
| ︙ | ︙ | |||
59 60 61 62 63 64 65 | :: Where is the Tcl source directory? :: You can set the TCLDIR environment variable to your Tcl HEAD checkout if "%TCLDIR%" == "" set TCLDIR=..\..\tcl :: Build the normal stuff along with the help file. :: | < | 59 60 61 62 63 64 65 66 67 68 69 70 71 72 | :: Where is the Tcl source directory? :: You can set the TCLDIR environment variable to your Tcl HEAD checkout if "%TCLDIR%" == "" set TCLDIR=..\..\tcl :: Build the normal stuff along with the help file. :: set OPTS=none if not %SYMBOLS%.==. set OPTS=symbols nmake -nologo -f makefile.vc release htmlhelp OPTS=%OPTS% %1 if errorlevel 1 goto error :: Build the static core, dlls and shell. :: |
| ︙ | ︙ | |||
81 82 83 84 85 86 87 | set OPTS=static,msvcrt if not %SYMBOLS%.==. set OPTS=symbols,static,msvcrt nmake -nologo -f makefile.vc core OPTS=%OPTS% %1 if errorlevel 1 goto error :: Build the core and shell for thread support. :: | < < < < < < < < < < < < < < < < < < < < < < < < | 80 81 82 83 84 85 86 87 88 89 90 91 92 93 | set OPTS=static,msvcrt if not %SYMBOLS%.==. set OPTS=symbols,static,msvcrt nmake -nologo -f makefile.vc core OPTS=%OPTS% %1 if errorlevel 1 goto error :: Build the core and shell for thread support. :: set OPTS=threads if not %SYMBOLS%.==. set OPTS=symbols,threads nmake -nologo -f makefile.vc release OPTS=%OPTS% %1 if errorlevel 1 goto error :: Build the static core and shell. :: |
| ︙ | ︙ |