Permalink
Browse files

Merge remote branch 'origin/master'

  • Loading branch information...
2 parents 5d67473 + 683335d commit 2c5bdd846ec4eda770050bc5e06e4417e2ca6bf8 @xor-freenet xor-freenet committed Nov 25, 2010
Showing with 91 additions and 38 deletions.
  1. +1 −0 .gitignore
  2. +48 −0 freenet_ext/TODO
  3. +42 −38 freenet_ext/build.xml
View
@@ -17,3 +17,4 @@ wrapper/src/c/org_tanukisoftware_wrapper_WrapperManager_ShutdownLock.h
wrapper/src/c/org_tanukisoftware_wrapper_WrapperManager_WrapperEventListenerMask.h
wrapper/src/c/org_tanukisoftware_wrapper_WrapperManager_WrapperInputStream.h
wrapper/src/c/org_tanukisoftware_wrapper_WrapperManager_WrapperTickEventImpl.h
+wrapper/src/c/wrapperinfo.c
View
@@ -0,0 +1,48 @@
+== Split, refer to external project ==
+
+[bdb]
+contrib version: 3.3.69
+debian package: libdb-je-java
+debian version: 3.3.62
+debian jar: /usr/share/java/db-je.jar
+notes: debian has newer versions called libdb4.[5678]-java
+
+[db4o]
+contrib version: 7.4.63.11890
+notes: apparently very very painful to upgrade to newer version due to API changes
+
+[wrapper]
+contrib version: 3.3.5
+debian package: service-wrapper-java
+debian version: 3.5.3 (new)
+
+[java.apache.tools]
+debian package: ant
+debian version: 1.8.0
+debian jar: /usr/share/java/ant.jar
+notes: different, possibly newer, version called commons-compress;
+ needs API modifications, but is much easier to bundle.
+
+== Split, mirror source code ourselves ==
+
+[java.lzma]
+http://contrapunctus.net/
+TODO: need to ask toad why there are two of these...
+
+[java.sevenzip]
+aka. java_lzma
+http://p7zip.sourceforge.net/
+
+[java.mantissa]
+http://www.spaceroots.org/
+
+== Keep ==
+
+These packages seem to be used ONLY in freenet and pretty much no-where else.
+Not worth it to split them into their own packages.
+
+[fec] - currently has a segfault issue and is disabled
+[jcpuid]
+[NativeBigInteger] - can possibly drop in favour of BigInteger which is fast enough now due to JIT
+[NativeThread]
+
View
@@ -13,7 +13,7 @@
<target name="init" description="Create build directory">
<mkdir dir="${build}"/>
<mkdir dir="${build}/freenet/node/"/>
-
+
<!-- Update the Version file -->
<replace file="ExtVersion.java">
<replacefilter token="@custom@" value="${git.revision}"/>
@@ -26,7 +26,7 @@
<target name="fec-common" depends="init" description="build required classes for FEC">
<ant antfile="build.xml" dir="../fec/common/"/>
</target>
-
+
<target name="fec" depends="fec-common" description="build the fecencoder/decoder plugins for fproxy.">
<javac destdir="${build}" optimize="on" source="${javac.target.version}">
<src path="../fec/src"/>
@@ -59,15 +59,14 @@
<fileset dir="../NativeThread/lib" includes="freenet/**" />
</copy>
</target>
-
+
<target name="bdb" depends="init" description="Build the BDB provider">
<ant antfile="build.xml" dir="../bdb/" target="jar"/>
</target>
-
+
<target name="wrapper" depends="init" description="Build the java wrapper">
<ant antfile="build.xml" target="jar" dir="../wrapper/">
- <!-- detect it! -->
- <property name="bits" value="32"/>
+ <property name="bits" value="${sun.arch.data.model}"/>
<property name="javac.target.version" value="${javac.target.version}"/>
</ant>
</target>
@@ -80,61 +79,66 @@
<target name="build-java" description="build the 3rd party code we bundle">
<tstamp/>
- <javac srcdir="../java" destdir="${build}" debug="on" optimize="on" source="1.5">
-
+ <javac srcdir="../java" destdir="${build}" debug="on" optimize="on" source="1.5">
<classpath>
<pathelement location="${build}"/>
</classpath>
<compilerarg value="-Xlint"/>
-
<include name="**/*.java"/>
</javac>
-
- <delete dir="${build}-test"/>
- <mkdir dir="${build}-test"/>
- <javac srcdir="../java-test" destdir="${build}-test" debug="on" optimize="on" source="1.5">
+ <delete dir="${build}-test"/>
+ <mkdir dir="${build}-test"/>
+ <javac srcdir="../java-test" destdir="${build}-test" debug="on" optimize="on" source="1.5">
<classpath>
<pathelement location="${junit.location}"/>
<pathelement location="${build}"/>
</classpath>
<compilerarg value="-Xlint"/>
-
<include name="**/*.java"/>
</javac>
- <junit printsummary="yes" fork="yes" haltonfailure="yes">
- <classpath>
- <pathelement path="${build}"/>
- <pathelement path="${build}-test"/>
- <pathelement location="${junit.location}"/>
- </classpath>
-
- <formatter type="plain" usefile="false"/>
-
- <batchtest fork="yes">
- <fileset dir="${build}-test">
- <include name="**/*Test.class"/>
- </fileset>
- </batchtest>
- <sysproperty key="benchmark" value="${benchmark}" />
- <sysproperty key="extensiveTesting" value="${extensiveTesting}" />
- </junit>
+ <junit printsummary="yes" fork="yes" haltonfailure="yes">
+ <classpath>
+ <pathelement path="${build}"/>
+ <pathelement path="${build}-test"/>
+ <pathelement location="${junit.location}"/>
+ </classpath>
+ <formatter type="plain" usefile="false"/>
+ <batchtest fork="yes">
+ <fileset dir="${build}-test">
+ <include name="**/*Test.class"/>
+ </fileset>
+ </batchtest>
+ <sysproperty key="benchmark" value="${benchmark}" />
+ <sysproperty key="extensiveTesting" value="${extensiveTesting}" />
+ </junit>
<delete dir="${build}-test"/>
</target>
- <target name="clean" description="Cleanup the build directory">
+ <target name="clean-all" depends="clean" description="More thorough version of clean">
+ <ant antfile="build.xml" target="clean-javadoc" dir="../bdb"/>
+ <ant antfile="build.xml" target="clean-jca" dir="../bdb"/>
+ <!--WORKAROUND bug in wrapper's build.xml-->
+ <mkdir dir="../wrapper/bin"/>
+ <mkdir dir="../wrapper/lib"/>
+ <mkdir dir="../wrapper/test"/>
+ <ant antfile="build.xml" target="total-clean" dir="../wrapper">
+ <property name="bits" value="${sun.arch.data.model}"/>
+ </ant>
+ </target>
+
+ <target name="clean" description="Cleanup the build directories">
<delete file="${jar.location}"/>
<delete dir="${build}"/>
- <ant antfile="build.xml" target="clean" dir="../fec/common/"/>
- <ant antfile="build.xml" target="clean" dir="../bdb/"/>
- <ant antfile="build.xml" target="clean" dir="../wrapper/">
- <!-- detect it! -->
- <property name="bits" value="32"/>
+ <ant antfile="build.xml" target="clean" dir="../bdb"/>
+ <ant antfile="build.xml" target="clean" dir="../db4o"/>
+ <ant antfile="build.xml" target="clean" dir="../fec/common"/>
+ <ant antfile="build.xml" target="clean" dir="../wrapper">
+ <property name="bits" value="${sun.arch.data.model}"/>
</ant>
- <ant antfile="build.xml" target="clean" dir="../db4o/"/>
</target>
<target name="jar" depends="clean,fec,jcpuid,nativethread,bigint,bdb,wrapper,db4o,build-java" description="Create the jar file">

0 comments on commit 2c5bdd8

Please sign in to comment.