[Jboss-svn-commits] JBL Code SVN: r4194 - in labs/jbossweb/trunk/src/share/native: build srclib/openssl

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

Author: mla...@jb...
Date: 2006-05-11 06:59:43 -0400 (Thu, 11 May 2006)
New Revision: 4194

Added:
   labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslamd64.bat
   labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslia64.bat
Removed:
   labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslamd.bat
Modified:
   labs/jbossweb/trunk/src/share/native/build/buildworld.bat
Log:
Update buildworld for IA64 platform

Modified: labs/jbossweb/trunk/src/share/native/build/buildworld.bat
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildworld.bat	2006-05-11 01:56:00 UTC (rev 4193)
+++ labs/jbossweb/trunk/src/share/native/build/buildworld.bat	2006-05-11 10:59:43 UTC (rev 4194)
@@ -11,14 +11,21 @@
 REM
 REM
 @if "%OS%" == "Windows_NT"  setlocal
-set MSVS8VC=C:\opt\MSVS8\VC\bin
+set MSVS8VC=C:\opt\msvs8\VC\bin
 REM set MSVS8VC=C:\D\Microsoft\MSVS8\VC\bin
+set PSDK5=C:\opt\psdk5
+REM PSDK5=C:\D\PSDK05
 
 set OPENSSLBIN=buildssl
 set OPENSSLVER=0.9.8b
 set APRVER=1.2.7
 set FLAVOR=DLL
 
+@if not "%1" == "sdk" goto checkFLAVOR
+shift
+set usesdk=1
+
+:checkFLAVOR
 @if /i "%1" == "dll" goto makeDLL
 set FLAVOR=STATIC
 goto checkCPU
@@ -35,15 +42,33 @@
 :cpuX86
 set CPU=I386
 set OPENSSLBIN=buildsslasm %1
-call %MSVS8VC%\vcvars32
+@if "%usesdk%" == "1" (
+    call %MSVS8VC%\vcvars32
+) else (
+    call %PSDK5%\SetEnv /XP32 /RETAIL
+}
 goto cmdBuild
 
 :cpuAMD64
 set CPU=AMD64
-set OPENSSLBIN=buildsslamd %1
-call %MSVS8VC%\amd64\vcvarsamd64
+set OPENSSLBIN=buildsslamd64 %1
+@if "%usesdk%" == "1" (
+    call %MSVS8VC%\amd64\vcvarsamd64
+) else (
+    call %PSDK5%\SetEnv /X64 /RETAIL
+}
 goto cmdBuild
 
+:cpuIA64
+set CPU=IA64
+set OPENSSLBIN=buildsslia64 %1
+@if "%usesdk%" == "1" (
+    call %MSVS8VC%\amd64\vcvarsamd64
+) else (
+    call %PSDK5%\SetEnv /SRV64 /RETAIL
+}
+goto cmdBuild
+
 :cmdBuild
 cd srclib/openssl-%OPENSSLVER%
 call %OPENSSLBIN% %1

Deleted: labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslamd.bat
===================================================================
--- labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslamd.bat	2006-05-11 01:56:00 UTC (rev 4193)
+++ labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslamd.bat	2006-05-11 10:59:43 UTC (rev 4194)
@@ -1,31 +0,0 @@
-@echo off
-REM
-REM JBoss, the OpenSource J2EE webOS
-REM
-REM Distributable under LGPL license.
-REM See terms of license at gnu.org.
-REM
-REM
-REM @author Mladen Turk
-REM @version $Revision: 1.0 $, $Date: 2005/07/12 14:56:09 $
-REM
-REM
-REM call vsvars32
-REM
-@if "%OS%" == "Windows_NT"  setlocal
-@rmdir /S /Q out32
-@rmdir /S /Q out32dll
-@rmdir /S /Q tmp32
-@rmdir /S /Q tmp32dll
-
-perl Configure VC-WIN64A
-call ms\do_win64a
-
-@if "%1" == "dll" goto DLL
-@goto LIB
-:DLL
-nmake -f ms\ntdll.mak
-@goto END
-:LIB
-nmake -f ms\nt.mak
-:END

Added: labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslamd64.bat
===================================================================
--- labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslamd64.bat	2006-05-11 01:56:00 UTC (rev 4193)
+++ labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslamd64.bat	2006-05-11 10:59:43 UTC (rev 4194)
@@ -0,0 +1,31 @@
+@echo off
+REM
+REM JBoss, the OpenSource J2EE webOS
+REM
+REM Distributable under LGPL license.
+REM See terms of license at gnu.org.
+REM
+REM
+REM @author Mladen Turk
+REM @version $Revision: 1.0 $, $Date: 2005/07/12 14:56:09 $
+REM
+REM
+REM call vsvars32
+REM
+@if "%OS%" == "Windows_NT"  setlocal
+@rmdir /S /Q out32
+@rmdir /S /Q out32dll
+@rmdir /S /Q tmp32
+@rmdir /S /Q tmp32dll
+
+perl Configure VC-WIN64A
+call ms\do_win64a
+
+@if "%1" == "dll" goto DLL
+@goto LIB
+:DLL
+nmake -f ms\ntdll.mak
+@goto END
+:LIB
+nmake -f ms\nt.mak
+:END

Added: labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslia64.bat
===================================================================
--- labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslia64.bat	2006-05-11 01:56:00 UTC (rev 4193)
+++ labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslia64.bat	2006-05-11 10:59:43 UTC (rev 4194)
@@ -0,0 +1,31 @@
+@echo off
+REM
+REM JBoss, the OpenSource J2EE webOS
+REM
+REM Distributable under LGPL license.
+REM See terms of license at gnu.org.
+REM
+REM
+REM @author Mladen Turk
+REM @version $Revision: 1.0 $, $Date: 2005/07/12 14:56:09 $
+REM
+REM
+REM call vsvars32
+REM
+@if "%OS%" == "Windows_NT"  setlocal
+@rmdir /S /Q out32
+@rmdir /S /Q out32dll
+@rmdir /S /Q tmp32
+@rmdir /S /Q tmp32dll
+
+perl Configure VC-WIN64I
+call ms\do_win64i
+
+@if "%1" == "dll" goto DLL
+@goto LIB
+:DLL
+nmake -f ms\ntdll.mak
+@goto END
+:LIB
+nmake -f ms\nt.mak
+:END