windows-install-updates-20010910

more corrections for windows packaging

diff --git a/src/NTMake9x b/src/NTMake9x
index 42c7693..2e76674 100644 (file)
--- a/src/NTMake9x
+++ b/src/NTMake9x
@@ -23,7 +23,7 @@ NTMAKELANG = nmake /nologo /f ntmakefile en_install
 NTMAKE_HEADERS = nmake /nologo /f ntmakefile install_headers
 NTMAKE_LIBUTILS = nmake /nologo /f ntmakefile install_libutils
 MKDIR = mkdir
-#OBJ = src
+OBJ = src
 
 # Standard install directory.
 !IFDEF AFSDEV_DESTDIR
@@ -292,10 +292,15 @@ install9x: install
 
 #Leave last echo in - it helps the build reconize the last $(CD)
 Win9x::
-       $(CD) $(OBJ)\WINNT\install\$@
-    nmake /nologo /f NTMakefile  install9x
+       echo ***** afs_setup_utils
+       $(CD) $(OBJ)\WINNT\afs_setup_utils 
+       nmake -f ntmakefile      install
+       $(CD) ..\..\..
+       echo ***** Win9x
+       $(CD) $(OBJ)\WINNT\install\Win9x
+       nmake /nologo /f NTMakefile  isinstall
        $(CD) ..\..\..\..
-       echo **** End of Install Scripts
+       eho **** End of Install Scripts
 
 media: Win9x
 

diff --git a/src/NTMakefile b/src/NTMakefile
index b6ebfa5..268119a 100644 (file)
--- a/src/NTMakefile
+++ b/src/NTMakefile
@@ -22,7 +22,7 @@ NTMAKE = nmake /nologo /f ntmakefile install
 NTMAKELANG = nmake /nologo /f ntmakefile en_US
 NTMAKE_HEADERS = nmake /nologo /f ntmakefile install_headers
 MKDIR = mkdir
-OBJ = obj
+OBJ = src
 
 # Standard install directory.
 !IFDEF AFSDEV_DESTDIR
@@ -326,37 +326,37 @@ libadmin: tbutc
        $(CD) $(OBJ)\$@
        $(NTMAKE)
        $(CD) ..\..
-       
+
 adminutil: libadmin
      echo ***** $@
        $(CD) $(OBJ)\libadmin\$@
        $(NTMAKE)
        $(CD) ..\..\..
-       
+
 vos: adminutil
      echo ***** $@
        $(CD) $(OBJ)\libadmin\$@
        $(NTMAKE)
        $(CD) ..\..\..
-       
+
 client: vos
      echo ***** $@
        $(CD) $(OBJ)\libadmin\$@
        $(NTMAKE)
        $(CD) ..\..\..
-       
+
 kas: client
      echo ***** $@
        $(CD) $(OBJ)\libadmin\$@
        $(NTMAKE)
        $(CD) ..\..\..
-       
+
 pts: kas
      echo ***** $@
        $(CD) $(OBJ)\libadmin\$@
        $(NTMAKE)
        $(CD) ..\..\..
-       
+
 bos: pts
      echo ***** $@
        $(CD) $(OBJ)\libadmin\$@
@@ -417,13 +417,7 @@ afssvrcpa: afssvrcfg
        $(NTMAKE)
        $(CD) ..\..\..
 
-afs_setup_utils: afssvrcpa
-     echo ***** $@
-       $(CD) $(OBJ)\WINNT\$@
-       $(NTMAKE)
-       $(CD) ..\..\..
-
-client_talocale: afs_setup_utils
+client_talocale: afssvrcpa
      echo ***** $@
        $(CD) $(OBJ)\WINNT\talocale
        $(NTMAKE)
@@ -476,6 +470,11 @@ install: start finale
 # InstallShield dependencies
 
 InstallShield5: install
+       echo ***** afs_setup_utils
+       $(CD) $(OBJ)\WINNT\afs_setup_utils
+       $(NTMAKE)
+       $(CD) ..\..\..
+
        $(CD) $(OBJ)\WINNT\install\$@
        $(NTMAKE)
        $(CD) ..\..\..\..

diff --git a/src/WINNT/afs_setup_utils/NTMakefile b/src/WINNT/afs_setup_utils/NTMakefile
index 8ac4df9..0115b0b 100644 (file)
--- a/src/WINNT/afs_setup_utils/NTMakefile
+++ b/src/WINNT/afs_setup_utils/NTMakefile
@@ -86,11 +86,13 @@ $(AFSRM_EXEFILE): $(AFSRM_EXEOBJS) $(AFSRM_EXELIBS)
 
 ############################################################################
 
+DIRLANG= ZH_TW ZH_CN PT_BR KO_KR JA_JP ES_ES EN_US DE_DE
+
 install : $(INSTALL_UTILS_DLLFILE) $(SERVER_UNINST_DLLFILE) $(CLIENT_UNINST_DLLFILE) \
           $(CC_UNINST_DLLFILE) $(LIGHT_CLIENT_UNINST_DLLFILE) $(DOCS_UNINST_DLLFILE) \
 
 media : install
-          $(AFSRM_EXEFILE) lang
+          $(AFSRM_EXEFILE) $(DIRLANG)
                  cd _isuser
                  nmake -fntmakefile install
           $(CD) ..
@@ -99,9 +101,9 @@ media : install
           $(CD) ..
                  echo 
 
-lang ::
+$(DIRLANG) ::
        $(CD) lang
-       for /f %l in ('dir /B ??_??') do @$(NTLANG) %l $(MAKECMD) /nologo /f NTMakefile install
+       @$(NTLANG) $@ $(MAKECMD) /nologo /f NTMakefile install
        $(CD) ..
    echo done lang
 

diff --git a/src/WINNT/afs_setup_utils/_isuser/ntmakefile b/src/WINNT/afs_setup_utils/_isuser/ntmakefile
index 66050cd..9905616 100644 (file)
--- a/src/WINNT/afs_setup_utils/_isuser/ntmakefile
+++ b/src/WINNT/afs_setup_utils/_isuser/ntmakefile
@@ -16,7 +16,8 @@ OutDir=.
 # End Custom Macros
 
 INSTALL : "$(OUTDIR)\_IsUser.dll"
-
+       $(DEL) *.PCH 
+       $(DEL) *.IDB
 
 CLEAN ::
        -@erase "$(INTDIR)\_isuser.obj"
@@ -33,6 +34,9 @@ HEADERS = ".\sdrc.h"
 
 ".\sdrc.h" : $(IS5ROOT)\INCLUDE\sdrc.h
     $(COPY) $(IS5ROOT)\INCLUDE\sdrc.h .
+!   IF EXIST($(IS5ROOT)\Script\ISRT\Include\sdrc.h)
+    $(COPY) $(IS5ROOT)\Script\ISRT\Include\sdrc.h .
+!      ENDIF
 
 CPP=cl.exe
 CPP_PROJ=/nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_ISUSER_EXPORTS" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c