Changeset 653 in kBuild

Timestamp:

Dec 4, 2006 12:30:15 AM (18 years ago)

Author:

bird

Message:

x86.win32 -> x86.win32. forgot to add kmk_rmdir it seems.

Location:

trunk/kBuild

Files:

• bin/x86.win (copied) (copied from trunk/kBuild/bin/x86.win32 )
• bin/x86.win/cygiconv-2.dll (deleted)
• bin/x86.win/cygintl-1.dll (deleted)
• bin/x86.win/cygintl-2.dll (deleted)
• bin/x86.win/cygintl-3.dll (deleted)
• bin/x86.win/cygwin1.dll (copied) (copied from trunk/kBuild/bin/x86.win32/cygwin1.dll )
• bin/x86.win/kDepIDB.exe (copied) (copied from trunk/kBuild/bin/x86.win32/kDepIDB.exe )
• bin/x86.win/kDepPre.exe (copied) (copied from trunk/kBuild/bin/x86.win32/kDepPre.exe )
• bin/x86.win/kmk.exe (copied) (copied from trunk/kBuild/bin/x86.win32/kmk.exe )
• bin/x86.win/kmk_append.exe (copied) (copied from trunk/kBuild/bin/x86.win32/kmk_append.exe )
• bin/x86.win/kmk_ash.exe (copied) (copied from trunk/kBuild/bin/x86.win32/kmk_ash.exe )
• bin/x86.win/kmk_cat.exe (copied) (copied from trunk/kBuild/bin/x86.win32/kmk_cat.exe )
• bin/x86.win/kmk_cp.exe (copied) (copied from trunk/kBuild/bin/x86.win32/kmk_cp.exe )
• bin/x86.win/kmk_echo.exe (copied) (copied from trunk/kBuild/bin/x86.win32/kmk_echo.exe )
• bin/x86.win/kmk_gmake.exe (copied) (copied from trunk/kBuild/bin/x86.win32/kmk_gmake.exe )
• bin/x86.win/kmk_install.exe (copied) (copied from trunk/kBuild/bin/x86.win32/kmk_install.exe )
• bin/x86.win/kmk_ln.exe (copied) (copied from trunk/kBuild/bin/x86.win32/kmk_ln.exe )
• bin/x86.win/kmk_mkdir.exe (copied) (copied from trunk/kBuild/bin/x86.win32/kmk_mkdir.exe )
• bin/x86.win/kmk_mv.exe (copied) (copied from trunk/kBuild/bin/x86.win32/kmk_mv.exe )
• bin/x86.win/kmk_rm.exe (copied) (copied from trunk/kBuild/bin/x86.win32/kmk_rm.exe )
• bin/x86.win/kmk_rmdir.exe (added)
• bin/x86.win/kmk_sed.exe (copied) (copied from trunk/kBuild/bin/x86.win32/kmk_sed.exe )
• bin/x86.win32/kmk_rmdir.exe (added)
• env.sh (modified) (2 diffs)
• envwin.cmd (modified) (1 diff)
• header.kmk (modified) (1 diff)

trunk/kBuild/env.sh

@@ -106 +106 @@
             ;;
 
+        WindowsNT|CYGWIN_NT-*)
+            BUILD_PLATFORM=win
+            ;;
+
         *)
             echo "$0: unknown os $BUILD_PLATFORM"
@@ -153 +157 @@
 _PATH_SEP=":"
 case "$BUILD_PLATFORM" in
-    os2|win32|winnt|win2k|winxp)
+    os2|win|win32|win64|nt|winnt|win2k|winxp)
         _SUFF_EXE=".exe"
         _PATH_SEP=";"

trunk/kBuild/envwin.cmd

@@ -232 +232 @@
 :next
 
-REM # Make shell
-set MAKESHELL="%PATH_KBUILD%\bin\%BUILD_PLATFORM_ARCH%.%BUILD_PLATFORM%/kmk_ash.exe"
-
 REM # The PATH.
 IF "%BUILD_PLATFORM_ARCH%.%BUILD_PLATFORM%" = "x86.nt"      set PATH=%PATH_KBUILD%\bin\x86.win32;%PATH%

trunk/kBuild/header.kmk

@@ -267 +267 @@
   endif
   ifeq ($(wildcard $(PATH_KBUILD_BIN)/kmk_ash$(HOSTSUFF_EXE)),)
-   ifeq ($(filter-out win64 win nt ,$(BUILD_PLATFORM)),)
-    PATH_KBUILD_BIN := $(PATH_KBUILD)/bin/x86.win32
+   ifeq ($(filter-out win64 win32 win nt ,$(BUILD_PLATFORM)),)
+    PATH_KBUILD_BIN := $(PATH_KBUILD)/bin/x86.win
    endif
   endif