added -J option to preserve unmodified files in preexisting jarfile

darcs-hash:20051012214257-5007d-ae8d774d3b63fd3f02199356f09a48d9e1b34ce1.gz

diff --git a/src/org/ibex/tool/Compiler.java b/src/org/ibex/tool/Compiler.java
index c23a501..3b3dddd 100644 (file)
--- a/src/org/ibex/tool/Compiler.java
+++ b/src/org/ibex/tool/Compiler.java
@@ -35,6 +35,7 @@ public class Compiler {
         List srcdir = new ArrayList();
         String source = null, target = null, blddir = null, mainclass = null;
        boolean buildjar = false;
+       boolean keepjar = false;
 
        if (args.length == 0) args = new String[] { "--help" };
         for (int i=0; i < args.length; i++) {
@@ -52,6 +53,8 @@ public class Compiler {
                        if (blddir != null) { System.out.println("cannot specify both -d and -j"); return; }
                         blddir = args[++i];
                         break;
+                    case 'J':
+                       keepjar = true;
                     case 'j':
                         if (i == args.length - 1) {
                             System.out.println("Missing parameter: "+args[i]); return; }
@@ -94,7 +97,7 @@ public class Compiler {
 
         Compiler c = new Compiler();
         if (blddir != null) {
-           if (buildjar) c.setBuildJar(blddir);
+           if (buildjar) c.setBuildJar(blddir, keepjar);
            else          c.setBuildDir(blddir);
        }
         if (source != null) c.setSource(source);
@@ -138,6 +141,7 @@ public class Compiler {
 
     private File builddir = null;
     private boolean buildzip = false;
+    private boolean keepzip = false;
     private ZipOutputStream jarfile = null;
     private String mainclass = null;
 
@@ -163,9 +167,10 @@ public class Compiler {
     }
 
     public void setMainClass(String mainclass) { this.mainclass = mainclass; }
-    public void setBuildJar(String dir) throws IOException {
+    public void setBuildJar(String dir, boolean keepjar) throws IOException {
        builddir = new File(dir == null ? "." : dir);
        buildzip = true;
+        if (keepjar) keepzip = true;
     }
     public void setBuildDir(String dir) throws IOException {
        builddir = new File(dir == null ? "." : dir);
@@ -197,14 +202,24 @@ public class Compiler {
     public void setVeryVerbose(boolean v) { veryverbose = v; }
     public void setWarnings(boolean w) { warnings = w; }
 
+    ZipInputStream keptzip = null;
+
     public boolean compile() throws IOException {
         List s = new ArrayList();
 
        if (buildzip) {
+            if (keepzip) {
+                File f = builddir;
+                if (f.exists()) {
+                    keptzip = new ZipInputStream(new FileInputStream(f));
+                    f.delete();
+                }
+            }
            Manifest m = new Manifest();
            m.getMainAttributes().putValue("Manifest-Version", "1.0");
            if (mainclass != null) m.getMainAttributes().putValue("Main-Class", mainclass);
            jarfile = new JarOutputStream(new BufferedOutputStream(new FileOutputStream(builddir)), m);
+            entries.add("META-INF/MANIFEST.MF");
        }
         for (int i=0; i < sourcedirs.length; i++) {
             File src = new File(sourcedirs[i]);
@@ -240,13 +255,29 @@ public class Compiler {
         if (warnings && !hasErrors) { out.write(w.toString()); out.flush(); }
         warn = null;
        try {
-           if (jarfile != null) jarfile.close();
+           if (jarfile != null) {
+                if (keptzip != null) {
+                    byte[] buf = new byte[1024 * 16];
+                    for(ZipEntry ze = keptzip.getNextEntry(); ze != null; ze = keptzip.getNextEntry()) {
+                        if (entries.contains(ze.getName())) continue;
+                        message("   preserving: " + ze.getName());
+                        jarfile.putNextEntry(ze);
+                        while(true) {
+                            int numread = keptzip.read(buf, 0, buf.length);
+                            if (numread == -1) break;
+                            jarfile.write(buf, 0, numread);
+                        }
+                    }
+                }
+                jarfile.close();
+            }
        } catch (Exception e) {
            e.printStackTrace();
        }
        if (verbose) System.out.print(clearing + "   \r");
         return hasErrors;
     }
+    List entries = new ArrayList();
 
     private final FilenameFilter filterSrcs = new FilenameFilter() {
         public boolean accept(File dir, String name) { return name.endsWith(".java"); }
@@ -486,15 +517,13 @@ public class Compiler {
                        pct = "(" + pct + "%) ";
                        */
                        String printme = " writing: " + pct + str(pack(name),'.') + "." + new String(name(name));
-                       if (clearing.length() < printme.length()) clearing = "";
-                       else clearing = clearing.substring(printme.length());
-                       System.out.print(printme + clearing + "\r");
-                       for(clearing = ""; clearing.length() < printme.length() + 5; clearing += " ");
+                        message(printme);
                    }
                    if (buildzip) {
                        try {
                            jarfile.putNextEntry(new ZipEntry(str(pack(name), '/') + "/" + new String(name(name)) + ".class"));
                            jarfile.write(c[i].getBytes());
+                            entries.add(str(pack(name), '/') + "/" + new String(name(name)) + ".class");
                        } catch (java.util.zip.ZipException ze) {
                            // HACK: horrendous hack
                            if (ze.getMessage().indexOf("duplicate entry") != -1) {
@@ -521,8 +550,15 @@ public class Compiler {
         }
     };
 
+    public static void message(String printme) {
+        if (clearing.length() < printme.length()) clearing = "";
+        else clearing = clearing.substring(printme.length());
+        System.out.print(printme + clearing + "\r");
+        for(clearing = ""; clearing.length() < printme.length() + 5; clearing += " ");
+    }
+
     int percent = 0;
-    String clearing = "";
+    static String clearing = "";
 
     /** Problem creater for compiler. */
     private final IProblemFactory problems = new DefaultProblemFactory();