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

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

Author: mla...@jb...
Date: 2006-05-08 03:26:39 -0400 (Mon, 08 May 2006)
New Revision: 4129

Modified:
   labs/jbossweb/trunk/src/share/native/NMAKEmakefile
   labs/jbossweb/trunk/src/share/native/build/buildprep.sh
   labs/jbossweb/trunk/src/share/native/build/buildworld.sh
Log:
Update SSL version to 0.9.8b and add install target
for windows nmakefile.

Modified: labs/jbossweb/trunk/src/share/native/NMAKEmakefile
===================================================================
--- labs/jbossweb/trunk/src/share/native/NMAKEmakefile	2006-05-08 07:04:23 UTC (rev 4128)
+++ labs/jbossweb/trunk/src/share/native/NMAKEmakefile	2006-05-08 07:26:39 UTC (rev 4129)
@@ -48,14 +48,18 @@
 
 INCLUDES = -I$(SRCDIR)/include $(JAVA_INCLUDES)
 
+APRVER = "1.2.7"
+SSLVER = "0.9.8b"
+ZIPVER = "1.2.3"
+
 !IFNDEF WITH_APR
-WITH_APR = srclib/apr
+WITH_APR = srclib/apr-$(APRVER)
 !ENDIF
 !IFNDEF WITH_OPENSSL
-WITH_OPENSSL = srclib/openssl
+WITH_OPENSSL = srclib/openssl-$(SSLVER)
 !ENDIF
 !IFNDEF WITH_ZLIB
-WITH_ZLIB = srclib/zlib
+WITH_ZLIB = srclib/zlib-$(ZIPVER)
 !ENDIF
 
 INCLUDES = $(INCLUDES) -I$(WITH_APR)/include -I$(WITH_APR)/include/arch/win32 -I$(WITH_OPENSSL)/inc32 -I$(WITH_ZLIB)
@@ -125,3 +129,22 @@
 
 clean:
 	@$(CLEANTARGET)
+
+!IFNDEF INSTALLDIR
+INSTALLDIR = ../native-builds/$(BUILDIR)
+!ENDIF
+
+!IFDEF STATIC
+install: all
+    @gmkdir -p $(INSTALLDIR
+	@cp -f -t $(INSTALLDIR) $(BUILDLIB)
+	@cp -f -t $(INSTALLDIR) $(WITH_OPENSSL)/out32/openssl.exe
+!ELSE
+install: all
+    @gmkdir -p $(INSTALLDIR)
+	@cp -f -t $(INSTALLDIR) $(BUILDLIB)
+	@cp -f -t $(INSTALLDIR) $(WITH_OPENSSL)/out32dll/openssl.exe
+	@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
+!ENDIF

Modified: labs/jbossweb/trunk/src/share/native/build/buildprep.sh
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildprep.sh	2006-05-08 07:04:23 UTC (rev 4128)
+++ labs/jbossweb/trunk/src/share/native/build/buildprep.sh	2006-05-08 07:26:39 UTC (rev 4129)
@@ -31,7 +31,7 @@
 fi
 
 APRVER="1.2.7"
-SSLVER="0.9.8a"
+SSLVER="0.9.8b"
 
 # Prebuild
 cd ${NATIVEDIST}

Modified: labs/jbossweb/trunk/src/share/native/build/buildworld.sh
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildworld.sh	2006-05-08 07:04:23 UTC (rev 4128)
+++ labs/jbossweb/trunk/src/share/native/build/buildworld.sh	2006-05-08 07:26:39 UTC (rev 4129)
@@ -7,7 +7,7 @@
 #
 
 TEST=test
-SSLVER="0.9.8a"
+SSLVER="0.9.8b"
 SSLNUM="0.9.8"
 APRVER="1.2.7"
 TCNATIVE_BASE=`pwd`