[freenet-cvs] r8102 - in trunk/freenet: . src/freenet/pluginmanager

[nextg...@freenetproject.org]

Author: nextgens
Date: 2006-02-22 10:02:34 +0000 (Wed, 22 Feb 2006)
New Revision: 8102

Modified:
   trunk/freenet/build.xml
   trunk/freenet/build_binary.xml
   trunk/freenet/src/freenet/pluginmanager/PluginManager.java
Log:
Removed a line preventing compilation

Modified: trunk/freenet/build.xml
===================================================================
--- trunk/freenet/build.xml     2006-02-22 09:58:14 UTC (rev 8101)
+++ trunk/freenet/build.xml     2006-02-22 10:02:34 UTC (rev 8102)
@@ -49,7 +49,6 @@
       <include name="org/**/*.java"/>
       <include name="freenet/**/*.java"/>
       <include name="net/i2p/util/*.java"/>
-      <include name="snmplib/*.java"/>
       <exclude name="org/**/MersenneTwisterTest.java"/>
       <exclude name="freenet/node/*Test.java"/>
     </javac>

Modified: trunk/freenet/build_binary.xml
===================================================================
--- trunk/freenet/build_binary.xml      2006-02-22 09:58:14 UTC (rev 8101)
+++ trunk/freenet/build_binary.xml      2006-02-22 10:02:34 UTC (rev 8102)
@@ -68,8 +68,9 @@
        <echo message="Compiling freenet-ext.jar"/>
        <exec executable="gcj" failonerror="true">
                <arg value="-c"/>
-               <arg value="-g"/>
-               <arg value="-O0"/>
+               <arg value="-O3"/>
+               <arg value="-fno-bounds-check"/>
+               <arg value="-fno-store-check"/>
                <arg value="-fjni"/>
                <arg value="-o"/>
                <arg value="${build}/freenet-ext.o"/>
@@ -84,8 +85,9 @@
        <echo message="Compiling freenet-cvs-snapshot.jar"/>
        <exec executable="gcj" failonerror="true">
                <arg value="-c"/>
-               <arg value="-g"/>
-               <arg value="-O0"/>
+               <arg value="-O3"/>
+               <arg value="-fno-bounds-check"/>
+               <arg value="-fno-store-check"/>
                <arg value="-fjni"/>
                <arg value="-o"/>
                <arg value="${build}/freenet-cvs-snapshot.o"/>
@@ -108,12 +110,13 @@
        <echo message="Linking"/>
        <exec executable="gcj" failonerror="true">
                <arg value="-combine"/>
-               <arg value="-g"/>
-               <arg value="-O0"/>
+               <arg value="-O3"/>
+               <arg value="-fno-bounds-check"/>
+               <arg value="-fno-store-check"/>
                <arg value="-fjni"/>
                <arg value="-o"/>
                <arg value="freenet"/>
-               <arg value="--main=freenet.node.Node"/>
+               <arg value="--main=net.i2p.util.NativeBigInteger"/>
                <arg value="-I${lib}/freenet-cvs-snapshot.jar"/>
                <arg value="-I${lib}/freenet-ext.jar"/>
                <arg value="-I${gnu-crypto.location}"/>
@@ -133,42 +136,14 @@
   </target>

   <target name="dist_gcj" depends="link_gcj"
-      description="generate the distribution" >
-       <echo message="Extracting libs from freenet-ext.jar"/>
-       <unzip src="${lib}/freenet-ext.jar" dest="${bin}"/>
+      description="generate the distribution" />

-       <echo message="Linking"/>
-       <exec executable="gcj" failonerror="true">
-               <arg value="-combine"/>
-               <arg value="-g"/>
-               <arg value="-O0"/>
-               <arg value="-fjni"/>
-               <arg value="-o"/>
-               <arg value="freenet"/>
-               <arg value="--main=freenet.node.Node"/>
-               <arg value="-I${lib}/freenet-cvs-snapshot.jar"/>
-               <arg value="-I${lib}/freenet-ext.jar"/>
-               <arg value="-I${gnu-crypto.location}"/>
-               <arg value="-I${javax-crypto.location}"/>
-               <arg value="-I${javax-security.location}"/>
-               <arg value="-L${bin}/lib/linux/x86/"/>
-               <arg value="-L${bin}/net/i2p/util/"/>
-               <arg value="-lfec16"/>
-               <arg value="-lfec8"/>
-               <arg value="-ljbigi-linux-athlon"/>
-               <arg value="-l-javax-security"/>
-               <arg value="-l-javax-crypto"/>
-               <arg value="-l-gnu-crypto"/>
-               <arg value="${build}/freenet-ext.o"/>
-               <arg value="${build}/freenet-cvs-snapshot.o"/>
-       </exec>
-  </target>
-
     <!-- ================================================== -->
     <target name="clean" description="Delete class files and docs dir.">
         <delete dir="${build}"/>
         <delete dir="${bin}"/>
         <delete file="freenet"/>
+        <delete file="*.o"/>
     </target>
     <target name="distclean" description="Delete class files, lib dir and docs 
dir.">
         <delete dir="${build}"/>
@@ -176,5 +151,6 @@
         <delete dir="${lib}"/>
         <delete dir="misc"/>
         <delete file="freenet"/>
+        <delete file="*.o"/>
     </target>
 </project>

Modified: trunk/freenet/src/freenet/pluginmanager/PluginManager.java
===================================================================
--- trunk/freenet/src/freenet/pluginmanager/PluginManager.java  2006-02-22 
09:58:14 UTC (rev 8101)
+++ trunk/freenet/src/freenet/pluginmanager/PluginManager.java  2006-02-22 
10:02:34 UTC (rev 8102)
@@ -36,7 +36,6 @@
                // Needed to include plugin in jar-files
                if (new Date().equals(null)){
                        System.err.println(new TestPlugin());
-                       System.err.println(new TestGalleryPlugin());
                }
        }