ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From k...@apache.org
Subject svn commit: r540950 - in /ant: core/trunk/dist/ core/trunk/dist/lib/ sandbox/antlibs/debian/trunk/src/main/org/apache/ant/debian/ sandbox/antlibs/debian/trunk/src/tests/antunit/
Date Wed, 23 May 2007 13:28:06 GMT
Author: kevj
Date: Wed May 23 06:28:05 2007
New Revision: 540950

URL: http://svn.apache.org/viewvc?view=rev&rev=540950
Log:
-can now install created package, missing md5 & more config

Added:
    ant/core/trunk/dist/
    ant/core/trunk/dist/lib/
Modified:
    ant/sandbox/antlibs/debian/trunk/src/main/org/apache/ant/debian/ControlFile.java
    ant/sandbox/antlibs/debian/trunk/src/main/org/apache/ant/debian/ControlFileTask.java
    ant/sandbox/antlibs/debian/trunk/src/tests/antunit/build-test.xml

Modified: ant/sandbox/antlibs/debian/trunk/src/main/org/apache/ant/debian/ControlFile.java
URL: http://svn.apache.org/viewvc/ant/sandbox/antlibs/debian/trunk/src/main/org/apache/ant/debian/ControlFile.java?view=diff&rev=540950&r1=540949&r2=540950
==============================================================================
--- ant/sandbox/antlibs/debian/trunk/src/main/org/apache/ant/debian/ControlFile.java (original)
+++ ant/sandbox/antlibs/debian/trunk/src/main/org/apache/ant/debian/ControlFile.java Wed May
23 06:28:05 2007
@@ -42,16 +42,12 @@
     private static final String MAINTAINER_HEADER = "Maintainer: ";
     private static final String PROVIDES_HEADER = "Provides: ";
     private static final String DESCRIPTION_HEADER = "Description: ";
-    private static final String DEPENDENCIES_HEADER = "Dependency of: ";
-    private static final String RECOMMENDS_HEADER = "Recommeds: ";
+    private static final String RECOMMENDS_HEADER = "Recommends: ";
     private static final String SUGGESTS_HEADER = "Suggests: ";
     private static final String CONFLICTS_HEADER = "Conflicts: ";
     private static final String REPLACES_HEADER = "Replaces: ";
     private static final String DEPENDS_HEADER = "Depends: ";
     
-
-    private Vector dependencies = new Vector();
-    
     private Vector recommends = new Vector();
 
     private Vector provides = new Vector();
@@ -77,16 +73,14 @@
     private String debEssential;
 
     private String debMaintainer;
+    
+    private String homepage;
 
     private Description description;
 
     /* default */
     public ControlFile() {}
 
-    public void addDependency(Dependency d) {
-        dependencies.add(d);
-    }
-
     public void addRecommends(Recommends r) {
         recommends.add(r);
     }
@@ -166,6 +160,10 @@
     public void setDebMaintainer(String debMaintainer) {
         this.debMaintainer = debMaintainer;
     }
