--- a/sbin/build/client.xml	Fri Apr 27 19:18:21 2012 +0200
+++ b/sbin/build/client.xml	Thu May 03 17:52:52 2012 +0200
@@ -13,41 +13,16 @@
     </taskdef>
     <delete dir="${basedir}/../../build" />
     <mkdir  dir="${basedir}/../../build" />
+    
     <target name="makeall" depends="concatenate" />
-    <target name="make_templates" description="Concatenate the html templates together">
-        <for param="file">
-            <path>
-                <fileset dir="../../src/templates" includes="*.html" />
-            </path>
-            <sequential>
-
-                <basename property="filename" file="@{file}"/>
-                <basename property="filehead" file="@{file}" suffix=".html"/>
-                <echo file="../../build/compiled_templates.js" append="yes"
-                message="${line.separator}IriSP.${filehead}_template = &quot;" />
-                <concat append="yes" destfile="../../build/compiled_templates.js">
-                    <filelist dir="../../src/templates" files="${filename}"></filelist>
-                    <filterchain>
-                        <striplinebreaks/>
-                    </filterchain>
-                </concat>
-                <echo file="../../build/compiled_templates.js" append="yes" message="&quot;;" />
-                <var name="filename" unset="true" />
-                <var name="filehead" unset="true" />
-            </sequential>
-        </for>
-    </target>
-    <target name="concatenate" description="Build the developer release file" depends="make_templates">
+    
+    <target name="concatenate" description="Build the developer release file">
         <concat encoding="UTF-8" outputencoding="UTF-8" destfile="../../build/LdtPlayer-core.js">
             <filelist dir="../../src/js/" files="header.js" />
-            <filelist dir="../../src/js/libs"
-            files="lab.js"/>
             <!-- required file before everything else -->
-            <filelist dir="../../src/js" files="main.js" />
-            <!-- templates -->
-            <filelist dir="../../build" files="compiled_templates.js" />
+            <filelist dir="../../src/js/libs" files="LAB.min.js" />
             <!-- core files -->
-            <filelist dir="../../src/js" files="utils.js pop.js model.js defaults.js widgets.js modules.js layout.js init.js i18n.js" />
+            <filelist dir="../../src/js" files="init.js utils.js pop.js model.js defaults.js widgets.js" />
             <!-- players -->
             <fileset dir="../../src/js/players" casesensitive="yes">
                 <include name="**/*.js"/>
@@ -62,6 +37,7 @@
         </concat>
         <delete file="../../build/compiled_templates.js" />
     </target>
+    
     <target name="minify" depends="concatenate">
         <jscomp compilationLevel="simple" warning="quiet" debug="false"
         output="../../build/LdtPlayer.min.raw.js">
@@ -71,7 +47,7 @@
                 <file name="js/swfobject.js" />
             </externs>
             <sources dir="${basedir}/../../build">
-                <file name="LdtPlayer-release.js" />
+                <file name="LdtPlayer-core.js" />
             </sources>
         </jscomp>
         <concat destfile="../../build/LdtPlayer.min.js"
@@ -87,7 +63,7 @@
     <target name="jslint" description="Run jslint on the files" depends="concatenate">
         <apply executable="java" parallel="false">
             <filelist dir="../../build">
-                <file name="LdtPlayer-release.js"/>
+                <file name="LdtPlayer-core.js"/>
             </filelist>
             <arg line="-jar"/>
             <arg path="${rhino.jar}"/>