diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-01-23 14:46:22 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-01-23 14:46:22 (GMT) |
| commit | e0911ec4c26de1730f2f00b8d32a5e1980211dea (patch) | |
| tree | 8f06b01a46f98cbd69ef3cfefa941daa32481766 /win | |
| parent | c3894d8f32c0386305c5ead33eff1e8fceb377f2 (diff) | |
| download | tk-e0911ec4c26de1730f2f00b8d32a5e1980211dea.zip tk-e0911ec4c26de1730f2f00b8d32a5e1980211dea.tar.gz tk-e0911ec4c26de1730f2f00b8d32a5e1980211dea.tar.bz2 | |
If Tk is compiled with -DTK_NO_DEPRECATED=1, remove some deprecated code (pack subcommands) and other stuff which is not used any more.
And fix a few typos. Remove rmd.bat and rmd.bat, which are also not used any more.
Diffstat (limited to 'win')
| -rw-r--r-- | win/mkd.bat | 12 | ||||
| -rw-r--r-- | win/rmd.bat | 20 | ||||
| -rw-r--r-- | win/rules.vc | 20 |
3 files changed, 6 insertions, 46 deletions
diff --git a/win/mkd.bat b/win/mkd.bat deleted file mode 100644 index 1bd5ccb..0000000 --- a/win/mkd.bat +++ /dev/null @@ -1,12 +0,0 @@ -@echo off
-
-if exist %1\nul goto end
-
-md %1
-if errorlevel 1 goto end
-
-echo Created directory %1
-
-:end
-
-
diff --git a/win/rmd.bat b/win/rmd.bat deleted file mode 100644 index 820b76f..0000000 --- a/win/rmd.bat +++ /dev/null @@ -1,20 +0,0 @@ -@echo off
-
-if not exist %1\nul goto end
-
-echo Removing directory %1
-
-if "%OS%" == "Windows_NT" goto winnt
-
-deltree /y %1
-if errorlevel 1 goto end
-goto success
-
-:winnt
-rmdir /s /q %1
-if errorlevel 1 goto end
-
-:success
-echo Deleted directory %1
-
-:end
diff --git a/win/rules.vc b/win/rules.vc index 2cd711b..fbbe705 100644 --- a/win/rules.vc +++ b/win/rules.vc @@ -33,7 +33,6 @@ _INSTALLDIR = $(INSTALLDIR:/=\) # "delete all" method.
#----------------------------------------------------------
-!if "$(OS)" == "Windows_NT"
RMDIR = rmdir /S /Q
ERRNULL = 2>NUL
!if ![ver | find "4.0" > nul]
@@ -43,13 +42,6 @@ COPY = copy >NUL CPY = xcopy /i /y >NUL
COPY = copy /y >NUL
!endif
-!else # "$(OS)" != "Windows_NT"
-CPY = xcopy /i >_JUNK.OUT # On Win98 NUL does not work here.
-COPY = copy >_JUNK.OUT # On Win98 NUL does not work here.
-RMDIR = deltree /Y
-NULL = \NUL # Used in testing directory existence
-ERRNULL = >NUL # Win9x shell cannot redirect stderr
-!endif
MKDIR = mkdir
#------------------------------------------------------------------------------
@@ -405,14 +397,14 @@ TCL_COMPILE_DEBUG = 0 #----------------------------------------------------------
!if "$(CHECKS)" == "" || [nmakehlp -f "$(CHECKS)" "none"]
-TCL_NO_DEPRECATED = 0
+TK_NO_DEPRECATED = 0
WARNINGS = -W3
!else
!if [nmakehlp -f $(CHECKS) "nodep"]
!message *** Doing nodep check
-TCL_NO_DEPRECATED = 1
+TK_NO_DEPRECATED = 1
!else
-TCL_NO_DEPRECATED = 0
+TK_NO_DEPRECATED = 0
!endif
!if [nmakehlp -f $(CHECKS) "fullwarn"]
!message *** Doing full warnings check
@@ -451,7 +443,7 @@ This compiler does not support profile guided optimization. # Set our defines now armed with our options.
#----------------------------------------------------------
-OPTDEFINES = -DTCL_CFGVAL_ENCODING=$(CFG_ENCODING) -DSTDC_HEADERS
+OPTDEFINES = -DTCL_CFGVAL_ENCODING=$(CFG_ENCODING) -DSTDC_HEADERS -DTCL_NO_DEPRECATED
!if $(TCL_MEM_DEBUG)
OPTDEFINES = $(OPTDEFINES) -DTCL_MEM_DEBUG
@@ -468,8 +460,8 @@ OPTDEFINES = $(OPTDEFINES) -DUSE_THREAD_ALLOC=1 !if $(STATIC_BUILD)
OPTDEFINES = $(OPTDEFINES) -DSTATIC_BUILD
!endif
-!if $(TCL_NO_DEPRECATED)
-OPTDEFINES = $(OPTDEFINES) -DTCL_NO_DEPRECATED
+!if $(TK_NO_DEPRECATED)
+OPTDEFINES = $(OPTDEFINES) -DTK_NO_DEPRECATED
!endif
!if !$(DEBUG)
|