Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Changed build structure to separate openssl

git-svn-id: http://svn.codehaus.org/jruby/branches/openssl@2461 961051c9-f516-0410-bf72-c9f7e237a7b7
  • Loading branch information...
commit 392b3d5d0e4805da2addaf9f2f2e2411a5700dc2 1 parent 5cc3c2d
@olabini olabini authored
View
2  bin/jirb.bat
@@ -63,7 +63,7 @@ set _STARTJAVA="%JAVA_HOME%\bin\java"
set _RUNJAVA="%JAVA_HOME%\bin\java"
rem ----- Set Up The Runtime Classpath ----------------------------------------
-set CP=%JRUBY_HOME%\lib\jruby.jar;%JRUBY_HOME%\lib\jvyaml.jar;%JRUBY_HOME%\lib\plaincharset.jar;%JRUBY_HOME%\lib\asm-2.2.2.jar
+set CP=%JRUBY_HOME%\lib\jruby.jar;%JRUBY_HOME%\lib\jruby-openssl.jar;%JRUBY_HOME%\lib\jvyaml.jar;%JRUBY_HOME%\lib\plaincharset.jar;%JRUBY_HOME%\lib\asm-2.2.2.jar
if not "%CLASSPATH%" == "" goto gotCP
set CLASSPATH=%CP%
View
2  bin/jruby.bat
@@ -68,7 +68,7 @@ set _STARTJAVA="%JAVA_HOME%\bin\%JAVA_COMMAND%"
set _RUNJAVA="%JAVA_HOME%\bin\java"
rem ----- Set Up The Runtime Classpath ----------------------------------------
-set CP=%JRUBY_HOME%\lib\jruby.jar;%JRUBY_HOME%\lib\jvyaml.jar;%JRUBY_HOME%\lib\plaincharset.jar;%JRUBY_HOME%\lib\asm-2.2.2.jar
+set CP=%JRUBY_HOME%\lib\jruby.jar;%JRUBY_HOME%\lib\jruby-openssl.jar;%JRUBY_HOME%\lib\jvyaml.jar;%JRUBY_HOME%\lib\plaincharset.jar;%JRUBY_HOME%\lib\asm-2.2.2.jar
if not "%CLASSPATH%" == "" goto gotCP
set CLASSPATH=%CP%
View
47 build.xml
@@ -27,12 +27,18 @@
<exclude unless="bsf.present" name="org/jruby/javasupport/bsf/**/*.java"/>
<exclude unless="jdk1.4+" name="**/XmlAstMarshal.java"/>
<exclude unless="jdk1.4+" name="**/AstPersistenceDelegates.java"/>
- <exclude unless="jdk1.5+" name="org/jruby/ext/openssl/**/*.java"/>
- <exclude unless="bc.present" name="org/jruby/ext/openssl/**/*.java"/>
+ <exclude name="org/jruby/ext/openssl/**/*.java"/>
+ <exclude name="org/jruby/ext/openssl/**/*.java"/>
<include name="org/jruby/ext/openssl/RubyOpenSSL.java"/>
<include name="org/jruby/ext/openssl/OpenSSLFake.java"/>
</patternset>
+ <patternset id="java.openssl.src.pattern">
+ <include if="build.openssl" name="org/jruby/ext/openssl/**/*.java"/>
+ <exclude name="org/jruby/ext/openssl/RubyOpenSSL.java"/>
+ <exclude name="org/jruby/ext/openssl/OpenSSLFake.java"/>
+ </patternset>
+
<patternset id="ruby.src.pattern">
<include name="**/*.rb"/>
</patternset>
@@ -57,6 +63,7 @@
<mkdir dir="${build.dir}"/>
<mkdir dir="${classes.dir}"/>
<mkdir dir="${jruby.classes.dir}"/>
+ <mkdir dir="${jruby.openssl.classes.dir}"/>
<mkdir dir="${test.classes.dir}"/>
<mkdir dir="${test.results.dir}"/>
<mkdir dir="${html.test.results.dir}"/>
@@ -78,6 +85,12 @@
<available property="cglib.present"
classname="net.sf.cglib.reflect.FastClass"
classpathref="build.classpath"/>
+ <condition property="build.openssl">
+ <and>
+ <isset property="bc.present"/>
+ <isset property="jdk1.5+"/>
+ </and>
+ </condition>
</target>
<target name="compile.tasks" depends="prepare"
@@ -96,8 +109,7 @@
</copy>
</target>
- <target name="compile" depends="compile.tasks, check-for-optional-packages"
- description="Compile the source files for the project.">
+ <target name="compile-jruby" depends="compile.tasks, check-for-optional-packages">
<javac destdir="${jruby.classes.dir}" debug="true" source="${javac.version}">
<classpath refid="build.classpath"/>
<src path="${src.dir}"/>
@@ -105,6 +117,19 @@
</javac>
</target>
+ <target name="compile-openssl" if="build.openssl" depends="compile-jruby">
+ <javac destdir="${jruby.openssl.classes.dir}" debug="true" source="${javac.version}">
+ <classpath refid="build.classpath"/>
+ <classpath path="${jruby.classes.dir}"/>
+ <src path="${src.dir}"/>
+ <patternset refid="java.openssl.src.pattern"/>
+ </javac>
+ </target>
+
+ <target name="compile" depends="compile-jruby,compile-openssl"
+ description="Compile the source files for the project.">
+ </target>
+
<target name="serialize" depends="compile"
description="Serializes builting Ruby libraries into Java format">
<jruby-serialize destdir="${jruby.classes.dir}">
@@ -121,7 +146,7 @@
</jruby-serialize>
</target>
- <target name="jar" depends="serialize" description="Create the jruby.jar file">
+ <target name="jar-jruby" depends="serialize">
<jar destfile="${lib.dir}/jruby.jar">
<fileset dir="${jruby.classes.dir}">
<include name="**/*.class"/>
@@ -136,6 +161,17 @@
</jar>
</target>
+ <target name="jar-openssl" depends="serialize,jar-jruby" if="build.openssl">
+ <jar destfile="${lib.dir}/jruby-openssl.jar">
+ <fileset dir="${jruby.openssl.classes.dir}">
+ <include name="**/*.class"/>
+ </fileset>
+ </jar>
+ </target>
+
+ <target name="jar" depends="jar-jruby,jar-openssl" description="Create the jruby.jar file">
+ </target>
+
<target name="jar.standalone" depends="serialize, serialize.rubylib, jar"
description="Create a standalone jruby.jar file using libraries from RUBY_HOME/lib/ruby/1.8"/>
@@ -277,6 +313,7 @@
<target name="clean" depends="init" description="clean almost everything">
<delete dir="${build.dir}"/>
<delete file="${lib.dir}/jruby.jar" quiet="true"/>
+ <delete file="${lib.dir}/jruby-openssl.jar" quiet="true"/>
<delete dir="${api.docs.dir}"/>
</target>
</project>
View
1  default.build.properties
@@ -6,6 +6,7 @@ lib.dir=lib
build.dir=build
classes.dir=${build.dir}/classes
jruby.classes.dir=${classes.dir}/jruby
+jruby.openssl.classes.dir=${classes.dir}/openssl
jruby.instrumented.classes.dir=${classes.dir}/jruby-instrumented
test.classes.dir=${classes.dir}/test
docs.dir=docs
Please sign in to comment.
Something went wrong with that request. Please try again.