You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by mt...@apache.org on 2009/09/25 11:51:25 UTC
svn commit: r818794 - in /commons/sandbox/runtime/trunk/src/main:
java/org/apache/commons/runtime/Loader.java native/Makefile.msc.in
Author: mturk
Date: Fri Sep 25 09:51:25 2009
New Revision: 818794
URL: http://svn.apache.org/viewvc?rev=818794&view=rev
Log:
Make libFile as protected. It's used internally only
Modified:
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Loader.java
commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in
Modified: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Loader.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Loader.java?rev=818794&r1=818793&r2=818794&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Loader.java (original)
+++ commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Loader.java Fri Sep 25 09:51:25 2009
@@ -85,7 +85,7 @@
* Get the path to temporary location for extracting the
* libraries from resource.
*/
- public static File libFile(String name, boolean arch)
+ protected static File libFile(String name, boolean arch)
{
synchronized(Loader.class) {
if (path == null) {
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=818794&r1=818793&r2=818794&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in (original)
+++ commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in Fri Sep 25 09:51:25 2009
@@ -54,8 +54,6 @@
MT=mt.exe
DESTDIR=$(PREFIX)
-LIBSO=$(NAME)$(SO)
-SSLSO=$(NAME)ssl$(SO)
LIBNAME=lib$(NAME)
SSLNAME=lib$(NAME)ssl
@@ -220,7 +218,6 @@
<<
IF EXIST $@.manifest \
mt -nologo -manifest $@.manifest -outputresource:$@;2
- @copy /Y $@ $(LIBSO)
$(SSLMODLIB): $(SHAREDLIB) $(OPENSSL_OBJS)
$(RC) /l 0x409 /d "NDEBUG" /d STR_PRODUCT="Apache Commons Runtime SSL Module" /d STR_INTNAME="$(SSLNAME)" /i "$(SRCDIR)\include" /fo $@.res $(SRCDIR)/os/win32/main.rc
@@ -229,7 +226,6 @@
<<
IF EXIST $(SSLMODLIB).manifest \
mt -nologo -manifest $@.manifest -outputresource:$@;2
- @copy /Y $@ $(SSLSO)
$(TESTSUITE): $(SHAREDLIB) @modules@ $(SRCDIR)/test/testsuite.$(OBJ)
$(LINK) $(SHFLAGS) /SUBSYSTEM:CONSOLE $(LDFLAGS) /libpath:"." $(LIBNAME).lib /pdb:testsuite.pdb /out:$@ @<<