[Fedora-directory-commits] winsync/passwordsync/passhook passhook.mak, 1.10, 1.11

[Richard Allen Megginson]

Author: rmeggins

Update of /cvs/dirsec/winsync/passwordsync/passhook
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32256/passwordsync/passhook

Modified Files:
    passhook.mak 
Log Message:
Resolves: bug 426421 245630 476095
Description: Windows Console uses nss libraries from \windows\system32
Fix Description: Windows Console still uses nss libraries from system32, but now passsync uses the same NSS version as Windows Console, so there should be no conflict
Description: install LDAP SDK DLLs in sync service dir, not system32
Fix Description: only files that need to go in system32 are installed there - everything else is installed in the passync home directory
Description: upgrade/build components bug
Fix Description: Now using NSPR 4.7.3, NSS 3.12.2, Mozldap 6.0.5
In addition, you can now build passsync in a Windows only environmnet - uses bitsadmin instead of wget for downloading, and uses unzip.vbs instead of unzip - this should simplify the build environment so that you don't have to figure out which combination of mks/cygwin/msys needs to be installed.
I also upgraded to the latest version of wix and had to upgrade a couple of wxs elements.
I also added the ability to upgrade passsync in the future with the use of the Upgrade element.
Platforms tested: Windows Server 2003

Index: passhook.mak
===================================================================
RCS file: /cvs/dirsec/winsync/passwordsync/passhook/passhook.mak,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- passhook.mak	10 Nov 2005 04:18:04 -0000	1.10
+++ passhook.mak	16 Feb 2009 22:37:32 -0000	1.11
@@ -127,7 +127,7 @@
 BSC32_SBRS= \
    
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\passhook.pdb" /machine:I386 /def:".\passhook.def" /out:"$(OUTDIR)\passhook.dll" /implib:"$(OUTDIR)\passhook.lib" 
+LINK32_FLAGS=nss3.lib nssutil3.lib libnspr4.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\passhook.pdb" /machine:I386 /def:".\passhook.def" /out:"$(OUTDIR)\passhook.dll" /implib:"$(OUTDIR)\passhook.lib" 
 DEF_FILE= \
    ".\passhook.def"
 LINK32_OBJS= \
@@ -205,7 +205,7 @@
 BSC32_SBRS= \
    
 LINK32=link.exe
-LINK32_FLAGS=nss3.lib libnspr4.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\passhook.pdb" /debug /machine:I386 /def:".\passhook.def" /out:"$(OUTDIR)\passhook.dll" /implib:"$(OUTDIR)\passhook.lib" 
+LINK32_FLAGS=nss3.lib nssutil3.lib libnspr4.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\passhook.pdb" /debug /machine:I386 /def:".\passhook.def" /out:"$(OUTDIR)\passhook.dll" /implib:"$(OUTDIR)\passhook.lib" 
 DEF_FILE= \
    ".\passhook.def"
 LINK32_OBJS= \