Skip to content

Commit 91b7b0e

Browse files
committed
Clean up build of fakessl library
1 parent be70b0f commit 91b7b0e

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

Build/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ installable: $(COMPONENTS)
100100

101101

102102
%-build: $(@:%-build=%)
103-
cd ../$(@:%-build=%)/build; make dist-terse
103+
cd ../$(@:%-build=%)/build; make dist
104104

105105
%-clean: $(@:%-clean=%)
106106
cd ../$(@:%-clean=%)/build; make clean

Build/components

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
FakeSSL
21
Example

ServerCore/build/Makefile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ JAVADOC_LINKS = $(JAVADOC_OPTS) \
103103
-tag internal:Xa:"Internal:" \
104104
-windowtitle "Elko Server Framework"
105105

106-
JAR_FILES = $(JAR_DIR)/elkoserver.jar
106+
JAR_FILES = $(JAR_DIR)/elkoserver.jar $(JAR_DIR)/fakessl.jar
107107

108108
CLASS_BUILD_MARKER = $(BUILT_DIR)/classbuildmarker
109109

@@ -212,7 +212,11 @@ $(JAR_DIR)/elkoserver.jar: $(CLASS_BUILD_MARKER)
212212
`find $(CLA_ROOT)/json -name '*.class'` \
213213
`find $(CLA_ROOT)/objdb -name '*.class'` \
214214
`find $(CLA_ROOT)/server -name '*.class'` \
215-
`find $(CLA_ROOT)/util -name '*.class'` \
215+
`find $(CLA_ROOT)/util -name '*.class'`
216+
217+
$(JAR_DIR)/fakessl.jar: $(CLASS_BUILD_MARKER)
218+
$(RM) $@
219+
cd $(CLA_DIR); jar cf ../$@ \
216220
`find scalablessl -name '*.class'`
217221

218222
do-javadoc: generated

ServerCore/doc/ssldoc.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Configuring Elko servers for SSL support
88
http://www.telekinesis.com.au/wipv3_6/page2/show.jsp?id=230173&db=Entries
99
This library provides full support for SSL in the Elko server.
1010

11-
fakessl.jar -- this is bundled with the Elko distribution. This is a
11+
fakessl.jar -- this is built in the Elko distribution. This is a
1212
development and testing stub library. It provides no actual SSL
1313
support but allows the SSL-enabled server to load and run without
1414
unresolved class load errors as long as you don't actually

0 commit comments

Comments
 (0)