Changeset 1375

Timestamp:

10/05/10 17:34:25 (3 years ago)

Author:

zach

Message:

Final build script fix

Location:

trunk/html5

Files:

• bin-debug/jwplayer.html5.js (modified) (1 diff)
• build/build.xml (modified) (1 diff)
• test/examples/custom_skin.html (modified) (16 diffs)

trunk/html5/bin-debug/jwplayer.html5.js

@@ -2056 +2056 @@
                 }
                 
-                var _settings = jwplayer.utils.extend({}, _defaults);
+                var _settings = jwplayer.utils.extend({}, _defaults, logoConfig);
                 
                 var _logo = document.createElement("img");

trunk/html5/build/build.xml

@@ -23 +23 @@
                         <param name="outputpath" value="${basedir}/bin-debug/jwplayer.html5.js"/>
                 </antcall>
+                <copy file="${basedir}/bin-debug/jwplayer.html5.js" tofile="${basedir}/jwplayer.html5.min.js" />
         </target>
         
         <target name="build-release" depends="build-debug">
-                <replace file="${basedir}/bin-debug/jwplayer.html5.js" token=", logoConfig);" value=");"/>
+                <replace file="${basedir}/jwplayer.html5.min.js" token=", logoConfig);" value=");"/>
                 <java jar="${basedir}/build/yuicompressor-2.4.2.jar" fork="true">
-                        <arg line="'${basedir}/bin-debug/jwplayer.html5.js'"/>
+                        <arg line="'${basedir}/jwplayer.html5.min.js'"/>
                         <arg line="-o '${basedir}/jwplayer.html5.min.js'"/>
                 </java>

trunk/html5/test/examples/custom_skin.html

@@ -28 +28 @@
                 }],
                 image: "http://content.bitsontherun.com/thumbs/gSzpo2wh-480.jpg",
-                skin: "../../../../skins/beelden/beelden.xml"
+                skin: "../../../skins/beelden/beelden.xml"
             });
         </script>
@@ -46 +46 @@
                 }],
                 image: "http://content.bitsontherun.com/thumbs/gSzpo2wh-480.jpg",
-                skin: "../../../../skins/bekle/bekle.xml"
+                skin: "../../../skins/bekle/bekle.xml"
             });
         </script>
@@ -64 +64 @@
                 }],
                 image: "http://content.bitsontherun.com/thumbs/gSzpo2wh-480.jpg",
-                skin: "../../../../skins/classic/classic.xml"
+                skin: "../../../skins/classic/classic.xml"
             });
         </script>
@@ -82 +82 @@
                 }],
                 image: "http://content.bitsontherun.com/thumbs/gSzpo2wh-480.jpg",
-                skin: "../../../../skins/five/five.xml"
+                skin: "../../../skins/five/five.xml"
             });
         </script>
@@ -100 +100 @@
                 }],
                 image: "http://content.bitsontherun.com/thumbs/gSzpo2wh-480.jpg",
-                skin: "../../../../skins/glow/glow.xml"
+                skin: "../../../skins/glow/glow.xml"
             });
         </script>
@@ -118 +118 @@
                 }],
                 image: "http://content.bitsontherun.com/thumbs/gSzpo2wh-480.jpg",
-                skin: "../../../../skins/grungetape/grungetape.xml"
+                skin: "../../../skins/grungetape/grungetape.xml"
             });
         </script>
@@ -136 +136 @@
                 }],
                 image: "http://content.bitsontherun.com/thumbs/gSzpo2wh-480.jpg",
-                skin: "../../../../skins/icecreamsneaka/icecreamsneaka.xml"
+                skin: "../../../skins/icecreamsneaka/icecreamsneaka.xml"
             });
         </script>
@@ -154 +154 @@
                 }],
                 image: "http://content.bitsontherun.com/thumbs/gSzpo2wh-480.jpg",
-                skin: "../../../../skins/kleur/kleur.xml"
+                skin: "../../../skins/kleur/kleur.xml"
             });
         </script>
@@ -172 +172 @@
                 }],
                 image: "http://content.bitsontherun.com/thumbs/gSzpo2wh-480.jpg",
-                skin: "../../../../skins/lulu/lulu.xml"
+                skin: "../../../skins/lulu/lulu.xml"
             });
         </script>
@@ -190 +190 @@
                 }],
                 image: "http://content.bitsontherun.com/thumbs/gSzpo2wh-480.jpg",
-                skin: "../../../../skins/modieus/modieus.xml"
+                skin: "../../../skins/modieus/modieus.xml"
             });
         </script>
@@ -208 +208 @@
                 }],
                 image: "http://content.bitsontherun.com/thumbs/gSzpo2wh-480.jpg",
-                skin: "../../../../skins/nacht/nacht.xml"
+                skin: "../../../skins/nacht/nacht.xml"
             });
         </script>
@@ -226 +226 @@
                 }],
                 image: "http://content.bitsontherun.com/thumbs/gSzpo2wh-480.jpg",
-                skin: "../../../../skins/playcasso/playcasso.xml"
+                skin: "../../../skins/playcasso/playcasso.xml"
             });
         </script>
@@ -244 +244 @@
                 }],
                 image: "http://content.bitsontherun.com/thumbs/gSzpo2wh-480.jpg",
-                skin: "../../../../skins/schoon/schoon.xml"
+                skin: "../../../skins/schoon/schoon.xml"
             });
         </script>
@@ -262 +262 @@
                 }],
                 image: "http://content.bitsontherun.com/thumbs/gSzpo2wh-480.jpg",
-                skin: "../../../../skins/snel/snel.xml"
+                skin: "../../../skins/snel/snel.xml"
             });
         </script>
@@ -280 +280 @@
                 }],
                 image: "http://content.bitsontherun.com/thumbs/gSzpo2wh-480.jpg",
-                skin: "../../../../skins/stijl/stijl.xml"
+                skin: "../../../skins/stijl/stijl.xml"
             });
         </script>
@@ -298 +298 @@
                 }],
                 image: "http://content.bitsontherun.com/thumbs/gSzpo2wh-480.jpg",
-                skin: "../../../../skins/stormtrooper/stormtrooper.xml"
+                skin: "../../../skins/stormtrooper/stormtrooper.xml"
             });
         </script>