[freenet-cvs] r8105 - in trunk/plugins: . TestGallery

[nextg...@freenetproject.org]

Author: nextgens
Date: 2006-02-22 10:40:06 +0000 (Wed, 22 Feb 2006)
New Revision: 8105

Modified:
   trunk/plugins/TestGallery/TestGallery.java
   trunk/plugins/build.xml
Log:
doh ; we need compiled files in the jar

Modified: trunk/plugins/TestGallery/TestGallery.java
===================================================================
--- trunk/plugins/TestGallery/TestGallery.java  2006-02-22 10:13:39 UTC (rev 
8104)
+++ trunk/plugins/TestGallery/TestGallery.java  2006-02-22 10:40:06 UTC (rev 
8105)
@@ -1,10 +1,11 @@
-package freenet.pluginmanager;
+package freenet.plugin;

 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.util.Date;
 import java.util.Random;

+import freenet.pluginmanager;
 import freenet.client.FetchException;
 import freenet.client.FetchResult;
 import freenet.client.HighLevelSimpleClient;

Modified: trunk/plugins/build.xml
===================================================================
--- trunk/plugins/build.xml     2006-02-22 10:13:39 UTC (rev 8104)
+++ trunk/plugins/build.xml     2006-02-22 10:40:06 UTC (rev 8105)
@@ -2,8 +2,8 @@
 <!-- ant build file for Freenet -->

 <project name="Freenet" default="dist" basedir=".">
-       <loadfile property="freenet-cvs-snapshot.location"  
srcFile="/var/www/downloads/alpha/.latest"/>
-       <property name="freenet-cvs-snapshot.location" 
location="/var/www/downloads/alpha/${freenet-cvs-snapshot.location}"/>
+       <loadfile property="freenet-cvs-snapshot.name"  
srcFile="/var/www/downloads/alpha/.latest"/>
+       <property name="freenet-cvs-snapshot.location" 
location="/var/www/downloads/alpha/${freenet-cvs-snapshot.name}"/>
        <property name="freenet-ext.location" 
location="/var/www/downloads/alpha/freenet-ext.jar"/>
        <property name="build" location="build/"/>
        <property name="dist" location="dist/"/>
@@ -11,6 +11,8 @@
 <target name="mkdir">
     <mkdir dir="${build}"/>
     <mkdir dir="${dist}"/>
+    <echo message="Using ${freenet-cvs-snapshot.location} as 
freenet-cvs-snapshot.jar"/>
+    <echo message="Using ${freenet-ext.location} as freenet-ext.jar"/>
 </target>

     <!-- ================================================== -->
@@ -26,7 +28,7 @@
        <pathelement location="${freenet-cvs-snapshot.location}"/>
     </classpath>
 <!-- following a very temporary list of files to be build -->
-      <include name="${what}/**/*.java"/>
+      <include name="**/*.java"/>
     </javac>
   </target>

@@ -37,11 +39,12 @@
     <!-- Create the distribution directory -->
     <!--<mkdir dir="."/>-->
     <!-- Put everything in ${build} into the freenet-${DSTAMP}.jar file -->
-    <jar jarfile="${dist}/${what}.jar" basedir="${what}"/>
+    <jar jarfile="${dist}/${what}.jar" basedir="${build}"/>
   </target>

     <!-- ================================================== -->
     <target name="clean" description="Delete class files and docs dir.">
         <delete dir="${build}"/>
+        <delete dir="${dist}"/>
     </target>
 </project>