# HG changeset patch
# User Jaroslav Tulach <jaroslav.tulach@apidesign.org>
# Date 1381348954 -7200
# Node ID 5d93ca1561c323d82be5aad067a27f8d5df48d88
# Parent  65dd5a650eab045a409677641ef027fe0695b312
Don't provide resources from rt.jar when generating bck2brwsr.js as the minimal library is not self contained anymore - but we still want as small bck2brwsr.js as possible

diff -r 65dd5a650eab -r 5d93ca1561c3 rt/vm/src/main/java/org/apidesign/vm4brwsr/Bck2Brwsr.java
--- a/rt/vm/src/main/java/org/apidesign/vm4brwsr/Bck2Brwsr.java	Wed Oct 09 17:59:11 2013 +0200
+++ b/rt/vm/src/main/java/org/apidesign/vm4brwsr/Bck2Brwsr.java	Wed Oct 09 22:02:34 2013 +0200
@@ -151,7 +151,7 @@
      * @since 0.5
      */
     public Bck2Brwsr resources(final ClassLoader loader) {
-        return resources(new LdrRsrcs(loader));
+        return resources(new LdrRsrcs(loader, false));
     }
     
     /** Generates virtual machine based on previous configuration of the 
@@ -161,7 +161,7 @@
      * @since 0.5
      */
     public void generate(Appendable out) throws IOException {
-        Resources r = res != null ? res : new LdrRsrcs(Bck2Brwsr.class.getClassLoader());
+        Resources r = res != null ? res : new LdrRsrcs(Bck2Brwsr.class.getClassLoader(), false);
         if (level != ObfuscationLevel.NONE) {
             try {
                 ClosureWrapper.produceTo(out, level, r, classes);
diff -r 65dd5a650eab -r 5d93ca1561c3 rt/vm/src/main/java/org/apidesign/vm4brwsr/LdrRsrcs.java
--- a/rt/vm/src/main/java/org/apidesign/vm4brwsr/LdrRsrcs.java	Wed Oct 09 17:59:11 2013 +0200
+++ b/rt/vm/src/main/java/org/apidesign/vm4brwsr/LdrRsrcs.java	Wed Oct 09 22:02:34 2013 +0200
@@ -28,9 +28,11 @@
  */
 final class LdrRsrcs implements Bck2Brwsr.Resources {
     private final ClassLoader loader;
+    private final boolean skipRtJar;
 
-    LdrRsrcs(ClassLoader loader) {
+    LdrRsrcs(ClassLoader loader, boolean skipRtJar) {
         this.loader = loader;
+        this.skipRtJar = skipRtJar;
     }
 
     @Override
@@ -43,6 +45,9 @@
         if (u == null) {
             throw new IOException("Can't find " + name);
         }
+        if (skipRtJar && u.toExternalForm().contains("rt.jar!")) {
+            return null;
+        }
         return u.openStream();
     }
 }
diff -r 65dd5a650eab -r 5d93ca1561c3 rt/vm/src/main/java/org/apidesign/vm4brwsr/Main.java
--- a/rt/vm/src/main/java/org/apidesign/vm4brwsr/Main.java	Wed Oct 09 17:59:11 2013 +0200
+++ b/rt/vm/src/main/java/org/apidesign/vm4brwsr/Main.java	Wed Oct 09 22:02:34 2013 +0200
@@ -93,7 +93,7 @@
             Bck2Brwsr.newCompiler().
                 obfuscation(obfLevel).
                 addRootClasses(classes.toArray()).
-                resources(Main.class.getClassLoader()).
+                resources(new LdrRsrcs(Main.class.getClassLoader(), true)).
                 generate(w);
         }
     }