Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=0cacb12c58799b08e7a1445397b8cc842471d9a6

commit 0cacb12c58799b08e7a1445397b8cc842471d9a6
Author: Marius Cirsta <[email protected]>
Date:   Fri Jun 29 23:46:39 2012 +0000

ws-jaxme-0.5.2-1-x86_64

* rebuild with openjava
* version bump

diff --git a/source/devel-extra/ws-jaxme/FrugalBuild 
b/source/devel-extra/ws-jaxme/FrugalBuild
index d99ee48..ac59466 100644
--- a/source/devel-extra/ws-jaxme/FrugalBuild
+++ b/source/devel-extra/ws-jaxme/FrugalBuild
@@ -2,26 +2,26 @@
# Maintainer: Miklos Vajna <[email protected]>

pkgname=ws-jaxme
-pkgver=0.3.1
+pkgver=0.5.2
pkgrel=1
pkgdesc="An open source implementation of JAXB, the specification for Java/XML 
binding."
url="http://ws.apache.org/jaxme/index.html";
-Finclude java
-depends=(${depends[@]} 'junit' 'apache-log4j' 'gnu-crypto' 'xmldb-api')
+Finclude openjava
+depends=(${depends[@]} 'apache-log4j' 'gnu-crypto' 'xmldb-api' 
'antlr-openjava' 'commons-codec')
groups=('devel-extra')
archs=('i686' 'x86_64')
-# yes. updating to 0.5.x should be nice. will do later
-up2date="$pkgver"
+up2date="Flastarchive http://www.apache.org/dist/ws/jaxme/source/ -src.tar.gz"
source=(http://www.apache.org/dist/ws/jaxme/source/ws-jaxme-$pkgver-src.tar.gz \
-       ws-jaxme-0.3.1-base64.diff ws-jaxme-0.3.1-nohsqldb.patch)
-sha1sums=('4ba5fd76cbda407c0b32af2e3235dab66a8b0a00' \
-          '5e06765d5dcdc921b5d2be107c9dfe2c417c546c' \
-          'b5bc9691a0ba611e2f46b5bf854442b016cd0e2d')
+       no-deps.patch upstream.diff)
+signatures=($source.asc '' '')

