svn commit: r771277 - in /commons/sandbox/runtime/trunk/src/main/native: Makefile.in Makefile.msc.in modules/network/ssl/openssl.c

[mt...@apache.org]

Author: mturk
Date: Mon May  4 11:58:50 2009
New Revision: 771277

URL: http://svn.apache.org/viewvc?rev=771277&view=rev
Log:
Add openssl to the makefiles

Added:
    commons/sandbox/runtime/trunk/src/main/native/modules/network/ssl/openssl.c   (with props)
Modified:
    commons/sandbox/runtime/trunk/src/main/native/Makefile.in
    commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in

Modified: commons/sandbox/runtime/trunk/src/main/native/Makefile.in
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/Makefile.in?rev=771277&r1=771276&r2=771277&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/Makefile.in (original)
+++ commons/sandbox/runtime/trunk/src/main/native/Makefile.in Mon May  4 11:58:50 2009
@@ -61,6 +61,7 @@
 	$(SRCDIR)/os/hpux \
 	$(SRCDIR)/os/unix \
 	$(SRCDIR)/os/win32 \
+	$(SRCDIR)/modules/network/ssl \
 	$(SRCDIR)/test
 
 COMMON_OBJS=\
@@ -77,6 +78,9 @@
 	$(SRCDIR)/shared/tables.$(OBJ) \
 	$(SRCDIR)/shared/version.$(OBJ)
 
+OPENSSL_OBJS=\
+	$(SRCDIR)/modules/network/ssl/openssl.$(OBJ)
+
 LINUX_OBJS= \
 	$(SRCDIR)/os/unix/file.$(OBJ) \
 	$(SRCDIR)/os/unix/main.$(OBJ) \
@@ -141,8 +145,8 @@
 .cpp.$(OBJ):
 	$(CXX) $(CFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDES) -c -o $@ $<
 
-$(SHAREDLIB): $(COMMON_OBJS) $(@platform@_OBJS) @testobjs@
-	$(CC) $(SHFLAGS) $(LDFLAGS) -o $(BLDDIR)/$@ $(COMMON_OBJS) $(@platform@_OBJS) @testobjs@
+$(SHAREDLIB): $(COMMON_OBJS) $(@platform@_OBJS) $(OPENSSL_OBJS) @testobjs@
+	$(CC) $(SHFLAGS) $(LDFLAGS) -o $(BLDDIR)/$@ $(COMMON_OBJS) $(@platform@_OBJS) $(OPENSSL_OBJS) @testobjs@
 
 setup:
 	@mkdir -p $(BLDDIR)

Modified: commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in?rev=771277&r1=771276&r2=771277&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in (original)
+++ commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in Mon May  4 11:58:50 2009
@@ -71,6 +71,9 @@
 	$(SRCDIR)/shared/tables.$(OBJ) \
 	$(SRCDIR)/shared/version.$(OBJ)
 
+OPENSSL_OBJS=\
+	$(SRCDIR)/modules/network/ssl/openssl.$(OBJ)
+
 WINDOWS_OBJS= \
 	$(SRCDIR)/os/win32/file.$(OBJ) \
 	$(SRCDIR)/os/win32/main.$(OBJ) \
@@ -97,8 +100,8 @@
 .rc.res:
 	$(RC) /l 0x409 /d "NDEBUG" /i "$(SRCDIR)\include" /fo $@ $<
 
-$(SHAREDLIB): $(COMMON_OBJS) $(@platform@_OBJS) @testobjs@
-	$(LINK) $(SHFLAGS) $(LDFLAGS) /DLL /SUBSYSTEM:WINDOWS $(COMMON_OBJS) $(WINDOWS_OBJS) @testobjs@ /pdb:$(BLDDIR)\$(LIBNAME).pdb /out:$(BLDDIR)\$@
+$(SHAREDLIB): $(COMMON_OBJS) $(@platform@_OBJS) $(OPENSSL_OBJS) @testobjs@
+	$(LINK) $(SHFLAGS) $(LDFLAGS) /DLL /SUBSYSTEM:WINDOWS $(COMMON_OBJS) $(WINDOWS_OBJS) $(OPENSSL_OBJS) @testobjs@ /pdb:$(BLDDIR)\$(LIBNAME).pdb /out:$(BLDDIR)\$@
 	IF EXIST $(BLDDIR)\$(SHAREDLIB).manifest \
 		mt -nologo -manifest  $(BLDDIR)\$(SHAREDLIB).manifest -outputresource:$(BLDDIR)\$(SHAREDLIB);2
 	@copy /Y $(BLDDIR)\$(SHAREDLIB) $(BLDDIR)\$(SONAME)
@@ -111,6 +114,7 @@
 	-@del /Q $(SRCDIR)\test\*.$(OBJ) 2>NUL
 	-@del /Q $(SRCDIR)\os\win32\*.$(OBJ) 2>NUL
 	-@del /Q $(SRCDIR)\os\win32\*.res 2>NUL
+	-@del /Q $(SRCDIR)\modules\network\ssl\*.$(OBJ) 2>NUL
 	-@del /Q $(BLDDIR)\*  2>NUL
 
 distclean: clean

Added: commons/sandbox/runtime/trunk/src/main/native/modules/network/ssl/openssl.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/modules/network/ssl/openssl.c?rev=771277&view=auto
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/modules/network/ssl/openssl.c (added)
+++ commons/sandbox/runtime/trunk/src/main/native/modules/network/ssl/openssl.c Mon May  4 11:58:50 2009
@@ -0,0 +1,29 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "acr.h"
+#include "acr_private.h"
+#include "acr_string.h"
+#include "acr_memory.h"
+#include "acr_error.h"
+#include "acr_types.h"
+#include "acr_clazz.h"
+#include "acr_vm.h"
+
+ACR_NET_EXPORT_DECLARE(jboolean, OpenSSL, has0)(ACR_JNISTDARGS)
+{
+    return V2Z(HAVE_OPENSSL);
+}

Propchange: commons/sandbox/runtime/trunk/src/main/native/modules/network/ssl/openssl.c
------------------------------------------------------------------------------
    svn:eol-style = native