Changeset 4315

Timestamp:

11/06/09 07:53:57 (3 weeks ago)

Author:

dr2chase

Message:

Output classes are now stored in jar files, hooray

Location:

trunk

Files:

• ProjectFortress/src/com/sun/fortress/compiler/ByteCodeWriter.java (modified) (2 diffs)
• ProjectFortress/src/com/sun/fortress/compiler/NamingCzar.java (modified) (1 diff)
• ProjectFortress/src/com/sun/fortress/compiler/codegen/CodeGen.java (modified) (6 diffs)
• bin/run (modified) (1 diff)

trunk/ProjectFortress/src/com/sun/fortress/compiler/ByteCodeWriter.java

@@ -20 +20 @@
 import com.sun.fortress.repository.ProjectProperties;
 import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.jar.JarOutputStream;
+import java.util.zip.ZipEntry;
 
 public class ByteCodeWriter {
@@ -25 +28 @@
     static Character slash = '/';
 
+    public static void writeJarredClass(JarOutputStream jos, String file, byte[] bytes) {
+        String fileName = file.replace(dot, slash) + ".class";
+        ZipEntry ze = new ZipEntry(fileName);
+        try {
+            jos.putNextEntry(ze);
+            jos.write(bytes);
+            jos.closeEntry();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+   
+    }
+    
     public static void writeClass(String repository, String file, byte[] bytes) {
         String fileName = repository + file.replace(dot, slash) + ".class";

trunk/ProjectFortress/src/com/sun/fortress/compiler/NamingCzar.java

@@ -572 +572 @@
     }
 
-    private static String javaPackageClassForApi(APIName api, String sep) {
+    public static String javaPackageClassForApi(APIName api, String sep) {
         return javaPackageClassForApi(api.getText(), sep);
     }

trunk/ProjectFortress/src/com/sun/fortress/compiler/codegen/CodeGen.java

@@ -17 +17 @@
 package com.sun.fortress.compiler.codegen;
 
+import java.io.BufferedOutputStream;
+import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
+import java.io.IOException;
 import java.io.PrintWriter;
 import java.math.BigInteger;
 import java.util.*;
+import java.util.jar.JarOutputStream;
 
 import org.objectweb.asm.*;
@@ -101 +105 @@
     private final ComponentIndex ci;
     private GlobalEnvironment env;
+    private final JarOutputStream jos;
 
     private static final int NO_SELF = -1;
@@ -130 +135 @@
         this.emittingFunctionalMethodWrappers = c.emittingFunctionalMethodWrappers;
         this.currentTraitObjectDecl = c.currentTraitObjectDecl;
+        this.jos = c.jos;
 
         this.component = c.component;
@@ -143 +149 @@
         component = c;
         packageAndClassName = NamingCzar.javaPackageClassForApi(c.getName());
+        String dotted = NamingCzar.javaPackageClassForApi(c.getName(), ".");
+        try {
+            this.jos = new JarOutputStream(new BufferedOutputStream( new FileOutputStream(NamingCzar.cache + dotted + ".jar")));
+        } catch (FileNotFoundException e) {
+            throw new RuntimeException(e);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
         this.ta = ta;
         this.pa = pa;
@@ -356 +370 @@
             CheckClassAdapter.verify(new ClassReader(cw.toByteArray()), true, pw);
 
-        ByteCodeWriter.writeClass(NamingCzar.cache, file, cw.toByteArray());
+        ByteCodeWriter.writeJarredClass(jos, file, cw.toByteArray());
         debug( "Writing class ", file);
     }
@@ -637 +651 @@
 
         dumpClass( packageAndClassName );
+        
+        try {
+            jos.close();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
     }
 

trunk/bin/run

@@ -29 +29 @@
 fi
 
-CP="$FORTRESS_HOME/default_repository/caches/bytecode_cache${SEP}$FORTRESS_HOME/default_repository/caches/nativewrapper_cache${SEP}$FORTRESS_HOME/ProjectFortress/build${SEP}$FORTRESS_HOME/ProjectFortress/third_party/junit/junit.jar${SEP}$FORTRESS_HOME/ProjectFortress/third_party/asm/asm-all-3.1.jar${SEP}$FORTRESS_HOME/ProjectFortress/third_party/xtc/xtc.jar${SEP}$FORTRESS_HOME/ProjectFortress/third_party/jsr166y/jsr166y.jar${SEP}$FORTRESS_HOME/ProjectFortress/third_party/plt/plt.jar${SEP}$JAVA_HOME/lib/tools.jar${SEP}$FORTRESS_HOME/ProjectFortress/third_party/unsigned/unsigned.jar${SEP}$FORTRESS_HOME/ProjectFortress/third_party/astgen/astgen.jar${SEP}$FORTRESS_HOME/ProjectFortress/third_party/scala/scala-compiler-2.7.5.jar${SEP}$FORTRESS_HOME/ProjectFortress/third_party/scala/scala-library-2.7.5.jar${SEP}$CP"
-
+CP="$FORTRESS_HOME/default_repository/caches/bytecode_cache${SEP}$FORTRESS_HOME/default_repository/caches/bytecode_cache/*${SEP}$FORTRESS_HOME/default_repository/caches/nativewrapper_cache${SEP}$FORTRESS_HOME/ProjectFortress/build${SEP}$FORTRESS_HOME/ProjectFortress/third_party/junit/junit.jar${SEP}$FORTRESS_HOME/ProjectFortress/third_party/asm/asm-all-3.1.jar${SEP}$FORTRESS_HOME/ProjectFortress/third_party/xtc/xtc.jar${SEP}$FORTRESS_HOME/ProjectFortress/third_party/jsr166y/jsr166y.jar${SEP}$FORTRESS_HOME/ProjectFortress/third_party/plt/plt.jar${SEP}$JAVA_HOME/lib/tools.jar${SEP}$FORTRESS_HOME/ProjectFortress/third_party/unsigned/unsigned.jar${SEP}$FORTRESS_HOME/ProjectFortress/third_party/astgen/astgen.jar${SEP}$FORTRESS_HOME/ProjectFortress/third_party/scala/scala-compiler-2.7.5.jar${SEP}$FORTRESS_HOME/ProjectFortress/third_party/scala/scala-library-2.7.5.jar${SEP}$CP"
+# echo $CP
 if [ -z "$JAVA_HOME" ] ; then
   JAVACMD=java