Exclude submodules from zip downloads (issue 151)

James Moger

2012-10-18 13417cf9c6eec555b51da49742e47939d2f5715b

 src/com/gitblit/build/Build.java

@@ -20,6 +20,7 @@
import java.io.File;

import java.io.FileInputStream;

import java.io.FileWriter;

import java.io.FilenameFilter;

import java.io.IOException;

import java.io.InputStream;

import java.io.RandomAccessFile;

@@ -92,6 +93,7 @@
      downloadFromApache(MavenObject.LUCENE, BuildType.RUNTIME);

      downloadFromApache(MavenObject.LUCENE_HIGHLIGHTER, BuildType.RUNTIME);

      downloadFromApache(MavenObject.LUCENE_MEMORY, BuildType.RUNTIME);

      downloadFromApache(MavenObject.LUCENE_QUERIES, BuildType.RUNTIME);

      downloadFromApache(MavenObject.JAKARTA_REGEXP, BuildType.RUNTIME);

      downloadFromApache(MavenObject.UNBOUND_ID, BuildType.RUNTIME);

      downloadFromApache(MavenObject.IVY, BuildType.RUNTIME);

@@ -126,6 +128,7 @@
      downloadFromApache(MavenObject.LUCENE, BuildType.COMPILETIME);

      downloadFromApache(MavenObject.LUCENE_HIGHLIGHTER, BuildType.COMPILETIME);

      downloadFromApache(MavenObject.LUCENE_MEMORY, BuildType.COMPILETIME);

      downloadFromApache(MavenObject.LUCENE_QUERIES, BuildType.COMPILETIME);

      downloadFromApache(MavenObject.JAKARTA_REGEXP, BuildType.COMPILETIME);

      downloadFromApache(MavenObject.UNBOUND_ID, BuildType.COMPILETIME);

      downloadFromApache(MavenObject.IVY, BuildType.COMPILETIME);

@@ -149,6 +152,7 @@
      downloadFromApache(MavenObject.LUCENE, BuildType.RUNTIME);

      downloadFromApache(MavenObject.LUCENE_HIGHLIGHTER, BuildType.RUNTIME);

      downloadFromApache(MavenObject.LUCENE_MEMORY, BuildType.RUNTIME);

      downloadFromApache(MavenObject.LUCENE_QUERIES, BuildType.RUNTIME);

      downloadFromApache(MavenObject.JAKARTA_REGEXP, BuildType.RUNTIME);



      downloadFromEclipse(MavenObject.JGIT, BuildType.RUNTIME);

@@ -376,6 +380,7 @@
         

         if (targetFile.exists()) {

            downloads.add(targetFile);

            removeObsoleteArtifacts(mo, type, targetFile.getParentFile());

            continue;

         }

         String expectedSHA1 = mo.getSHA1(jar);

@@ -451,8 +456,40 @@
            throw new RuntimeException("Error writing to file " + targetFile, e);

         }

         downloads.add(targetFile);

			
         removeObsoleteArtifacts(mo, type, targetFile.getParentFile());

      }

      return downloads;

   }

	
   private static void removeObsoleteArtifacts(final MavenObject mo, final BuildType type, File folder) {

      File [] removals = folder.listFiles(new FilenameFilter() {

         @Override

         public boolean accept(File dir, String name) {

            String n = name.toLowerCase();

            String dep = mo.artifact.toLowerCase();

            if (n.startsWith(dep)) {

               String suffix = "-" + mo.version;

               if (type.equals(BuildType.COMPILETIME)) {

                  suffix += "-sources.jar";

               } else {

                  suffix += ".jar";

               }

               if (!n.endsWith(suffix)) {

                  return true;

               }

            }

            return false;

         }

      });

		
      // delete any matches

      if (removals != null) {

         for (File file : removals) {

            System.out.println("deleting " + file);

            file.delete();

         }

      }

   }



   private static void updateDownload(float progress, File file) {

@@ -484,14 +521,14 @@
            "c7adc475ca40c288c93054e0f4fe58f3a98c0cb5");



      public static final MavenObject JETTY = new MavenObject("Jetty",

            "org/eclipse/jetty/aggregate", "jetty-webapp", "7.6.5.v20120716", 1000000, 680000,

            2720000, "e6a34a2d79cbb010d56741e53f8ebf6d9eeef135",

            "c2dc95a9c0d0f85c2610cb71aa169c90b25dff83",

            "org/eclipse/jetty/aggregate", "jetty-webapp", "7.6.7.v20120910", 1000000, 680000,

            2720000, "d621fa6419aaa37edbcab8e16a5e6b05c9527e62",

            "b505f7b493c5aa262d371d90754bded8b392ffb0",

            "");



      public static final MavenObject JETTY_AJP = new MavenObject("Jetty-AJP",

            "org/eclipse/jetty", "jetty-ajp", "7.6.5.v20120716", 32000, 22000,

            97000, "74fb9aae97e2d189d1c4071da51101b293034e80", "ebb9a2f2f8960e5565e8a6bda950e0934772507f", "");

            "org/eclipse/jetty", "jetty-ajp", "7.6.7.v20120910", 32000, 22000,

            97000, "578d502bc78ed7aa1c0b6afef4cd59477041ec37", "6cfed9a1354f720fcde12ec15d5e1ae9cf97000c", "");

      

      public static final MavenObject SERVLET = new MavenObject("Servlet 3.0", "javax/servlet",

            "javax.servlet-api", "3.0.1", 84000, 211000, 0,

@@ -539,8 +576,8 @@
            "627b125cc6029d4d5c59c3a910c1bef347384d97",

            "");



      public static final MavenObject JUNIT = new MavenObject("JUnit", "junit", "junit", "4.8.2",

            237000, 0, 0, "c94f54227b08100974c36170dcb53329435fe5ad", "", "");

      public static final MavenObject JUNIT = new MavenObject("JUnit", "junit", "junit", "4.10",

            253000, 141000, 0, "e4f1766ce7404a08f45d859fb9c226fc9e41a861", "6c98d6766e72d5575f96c9479d1c1d3b865c6e25", "");



      public static final MavenObject HAMCREST = new MavenObject("Hamcrest Core", "org/hamcrest", "hamcrest-core", "1.1",

            77000, 0, 0, "860340562250678d1a344907ac75754e259cdb14", null, "");

@@ -620,6 +657,10 @@
            "3.6.1", 30000, 23000, 0, "8c7ca5572edea50973dc0d26cf75c27047eebe7e",

            "2e291e96d25132e002b1c8240e361d1272d113e1", "");



      public static final MavenObject LUCENE_QUERIES = new MavenObject("lucene queries", "org/apache/lucene", "lucene-queries",

            "3.6.1", 47400, 48600, 0, "4ed6022dd4aa80b932a1546e7e39e3b8bbe7acb7",

            "dc425c75d988e4975d314772035a46b6a17dcc8d", "");



      public static final MavenObject JAKARTA_REGEXP = new MavenObject("jakarta regexp", "jakarta-regexp", "jakarta-regexp",

            "1.4", 28500, 0, 0, "0ea514a179ac1dd7e81c7e6594468b9b9910d298",

            null, "");