[Jboss-svn-commits] JBL Code SVN: r4379 - in labs/jbossweb/trunk/src/share/native: . build

[<jbo...@li...>]

Author: mla...@jb...
Date: 2006-05-23 10:18:35 -0400 (Tue, 23 May 2006)
New Revision: 4379

Modified:
   labs/jbossweb/trunk/src/share/native/NMAKEmakefile
   labs/jbossweb/trunk/src/share/native/build/buildworld.bat
Log:
Added redist task to build.

Modified: labs/jbossweb/trunk/src/share/native/NMAKEmakefile
===================================================================
--- labs/jbossweb/trunk/src/share/native/NMAKEmakefile	2006-05-23 14:03:27 UTC (rev 4378)
+++ labs/jbossweb/trunk/src/share/native/NMAKEmakefile	2006-05-23 14:18:35 UTC (rev 4379)
@@ -132,6 +132,7 @@
 
 !IFNDEF INSTALLDIR
 INSTALLDIR = ../native-builds/windows-%CPU%/bin/native
+INSTALLLOC = ..\native-builds\windows-%CPU%\bin\native
 !ENDIF
 
 !IFDEF STATIC
@@ -147,4 +148,7 @@
 	@cp -f -t $(INSTALLDIR) $(WITH_OPENSSL)/out32dll/libeay32.dll
 	@cp -f -t $(INSTALLDIR) $(WITH_OPENSSL)/out32dll/ssleay32.dll
 	@cp -f -t $(INSTALLDIR) $(WITH_APR)/$(BUILDIR)/libapr-1.dll
+	@IF EXIST $(CRT_REDIST)\msvcr80.dll \
+	   xcopy $(CRT_REDIST)\* $(INSTALLLOC)\ /s /d > NUL
+	
 !ENDIF

Modified: labs/jbossweb/trunk/src/share/native/build/buildworld.bat
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildworld.bat	2006-05-23 14:03:27 UTC (rev 4378)
+++ labs/jbossweb/trunk/src/share/native/build/buildworld.bat	2006-05-23 14:18:35 UTC (rev 4379)
@@ -11,9 +11,9 @@
 REM
 REM
 @if "%OS%" == "Windows_NT"  setlocal
-set MSVS8VC=C:\opt\msvs8\VC\bin
+set MSVS8VC=C:\opt\msvs8\VC
 set MSVS6VC=C:\opt\msvs6
-REM set MSVS8VC=C:\D\Microsoft\MSVS8\VC\bin
+REM set MSVS8VC=C:\D\Microsoft\MSVS8\VC
 REM set MSVS6VC=C:\D\Microsoft\MSVS6
 
 set PSDK5=C:\opt\psdk6
@@ -48,7 +48,8 @@
 @if "%usesdk%" == "1" (
     call %MSVS6VC%\vs6vars
 ) else (
-    call %MSVS8VC%\vcvars32
+    call %MSVS8VC%\bin\vcvars32
+    set CRT_REDIST=%MSVS8VC%\redist\x86\Microsoft.VC80.CRT
 )
 goto cmdBuild
 
@@ -58,7 +59,8 @@
 @if "%usesdk%" == "1" (
     call %PSDK5%\SetEnv /X64 /RETAIL
 ) else (
-    call %MSVS8VC%\amd64\vcvarsamd64
+    call %MSVS8VC%\bin\amd64\vcvarsamd64
+    set CRT_REDIST=%MSVS8VC%\redist\amd64\Microsoft.VC80.CRT
 )
 goto cmdBuild
 
@@ -68,7 +70,9 @@
 @if "%usesdk%" == "1" (
     call %PSDK5%\SetEnv /SRV64 /RETAIL
 ) else (
-    call %MSVS8VC%\amd64\vcvarsamd64
+    REM Update to correct IA64 paths
+    call %MSVS8VC%\bin\amd64\vcvarsamd64
+    set CRT_REDIST=%MSVS8VC%\redist\amd64\Microsoft.VC80.CRT
 )
 goto cmdBuild