Permalink
Browse files

Fix build file so that the grouping (and all other new modules) is bu…

…ilt correctly.
  • Loading branch information...
1 parent 53a9069 commit aa3bf64a21a1845261bf2fd0040539e9ad0ad796 @ari ari committed Aug 30, 2010
Showing with 60 additions and 85 deletions.
  1. +7 −1 build.properties
  2. +53 −84 build.xml
View
@@ -1,2 +1,8 @@
-# Path for the Google Compiller jar file
+# Path for the Google Compiler jar file. By default in the same directory as this properties file.
GoogleCompiler = compiler.jar
+
+srcdir = js
+distdir = dist
+
+target = jquery.jqGrid.js
+target.min = jquery.jqGrid.min.js
View
137 build.xml
@@ -1,84 +1,53 @@
-<?xml version="1.0"?>
-<project name="jqGrid" default="build" basedir=".">
-
- <!-- define the path of compressor in this file -->
- <property file="build.properties" />
-
- <property description="Source Folder" name="srcdir" value="js" />
- <property description="Folder for jquery, min, lite and packed target" name="distdir" value="./dist" />
-
- <!-- Files names for distribution -->
- <property name="jqGrid" value="jquery.jqGrid.js" />
- <property name="jqGrid.min" value="jquery.jqGrid.min.js" />
-
- <target name="init">
- <mkdir dir="${distdir}" />
- </target>
-
- <target name="jqgrid" depends="init">
- <concat destfile="${distdir}/${jqGrid}">
- <fileset dir="${srcdir}">
- <include name="grid.base.js" />
- <include name="grid.common.js" />
- <include name="grid.formedit.js" />
- <include name="grid.inlinedit.js" />
- <include name="grid.celledit.js" />
- <include name="grid.subgrid.js" />
- <include name="grid.treegrid.js" />
- <include name="grid.custom.js" />
- <include name="grid.postext.js" />
- <include name="grid.tbltogrid.js" />
- <include name="grid.setcolumns.js" />
- <include name="grid.import.js" />
- <include name="jquery.fmatter.js" />
- <include name="grid.jqueryui.js" />
- <include name="jquery.searchFilter.js" />
- <include name="jqDnR.js" />
- <include name="jqModal.js" />
- <include name="JsonXml.js" />
- </fileset>
- </concat>
- </target>
-
- <target name="jqgrid.min" depends="jqgrid">
- <apply executable="java" parallel="false" verbose="true" failonerror="true" dest="${distdir}">
- <fileset dir="${distdir}">
- <include name="${jqGrid}" />
- </fileset>
- <arg line="-jar" />
- <arg path="${GoogleCompiler}" />
- <arg value="--warning_level" />
- <arg value="QUIET" />
- <arg value="--js_output_file" />
- <targetfile />
- <arg value="--js" />
- <mapper type="glob" from="${jqGrid}" to="${jqGrid.min}" />
- </apply>
- <concat destfile="${jqGrid.min}">
- <filelist files="${jqGrid}, ${distdir}"/>
- </concat>
- <concat destfile="${jqGrid.min}" append="yes">
- <filelist files="${distdir}"/>
- </concat>
- <delete file="${distdir}"/>
- <echo message="${jqGrid.min} built." />
- </target>
-
- <target name="i18n">
- <mkdir dir="${distdir}/i18n" />
- <copy todir="${distdir}/i18n" overwrite="true">
- <fileset dir="${srcdir}/i18n">
- <include name="grid.locale-*.js" />
- </fileset>
- </copy>
- </target>
-
- <target name="build" depends="jqgrid, jqgrid.min, i18n"/>
-
- <target name="clean">
- <delete dir="${distdir}" />
- </target>
-
- <target name="all" depends="clean,build"/>
-
-</project>
+<?xml version="1.0"?>
+<project name="jqGrid" default="build" basedir=".">
+
+ <!-- define the path of compressor in this file -->
+ <property file="build.properties" />
+
+ <target name="init">
+ <mkdir dir="${distdir}" />
+ </target>
+
+ <target name="jqgrid" depends="init">
+ <concat destfile="${distdir}/${target}">
+ <fileset dir="${srcdir}">
+ <exclude name="i18n" />
+ </fileset>
+ </concat>
+ </target>
+
+ <target name="jqgrid.min" depends="jqgrid">
+ <apply executable="java" parallel="false" verbose="true" failonerror="true" dest="${distdir}">
+ <fileset dir="${distdir}">
+ <include name="${target}" />
+ </fileset>
+ <arg line="-jar" />
+ <arg path="${GoogleCompiler}" />
+ <arg value="--warning_level" />
+ <arg value="QUIET" />
+ <arg value="--js_output_file" />
+ <targetfile />
+ <arg value="--js" />
+ <mapper type="glob" from="${target}" to="${target.min}" />
+ </apply>
+ <echo message="${target.min} built." />
+ </target>
+
+ <target name="i18n">
+ <mkdir dir="${distdir}/i18n" />
+ <copy todir="${distdir}/i18n" overwrite="true">
+ <fileset dir="${srcdir}/i18n">
+ <include name="grid.locale-*.js" />
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="build" depends="jqgrid, jqgrid.min, i18n"/>
+
+ <target name="clean">
+ <delete dir="${distdir}" />
+ </target>
+
+ <target name="all" depends="clean,build"/>
+
+</project>

0 comments on commit aa3bf64

Please sign in to comment.