build()
{
Fpatchall
Fjavacleanup
-       Fant jar
+       ln -sf /usr/share/java/antlr-openjava.jar ./prerequisites/antlr.jar
+       #remove unit tests to avoid extra deps
+       rm -rf src/js/org/apache/ws/jaxme/js/junit || Fdie
+       Fant all
Fjar dist/*.jar
}
diff --git a/source/devel-extra/ws-jaxme/no-deps.patch 
b/source/devel-extra/ws-jaxme/no-deps.patch
new file mode 100644
index 0000000..7622be1
--- /dev/null
+++ b/source/devel-extra/ws-jaxme/no-deps.patch
@@ -0,0 +1,11 @@
+--- ws-jaxme-0.5.2/ant/js.xml  2006-08-23 08:02:35.000000000 +0000
++++ ws-jaxme-0.5.2.new/ant/js.xml      2012-06-29 19:48:37.000000000 +0000
+@@ -155,7 +155,7 @@
+     </target>
+
+     <target name="JS.generate.compile"
+-           
depends="dirs,JS.generate.proxy,JS.generate.enum,JS.generate.version,JS.generate.xmlrpc">
++           
depends="dirs,JS.generate.proxy,JS.generate.enum,JS.generate.xmlrpc">
+         <javac destdir="${build.js.test.classes}"
+             debug="${debug}" optimize="${optimize}"
+             includes="org/apache/ws/jaxme/js/junit/**/*"
diff --git a/source/devel-extra/ws-jaxme/upstream.diff 
b/source/devel-extra/ws-jaxme/upstream.diff
new file mode 100644
index 0000000..2717c17
--- /dev/null
+++ b/source/devel-extra/ws-jaxme/upstream.diff
@@ -0,0 +1,363 @@
+--- jaxme-0.5.2+dfsg.orig/jaxme.properties
++++ jaxme-0.5.2+dfsg/jaxme.properties
+@@ -0,0 +1,2 @@
++preqs=/usr/share/java
++javax.xml.transform.TransformerFactory=org.apache.xalan.processor.TransformerFactoryImpl
+--- jaxme-0.5.2+dfsg.orig/build.xml
++++ jaxme-0.5.2+dfsg/build.xml
+@@ -34,7 +34,7 @@
+                <include name="prerequisites/junit*.jar"/>
+                <include name="prerequisites/log4j*.jar"/>
+                <include name="prerequisites/xercesImpl.jar"/>
+-               <include name="prerequisites/xml-apis-1.3.02.jar"/>
++               <include name="prerequisites/xml-apis.jar"/>
+                <include name="prerequisites/xmldb-api-*.jar"/>
+              </tarfileset>
+              <tarfileset prefix="ws-jaxme-${version}/docs" 
dir="${build.site}"/>
+--- jaxme-0.5.2+dfsg.orig/ant/pm.xml
++++ jaxme-0.5.2+dfsg/ant/pm.xml
+@@ -37,9 +37,9 @@
+         <pathelement location="${dist}/jaxmexs-${version}.jar"/>
+         <pathelement location="${dist}/jaxme2-${version}.jar"/>
+         <pathelement location="${preqs}/beaver.jar"/>
+-        <pathelement location="${preqs}/hsqldb-1.7.1.jar"/>
++        <pathelement location="${preqs}/hsqldb.jar"/>
+         <pathelement location="${preqs}/ant.jar"/>
+-        <pathelement location="${preqs}/xml-apis-1.3.02.jar"/>
++        <pathelement location="${preqs}/xml-apis.jar"/>
+         <pathelement location="${preqs}/xercesImpl.jar"/>
+         <pathelement location="${preqs}/xmldb-api-20021118.jar"/>
+         <!-- These aren't in the CVS and aren't necessary for the build -->
+@@ -73,6 +73,7 @@
+             source="1.3" target="1.3"
+             srcdir="${src.pm}">
+             <exclude name="org/apache/ws/jaxme/pm/junit/**/*"/>
++            <exclude name="org/apache/ws/jaxme/pm/xmldb/*"/>
+             <exclude name="org/apache/ws/jaxme/**/api4j/*" 
unless="have.inoapi4j"/>
+             <exclude name="org/apache/ws/jaxme/pm/ino/URLEncoder14.java" 
unless="have14"/>
+         </javac>
+--- jaxme-0.5.2+dfsg.orig/ant/xs.xml
++++ jaxme-0.5.2+dfsg/ant/xs.xml
+@@ -23,7 +23,7 @@
+     <property name="src.xs" location="${basedir}/src/xs"/>
+
+     <path id="xs.class.path">
+-        <pathelement location="${preqs}/xml-apis-1.3.02.jar"/>
++        <pathelement location="${preqs}/xml-apis.jar"/>
+         <pathelement location="${preqs}/junit.jar"/>
+         <pathelement location="${dist}/jaxmeapi-${version}.jar"/>
+     </path>
+--- jaxme-0.5.2+dfsg.orig/ant/api.xml
++++ jaxme-0.5.2+dfsg/ant/api.xml
+@@ -25,7 +25,7 @@
+     </target>
+
+     <path id="api.class.path">
+-        <pathelement location="${preqs}/xml-apis-1.3.02.jar"/>
++        <pathelement location="${preqs}/xml-apis.jar"/>
+     </path>
+
+     <target name="API.compile" depends="init">
+--- jaxme-0.5.2+dfsg.orig/ant/jm.xml
++++ jaxme-0.5.2+dfsg/ant/jm.xml
+@@ -34,9 +34,10 @@
+       <pathelement location="${dist}/jaxmejs-${version}.jar"/>
+       <pathelement location="${dist}/jaxmexs-${version}.jar"/>
+       <pathelement location="${preqs}/ant.jar"/>
+-      <pathelement location="${preqs}/xml-apis-1.3.02.jar"/>
++      <pathelement location="${preqs}/xml-apis.jar"/>
+       <pathelement location="${preqs}/beaver.jar"/>
+       <pathelement location="${preqs}/antlr.jar"/>
++      <pathelement location="${preqs}/commons-codec.jar"/>
+     </path>
+
+     <path id="jaxme.test.path">
+--- jaxme-0.5.2+dfsg.orig/ant/js.xml
++++ jaxme-0.5.2+dfsg/ant/js.xml
+@@ -35,8 +35,8 @@
+     <property name="src.js" location="${basedir}/src/js"/>
+
+     <path id="js.class.path">
+-      <pathelement location="${preqs}/log4j-1.2.8.jar"/>
+-      <pathelement location="${preqs}/ant-1.5.4.jar"/>
++      <pathelement location="${preqs}/log4j-1.2.jar"/>
++      <pathelement location="${preqs}/ant.jar"/>
+       <pathelement location="${preqs}/junit.jar"/>
+       <pathelement location="${preqs}/antlr.jar"/>
+       <pathelement location="${dist}/jaxmeapi-${version}.jar"/>
+@@ -44,7 +44,7 @@
+
+     <path id="js.test.path">
+         <path refid="js.class.path"/>
+-        <pathelement location="${preqs}/hsqldb-1.7.1.jar"/>
++        <pathelement location="${preqs}/hsqldb.jar"/>
+         <pathelement location="${dist}/jaxmejs-${version}.jar"/>
+         <pathelement location="${build.js.test.classes}"/>
+     </path>
+@@ -62,7 +62,7 @@
+     <target name="JS.antlr" depends="dirs">
+         <java classname="antlr.Tool" failonerror="true">
+             <classpath>
+-                <pathelement location="${preqs}/antlr.jar"/>
++                <pathelement location="/usr/share/java/antlr-openjava.jar"/>
+             </classpath>
+             <arg line="-o ${build.js.src}/org/apache/ws/jaxme/js/jparser"/>
+             <arg file="${src.js}/org/apache/ws/jaxme/js/jparser/java15.g"/>
+--- 
jaxme-0.5.2+dfsg.orig/src/jaxme/org/apache/ws/jaxme/impl/JMMarshallerImpl.java
++++ jaxme-0.5.2+dfsg/src/jaxme/org/apache/ws/jaxme/impl/JMMarshallerImpl.java
+@@ -21,16 +21,22 @@
+ import java.io.OutputStreamWriter;
+ import java.io.UnsupportedEncodingException;
+ import java.io.Writer;
++import java.io.File;
+
+ import javax.xml.bind.JAXBException;
+ import javax.xml.bind.MarshalException;
+ import javax.xml.bind.Marshaller;
+ import javax.xml.bind.PropertyException;
++import javax.xml.bind.attachment.AttachmentMarshaller;
++import javax.xml.bind.annotation.adapters.XmlAdapter;
+ import javax.xml.namespace.QName;
+ import javax.xml.transform.Result;
+ import javax.xml.transform.dom.DOMResult;
+ import javax.xml.transform.sax.SAXResult;
+ import javax.xml.transform.stream.StreamResult;
++import javax.xml.stream.XMLStreamWriter;
++import javax.xml.stream.XMLEventWriter;
++import javax.xml.validation.Schema;
+
+ import org.apache.ws.jaxme.*;
+ import org.apache.ws.jaxme.JMElement;
+@@ -430,4 +436,55 @@
+   public Node getNode(java.lang.Object contentTree) throws JAXBException {
+     throw new UnsupportedOperationException("JaxMe doesn't support live DOM 
views");
+   }
++
++
++// added to support JDK6
++
++    public void marshal(Object jaxbElement, File output) throws JAXBException 
{
++        throw new UnsupportedOperationException();
++    }
++
++    public void marshal(Object jaxbElement, XMLStreamWriter writer) throws 
JAXBException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void marshal(Object jaxbElement, XMLEventWriter writer) throws 
JAXBException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setAdapter(XmlAdapter adapter) {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setAdapter(Class type, XmlAdapter adapter) {
++        throw new UnsupportedOperationException();
++    }
++
++    public XmlAdapter getAdapter(Class type) {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setAttachmentMarshaller(AttachmentMarshaller am) {
++        throw new UnsupportedOperationException();
++    }
++
++    public AttachmentMarshaller getAttachmentMarshaller() {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setSchema(Schema schema) {
++        throw new UnsupportedOperationException();
++    }
++
++    public Schema getSchema() {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setListener(Listener listener) {
++        throw new UnsupportedOperationException();
++    }
++
++    public Listener getListener() {
++        throw new UnsupportedOperationException();
++    }
+ }
+--- 
jaxme-0.5.2+dfsg.orig/src/jaxme/org/apache/ws/jaxme/impl/JMUnmarshallerImpl.java
++++ jaxme-0.5.2+dfsg/src/jaxme/org/apache/ws/jaxme/impl/JMUnmarshallerImpl.java
+@@ -26,6 +26,10 @@
+ import javax.xml.bind.JAXBException;
+ import javax.xml.bind.UnmarshalException;
+ import javax.xml.bind.UnmarshallerHandler;
++import javax.xml.bind.JAXBElement;
++import javax.xml.bind.Unmarshaller;
++import javax.xml.bind.attachment.AttachmentUnmarshaller;
++import javax.xml.bind.annotation.adapters.XmlAdapter;
+ import javax.xml.parsers.ParserConfigurationException;
+ import javax.xml.parsers.SAXParser;
+ import javax.xml.parsers.SAXParserFactory;
+@@ -33,6 +37,9 @@
+ import javax.xml.transform.dom.DOMSource;
+ import javax.xml.transform.sax.SAXSource;
+ import javax.xml.transform.stream.StreamSource;
++import javax.xml.stream.XMLStreamReader;
++import javax.xml.stream.XMLEventReader;
++import javax.xml.validation.Schema;
+
+ import org.apache.ws.jaxme.JMUnmarshaller;
+ import org.apache.ws.jaxme.util.DOMSerializer;
+@@ -177,4 +184,71 @@
+     public UnmarshallerHandler getUnmarshallerHandler() {
+         return new JMUnmarshallerHandlerImpl(this);
+     }
++
++
++// added to support JDK6
++
++    public Object unmarshal(Reader reader) throws JAXBException {
++        throw new UnsupportedOperationException();
++    }
++
++    public JAXBElement unmarshal(Node node, Class declaredType) throws 
JAXBException {
++        throw new UnsupportedOperationException();
++    }
++
++    public  JAXBElement unmarshal(Source source, Class declaredType) throws 
JAXBException {
++        throw new UnsupportedOperationException();
++    }
++
++    public Object unmarshal(XMLStreamReader reader) throws JAXBException {
++        throw new UnsupportedOperationException();
++    }
++
++    public  JAXBElement unmarshal(XMLStreamReader reader, Class declaredType) 
throws JAXBException {
++        throw new UnsupportedOperationException();
++    }
++
++    public Object unmarshal(XMLEventReader reader) throws JAXBException {
++        throw new UnsupportedOperationException();
++    }
++
++    public  JAXBElement unmarshal(XMLEventReader reader, Class declaredType) 
throws JAXBException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setSchema(Schema schema) {
++        throw new UnsupportedOperationException();
++    }
++
++    public Schema getSchema() {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setAdapter(XmlAdapter adapter) {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setAdapter(Class type, XmlAdapter adapter) {
++        throw new UnsupportedOperationException();
++    }
++
++    public XmlAdapter getAdapter(Class type) {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setAttachmentUnmarshaller(AttachmentUnmarshaller au) {
++        throw new UnsupportedOperationException();
++    }
++
++    public AttachmentUnmarshaller getAttachmentUnmarshaller() {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setListener(Listener listener) {
++        throw new UnsupportedOperationException();
++    }
++
++    public Listener getListener() {
++        throw new UnsupportedOperationException();
++    }
+ }
+--- 
jaxme-0.5.2+dfsg.orig/src/jaxme/org/apache/ws/jaxme/junit/MarshallerTest.java
++++ jaxme-0.5.2+dfsg/src/jaxme/org/apache/ws/jaxme/junit/MarshallerTest.java
+@@ -556,7 +556,8 @@
+         marshaller.marshal(e, sw);
+         String got = sw.toString();
+         String expect = getAllElementString(false, pDateTimeFormat, 
pDateFormat, pTimeFormat);
+-        assertEquals(expect, got);
++        // Disabled due to timezone problems.
++        //assertEquals(expect, got);
+ }
+
+   private RootElementHandler getRootElementInfo(String pElement) throws 
ParserConfigurationException, IOException, SAXException {
+--- jaxme-0.5.2+dfsg.orig/src/jaxme/org/apache/ws/jaxme/junit/WildcardTest.java
++++ jaxme-0.5.2+dfsg/src/jaxme/org/apache/ws/jaxme/junit/WildcardTest.java
+@@ -88,9 +88,10 @@
+     }
+
+     public void testMarshalAnyAttribute() throws Exception {
+-        String expect = "<ex:AnyAttribute p:bar=\"value 1\" baz=\"value 2\" 
xmlns:ex=\"http://ws.apache.org/jaxme/test/misc/wildcards\"; xmlns:p=\"foo\"/>";
++        String expect1 = "<ex:AnyAttribute p:bar=\"value 1\" baz=\"value 2\" 
xmlns:ex=\"http://ws.apache.org/jaxme/test/misc/wildcards\"; xmlns:p=\"foo\"/>";
++        String expect2 = "<ex:AnyAttribute p:bar=\"value 1\" baz=\"value 2\" 
xmlns:p=\"foo\" xmlns:ex=\"http://ws.apache.org/jaxme/test/misc/wildcards\"/>";
+         String got = getMarshalledAnyAttribute();
+-        assertEquals(expect, got);
++        assertTrue(expect1.equals(got) || expect2.equals(got));
+     }
+
+     protected void assertEquals(WildcardAttribute[] pExpect, 
WildcardAttribute[] pGot) {
+@@ -123,9 +124,10 @@
+     }
+
+     public void testMarshalListAttribute() throws Exception {
+-        String expect = "<ex:ListAttribute p:foo=\"value 1\" ex:bar=\"value 
2\" xmlns:ex=\"http://ws.apache.org/jaxme/test/misc/wildcards\"; 
xmlns:p=\"http://ws.apache.org/jaxme/test/misc/wildcards/2\"/>";
++        String expect1 = "<ex:ListAttribute p:foo=\"value 1\" ex:bar=\"value 
2\" xmlns:ex=\"http://ws.apache.org/jaxme/test/misc/wildcards\"; 
xmlns:p=\"http://ws.apache.org/jaxme/test/misc/wildcards/2\"/>";
++        String expect2 = "<ex:ListAttribute p:foo=\"value 1\" ex:bar=\"value 
2\" xmlns:p=\"http://ws.apache.org/jaxme/test/misc/wildcards/2\"; 
xmlns:ex=\"http://ws.apache.org/jaxme/test/misc/wildcards\"/>";
+         String got = getMarshalledListAttribute();
+-        assertEquals(expect, got);
++        assertTrue(expect1.equals(got) || expect2.equals(got));
+     }
+
+     public void testUnmarshalListAttribute() throws Exception {
+@@ -138,9 +140,10 @@
+     }
+
+     public void testMarshalOtherAttribute() throws Exception {
+-        String expect = "<ex:OtherAttribute p:bar=\"value 1\" baz=\"value 2\" 
xmlns:ex=\"http://ws.apache.org/jaxme/test/misc/wildcards\"; xmlns:p=\"foo\"/>";
++        String expect1 = "<ex:OtherAttribute p:bar=\"value 1\" baz=\"value 
2\" xmlns:ex=\"http://ws.apache.org/jaxme/test/misc/wildcards\"; 
xmlns:p=\"foo\"/>";
++        String expect2 = "<ex:OtherAttribute p:bar=\"value 1\" baz=\"value 
2\" xmlns:p=\"foo\" 
xmlns:ex=\"http://ws.apache.org/jaxme/test/misc/wildcards\"/>";
+         String got = getMarshalledOtherAttribute();
+-        assertEquals(expect, got);
++        assertTrue(expect1.equals(got) || expect2.equals(got));
+     }
+
+     public void testUnmarshalOtherAttribute() throws Exception {
+--- jaxme-0.5.2+dfsg.orig/src/jaxme/org/apache/ws/jaxme/util/Base64Binary.java
++++ jaxme-0.5.2+dfsg/src/jaxme/org/apache/ws/jaxme/util/Base64Binary.java
+@@ -17,9 +17,7 @@
+ package org.apache.ws.jaxme.util;
+
+ import java.io.IOException;
+-
+-import sun.misc.BASE64Decoder;
+-import sun.misc.BASE64Encoder;
++import org.apache.commons.codec.binary.Base64;
+
+
+ /** A utility class for working with base64 encoding.
+@@ -37,13 +35,13 @@
+        * base64 encoded byte array.
+        */
+       public static byte[] decode(String pValue) throws IOException {
+-              return (new BASE64Decoder()).decodeBuffer(pValue);
++              return (new Base64()).decode(pValue.getBytes());
+       }
+
+       /** Converts the base64 encoded byte array <code>pValue</code>
+        * into a string.
+        */
+       public static String encode(byte[] pValue) {
+-              return (new BASE64Encoder()).encode(pValue);
++              return new String((new Base64()).encode(pValue));
+       }
+ }
diff --git a/source/devel-extra/ws-jaxme/ws-jaxme-0.3.1-base64.diff 
b/source/devel-extra/ws-jaxme/ws-jaxme-0.3.1-base64.diff
deleted file mode 100644
index b0475f9..0000000
--- a/source/devel-extra/ws-jaxme/ws-jaxme-0.3.1-base64.diff
+++ /dev/null
@@ -1,36 +0,0 @@
---- ws-jaxme-0.3.1/buildjm.xml.orig    2006-07-30 18:46:21.000000000 +0200
-+++ ws-jaxme-0.3.1/buildjm.xml 2006-07-30 19:04:24.000000000 +0200
-@@ -54,6 +54,7 @@
-       <pathelement location="${preqs}/ant.jar"/>
-       <pathelement location="${preqs}/xml-apis.jar"/>
-       <pathelement location="${preqs}/xercesImpl.jar"/>
-+      <pathelement location="${preqs}/gnu-crypto.jar"/>
-     </path>
-
-     <path id="jaxme.runtime.path">
---- ws-jaxme-0.3.1/src/jaxme/org/apache/ws/jaxme/util/Base64Binary.java.orig   
2006-07-30 18:49:11.000000000 +0200
-+++ ws-jaxme-0.3.1/src/jaxme/org/apache/ws/jaxme/util/Base64Binary.java        
2006-07-30 19:02:54.000000000 +0200
-@@ -18,8 +18,7 @@
-
- import java.io.IOException;
-
--import sun.misc.BASE64Decoder;
--import sun.misc.BASE64Encoder;
-+import gnu.crypto.util.Base64;
-
-
- /**
-@@ -33,11 +32,11 @@
-   }
-
-   public static byte[] decode(String pValue) throws IOException {
--    return (new BASE64Decoder()).decodeBuffer(pValue);
-+    return Base64.decode(pValue);
-   }
-
-   public static String encode(byte[] pValue) {
--    return (new BASE64Encoder()).encode(pValue);
-+    return Base64.encode(pValue);
-   }
-
-   public static void main(String[] args) throws Exception {
diff --git a/source/devel-extra/ws-jaxme/ws-jaxme-0.3.1-nohsqldb.patch 
b/source/devel-extra/ws-jaxme/ws-jaxme-0.3.1-nohsqldb.patch
deleted file mode 100644
index c51a33c..0000000
--- a/source/devel-extra/ws-jaxme/ws-jaxme-0.3.1-nohsqldb.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -ru ws-jaxme-0.3.1/build.xml ws-jaxme-0.3.1-patched/build.xml
---- ws-jaxme-0.3.1/build.xml   2004-09-02 18:41:58.000000000 -0400
-+++ ws-jaxme-0.3.1-patched/build.xml   2005-06-26 22:59:39.000000000 -0400
-@@ -157,9 +157,8 @@
-   <target name="doc" depends="javadoc,docbook.html,forrest,replace"
-       description="Generates the documentation"/>
-
--  <target name="javadoc" depends="init,all"
-+  <target name="javadoc" depends="init"
-       description="Generates the API documentation">
--    <delete dir="${build.apidocs}"/>
-     <mkdir dir="${build.apidocs}"/>
-     <javadoc
-                      access="protected"
-@@ -189,8 +188,8 @@
-         <pathelement location="${src.js}"/>
-         <pathelement location="${src.jm}"/>
-         <pathelement location="${src.pm}"/>
--        <pathelement location="${build.js.src}"/>
--        <pathelement location="${build.jm.src}"/>
-+        <!--pathelement location="${build.js.src}"/>
-+        <pathelement location="${build.jm.src}"/-->
-       </sourcepath>
-     </javadoc>
-   </target>
-@@ -245,6 +244,15 @@
-     <delete dir="${dist}"/>
-   </target>
-
-+  <target name="jar">
-+
-+    <ant antfile="buildapi.xml" target="jar" inheritall="false" 
inheritrefs="false"/>
-+    <ant antfile="buildxs.xml" target="jar" inheritall="false" 
inheritrefs="false"/>
-+    <ant antfile="buildjs.xml" target="jar" inheritall="false" 
inheritrefs="false"/>
-+    <ant antfile="buildjm.xml" target="compile" inheritall="false" 
inheritrefs="false"/>
-+    <ant antfile="buildpm.xml" target="compile" inheritall="false" 
inheritrefs="false"/>
-+  </target>
-+
-   <target name="all">
-     <ant antfile="buildapi.xml" target="all" inheritall="false" 
inheritrefs="false"/>
-     <ant antfile="buildxs.xml" target="all" inheritall="false" 
inheritrefs="false"/>
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to