LogoopenSUSE Build Service > Projects
Sign Up | Log In

View File jxta-2.3.2-build_xml.patch of Package jxta (Project Java:jpackage-1.7)

--- build.xml.sav	2004-12-07 22:14:28.000000000 +0100
+++ build.xml	2005-02-23 17:07:32.794569456 +0100
@@ -91,8 +91,8 @@
   <property name="build_contrib" value="${build}/contrib" />
   <property name="build_swingTools" value="${build}/swingTools" />
   <property name="dist" value="${basedir}/dist" />
-  <property name="apidoc" value="${jxtaroot}/platform/www/java/api" />
-  <property name="impldoc" value="${jxtaroot}/platform/www/java/impl" />
+  <property name="apidoc" value="${basedir}/www/java/api" />
+  <property name="impldoc" value="${basedir}/www/java/impl" />
   <property name="jnlp" value="${basedir}/jnlp" />
   <property name="rpm" value="${basedir}/rpm" />
   <property name="lib" value="${basedir}/lib" />
@@ -142,10 +142,10 @@
     <!-- JARs -->
     <property name="jxtajar" value="${dist}/jxta.jar" />
     <property name="jxtaextjar" value="${dist}/jxtaext.jar"/>
-    <property name="jxtashelljar" value="${jxtaroot}/shell/binding/java/dist/jxtashell.jar" />
+    <property name="jxtashelljar" value="${basedir}/binding/java/dist/jxtashell.jar" />
    
     <!-- Paths -->
-    <fileset id="shell.files" dir="${jxtaroot}/shell">
+    <fileset id="shell.files" dir="${basedir}/shell">
       <filename name="binding/java/dist/jxtashell.jar" />
     </fileset>
     
@@ -362,7 +362,7 @@
   <target name="jar" depends="compile" description="Creates Unsigned JXTA Platform and Extensions Jar file">
   
     <jar basedir="${build}" jarfile="${jxtajar}">
-      <fileset file="${jxtaroot}/platform/license.txt"/>
+      <fileset file="${basedir}/jxta_license.txt"/>
       <exclude name="kaffe/**" />
       <exclude name="com/**" />  <!-- may be too broad -->
       <exclude name="net/jxta/ext/**"/>
@@ -398,7 +398,7 @@
     </jar>
 
     <jar basedir="${build}" jarfile="${jxtaextjar}">
-      <fileset file="${jxtaroot}/platform/license.txt"/>
+      <fileset file="${basedir}/jxta_license.txt"/>
       <include name="net/jxta/ext/config/**"/>
       <include name="net/jxta/ext/http/**"/>
       <include name="**/*.xml"/>
@@ -588,7 +588,7 @@
     <mkdir dir="${tmp}/service"/>
     
     <jar jarfile="${tmp}/service/jxtaextservice.jar">
-      <fileset file="${jxtaroot}/platform/license.txt"/>
+      <fileset file="${basedir}/jxta_license.txt"/>
       <fileset dir="${build}">
         <include name="net/jxta/ext/service/reflection/**"/>
       </fileset>
@@ -647,6 +647,9 @@
       <link href="http://logging.apache.org/log4j/docs/api/" />
       <classpath>
         <path refid="compile.classpath" />
+        <fileset dir="${dist}">
+          <include name="*.jar"/>
+        </fileset>
       </classpath>
       <sourcepath>
         <pathelement location="${basedir}/api/src/" />
@@ -668,6 +671,9 @@
       <link href="http://platform.jxta.org/nonav/java/api/" offline="true" packagelistLoc="${apidoc}"/>
       <classpath>
         <path refid="ext.classpath" />
+        <fileset dir="${dist}">
+          <include name="*.jar"/>
+        </fileset>
       </classpath>
       <sourcepath>
         <pathelement location="${basedir}/api/src/" />
@@ -705,7 +711,7 @@
   
   <target name="lib-zip" depends="signjar" description="Creates zip file of libs">
     <zip destfile="${dist}/jxta-lib-${net.jxta.build.version}.zip" >
-      <fileset file="${jxtaroot}/platform/license.txt"/>
+      <fileset file="${basedir}/jxta_license.txt"/>
 
       <zipfileset dir="${lib}">
         <include name="**/*.jar" />
@@ -723,7 +729,7 @@
   <target name="lib-tgz" depends="signjar" description="creates tar.gz file of libs">
     <delete file="${dist}/jxta-lib-${net.jxta.build.version}.tar.gz" />
     <tar destfile="${dist}/jxta-lib-${net.jxta.build.version}.tar.gz" compression="gzip" longfile="gnu">
-       <tarfileset file="${jxtaroot}/platform/license.txt"/>
+       <tarfileset file="${basedir}/jxta_license.txt"/>
      
        <tarfileset dir="${lib}">
         <include name="**/*.jar" />
@@ -758,7 +764,7 @@
   
   <target name="jxtaSwing" depends="jxtaSwing-compile" description="Creates jxtaSwing.jar Jar file">
     <jar basedir="${build_swingTools}" jarfile="${dist}/jxtaSwing.jar">
-      <fileset file="${jxtaroot}/platform/license.txt"/>
+      <fileset file="${basedir}/jxta_license.txt"/>
       <manifest>
         <attribute name="Built-By" value="${user.name}" />
         <attribute name="Built-At" value="${DSTAMP}" />
@@ -773,7 +779,7 @@
     </jar>
   </target>
   
-  <target name="jxtaSwing-compile" depends="signjar" description="Builds the SwingTools">
+  <target name="jxtaSwing-compile" depends="jar" description="Builds the SwingTools">
     <!-- Compile the java code into ${build} -->      
 
     <echo message="jxtaSwing: ${build_swingTools}" />
@@ -955,14 +961,14 @@
     </java>
   </target>
   
-   <target name="runtest" depends="signjar" description="text mode test runner">
+   <target name="runtest" depends="jar" description="text mode test runner">
     <ant antfile="${ant}/test.xml" target="text" inheritRefs="true">
       <reference refid="lib.files" torefid="lib.files"/>
       <reference refid="ext.lib.files" torefid="ext.lib.files"/>
     </ant>
   </target>
   
-  <target name="runtestui" depends="signjar" description="ui mode test runner">
+  <target name="runtestui" depends="jar" description="ui mode test runner">
     <ant antfile="${ant}/test.xml" target="ui" inheritRefs="true">
       <reference refid="lib.files" torefid="lib.files"/>
       <reference refid="ext.lib.files" torefid="ext.lib.files"/>