[389-commits] esc/win32 build.sh,1.11.2.5,1.11.2.6

[Jack Magne]

Author: jmagne

Update of /cvs/dirsec/esc/win32
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12763

Modified Files:
      Tag: PKI_8_0_RTM_BRANCH
	build.sh 
Log Message:
Fix script for later Visual Studio.


Index: build.sh
===================================================================
RCS file: /cvs/dirsec/esc/win32/build.sh,v
retrieving revision 1.11.2.5
retrieving revision 1.11.2.6
diff -u -r1.11.2.5 -r1.11.2.6
--- build.sh	17 Nov 2009 23:13:17 -0000	1.11.2.5
+++ build.sh	20 Nov 2009 00:51:06 -0000	1.11.2.6
@@ -98,11 +98,19 @@
 
 #Value for the location of Moz Tools needed to compile
 
-MOZ_TOOLS_BIN_PATH=/cygdrive/c/moztools/bin:/cygdrive/d/moztools/bin
+#MOZ_TOOLS_BIN_PATH=/cygdrive/c/moztools/bin:/cygdrive/d/moztools/bin
+MOZ_TOOLS_BIN_PATH=/cygdrive/c/mozilla-build/moztools/bin
 
 export PATH=${MOZ_TOOLS_BIN_PATH}:${ORIG_PATH}
 
-CORE_OBJ_DIR=`uname``uname -r`_OPT.OBJ
+if test "${OS_RELEASE+set}" != set ; then
+
+   CORE_OBJ_DIR=`uname``uname -r`_OPT.OBJ
+else
+   CORE_OBJ_DIR="WINNT$OS_RELEASE"_OPT.OBJ
+   
+fi
+
 
 export PATH=${ORIG_PATH}
 
@@ -143,7 +151,7 @@
     fi
 
     cd $NSS_NAME/mozilla/security/nss
-    make BUILD_OPT=1 nss_build_all
+    make BUILD_OPT=1 OS_RELEASE=$OS_RELEASE nss_build_all
     if [ $? != 0 ];
     then
         echo "Can't make nss."