+    
+    public void setHomepage(String homepage) {
+        this.homepage = homepage;
+    }
 
     public void addDescription(Description d) {
         this.description = d;
@@ -185,7 +183,7 @@
         writeVector(suggests, SUGGESTS_HEADER, writer);
         writeVector(conflicts, CONFLICTS_HEADER, writer);
         writeVector(replaces, REPLACES_HEADER, writer);
-        writeVector(dependencies, DEPENDENCIES_HEADER, writer);
+        //writeVector(dependencies, DEPENDENCIES_HEADER, writer);
         
         if(null != description) {
             writer.println(DESCRIPTION_HEADER+description.getDesc());
@@ -196,10 +194,18 @@
             throws IOException {
         
         if (v.size() > 0) {
+            boolean first = true;
             for(Iterator i = v.iterator();i.hasNext();) {
-                w.print(header);
+                if (first) {
+                    w.print(header);
+                }
+                first = false;
                 w.print(((DpkgLine)i.next()).getName());
-                w.print("\n");
+                if(i.hasNext()) {
+                    w.print(",");
+                } else {
+                    w.print("\n");
+                }
             }
         }
     }

Modified: ant/sandbox/antlibs/debian/trunk/src/main/org/apache/ant/debian/ControlFileTask.java
URL: http://svn.apache.org/viewvc/ant/sandbox/antlibs/debian/trunk/src/main/org/apache/ant/debian/ControlFileTask.java?view=diff&rev=540950&r1=540949&r2=540950
==============================================================================
--- ant/sandbox/antlibs/debian/trunk/src/main/org/apache/ant/debian/ControlFileTask.java (original)
+++ ant/sandbox/antlibs/debian/trunk/src/main/org/apache/ant/debian/ControlFileTask.java Wed
May 23 06:28:05 2007
@@ -107,6 +107,10 @@
     public void setMaintainer(String debMaintainer) {
         controlFile.setDebMaintainer(debMaintainer);
     }
+    
+    public void setHomepage(String h) {
+        controlFile.setHomepage(h);
+    }
 
     public void addProvides(ControlFile.Provides provides) {
         controlFile.addProvides(provides);
@@ -114,10 +118,6 @@
 
     public void addDescription(ControlFile.Description description) {
         controlFile.addDescription(description);
-    }
-
-    public void addDependency(ControlFile.Dependency dependency) {
-        controlFile.addDependency(dependency);
     }
     
     public void addRecommends(ControlFile.Recommends recommends) {

Modified: ant/sandbox/antlibs/debian/trunk/src/tests/antunit/build-test.xml
URL: http://svn.apache.org/viewvc/ant/sandbox/antlibs/debian/trunk/src/tests/antunit/build-test.xml?view=diff&rev=540950&r1=540949&r2=540950
==============================================================================
--- ant/sandbox/antlibs/debian/trunk/src/tests/antunit/build-test.xml (original)
+++ ant/sandbox/antlibs/debian/trunk/src/tests/antunit/build-test.xml Wed May 23 06:28:05
2007
@@ -19,34 +19,25 @@
     <au:assertFileDoesntExist file="${controlfile}"/>
   	<deb:control file="${controlfile}" 
   	  package="ant" version="1.7.1alpha" maintainer="kevj@apache.org"
-  	  essential="no" priority="optional" section="Development" architecture="all">
-      <depends>java-gjc-compat | java-virtual-machine</depends>
-      <depends>java-gjc-compat | java1-runtime | java2-runtime</depends>
+  	  essential="no" priority="optional" section="Development" architecture="all"
+  	  homepage="http://ant.apache.org">
+      <depends>java-gcj-compat | java-virtual-machine</depends>
+      <depends>java-gcj-compat | java1-runtime | java2-runtime</depends>
   	  <depends>libxerces2-java</depends>
   	  <recommends>ant-optional</recommends>
   	  <recommends>jikes | java-compiler</recommends>
   	  <suggests>ant-doc</suggests>
-  	  <conflicts>ant-(&lt;1.7.0)</conflicts>
-  	  <conflicts>ant-doc(&lt;1.7.0)</conflicts>
-  	  <replaces>ant-(&lt;1.7.0)</replaces>
-  	  <replaces>ant-doc(&lt;1.7.0)</replaces>
-  	  <dependency>nice</dependency>
-  	  <dependency>libzeroc-ice-java</dependency>
-  	  <dependency>libtomcat5.5-java</dependency>
-  	  <dependency>libtomcat5-java</dependency>
-  	  <dependency>libow-util-ant-tasks-java</dependency>
-  	  <dependency>libaxis-java</dependency>
-  	  <dependency>velocity</dependency>
-  	  <dependency>jde</dependency>
-  	  <dependency>ecj</dependency>
-  	  <dependency>ant-optional</dependency>
-  	  <dependency>ant-doc</dependency>
+  	  <conflicts>ant(&lt;1.6.5-6)</conflicts>
+  	  <conflicts>ant-doc(&lt;1.6.5-6)</conflicts>
+  	  <replaces>ant(&lt;1.6.5-6)</replaces>
+  	  <replaces>ant-doc(&lt;1.6.5-6)</replaces>
   	  <description>Java based build tool like make</description>
   	</deb:control>
     <au:assertFileExists file="${controlfile}"/>
   </target>
 
   <target name="test-build">
+  	<echo message="${ant.src.dir}"/>
     <au:assertFileDoesntExist file="${package}"/>
     <deb:dpkg packageName="${package}" dir="${ant.src.dir}/dist"/>
     <au:assertFileExists file="${package}"/>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message