repo
string | commit
string | message
string | diff
string |
|---|---|---|---|
yui/builder
|
057e455b1030e842143acc853ef1181a0ff1aba2
|
Added sub dir walking to assets/skins dir to support more than one skin
|
diff --git a/componentbuild/3.x/module.xml b/componentbuild/3.x/module.xml
index 79551a6..73e2f75 100644
--- a/componentbuild/3.x/module.xml
+++ b/componentbuild/3.x/module.xml
@@ -1,132 +1,170 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiModuleTargets">
<dirname property="module.basedir" file="${ant.file.YuiModuleTargets}"/>
<import file="${module.basedir}/../shared/targets.xml" description="Targets common to Rollup/Module" />
<target name="build" depends="buildcore, -rollupjs, buildskins, buildlangs" />
<target name="buildskins" depends="-buildskins, -rollupcss" />
<target name="buildlangs" depends="-buildlangs, -rolluplangs" />
<!-- CORE -->
<target name="buildcore" depends="builddebug, -createcore, -loggerregex" description="Create component.js">
<fixcrlf srcdir="${component.builddir}" includes="${component.basefilename}.js" eol="${buildfiles.eol}" />
</target>
<target name="-createcore">
<copy file="${component.builddir}/${component.basefilename}-debug.js" tofile="${component.builddir}/${component.basefilename}.js" />
</target>
<target name="-loggerregex" description="Replace logger statements" unless="component.logger.regex.skip">
<echo level="info">Replacing Logger Statements in ${component.builddir}/${component.basefilename}.js</echo>
<replaceregexp file="${component.builddir}/${component.basefilename}.js"
byline="${component.logger.regex.byline}"
match="${component.logger.regex}"
replace="${component.logger.regex.replace}"
flags="${component.logger.regex.flags}" />
</target>
<!-- DEBUG -->
<target name="builddebug" depends="-concatdebug, -registerdebug, -prependdebug, -appenddebug" description="Create component-debug.js">
<fixcrlf srcdir="${component.builddir}" includes="${component.basefilename}-debug.js" eol="${buildfiles.eol}" />
</target>
<target name="-concatdebug">
<concatsource destfile="${component.builddir}/${component.basefilename}-debug.js" sourcedir="${component.jsfiles.base}" sourcefiles="${component.jsfiles}" />
</target>
<target name="-registerdebug" unless="register.skip">
<addmodule module="${component.module}" file="${component.builddir}/${component.basefilename}-debug.js" details="${component.details.hash}" />
</target>
<target name="-rollupjs" if="rollup">
<if>
<isset property="rollup.sub"/>
<then>
<echo level="info">Module: Build a rollup of a rollup; moving rollup.sub properties into rollup properties.</echo>
<var name="rollup.builddir" unset="true"/>
<var name="rollup.component" unset="true"/>
<var name="rollup.component.basefilename" unset="true"/>
<propertycopy name="rollup.builddir" from="rollup.sub.builddir"/>
<propertycopy name="rollup.component" from="rollup.sub.component"/>
<propertycopy name="rollup.component.basefilename" from="rollup.sub.component.basefilename"/>
</then>
</if>
<echo level="info">Module: Rolling up ${component.basefilename}-debug.js into ${rollup.component.basefilename}-debug.js</echo>
<concat destfile="${rollup.builddir}/${rollup.component.basefilename}.js" append="true" fixlastline="true">
<filelist dir="${component.builddir}" files="${component.basefilename}.js" />
</concat>
<concat destfile="${rollup.builddir}/${rollup.component.basefilename}-debug.js" append="true" fixlastline="true">
<filelist dir="${component.builddir}" files="${component.basefilename}-debug.js" />
</concat>
</target>
<!-- SKINS -->
<target name="-buildskins" depends="-concatskins" description="Create skin rollup in local component build directory" if="component.skins.exist">
- <fixcrlf srcdir="${component.builddir}/assets/skins/sam" includes="${component}.css" eol="${buildfiles.eol}" />
+ <for param="skin.dir">
+ <path>
+ <dirset dir="${component.assets.base}/skins/" includes="*"/>
+ </path>
+ <sequential>
+ <local name="skin.name"/>
+ <basename property="skin.name" file="@{skin.dir}"/>
+ <echo level="info">Fixing CRLF for Skin files for @{skin.dir} :: ${skin.name}</echo>
+ <fixcrlf srcdir="${component.builddir}/assets/skins/${skin.name}" includes="${component}.css" eol="${buildfiles.eol}" />
+ </sequential>
+ </for>
+ <!--fixcrlf srcdir="${component.builddir}/assets/skins/sam" includes="${component}.css" eol="${buildfiles.eol}" /-->
</target>
<target name="-buildlangs" description="Create language packs in the local component build directory" if="component.langs.exist">
<mkdir dir="${component.builddir}/lang" />
<for list="${component.lang}" param="lang" trim="true">
<sequential>
<addlang dir="${component.lang.base}" module="${component}" lang="@{lang}" dest="${component.builddir}/lang" />
</sequential>
</for>
<addlang dir="${component.lang.base}" module="${component}" lang="" dest="${component.builddir}/lang/" />
</target>
<target name="-rolluplangs" if="rolluplangs">
<for list="${component.lang}" param="lang" trim="true">
<sequential>
<concat destfile="${rollup.builddir}/lang/${rollup.component}_@{lang}.js" append="true" fixlastline="true">
<fileset dir="${component.builddir}/lang" includes="*_@{lang}.js" />
</concat>
</sequential>
</for>
<concat destfile="${rollup.builddir}/lang/${rollup.component}.js" append="true" fixlastline="true">
<filelist dir="${component.builddir}/lang" files="${component}.js" />
</concat>
</target>
<target name="-concatskins" if="component.skins.exist">
- <concatsource destfile="${component.builddir}/assets/skins/sam/${component}.css" sourcedir="${component.assets.base}" sourcefiles="${component}-core.css, skins/sam/${component}-skin.css" />
- <yuicompress type="css" src="${component.builddir}/assets/skins/sam/${component}.css" dest="${component.builddir}/assets/skins/sam/${component}.css" args="${yuicompressor.css.args.internal}" />
+ <echo level="info">Concating Skins</echo>
+ <for param="skin.dir">
+ <path>
+ <dirset dir="${component.assets.base}/skins/" includes="*"/>
+ </path>
+ <sequential>
+ <local name="skin.name"/>
+ <basename property="skin.name" file="@{skin.dir}"/>
+ <echo level="info">Concating Skin files for @{skin.dir} :: ${skin.name}</echo>
+ <concatsource destfile="${component.builddir}/assets/skins/${skin.name}/${component}.css" sourcedir="${component.assets.base}" sourcefiles="${component}-core.css, skins/${skin.name}/${component}-skin.css" />
+ <yuicompress type="css" src="${component.builddir}/assets/skins/${skin.name}/${component}.css" dest="${component.builddir}/assets/skins/${skin.name}/${component}.css" args="${yuicompressor.css.args.internal}" />
+ </sequential>
+ </for>
+
+ <!--concatsource destfile="${component.builddir}/assets/skins/sam/${component}.css" sourcedir="${component.assets.base}" sourcefiles="${component}-core.css, skins/sam/${component}-skin.css" />
+ <yuicompress type="css" src="${component.builddir}/assets/skins/sam/${component}.css" dest="${component.builddir}/assets/skins/sam/${component}.css" args="${yuicompressor.css.args.internal}" /-->
</target>
<target name="-rollupcss" if="rollupskins">
<echo level="info">Rolling up ${component}.css into ${rollup.component}.css</echo>
- <concat destfile="${rollup.builddir}/assets/skins/sam/${rollup.component}.css" append="true" fixlastline="true">
+ <for param="skin.dir">
+ <path>
+ <dirset dir="${component.assets.base}/skins/" includes="*"/>
+ </path>
+ <sequential>
+ <local name="skin.name"/>
+ <basename property="skin.name" file="@{skin.dir}"/>
+ <echo level="info">Concating Skin files for @{skin.dir} :: ${skin.name}</echo>
+ <concat destfile="${rollup.builddir}/assets/skins/${skin.name}/${rollup.component}.css" append="true" fixlastline="true">
+ <filelist dir="${component.builddir}/assets/skins/${skin.name}" files="${component}.css" />
+ </concat>
+ </sequential>
+ </for>
+ <!--concat destfile="${rollup.builddir}/assets/skins/sam/${rollup.component}.css" append="true" fixlastline="true">
<filelist dir="${component.builddir}/assets/skins/sam" files="${component}.css" />
- </concat>
+ </concat-->
</target>
<!-- Tests -->
<target name="tests" depends="-lint-server">
<echo level="info">Generating test module for ${component}</echo>
<echo level="info"> Test module: ${tests.component}</echo>
<echo level="info"> Test module source directory: ${tests.srcdir}</echo>
<echo level="info"> Test module source files: ${tests.jsfiles}</echo>
<echo level="info"> Test module output directory: ${tests.builddir}</echo>
<echo level="info"> Test module file: ${tests.builddir}/${tests.component}.js</echo>
<echo level="info"> </echo>
<available file="${tests.srcdir}" type="dir" property="tests.srcdir.exists"/>
<var name="buildfile" value="${tests.builddir}/${tests.component}.js"/>
<arrayliteral from="tests.requires" to="tests.details.requires" key="requires"/>
<concatsource destfile="${buildfile}" sourcedir="${tests.srcdir}" sourcefiles="${tests.jsfiles}"/>
<addmodule file="${buildfile}" module="${tests.component}" details="{${tests.details.requires}}"/>
<jslint>
<jsfiles>
<fileset file="${buildfile}"/>
</jsfiles>
</jslint>
<echo level="info">Test module ${tests.component} created</echo>
</target>
</project>
diff --git a/componentbuild/shared/targets.xml b/componentbuild/shared/targets.xml
index b4533de..b37a0af 100644
--- a/componentbuild/shared/targets.xml
+++ b/componentbuild/shared/targets.xml
@@ -1,192 +1,202 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiSharedTargets">
<echo level="info">Starting Build For ${component}</echo>
<echo level="info">Ant Properties</echo>
<echo level="info"> Home : ${ant.home}</echo>
<echo level="info"> Ant Version : ${ant.version}</echo>
<echo level="info"> Build File : ${ant.file}</echo>
<echo level="info">Local Build Properties</echo>
<echo level="info"> version : ${yui.version}</echo>
<echo level="info"> srcdir : ${srcdir}</echo>
<echo level="info"> builddir : ${builddir}</echo>
<echo level="info"> component : ${component}</echo>
<echo level="info"> component.basefilename : ${component.basefilename}</echo>
<echo level="info"> component.basedir : ${component.basedir}</echo>
<echo level="info"> component.builddir : ${component.builddir}</echo>
<echo level="info">Global Build Properties</echo>
<echo level="info"> global.build.base : ${global.build.base}</echo>
<echo level="info"> global.build.component : ${global.build.component}</echo>
<echo level="info"> global.build.component.assets : ${global.build.component.assets}</echo>
<dirname property="targets.basedir" file="${ant.file.YuiSharedTargets}"/>
<import file="${targets.basedir}/macrolib.xml" description="Macrodef definitions - jslint, yuicompessor, registerversion" />
<target name="all" depends="local, deploy" description="Build and Deploy to Global Build Directory" />
<target name="local" depends="clean, init, build, minify, lint" description="Build and Deploy to Local Build Directory" />
<target name="init">
<tstamp/>
<mkdir dir="${component.builddir}" />
<createdetails />
<antcall target="-lint-server"/>
</target>
<target name="-lint-server" description="Start JSLint Server" unless="lint.skip">
<antcall target="-node">
<param name="src" value="${builddir}/lib/jslint/jslint-node.js"/>
</antcall>
</target>
<target name="-node" description="Start NodeJS Server" unless="node.spawn">
<if>
<not>
<http url="${node.jslint.url}"/>
</not>
<then>
<!-- You can't set failifexecutionfails if spawn is true. Argh. -->
<!-- Check if it's installed first. -->
<exec resultproperty="node.status" executable="node" failonerror="false" failifexecutionfails="false" searchpath="true" resolveexecutable="true">
<arg value="-v"/>
</exec>
<if>
<equals arg1="${node.status}" arg2="0"/>
<then>
<echo level="info">Spawning Node.js app at: ${src}</echo>
<exec executable="node" spawn="true" failonerror="false" searchpath="true" resolveexecutable="true">
<arg value="${src}"/>
</exec>
</then>
<else>
<echo level="info">For faster builds, install Node.js.</echo>
</else>
</if>
<!-- Don't fail if node doesn't exist, fails to start, etc.
We will fallback to the slow Rhino engine later. -->
</then>
</if>
<!-- Don't try to start again. -->
<property name="node.spawn" value="true"/>
</target>
<target name="clean" description="Clean Local Build Directory" unless="clean.skip">
<delete dir="${component.builddir}" />
</target>
<target name="build" />
<!-- MIN -->
<target name="minify" description="Create component-min.js from component.js">
<yuicompress src="${component.builddir}/${component.basefilename}.js" dest="${component.builddir}/${component.basefilename}-min.js" args="${yuicompressor.js.args.internal}" />
<if>
<available file="${component.builddir}/lang" type="dir" />
<then>
<for param="file">
<path>
<fileset dir="${component.builddir}/lang" includes="*.js"/>
</path>
<sequential>
<yuicompress src="@{file}" dest="@{file}" args="${yuicompressor.js.args.internal}" />
</sequential>
</for>
</then>
</if>
</target>
<target name="lint" description="Run jslint over the local build files (default settings)" unless="lint.skip">
<jslint>
<jsfiles>
<fileset dir="${component.builddir}" includes="*.js" />
</jsfiles>
</jslint>
</target>
<!-- DEPLOY -->
<target name="deploy" description="Copy files to global location" depends="deploybuild, deployassets, deployskins, deploylang, deploydocs"></target>
<target name="deploybuild" description="Copy built files to global build location">
<copy todir="${global.build.component}" overwrite="true" verbose="true">
<fileset dir="${component.builddir}" includes="*.js" />
</copy>
</target>
<target name="deployassets" if="component.assets.exist">
<copy todir="${global.build.component.assets}" flatten="${component.assets.flatten}" overwrite="true" verbose="true">
<fileset dir="${component.assets.base}" includes="${component.assets.files}" excludes="skins/, legacy/" />
</copy>
<copy todir="${global.build.component.assets}" flatten="${component.assets.legacy.flatten}" preservelastmodified="true" failonerror="false" verbose="true">
<fileset dir="${component.assets.legacy.base}" includes="${component.assets.legacy.files}" excludes="skins/" />
</copy>
</target>
<target name="deployskins" if="skins.exist">
- <copy todir="${global.build.component.assets}/skins/sam" overwrite="true" verbose="true">
- <fileset dir="${component.builddir}/assets/skins/sam" includes="${component}.css" />
- </copy>
-
- <copy todir="${global.build.component.assets}/skins/sam" overwrite="true" verbose="true">
- <fileset dir="${component.assets.skins.base}/sam" includes="${component.assets.skins.files}" />
- </copy>
+ <for param="skin.dir">
+ <path>
+ <dirset dir="${component.assets.base}/skins/" includes="*"/>
+ </path>
+ <sequential>
+ <local name="skin.name"/>
+ <basename property="skin.name" file="@{skin.dir}"/>
+ <echo level="info">Deploying Skin files for @{skin.dir} :: ${skin.name}</echo>
+ <copy todir="${global.build.component.assets}/skins/${skin.name}" overwrite="true" verbose="true">
+ <fileset dir="${component.builddir}/assets/skins/${skin.name}" includes="${component}.css" />
+ </copy>
+
+ <copy todir="${global.build.component.assets}/skins/${skin.name}" overwrite="true" verbose="true">
+ <fileset dir="${component.assets.skins.base}/${skin.name}" includes="${component.assets.skins.files}" />
+ </copy>
+ </sequential>
+ </for>
</target>
<target name="deploylang" description="Copy language bundles to global build location">
<copy todir="${global.build.component}/lang" overwrite="true" failonerror="false" verbose="true">
<fileset dir="${component.builddir}/lang" includes="*.js" />
</copy>
</target>
<target name="deploydocs" description="Copy doc files to global doc locations">
<!-- TODO -->
</target>
<target name="-prepend" if="component.prependfiles">
<concat destfile="${workingdir}/${component.basefilename}.js.tmp" fixlastline="true">
<filelist dir="${component.basedir}" files="${component.prependfiles}" />
<filterchain>
<tokenfilter>
<filetokenizer/>
<replaceregex
pattern="${component.logger.regex}"
replace="${component.logger.regex.replace}"
flags="${component.logger.regex.flags}" />
</tokenfilter>
</filterchain>
</concat>
<concat destfile="${workingdir}/${component.basefilename}.js.tmp" fixlastline="true" append="true">
<filelist dir="${component.builddir}" files="${component.basefilename}.js" />
</concat>
<move file="${workingdir}/${component.basefilename}.js.tmp" tofile="${component.builddir}/${component.basefilename}.js" />
</target>
<target name="-append" if="component.appendfiles">
<concat destfile="${component.builddir}/${component.basefilename}.js" fixlastline="true" append="true">
<filelist dir="${component.basedir}" files="${component.appendfiles}" />
<filterchain>
<tokenfilter>
<filetokenizer/>
<replaceregex
pattern="${component.logger.regex}"
replace="${component.logger.regex.replace}"
flags="${component.logger.regex.flags}" />
</tokenfilter>
</filterchain>
</concat>
</target>
<target name="-prependdebug" if="component.prependfiles">
<concat destfile="${workingdir}/${component.basefilename}-debug.js.tmp" fixlastline="true" >
<filelist dir="${component.basedir}" files="${component.prependfiles}" />
<filelist dir="${component.builddir}" files="${component.basefilename}-debug.js" />
</concat>
<move file="${workingdir}/${component.basefilename}-debug.js.tmp" tofile="${component.builddir}/${component.basefilename}-debug.js" />
</target>
<target name="-appenddebug" if="component.appendfiles">
<concat destfile="${component.builddir}/${component.basefilename}-debug.js" fixlastline="true" append="true">
<filelist dir="${component.basedir}" files="${component.appendfiles}" />
</concat>
</target>
</project>
|
yui/builder
|
3c2a7bb00f1f5402ad90f254446a73230a9bd700
|
Adding 'tests' target for modules and rollups.
|
diff --git a/componentbuild/3.x/module.xml b/componentbuild/3.x/module.xml
index e0ba31b..79551a6 100644
--- a/componentbuild/3.x/module.xml
+++ b/componentbuild/3.x/module.xml
@@ -1,108 +1,132 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiModuleTargets">
<dirname property="module.basedir" file="${ant.file.YuiModuleTargets}"/>
<import file="${module.basedir}/../shared/targets.xml" description="Targets common to Rollup/Module" />
<target name="build" depends="buildcore, -rollupjs, buildskins, buildlangs" />
<target name="buildskins" depends="-buildskins, -rollupcss" />
<target name="buildlangs" depends="-buildlangs, -rolluplangs" />
<!-- CORE -->
<target name="buildcore" depends="builddebug, -createcore, -loggerregex" description="Create component.js">
<fixcrlf srcdir="${component.builddir}" includes="${component.basefilename}.js" eol="${buildfiles.eol}" />
</target>
<target name="-createcore">
<copy file="${component.builddir}/${component.basefilename}-debug.js" tofile="${component.builddir}/${component.basefilename}.js" />
</target>
<target name="-loggerregex" description="Replace logger statements" unless="component.logger.regex.skip">
<echo level="info">Replacing Logger Statements in ${component.builddir}/${component.basefilename}.js</echo>
<replaceregexp file="${component.builddir}/${component.basefilename}.js"
byline="${component.logger.regex.byline}"
match="${component.logger.regex}"
replace="${component.logger.regex.replace}"
flags="${component.logger.regex.flags}" />
</target>
<!-- DEBUG -->
<target name="builddebug" depends="-concatdebug, -registerdebug, -prependdebug, -appenddebug" description="Create component-debug.js">
<fixcrlf srcdir="${component.builddir}" includes="${component.basefilename}-debug.js" eol="${buildfiles.eol}" />
</target>
<target name="-concatdebug">
<concatsource destfile="${component.builddir}/${component.basefilename}-debug.js" sourcedir="${component.jsfiles.base}" sourcefiles="${component.jsfiles}" />
</target>
<target name="-registerdebug" unless="register.skip">
<addmodule module="${component.module}" file="${component.builddir}/${component.basefilename}-debug.js" details="${component.details.hash}" />
</target>
<target name="-rollupjs" if="rollup">
<if>
<isset property="rollup.sub"/>
<then>
<echo level="info">Module: Build a rollup of a rollup; moving rollup.sub properties into rollup properties.</echo>
<var name="rollup.builddir" unset="true"/>
<var name="rollup.component" unset="true"/>
<var name="rollup.component.basefilename" unset="true"/>
<propertycopy name="rollup.builddir" from="rollup.sub.builddir"/>
<propertycopy name="rollup.component" from="rollup.sub.component"/>
<propertycopy name="rollup.component.basefilename" from="rollup.sub.component.basefilename"/>
</then>
</if>
<echo level="info">Module: Rolling up ${component.basefilename}-debug.js into ${rollup.component.basefilename}-debug.js</echo>
<concat destfile="${rollup.builddir}/${rollup.component.basefilename}.js" append="true" fixlastline="true">
<filelist dir="${component.builddir}" files="${component.basefilename}.js" />
</concat>
<concat destfile="${rollup.builddir}/${rollup.component.basefilename}-debug.js" append="true" fixlastline="true">
<filelist dir="${component.builddir}" files="${component.basefilename}-debug.js" />
</concat>
</target>
<!-- SKINS -->
<target name="-buildskins" depends="-concatskins" description="Create skin rollup in local component build directory" if="component.skins.exist">
<fixcrlf srcdir="${component.builddir}/assets/skins/sam" includes="${component}.css" eol="${buildfiles.eol}" />
</target>
<target name="-buildlangs" description="Create language packs in the local component build directory" if="component.langs.exist">
<mkdir dir="${component.builddir}/lang" />
<for list="${component.lang}" param="lang" trim="true">
<sequential>
<addlang dir="${component.lang.base}" module="${component}" lang="@{lang}" dest="${component.builddir}/lang" />
</sequential>
</for>
<addlang dir="${component.lang.base}" module="${component}" lang="" dest="${component.builddir}/lang/" />
</target>
<target name="-rolluplangs" if="rolluplangs">
<for list="${component.lang}" param="lang" trim="true">
<sequential>
<concat destfile="${rollup.builddir}/lang/${rollup.component}_@{lang}.js" append="true" fixlastline="true">
<fileset dir="${component.builddir}/lang" includes="*_@{lang}.js" />
</concat>
</sequential>
</for>
<concat destfile="${rollup.builddir}/lang/${rollup.component}.js" append="true" fixlastline="true">
<filelist dir="${component.builddir}/lang" files="${component}.js" />
</concat>
</target>
<target name="-concatskins" if="component.skins.exist">
<concatsource destfile="${component.builddir}/assets/skins/sam/${component}.css" sourcedir="${component.assets.base}" sourcefiles="${component}-core.css, skins/sam/${component}-skin.css" />
<yuicompress type="css" src="${component.builddir}/assets/skins/sam/${component}.css" dest="${component.builddir}/assets/skins/sam/${component}.css" args="${yuicompressor.css.args.internal}" />
</target>
<target name="-rollupcss" if="rollupskins">
<echo level="info">Rolling up ${component}.css into ${rollup.component}.css</echo>
<concat destfile="${rollup.builddir}/assets/skins/sam/${rollup.component}.css" append="true" fixlastline="true">
<filelist dir="${component.builddir}/assets/skins/sam" files="${component}.css" />
</concat>
</target>
+ <!-- Tests -->
+ <target name="tests" depends="-lint-server">
+ <echo level="info">Generating test module for ${component}</echo>
+ <echo level="info"> Test module: ${tests.component}</echo>
+ <echo level="info"> Test module source directory: ${tests.srcdir}</echo>
+ <echo level="info"> Test module source files: ${tests.jsfiles}</echo>
+ <echo level="info"> Test module output directory: ${tests.builddir}</echo>
+ <echo level="info"> Test module file: ${tests.builddir}/${tests.component}.js</echo>
+ <echo level="info"> </echo>
+
+ <available file="${tests.srcdir}" type="dir" property="tests.srcdir.exists"/>
+ <var name="buildfile" value="${tests.builddir}/${tests.component}.js"/>
+ <arrayliteral from="tests.requires" to="tests.details.requires" key="requires"/>
+ <concatsource destfile="${buildfile}" sourcedir="${tests.srcdir}" sourcefiles="${tests.jsfiles}"/>
+ <addmodule file="${buildfile}" module="${tests.component}" details="{${tests.details.requires}}"/>
+
+ <jslint>
+ <jsfiles>
+ <fileset file="${buildfile}"/>
+ </jsfiles>
+ </jslint>
+
+ <echo level="info">Test module ${tests.component} created</echo>
+ </target>
</project>
diff --git a/componentbuild/3.x/rollup.xml b/componentbuild/3.x/rollup.xml
index 20aa9ca..1559fca 100644
--- a/componentbuild/3.x/rollup.xml
+++ b/componentbuild/3.x/rollup.xml
@@ -1,80 +1,105 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiRollupTargets">
<dirname property="rolluptargets.basedir" file="${ant.file.YuiRollupTargets}"/>
<import file="${rolluptargets.basedir}/../shared/targets.xml" description="Targets common to Rollup/Module" />
<target name="build" depends="buildmodules" description="Create component.js"></target>
<target name="buildmodules" depends="-buildmodules, -registerall, -prependall, -appendall, -rollupjs, -rolluplangs">
<fixcrlf srcdir="${component.builddir}" eol="${buildfiles.eol}" />
</target>
<target name="-buildmodules">
<!-- Since Ant 1.8, properties defined in subant tasks can never, ever be set again.
In order for datatype's rollups of rollups to work, we must use new property
names for the nested rollup task. module.xml then renames rollup.sub to rollup. -->
<if>
<isset property="rollup"/>
<then>
<fail if="rollup.sub">You're trying to build a rollup of a rollup of a rollup. Are you sure that's what you want?</fail>
<echo level="info">Rollup of rollup detected; setting rollup.sub properties.</echo>
<subant target="${component.rollup.target}" inheritall="false" >
<filelist dir="${buildfile.dir}" files="${component.rollup.modules.buildfiles}" />
<property name="rollup.sub" value="true" />
<property name="rollup.sub.builddir" value="${component.builddir}" />
<property name="rollup.sub.component" value="${component}" />
<property name="rollup.sub.component.basefilename" value="${component.basefilename}" />
</subant>
</then>
<else>
<subant target="${component.rollup.target}" inheritall="false" >
<filelist dir="${buildfile.dir}" files="${component.rollup.modules.buildfiles}" />
<property name="rollup" value="true" />
<property name="rollup.builddir" value="${component.builddir}" />
<property name="rollup.component" value="${component}" />
<property name="rollup.component.basefilename" value="${component.basefilename}" />
</subant>
</else>
</if>
</target>
<target name="-rollupjs" if="rollup">
<echo level="info">Rollup: Rolling up ${component.basefilename}-debug.js into ${rollup.component.basefilename}-debug.js</echo>
<concat destfile="${rollup.builddir}/${rollup.component.basefilename}.js" append="true" fixlastline="true" >
<filelist dir="${component.builddir}" files="${component.basefilename}.js" />
</concat>
<concat destfile="${rollup.builddir}/${rollup.component.basefilename}-debug.js" append="true" fixlastline="true">
<filelist dir="${component.builddir}" files="${component.basefilename}-debug.js" />
</concat>
</target>
<target name="-rolluplangs" if="rolluplangs">
<for list="${component.rollup.lang}" param="lang" trim="true">
<sequential>
<concat destfile="${rollup.builddir}/lang/${rollup.component}_@{lang}.js" append="true" fixlastline="true">
<fileset dir="${component.builddir}/lang" includes="*_@{lang}.js" />
</concat>
</sequential>
</for>
<concat destfile="${rollup.builddir}/lang/${rollup.component}.js" append="true" fixlastline="true">
<filelist dir="${component.builddir}/lang" files="${component}.js" />
</concat>
</target>
<target name="-prependall" depends="-prependdebug, -prepend" if="component.prependfiles" />
<target name="-appendall" depends="-appenddebug, -append" if="component.appendfiles" />
<target name="-registerall" unless="register.skip">
<addrollup module="${component.module}" file="${component.builddir}/${component.basefilename}-debug.js" details="${component.details.hash}" />
<addrollup module="${component.module}" file="${component.builddir}/${component.basefilename}.js" details="${component.details.hash}" />
<if>
<available file="${component.builddir}/lang/" type="dir" />
<then>
<addlangrollup module="${component.module}" dir="${component.builddir}/lang/" />
</then>
</if>
</target>
+
+ <target name="tests">
+ <subant target="tests" inheritall="false" >
+ <filelist dir="${buildfile.dir}" files="${component.rollup.modules.buildfiles}" />
+ <property name="rollup" value="true" />
+ <property name="rollup.component" value="${tests.component}" />
+ </subant>
+
+ <arrayliteral from="tests.rollup.modules" to="tests.details.use" key="use"/>
+ <propertyregex property="tests.rollup.module.files"
+ override="true"
+ input="${tests.rollup.modules}"
+ casesensitive="false"
+ regexp="([^\,\s]+)"
+ replace="\1.js"
+ />
+
+ <concat destfile="${tests.builddir}/${tests.component}.js" append="true" fixlastline="true">
+ <filelist dir="${tests.builddir}" files="${tests.rollup.module.files}"/>
+ </concat>
+
+ <addrollup module="${tests.component}" file="${tests.builddir}/${tests.component}.js" details="{${tests.details.use}}" />
+
+ <echo level="info">Rollup test module ${tests.component} created</echo>
+ </target>
</project>
diff --git a/componentbuild/shared/properties.xml b/componentbuild/shared/properties.xml
index cb40391..d678a21 100644
--- a/componentbuild/shared/properties.xml
+++ b/componentbuild/shared/properties.xml
@@ -1,165 +1,185 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiSharedProperties">
<!-- ANT contrib library for loops, if/else support, with property fix for FOR task -->
<taskdef resource="antcontrib.properties">
<classpath>
<pathelement location="${builddir}/lib/ant-contrib/ant-contrib-1.0b3-modified.jar" />
</classpath>
</taskdef>
<dirname property="buildfile.dir" file="${ant.file}" />
<!--
builddir : The path to the builder/componentbuild directory from the component build file
srcdir : The path to top of the project source directory (e.g. yui2) from the component build file
-->
<property name="builddir" location="../../../builder/componentbuild" />
<property name="srcdir" location="../.." />
<!-- buildfiles.eol : End of line char to use for built files -->
<property name="buildfiles.eol" value="lf"/>
<!-- Supporting Tools -->
<property name="rhino.jar" location="${builddir}/lib/rhino/js.jar" />
<property name="jslintconsole.js" location="${builddir}/lib/jslint/jslint-console.js" />
<property name="jslintsrc.js" location="${builddir}/lib/jslint/fulljslint.js" />
<property name="yuicompressor.jar" location="${builddir}/lib/yuicompressor/ant-yuicompressor-2.4.5pre2.jar" />
<property name="yrb2jsonconsole.js" location="${builddir}/lib/yrb2json/yrb2json-console.js" />
<property name="yrb2jsonsrc.js" location="${builddir}/lib/yrb2json/yrb2json.js" />
<!-- YUI Compressor arguments for JS and CSS files -->
<property name="yuicompressor.js.charset" value="utf-8" />
<property name="yuicompressor.css.charset" value="utf-8" />
<property name="yuicompressor.js.args" value="--disable-optimizations --preserve-semi --line-break 6000" />
<property name="yuicompressor.css.args" value="--line-break 6000" />
<!-- Enable/Disable YUI Compressor verbosity. NOTE: Checked in build files should not disable this flag -->
<property name="yuicompressor.js.verbose" value="true" />
<property name="yuicompressor.css.verbose" value="true" />
<condition property="yuicompressor.js.args.internal" value="-v --charset ${yuicompressor.js.charset} ${yuicompressor.js.args}" else="--charset ${yuicompressor.js.charset} ${yuicompressor.js.args}">
<istrue value="${yuicompressor.js.verbose}" />
</condition>
<condition property="yuicompressor.css.args.internal" value="-v --charset ${yuicompressor.css.charset} ${yuicompressor.css.args}" else="--charset ${yuicompressor.css.charset} ${yuicompressor.css.args}">
<istrue value="${yuicompressor.css.verbose}" />
</condition>
<!-- Top Level Build Directories (e.g. yui2/build, yui3/build)-->
<property name="global.build.base" location="${srcdir}/build" />
<property name="global.build.component" location="${global.build.base}/${component}" />
<property name="global.build.component.assets" location="${global.build.component}/assets" />
<!-- Component Properties -->
<property name="component.module" value="${component}" />
<property name="component.basedir" location="${buildfile.dir}" />
<property name="component.jsfiles.base" location="${component.basedir}/js" />
<property name="component.cssfiles.base" location="${component.basedir}/css" />
<property name="component.lang.base" location="${component.basedir}/lang" />
<property name="component.assets.flatten" value="true" />
<property name="component.assets.base" location="${component.basedir}/assets" />
<property name="component.assets.files" value="**/*" />
<property name="component.assets.legacy.flatten" value="true" />
<property name="component.assets.legacy.base" location="${component.assets.base}/legacy" />
<property name="component.assets.legacy.files" value="**/*" />
<property name="component.assets.skins.base" location="${component.assets.base}/skins" />
<property name="component.assets.skins.files" value="**/*" />
<condition property="component.skins.exist">
<and>
<available file="${component.assets.base}/${component}-core.css" type="file" />
<available file="${component.assets.base}/skins" type="dir" />
</and>
</condition>
<!-- component is part of a rollup build, so rollup skins to parent -->
<condition property="rollupskins">
<and>
<istrue value="${rollup}" />
<istrue value="${component.skins.exist}" />
</and>
</condition>
<available file="${component.assets.base}" type="dir" property="component.assets.exist"/>
<condition property="component.langs.exist">
<and>
<or>
<isset property="component.lang" />
<isset property="component.rollup.lang" />
</or>
</and>
</condition>
<condition property="rolluplangs">
<and>
<istrue value="${rollup}" />
<istrue value="${component.langs.exist}" />
</and>
</condition>
+ <!-- component test module properties -->
+ <property name="testsdir" value="./tests"/>
+ <property name="tests.srcdir" value="${testsdir}/src"/>
+ <property name="tests.builddir" value="${testsdir}"/>
+ <property name="tests.component" value="${component}-tests"/>
+ <property name="tests.jsfiles" value="${component}.js"/>
+ <property name="tests.requires" value="${component}, test"/>
+ <if>
+ <istrue value="${component.rollup}"/>
+ <then>
+ <propertyregex property="tests.rollup.modules"
+ override="true"
+ input="${component.use}"
+ casesensitive="false"
+ regexp="([^\,\s]+)"
+ replace="\1-tests"
+ />
+ </then>
+ </if>
+
<!--
DEPRECATED: component.basefilename and component.releasetype are deprecated
We used to mark filenames with suffixes (-beta, -experimental), which we no longer do
-->
<condition property="component.basefilename" value="${component}" else="${component}">
<isset property="component.releasetype"/>
</condition>
<!-- Default logger regex values if not provided -->
<property name="component.logger.regex" value="^.*?(?:logger|YAHOO.log).*?(?:;|\).*;|(?:\r?\n.*?)*?\).*;).*;?.*?\r?\n" />
<property name="component.logger.regex.replace" value="" />
<property name="component.logger.regex.flags" value="mg" />
<property name="component.logger.regex.byline" value="false" />
<!-- Rollup support, currently only used for YUI 3 -->
<property name="component.rollup" value="false"/>
<property name="component.rollup.target" value="all"/>
<condition property="component.builddir" value="${component.basedir}/build_rollup_tmp" else="${component.basedir}/build_tmp">
<istrue value="${component.rollup}"/>
</condition>
<condition property="rollup.skins.exist">
<and>
<istrue value="${component.rollup}" />
<available file="${component.assets.base}/skins" type="dir" />
</and>
</condition>
<condition property="skins.exist">
<or>
<istrue value="${rollup.skins.exist}" />
<istrue value="${component.skins.exist}" />
</or>
</condition>
<!-- The temporary working directory used by the build process -->
<property name="workingdir" location="${component.builddir}/ant" />
<!-- Directory for language resource bundles in JSON format derived from YRB format -->
<property name="component.langbuilddir" value="${component.basedir}/build_lang_tmp" />
<!-- The file which defines the default targets for the particular type of component (module, rollup, css) -->
<condition property="targetbase" value="rollup" else="module">
<istrue value="${component.rollup}"/>
</condition>
<condition property="targets" value="../shared/cssmodule.xml" else="${targetbase}.xml">
<isset property="component.cssfiles" />
</condition>
<property name="lint.failonerror" value="false"/>
<property name="node.jslint.url" value="http://127.0.0.1:8081/"/>
<property name="yuicompressor.url" value="http://127.0.0.1:${yuicompressor.port}/compress"/>
</project>
|
yui/builder
|
5046355733a36d384236859a934153adb7bbf3e9
|
Don't fail the build for JSLint errors.
|
diff --git a/componentbuild/shared/properties.xml b/componentbuild/shared/properties.xml
index 5597633..cb40391 100644
--- a/componentbuild/shared/properties.xml
+++ b/componentbuild/shared/properties.xml
@@ -1,167 +1,165 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiSharedProperties">
<!-- ANT contrib library for loops, if/else support, with property fix for FOR task -->
<taskdef resource="antcontrib.properties">
<classpath>
<pathelement location="${builddir}/lib/ant-contrib/ant-contrib-1.0b3-modified.jar" />
</classpath>
</taskdef>
<dirname property="buildfile.dir" file="${ant.file}" />
<!--
builddir : The path to the builder/componentbuild directory from the component build file
srcdir : The path to top of the project source directory (e.g. yui2) from the component build file
-->
<property name="builddir" location="../../../builder/componentbuild" />
<property name="srcdir" location="../.." />
<!-- buildfiles.eol : End of line char to use for built files -->
<property name="buildfiles.eol" value="lf"/>
<!-- Supporting Tools -->
<property name="rhino.jar" location="${builddir}/lib/rhino/js.jar" />
<property name="jslintconsole.js" location="${builddir}/lib/jslint/jslint-console.js" />
<property name="jslintsrc.js" location="${builddir}/lib/jslint/fulljslint.js" />
<property name="yuicompressor.jar" location="${builddir}/lib/yuicompressor/ant-yuicompressor-2.4.5pre2.jar" />
<property name="yrb2jsonconsole.js" location="${builddir}/lib/yrb2json/yrb2json-console.js" />
<property name="yrb2jsonsrc.js" location="${builddir}/lib/yrb2json/yrb2json.js" />
<!-- YUI Compressor arguments for JS and CSS files -->
<property name="yuicompressor.js.charset" value="utf-8" />
<property name="yuicompressor.css.charset" value="utf-8" />
<property name="yuicompressor.js.args" value="--disable-optimizations --preserve-semi --line-break 6000" />
<property name="yuicompressor.css.args" value="--line-break 6000" />
<!-- Enable/Disable YUI Compressor verbosity. NOTE: Checked in build files should not disable this flag -->
<property name="yuicompressor.js.verbose" value="true" />
<property name="yuicompressor.css.verbose" value="true" />
<condition property="yuicompressor.js.args.internal" value="-v --charset ${yuicompressor.js.charset} ${yuicompressor.js.args}" else="--charset ${yuicompressor.js.charset} ${yuicompressor.js.args}">
<istrue value="${yuicompressor.js.verbose}" />
</condition>
<condition property="yuicompressor.css.args.internal" value="-v --charset ${yuicompressor.css.charset} ${yuicompressor.css.args}" else="--charset ${yuicompressor.css.charset} ${yuicompressor.css.args}">
<istrue value="${yuicompressor.css.verbose}" />
</condition>
<!-- Top Level Build Directories (e.g. yui2/build, yui3/build)-->
<property name="global.build.base" location="${srcdir}/build" />
<property name="global.build.component" location="${global.build.base}/${component}" />
<property name="global.build.component.assets" location="${global.build.component}/assets" />
<!-- Component Properties -->
<property name="component.module" value="${component}" />
<property name="component.basedir" location="${buildfile.dir}" />
<property name="component.jsfiles.base" location="${component.basedir}/js" />
<property name="component.cssfiles.base" location="${component.basedir}/css" />
<property name="component.lang.base" location="${component.basedir}/lang" />
<property name="component.assets.flatten" value="true" />
<property name="component.assets.base" location="${component.basedir}/assets" />
<property name="component.assets.files" value="**/*" />
<property name="component.assets.legacy.flatten" value="true" />
<property name="component.assets.legacy.base" location="${component.assets.base}/legacy" />
<property name="component.assets.legacy.files" value="**/*" />
<property name="component.assets.skins.base" location="${component.assets.base}/skins" />
<property name="component.assets.skins.files" value="**/*" />
<condition property="component.skins.exist">
<and>
<available file="${component.assets.base}/${component}-core.css" type="file" />
<available file="${component.assets.base}/skins" type="dir" />
</and>
</condition>
<!-- component is part of a rollup build, so rollup skins to parent -->
<condition property="rollupskins">
<and>
<istrue value="${rollup}" />
<istrue value="${component.skins.exist}" />
</and>
</condition>
<available file="${component.assets.base}" type="dir" property="component.assets.exist"/>
<condition property="component.langs.exist">
<and>
<or>
<isset property="component.lang" />
<isset property="component.rollup.lang" />
</or>
</and>
</condition>
<condition property="rolluplangs">
<and>
<istrue value="${rollup}" />
<istrue value="${component.langs.exist}" />
</and>
</condition>
<!--
DEPRECATED: component.basefilename and component.releasetype are deprecated
We used to mark filenames with suffixes (-beta, -experimental), which we no longer do
-->
<condition property="component.basefilename" value="${component}" else="${component}">
<isset property="component.releasetype"/>
</condition>
<!-- Default logger regex values if not provided -->
<property name="component.logger.regex" value="^.*?(?:logger|YAHOO.log).*?(?:;|\).*;|(?:\r?\n.*?)*?\).*;).*;?.*?\r?\n" />
<property name="component.logger.regex.replace" value="" />
<property name="component.logger.regex.flags" value="mg" />
<property name="component.logger.regex.byline" value="false" />
<!-- Rollup support, currently only used for YUI 3 -->
<property name="component.rollup" value="false"/>
<property name="component.rollup.target" value="all"/>
<condition property="component.builddir" value="${component.basedir}/build_rollup_tmp" else="${component.basedir}/build_tmp">
<istrue value="${component.rollup}"/>
</condition>
<condition property="rollup.skins.exist">
<and>
<istrue value="${component.rollup}" />
<available file="${component.assets.base}/skins" type="dir" />
</and>
</condition>
<condition property="skins.exist">
<or>
<istrue value="${rollup.skins.exist}" />
<istrue value="${component.skins.exist}" />
</or>
</condition>
<!-- The temporary working directory used by the build process -->
<property name="workingdir" location="${component.builddir}/ant" />
<!-- Directory for language resource bundles in JSON format derived from YRB format -->
<property name="component.langbuilddir" value="${component.basedir}/build_lang_tmp" />
<!-- The file which defines the default targets for the particular type of component (module, rollup, css) -->
<condition property="targetbase" value="rollup" else="module">
<istrue value="${component.rollup}"/>
</condition>
<condition property="targets" value="../shared/cssmodule.xml" else="${targetbase}.xml">
<isset property="component.cssfiles" />
</condition>
- <!-- By default, jslint failure should fail the build.
- This can be overridden on the command line. -->
- <property name="lint.failonerror" value="true"/>
+ <property name="lint.failonerror" value="false"/>
<property name="node.jslint.url" value="http://127.0.0.1:8081/"/>
<property name="yuicompressor.url" value="http://127.0.0.1:${yuicompressor.port}/compress"/>
</project>
|
yui/builder
|
d1d67b67c919eb82add198dc6bf05dbbbc1f5ab0
|
Only define Compressor tasks if yuicompressor.jar is set.
|
diff --git a/componentbuild/shared/macrolib.xml b/componentbuild/shared/macrolib.xml
index 46d821c..b7f6721 100644
--- a/componentbuild/shared/macrolib.xml
+++ b/componentbuild/shared/macrolib.xml
@@ -1,376 +1,384 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiMacroLib">
<macrodef name="arrayliteral">
<attribute name="from" />
<attribute name="to" />
<attribute name="key" />
<sequential>
<if>
<and>
<isset property="@{from}" />
<length string="${@{from}}" when="ne" length="0" />
</and>
<then>
<propertyregex property="array"
override="true"
input="${@{from}}"
casesensitive="false"
regexp="([^\,\s]+)"
replace="'\1'"
/>
<property name="@{to}" value="@{key}:[${array}]" />
</then>
</if>
</sequential>
</macrodef>
<macrodef name="createdetails">
<sequential>
<arrayliteral from="component.use" to="component.details.use" key="use" />
<arrayliteral from="component.supersedes" to="component.details.supersedes" key="supersedes" />
<arrayliteral from="component.requires" to="component.details.requires" key="requires" />
<arrayliteral from="component.optional" to="component.details.optional" key="optional" />
<arrayliteral from="component.after" to="component.details.after" key="after" />
<arrayliteral from="component.lang" to="component.details.lang" key="lang" />
<if>
<isset property="component.skinnable" />
<then>
<property name="component.details.skinnable" value="skinnable:${component.skinnable}" />
</then>
</if>
<propertyselector property="details.list"
delimiter=","
match="component\.details.([^\.]*)"
select="\1"
casesensitive="false" />
<var name="details" value="" />
<if>
<isset property="details.list" />
<then>
<for list="${details.list}" param="val">
<sequential>
<var name="details" value="${component.details.@{val}}, ${details}" />
</sequential>
</for>
<propertyregex property="component.details.hash"
input="{${details}}"
regexp="(\,\s*?\})"
replace="}"
casesensitive="false" />
</then>
<else>
<property name="component.details.hash" value="" />
</else>
</if>
</sequential>
</macrodef>
- <taskdef name="yuicompressor"
- classname="com.yahoo.platform.yui.compressor.CompressorTask"
- classpath="${yuicompressor.jar}"/>
-
- <!-- Maps the legacy yuicompress task into a yuicompressor task. -->
- <macrodef name="yuicompress">
- <attribute name="src" />
- <attribute name="dest" />
- <attribute name="args" />
- <!-- Unused. Type is detected automatically from the @{src} filename. -->
- <attribute name="type" default="?"/>
- <!-- If you had to override this, use the type option in args instead. -->
- <sequential>
- <yuicompressor input="@{src}" output="@{dest}" options="@{args}"/>
- </sequential>
- </macrodef>
+ <if>
+ <!-- The yui2 builder-integration script embeds macrolib.xml
+ by itself for other macros, which leaves yuicompressor.jar
+ unset. If that's the case, don't define the compressor tasks. -->
+ <isset property="yuicompressor.jar"/>
+ <then>
+ <taskdef name="yuicompressor"
+ classname="com.yahoo.platform.yui.compressor.CompressorTask"
+ classpath="${yuicompressor.jar}"/>
+
+ <!-- Maps the legacy yuicompress task into a yuicompressor task. -->
+ <macrodef name="yuicompress">
+ <attribute name="src" />
+ <attribute name="dest" />
+ <attribute name="args" />
+ <!-- Unused. Type is detected automatically from the @{src} filename. -->
+ <attribute name="type" default="?"/>
+ <!-- If you had to override this, use the type option in args instead. -->
+ <sequential>
+ <yuicompressor input="@{src}" output="@{dest}" options="@{args}"/>
+ </sequential>
+ </macrodef>
+ </then>
+ </if>
<macrodef name="concatsource">
<attribute name="destfile" />
<attribute name="sourcedir" />
<attribute name="sourcefiles" />
<attribute name="workingdir" default="${workingdir}" />
<element name="filters" optional="true" description="Additonal filters to apply to individual files"/>
<sequential>
<echo level="info">Concatenating</echo>
<echo level="info"> Source Files : @{sourcefiles}</echo>
<echo level="info"> In Source Dir : @{sourcedir}</echo>
<echo level="info"> To : @{destfile}</echo>
<delete dir="@{workingdir}" quiet="true"/>
<copy todir="@{workingdir}">
<filelist dir="@{sourcedir}" files="@{sourcefiles}" />
<filterchain>
<filters />
<fixcrlf fixlast="true" eof="remove"/>
</filterchain>
</copy>
<concat destfile="@{destfile}" fixlastline="true">
<filelist dir="@{workingdir}" files="@{sourcefiles}" />
</concat>
<delete dir="${workingdir}" quiet="true" />
</sequential>
</macrodef>
<macrodef name="jslint">
<element name="jsfiles" optional="false" />
<sequential>
<pathconvert pathsep="' '" property="jsfileargs">
<jsfiles />
</pathconvert>
<if>
<or>
<istrue value="${node.online}"/>
<http url="${node.jslint.url}"/>
</or>
<then>
<property name="node.online" value="true"/>
<post to="${node.jslint.url}" property="node.jslint.response" failonerror="${lint.failonerror}">
<prop name="files" value="${jsfileargs}"/>
<prop name="failonerror" value="${lint.failonerror}"/>
</post>
<!-- Since Ant doesn't really failonerror for the post task,
handle this ourselves: -->
<if>
<not>
<isset property="node.jslint.response"/>
</not>
<then>
<fail>JSLint failed. To view lint output and continue the build, run ant with -Dlint.failonerror=false.</fail>
</then>
</if>
<!-- Clear property for next run: -->
<var name="node.jslint.response" unset="true"/>
</then>
<else>
<echo>Using Rhino. Install nodejs to improve jslint speed, or skip with -Dlint.skip=true</echo>
<!--
Need to find a way to convert fileset to args (script?) to
avoid ' ', which will break for files with ' in them
Evaluates to the following java execution line...
java -r js.jar jslintconsole.js 'file1.js' 'file2.js' 'file3.js'
-->
<java jar="${rhino.jar}" fork="true" failonerror="${jslint.failonerror}">
<arg file="${jslintconsole.js}" />
<arg value="${jslintsrc.js}" />
<arg line="'${jsfileargs}'" />
</java>
</else>
</if>
</sequential>
</macrodef>
<macrodef name="registerversion">
<attribute name="module" />
<attribute name="classname" />
<attribute name="file" />
<sequential>
<loadfile srcfile="${builddir}/files/versioncode.txt" property="@{module}-@{classname}-version" >
<filterchain>
<replacetokens>
<token key="MODULE" value="@{module}"/>
<token key="CLASSNAME" value="@{classname}"/>
</replacetokens>
</filterchain>
</loadfile>
<echo level="info">Adding Version Registration Code to @{file}</echo>
<concat destfile="@{file}" append="true" fixlastline="true">${@{module}-@{classname}-version}</concat>
</sequential>
</macrodef>
<macrodef name="addlang">
<attribute name="dir" />
<attribute name="module" />
<attribute name="dest" />
<attribute name="lang" default="" />
<attribute name="details" default = ""/>
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}@{lang}_details" value="" />
</then>
<else>
<property name="@{module}@{lang}_details" value=",@{details}" />
</else>
</if>
<if>
<equals arg1="@{lang}" arg2="" />
<then>
<property name="@{module}@{lang}_fullname" value="@{module}" />
</then>
<else>
<property name="@{module}@{lang}_fullname" value="@{module}_@{lang}" />
</else>
</if>
<if>
<available file="@{dir}/${@{module}@{lang}_fullname}.pres" />
<then>
<mkdir dir="${component.langbuilddir}" />
<java jar="${rhino.jar}" fork="true" failonerror="true">
<jvmarg value="-Dfile.encoding=utf-8" />
<arg file="${yrb2jsonconsole.js}" />
<arg file="${yrb2jsonsrc.js}" />
<arg file="@{dir}/${@{module}@{lang}_fullname}.pres" />
<arg file="${component.langbuilddir}/${@{module}@{lang}_fullname}.js" />
</java>
<echo level="info">Wrapping ${component.langbuilddir}/${@{module}@{lang}_fullname}.js in YUI.add, Y.Intl.add</echo>
<loadfile srcfile="${component.langbuilddir}/${@{module}@{lang}_fullname}.js" property="@{module}@{lang}-strs-loaded" encoding="utf-8" />
</then>
<else>
<echo level="info">Wrapping @{dir}/${@{module}@{lang}_fullname}.js in YUI.add, Y.Intl.add</echo>
<loadfile srcfile="@{dir}/${@{module}@{lang}_fullname}.js" property="@{module}@{lang}-strs-loaded" encoding="utf-8" />
</else>
</if>
<copy file="${builddir}/files/langtemplate.txt" tofile="@{dest}/${@{module}@{lang}_fullname}.js" overwrite="true" outputencoding="utf-8">
<filterset>
<filter token="LANG" value="@{lang}" />
<filter token="LANG_MODULE" value="lang/${@{module}@{lang}_fullname}" />
<filter token="STRINGS" value="${@{module}@{lang}-strs-loaded}" />
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}" />
<filter token="LANG_DETAILS" value="${@{module}@{lang}_details}" />
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addmodule">
<attribute name="file" />
<attribute name="module" />
<attribute name="details" default="" />
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}-details" value="" />
</then>
<else>
<property name="@{module}-details" value=",@{details}" />
</else>
</if>
<loadfile srcfile="@{file}" property="@{module}-@{file}-code" />
<echo level="info">Wrapping @{file} in YUI.add module</echo>
<copy file="${builddir}/files/moduletemplate.txt" tofile="@{file}" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{file}-code}" />
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}" />
<filter token="DETAILS" value="${@{module}-details}" />
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addrollup">
<attribute name="file" />
<attribute name="module" />
<attribute name="details" default="" />
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}-details" value="" />
</then>
<else>
<property name="@{module}-details" value=",@{details}" />
</else>
</if>
<loadfile srcfile="@{file}" property="@{module}-@{file}-code" />
<echo level="info">Adding Rollup @{file} using YUI.add</echo>
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{file}" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{file}-code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}"/>
<filter token="DETAILS" value="${@{module}-details}"/>
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addlangrollup">
<attribute name="module" />
<attribute name="dir" />
<sequential>
<echo level="info">Registering rollup info for lang files in @{dir} using YUI.add</echo>
<for list="${component.rollup.lang}" param="lang" trim="true">
<sequential>
<loadfile srcfile="@{dir}/@{module}_@{lang}.js" property="@{module}-@{lang}-code" />
<var name="lang.use" value="{use:[" />
<for list="${component.lang.use}" param="submod" trim="true">
<sequential>
<var name="lang.use" value="${lang.use}'lang/@{submod}_@{lang}'," />
</sequential>
</for>
<var name="lang.use" value="${lang.use}]}" />
<propertyregex property="@{module}-@{lang}-details"
input="${lang.use}"
regexp="(\,\s*?\])"
replace="]"
casesensitive="false" />
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{dir}/@{module}_@{lang}.js" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{lang}-code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="lang/@{module}_@{lang}"/>
<filter token="DETAILS" value=", ${@{module}-@{lang}-details}"/>
</filterset>
</copy>
</sequential>
</for>
<loadfile srcfile="@{dir}/@{module}.js" property="@{module}--code" />
<var name="lang.use" value="{use:[" />
<for list="${component.lang.use}" param="submod" trim="true">
<sequential>
<var name="lang.use" value="${lang.use}'lang/@{submod}'," />
</sequential>
</for>
<var name="lang.use" value="${lang.use}]}" />
<propertyregex property="@{module}--details"
input="${lang.use}"
regexp="(\,\s*?\])"
replace="]"
casesensitive="false" />
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{dir}/@{module}.js" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}--code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="lang/@{module}"/>
<filter token="DETAILS" value=", ${@{module}--details}"/>
</filterset>
</copy>
</sequential>
</macrodef>
</project>
|
yui/builder
|
3cef0e692223beb44370caf1b074950f3aaa53c6
|
'self' predef
|
diff --git a/componentbuild/lib/jslint/jslint-console.js b/componentbuild/lib/jslint/jslint-console.js
index 7081817..ff1700a 100644
--- a/componentbuild/lib/jslint/jslint-console.js
+++ b/componentbuild/lib/jslint/jslint-console.js
@@ -1,71 +1,72 @@
/**
* Javascript Shell Script to Load and JSLint js files through Rhino Javascript Shell
* The jslint source file is expected as the first argument, followed by the list of JS files to JSLint
*
* e.g.
* java -j js.jar /tools/fulljslint.js testFile1.js testFile2.js testFile3.js
**/
var jslintsrc = arguments.splice(0,1);
var scripts = arguments;
load(jslintsrc);
(function(){ // Just to keep stuff seperate from JSLINT code
var OPTS = {
browser : true,
//laxLineEnd : true,
undef: true,
newcap: false,
- predef:["YUI", "window", "YUI_config", "YAHOO", "YAHOO_config", "opera", "exports", "document", "navigator", "console"]
+ predef:["YUI", "window", "YUI_config", "YAHOO", "YAHOO_config",
+ "opera", "exports", "document", "navigator", "console", "self"]
};
function test(jsFile) {
print("Running JSLint on : " + jsFile);
var js = readFile(jsFile);
var success = JSLINT(js, OPTS);
if (success) {
print("- OK");
} else {
print(" \n");
for (var i=0; i < JSLINT.errors.length; ++i) {
var e = JSLINT.errors[i];
if (e) {
print("\t" + e.line + ", " + e.character + ": " + e.reason + "\n\t" + clean(e.evidence) + "\n");
}
}
print(" \n");
// Last item is null if JSLint hit a fatal error
if (JSLINT.errors && JSLINT.errors[JSLINT.errors.length-1] === null) {
throw new Error("Fatal JSLint Exception. Stopped lint");
}
}
}
function clean(str) {
var trimmed = "";
if (str) {
if(str.length <= 500) {
trimmed = str.replace(/^\s*(\S*(\s+\S+)*)\s*$/, "$1");
} else {
trimmed = "[Code Evidence Omitted: Greater than 500 chars]";
}
}
return trimmed;
}
function jslint(aScripts) {
for (var i = 0; i < aScripts.length; ++i) {
test(aScripts[i]);
}
};
jslint(scripts);
})();
|
yui/builder
|
7b04dffaa5ccc9c9e4486d9c2be81480bc462e2c
|
Require Java 1.5 in YUI Compressor JAR for real.
|
diff --git a/componentbuild/lib/yuicompressor/ant-yuicompressor-2.4.5pre2.jar b/componentbuild/lib/yuicompressor/ant-yuicompressor-2.4.5pre2.jar
index bfc2a06..38c211a 100644
Binary files a/componentbuild/lib/yuicompressor/ant-yuicompressor-2.4.5pre2.jar and b/componentbuild/lib/yuicompressor/ant-yuicompressor-2.4.5pre2.jar differ
|
yui/builder
|
8723763f2be24498bca967f9783466a9ed2537e8
|
Require Java 1.5 or later in YUI Compressor JAR.
|
diff --git a/componentbuild/lib/yuicompressor/ant-yuicompressor-2.4.5pre2.jar b/componentbuild/lib/yuicompressor/ant-yuicompressor-2.4.5pre2.jar
index db0114d..bfc2a06 100644
Binary files a/componentbuild/lib/yuicompressor/ant-yuicompressor-2.4.5pre2.jar and b/componentbuild/lib/yuicompressor/ant-yuicompressor-2.4.5pre2.jar differ
|
yui/builder
|
d6b3363f311ff3d26649c4f39d23f25874247186
|
Upgrade YUI Compressor. Use native Ant task. Fix #28.
|
diff --git a/componentbuild/lib/yuicompressor/ant-yuicompressor-2.4.5pre2.jar b/componentbuild/lib/yuicompressor/ant-yuicompressor-2.4.5pre2.jar
new file mode 100644
index 0000000..db0114d
Binary files /dev/null and b/componentbuild/lib/yuicompressor/ant-yuicompressor-2.4.5pre2.jar differ
diff --git a/componentbuild/lib/yuicompressor/yuicompressor-2.4.5pre2.jar b/componentbuild/lib/yuicompressor/yuicompressor-2.4.5pre2.jar
deleted file mode 100644
index 158af6f..0000000
Binary files a/componentbuild/lib/yuicompressor/yuicompressor-2.4.5pre2.jar and /dev/null differ
diff --git a/componentbuild/shared/macrolib.xml b/componentbuild/shared/macrolib.xml
index a6c08ba..46d821c 100644
--- a/componentbuild/shared/macrolib.xml
+++ b/componentbuild/shared/macrolib.xml
@@ -1,461 +1,376 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiMacroLib">
<macrodef name="arrayliteral">
<attribute name="from" />
<attribute name="to" />
<attribute name="key" />
<sequential>
<if>
<and>
<isset property="@{from}" />
<length string="${@{from}}" when="ne" length="0" />
</and>
<then>
<propertyregex property="array"
override="true"
input="${@{from}}"
casesensitive="false"
regexp="([^\,\s]+)"
replace="'\1'"
/>
<property name="@{to}" value="@{key}:[${array}]" />
</then>
</if>
</sequential>
</macrodef>
<macrodef name="createdetails">
<sequential>
<arrayliteral from="component.use" to="component.details.use" key="use" />
<arrayliteral from="component.supersedes" to="component.details.supersedes" key="supersedes" />
<arrayliteral from="component.requires" to="component.details.requires" key="requires" />
<arrayliteral from="component.optional" to="component.details.optional" key="optional" />
<arrayliteral from="component.after" to="component.details.after" key="after" />
<arrayliteral from="component.lang" to="component.details.lang" key="lang" />
<if>
<isset property="component.skinnable" />
<then>
<property name="component.details.skinnable" value="skinnable:${component.skinnable}" />
</then>
</if>
<propertyselector property="details.list"
delimiter=","
match="component\.details.([^\.]*)"
select="\1"
casesensitive="false" />
<var name="details" value="" />
<if>
<isset property="details.list" />
<then>
<for list="${details.list}" param="val">
<sequential>
<var name="details" value="${component.details.@{val}}, ${details}" />
</sequential>
</for>
<propertyregex property="component.details.hash"
input="{${details}}"
regexp="(\,\s*?\})"
replace="}"
casesensitive="false" />
</then>
<else>
<property name="component.details.hash" value="" />
</else>
</if>
</sequential>
</macrodef>
+ <taskdef name="yuicompressor"
+ classname="com.yahoo.platform.yui.compressor.CompressorTask"
+ classpath="${yuicompressor.jar}"/>
+
+ <!-- Maps the legacy yuicompress task into a yuicompressor task. -->
<macrodef name="yuicompress">
<attribute name="src" />
<attribute name="dest" />
<attribute name="args" />
- <attribute name="type" default="js"/>
+ <!-- Unused. Type is detected automatically from the @{src} filename. -->
+ <attribute name="type" default="?"/>
+ <!-- If you had to override this, use the type option in args instead. -->
<sequential>
- <if>
- <or>
- <istrue value="${yuicompressor.online}"/>
- <http url="${yuicompressor.url}" errorsBeginAt="500"/>
- </or>
- <then>
- <property name="yuicompressor.online" value="true"/>
- <property name="yuicompressor.output" value="@{dest}"/>
- <property name="yuicompressor.file" value="@{src}"/>
-
- <!-- FIXME The encoding problems lie here.
-
- I have not yet ruled out the HTTP server as the
- cause of encoding issues. The JSON transformation
- could be causing issues, but I doubt it. Still, I'm
- looking into that now.
-
- The file may be munged by the <echo/> task below
- that writes out the extracted script from JSON
- in the JS snippet and writes it to the -min file.
-
- Your mission, if you choose to accept it, is to
- devise a mechanism that:
- 1. Minifies the file over HTTP
- 2. Displays warnings and errors in the build output.
- 3. Fails the build if minification fails.
- 4. Writes the minified result to a file.
-
- I would suggest testing the HTTP server first to
- make sure it's not the result of encoding problems.
-
- The test you're using should be the yui3 text module.
- Things start to look OK until the wordbreak data script.
- A diff should yeild minor differences (e.g.
- lowercase vars) instead of different Unicode.
- -->
-
- <echo>If this web request fails, try building again with -Dyuicompressor.online=false or install the cURL executable into your PATH.</echo>
- <exec executable="curl" input="@{src}" outputproperty="yuicompressor.result" failonerror="true" searchpath="true">
- <arg value="--silent"/>
- <arg line="-T"/>
- <arg line="${yuicompressor.file}"/>
- <arg line="${yuicompressor.url}?type=@{type}"/>
- </exec>
- <script language="javascript">
- <![CDATA[
- var echo;
- var project = self.getProject();
- var res = project.getProperty("yuicompressor.result");
- res = eval("(" + res + ")");
-
- function w (str, level) {
- var echo = project.createTask("echo");
- echo.setMessage(str);
- echo.perform();
- }
-
- if (!res.result) {
- var fail = project.createTask("fail");
- fail.setMessage("Failed to minify!");
- fail.perform();
- }
-
- function notify (level, errors) {
- for (var i = 0, l = errors.length; i < l; i++) {
- w(errors[i], level);
- }
- }
-
- notify("error", res.errors);
- notify("warning", res.warnings);
-
- project.setProperty("yuicompressor.script", res.result);
-
- ]]>
- </script>
- <!-- XXX: Encoding failure here? -->
- <!-- Setting @encoding on echo didn't work for me, the output was worse. -->
- <echo file="@{dest}" message="${yuicompressor.script}"/>
- <var name="yuicompressor.output" unset="true"/>
- <var name="yuicompressor.script" unset="true"/>
- <var name="yuicompressor.file" unset="true"/>
- <var name="yuicompressor.result" unset="true"/>
- </then>
- <else>
- <echo level="info">Running yuicompressor on @{src} with @{args}</echo>
- <java jar="${yuicompressor.java15.jar}" fork="true" failonerror="true">
- <arg line="@{args} -o" />
- <arg file="@{dest}" />
- <arg file="@{src}" />
- </java>
- </else>
- </if>
+ <yuicompressor input="@{src}" output="@{dest}" options="@{args}"/>
</sequential>
</macrodef>
<macrodef name="concatsource">
<attribute name="destfile" />
<attribute name="sourcedir" />
<attribute name="sourcefiles" />
<attribute name="workingdir" default="${workingdir}" />
<element name="filters" optional="true" description="Additonal filters to apply to individual files"/>
<sequential>
<echo level="info">Concatenating</echo>
<echo level="info"> Source Files : @{sourcefiles}</echo>
<echo level="info"> In Source Dir : @{sourcedir}</echo>
<echo level="info"> To : @{destfile}</echo>
<delete dir="@{workingdir}" quiet="true"/>
<copy todir="@{workingdir}">
<filelist dir="@{sourcedir}" files="@{sourcefiles}" />
<filterchain>
<filters />
<fixcrlf fixlast="true" eof="remove"/>
</filterchain>
</copy>
<concat destfile="@{destfile}" fixlastline="true">
<filelist dir="@{workingdir}" files="@{sourcefiles}" />
</concat>
<delete dir="${workingdir}" quiet="true" />
</sequential>
</macrodef>
<macrodef name="jslint">
<element name="jsfiles" optional="false" />
<sequential>
<pathconvert pathsep="' '" property="jsfileargs">
<jsfiles />
</pathconvert>
<if>
<or>
<istrue value="${node.online}"/>
<http url="${node.jslint.url}"/>
</or>
<then>
<property name="node.online" value="true"/>
<post to="${node.jslint.url}" property="node.jslint.response" failonerror="${lint.failonerror}">
<prop name="files" value="${jsfileargs}"/>
<prop name="failonerror" value="${lint.failonerror}"/>
</post>
<!-- Since Ant doesn't really failonerror for the post task,
handle this ourselves: -->
<if>
<not>
<isset property="node.jslint.response"/>
</not>
<then>
<fail>JSLint failed. To view lint output and continue the build, run ant with -Dlint.failonerror=false.</fail>
</then>
</if>
<!-- Clear property for next run: -->
<var name="node.jslint.response" unset="true"/>
</then>
<else>
<echo>Using Rhino. Install nodejs to improve jslint speed, or skip with -Dlint.skip=true</echo>
<!--
Need to find a way to convert fileset to args (script?) to
avoid ' ', which will break for files with ' in them
Evaluates to the following java execution line...
java -r js.jar jslintconsole.js 'file1.js' 'file2.js' 'file3.js'
-->
<java jar="${rhino.jar}" fork="true" failonerror="${jslint.failonerror}">
<arg file="${jslintconsole.js}" />
<arg value="${jslintsrc.js}" />
<arg line="'${jsfileargs}'" />
</java>
</else>
</if>
</sequential>
</macrodef>
<macrodef name="registerversion">
<attribute name="module" />
<attribute name="classname" />
<attribute name="file" />
<sequential>
<loadfile srcfile="${builddir}/files/versioncode.txt" property="@{module}-@{classname}-version" >
<filterchain>
<replacetokens>
<token key="MODULE" value="@{module}"/>
<token key="CLASSNAME" value="@{classname}"/>
</replacetokens>
</filterchain>
</loadfile>
<echo level="info">Adding Version Registration Code to @{file}</echo>
<concat destfile="@{file}" append="true" fixlastline="true">${@{module}-@{classname}-version}</concat>
</sequential>
</macrodef>
<macrodef name="addlang">
<attribute name="dir" />
<attribute name="module" />
<attribute name="dest" />
<attribute name="lang" default="" />
<attribute name="details" default = ""/>
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}@{lang}_details" value="" />
</then>
<else>
<property name="@{module}@{lang}_details" value=",@{details}" />
</else>
</if>
<if>
<equals arg1="@{lang}" arg2="" />
<then>
<property name="@{module}@{lang}_fullname" value="@{module}" />
</then>
<else>
<property name="@{module}@{lang}_fullname" value="@{module}_@{lang}" />
</else>
</if>
<if>
<available file="@{dir}/${@{module}@{lang}_fullname}.pres" />
<then>
<mkdir dir="${component.langbuilddir}" />
<java jar="${rhino.jar}" fork="true" failonerror="true">
<jvmarg value="-Dfile.encoding=utf-8" />
<arg file="${yrb2jsonconsole.js}" />
<arg file="${yrb2jsonsrc.js}" />
<arg file="@{dir}/${@{module}@{lang}_fullname}.pres" />
<arg file="${component.langbuilddir}/${@{module}@{lang}_fullname}.js" />
</java>
<echo level="info">Wrapping ${component.langbuilddir}/${@{module}@{lang}_fullname}.js in YUI.add, Y.Intl.add</echo>
<loadfile srcfile="${component.langbuilddir}/${@{module}@{lang}_fullname}.js" property="@{module}@{lang}-strs-loaded" encoding="utf-8" />
</then>
<else>
<echo level="info">Wrapping @{dir}/${@{module}@{lang}_fullname}.js in YUI.add, Y.Intl.add</echo>
<loadfile srcfile="@{dir}/${@{module}@{lang}_fullname}.js" property="@{module}@{lang}-strs-loaded" encoding="utf-8" />
</else>
</if>
<copy file="${builddir}/files/langtemplate.txt" tofile="@{dest}/${@{module}@{lang}_fullname}.js" overwrite="true" outputencoding="utf-8">
<filterset>
<filter token="LANG" value="@{lang}" />
<filter token="LANG_MODULE" value="lang/${@{module}@{lang}_fullname}" />
<filter token="STRINGS" value="${@{module}@{lang}-strs-loaded}" />
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}" />
<filter token="LANG_DETAILS" value="${@{module}@{lang}_details}" />
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addmodule">
<attribute name="file" />
<attribute name="module" />
<attribute name="details" default="" />
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}-details" value="" />
</then>
<else>
<property name="@{module}-details" value=",@{details}" />
</else>
</if>
<loadfile srcfile="@{file}" property="@{module}-@{file}-code" />
<echo level="info">Wrapping @{file} in YUI.add module</echo>
<copy file="${builddir}/files/moduletemplate.txt" tofile="@{file}" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{file}-code}" />
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}" />
<filter token="DETAILS" value="${@{module}-details}" />
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addrollup">
<attribute name="file" />
<attribute name="module" />
<attribute name="details" default="" />
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}-details" value="" />
</then>
<else>
<property name="@{module}-details" value=",@{details}" />
</else>
</if>
<loadfile srcfile="@{file}" property="@{module}-@{file}-code" />
<echo level="info">Adding Rollup @{file} using YUI.add</echo>
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{file}" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{file}-code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}"/>
<filter token="DETAILS" value="${@{module}-details}"/>
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addlangrollup">
<attribute name="module" />
<attribute name="dir" />
<sequential>
<echo level="info">Registering rollup info for lang files in @{dir} using YUI.add</echo>
<for list="${component.rollup.lang}" param="lang" trim="true">
<sequential>
<loadfile srcfile="@{dir}/@{module}_@{lang}.js" property="@{module}-@{lang}-code" />
<var name="lang.use" value="{use:[" />
<for list="${component.lang.use}" param="submod" trim="true">
<sequential>
<var name="lang.use" value="${lang.use}'lang/@{submod}_@{lang}'," />
</sequential>
</for>
<var name="lang.use" value="${lang.use}]}" />
<propertyregex property="@{module}-@{lang}-details"
input="${lang.use}"
regexp="(\,\s*?\])"
replace="]"
casesensitive="false" />
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{dir}/@{module}_@{lang}.js" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{lang}-code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="lang/@{module}_@{lang}"/>
<filter token="DETAILS" value=", ${@{module}-@{lang}-details}"/>
</filterset>
</copy>
</sequential>
</for>
<loadfile srcfile="@{dir}/@{module}.js" property="@{module}--code" />
<var name="lang.use" value="{use:[" />
<for list="${component.lang.use}" param="submod" trim="true">
<sequential>
<var name="lang.use" value="${lang.use}'lang/@{submod}'," />
</sequential>
</for>
<var name="lang.use" value="${lang.use}]}" />
<propertyregex property="@{module}--details"
input="${lang.use}"
regexp="(\,\s*?\])"
replace="]"
casesensitive="false" />
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{dir}/@{module}.js" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}--code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="lang/@{module}"/>
<filter token="DETAILS" value=", ${@{module}--details}"/>
</filterset>
</copy>
</sequential>
</macrodef>
</project>
diff --git a/componentbuild/shared/properties.xml b/componentbuild/shared/properties.xml
index 5802168..5597633 100644
--- a/componentbuild/shared/properties.xml
+++ b/componentbuild/shared/properties.xml
@@ -1,169 +1,167 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiSharedProperties">
<!-- ANT contrib library for loops, if/else support, with property fix for FOR task -->
<taskdef resource="antcontrib.properties">
<classpath>
<pathelement location="${builddir}/lib/ant-contrib/ant-contrib-1.0b3-modified.jar" />
</classpath>
</taskdef>
<dirname property="buildfile.dir" file="${ant.file}" />
<!--
builddir : The path to the builder/componentbuild directory from the component build file
srcdir : The path to top of the project source directory (e.g. yui2) from the component build file
-->
<property name="builddir" location="../../../builder/componentbuild" />
<property name="srcdir" location="../.." />
<!-- buildfiles.eol : End of line char to use for built files -->
<property name="buildfiles.eol" value="lf"/>
<!-- Supporting Tools -->
<property name="rhino.jar" location="${builddir}/lib/rhino/js.jar" />
<property name="jslintconsole.js" location="${builddir}/lib/jslint/jslint-console.js" />
<property name="jslintsrc.js" location="${builddir}/lib/jslint/fulljslint.js" />
- <property name="yuicompressor.jar" location="${builddir}/lib/yuicompressor/yuicompressor-2.4.5pre2.jar" />
- <property name="yuicompressor.java15.jar" location="${builddir}/lib/yuicompressor/yuicompressor-2.4.4.jar" />
+ <property name="yuicompressor.jar" location="${builddir}/lib/yuicompressor/ant-yuicompressor-2.4.5pre2.jar" />
<property name="yrb2jsonconsole.js" location="${builddir}/lib/yrb2json/yrb2json-console.js" />
<property name="yrb2jsonsrc.js" location="${builddir}/lib/yrb2json/yrb2json.js" />
<!-- YUI Compressor arguments for JS and CSS files -->
<property name="yuicompressor.js.charset" value="utf-8" />
<property name="yuicompressor.css.charset" value="utf-8" />
<property name="yuicompressor.js.args" value="--disable-optimizations --preserve-semi --line-break 6000" />
<property name="yuicompressor.css.args" value="--line-break 6000" />
- <property name="yuicompressor.port" value="8091"/>
<!-- Enable/Disable YUI Compressor verbosity. NOTE: Checked in build files should not disable this flag -->
<property name="yuicompressor.js.verbose" value="true" />
<property name="yuicompressor.css.verbose" value="true" />
<condition property="yuicompressor.js.args.internal" value="-v --charset ${yuicompressor.js.charset} ${yuicompressor.js.args}" else="--charset ${yuicompressor.js.charset} ${yuicompressor.js.args}">
<istrue value="${yuicompressor.js.verbose}" />
</condition>
<condition property="yuicompressor.css.args.internal" value="-v --charset ${yuicompressor.css.charset} ${yuicompressor.css.args}" else="--charset ${yuicompressor.css.charset} ${yuicompressor.css.args}">
<istrue value="${yuicompressor.css.verbose}" />
</condition>
<!-- Top Level Build Directories (e.g. yui2/build, yui3/build)-->
<property name="global.build.base" location="${srcdir}/build" />
<property name="global.build.component" location="${global.build.base}/${component}" />
<property name="global.build.component.assets" location="${global.build.component}/assets" />
<!-- Component Properties -->
<property name="component.module" value="${component}" />
<property name="component.basedir" location="${buildfile.dir}" />
<property name="component.jsfiles.base" location="${component.basedir}/js" />
<property name="component.cssfiles.base" location="${component.basedir}/css" />
<property name="component.lang.base" location="${component.basedir}/lang" />
<property name="component.assets.flatten" value="true" />
<property name="component.assets.base" location="${component.basedir}/assets" />
<property name="component.assets.files" value="**/*" />
<property name="component.assets.legacy.flatten" value="true" />
<property name="component.assets.legacy.base" location="${component.assets.base}/legacy" />
<property name="component.assets.legacy.files" value="**/*" />
<property name="component.assets.skins.base" location="${component.assets.base}/skins" />
<property name="component.assets.skins.files" value="**/*" />
<condition property="component.skins.exist">
<and>
<available file="${component.assets.base}/${component}-core.css" type="file" />
<available file="${component.assets.base}/skins" type="dir" />
</and>
</condition>
<!-- component is part of a rollup build, so rollup skins to parent -->
<condition property="rollupskins">
<and>
<istrue value="${rollup}" />
<istrue value="${component.skins.exist}" />
</and>
</condition>
<available file="${component.assets.base}" type="dir" property="component.assets.exist"/>
<condition property="component.langs.exist">
<and>
<or>
<isset property="component.lang" />
<isset property="component.rollup.lang" />
</or>
</and>
</condition>
<condition property="rolluplangs">
<and>
<istrue value="${rollup}" />
<istrue value="${component.langs.exist}" />
</and>
</condition>
<!--
DEPRECATED: component.basefilename and component.releasetype are deprecated
We used to mark filenames with suffixes (-beta, -experimental), which we no longer do
-->
<condition property="component.basefilename" value="${component}" else="${component}">
<isset property="component.releasetype"/>
</condition>
<!-- Default logger regex values if not provided -->
<property name="component.logger.regex" value="^.*?(?:logger|YAHOO.log).*?(?:;|\).*;|(?:\r?\n.*?)*?\).*;).*;?.*?\r?\n" />
<property name="component.logger.regex.replace" value="" />
<property name="component.logger.regex.flags" value="mg" />
<property name="component.logger.regex.byline" value="false" />
<!-- Rollup support, currently only used for YUI 3 -->
<property name="component.rollup" value="false"/>
<property name="component.rollup.target" value="all"/>
<condition property="component.builddir" value="${component.basedir}/build_rollup_tmp" else="${component.basedir}/build_tmp">
<istrue value="${component.rollup}"/>
</condition>
<condition property="rollup.skins.exist">
<and>
<istrue value="${component.rollup}" />
<available file="${component.assets.base}/skins" type="dir" />
</and>
</condition>
<condition property="skins.exist">
<or>
<istrue value="${rollup.skins.exist}" />
<istrue value="${component.skins.exist}" />
</or>
</condition>
<!-- The temporary working directory used by the build process -->
<property name="workingdir" location="${component.builddir}/ant" />
<!-- Directory for language resource bundles in JSON format derived from YRB format -->
<property name="component.langbuilddir" value="${component.basedir}/build_lang_tmp" />
<!-- The file which defines the default targets for the particular type of component (module, rollup, css) -->
<condition property="targetbase" value="rollup" else="module">
<istrue value="${component.rollup}"/>
</condition>
<condition property="targets" value="../shared/cssmodule.xml" else="${targetbase}.xml">
<isset property="component.cssfiles" />
</condition>
<!-- By default, jslint failure should fail the build.
This can be overridden on the command line. -->
<property name="lint.failonerror" value="true"/>
<property name="node.jslint.url" value="http://127.0.0.1:8081/"/>
<property name="yuicompressor.url" value="http://127.0.0.1:${yuicompressor.port}/compress"/>
</project>
diff --git a/componentbuild/shared/targets.xml b/componentbuild/shared/targets.xml
index cd9b509..b4533de 100644
--- a/componentbuild/shared/targets.xml
+++ b/componentbuild/shared/targets.xml
@@ -1,214 +1,192 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiSharedTargets">
<echo level="info">Starting Build For ${component}</echo>
<echo level="info">Ant Properties</echo>
<echo level="info"> Home : ${ant.home}</echo>
<echo level="info"> Ant Version : ${ant.version}</echo>
<echo level="info"> Build File : ${ant.file}</echo>
<echo level="info">Local Build Properties</echo>
<echo level="info"> version : ${yui.version}</echo>
<echo level="info"> srcdir : ${srcdir}</echo>
<echo level="info"> builddir : ${builddir}</echo>
<echo level="info"> component : ${component}</echo>
<echo level="info"> component.basefilename : ${component.basefilename}</echo>
<echo level="info"> component.basedir : ${component.basedir}</echo>
<echo level="info"> component.builddir : ${component.builddir}</echo>
<echo level="info">Global Build Properties</echo>
<echo level="info"> global.build.base : ${global.build.base}</echo>
<echo level="info"> global.build.component : ${global.build.component}</echo>
<echo level="info"> global.build.component.assets : ${global.build.component.assets}</echo>
<dirname property="targets.basedir" file="${ant.file.YuiSharedTargets}"/>
<import file="${targets.basedir}/macrolib.xml" description="Macrodef definitions - jslint, yuicompessor, registerversion" />
<target name="all" depends="local, deploy" description="Build and Deploy to Global Build Directory" />
<target name="local" depends="clean, init, build, minify, lint" description="Build and Deploy to Local Build Directory" />
<target name="init">
<tstamp/>
<mkdir dir="${component.builddir}" />
<createdetails />
- <antcall target="-yuicompressor"/>
<antcall target="-lint-server"/>
</target>
<target name="-lint-server" description="Start JSLint Server" unless="lint.skip">
<antcall target="-node">
<param name="src" value="${builddir}/lib/jslint/jslint-node.js"/>
</antcall>
</target>
<target name="-node" description="Start NodeJS Server" unless="node.spawn">
<if>
<not>
<http url="${node.jslint.url}"/>
</not>
<then>
<!-- You can't set failifexecutionfails if spawn is true. Argh. -->
<!-- Check if it's installed first. -->
<exec resultproperty="node.status" executable="node" failonerror="false" failifexecutionfails="false" searchpath="true" resolveexecutable="true">
<arg value="-v"/>
</exec>
<if>
<equals arg1="${node.status}" arg2="0"/>
<then>
<echo level="info">Spawning Node.js app at: ${src}</echo>
<exec executable="node" spawn="true" failonerror="false" searchpath="true" resolveexecutable="true">
<arg value="${src}"/>
</exec>
</then>
<else>
<echo level="info">For faster builds, install Node.js.</echo>
</else>
</if>
<!-- Don't fail if node doesn't exist, fails to start, etc.
We will fallback to the slow Rhino engine later. -->
</then>
</if>
<!-- Don't try to start again. -->
<property name="node.spawn" value="true"/>
</target>
- <target name="-yuicompressor" description="Start YUI Compressor Server" unless="yuicompressor.spawn">
- <if>
- <not>
- <http url="${yuicompressor.url}"/>
- </not>
- <then>
- <echo level="info">Attempting to start YUI Compressor server.</echo>
- <java classname="com.yahoo.platform.yui.compressor.Bootstrap" fork="true" spawn="true" failonerror="false">
- <arg line="--server"/>
- <arg line="${yuicompressor.port}"/>
- <arg line="${yuicompressor.js.args}"/>
- <arg line="${yuicompressor.js.args.internal}"/>
- <classpath>
- <pathelement location="${yuicompressor.jar}"/>
- </classpath>
- </java>
- </then>
- </if>
- <property name="yuicompressor.spawn" value="true"/>
- </target>
-
<target name="clean" description="Clean Local Build Directory" unless="clean.skip">
<delete dir="${component.builddir}" />
</target>
<target name="build" />
<!-- MIN -->
<target name="minify" description="Create component-min.js from component.js">
<yuicompress src="${component.builddir}/${component.basefilename}.js" dest="${component.builddir}/${component.basefilename}-min.js" args="${yuicompressor.js.args.internal}" />
<if>
<available file="${component.builddir}/lang" type="dir" />
<then>
<for param="file">
<path>
<fileset dir="${component.builddir}/lang" includes="*.js"/>
</path>
<sequential>
<yuicompress src="@{file}" dest="@{file}" args="${yuicompressor.js.args.internal}" />
</sequential>
</for>
</then>
</if>
</target>
<target name="lint" description="Run jslint over the local build files (default settings)" unless="lint.skip">
<jslint>
<jsfiles>
<fileset dir="${component.builddir}" includes="*.js" />
</jsfiles>
</jslint>
</target>
<!-- DEPLOY -->
<target name="deploy" description="Copy files to global location" depends="deploybuild, deployassets, deployskins, deploylang, deploydocs"></target>
<target name="deploybuild" description="Copy built files to global build location">
<copy todir="${global.build.component}" overwrite="true" verbose="true">
<fileset dir="${component.builddir}" includes="*.js" />
</copy>
</target>
<target name="deployassets" if="component.assets.exist">
<copy todir="${global.build.component.assets}" flatten="${component.assets.flatten}" overwrite="true" verbose="true">
<fileset dir="${component.assets.base}" includes="${component.assets.files}" excludes="skins/, legacy/" />
</copy>
<copy todir="${global.build.component.assets}" flatten="${component.assets.legacy.flatten}" preservelastmodified="true" failonerror="false" verbose="true">
<fileset dir="${component.assets.legacy.base}" includes="${component.assets.legacy.files}" excludes="skins/" />
</copy>
</target>
<target name="deployskins" if="skins.exist">
<copy todir="${global.build.component.assets}/skins/sam" overwrite="true" verbose="true">
<fileset dir="${component.builddir}/assets/skins/sam" includes="${component}.css" />
</copy>
<copy todir="${global.build.component.assets}/skins/sam" overwrite="true" verbose="true">
<fileset dir="${component.assets.skins.base}/sam" includes="${component.assets.skins.files}" />
</copy>
</target>
<target name="deploylang" description="Copy language bundles to global build location">
<copy todir="${global.build.component}/lang" overwrite="true" failonerror="false" verbose="true">
<fileset dir="${component.builddir}/lang" includes="*.js" />
</copy>
</target>
<target name="deploydocs" description="Copy doc files to global doc locations">
<!-- TODO -->
</target>
<target name="-prepend" if="component.prependfiles">
<concat destfile="${workingdir}/${component.basefilename}.js.tmp" fixlastline="true">
<filelist dir="${component.basedir}" files="${component.prependfiles}" />
<filterchain>
<tokenfilter>
<filetokenizer/>
<replaceregex
pattern="${component.logger.regex}"
replace="${component.logger.regex.replace}"
flags="${component.logger.regex.flags}" />
</tokenfilter>
</filterchain>
</concat>
<concat destfile="${workingdir}/${component.basefilename}.js.tmp" fixlastline="true" append="true">
<filelist dir="${component.builddir}" files="${component.basefilename}.js" />
</concat>
<move file="${workingdir}/${component.basefilename}.js.tmp" tofile="${component.builddir}/${component.basefilename}.js" />
</target>
<target name="-append" if="component.appendfiles">
<concat destfile="${component.builddir}/${component.basefilename}.js" fixlastline="true" append="true">
<filelist dir="${component.basedir}" files="${component.appendfiles}" />
<filterchain>
<tokenfilter>
<filetokenizer/>
<replaceregex
pattern="${component.logger.regex}"
replace="${component.logger.regex.replace}"
flags="${component.logger.regex.flags}" />
</tokenfilter>
</filterchain>
</concat>
</target>
<target name="-prependdebug" if="component.prependfiles">
<concat destfile="${workingdir}/${component.basefilename}-debug.js.tmp" fixlastline="true" >
<filelist dir="${component.basedir}" files="${component.prependfiles}" />
<filelist dir="${component.builddir}" files="${component.basefilename}-debug.js" />
</concat>
<move file="${workingdir}/${component.basefilename}-debug.js.tmp" tofile="${component.builddir}/${component.basefilename}-debug.js" />
</target>
<target name="-appenddebug" if="component.appendfiles">
<concat destfile="${component.builddir}/${component.basefilename}-debug.js" fixlastline="true" append="true">
<filelist dir="${component.basedir}" files="${component.appendfiles}" />
</concat>
</target>
</project>
|
yui/builder
|
d37a167deb4f9933f4119f33d58ca7e444bda8e0
|
Add FIXME comment with encoding information.
|
diff --git a/componentbuild/shared/macrolib.xml b/componentbuild/shared/macrolib.xml
index 2e638fe..a6c08ba 100644
--- a/componentbuild/shared/macrolib.xml
+++ b/componentbuild/shared/macrolib.xml
@@ -1,431 +1,461 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiMacroLib">
<macrodef name="arrayliteral">
<attribute name="from" />
<attribute name="to" />
<attribute name="key" />
<sequential>
<if>
<and>
<isset property="@{from}" />
<length string="${@{from}}" when="ne" length="0" />
</and>
<then>
<propertyregex property="array"
override="true"
input="${@{from}}"
casesensitive="false"
regexp="([^\,\s]+)"
replace="'\1'"
/>
<property name="@{to}" value="@{key}:[${array}]" />
</then>
</if>
</sequential>
</macrodef>
<macrodef name="createdetails">
<sequential>
<arrayliteral from="component.use" to="component.details.use" key="use" />
<arrayliteral from="component.supersedes" to="component.details.supersedes" key="supersedes" />
<arrayliteral from="component.requires" to="component.details.requires" key="requires" />
<arrayliteral from="component.optional" to="component.details.optional" key="optional" />
<arrayliteral from="component.after" to="component.details.after" key="after" />
<arrayliteral from="component.lang" to="component.details.lang" key="lang" />
<if>
<isset property="component.skinnable" />
<then>
<property name="component.details.skinnable" value="skinnable:${component.skinnable}" />
</then>
</if>
<propertyselector property="details.list"
delimiter=","
match="component\.details.([^\.]*)"
select="\1"
casesensitive="false" />
<var name="details" value="" />
<if>
<isset property="details.list" />
<then>
<for list="${details.list}" param="val">
<sequential>
<var name="details" value="${component.details.@{val}}, ${details}" />
</sequential>
</for>
<propertyregex property="component.details.hash"
input="{${details}}"
regexp="(\,\s*?\})"
replace="}"
casesensitive="false" />
</then>
<else>
<property name="component.details.hash" value="" />
</else>
</if>
</sequential>
</macrodef>
<macrodef name="yuicompress">
<attribute name="src" />
<attribute name="dest" />
<attribute name="args" />
<attribute name="type" default="js"/>
<sequential>
<if>
<or>
<istrue value="${yuicompressor.online}"/>
<http url="${yuicompressor.url}" errorsBeginAt="500"/>
</or>
<then>
<property name="yuicompressor.online" value="true"/>
<property name="yuicompressor.output" value="@{dest}"/>
<property name="yuicompressor.file" value="@{src}"/>
+
+ <!-- FIXME The encoding problems lie here.
+
+ I have not yet ruled out the HTTP server as the
+ cause of encoding issues. The JSON transformation
+ could be causing issues, but I doubt it. Still, I'm
+ looking into that now.
+
+ The file may be munged by the <echo/> task below
+ that writes out the extracted script from JSON
+ in the JS snippet and writes it to the -min file.
+
+ Your mission, if you choose to accept it, is to
+ devise a mechanism that:
+ 1. Minifies the file over HTTP
+ 2. Displays warnings and errors in the build output.
+ 3. Fails the build if minification fails.
+ 4. Writes the minified result to a file.
+
+ I would suggest testing the HTTP server first to
+ make sure it's not the result of encoding problems.
+
+ The test you're using should be the yui3 text module.
+ Things start to look OK until the wordbreak data script.
+ A diff should yeild minor differences (e.g.
+ lowercase vars) instead of different Unicode.
+ -->
+
<echo>If this web request fails, try building again with -Dyuicompressor.online=false or install the cURL executable into your PATH.</echo>
<exec executable="curl" input="@{src}" outputproperty="yuicompressor.result" failonerror="true" searchpath="true">
<arg value="--silent"/>
<arg line="-T"/>
<arg line="${yuicompressor.file}"/>
<arg line="${yuicompressor.url}?type=@{type}"/>
</exec>
<script language="javascript">
<![CDATA[
var echo;
var project = self.getProject();
var res = project.getProperty("yuicompressor.result");
res = eval("(" + res + ")");
function w (str, level) {
var echo = project.createTask("echo");
echo.setMessage(str);
echo.perform();
}
if (!res.result) {
var fail = project.createTask("fail");
fail.setMessage("Failed to minify!");
fail.perform();
}
function notify (level, errors) {
for (var i = 0, l = errors.length; i < l; i++) {
w(errors[i], level);
}
}
notify("error", res.errors);
notify("warning", res.warnings);
project.setProperty("yuicompressor.script", res.result);
]]>
</script>
+ <!-- XXX: Encoding failure here? -->
+ <!-- Setting @encoding on echo didn't work for me, the output was worse. -->
<echo file="@{dest}" message="${yuicompressor.script}"/>
<var name="yuicompressor.output" unset="true"/>
<var name="yuicompressor.script" unset="true"/>
<var name="yuicompressor.file" unset="true"/>
<var name="yuicompressor.result" unset="true"/>
</then>
<else>
<echo level="info">Running yuicompressor on @{src} with @{args}</echo>
<java jar="${yuicompressor.java15.jar}" fork="true" failonerror="true">
<arg line="@{args} -o" />
<arg file="@{dest}" />
<arg file="@{src}" />
</java>
</else>
</if>
</sequential>
</macrodef>
<macrodef name="concatsource">
<attribute name="destfile" />
<attribute name="sourcedir" />
<attribute name="sourcefiles" />
<attribute name="workingdir" default="${workingdir}" />
<element name="filters" optional="true" description="Additonal filters to apply to individual files"/>
<sequential>
<echo level="info">Concatenating</echo>
<echo level="info"> Source Files : @{sourcefiles}</echo>
<echo level="info"> In Source Dir : @{sourcedir}</echo>
<echo level="info"> To : @{destfile}</echo>
<delete dir="@{workingdir}" quiet="true"/>
<copy todir="@{workingdir}">
<filelist dir="@{sourcedir}" files="@{sourcefiles}" />
<filterchain>
<filters />
<fixcrlf fixlast="true" eof="remove"/>
</filterchain>
</copy>
<concat destfile="@{destfile}" fixlastline="true">
<filelist dir="@{workingdir}" files="@{sourcefiles}" />
</concat>
<delete dir="${workingdir}" quiet="true" />
</sequential>
</macrodef>
<macrodef name="jslint">
<element name="jsfiles" optional="false" />
<sequential>
<pathconvert pathsep="' '" property="jsfileargs">
<jsfiles />
</pathconvert>
<if>
<or>
<istrue value="${node.online}"/>
<http url="${node.jslint.url}"/>
</or>
<then>
<property name="node.online" value="true"/>
<post to="${node.jslint.url}" property="node.jslint.response" failonerror="${lint.failonerror}">
<prop name="files" value="${jsfileargs}"/>
<prop name="failonerror" value="${lint.failonerror}"/>
</post>
<!-- Since Ant doesn't really failonerror for the post task,
handle this ourselves: -->
<if>
<not>
<isset property="node.jslint.response"/>
</not>
<then>
<fail>JSLint failed. To view lint output and continue the build, run ant with -Dlint.failonerror=false.</fail>
</then>
</if>
<!-- Clear property for next run: -->
<var name="node.jslint.response" unset="true"/>
</then>
<else>
<echo>Using Rhino. Install nodejs to improve jslint speed, or skip with -Dlint.skip=true</echo>
<!--
Need to find a way to convert fileset to args (script?) to
avoid ' ', which will break for files with ' in them
Evaluates to the following java execution line...
java -r js.jar jslintconsole.js 'file1.js' 'file2.js' 'file3.js'
-->
<java jar="${rhino.jar}" fork="true" failonerror="${jslint.failonerror}">
<arg file="${jslintconsole.js}" />
<arg value="${jslintsrc.js}" />
<arg line="'${jsfileargs}'" />
</java>
</else>
</if>
</sequential>
</macrodef>
<macrodef name="registerversion">
<attribute name="module" />
<attribute name="classname" />
<attribute name="file" />
<sequential>
<loadfile srcfile="${builddir}/files/versioncode.txt" property="@{module}-@{classname}-version" >
<filterchain>
<replacetokens>
<token key="MODULE" value="@{module}"/>
<token key="CLASSNAME" value="@{classname}"/>
</replacetokens>
</filterchain>
</loadfile>
<echo level="info">Adding Version Registration Code to @{file}</echo>
<concat destfile="@{file}" append="true" fixlastline="true">${@{module}-@{classname}-version}</concat>
</sequential>
</macrodef>
<macrodef name="addlang">
<attribute name="dir" />
<attribute name="module" />
<attribute name="dest" />
<attribute name="lang" default="" />
<attribute name="details" default = ""/>
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}@{lang}_details" value="" />
</then>
<else>
<property name="@{module}@{lang}_details" value=",@{details}" />
</else>
</if>
<if>
<equals arg1="@{lang}" arg2="" />
<then>
<property name="@{module}@{lang}_fullname" value="@{module}" />
</then>
<else>
<property name="@{module}@{lang}_fullname" value="@{module}_@{lang}" />
</else>
</if>
<if>
<available file="@{dir}/${@{module}@{lang}_fullname}.pres" />
<then>
<mkdir dir="${component.langbuilddir}" />
<java jar="${rhino.jar}" fork="true" failonerror="true">
<jvmarg value="-Dfile.encoding=utf-8" />
<arg file="${yrb2jsonconsole.js}" />
<arg file="${yrb2jsonsrc.js}" />
<arg file="@{dir}/${@{module}@{lang}_fullname}.pres" />
<arg file="${component.langbuilddir}/${@{module}@{lang}_fullname}.js" />
</java>
<echo level="info">Wrapping ${component.langbuilddir}/${@{module}@{lang}_fullname}.js in YUI.add, Y.Intl.add</echo>
<loadfile srcfile="${component.langbuilddir}/${@{module}@{lang}_fullname}.js" property="@{module}@{lang}-strs-loaded" encoding="utf-8" />
</then>
<else>
<echo level="info">Wrapping @{dir}/${@{module}@{lang}_fullname}.js in YUI.add, Y.Intl.add</echo>
<loadfile srcfile="@{dir}/${@{module}@{lang}_fullname}.js" property="@{module}@{lang}-strs-loaded" encoding="utf-8" />
</else>
</if>
<copy file="${builddir}/files/langtemplate.txt" tofile="@{dest}/${@{module}@{lang}_fullname}.js" overwrite="true" outputencoding="utf-8">
<filterset>
<filter token="LANG" value="@{lang}" />
<filter token="LANG_MODULE" value="lang/${@{module}@{lang}_fullname}" />
<filter token="STRINGS" value="${@{module}@{lang}-strs-loaded}" />
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}" />
<filter token="LANG_DETAILS" value="${@{module}@{lang}_details}" />
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addmodule">
<attribute name="file" />
<attribute name="module" />
<attribute name="details" default="" />
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}-details" value="" />
</then>
<else>
<property name="@{module}-details" value=",@{details}" />
</else>
</if>
<loadfile srcfile="@{file}" property="@{module}-@{file}-code" />
<echo level="info">Wrapping @{file} in YUI.add module</echo>
<copy file="${builddir}/files/moduletemplate.txt" tofile="@{file}" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{file}-code}" />
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}" />
<filter token="DETAILS" value="${@{module}-details}" />
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addrollup">
<attribute name="file" />
<attribute name="module" />
<attribute name="details" default="" />
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}-details" value="" />
</then>
<else>
<property name="@{module}-details" value=",@{details}" />
</else>
</if>
<loadfile srcfile="@{file}" property="@{module}-@{file}-code" />
<echo level="info">Adding Rollup @{file} using YUI.add</echo>
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{file}" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{file}-code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}"/>
<filter token="DETAILS" value="${@{module}-details}"/>
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addlangrollup">
<attribute name="module" />
<attribute name="dir" />
<sequential>
<echo level="info">Registering rollup info for lang files in @{dir} using YUI.add</echo>
<for list="${component.rollup.lang}" param="lang" trim="true">
<sequential>
<loadfile srcfile="@{dir}/@{module}_@{lang}.js" property="@{module}-@{lang}-code" />
<var name="lang.use" value="{use:[" />
<for list="${component.lang.use}" param="submod" trim="true">
<sequential>
<var name="lang.use" value="${lang.use}'lang/@{submod}_@{lang}'," />
</sequential>
</for>
<var name="lang.use" value="${lang.use}]}" />
<propertyregex property="@{module}-@{lang}-details"
input="${lang.use}"
regexp="(\,\s*?\])"
replace="]"
casesensitive="false" />
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{dir}/@{module}_@{lang}.js" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{lang}-code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="lang/@{module}_@{lang}"/>
<filter token="DETAILS" value=", ${@{module}-@{lang}-details}"/>
</filterset>
</copy>
</sequential>
</for>
<loadfile srcfile="@{dir}/@{module}.js" property="@{module}--code" />
<var name="lang.use" value="{use:[" />
<for list="${component.lang.use}" param="submod" trim="true">
<sequential>
<var name="lang.use" value="${lang.use}'lang/@{submod}'," />
</sequential>
</for>
<var name="lang.use" value="${lang.use}]}" />
<propertyregex property="@{module}--details"
input="${lang.use}"
regexp="(\,\s*?\])"
replace="]"
casesensitive="false" />
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{dir}/@{module}.js" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}--code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="lang/@{module}"/>
<filter token="DETAILS" value=", ${@{module}--details}"/>
</filterset>
</copy>
</sequential>
</macrodef>
</project>
|
yui/builder
|
e12de9094b83feaa707c81b7f60b78b2f5f13a0a
|
Upgrade YUI Compressor. Fix #28, encoding issues.
|
diff --git a/componentbuild/lib/yuicompressor/yuicompressor-2.4.5pre.jar b/componentbuild/lib/yuicompressor/yuicompressor-2.4.5pre.jar
deleted file mode 100644
index 0317776..0000000
Binary files a/componentbuild/lib/yuicompressor/yuicompressor-2.4.5pre.jar and /dev/null differ
diff --git a/componentbuild/lib/yuicompressor/yuicompressor-2.4.5pre2.jar b/componentbuild/lib/yuicompressor/yuicompressor-2.4.5pre2.jar
new file mode 100644
index 0000000..158af6f
Binary files /dev/null and b/componentbuild/lib/yuicompressor/yuicompressor-2.4.5pre2.jar differ
diff --git a/componentbuild/shared/properties.xml b/componentbuild/shared/properties.xml
index 341271b..5802168 100644
--- a/componentbuild/shared/properties.xml
+++ b/componentbuild/shared/properties.xml
@@ -1,169 +1,169 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiSharedProperties">
<!-- ANT contrib library for loops, if/else support, with property fix for FOR task -->
<taskdef resource="antcontrib.properties">
<classpath>
<pathelement location="${builddir}/lib/ant-contrib/ant-contrib-1.0b3-modified.jar" />
</classpath>
</taskdef>
<dirname property="buildfile.dir" file="${ant.file}" />
<!--
builddir : The path to the builder/componentbuild directory from the component build file
srcdir : The path to top of the project source directory (e.g. yui2) from the component build file
-->
<property name="builddir" location="../../../builder/componentbuild" />
<property name="srcdir" location="../.." />
<!-- buildfiles.eol : End of line char to use for built files -->
<property name="buildfiles.eol" value="lf"/>
<!-- Supporting Tools -->
<property name="rhino.jar" location="${builddir}/lib/rhino/js.jar" />
<property name="jslintconsole.js" location="${builddir}/lib/jslint/jslint-console.js" />
<property name="jslintsrc.js" location="${builddir}/lib/jslint/fulljslint.js" />
- <property name="yuicompressor.jar" location="${builddir}/lib/yuicompressor/yuicompressor-2.4.5pre.jar" />
+ <property name="yuicompressor.jar" location="${builddir}/lib/yuicompressor/yuicompressor-2.4.5pre2.jar" />
<property name="yuicompressor.java15.jar" location="${builddir}/lib/yuicompressor/yuicompressor-2.4.4.jar" />
<property name="yrb2jsonconsole.js" location="${builddir}/lib/yrb2json/yrb2json-console.js" />
<property name="yrb2jsonsrc.js" location="${builddir}/lib/yrb2json/yrb2json.js" />
<!-- YUI Compressor arguments for JS and CSS files -->
<property name="yuicompressor.js.charset" value="utf-8" />
<property name="yuicompressor.css.charset" value="utf-8" />
<property name="yuicompressor.js.args" value="--disable-optimizations --preserve-semi --line-break 6000" />
<property name="yuicompressor.css.args" value="--line-break 6000" />
<property name="yuicompressor.port" value="8091"/>
<!-- Enable/Disable YUI Compressor verbosity. NOTE: Checked in build files should not disable this flag -->
<property name="yuicompressor.js.verbose" value="true" />
<property name="yuicompressor.css.verbose" value="true" />
<condition property="yuicompressor.js.args.internal" value="-v --charset ${yuicompressor.js.charset} ${yuicompressor.js.args}" else="--charset ${yuicompressor.js.charset} ${yuicompressor.js.args}">
<istrue value="${yuicompressor.js.verbose}" />
</condition>
<condition property="yuicompressor.css.args.internal" value="-v --charset ${yuicompressor.css.charset} ${yuicompressor.css.args}" else="--charset ${yuicompressor.css.charset} ${yuicompressor.css.args}">
<istrue value="${yuicompressor.css.verbose}" />
</condition>
<!-- Top Level Build Directories (e.g. yui2/build, yui3/build)-->
<property name="global.build.base" location="${srcdir}/build" />
<property name="global.build.component" location="${global.build.base}/${component}" />
<property name="global.build.component.assets" location="${global.build.component}/assets" />
<!-- Component Properties -->
<property name="component.module" value="${component}" />
<property name="component.basedir" location="${buildfile.dir}" />
<property name="component.jsfiles.base" location="${component.basedir}/js" />
<property name="component.cssfiles.base" location="${component.basedir}/css" />
<property name="component.lang.base" location="${component.basedir}/lang" />
<property name="component.assets.flatten" value="true" />
<property name="component.assets.base" location="${component.basedir}/assets" />
<property name="component.assets.files" value="**/*" />
<property name="component.assets.legacy.flatten" value="true" />
<property name="component.assets.legacy.base" location="${component.assets.base}/legacy" />
<property name="component.assets.legacy.files" value="**/*" />
<property name="component.assets.skins.base" location="${component.assets.base}/skins" />
<property name="component.assets.skins.files" value="**/*" />
<condition property="component.skins.exist">
<and>
<available file="${component.assets.base}/${component}-core.css" type="file" />
<available file="${component.assets.base}/skins" type="dir" />
</and>
</condition>
<!-- component is part of a rollup build, so rollup skins to parent -->
<condition property="rollupskins">
<and>
<istrue value="${rollup}" />
<istrue value="${component.skins.exist}" />
</and>
</condition>
<available file="${component.assets.base}" type="dir" property="component.assets.exist"/>
<condition property="component.langs.exist">
<and>
<or>
<isset property="component.lang" />
<isset property="component.rollup.lang" />
</or>
</and>
</condition>
<condition property="rolluplangs">
<and>
<istrue value="${rollup}" />
<istrue value="${component.langs.exist}" />
</and>
</condition>
<!--
DEPRECATED: component.basefilename and component.releasetype are deprecated
We used to mark filenames with suffixes (-beta, -experimental), which we no longer do
-->
<condition property="component.basefilename" value="${component}" else="${component}">
<isset property="component.releasetype"/>
</condition>
<!-- Default logger regex values if not provided -->
<property name="component.logger.regex" value="^.*?(?:logger|YAHOO.log).*?(?:;|\).*;|(?:\r?\n.*?)*?\).*;).*;?.*?\r?\n" />
<property name="component.logger.regex.replace" value="" />
<property name="component.logger.regex.flags" value="mg" />
<property name="component.logger.regex.byline" value="false" />
<!-- Rollup support, currently only used for YUI 3 -->
<property name="component.rollup" value="false"/>
<property name="component.rollup.target" value="all"/>
<condition property="component.builddir" value="${component.basedir}/build_rollup_tmp" else="${component.basedir}/build_tmp">
<istrue value="${component.rollup}"/>
</condition>
<condition property="rollup.skins.exist">
<and>
<istrue value="${component.rollup}" />
<available file="${component.assets.base}/skins" type="dir" />
</and>
</condition>
<condition property="skins.exist">
<or>
<istrue value="${rollup.skins.exist}" />
<istrue value="${component.skins.exist}" />
</or>
</condition>
<!-- The temporary working directory used by the build process -->
<property name="workingdir" location="${component.builddir}/ant" />
<!-- Directory for language resource bundles in JSON format derived from YRB format -->
<property name="component.langbuilddir" value="${component.basedir}/build_lang_tmp" />
<!-- The file which defines the default targets for the particular type of component (module, rollup, css) -->
<condition property="targetbase" value="rollup" else="module">
<istrue value="${component.rollup}"/>
</condition>
<condition property="targets" value="../shared/cssmodule.xml" else="${targetbase}.xml">
<isset property="component.cssfiles" />
</condition>
<!-- By default, jslint failure should fail the build.
This can be overridden on the command line. -->
<property name="lint.failonerror" value="true"/>
<property name="node.jslint.url" value="http://127.0.0.1:8081/"/>
<property name="yuicompressor.url" value="http://127.0.0.1:${yuicompressor.port}/compress"/>
</project>
|
yui/builder
|
07b12500c35e07117d7ffa82c74213820cd25022
|
more predefs
|
diff --git a/componentbuild/lib/jslint/jslint-console.js b/componentbuild/lib/jslint/jslint-console.js
index cf999f8..7081817 100644
--- a/componentbuild/lib/jslint/jslint-console.js
+++ b/componentbuild/lib/jslint/jslint-console.js
@@ -1,71 +1,71 @@
/**
* Javascript Shell Script to Load and JSLint js files through Rhino Javascript Shell
* The jslint source file is expected as the first argument, followed by the list of JS files to JSLint
- *
- * e.g.
- * java -j js.jar /tools/fulljslint.js testFile1.js testFile2.js testFile3.js
+ *
+ * e.g.
+ * java -j js.jar /tools/fulljslint.js testFile1.js testFile2.js testFile3.js
**/
var jslintsrc = arguments.splice(0,1);
var scripts = arguments;
load(jslintsrc);
(function(){ // Just to keep stuff seperate from JSLINT code
- var OPTS = {
- browser : true,
- //laxLineEnd : true,
- undef: true,
- newcap: false,
- predef:["YUI"]
- };
-
- function test(jsFile) {
-
- print("Running JSLint on : " + jsFile);
-
- var js = readFile(jsFile);
+ var OPTS = {
+ browser : true,
+ //laxLineEnd : true,
+ undef: true,
+ newcap: false,
+ predef:["YUI", "window", "YUI_config", "YAHOO", "YAHOO_config", "opera", "exports", "document", "navigator", "console"]
+ };
- var success = JSLINT(js, OPTS);
- if (success) {
- print("- OK");
- } else {
- print(" \n");
+ function test(jsFile) {
+
+ print("Running JSLint on : " + jsFile);
+
+ var js = readFile(jsFile);
+
+ var success = JSLINT(js, OPTS);
+ if (success) {
+ print("- OK");
+ } else {
+ print(" \n");
+
+ for (var i=0; i < JSLINT.errors.length; ++i) {
+ var e = JSLINT.errors[i];
+ if (e) {
+ print("\t" + e.line + ", " + e.character + ": " + e.reason + "\n\t" + clean(e.evidence) + "\n");
+ }
+ }
+ print(" \n");
- for (var i=0; i < JSLINT.errors.length; ++i) {
- var e = JSLINT.errors[i];
- if (e) {
- print("\t" + e.line + ", " + e.character + ": " + e.reason + "\n\t" + clean(e.evidence) + "\n");
- }
- }
- print(" \n");
-
// Last item is null if JSLint hit a fatal error
if (JSLINT.errors && JSLINT.errors[JSLINT.errors.length-1] === null) {
throw new Error("Fatal JSLint Exception. Stopped lint");
}
- }
- }
-
- function clean(str) {
- var trimmed = "";
- if (str) {
- if(str.length <= 500) {
- trimmed = str.replace(/^\s*(\S*(\s+\S+)*)\s*$/, "$1");
- } else {
- trimmed = "[Code Evidence Omitted: Greater than 500 chars]";
- }
- }
- return trimmed;
- }
-
- function jslint(aScripts) {
- for (var i = 0; i < aScripts.length; ++i) {
- test(aScripts[i]);
- }
- };
-
- jslint(scripts);
+ }
+ }
+
+ function clean(str) {
+ var trimmed = "";
+ if (str) {
+ if(str.length <= 500) {
+ trimmed = str.replace(/^\s*(\S*(\s+\S+)*)\s*$/, "$1");
+ } else {
+ trimmed = "[Code Evidence Omitted: Greater than 500 chars]";
+ }
+ }
+ return trimmed;
+ }
+
+ function jslint(aScripts) {
+ for (var i = 0; i < aScripts.length; ++i) {
+ test(aScripts[i]);
+ }
+ };
+
+ jslint(scripts);
})();
diff --git a/componentbuild/lib/jslint/jslint-node.js b/componentbuild/lib/jslint/jslint-node.js
index cf6f167..d3bbe19 100644
--- a/componentbuild/lib/jslint/jslint-node.js
+++ b/componentbuild/lib/jslint/jslint-node.js
@@ -1,118 +1,118 @@
/**
* Javascript Shell Script to Load and JSLint js files through Rhino Javascript Shell
* The jslint source file is expected as the first argument, followed by the list of JS files to JSLint
- *
- * e.g.
- * java -j js.jar /tools/fulljslint.js testFile1.js testFile2.js testFile3.js
+ *
+ * e.g.
+ * java -j js.jar /tools/fulljslint.js testFile1.js testFile2.js testFile3.js
**/
JSLINT = require("./fulljslint").JSLINT;
(function(){ // Just to keep stuff seperate from JSLINT code
var PORT = parseInt(process.argv[2]) || 8081;
- var OPTS = {
- browser : true,
- //laxLineEnd : true,
+ var OPTS = {
+ browser : true,
+ //laxLineEnd : true,
undef: true,
- newcap: false,
- predef:["YUI"]
- };
-
- function test(js) {
+ newcap: false,
+ predef:["YUI", "window", "YUI_config", "YAHOO", "YAHOO_config", "opera", "exports", "document", "navigator", "console"]
+ };
+
+ function test(js) {
var body = "", code = 200;
var success = JSLINT(js, OPTS);
- if (success) {
- return "OK";
- } else {
- for (var i=0; i < JSLINT.errors.length; ++i) {
- var e = JSLINT.errors[i];
- if (e) {
- body += ("\t" + e.line + ", " + e.character + ": " + e.reason + "\n\t" + clean(e.evidence) + "\n");
- }
- }
+ if (success) {
+ return "OK";
+ } else {
+ for (var i=0; i < JSLINT.errors.length; ++i) {
+ var e = JSLINT.errors[i];
+ if (e) {
+ body += ("\t" + e.line + ", " + e.character + ": " + e.reason + "\n\t" + clean(e.evidence) + "\n");
+ }
+ }
body += "\n";
// Last item is null if JSLint hit a fatal error
if (JSLINT.errors && JSLINT.errors[JSLINT.errors.length-1] === null) {
code = 500;
}
return {
"content" : body,
"code" : code
};
- }
- }
-
- function clean(str) {
- var trimmed = "";
- if (str) {
- if(str.length <= 500) {
- trimmed = str.replace(/^\s*(\S*(\s+\S+)*)\s*$/, "$1");
- } else {
- trimmed = "[Code Evidence Omitted: Greater than 500 chars]";
- }
- }
- return trimmed;
- }
+ }
+ }
+
+ function clean(str) {
+ var trimmed = "";
+ if (str) {
+ if(str.length <= 500) {
+ trimmed = str.replace(/^\s*(\S*(\s+\S+)*)\s*$/, "$1");
+ } else {
+ trimmed = "[Code Evidence Omitted: Greater than 500 chars]";
+ }
+ }
+ return trimmed;
+ }
var qs = require("querystring");
var fs = require("fs");
var EventEmitter = require("events").EventEmitter;
var ticket = 0;
require("http").createServer(function (req, res) {
var data = "";
req.addListener("data", function (chunk) {
data += chunk;
});
var proc = new EventEmitter();
proc.addListener("end", function (code, body, die) {
res.writeHead(code, {"Content-type" : "text/plain"});
res.end(body);
if (die) process.exit(0);
});
req.addListener("end", function () {
ticket++;
var code = 200, body;
var die = "/kill" === req.url;
if (die) body = "Goodbye.";
else if (req.method === "POST") {
var query = qs.parse(data);
var files = query["files"].split("' '");
var failOnError = query["failonerror"] == "true";
var results = [];
files.forEach(function (file) {
fs.readFile(file, function (err, data) {
var diagnosis = test(data.toString("utf8"));
results.push(diagnosis.content);
code = (
failOnError &&
diagnosis.code !== 200
) ? diagnosis.code : code;
if (results.length == files.length) proc.emit("end", code, results.join("\n"));
});
});
} else {
body = "Ready.";
}
if (body) proc.emit("end", code, body, die);
});
}).listen(PORT, "127.0.0.1");
require("sys").puts("Server started on port " + PORT);
(function () {
var reap;
setInterval(function () {
if (reap == ticket) process.exit(0);
reap = ticket;
}, 10000);
})();
})();
-
+
|
yui/builder
|
4a8c68b7447647a73d75173d156caad503deeb0e
|
Added 'after' support
|
diff --git a/componentbuild/shared/macrolib.xml b/componentbuild/shared/macrolib.xml
index 9c56b36..2e638fe 100644
--- a/componentbuild/shared/macrolib.xml
+++ b/componentbuild/shared/macrolib.xml
@@ -1,430 +1,431 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiMacroLib">
<macrodef name="arrayliteral">
<attribute name="from" />
<attribute name="to" />
<attribute name="key" />
<sequential>
<if>
<and>
<isset property="@{from}" />
<length string="${@{from}}" when="ne" length="0" />
</and>
<then>
<propertyregex property="array"
override="true"
input="${@{from}}"
casesensitive="false"
regexp="([^\,\s]+)"
replace="'\1'"
/>
<property name="@{to}" value="@{key}:[${array}]" />
</then>
</if>
</sequential>
</macrodef>
<macrodef name="createdetails">
<sequential>
<arrayliteral from="component.use" to="component.details.use" key="use" />
<arrayliteral from="component.supersedes" to="component.details.supersedes" key="supersedes" />
<arrayliteral from="component.requires" to="component.details.requires" key="requires" />
<arrayliteral from="component.optional" to="component.details.optional" key="optional" />
+ <arrayliteral from="component.after" to="component.details.after" key="after" />
<arrayliteral from="component.lang" to="component.details.lang" key="lang" />
<if>
<isset property="component.skinnable" />
<then>
<property name="component.details.skinnable" value="skinnable:${component.skinnable}" />
</then>
</if>
<propertyselector property="details.list"
delimiter=","
match="component\.details.([^\.]*)"
select="\1"
casesensitive="false" />
<var name="details" value="" />
<if>
<isset property="details.list" />
<then>
<for list="${details.list}" param="val">
<sequential>
<var name="details" value="${component.details.@{val}}, ${details}" />
</sequential>
</for>
<propertyregex property="component.details.hash"
input="{${details}}"
regexp="(\,\s*?\})"
replace="}"
casesensitive="false" />
</then>
<else>
<property name="component.details.hash" value="" />
</else>
</if>
</sequential>
</macrodef>
<macrodef name="yuicompress">
<attribute name="src" />
<attribute name="dest" />
<attribute name="args" />
<attribute name="type" default="js"/>
<sequential>
<if>
<or>
<istrue value="${yuicompressor.online}"/>
<http url="${yuicompressor.url}" errorsBeginAt="500"/>
</or>
<then>
<property name="yuicompressor.online" value="true"/>
<property name="yuicompressor.output" value="@{dest}"/>
<property name="yuicompressor.file" value="@{src}"/>
<echo>If this web request fails, try building again with -Dyuicompressor.online=false or install the cURL executable into your PATH.</echo>
<exec executable="curl" input="@{src}" outputproperty="yuicompressor.result" failonerror="true" searchpath="true">
<arg value="--silent"/>
<arg line="-T"/>
<arg line="${yuicompressor.file}"/>
<arg line="${yuicompressor.url}?type=@{type}"/>
</exec>
<script language="javascript">
<![CDATA[
var echo;
var project = self.getProject();
var res = project.getProperty("yuicompressor.result");
res = eval("(" + res + ")");
function w (str, level) {
var echo = project.createTask("echo");
echo.setMessage(str);
echo.perform();
}
if (!res.result) {
var fail = project.createTask("fail");
fail.setMessage("Failed to minify!");
fail.perform();
}
function notify (level, errors) {
for (var i = 0, l = errors.length; i < l; i++) {
w(errors[i], level);
}
}
notify("error", res.errors);
notify("warning", res.warnings);
project.setProperty("yuicompressor.script", res.result);
]]>
</script>
<echo file="@{dest}" message="${yuicompressor.script}"/>
<var name="yuicompressor.output" unset="true"/>
<var name="yuicompressor.script" unset="true"/>
<var name="yuicompressor.file" unset="true"/>
<var name="yuicompressor.result" unset="true"/>
</then>
<else>
<echo level="info">Running yuicompressor on @{src} with @{args}</echo>
<java jar="${yuicompressor.java15.jar}" fork="true" failonerror="true">
<arg line="@{args} -o" />
<arg file="@{dest}" />
<arg file="@{src}" />
</java>
</else>
</if>
</sequential>
</macrodef>
<macrodef name="concatsource">
<attribute name="destfile" />
<attribute name="sourcedir" />
<attribute name="sourcefiles" />
<attribute name="workingdir" default="${workingdir}" />
<element name="filters" optional="true" description="Additonal filters to apply to individual files"/>
<sequential>
<echo level="info">Concatenating</echo>
<echo level="info"> Source Files : @{sourcefiles}</echo>
<echo level="info"> In Source Dir : @{sourcedir}</echo>
<echo level="info"> To : @{destfile}</echo>
<delete dir="@{workingdir}" quiet="true"/>
<copy todir="@{workingdir}">
<filelist dir="@{sourcedir}" files="@{sourcefiles}" />
<filterchain>
<filters />
<fixcrlf fixlast="true" eof="remove"/>
</filterchain>
</copy>
<concat destfile="@{destfile}" fixlastline="true">
<filelist dir="@{workingdir}" files="@{sourcefiles}" />
</concat>
<delete dir="${workingdir}" quiet="true" />
</sequential>
</macrodef>
<macrodef name="jslint">
<element name="jsfiles" optional="false" />
<sequential>
<pathconvert pathsep="' '" property="jsfileargs">
<jsfiles />
</pathconvert>
<if>
<or>
<istrue value="${node.online}"/>
<http url="${node.jslint.url}"/>
</or>
<then>
<property name="node.online" value="true"/>
<post to="${node.jslint.url}" property="node.jslint.response" failonerror="${lint.failonerror}">
<prop name="files" value="${jsfileargs}"/>
<prop name="failonerror" value="${lint.failonerror}"/>
</post>
<!-- Since Ant doesn't really failonerror for the post task,
handle this ourselves: -->
<if>
<not>
<isset property="node.jslint.response"/>
</not>
<then>
<fail>JSLint failed. To view lint output and continue the build, run ant with -Dlint.failonerror=false.</fail>
</then>
</if>
<!-- Clear property for next run: -->
<var name="node.jslint.response" unset="true"/>
</then>
<else>
<echo>Using Rhino. Install nodejs to improve jslint speed, or skip with -Dlint.skip=true</echo>
<!--
Need to find a way to convert fileset to args (script?) to
avoid ' ', which will break for files with ' in them
Evaluates to the following java execution line...
java -r js.jar jslintconsole.js 'file1.js' 'file2.js' 'file3.js'
-->
<java jar="${rhino.jar}" fork="true" failonerror="${jslint.failonerror}">
<arg file="${jslintconsole.js}" />
<arg value="${jslintsrc.js}" />
<arg line="'${jsfileargs}'" />
</java>
</else>
</if>
</sequential>
</macrodef>
<macrodef name="registerversion">
<attribute name="module" />
<attribute name="classname" />
<attribute name="file" />
<sequential>
<loadfile srcfile="${builddir}/files/versioncode.txt" property="@{module}-@{classname}-version" >
<filterchain>
<replacetokens>
<token key="MODULE" value="@{module}"/>
<token key="CLASSNAME" value="@{classname}"/>
</replacetokens>
</filterchain>
</loadfile>
<echo level="info">Adding Version Registration Code to @{file}</echo>
<concat destfile="@{file}" append="true" fixlastline="true">${@{module}-@{classname}-version}</concat>
</sequential>
</macrodef>
<macrodef name="addlang">
<attribute name="dir" />
<attribute name="module" />
<attribute name="dest" />
<attribute name="lang" default="" />
<attribute name="details" default = ""/>
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}@{lang}_details" value="" />
</then>
<else>
<property name="@{module}@{lang}_details" value=",@{details}" />
</else>
</if>
<if>
<equals arg1="@{lang}" arg2="" />
<then>
<property name="@{module}@{lang}_fullname" value="@{module}" />
</then>
<else>
<property name="@{module}@{lang}_fullname" value="@{module}_@{lang}" />
</else>
</if>
<if>
<available file="@{dir}/${@{module}@{lang}_fullname}.pres" />
<then>
<mkdir dir="${component.langbuilddir}" />
<java jar="${rhino.jar}" fork="true" failonerror="true">
<jvmarg value="-Dfile.encoding=utf-8" />
<arg file="${yrb2jsonconsole.js}" />
<arg file="${yrb2jsonsrc.js}" />
<arg file="@{dir}/${@{module}@{lang}_fullname}.pres" />
<arg file="${component.langbuilddir}/${@{module}@{lang}_fullname}.js" />
</java>
<echo level="info">Wrapping ${component.langbuilddir}/${@{module}@{lang}_fullname}.js in YUI.add, Y.Intl.add</echo>
<loadfile srcfile="${component.langbuilddir}/${@{module}@{lang}_fullname}.js" property="@{module}@{lang}-strs-loaded" encoding="utf-8" />
</then>
<else>
<echo level="info">Wrapping @{dir}/${@{module}@{lang}_fullname}.js in YUI.add, Y.Intl.add</echo>
<loadfile srcfile="@{dir}/${@{module}@{lang}_fullname}.js" property="@{module}@{lang}-strs-loaded" encoding="utf-8" />
</else>
</if>
<copy file="${builddir}/files/langtemplate.txt" tofile="@{dest}/${@{module}@{lang}_fullname}.js" overwrite="true" outputencoding="utf-8">
<filterset>
<filter token="LANG" value="@{lang}" />
<filter token="LANG_MODULE" value="lang/${@{module}@{lang}_fullname}" />
<filter token="STRINGS" value="${@{module}@{lang}-strs-loaded}" />
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}" />
<filter token="LANG_DETAILS" value="${@{module}@{lang}_details}" />
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addmodule">
<attribute name="file" />
<attribute name="module" />
<attribute name="details" default="" />
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}-details" value="" />
</then>
<else>
<property name="@{module}-details" value=",@{details}" />
</else>
</if>
<loadfile srcfile="@{file}" property="@{module}-@{file}-code" />
<echo level="info">Wrapping @{file} in YUI.add module</echo>
<copy file="${builddir}/files/moduletemplate.txt" tofile="@{file}" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{file}-code}" />
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}" />
<filter token="DETAILS" value="${@{module}-details}" />
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addrollup">
<attribute name="file" />
<attribute name="module" />
<attribute name="details" default="" />
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}-details" value="" />
</then>
<else>
<property name="@{module}-details" value=",@{details}" />
</else>
</if>
<loadfile srcfile="@{file}" property="@{module}-@{file}-code" />
<echo level="info">Adding Rollup @{file} using YUI.add</echo>
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{file}" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{file}-code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}"/>
<filter token="DETAILS" value="${@{module}-details}"/>
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addlangrollup">
<attribute name="module" />
<attribute name="dir" />
<sequential>
<echo level="info">Registering rollup info for lang files in @{dir} using YUI.add</echo>
<for list="${component.rollup.lang}" param="lang" trim="true">
<sequential>
<loadfile srcfile="@{dir}/@{module}_@{lang}.js" property="@{module}-@{lang}-code" />
<var name="lang.use" value="{use:[" />
<for list="${component.lang.use}" param="submod" trim="true">
<sequential>
<var name="lang.use" value="${lang.use}'lang/@{submod}_@{lang}'," />
</sequential>
</for>
<var name="lang.use" value="${lang.use}]}" />
<propertyregex property="@{module}-@{lang}-details"
input="${lang.use}"
regexp="(\,\s*?\])"
replace="]"
casesensitive="false" />
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{dir}/@{module}_@{lang}.js" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{lang}-code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="lang/@{module}_@{lang}"/>
<filter token="DETAILS" value=", ${@{module}-@{lang}-details}"/>
</filterset>
</copy>
</sequential>
</for>
<loadfile srcfile="@{dir}/@{module}.js" property="@{module}--code" />
<var name="lang.use" value="{use:[" />
<for list="${component.lang.use}" param="submod" trim="true">
<sequential>
<var name="lang.use" value="${lang.use}'lang/@{submod}'," />
</sequential>
</for>
<var name="lang.use" value="${lang.use}]}" />
<propertyregex property="@{module}--details"
input="${lang.use}"
regexp="(\,\s*?\])"
replace="]"
casesensitive="false" />
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{dir}/@{module}.js" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}--code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="lang/@{module}"/>
<filter token="DETAILS" value=", ${@{module}--details}"/>
</filterset>
</copy>
</sequential>
</macrodef>
</project>
|
yui/builder
|
e990b90899dcdb3d2d2ada7331f065a7b4ca686c
|
Added YUI to predefs, added condition around use of exports
|
diff --git a/componentbuild/lib/jslint/fulljslint.js b/componentbuild/lib/jslint/fulljslint.js
index 7c7bd57..5b3222c 100644
--- a/componentbuild/lib/jslint/fulljslint.js
+++ b/componentbuild/lib/jslint/fulljslint.js
@@ -5107,513 +5107,515 @@ loop: for (;;) {
return this;
}).exps = true;
stmt('throw', function () {
nolinebreak(this);
nonadjacent(token, nexttoken);
this.first = parse(20);
reachable('throw');
return this;
}).exps = true;
reserve('void');
// Superfluous reserved words
reserve('class');
reserve('const');
reserve('enum');
reserve('export');
reserve('extends');
reserve('import');
reserve('super');
reserve('let');
reserve('yield');
reserve('implements');
reserve('interface');
reserve('package');
reserve('private');
reserve('protected');
reserve('public');
reserve('static');
// Parse JSON
function jsonValue() {
function jsonObject() {
var o = {}, t = nexttoken;
advance('{');
if (nexttoken.id !== '}') {
for (;;) {
if (nexttoken.id === '(end)') {
error("Missing '}' to match '{' from line {a}.",
nexttoken, t.line);
} else if (nexttoken.id === '}') {
warning("Unexpected comma.", token);
break;
} else if (nexttoken.id === ',') {
error("Unexpected comma.", nexttoken);
} else if (nexttoken.id !== '(string)') {
warning("Expected a string and instead saw {a}.",
nexttoken, nexttoken.value);
}
if (o[nexttoken.value] === true) {
warning("Duplicate key '{a}'.",
nexttoken, nexttoken.value);
} else if (nexttoken.value === '__proto__') {
warning("Stupid key '{a}'.",
nexttoken, nexttoken.value);
} else {
o[nexttoken.value] = true;
}
advance();
advance(':');
jsonValue();
if (nexttoken.id !== ',') {
break;
}
advance(',');
}
}
advance('}');
}
function jsonArray() {
var t = nexttoken;
advance('[');
if (nexttoken.id !== ']') {
for (;;) {
if (nexttoken.id === '(end)') {
error("Missing ']' to match '[' from line {a}.",
nexttoken, t.line);
} else if (nexttoken.id === ']') {
warning("Unexpected comma.", token);
break;
} else if (nexttoken.id === ',') {
error("Unexpected comma.", nexttoken);
}
jsonValue();
if (nexttoken.id !== ',') {
break;
}
advance(',');
}
}
advance(']');
}
switch (nexttoken.id) {
case '{':
jsonObject();
break;
case '[':
jsonArray();
break;
case 'true':
case 'false':
case 'null':
case '(number)':
case '(string)':
advance();
break;
case '-':
advance('-');
if (token.character !== nexttoken.from) {
warning("Unexpected space after '-'.", token);
}
adjacent(token, nexttoken);
advance('(number)');
break;
default:
error("Expected a JSON value.", nexttoken);
}
}
// The actual JSLINT function itself.
var itself = function (s, o) {
var a, i;
JSLINT.errors = [];
predefined = Object.create(standard);
if (o) {
a = o.predef;
if (a instanceof Array) {
for (i = 0; i < a.length; i += 1) {
predefined[a[i]] = true;
}
}
if (o.adsafe) {
o.safe = true;
}
if (o.safe) {
o.browser = false;
o.css = false;
o.debug = false;
o.devel = false;
o.eqeqeq = true;
o.evil = false;
o.forin = false;
o.nomen = true;
o.on = false;
o.rhino = false;
o.safe = true;
o.windows = false;
o.strict = true;
o.sub = false;
o.undef = true;
o.widget = false;
predefined.Date = null;
predefined['eval'] = null;
predefined.Function = null;
predefined.Object = null;
predefined.ADSAFE = false;
predefined.lib = false;
}
option = o;
} else {
option = {};
}
option.indent = option.indent || 4;
option.maxerr = option.maxerr || 50;
adsafe_id = '';
adsafe_may = false;
adsafe_went = false;
approved = {};
if (option.approved) {
for (i = 0; i < option.approved.length; i += 1) {
approved[option.approved[i]] = option.approved[i];
}
} else {
approved.test = 'test';
}
tab = '';
for (i = 0; i < option.indent; i += 1) {
tab += ' ';
}
indent = 1;
global = Object.create(predefined);
scope = global;
funct = {
'(global)': true,
'(name)': '(global)',
'(scope)': scope,
'(breakage)': 0,
'(loopage)': 0
};
functions = [funct];
ids = {};
urls = [];
src = false;
xmode = false;
stack = null;
member = {};
membersOnly = null;
implied = {};
inblock = false;
lookahead = [];
jsonmode = false;
warnings = 0;
lex.init(s);
prereg = true;
strict_mode = false;
prevtoken = token = nexttoken = syntax['(begin)'];
assume();
try {
advance();
if (nexttoken.value.charAt(0) === '<') {
html();
if (option.adsafe && !adsafe_went) {
warning("ADsafe violation: Missing ADSAFE.go.", this);
}
} else {
switch (nexttoken.id) {
case '{':
case '[':
option.laxbreak = true;
jsonmode = true;
jsonValue();
break;
case '@':
case '*':
case '#':
case '.':
case ':':
xmode = 'style';
advance();
if (token.id !== '@' || !nexttoken.identifier ||
nexttoken.value !== 'charset' || token.line !== 1 ||
token.from !== 1) {
error('A css file should begin with @charset "UTF-8";');
}
advance();
if (nexttoken.type !== '(string)' &&
nexttoken.value !== 'UTF-8') {
error('A css file should begin with @charset "UTF-8";');
}
advance();
advance(';');
styles();
break;
default:
if (option.adsafe && option.fragment) {
error("Expected '{a}' and instead saw '{b}'.",
nexttoken, '<div>', nexttoken.value);
}
statements('lib');
}
}
advance('(end)');
} catch (e) {
if (e) {
JSLINT.errors.push({
reason : e.message,
line : e.line || nexttoken.line,
character : e.character || nexttoken.from
}, null);
}
}
return JSLINT.errors.length === 0;
};
function is_array(o) {
return Object.prototype.toString.apply(o) === '[object Array]';
}
function to_array(o) {
var a = [], k;
for (k in o) {
if (is_own(o, k)) {
a.push(k);
}
}
return a;
}
// Data summary.
itself.data = function () {
var data = {functions: []}, fu, globals, implieds = [], f, i, j,
members = [], n, unused = [], v;
if (itself.errors.length) {
data.errors = itself.errors;
}
if (jsonmode) {
data.json = true;
}
for (n in implied) {
if (is_own(implied, n)) {
implieds.push({
name: n,
line: implied[n]
});
}
}
if (implieds.length > 0) {
data.implieds = implieds;
}
if (urls.length > 0) {
data.urls = urls;
}
globals = to_array(scope);
if (globals.length > 0) {
data.globals = globals;
}
for (i = 1; i < functions.length; i += 1) {
f = functions[i];
fu = {};
for (j = 0; j < functionicity.length; j += 1) {
fu[functionicity[j]] = [];
}
for (n in f) {
if (is_own(f, n) && n.charAt(0) !== '(') {
v = f[n];
if (is_array(fu[v])) {
fu[v].push(n);
if (v === 'unused') {
unused.push({
name: n,
line: f['(line)'],
'function': f['(name)']
});
}
}
}
}
for (j = 0; j < functionicity.length; j += 1) {
if (fu[functionicity[j]].length === 0) {
delete fu[functionicity[j]];
}
}
fu.name = f['(name)'];
fu.param = f['(params)'];
fu.line = f['(line)'];
fu.last = f['(last)'];
data.functions.push(fu);
}
if (unused.length > 0) {
data.unused = unused;
}
members = [];
for (n in member) {
if (typeof member[n] === 'number') {
data.member = member;
break;
}
}
return data;
};
itself.report = function (option) {
var data = itself.data();
var a = [], c, e, err, f, i, k, l, m = '', n, o = [], s;
function detail(h, array) {
var b, i, singularity;
if (array) {
o.push('<div><i>' + h + '</i> ');
array = array.sort();
for (i = 0; i < array.length; i += 1) {
if (array[i] !== singularity) {
singularity = array[i];
o.push((b ? ', ' : '') + singularity);
b = true;
}
}
o.push('</div>');
}
}
if (data.errors || data.implieds || data.unused) {
err = true;
o.push('<div id=errors><i>Error:</i>');
if (data.errors) {
for (i = 0; i < data.errors.length; i += 1) {
c = data.errors[i];
if (c) {
e = c.evidence || '';
o.push('<p>Problem' + (isFinite(c.line) ? ' at line ' +
c.line + ' character ' + c.character : '') +
': ' + c.reason.entityify() +
'</p><p class=evidence>' +
(e && (e.length > 80 ? e.slice(0, 77) + '...' :
e).entityify()) + '</p>');
}
}
}
if (data.implieds) {
s = [];
for (i = 0; i < data.implieds.length; i += 1) {
s[i] = '<code>' + data.implieds[i].name + '</code> <i>' +
data.implieds[i].line + '</i>';
}
o.push('<p><i>Implied global:</i> ' + s.join(', ') + '</p>');
}
if (data.unused) {
s = [];
for (i = 0; i < data.unused.length; i += 1) {
s[i] = '<code><u>' + data.unused[i].name + '</u></code> <i>' +
data.unused[i].line + '</i> <code>' +
data.unused[i]['function'] + '</code>';
}
o.push('<p><i>Unused variable:</i> ' + s.join(', ') + '</p>');
}
if (data.json) {
o.push('<p>JSON: bad.</p>');
}
o.push('</div>');
}
if (!option) {
o.push('<br><div id=functions>');
if (data.urls) {
detail("URLs<br>", data.urls, '<br>');
}
if (xmode === 'style') {
o.push('<p>CSS.</p>');
} else if (data.json && !err) {
o.push('<p>JSON: good.</p>');
} else if (data.globals) {
o.push('<div><i>Global</i> ' +
data.globals.sort().join(', ') + '</div>');
} else {
o.push('<div><i>No new global variables introduced.</i></div>');
}
for (i = 0; i < data.functions.length; i += 1) {
f = data.functions[i];
o.push('<br><div class=function><i>' + f.line + '-' +
f.last + '</i> ' + (f.name || '') + '(' +
(f.param ? f.param.join(', ') : '') + ')</div>');
detail('<big><b>Unused</b></big>', f.unused);
detail('Closure', f.closure);
detail('Variable', f['var']);
detail('Exception', f.exception);
detail('Outer', f.outer);
detail('Global', f.global);
detail('Label', f.label);
}
if (data.member) {
a = to_array(data.member);
if (a.length) {
a = a.sort();
m = '<br><pre id=members>/*members ';
l = 10;
for (i = 0; i < a.length; i += 1) {
k = a[i];
n = k.name();
if (l + n.length > 72) {
o.push(m + '<br>');
m = ' ';
l = 1;
}
l += n.length + 2;
if (data.member[k] === 1) {
n = '<i>' + n + '</i>';
}
if (i < a.length - 1) {
n += ', ';
}
m += n;
}
o.push(m + '<br>*/</pre>');
}
o.push('</div>');
}
}
return o.join('');
};
itself.jslint = itself;
itself.edition = '2010-04-06';
return itself;
}());
-exports.JSLINT = JSLINT;
+if (typeof exports !== 'undefined') {
+ exports.JSLINT = JSLINT;
+}
diff --git a/componentbuild/lib/jslint/jslint-console.js b/componentbuild/lib/jslint/jslint-console.js
index 6eb6da9..cf999f8 100644
--- a/componentbuild/lib/jslint/jslint-console.js
+++ b/componentbuild/lib/jslint/jslint-console.js
@@ -1,70 +1,71 @@
/**
* Javascript Shell Script to Load and JSLint js files through Rhino Javascript Shell
* The jslint source file is expected as the first argument, followed by the list of JS files to JSLint
*
* e.g.
* java -j js.jar /tools/fulljslint.js testFile1.js testFile2.js testFile3.js
**/
var jslintsrc = arguments.splice(0,1);
var scripts = arguments;
load(jslintsrc);
(function(){ // Just to keep stuff seperate from JSLINT code
var OPTS = {
browser : true,
//laxLineEnd : true,
undef: true,
- newcap: false
+ newcap: false,
+ predef:["YUI"]
};
function test(jsFile) {
print("Running JSLint on : " + jsFile);
var js = readFile(jsFile);
var success = JSLINT(js, OPTS);
if (success) {
print("- OK");
} else {
print(" \n");
for (var i=0; i < JSLINT.errors.length; ++i) {
var e = JSLINT.errors[i];
if (e) {
print("\t" + e.line + ", " + e.character + ": " + e.reason + "\n\t" + clean(e.evidence) + "\n");
}
}
print(" \n");
// Last item is null if JSLint hit a fatal error
if (JSLINT.errors && JSLINT.errors[JSLINT.errors.length-1] === null) {
throw new Error("Fatal JSLint Exception. Stopped lint");
}
}
}
function clean(str) {
var trimmed = "";
if (str) {
if(str.length <= 500) {
trimmed = str.replace(/^\s*(\S*(\s+\S+)*)\s*$/, "$1");
} else {
trimmed = "[Code Evidence Omitted: Greater than 500 chars]";
}
}
return trimmed;
}
function jslint(aScripts) {
for (var i = 0; i < aScripts.length; ++i) {
test(aScripts[i]);
}
};
jslint(scripts);
})();
diff --git a/componentbuild/lib/jslint/jslint-node.js b/componentbuild/lib/jslint/jslint-node.js
index 4ca1f16..cf6f167 100644
--- a/componentbuild/lib/jslint/jslint-node.js
+++ b/componentbuild/lib/jslint/jslint-node.js
@@ -1,117 +1,118 @@
/**
* Javascript Shell Script to Load and JSLint js files through Rhino Javascript Shell
* The jslint source file is expected as the first argument, followed by the list of JS files to JSLint
*
* e.g.
* java -j js.jar /tools/fulljslint.js testFile1.js testFile2.js testFile3.js
**/
JSLINT = require("./fulljslint").JSLINT;
(function(){ // Just to keep stuff seperate from JSLINT code
var PORT = parseInt(process.argv[2]) || 8081;
var OPTS = {
browser : true,
//laxLineEnd : true,
undef: true,
- newcap: false
+ newcap: false,
+ predef:["YUI"]
};
function test(js) {
var body = "", code = 200;
var success = JSLINT(js, OPTS);
if (success) {
return "OK";
} else {
for (var i=0; i < JSLINT.errors.length; ++i) {
var e = JSLINT.errors[i];
if (e) {
body += ("\t" + e.line + ", " + e.character + ": " + e.reason + "\n\t" + clean(e.evidence) + "\n");
}
}
body += "\n";
// Last item is null if JSLint hit a fatal error
if (JSLINT.errors && JSLINT.errors[JSLINT.errors.length-1] === null) {
code = 500;
}
return {
"content" : body,
"code" : code
};
}
}
function clean(str) {
var trimmed = "";
if (str) {
if(str.length <= 500) {
trimmed = str.replace(/^\s*(\S*(\s+\S+)*)\s*$/, "$1");
} else {
trimmed = "[Code Evidence Omitted: Greater than 500 chars]";
}
}
return trimmed;
}
var qs = require("querystring");
var fs = require("fs");
var EventEmitter = require("events").EventEmitter;
var ticket = 0;
require("http").createServer(function (req, res) {
var data = "";
req.addListener("data", function (chunk) {
data += chunk;
});
var proc = new EventEmitter();
proc.addListener("end", function (code, body, die) {
res.writeHead(code, {"Content-type" : "text/plain"});
res.end(body);
if (die) process.exit(0);
});
req.addListener("end", function () {
ticket++;
var code = 200, body;
var die = "/kill" === req.url;
if (die) body = "Goodbye.";
else if (req.method === "POST") {
var query = qs.parse(data);
var files = query["files"].split("' '");
var failOnError = query["failonerror"] == "true";
var results = [];
files.forEach(function (file) {
fs.readFile(file, function (err, data) {
var diagnosis = test(data.toString("utf8"));
results.push(diagnosis.content);
code = (
failOnError &&
diagnosis.code !== 200
) ? diagnosis.code : code;
if (results.length == files.length) proc.emit("end", code, results.join("\n"));
});
});
} else {
body = "Ready.";
}
if (body) proc.emit("end", code, body, die);
});
}).listen(PORT, "127.0.0.1");
require("sys").puts("Server started on port " + PORT);
(function () {
var reap;
setInterval(function () {
if (reap == ticket) process.exit(0);
reap = ticket;
}, 10000);
})();
})();
|
yui/builder
|
df4af4ab795d38e9368e3cfc3df3af98e40aa4dc
|
Upload file to YUI Compressor instead.
|
diff --git a/componentbuild/lib/yuicompressor/yuicompressor-2.4.5pre.jar b/componentbuild/lib/yuicompressor/yuicompressor-2.4.5pre.jar
index 522809f..0317776 100644
Binary files a/componentbuild/lib/yuicompressor/yuicompressor-2.4.5pre.jar and b/componentbuild/lib/yuicompressor/yuicompressor-2.4.5pre.jar differ
diff --git a/componentbuild/shared/macrolib.xml b/componentbuild/shared/macrolib.xml
index 0febb26..9c56b36 100644
--- a/componentbuild/shared/macrolib.xml
+++ b/componentbuild/shared/macrolib.xml
@@ -1,430 +1,430 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiMacroLib">
<macrodef name="arrayliteral">
<attribute name="from" />
<attribute name="to" />
<attribute name="key" />
<sequential>
<if>
<and>
<isset property="@{from}" />
<length string="${@{from}}" when="ne" length="0" />
</and>
<then>
<propertyregex property="array"
override="true"
input="${@{from}}"
casesensitive="false"
regexp="([^\,\s]+)"
replace="'\1'"
/>
<property name="@{to}" value="@{key}:[${array}]" />
</then>
</if>
</sequential>
</macrodef>
<macrodef name="createdetails">
<sequential>
<arrayliteral from="component.use" to="component.details.use" key="use" />
<arrayliteral from="component.supersedes" to="component.details.supersedes" key="supersedes" />
<arrayliteral from="component.requires" to="component.details.requires" key="requires" />
<arrayliteral from="component.optional" to="component.details.optional" key="optional" />
<arrayliteral from="component.lang" to="component.details.lang" key="lang" />
<if>
<isset property="component.skinnable" />
<then>
<property name="component.details.skinnable" value="skinnable:${component.skinnable}" />
</then>
</if>
<propertyselector property="details.list"
delimiter=","
match="component\.details.([^\.]*)"
select="\1"
casesensitive="false" />
<var name="details" value="" />
<if>
<isset property="details.list" />
<then>
<for list="${details.list}" param="val">
<sequential>
<var name="details" value="${component.details.@{val}}, ${details}" />
</sequential>
</for>
<propertyregex property="component.details.hash"
input="{${details}}"
regexp="(\,\s*?\})"
replace="}"
casesensitive="false" />
</then>
<else>
<property name="component.details.hash" value="" />
</else>
</if>
</sequential>
</macrodef>
<macrodef name="yuicompress">
<attribute name="src" />
<attribute name="dest" />
<attribute name="args" />
<attribute name="type" default="js"/>
<sequential>
<if>
<or>
<istrue value="${yuicompressor.online}"/>
<http url="${yuicompressor.url}" errorsBeginAt="500"/>
</or>
<then>
<property name="yuicompressor.online" value="true"/>
<property name="yuicompressor.output" value="@{dest}"/>
<property name="yuicompressor.file" value="@{src}"/>
<echo>If this web request fails, try building again with -Dyuicompressor.online=false or install the cURL executable into your PATH.</echo>
- <exec executable="curl" input="@{src}" outputproperty="yuicompressor.result" failonerror="true">
+ <exec executable="curl" input="@{src}" outputproperty="yuicompressor.result" failonerror="true" searchpath="true">
<arg value="--silent"/>
- <arg line="--data-urlencode "/>
- <arg line="@${yuicompressor.file}"/>
+ <arg line="-T"/>
+ <arg line="${yuicompressor.file}"/>
<arg line="${yuicompressor.url}?type=@{type}"/>
</exec>
<script language="javascript">
<![CDATA[
var echo;
var project = self.getProject();
var res = project.getProperty("yuicompressor.result");
res = eval("(" + res + ")");
function w (str, level) {
var echo = project.createTask("echo");
echo.setMessage(str);
echo.perform();
}
if (!res.result) {
var fail = project.createTask("fail");
fail.setMessage("Failed to minify!");
fail.perform();
}
function notify (level, errors) {
for (var i = 0, l = errors.length; i < l; i++) {
w(errors[i], level);
}
}
notify("error", res.errors);
notify("warning", res.warnings);
project.setProperty("yuicompressor.script", res.result);
]]>
</script>
<echo file="@{dest}" message="${yuicompressor.script}"/>
<var name="yuicompressor.output" unset="true"/>
<var name="yuicompressor.script" unset="true"/>
<var name="yuicompressor.file" unset="true"/>
<var name="yuicompressor.result" unset="true"/>
</then>
<else>
<echo level="info">Running yuicompressor on @{src} with @{args}</echo>
<java jar="${yuicompressor.java15.jar}" fork="true" failonerror="true">
<arg line="@{args} -o" />
<arg file="@{dest}" />
<arg file="@{src}" />
</java>
</else>
</if>
</sequential>
</macrodef>
<macrodef name="concatsource">
<attribute name="destfile" />
<attribute name="sourcedir" />
<attribute name="sourcefiles" />
<attribute name="workingdir" default="${workingdir}" />
<element name="filters" optional="true" description="Additonal filters to apply to individual files"/>
<sequential>
<echo level="info">Concatenating</echo>
<echo level="info"> Source Files : @{sourcefiles}</echo>
<echo level="info"> In Source Dir : @{sourcedir}</echo>
<echo level="info"> To : @{destfile}</echo>
<delete dir="@{workingdir}" quiet="true"/>
<copy todir="@{workingdir}">
<filelist dir="@{sourcedir}" files="@{sourcefiles}" />
<filterchain>
<filters />
<fixcrlf fixlast="true" eof="remove"/>
</filterchain>
</copy>
<concat destfile="@{destfile}" fixlastline="true">
<filelist dir="@{workingdir}" files="@{sourcefiles}" />
</concat>
<delete dir="${workingdir}" quiet="true" />
</sequential>
</macrodef>
<macrodef name="jslint">
<element name="jsfiles" optional="false" />
<sequential>
<pathconvert pathsep="' '" property="jsfileargs">
<jsfiles />
</pathconvert>
<if>
<or>
<istrue value="${node.online}"/>
<http url="${node.jslint.url}"/>
</or>
<then>
<property name="node.online" value="true"/>
<post to="${node.jslint.url}" property="node.jslint.response" failonerror="${lint.failonerror}">
<prop name="files" value="${jsfileargs}"/>
<prop name="failonerror" value="${lint.failonerror}"/>
</post>
<!-- Since Ant doesn't really failonerror for the post task,
handle this ourselves: -->
<if>
<not>
<isset property="node.jslint.response"/>
</not>
<then>
<fail>JSLint failed. To view lint output and continue the build, run ant with -Dlint.failonerror=false.</fail>
</then>
</if>
<!-- Clear property for next run: -->
<var name="node.jslint.response" unset="true"/>
</then>
<else>
<echo>Using Rhino. Install nodejs to improve jslint speed, or skip with -Dlint.skip=true</echo>
<!--
Need to find a way to convert fileset to args (script?) to
avoid ' ', which will break for files with ' in them
Evaluates to the following java execution line...
java -r js.jar jslintconsole.js 'file1.js' 'file2.js' 'file3.js'
-->
<java jar="${rhino.jar}" fork="true" failonerror="${jslint.failonerror}">
<arg file="${jslintconsole.js}" />
<arg value="${jslintsrc.js}" />
<arg line="'${jsfileargs}'" />
</java>
</else>
</if>
</sequential>
</macrodef>
<macrodef name="registerversion">
<attribute name="module" />
<attribute name="classname" />
<attribute name="file" />
<sequential>
<loadfile srcfile="${builddir}/files/versioncode.txt" property="@{module}-@{classname}-version" >
<filterchain>
<replacetokens>
<token key="MODULE" value="@{module}"/>
<token key="CLASSNAME" value="@{classname}"/>
</replacetokens>
</filterchain>
</loadfile>
<echo level="info">Adding Version Registration Code to @{file}</echo>
<concat destfile="@{file}" append="true" fixlastline="true">${@{module}-@{classname}-version}</concat>
</sequential>
</macrodef>
<macrodef name="addlang">
<attribute name="dir" />
<attribute name="module" />
<attribute name="dest" />
<attribute name="lang" default="" />
<attribute name="details" default = ""/>
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}@{lang}_details" value="" />
</then>
<else>
<property name="@{module}@{lang}_details" value=",@{details}" />
</else>
</if>
<if>
<equals arg1="@{lang}" arg2="" />
<then>
<property name="@{module}@{lang}_fullname" value="@{module}" />
</then>
<else>
<property name="@{module}@{lang}_fullname" value="@{module}_@{lang}" />
</else>
</if>
<if>
<available file="@{dir}/${@{module}@{lang}_fullname}.pres" />
<then>
<mkdir dir="${component.langbuilddir}" />
<java jar="${rhino.jar}" fork="true" failonerror="true">
<jvmarg value="-Dfile.encoding=utf-8" />
<arg file="${yrb2jsonconsole.js}" />
<arg file="${yrb2jsonsrc.js}" />
<arg file="@{dir}/${@{module}@{lang}_fullname}.pres" />
<arg file="${component.langbuilddir}/${@{module}@{lang}_fullname}.js" />
</java>
<echo level="info">Wrapping ${component.langbuilddir}/${@{module}@{lang}_fullname}.js in YUI.add, Y.Intl.add</echo>
<loadfile srcfile="${component.langbuilddir}/${@{module}@{lang}_fullname}.js" property="@{module}@{lang}-strs-loaded" encoding="utf-8" />
</then>
<else>
<echo level="info">Wrapping @{dir}/${@{module}@{lang}_fullname}.js in YUI.add, Y.Intl.add</echo>
<loadfile srcfile="@{dir}/${@{module}@{lang}_fullname}.js" property="@{module}@{lang}-strs-loaded" encoding="utf-8" />
</else>
</if>
<copy file="${builddir}/files/langtemplate.txt" tofile="@{dest}/${@{module}@{lang}_fullname}.js" overwrite="true" outputencoding="utf-8">
<filterset>
<filter token="LANG" value="@{lang}" />
<filter token="LANG_MODULE" value="lang/${@{module}@{lang}_fullname}" />
<filter token="STRINGS" value="${@{module}@{lang}-strs-loaded}" />
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}" />
<filter token="LANG_DETAILS" value="${@{module}@{lang}_details}" />
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addmodule">
<attribute name="file" />
<attribute name="module" />
<attribute name="details" default="" />
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}-details" value="" />
</then>
<else>
<property name="@{module}-details" value=",@{details}" />
</else>
</if>
<loadfile srcfile="@{file}" property="@{module}-@{file}-code" />
<echo level="info">Wrapping @{file} in YUI.add module</echo>
<copy file="${builddir}/files/moduletemplate.txt" tofile="@{file}" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{file}-code}" />
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}" />
<filter token="DETAILS" value="${@{module}-details}" />
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addrollup">
<attribute name="file" />
<attribute name="module" />
<attribute name="details" default="" />
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}-details" value="" />
</then>
<else>
<property name="@{module}-details" value=",@{details}" />
</else>
</if>
<loadfile srcfile="@{file}" property="@{module}-@{file}-code" />
<echo level="info">Adding Rollup @{file} using YUI.add</echo>
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{file}" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{file}-code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}"/>
<filter token="DETAILS" value="${@{module}-details}"/>
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addlangrollup">
<attribute name="module" />
<attribute name="dir" />
<sequential>
<echo level="info">Registering rollup info for lang files in @{dir} using YUI.add</echo>
<for list="${component.rollup.lang}" param="lang" trim="true">
<sequential>
<loadfile srcfile="@{dir}/@{module}_@{lang}.js" property="@{module}-@{lang}-code" />
<var name="lang.use" value="{use:[" />
<for list="${component.lang.use}" param="submod" trim="true">
<sequential>
<var name="lang.use" value="${lang.use}'lang/@{submod}_@{lang}'," />
</sequential>
</for>
<var name="lang.use" value="${lang.use}]}" />
<propertyregex property="@{module}-@{lang}-details"
input="${lang.use}"
regexp="(\,\s*?\])"
replace="]"
casesensitive="false" />
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{dir}/@{module}_@{lang}.js" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{lang}-code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="lang/@{module}_@{lang}"/>
<filter token="DETAILS" value=", ${@{module}-@{lang}-details}"/>
</filterset>
</copy>
</sequential>
</for>
<loadfile srcfile="@{dir}/@{module}.js" property="@{module}--code" />
<var name="lang.use" value="{use:[" />
<for list="${component.lang.use}" param="submod" trim="true">
<sequential>
<var name="lang.use" value="${lang.use}'lang/@{submod}'," />
</sequential>
</for>
<var name="lang.use" value="${lang.use}]}" />
<propertyregex property="@{module}--details"
input="${lang.use}"
regexp="(\,\s*?\])"
replace="]"
casesensitive="false" />
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{dir}/@{module}.js" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}--code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="lang/@{module}"/>
<filter token="DETAILS" value=", ${@{module}--details}"/>
</filterset>
</copy>
</sequential>
</macrodef>
</project>
|
yui/builder
|
76ffa2e6f128c89782982819e9ba96c6335fd9c2
|
Check if Node.js is installed before spawning.
|
diff --git a/componentbuild/shared/targets.xml b/componentbuild/shared/targets.xml
index a77c0b8..cd9b509 100644
--- a/componentbuild/shared/targets.xml
+++ b/componentbuild/shared/targets.xml
@@ -1,201 +1,214 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiSharedTargets">
<echo level="info">Starting Build For ${component}</echo>
<echo level="info">Ant Properties</echo>
<echo level="info"> Home : ${ant.home}</echo>
<echo level="info"> Ant Version : ${ant.version}</echo>
<echo level="info"> Build File : ${ant.file}</echo>
<echo level="info">Local Build Properties</echo>
<echo level="info"> version : ${yui.version}</echo>
<echo level="info"> srcdir : ${srcdir}</echo>
<echo level="info"> builddir : ${builddir}</echo>
<echo level="info"> component : ${component}</echo>
<echo level="info"> component.basefilename : ${component.basefilename}</echo>
<echo level="info"> component.basedir : ${component.basedir}</echo>
<echo level="info"> component.builddir : ${component.builddir}</echo>
<echo level="info">Global Build Properties</echo>
<echo level="info"> global.build.base : ${global.build.base}</echo>
<echo level="info"> global.build.component : ${global.build.component}</echo>
<echo level="info"> global.build.component.assets : ${global.build.component.assets}</echo>
<dirname property="targets.basedir" file="${ant.file.YuiSharedTargets}"/>
<import file="${targets.basedir}/macrolib.xml" description="Macrodef definitions - jslint, yuicompessor, registerversion" />
<target name="all" depends="local, deploy" description="Build and Deploy to Global Build Directory" />
<target name="local" depends="clean, init, build, minify, lint" description="Build and Deploy to Local Build Directory" />
<target name="init">
<tstamp/>
<mkdir dir="${component.builddir}" />
<createdetails />
<antcall target="-yuicompressor"/>
<antcall target="-lint-server"/>
</target>
<target name="-lint-server" description="Start JSLint Server" unless="lint.skip">
<antcall target="-node">
<param name="src" value="${builddir}/lib/jslint/jslint-node.js"/>
</antcall>
</target>
<target name="-node" description="Start NodeJS Server" unless="node.spawn">
<if>
<not>
<http url="${node.jslint.url}"/>
</not>
<then>
- <echo level="info">Attempting to start NodeJS app at: ${src}</echo>
- <exec executable="node" spawn="true" failonerror="false">
- <arg value="${src}"/>
+ <!-- You can't set failifexecutionfails if spawn is true. Argh. -->
+ <!-- Check if it's installed first. -->
+ <exec resultproperty="node.status" executable="node" failonerror="false" failifexecutionfails="false" searchpath="true" resolveexecutable="true">
+ <arg value="-v"/>
</exec>
+ <if>
+ <equals arg1="${node.status}" arg2="0"/>
+ <then>
+ <echo level="info">Spawning Node.js app at: ${src}</echo>
+ <exec executable="node" spawn="true" failonerror="false" searchpath="true" resolveexecutable="true">
+ <arg value="${src}"/>
+ </exec>
+ </then>
+ <else>
+ <echo level="info">For faster builds, install Node.js.</echo>
+ </else>
+ </if>
<!-- Don't fail if node doesn't exist, fails to start, etc.
We will fallback to the slow Rhino engine later. -->
</then>
</if>
<!-- Don't try to start again. -->
<property name="node.spawn" value="true"/>
</target>
<target name="-yuicompressor" description="Start YUI Compressor Server" unless="yuicompressor.spawn">
<if>
<not>
<http url="${yuicompressor.url}"/>
</not>
<then>
<echo level="info">Attempting to start YUI Compressor server.</echo>
<java classname="com.yahoo.platform.yui.compressor.Bootstrap" fork="true" spawn="true" failonerror="false">
<arg line="--server"/>
<arg line="${yuicompressor.port}"/>
<arg line="${yuicompressor.js.args}"/>
<arg line="${yuicompressor.js.args.internal}"/>
<classpath>
<pathelement location="${yuicompressor.jar}"/>
</classpath>
</java>
</then>
</if>
<property name="yuicompressor.spawn" value="true"/>
</target>
<target name="clean" description="Clean Local Build Directory" unless="clean.skip">
<delete dir="${component.builddir}" />
</target>
<target name="build" />
<!-- MIN -->
<target name="minify" description="Create component-min.js from component.js">
<yuicompress src="${component.builddir}/${component.basefilename}.js" dest="${component.builddir}/${component.basefilename}-min.js" args="${yuicompressor.js.args.internal}" />
<if>
<available file="${component.builddir}/lang" type="dir" />
<then>
<for param="file">
<path>
<fileset dir="${component.builddir}/lang" includes="*.js"/>
</path>
<sequential>
<yuicompress src="@{file}" dest="@{file}" args="${yuicompressor.js.args.internal}" />
</sequential>
</for>
</then>
</if>
</target>
<target name="lint" description="Run jslint over the local build files (default settings)" unless="lint.skip">
<jslint>
<jsfiles>
<fileset dir="${component.builddir}" includes="*.js" />
</jsfiles>
</jslint>
</target>
<!-- DEPLOY -->
<target name="deploy" description="Copy files to global location" depends="deploybuild, deployassets, deployskins, deploylang, deploydocs"></target>
<target name="deploybuild" description="Copy built files to global build location">
<copy todir="${global.build.component}" overwrite="true" verbose="true">
<fileset dir="${component.builddir}" includes="*.js" />
</copy>
</target>
<target name="deployassets" if="component.assets.exist">
<copy todir="${global.build.component.assets}" flatten="${component.assets.flatten}" overwrite="true" verbose="true">
<fileset dir="${component.assets.base}" includes="${component.assets.files}" excludes="skins/, legacy/" />
</copy>
<copy todir="${global.build.component.assets}" flatten="${component.assets.legacy.flatten}" preservelastmodified="true" failonerror="false" verbose="true">
<fileset dir="${component.assets.legacy.base}" includes="${component.assets.legacy.files}" excludes="skins/" />
</copy>
</target>
<target name="deployskins" if="skins.exist">
<copy todir="${global.build.component.assets}/skins/sam" overwrite="true" verbose="true">
<fileset dir="${component.builddir}/assets/skins/sam" includes="${component}.css" />
</copy>
<copy todir="${global.build.component.assets}/skins/sam" overwrite="true" verbose="true">
<fileset dir="${component.assets.skins.base}/sam" includes="${component.assets.skins.files}" />
</copy>
</target>
<target name="deploylang" description="Copy language bundles to global build location">
<copy todir="${global.build.component}/lang" overwrite="true" failonerror="false" verbose="true">
<fileset dir="${component.builddir}/lang" includes="*.js" />
</copy>
</target>
<target name="deploydocs" description="Copy doc files to global doc locations">
<!-- TODO -->
</target>
<target name="-prepend" if="component.prependfiles">
<concat destfile="${workingdir}/${component.basefilename}.js.tmp" fixlastline="true">
<filelist dir="${component.basedir}" files="${component.prependfiles}" />
<filterchain>
<tokenfilter>
<filetokenizer/>
<replaceregex
pattern="${component.logger.regex}"
replace="${component.logger.regex.replace}"
flags="${component.logger.regex.flags}" />
</tokenfilter>
</filterchain>
</concat>
<concat destfile="${workingdir}/${component.basefilename}.js.tmp" fixlastline="true" append="true">
<filelist dir="${component.builddir}" files="${component.basefilename}.js" />
</concat>
<move file="${workingdir}/${component.basefilename}.js.tmp" tofile="${component.builddir}/${component.basefilename}.js" />
</target>
<target name="-append" if="component.appendfiles">
<concat destfile="${component.builddir}/${component.basefilename}.js" fixlastline="true" append="true">
<filelist dir="${component.basedir}" files="${component.appendfiles}" />
<filterchain>
<tokenfilter>
<filetokenizer/>
<replaceregex
pattern="${component.logger.regex}"
replace="${component.logger.regex.replace}"
flags="${component.logger.regex.flags}" />
</tokenfilter>
</filterchain>
</concat>
</target>
<target name="-prependdebug" if="component.prependfiles">
<concat destfile="${workingdir}/${component.basefilename}-debug.js.tmp" fixlastline="true" >
<filelist dir="${component.basedir}" files="${component.prependfiles}" />
<filelist dir="${component.builddir}" files="${component.basefilename}-debug.js" />
</concat>
<move file="${workingdir}/${component.basefilename}-debug.js.tmp" tofile="${component.builddir}/${component.basefilename}-debug.js" />
</target>
<target name="-appenddebug" if="component.appendfiles">
<concat destfile="${component.builddir}/${component.basefilename}-debug.js" fixlastline="true" append="true">
<filelist dir="${component.basedir}" files="${component.appendfiles}" />
</concat>
</target>
</project>
|
yui/builder
|
988d49d48a87ba35c98086b85bc84773fd380e4c
|
Don't fail on optional server targets.
|
diff --git a/componentbuild/shared/targets.xml b/componentbuild/shared/targets.xml
index 8e4c9df..a77c0b8 100644
--- a/componentbuild/shared/targets.xml
+++ b/componentbuild/shared/targets.xml
@@ -1,201 +1,201 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiSharedTargets">
<echo level="info">Starting Build For ${component}</echo>
<echo level="info">Ant Properties</echo>
<echo level="info"> Home : ${ant.home}</echo>
<echo level="info"> Ant Version : ${ant.version}</echo>
<echo level="info"> Build File : ${ant.file}</echo>
<echo level="info">Local Build Properties</echo>
<echo level="info"> version : ${yui.version}</echo>
<echo level="info"> srcdir : ${srcdir}</echo>
<echo level="info"> builddir : ${builddir}</echo>
<echo level="info"> component : ${component}</echo>
<echo level="info"> component.basefilename : ${component.basefilename}</echo>
<echo level="info"> component.basedir : ${component.basedir}</echo>
<echo level="info"> component.builddir : ${component.builddir}</echo>
<echo level="info">Global Build Properties</echo>
<echo level="info"> global.build.base : ${global.build.base}</echo>
<echo level="info"> global.build.component : ${global.build.component}</echo>
<echo level="info"> global.build.component.assets : ${global.build.component.assets}</echo>
<dirname property="targets.basedir" file="${ant.file.YuiSharedTargets}"/>
<import file="${targets.basedir}/macrolib.xml" description="Macrodef definitions - jslint, yuicompessor, registerversion" />
<target name="all" depends="local, deploy" description="Build and Deploy to Global Build Directory" />
<target name="local" depends="clean, init, build, minify, lint" description="Build and Deploy to Local Build Directory" />
<target name="init">
<tstamp/>
<mkdir dir="${component.builddir}" />
<createdetails />
<antcall target="-yuicompressor"/>
<antcall target="-lint-server"/>
</target>
<target name="-lint-server" description="Start JSLint Server" unless="lint.skip">
<antcall target="-node">
<param name="src" value="${builddir}/lib/jslint/jslint-node.js"/>
</antcall>
</target>
<target name="-node" description="Start NodeJS Server" unless="node.spawn">
<if>
<not>
<http url="${node.jslint.url}"/>
</not>
<then>
<echo level="info">Attempting to start NodeJS app at: ${src}</echo>
- <exec executable="node" spawn="true">
+ <exec executable="node" spawn="true" failonerror="false">
<arg value="${src}"/>
</exec>
<!-- Don't fail if node doesn't exist, fails to start, etc.
We will fallback to the slow Rhino engine later. -->
</then>
</if>
<!-- Don't try to start again. -->
<property name="node.spawn" value="true"/>
</target>
<target name="-yuicompressor" description="Start YUI Compressor Server" unless="yuicompressor.spawn">
<if>
<not>
<http url="${yuicompressor.url}"/>
</not>
<then>
<echo level="info">Attempting to start YUI Compressor server.</echo>
- <java classname="com.yahoo.platform.yui.compressor.Bootstrap" fork="true" spawn="true">
+ <java classname="com.yahoo.platform.yui.compressor.Bootstrap" fork="true" spawn="true" failonerror="false">
<arg line="--server"/>
<arg line="${yuicompressor.port}"/>
<arg line="${yuicompressor.js.args}"/>
<arg line="${yuicompressor.js.args.internal}"/>
<classpath>
<pathelement location="${yuicompressor.jar}"/>
</classpath>
</java>
</then>
</if>
<property name="yuicompressor.spawn" value="true"/>
</target>
<target name="clean" description="Clean Local Build Directory" unless="clean.skip">
<delete dir="${component.builddir}" />
</target>
<target name="build" />
<!-- MIN -->
<target name="minify" description="Create component-min.js from component.js">
<yuicompress src="${component.builddir}/${component.basefilename}.js" dest="${component.builddir}/${component.basefilename}-min.js" args="${yuicompressor.js.args.internal}" />
<if>
<available file="${component.builddir}/lang" type="dir" />
<then>
<for param="file">
<path>
<fileset dir="${component.builddir}/lang" includes="*.js"/>
</path>
<sequential>
<yuicompress src="@{file}" dest="@{file}" args="${yuicompressor.js.args.internal}" />
</sequential>
</for>
</then>
</if>
</target>
<target name="lint" description="Run jslint over the local build files (default settings)" unless="lint.skip">
<jslint>
<jsfiles>
<fileset dir="${component.builddir}" includes="*.js" />
</jsfiles>
</jslint>
</target>
<!-- DEPLOY -->
<target name="deploy" description="Copy files to global location" depends="deploybuild, deployassets, deployskins, deploylang, deploydocs"></target>
<target name="deploybuild" description="Copy built files to global build location">
<copy todir="${global.build.component}" overwrite="true" verbose="true">
<fileset dir="${component.builddir}" includes="*.js" />
</copy>
</target>
<target name="deployassets" if="component.assets.exist">
<copy todir="${global.build.component.assets}" flatten="${component.assets.flatten}" overwrite="true" verbose="true">
<fileset dir="${component.assets.base}" includes="${component.assets.files}" excludes="skins/, legacy/" />
</copy>
<copy todir="${global.build.component.assets}" flatten="${component.assets.legacy.flatten}" preservelastmodified="true" failonerror="false" verbose="true">
<fileset dir="${component.assets.legacy.base}" includes="${component.assets.legacy.files}" excludes="skins/" />
</copy>
</target>
<target name="deployskins" if="skins.exist">
<copy todir="${global.build.component.assets}/skins/sam" overwrite="true" verbose="true">
<fileset dir="${component.builddir}/assets/skins/sam" includes="${component}.css" />
</copy>
<copy todir="${global.build.component.assets}/skins/sam" overwrite="true" verbose="true">
<fileset dir="${component.assets.skins.base}/sam" includes="${component.assets.skins.files}" />
</copy>
</target>
<target name="deploylang" description="Copy language bundles to global build location">
<copy todir="${global.build.component}/lang" overwrite="true" failonerror="false" verbose="true">
<fileset dir="${component.builddir}/lang" includes="*.js" />
</copy>
</target>
<target name="deploydocs" description="Copy doc files to global doc locations">
<!-- TODO -->
</target>
<target name="-prepend" if="component.prependfiles">
<concat destfile="${workingdir}/${component.basefilename}.js.tmp" fixlastline="true">
<filelist dir="${component.basedir}" files="${component.prependfiles}" />
<filterchain>
<tokenfilter>
<filetokenizer/>
<replaceregex
pattern="${component.logger.regex}"
replace="${component.logger.regex.replace}"
flags="${component.logger.regex.flags}" />
</tokenfilter>
</filterchain>
</concat>
<concat destfile="${workingdir}/${component.basefilename}.js.tmp" fixlastline="true" append="true">
<filelist dir="${component.builddir}" files="${component.basefilename}.js" />
</concat>
<move file="${workingdir}/${component.basefilename}.js.tmp" tofile="${component.builddir}/${component.basefilename}.js" />
</target>
<target name="-append" if="component.appendfiles">
<concat destfile="${component.builddir}/${component.basefilename}.js" fixlastline="true" append="true">
<filelist dir="${component.basedir}" files="${component.appendfiles}" />
<filterchain>
<tokenfilter>
<filetokenizer/>
<replaceregex
pattern="${component.logger.regex}"
replace="${component.logger.regex.replace}"
flags="${component.logger.regex.flags}" />
</tokenfilter>
</filterchain>
</concat>
</target>
<target name="-prependdebug" if="component.prependfiles">
<concat destfile="${workingdir}/${component.basefilename}-debug.js.tmp" fixlastline="true" >
<filelist dir="${component.basedir}" files="${component.prependfiles}" />
<filelist dir="${component.builddir}" files="${component.basefilename}-debug.js" />
</concat>
<move file="${workingdir}/${component.basefilename}-debug.js.tmp" tofile="${component.builddir}/${component.basefilename}-debug.js" />
</target>
<target name="-appenddebug" if="component.appendfiles">
<concat destfile="${component.builddir}/${component.basefilename}-debug.js" fixlastline="true" append="true">
<filelist dir="${component.basedir}" files="${component.appendfiles}" />
</concat>
</target>
</project>
|
yui/builder
|
3581ab5151db0f9b14a94300825474e6afcaaef5
|
Use Java 1.5 compatable fallback YUI Compressor.
|
diff --git a/componentbuild/shared/macrolib.xml b/componentbuild/shared/macrolib.xml
index 366e5bc..0febb26 100644
--- a/componentbuild/shared/macrolib.xml
+++ b/componentbuild/shared/macrolib.xml
@@ -1,430 +1,430 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiMacroLib">
<macrodef name="arrayliteral">
<attribute name="from" />
<attribute name="to" />
<attribute name="key" />
<sequential>
<if>
<and>
<isset property="@{from}" />
<length string="${@{from}}" when="ne" length="0" />
</and>
<then>
<propertyregex property="array"
override="true"
input="${@{from}}"
casesensitive="false"
regexp="([^\,\s]+)"
replace="'\1'"
/>
<property name="@{to}" value="@{key}:[${array}]" />
</then>
</if>
</sequential>
</macrodef>
<macrodef name="createdetails">
<sequential>
<arrayliteral from="component.use" to="component.details.use" key="use" />
<arrayliteral from="component.supersedes" to="component.details.supersedes" key="supersedes" />
<arrayliteral from="component.requires" to="component.details.requires" key="requires" />
<arrayliteral from="component.optional" to="component.details.optional" key="optional" />
<arrayliteral from="component.lang" to="component.details.lang" key="lang" />
<if>
<isset property="component.skinnable" />
<then>
<property name="component.details.skinnable" value="skinnable:${component.skinnable}" />
</then>
</if>
<propertyselector property="details.list"
delimiter=","
match="component\.details.([^\.]*)"
select="\1"
casesensitive="false" />
<var name="details" value="" />
<if>
<isset property="details.list" />
<then>
<for list="${details.list}" param="val">
<sequential>
<var name="details" value="${component.details.@{val}}, ${details}" />
</sequential>
</for>
<propertyregex property="component.details.hash"
input="{${details}}"
regexp="(\,\s*?\})"
replace="}"
casesensitive="false" />
</then>
<else>
<property name="component.details.hash" value="" />
</else>
</if>
</sequential>
</macrodef>
<macrodef name="yuicompress">
<attribute name="src" />
<attribute name="dest" />
<attribute name="args" />
<attribute name="type" default="js"/>
<sequential>
<if>
<or>
<istrue value="${yuicompressor.online}"/>
<http url="${yuicompressor.url}" errorsBeginAt="500"/>
</or>
<then>
<property name="yuicompressor.online" value="true"/>
<property name="yuicompressor.output" value="@{dest}"/>
<property name="yuicompressor.file" value="@{src}"/>
<echo>If this web request fails, try building again with -Dyuicompressor.online=false or install the cURL executable into your PATH.</echo>
<exec executable="curl" input="@{src}" outputproperty="yuicompressor.result" failonerror="true">
<arg value="--silent"/>
<arg line="--data-urlencode "/>
<arg line="@${yuicompressor.file}"/>
<arg line="${yuicompressor.url}?type=@{type}"/>
</exec>
<script language="javascript">
<![CDATA[
var echo;
var project = self.getProject();
var res = project.getProperty("yuicompressor.result");
res = eval("(" + res + ")");
function w (str, level) {
var echo = project.createTask("echo");
echo.setMessage(str);
echo.perform();
}
if (!res.result) {
var fail = project.createTask("fail");
fail.setMessage("Failed to minify!");
fail.perform();
}
function notify (level, errors) {
for (var i = 0, l = errors.length; i < l; i++) {
w(errors[i], level);
}
}
notify("error", res.errors);
notify("warning", res.warnings);
project.setProperty("yuicompressor.script", res.result);
]]>
</script>
<echo file="@{dest}" message="${yuicompressor.script}"/>
<var name="yuicompressor.output" unset="true"/>
<var name="yuicompressor.script" unset="true"/>
<var name="yuicompressor.file" unset="true"/>
<var name="yuicompressor.result" unset="true"/>
</then>
<else>
<echo level="info">Running yuicompressor on @{src} with @{args}</echo>
- <java jar="${yuicompressor.jar}" fork="true" failonerror="true">
+ <java jar="${yuicompressor.java15.jar}" fork="true" failonerror="true">
<arg line="@{args} -o" />
<arg file="@{dest}" />
<arg file="@{src}" />
</java>
</else>
</if>
</sequential>
</macrodef>
<macrodef name="concatsource">
<attribute name="destfile" />
<attribute name="sourcedir" />
<attribute name="sourcefiles" />
<attribute name="workingdir" default="${workingdir}" />
<element name="filters" optional="true" description="Additonal filters to apply to individual files"/>
<sequential>
<echo level="info">Concatenating</echo>
<echo level="info"> Source Files : @{sourcefiles}</echo>
<echo level="info"> In Source Dir : @{sourcedir}</echo>
<echo level="info"> To : @{destfile}</echo>
<delete dir="@{workingdir}" quiet="true"/>
<copy todir="@{workingdir}">
<filelist dir="@{sourcedir}" files="@{sourcefiles}" />
<filterchain>
<filters />
<fixcrlf fixlast="true" eof="remove"/>
</filterchain>
</copy>
<concat destfile="@{destfile}" fixlastline="true">
<filelist dir="@{workingdir}" files="@{sourcefiles}" />
</concat>
<delete dir="${workingdir}" quiet="true" />
</sequential>
</macrodef>
<macrodef name="jslint">
<element name="jsfiles" optional="false" />
<sequential>
<pathconvert pathsep="' '" property="jsfileargs">
<jsfiles />
</pathconvert>
<if>
<or>
<istrue value="${node.online}"/>
<http url="${node.jslint.url}"/>
</or>
<then>
<property name="node.online" value="true"/>
<post to="${node.jslint.url}" property="node.jslint.response" failonerror="${lint.failonerror}">
<prop name="files" value="${jsfileargs}"/>
<prop name="failonerror" value="${lint.failonerror}"/>
</post>
<!-- Since Ant doesn't really failonerror for the post task,
handle this ourselves: -->
<if>
<not>
<isset property="node.jslint.response"/>
</not>
<then>
<fail>JSLint failed. To view lint output and continue the build, run ant with -Dlint.failonerror=false.</fail>
</then>
</if>
<!-- Clear property for next run: -->
<var name="node.jslint.response" unset="true"/>
</then>
<else>
<echo>Using Rhino. Install nodejs to improve jslint speed, or skip with -Dlint.skip=true</echo>
<!--
Need to find a way to convert fileset to args (script?) to
avoid ' ', which will break for files with ' in them
Evaluates to the following java execution line...
java -r js.jar jslintconsole.js 'file1.js' 'file2.js' 'file3.js'
-->
<java jar="${rhino.jar}" fork="true" failonerror="${jslint.failonerror}">
<arg file="${jslintconsole.js}" />
<arg value="${jslintsrc.js}" />
<arg line="'${jsfileargs}'" />
</java>
</else>
</if>
</sequential>
</macrodef>
<macrodef name="registerversion">
<attribute name="module" />
<attribute name="classname" />
<attribute name="file" />
<sequential>
<loadfile srcfile="${builddir}/files/versioncode.txt" property="@{module}-@{classname}-version" >
<filterchain>
<replacetokens>
<token key="MODULE" value="@{module}"/>
<token key="CLASSNAME" value="@{classname}"/>
</replacetokens>
</filterchain>
</loadfile>
<echo level="info">Adding Version Registration Code to @{file}</echo>
<concat destfile="@{file}" append="true" fixlastline="true">${@{module}-@{classname}-version}</concat>
</sequential>
</macrodef>
<macrodef name="addlang">
<attribute name="dir" />
<attribute name="module" />
<attribute name="dest" />
<attribute name="lang" default="" />
<attribute name="details" default = ""/>
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}@{lang}_details" value="" />
</then>
<else>
<property name="@{module}@{lang}_details" value=",@{details}" />
</else>
</if>
<if>
<equals arg1="@{lang}" arg2="" />
<then>
<property name="@{module}@{lang}_fullname" value="@{module}" />
</then>
<else>
<property name="@{module}@{lang}_fullname" value="@{module}_@{lang}" />
</else>
</if>
<if>
<available file="@{dir}/${@{module}@{lang}_fullname}.pres" />
<then>
<mkdir dir="${component.langbuilddir}" />
<java jar="${rhino.jar}" fork="true" failonerror="true">
<jvmarg value="-Dfile.encoding=utf-8" />
<arg file="${yrb2jsonconsole.js}" />
<arg file="${yrb2jsonsrc.js}" />
<arg file="@{dir}/${@{module}@{lang}_fullname}.pres" />
<arg file="${component.langbuilddir}/${@{module}@{lang}_fullname}.js" />
</java>
<echo level="info">Wrapping ${component.langbuilddir}/${@{module}@{lang}_fullname}.js in YUI.add, Y.Intl.add</echo>
<loadfile srcfile="${component.langbuilddir}/${@{module}@{lang}_fullname}.js" property="@{module}@{lang}-strs-loaded" encoding="utf-8" />
</then>
<else>
<echo level="info">Wrapping @{dir}/${@{module}@{lang}_fullname}.js in YUI.add, Y.Intl.add</echo>
<loadfile srcfile="@{dir}/${@{module}@{lang}_fullname}.js" property="@{module}@{lang}-strs-loaded" encoding="utf-8" />
</else>
</if>
<copy file="${builddir}/files/langtemplate.txt" tofile="@{dest}/${@{module}@{lang}_fullname}.js" overwrite="true" outputencoding="utf-8">
<filterset>
<filter token="LANG" value="@{lang}" />
<filter token="LANG_MODULE" value="lang/${@{module}@{lang}_fullname}" />
<filter token="STRINGS" value="${@{module}@{lang}-strs-loaded}" />
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}" />
<filter token="LANG_DETAILS" value="${@{module}@{lang}_details}" />
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addmodule">
<attribute name="file" />
<attribute name="module" />
<attribute name="details" default="" />
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}-details" value="" />
</then>
<else>
<property name="@{module}-details" value=",@{details}" />
</else>
</if>
<loadfile srcfile="@{file}" property="@{module}-@{file}-code" />
<echo level="info">Wrapping @{file} in YUI.add module</echo>
<copy file="${builddir}/files/moduletemplate.txt" tofile="@{file}" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{file}-code}" />
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}" />
<filter token="DETAILS" value="${@{module}-details}" />
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addrollup">
<attribute name="file" />
<attribute name="module" />
<attribute name="details" default="" />
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}-details" value="" />
</then>
<else>
<property name="@{module}-details" value=",@{details}" />
</else>
</if>
<loadfile srcfile="@{file}" property="@{module}-@{file}-code" />
<echo level="info">Adding Rollup @{file} using YUI.add</echo>
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{file}" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{file}-code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}"/>
<filter token="DETAILS" value="${@{module}-details}"/>
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addlangrollup">
<attribute name="module" />
<attribute name="dir" />
<sequential>
<echo level="info">Registering rollup info for lang files in @{dir} using YUI.add</echo>
<for list="${component.rollup.lang}" param="lang" trim="true">
<sequential>
<loadfile srcfile="@{dir}/@{module}_@{lang}.js" property="@{module}-@{lang}-code" />
<var name="lang.use" value="{use:[" />
<for list="${component.lang.use}" param="submod" trim="true">
<sequential>
<var name="lang.use" value="${lang.use}'lang/@{submod}_@{lang}'," />
</sequential>
</for>
<var name="lang.use" value="${lang.use}]}" />
<propertyregex property="@{module}-@{lang}-details"
input="${lang.use}"
regexp="(\,\s*?\])"
replace="]"
casesensitive="false" />
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{dir}/@{module}_@{lang}.js" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{lang}-code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="lang/@{module}_@{lang}"/>
<filter token="DETAILS" value=", ${@{module}-@{lang}-details}"/>
</filterset>
</copy>
</sequential>
</for>
<loadfile srcfile="@{dir}/@{module}.js" property="@{module}--code" />
<var name="lang.use" value="{use:[" />
<for list="${component.lang.use}" param="submod" trim="true">
<sequential>
<var name="lang.use" value="${lang.use}'lang/@{submod}'," />
</sequential>
</for>
<var name="lang.use" value="${lang.use}]}" />
<propertyregex property="@{module}--details"
input="${lang.use}"
regexp="(\,\s*?\])"
replace="]"
casesensitive="false" />
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{dir}/@{module}.js" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}--code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="lang/@{module}"/>
<filter token="DETAILS" value=", ${@{module}--details}"/>
</filterset>
</copy>
</sequential>
</macrodef>
</project>
diff --git a/componentbuild/shared/properties.xml b/componentbuild/shared/properties.xml
index 0aa8df3..341271b 100644
--- a/componentbuild/shared/properties.xml
+++ b/componentbuild/shared/properties.xml
@@ -1,168 +1,169 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiSharedProperties">
<!-- ANT contrib library for loops, if/else support, with property fix for FOR task -->
<taskdef resource="antcontrib.properties">
<classpath>
<pathelement location="${builddir}/lib/ant-contrib/ant-contrib-1.0b3-modified.jar" />
</classpath>
</taskdef>
<dirname property="buildfile.dir" file="${ant.file}" />
<!--
builddir : The path to the builder/componentbuild directory from the component build file
srcdir : The path to top of the project source directory (e.g. yui2) from the component build file
-->
<property name="builddir" location="../../../builder/componentbuild" />
<property name="srcdir" location="../.." />
<!-- buildfiles.eol : End of line char to use for built files -->
<property name="buildfiles.eol" value="lf"/>
<!-- Supporting Tools -->
<property name="rhino.jar" location="${builddir}/lib/rhino/js.jar" />
<property name="jslintconsole.js" location="${builddir}/lib/jslint/jslint-console.js" />
<property name="jslintsrc.js" location="${builddir}/lib/jslint/fulljslint.js" />
<property name="yuicompressor.jar" location="${builddir}/lib/yuicompressor/yuicompressor-2.4.5pre.jar" />
+ <property name="yuicompressor.java15.jar" location="${builddir}/lib/yuicompressor/yuicompressor-2.4.4.jar" />
<property name="yrb2jsonconsole.js" location="${builddir}/lib/yrb2json/yrb2json-console.js" />
<property name="yrb2jsonsrc.js" location="${builddir}/lib/yrb2json/yrb2json.js" />
<!-- YUI Compressor arguments for JS and CSS files -->
<property name="yuicompressor.js.charset" value="utf-8" />
<property name="yuicompressor.css.charset" value="utf-8" />
<property name="yuicompressor.js.args" value="--disable-optimizations --preserve-semi --line-break 6000" />
<property name="yuicompressor.css.args" value="--line-break 6000" />
<property name="yuicompressor.port" value="8091"/>
<!-- Enable/Disable YUI Compressor verbosity. NOTE: Checked in build files should not disable this flag -->
<property name="yuicompressor.js.verbose" value="true" />
<property name="yuicompressor.css.verbose" value="true" />
<condition property="yuicompressor.js.args.internal" value="-v --charset ${yuicompressor.js.charset} ${yuicompressor.js.args}" else="--charset ${yuicompressor.js.charset} ${yuicompressor.js.args}">
<istrue value="${yuicompressor.js.verbose}" />
</condition>
<condition property="yuicompressor.css.args.internal" value="-v --charset ${yuicompressor.css.charset} ${yuicompressor.css.args}" else="--charset ${yuicompressor.css.charset} ${yuicompressor.css.args}">
<istrue value="${yuicompressor.css.verbose}" />
</condition>
<!-- Top Level Build Directories (e.g. yui2/build, yui3/build)-->
<property name="global.build.base" location="${srcdir}/build" />
<property name="global.build.component" location="${global.build.base}/${component}" />
<property name="global.build.component.assets" location="${global.build.component}/assets" />
<!-- Component Properties -->
<property name="component.module" value="${component}" />
<property name="component.basedir" location="${buildfile.dir}" />
<property name="component.jsfiles.base" location="${component.basedir}/js" />
<property name="component.cssfiles.base" location="${component.basedir}/css" />
<property name="component.lang.base" location="${component.basedir}/lang" />
<property name="component.assets.flatten" value="true" />
<property name="component.assets.base" location="${component.basedir}/assets" />
<property name="component.assets.files" value="**/*" />
<property name="component.assets.legacy.flatten" value="true" />
<property name="component.assets.legacy.base" location="${component.assets.base}/legacy" />
<property name="component.assets.legacy.files" value="**/*" />
<property name="component.assets.skins.base" location="${component.assets.base}/skins" />
<property name="component.assets.skins.files" value="**/*" />
<condition property="component.skins.exist">
<and>
<available file="${component.assets.base}/${component}-core.css" type="file" />
<available file="${component.assets.base}/skins" type="dir" />
</and>
</condition>
<!-- component is part of a rollup build, so rollup skins to parent -->
<condition property="rollupskins">
<and>
<istrue value="${rollup}" />
<istrue value="${component.skins.exist}" />
</and>
</condition>
<available file="${component.assets.base}" type="dir" property="component.assets.exist"/>
<condition property="component.langs.exist">
<and>
<or>
<isset property="component.lang" />
<isset property="component.rollup.lang" />
</or>
</and>
</condition>
<condition property="rolluplangs">
<and>
<istrue value="${rollup}" />
<istrue value="${component.langs.exist}" />
</and>
</condition>
<!--
DEPRECATED: component.basefilename and component.releasetype are deprecated
We used to mark filenames with suffixes (-beta, -experimental), which we no longer do
-->
<condition property="component.basefilename" value="${component}" else="${component}">
<isset property="component.releasetype"/>
</condition>
<!-- Default logger regex values if not provided -->
<property name="component.logger.regex" value="^.*?(?:logger|YAHOO.log).*?(?:;|\).*;|(?:\r?\n.*?)*?\).*;).*;?.*?\r?\n" />
<property name="component.logger.regex.replace" value="" />
<property name="component.logger.regex.flags" value="mg" />
<property name="component.logger.regex.byline" value="false" />
<!-- Rollup support, currently only used for YUI 3 -->
<property name="component.rollup" value="false"/>
<property name="component.rollup.target" value="all"/>
<condition property="component.builddir" value="${component.basedir}/build_rollup_tmp" else="${component.basedir}/build_tmp">
<istrue value="${component.rollup}"/>
</condition>
<condition property="rollup.skins.exist">
<and>
<istrue value="${component.rollup}" />
<available file="${component.assets.base}/skins" type="dir" />
</and>
</condition>
<condition property="skins.exist">
<or>
<istrue value="${rollup.skins.exist}" />
<istrue value="${component.skins.exist}" />
</or>
</condition>
<!-- The temporary working directory used by the build process -->
<property name="workingdir" location="${component.builddir}/ant" />
<!-- Directory for language resource bundles in JSON format derived from YRB format -->
<property name="component.langbuilddir" value="${component.basedir}/build_lang_tmp" />
<!-- The file which defines the default targets for the particular type of component (module, rollup, css) -->
<condition property="targetbase" value="rollup" else="module">
<istrue value="${component.rollup}"/>
</condition>
<condition property="targets" value="../shared/cssmodule.xml" else="${targetbase}.xml">
<isset property="component.cssfiles" />
</condition>
<!-- By default, jslint failure should fail the build.
This can be overridden on the command line. -->
<property name="lint.failonerror" value="true"/>
<property name="node.jslint.url" value="http://127.0.0.1:8081/"/>
<property name="yuicompressor.url" value="http://127.0.0.1:${yuicompressor.port}/compress"/>
</project>
|
yui/builder
|
de05a4b5c0eecb8aaed8eac6cb9221fed59f873d
|
Prevent false failure before the server starts.
|
diff --git a/componentbuild/shared/macrolib.xml b/componentbuild/shared/macrolib.xml
index dbae5c2..366e5bc 100644
--- a/componentbuild/shared/macrolib.xml
+++ b/componentbuild/shared/macrolib.xml
@@ -1,439 +1,430 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiMacroLib">
<macrodef name="arrayliteral">
<attribute name="from" />
<attribute name="to" />
<attribute name="key" />
<sequential>
<if>
<and>
<isset property="@{from}" />
<length string="${@{from}}" when="ne" length="0" />
</and>
<then>
<propertyregex property="array"
override="true"
input="${@{from}}"
casesensitive="false"
regexp="([^\,\s]+)"
replace="'\1'"
/>
<property name="@{to}" value="@{key}:[${array}]" />
</then>
</if>
</sequential>
</macrodef>
<macrodef name="createdetails">
<sequential>
<arrayliteral from="component.use" to="component.details.use" key="use" />
<arrayliteral from="component.supersedes" to="component.details.supersedes" key="supersedes" />
<arrayliteral from="component.requires" to="component.details.requires" key="requires" />
<arrayliteral from="component.optional" to="component.details.optional" key="optional" />
<arrayliteral from="component.lang" to="component.details.lang" key="lang" />
<if>
<isset property="component.skinnable" />
<then>
<property name="component.details.skinnable" value="skinnable:${component.skinnable}" />
</then>
</if>
<propertyselector property="details.list"
delimiter=","
match="component\.details.([^\.]*)"
select="\1"
casesensitive="false" />
<var name="details" value="" />
<if>
<isset property="details.list" />
<then>
<for list="${details.list}" param="val">
<sequential>
<var name="details" value="${component.details.@{val}}, ${details}" />
</sequential>
</for>
<propertyregex property="component.details.hash"
input="{${details}}"
regexp="(\,\s*?\})"
replace="}"
casesensitive="false" />
</then>
<else>
<property name="component.details.hash" value="" />
</else>
</if>
</sequential>
</macrodef>
- <if>
- <or>
- <istrue value="${yuicompressor.online}"/>
- <http url="${yuicompressor.url}" errorsBeginAt="500"/>
- </or>
- <then>
- <property name="yuicompressor.online" value="true"/>
- <macrodef name="yuicompress">
- <attribute name="src" />
- <attribute name="dest" />
- <attribute name="args" /> <!-- not used by this task branch -->
- <attribute name="type" default="js"/>
- <sequential>
+ <macrodef name="yuicompress">
+ <attribute name="src" />
+ <attribute name="dest" />
+ <attribute name="args" />
+ <attribute name="type" default="js"/>
+ <sequential>
+ <if>
+ <or>
+ <istrue value="${yuicompressor.online}"/>
+ <http url="${yuicompressor.url}" errorsBeginAt="500"/>
+ </or>
+ <then>
+ <property name="yuicompressor.online" value="true"/>
<property name="yuicompressor.output" value="@{dest}"/>
<property name="yuicompressor.file" value="@{src}"/>
<echo>If this web request fails, try building again with -Dyuicompressor.online=false or install the cURL executable into your PATH.</echo>
<exec executable="curl" input="@{src}" outputproperty="yuicompressor.result" failonerror="true">
<arg value="--silent"/>
<arg line="--data-urlencode "/>
<arg line="@${yuicompressor.file}"/>
<arg line="${yuicompressor.url}?type=@{type}"/>
</exec>
<script language="javascript">
<![CDATA[
var echo;
var project = self.getProject();
var res = project.getProperty("yuicompressor.result");
res = eval("(" + res + ")");
function w (str, level) {
var echo = project.createTask("echo");
echo.setMessage(str);
echo.perform();
}
if (!res.result) {
var fail = project.createTask("fail");
fail.setMessage("Failed to minify!");
fail.perform();
}
function notify (level, errors) {
for (var i = 0, l = errors.length; i < l; i++) {
w(errors[i], level);
}
}
notify("error", res.errors);
notify("warning", res.warnings);
project.setProperty("yuicompressor.script", res.result);
]]>
</script>
<echo file="@{dest}" message="${yuicompressor.script}"/>
<var name="yuicompressor.output" unset="true"/>
<var name="yuicompressor.script" unset="true"/>
<var name="yuicompressor.file" unset="true"/>
<var name="yuicompressor.result" unset="true"/>
- </sequential>
- </macrodef>
- </then>
- <else>
- <echo level="info">Using forked yuicompressor, to speed up builds make sure the YUI Compressor server is started.</echo>
- <macrodef name="yuicompress">
- <attribute name="src" />
- <attribute name="dest" />
- <attribute name="args" />
- <attribute name="type" default="js"/> <!-- not used by this task branch -->
- <sequential>
+ </then>
+ <else>
<echo level="info">Running yuicompressor on @{src} with @{args}</echo>
<java jar="${yuicompressor.jar}" fork="true" failonerror="true">
<arg line="@{args} -o" />
<arg file="@{dest}" />
<arg file="@{src}" />
</java>
- </sequential>
- </macrodef>
- </else>
- </if>
+ </else>
+ </if>
+ </sequential>
+ </macrodef>
<macrodef name="concatsource">
<attribute name="destfile" />
<attribute name="sourcedir" />
<attribute name="sourcefiles" />
<attribute name="workingdir" default="${workingdir}" />
<element name="filters" optional="true" description="Additonal filters to apply to individual files"/>
<sequential>
<echo level="info">Concatenating</echo>
<echo level="info"> Source Files : @{sourcefiles}</echo>
<echo level="info"> In Source Dir : @{sourcedir}</echo>
<echo level="info"> To : @{destfile}</echo>
<delete dir="@{workingdir}" quiet="true"/>
<copy todir="@{workingdir}">
<filelist dir="@{sourcedir}" files="@{sourcefiles}" />
<filterchain>
<filters />
<fixcrlf fixlast="true" eof="remove"/>
</filterchain>
</copy>
<concat destfile="@{destfile}" fixlastline="true">
<filelist dir="@{workingdir}" files="@{sourcefiles}" />
</concat>
<delete dir="${workingdir}" quiet="true" />
</sequential>
</macrodef>
<macrodef name="jslint">
<element name="jsfiles" optional="false" />
<sequential>
<pathconvert pathsep="' '" property="jsfileargs">
<jsfiles />
</pathconvert>
<if>
<or>
<istrue value="${node.online}"/>
<http url="${node.jslint.url}"/>
</or>
<then>
<property name="node.online" value="true"/>
<post to="${node.jslint.url}" property="node.jslint.response" failonerror="${lint.failonerror}">
<prop name="files" value="${jsfileargs}"/>
<prop name="failonerror" value="${lint.failonerror}"/>
</post>
<!-- Since Ant doesn't really failonerror for the post task,
handle this ourselves: -->
<if>
<not>
<isset property="node.jslint.response"/>
</not>
<then>
<fail>JSLint failed. To view lint output and continue the build, run ant with -Dlint.failonerror=false.</fail>
</then>
</if>
<!-- Clear property for next run: -->
<var name="node.jslint.response" unset="true"/>
</then>
<else>
<echo>Using Rhino. Install nodejs to improve jslint speed, or skip with -Dlint.skip=true</echo>
<!--
Need to find a way to convert fileset to args (script?) to
avoid ' ', which will break for files with ' in them
Evaluates to the following java execution line...
java -r js.jar jslintconsole.js 'file1.js' 'file2.js' 'file3.js'
-->
<java jar="${rhino.jar}" fork="true" failonerror="${jslint.failonerror}">
<arg file="${jslintconsole.js}" />
<arg value="${jslintsrc.js}" />
<arg line="'${jsfileargs}'" />
</java>
</else>
</if>
</sequential>
</macrodef>
<macrodef name="registerversion">
<attribute name="module" />
<attribute name="classname" />
<attribute name="file" />
<sequential>
<loadfile srcfile="${builddir}/files/versioncode.txt" property="@{module}-@{classname}-version" >
<filterchain>
<replacetokens>
<token key="MODULE" value="@{module}"/>
<token key="CLASSNAME" value="@{classname}"/>
</replacetokens>
</filterchain>
</loadfile>
<echo level="info">Adding Version Registration Code to @{file}</echo>
<concat destfile="@{file}" append="true" fixlastline="true">${@{module}-@{classname}-version}</concat>
</sequential>
</macrodef>
<macrodef name="addlang">
<attribute name="dir" />
<attribute name="module" />
<attribute name="dest" />
<attribute name="lang" default="" />
<attribute name="details" default = ""/>
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}@{lang}_details" value="" />
</then>
<else>
<property name="@{module}@{lang}_details" value=",@{details}" />
</else>
</if>
<if>
<equals arg1="@{lang}" arg2="" />
<then>
<property name="@{module}@{lang}_fullname" value="@{module}" />
</then>
<else>
<property name="@{module}@{lang}_fullname" value="@{module}_@{lang}" />
</else>
</if>
<if>
<available file="@{dir}/${@{module}@{lang}_fullname}.pres" />
<then>
<mkdir dir="${component.langbuilddir}" />
<java jar="${rhino.jar}" fork="true" failonerror="true">
<jvmarg value="-Dfile.encoding=utf-8" />
<arg file="${yrb2jsonconsole.js}" />
<arg file="${yrb2jsonsrc.js}" />
<arg file="@{dir}/${@{module}@{lang}_fullname}.pres" />
<arg file="${component.langbuilddir}/${@{module}@{lang}_fullname}.js" />
</java>
<echo level="info">Wrapping ${component.langbuilddir}/${@{module}@{lang}_fullname}.js in YUI.add, Y.Intl.add</echo>
<loadfile srcfile="${component.langbuilddir}/${@{module}@{lang}_fullname}.js" property="@{module}@{lang}-strs-loaded" encoding="utf-8" />
</then>
<else>
<echo level="info">Wrapping @{dir}/${@{module}@{lang}_fullname}.js in YUI.add, Y.Intl.add</echo>
<loadfile srcfile="@{dir}/${@{module}@{lang}_fullname}.js" property="@{module}@{lang}-strs-loaded" encoding="utf-8" />
</else>
</if>
<copy file="${builddir}/files/langtemplate.txt" tofile="@{dest}/${@{module}@{lang}_fullname}.js" overwrite="true" outputencoding="utf-8">
<filterset>
<filter token="LANG" value="@{lang}" />
<filter token="LANG_MODULE" value="lang/${@{module}@{lang}_fullname}" />
<filter token="STRINGS" value="${@{module}@{lang}-strs-loaded}" />
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}" />
<filter token="LANG_DETAILS" value="${@{module}@{lang}_details}" />
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addmodule">
<attribute name="file" />
<attribute name="module" />
<attribute name="details" default="" />
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}-details" value="" />
</then>
<else>
<property name="@{module}-details" value=",@{details}" />
</else>
</if>
<loadfile srcfile="@{file}" property="@{module}-@{file}-code" />
<echo level="info">Wrapping @{file} in YUI.add module</echo>
<copy file="${builddir}/files/moduletemplate.txt" tofile="@{file}" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{file}-code}" />
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}" />
<filter token="DETAILS" value="${@{module}-details}" />
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addrollup">
<attribute name="file" />
<attribute name="module" />
<attribute name="details" default="" />
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}-details" value="" />
</then>
<else>
<property name="@{module}-details" value=",@{details}" />
</else>
</if>
<loadfile srcfile="@{file}" property="@{module}-@{file}-code" />
<echo level="info">Adding Rollup @{file} using YUI.add</echo>
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{file}" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{file}-code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}"/>
<filter token="DETAILS" value="${@{module}-details}"/>
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addlangrollup">
<attribute name="module" />
<attribute name="dir" />
<sequential>
<echo level="info">Registering rollup info for lang files in @{dir} using YUI.add</echo>
<for list="${component.rollup.lang}" param="lang" trim="true">
<sequential>
<loadfile srcfile="@{dir}/@{module}_@{lang}.js" property="@{module}-@{lang}-code" />
<var name="lang.use" value="{use:[" />
<for list="${component.lang.use}" param="submod" trim="true">
<sequential>
<var name="lang.use" value="${lang.use}'lang/@{submod}_@{lang}'," />
</sequential>
</for>
<var name="lang.use" value="${lang.use}]}" />
<propertyregex property="@{module}-@{lang}-details"
input="${lang.use}"
regexp="(\,\s*?\])"
replace="]"
casesensitive="false" />
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{dir}/@{module}_@{lang}.js" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{lang}-code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="lang/@{module}_@{lang}"/>
<filter token="DETAILS" value=", ${@{module}-@{lang}-details}"/>
</filterset>
</copy>
</sequential>
</for>
<loadfile srcfile="@{dir}/@{module}.js" property="@{module}--code" />
<var name="lang.use" value="{use:[" />
<for list="${component.lang.use}" param="submod" trim="true">
<sequential>
<var name="lang.use" value="${lang.use}'lang/@{submod}'," />
</sequential>
</for>
<var name="lang.use" value="${lang.use}]}" />
<propertyregex property="@{module}--details"
input="${lang.use}"
regexp="(\,\s*?\])"
replace="]"
casesensitive="false" />
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{dir}/@{module}.js" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}--code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="lang/@{module}"/>
<filter token="DETAILS" value=", ${@{module}--details}"/>
</filterset>
</copy>
</sequential>
</macrodef>
</project>
|
yui/builder
|
4ae244ccd2aa0f3c4dd794cd9f63b667c7935ef6
|
Give options for folks without cURL installed.
|
diff --git a/componentbuild/shared/macrolib.xml b/componentbuild/shared/macrolib.xml
index 8ba807a..dbae5c2 100644
--- a/componentbuild/shared/macrolib.xml
+++ b/componentbuild/shared/macrolib.xml
@@ -1,441 +1,439 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiMacroLib">
<macrodef name="arrayliteral">
<attribute name="from" />
<attribute name="to" />
<attribute name="key" />
<sequential>
<if>
<and>
<isset property="@{from}" />
<length string="${@{from}}" when="ne" length="0" />
</and>
<then>
<propertyregex property="array"
override="true"
input="${@{from}}"
casesensitive="false"
regexp="([^\,\s]+)"
replace="'\1'"
/>
<property name="@{to}" value="@{key}:[${array}]" />
</then>
</if>
</sequential>
</macrodef>
<macrodef name="createdetails">
<sequential>
<arrayliteral from="component.use" to="component.details.use" key="use" />
<arrayliteral from="component.supersedes" to="component.details.supersedes" key="supersedes" />
<arrayliteral from="component.requires" to="component.details.requires" key="requires" />
<arrayliteral from="component.optional" to="component.details.optional" key="optional" />
<arrayliteral from="component.lang" to="component.details.lang" key="lang" />
<if>
<isset property="component.skinnable" />
<then>
<property name="component.details.skinnable" value="skinnable:${component.skinnable}" />
</then>
</if>
<propertyselector property="details.list"
delimiter=","
match="component\.details.([^\.]*)"
select="\1"
casesensitive="false" />
<var name="details" value="" />
<if>
<isset property="details.list" />
<then>
<for list="${details.list}" param="val">
<sequential>
<var name="details" value="${component.details.@{val}}, ${details}" />
</sequential>
</for>
<propertyregex property="component.details.hash"
input="{${details}}"
regexp="(\,\s*?\})"
replace="}"
casesensitive="false" />
</then>
<else>
<property name="component.details.hash" value="" />
</else>
</if>
</sequential>
</macrodef>
<if>
<or>
<istrue value="${yuicompressor.online}"/>
- <and>
- <available file="curl" filepath="${env.PATH}"/>
- <http url="${yuicompressor.url}" errorsBeginAt="500"/>
- </and>
+ <http url="${yuicompressor.url}" errorsBeginAt="500"/>
</or>
<then>
<property name="yuicompressor.online" value="true"/>
<macrodef name="yuicompress">
<attribute name="src" />
<attribute name="dest" />
<attribute name="args" /> <!-- not used by this task branch -->
<attribute name="type" default="js"/>
<sequential>
<property name="yuicompressor.output" value="@{dest}"/>
<property name="yuicompressor.file" value="@{src}"/>
+ <echo>If this web request fails, try building again with -Dyuicompressor.online=false or install the cURL executable into your PATH.</echo>
<exec executable="curl" input="@{src}" outputproperty="yuicompressor.result" failonerror="true">
<arg value="--silent"/>
<arg line="--data-urlencode "/>
<arg line="@${yuicompressor.file}"/>
<arg line="${yuicompressor.url}?type=@{type}"/>
</exec>
<script language="javascript">
<![CDATA[
var echo;
var project = self.getProject();
var res = project.getProperty("yuicompressor.result");
res = eval("(" + res + ")");
function w (str, level) {
var echo = project.createTask("echo");
echo.setMessage(str);
echo.perform();
}
if (!res.result) {
var fail = project.createTask("fail");
fail.setMessage("Failed to minify!");
fail.perform();
}
function notify (level, errors) {
for (var i = 0, l = errors.length; i < l; i++) {
w(errors[i], level);
}
}
notify("error", res.errors);
notify("warning", res.warnings);
project.setProperty("yuicompressor.script", res.result);
]]>
</script>
<echo file="@{dest}" message="${yuicompressor.script}"/>
<var name="yuicompressor.output" unset="true"/>
<var name="yuicompressor.script" unset="true"/>
<var name="yuicompressor.file" unset="true"/>
<var name="yuicompressor.result" unset="true"/>
</sequential>
</macrodef>
</then>
<else>
<echo level="info">Using forked yuicompressor, to speed up builds make sure the YUI Compressor server is started.</echo>
<macrodef name="yuicompress">
<attribute name="src" />
<attribute name="dest" />
<attribute name="args" />
<attribute name="type" default="js"/> <!-- not used by this task branch -->
<sequential>
- <echo level="info">Running yuicompressor on @{src}</echo>
+ <echo level="info">Running yuicompressor on @{src} with @{args}</echo>
<java jar="${yuicompressor.jar}" fork="true" failonerror="true">
<arg line="@{args} -o" />
<arg file="@{dest}" />
<arg file="@{src}" />
</java>
</sequential>
</macrodef>
</else>
</if>
<macrodef name="concatsource">
<attribute name="destfile" />
<attribute name="sourcedir" />
<attribute name="sourcefiles" />
<attribute name="workingdir" default="${workingdir}" />
<element name="filters" optional="true" description="Additonal filters to apply to individual files"/>
<sequential>
<echo level="info">Concatenating</echo>
<echo level="info"> Source Files : @{sourcefiles}</echo>
<echo level="info"> In Source Dir : @{sourcedir}</echo>
<echo level="info"> To : @{destfile}</echo>
<delete dir="@{workingdir}" quiet="true"/>
<copy todir="@{workingdir}">
<filelist dir="@{sourcedir}" files="@{sourcefiles}" />
<filterchain>
<filters />
<fixcrlf fixlast="true" eof="remove"/>
</filterchain>
</copy>
<concat destfile="@{destfile}" fixlastline="true">
<filelist dir="@{workingdir}" files="@{sourcefiles}" />
</concat>
<delete dir="${workingdir}" quiet="true" />
</sequential>
</macrodef>
<macrodef name="jslint">
<element name="jsfiles" optional="false" />
<sequential>
<pathconvert pathsep="' '" property="jsfileargs">
<jsfiles />
</pathconvert>
<if>
<or>
<istrue value="${node.online}"/>
<http url="${node.jslint.url}"/>
</or>
<then>
<property name="node.online" value="true"/>
<post to="${node.jslint.url}" property="node.jslint.response" failonerror="${lint.failonerror}">
<prop name="files" value="${jsfileargs}"/>
<prop name="failonerror" value="${lint.failonerror}"/>
</post>
<!-- Since Ant doesn't really failonerror for the post task,
handle this ourselves: -->
<if>
<not>
<isset property="node.jslint.response"/>
</not>
<then>
<fail>JSLint failed. To view lint output and continue the build, run ant with -Dlint.failonerror=false.</fail>
</then>
</if>
<!-- Clear property for next run: -->
<var name="node.jslint.response" unset="true"/>
</then>
<else>
<echo>Using Rhino. Install nodejs to improve jslint speed, or skip with -Dlint.skip=true</echo>
<!--
Need to find a way to convert fileset to args (script?) to
avoid ' ', which will break for files with ' in them
Evaluates to the following java execution line...
java -r js.jar jslintconsole.js 'file1.js' 'file2.js' 'file3.js'
-->
<java jar="${rhino.jar}" fork="true" failonerror="${jslint.failonerror}">
<arg file="${jslintconsole.js}" />
<arg value="${jslintsrc.js}" />
<arg line="'${jsfileargs}'" />
</java>
</else>
</if>
</sequential>
</macrodef>
<macrodef name="registerversion">
<attribute name="module" />
<attribute name="classname" />
<attribute name="file" />
<sequential>
<loadfile srcfile="${builddir}/files/versioncode.txt" property="@{module}-@{classname}-version" >
<filterchain>
<replacetokens>
<token key="MODULE" value="@{module}"/>
<token key="CLASSNAME" value="@{classname}"/>
</replacetokens>
</filterchain>
</loadfile>
<echo level="info">Adding Version Registration Code to @{file}</echo>
<concat destfile="@{file}" append="true" fixlastline="true">${@{module}-@{classname}-version}</concat>
</sequential>
</macrodef>
<macrodef name="addlang">
<attribute name="dir" />
<attribute name="module" />
<attribute name="dest" />
<attribute name="lang" default="" />
<attribute name="details" default = ""/>
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}@{lang}_details" value="" />
</then>
<else>
<property name="@{module}@{lang}_details" value=",@{details}" />
</else>
</if>
<if>
<equals arg1="@{lang}" arg2="" />
<then>
<property name="@{module}@{lang}_fullname" value="@{module}" />
</then>
<else>
<property name="@{module}@{lang}_fullname" value="@{module}_@{lang}" />
</else>
</if>
<if>
<available file="@{dir}/${@{module}@{lang}_fullname}.pres" />
<then>
<mkdir dir="${component.langbuilddir}" />
<java jar="${rhino.jar}" fork="true" failonerror="true">
<jvmarg value="-Dfile.encoding=utf-8" />
<arg file="${yrb2jsonconsole.js}" />
<arg file="${yrb2jsonsrc.js}" />
<arg file="@{dir}/${@{module}@{lang}_fullname}.pres" />
<arg file="${component.langbuilddir}/${@{module}@{lang}_fullname}.js" />
</java>
<echo level="info">Wrapping ${component.langbuilddir}/${@{module}@{lang}_fullname}.js in YUI.add, Y.Intl.add</echo>
<loadfile srcfile="${component.langbuilddir}/${@{module}@{lang}_fullname}.js" property="@{module}@{lang}-strs-loaded" encoding="utf-8" />
</then>
<else>
<echo level="info">Wrapping @{dir}/${@{module}@{lang}_fullname}.js in YUI.add, Y.Intl.add</echo>
<loadfile srcfile="@{dir}/${@{module}@{lang}_fullname}.js" property="@{module}@{lang}-strs-loaded" encoding="utf-8" />
</else>
</if>
<copy file="${builddir}/files/langtemplate.txt" tofile="@{dest}/${@{module}@{lang}_fullname}.js" overwrite="true" outputencoding="utf-8">
<filterset>
<filter token="LANG" value="@{lang}" />
<filter token="LANG_MODULE" value="lang/${@{module}@{lang}_fullname}" />
<filter token="STRINGS" value="${@{module}@{lang}-strs-loaded}" />
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}" />
<filter token="LANG_DETAILS" value="${@{module}@{lang}_details}" />
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addmodule">
<attribute name="file" />
<attribute name="module" />
<attribute name="details" default="" />
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}-details" value="" />
</then>
<else>
<property name="@{module}-details" value=",@{details}" />
</else>
</if>
<loadfile srcfile="@{file}" property="@{module}-@{file}-code" />
<echo level="info">Wrapping @{file} in YUI.add module</echo>
<copy file="${builddir}/files/moduletemplate.txt" tofile="@{file}" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{file}-code}" />
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}" />
<filter token="DETAILS" value="${@{module}-details}" />
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addrollup">
<attribute name="file" />
<attribute name="module" />
<attribute name="details" default="" />
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}-details" value="" />
</then>
<else>
<property name="@{module}-details" value=",@{details}" />
</else>
</if>
<loadfile srcfile="@{file}" property="@{module}-@{file}-code" />
<echo level="info">Adding Rollup @{file} using YUI.add</echo>
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{file}" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{file}-code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}"/>
<filter token="DETAILS" value="${@{module}-details}"/>
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addlangrollup">
<attribute name="module" />
<attribute name="dir" />
<sequential>
<echo level="info">Registering rollup info for lang files in @{dir} using YUI.add</echo>
<for list="${component.rollup.lang}" param="lang" trim="true">
<sequential>
<loadfile srcfile="@{dir}/@{module}_@{lang}.js" property="@{module}-@{lang}-code" />
<var name="lang.use" value="{use:[" />
<for list="${component.lang.use}" param="submod" trim="true">
<sequential>
<var name="lang.use" value="${lang.use}'lang/@{submod}_@{lang}'," />
</sequential>
</for>
<var name="lang.use" value="${lang.use}]}" />
<propertyregex property="@{module}-@{lang}-details"
input="${lang.use}"
regexp="(\,\s*?\])"
replace="]"
casesensitive="false" />
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{dir}/@{module}_@{lang}.js" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{lang}-code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="lang/@{module}_@{lang}"/>
<filter token="DETAILS" value=", ${@{module}-@{lang}-details}"/>
</filterset>
</copy>
</sequential>
</for>
<loadfile srcfile="@{dir}/@{module}.js" property="@{module}--code" />
<var name="lang.use" value="{use:[" />
<for list="${component.lang.use}" param="submod" trim="true">
<sequential>
<var name="lang.use" value="${lang.use}'lang/@{submod}'," />
</sequential>
</for>
<var name="lang.use" value="${lang.use}]}" />
<propertyregex property="@{module}--details"
input="${lang.use}"
regexp="(\,\s*?\])"
replace="]"
casesensitive="false" />
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{dir}/@{module}.js" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}--code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="lang/@{module}"/>
<filter token="DETAILS" value=", ${@{module}--details}"/>
</filterset>
</copy>
</sequential>
</macrodef>
</project>
diff --git a/componentbuild/shared/properties.xml b/componentbuild/shared/properties.xml
index 272235f..fc3c2ce 100644
--- a/componentbuild/shared/properties.xml
+++ b/componentbuild/shared/properties.xml
@@ -1,166 +1,167 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiSharedProperties">
<!-- ANT contrib library for loops, if/else support, with property fix for FOR task -->
<taskdef resource="antcontrib.properties">
<classpath>
<pathelement location="${builddir}/lib/ant-contrib/ant-contrib-1.0b3-modified.jar" />
</classpath>
</taskdef>
<dirname property="buildfile.dir" file="${ant.file}" />
<!--
builddir : The path to the builder/componentbuild directory from the component build file
srcdir : The path to top of the project source directory (e.g. yui2) from the component build file
-->
<property name="builddir" location="../../../builder/componentbuild" />
<property name="srcdir" location="../.." />
<!-- buildfiles.eol : End of line char to use for built files -->
<property name="buildfiles.eol" value="lf"/>
<!-- Supporting Tools -->
<property name="rhino.jar" location="${builddir}/lib/rhino/js.jar" />
<property name="jslintconsole.js" location="${builddir}/lib/jslint/jslint-console.js" />
<property name="jslintsrc.js" location="${builddir}/lib/jslint/fulljslint.js" />
<property name="yuicompressor.jar" location="${builddir}/lib/yuicompressor/yuicompressor-2.4.5pre.jar" />
<property name="yrb2jsonconsole.js" location="${builddir}/lib/yrb2json/yrb2json-console.js" />
<property name="yrb2jsonsrc.js" location="${builddir}/lib/yrb2json/yrb2json.js" />
<!-- YUI Compressor arguments for JS and CSS files -->
<property name="yuicompressor.js.charset" value="utf-8" />
<property name="yuicompressor.css.charset" value="utf-8" />
<property name="yuicompressor.js.args" value="--disable-optimizations --preserve-semi --line-break 6000" />
+ <property name="yuicompressor.css.args" value="--line-break 6000" />
<property name="yuicompressor.port" value="8091"/>
<!-- Enable/Disable YUI Compressor verbosity. NOTE: Checked in build files should not disable this flag -->
<property name="yuicompressor.js.verbose" value="true" />
<property name="yuicompressor.css.verbose" value="true" />
<condition property="yuicompressor.js.args.internal" value="-v --charset ${yuicompressor.js.charset} ${yuicompressor.js.args}" else="--charset ${yuicompressor.js.charset} ${yuicompressor.js.args}">
<istrue value="${yuicompressor.js.verbose}" />
</condition>
<condition property="yuicompressor.css.args.internal" value="-v --charset ${yuicompressor.css.charset} ${yuicompressor.css.args}" else="--charset ${yuicompressor.css.charset} ${yuicompressor.css.args}">
<istrue value="${yuicompressor.css.verbose}" />
</condition>
<!-- Top Level Build Directories (e.g. yui2/build, yui3/build)-->
<property name="global.build.base" location="${srcdir}/build" />
<property name="global.build.component" location="${global.build.base}/${component}" />
<property name="global.build.component.assets" location="${global.build.component}/assets" />
<!-- Component Properties -->
<property name="component.module" value="${component}" />
<property name="component.basedir" location="${buildfile.dir}" />
<property name="component.jsfiles.base" location="${component.basedir}/js" />
<property name="component.lang.base" location="${component.basedir}/lang" />
<property name="component.assets.flatten" value="true" />
<property name="component.assets.base" location="${component.basedir}/assets" />
<property name="component.assets.files" value="**/*" />
<property name="component.assets.legacy.flatten" value="true" />
<property name="component.assets.legacy.base" location="${component.assets.base}/legacy" />
<property name="component.assets.legacy.files" value="**/*" />
<property name="component.assets.skins.base" location="${component.assets.base}/skins" />
<property name="component.assets.skins.files" value="**/*" />
<condition property="component.skins.exist">
<and>
<available file="${component.assets.base}/${component}-core.css" type="file" />
<available file="${component.assets.base}/skins" type="dir" />
</and>
</condition>
<!-- component is part of a rollup build, so rollup skins to parent -->
<condition property="rollupskins">
<and>
<istrue value="${rollup}" />
<istrue value="${component.skins.exist}" />
</and>
</condition>
<available file="${component.assets.base}" type="dir" property="component.assets.exist"/>
<condition property="component.langs.exist">
<and>
<or>
<isset property="component.lang" />
<isset property="component.rollup.lang" />
</or>
</and>
</condition>
<condition property="rolluplangs">
<and>
<istrue value="${rollup}" />
<istrue value="${component.langs.exist}" />
</and>
</condition>
<!--
DEPRECATED: component.basefilename and component.releasetype are deprecated
We used to mark filenames with suffixes (-beta, -experimental), which we no longer do
-->
<condition property="component.basefilename" value="${component}" else="${component}">
<isset property="component.releasetype"/>
</condition>
<!-- Default logger regex values if not provided -->
<property name="component.logger.regex" value="^.*?(?:logger|YAHOO.log).*?(?:;|\).*;|(?:\r?\n.*?)*?\).*;).*;?.*?\r?\n" />
<property name="component.logger.regex.replace" value="" />
<property name="component.logger.regex.flags" value="mg" />
<property name="component.logger.regex.byline" value="false" />
<!-- Rollup support, currently only used for YUI 3 -->
<property name="component.rollup" value="false"/>
<property name="component.rollup.target" value="all"/>
<condition property="component.builddir" value="${component.basedir}/build_rollup_tmp" else="${component.basedir}/build_tmp">
<istrue value="${component.rollup}"/>
</condition>
<condition property="rollup.skins.exist">
<and>
<istrue value="${component.rollup}" />
<available file="${component.assets.base}/skins" type="dir" />
</and>
</condition>
<condition property="skins.exist">
<or>
<istrue value="${rollup.skins.exist}" />
<istrue value="${component.skins.exist}" />
</or>
</condition>
<!-- The temporary working directory used by the build process -->
<property name="workingdir" location="${component.builddir}/ant" />
<!-- Directory for language resource bundles in JSON format derived from YRB format -->
<property name="component.langbuilddir" value="${component.basedir}/build_lang_tmp" />
<!-- The file which defines the default targets for the particular type of component (module, rollup, css) -->
<condition property="targetbase" value="rollup" else="module">
<istrue value="${component.rollup}"/>
</condition>
<condition property="targets" value="../shared/cssmodule.xml" else="${targetbase}.xml">
<isset property="component.cssfiles" />
</condition>
<!-- By default, jslint failure should fail the build.
This can be overridden on the command line. -->
<property name="lint.failonerror" value="true"/>
<property name="node.jslint.url" value="http://127.0.0.1:8081/"/>
<property name="yuicompressor.url" value="http://127.0.0.1:${yuicompressor.port}/compress"/>
</project>
|
yui/builder
|
43ed82adbcbc4c8a5fe8b2cb45821d5754bd5ca6
|
Use YUI Compressor's HTTP server if possible.
|
diff --git a/componentbuild/lib/yuicompressor/yuicompressor-2.4.5pre.jar b/componentbuild/lib/yuicompressor/yuicompressor-2.4.5pre.jar
new file mode 100644
index 0000000..522809f
Binary files /dev/null and b/componentbuild/lib/yuicompressor/yuicompressor-2.4.5pre.jar differ
diff --git a/componentbuild/shared/macrolib.xml b/componentbuild/shared/macrolib.xml
index 029407c..8ba807a 100644
--- a/componentbuild/shared/macrolib.xml
+++ b/componentbuild/shared/macrolib.xml
@@ -1,407 +1,441 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiMacroLib">
<macrodef name="arrayliteral">
<attribute name="from" />
<attribute name="to" />
<attribute name="key" />
<sequential>
<if>
<and>
<isset property="@{from}" />
<length string="${@{from}}" when="ne" length="0" />
</and>
<then>
<propertyregex property="array"
override="true"
input="${@{from}}"
casesensitive="false"
regexp="([^\,\s]+)"
replace="'\1'"
/>
<property name="@{to}" value="@{key}:[${array}]" />
</then>
</if>
</sequential>
</macrodef>
<macrodef name="createdetails">
<sequential>
<arrayliteral from="component.use" to="component.details.use" key="use" />
<arrayliteral from="component.supersedes" to="component.details.supersedes" key="supersedes" />
<arrayliteral from="component.requires" to="component.details.requires" key="requires" />
<arrayliteral from="component.optional" to="component.details.optional" key="optional" />
<arrayliteral from="component.lang" to="component.details.lang" key="lang" />
<if>
<isset property="component.skinnable" />
<then>
<property name="component.details.skinnable" value="skinnable:${component.skinnable}" />
</then>
</if>
<propertyselector property="details.list"
delimiter=","
match="component\.details.([^\.]*)"
select="\1"
casesensitive="false" />
<var name="details" value="" />
<if>
<isset property="details.list" />
<then>
<for list="${details.list}" param="val">
<sequential>
<var name="details" value="${component.details.@{val}}, ${details}" />
</sequential>
</for>
<propertyregex property="component.details.hash"
input="{${details}}"
regexp="(\,\s*?\})"
replace="}"
casesensitive="false" />
</then>
<else>
<property name="component.details.hash" value="" />
</else>
</if>
</sequential>
</macrodef>
<if>
- <istrue value="${yuicompressor.ant}"/>
+ <or>
+ <istrue value="${yuicompressor.online}"/>
+ <and>
+ <available file="curl" filepath="${env.PATH}"/>
+ <http url="${yuicompressor.url}" errorsBeginAt="500"/>
+ </and>
+ </or>
<then>
- <taskdef
- name="jscompressor"
- classname="com.yahoo.platform.yui.compressor.ant.JavaScriptCompressorTask"
- classpath="${yuicompressor.ant.jar}"/>
- <taskdef
- name="csscompressor"
- classname="com.yahoo.platform.yui.compressor.ant.CssCompressorTask"
- classpath="${yuicompressor.ant.jar}"/>
-
+ <property name="yuicompressor.online" value="true"/>
<macrodef name="yuicompress">
<attribute name="src" />
<attribute name="dest" />
<attribute name="args" /> <!-- not used by this task branch -->
<attribute name="type" default="js"/>
<sequential>
- <if>
- <equals arg1="@{type}" arg2="css"/>
- <then>
- <csscompressor srcfile="@{src}" destfile="@{dest}" linebreak="${yuicompressor.linebreak}" charset="${yuicompressor.css.charset}" verbose="${yuicompressor.css.verbose}"/>
- </then>
- <else>
- <jscompressor srcfile="@{src}" destfile="@{dest}" linebreak="${yuicompressor.linebreak}" preservesemicolons="true" disableoptimizations="true" charset="${yuicompressor.js.charset}" verbose="${yuicompressor.js.verbose}"/>
- </else>
- </if>
+ <property name="yuicompressor.output" value="@{dest}"/>
+ <property name="yuicompressor.file" value="@{src}"/>
+ <exec executable="curl" input="@{src}" outputproperty="yuicompressor.result" failonerror="true">
+ <arg value="--silent"/>
+ <arg line="--data-urlencode "/>
+ <arg line="@${yuicompressor.file}"/>
+ <arg line="${yuicompressor.url}?type=@{type}"/>
+ </exec>
+ <script language="javascript">
+ <![CDATA[
+ var echo;
+ var project = self.getProject();
+ var res = project.getProperty("yuicompressor.result");
+ res = eval("(" + res + ")");
+
+ function w (str, level) {
+ var echo = project.createTask("echo");
+ echo.setMessage(str);
+ echo.perform();
+ }
+
+ if (!res.result) {
+ var fail = project.createTask("fail");
+ fail.setMessage("Failed to minify!");
+ fail.perform();
+ }
+
+ function notify (level, errors) {
+ for (var i = 0, l = errors.length; i < l; i++) {
+ w(errors[i], level);
+ }
+ }
+
+ notify("error", res.errors);
+ notify("warning", res.warnings);
+
+ project.setProperty("yuicompressor.script", res.result);
+
+ ]]>
+ </script>
+ <echo file="@{dest}" message="${yuicompressor.script}"/>
+ <var name="yuicompressor.output" unset="true"/>
+ <var name="yuicompressor.script" unset="true"/>
+ <var name="yuicompressor.file" unset="true"/>
+ <var name="yuicompressor.result" unset="true"/>
</sequential>
</macrodef>
</then>
<else>
- <echo level="info">Using forked yuicompressor, to speed up builds include a yuicompressor.ant.jar.</echo>
+ <echo level="info">Using forked yuicompressor, to speed up builds make sure the YUI Compressor server is started.</echo>
<macrodef name="yuicompress">
<attribute name="src" />
<attribute name="dest" />
<attribute name="args" />
<attribute name="type" default="js"/> <!-- not used by this task branch -->
<sequential>
<echo level="info">Running yuicompressor on @{src}</echo>
<java jar="${yuicompressor.jar}" fork="true" failonerror="true">
<arg line="@{args} -o" />
<arg file="@{dest}" />
<arg file="@{src}" />
</java>
</sequential>
</macrodef>
</else>
</if>
<macrodef name="concatsource">
<attribute name="destfile" />
<attribute name="sourcedir" />
<attribute name="sourcefiles" />
<attribute name="workingdir" default="${workingdir}" />
<element name="filters" optional="true" description="Additonal filters to apply to individual files"/>
<sequential>
<echo level="info">Concatenating</echo>
<echo level="info"> Source Files : @{sourcefiles}</echo>
<echo level="info"> In Source Dir : @{sourcedir}</echo>
<echo level="info"> To : @{destfile}</echo>
<delete dir="@{workingdir}" quiet="true"/>
<copy todir="@{workingdir}">
<filelist dir="@{sourcedir}" files="@{sourcefiles}" />
<filterchain>
<filters />
<fixcrlf fixlast="true" eof="remove"/>
</filterchain>
</copy>
<concat destfile="@{destfile}" fixlastline="true">
<filelist dir="@{workingdir}" files="@{sourcefiles}" />
</concat>
<delete dir="${workingdir}" quiet="true" />
</sequential>
</macrodef>
<macrodef name="jslint">
<element name="jsfiles" optional="false" />
<sequential>
<pathconvert pathsep="' '" property="jsfileargs">
<jsfiles />
</pathconvert>
<if>
<or>
<istrue value="${node.online}"/>
<http url="${node.jslint.url}"/>
</or>
<then>
<property name="node.online" value="true"/>
<post to="${node.jslint.url}" property="node.jslint.response" failonerror="${lint.failonerror}">
<prop name="files" value="${jsfileargs}"/>
<prop name="failonerror" value="${lint.failonerror}"/>
</post>
<!-- Since Ant doesn't really failonerror for the post task,
handle this ourselves: -->
<if>
<not>
<isset property="node.jslint.response"/>
</not>
<then>
<fail>JSLint failed. To view lint output and continue the build, run ant with -Dlint.failonerror=false.</fail>
</then>
</if>
<!-- Clear property for next run: -->
<var name="node.jslint.response" unset="true"/>
</then>
<else>
<echo>Using Rhino. Install nodejs to improve jslint speed, or skip with -Dlint.skip=true</echo>
<!--
Need to find a way to convert fileset to args (script?) to
avoid ' ', which will break for files with ' in them
Evaluates to the following java execution line...
java -r js.jar jslintconsole.js 'file1.js' 'file2.js' 'file3.js'
-->
<java jar="${rhino.jar}" fork="true" failonerror="${jslint.failonerror}">
<arg file="${jslintconsole.js}" />
<arg value="${jslintsrc.js}" />
<arg line="'${jsfileargs}'" />
</java>
</else>
</if>
</sequential>
</macrodef>
<macrodef name="registerversion">
<attribute name="module" />
<attribute name="classname" />
<attribute name="file" />
<sequential>
<loadfile srcfile="${builddir}/files/versioncode.txt" property="@{module}-@{classname}-version" >
<filterchain>
<replacetokens>
<token key="MODULE" value="@{module}"/>
<token key="CLASSNAME" value="@{classname}"/>
</replacetokens>
</filterchain>
</loadfile>
<echo level="info">Adding Version Registration Code to @{file}</echo>
<concat destfile="@{file}" append="true" fixlastline="true">${@{module}-@{classname}-version}</concat>
</sequential>
</macrodef>
<macrodef name="addlang">
<attribute name="dir" />
<attribute name="module" />
<attribute name="dest" />
<attribute name="lang" default="" />
<attribute name="details" default = ""/>
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}@{lang}_details" value="" />
</then>
<else>
<property name="@{module}@{lang}_details" value=",@{details}" />
</else>
</if>
<if>
<equals arg1="@{lang}" arg2="" />
<then>
<property name="@{module}@{lang}_fullname" value="@{module}" />
</then>
<else>
<property name="@{module}@{lang}_fullname" value="@{module}_@{lang}" />
</else>
</if>
<if>
<available file="@{dir}/${@{module}@{lang}_fullname}.pres" />
<then>
<mkdir dir="${component.langbuilddir}" />
<java jar="${rhino.jar}" fork="true" failonerror="true">
<jvmarg value="-Dfile.encoding=utf-8" />
<arg file="${yrb2jsonconsole.js}" />
<arg file="${yrb2jsonsrc.js}" />
<arg file="@{dir}/${@{module}@{lang}_fullname}.pres" />
<arg file="${component.langbuilddir}/${@{module}@{lang}_fullname}.js" />
</java>
<echo level="info">Wrapping ${component.langbuilddir}/${@{module}@{lang}_fullname}.js in YUI.add, Y.Intl.add</echo>
<loadfile srcfile="${component.langbuilddir}/${@{module}@{lang}_fullname}.js" property="@{module}@{lang}-strs-loaded" encoding="utf-8" />
</then>
<else>
<echo level="info">Wrapping @{dir}/${@{module}@{lang}_fullname}.js in YUI.add, Y.Intl.add</echo>
<loadfile srcfile="@{dir}/${@{module}@{lang}_fullname}.js" property="@{module}@{lang}-strs-loaded" encoding="utf-8" />
</else>
</if>
<copy file="${builddir}/files/langtemplate.txt" tofile="@{dest}/${@{module}@{lang}_fullname}.js" overwrite="true" outputencoding="utf-8">
<filterset>
<filter token="LANG" value="@{lang}" />
<filter token="LANG_MODULE" value="lang/${@{module}@{lang}_fullname}" />
<filter token="STRINGS" value="${@{module}@{lang}-strs-loaded}" />
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}" />
<filter token="LANG_DETAILS" value="${@{module}@{lang}_details}" />
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addmodule">
<attribute name="file" />
<attribute name="module" />
<attribute name="details" default="" />
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}-details" value="" />
</then>
<else>
<property name="@{module}-details" value=",@{details}" />
</else>
</if>
<loadfile srcfile="@{file}" property="@{module}-@{file}-code" />
<echo level="info">Wrapping @{file} in YUI.add module</echo>
<copy file="${builddir}/files/moduletemplate.txt" tofile="@{file}" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{file}-code}" />
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}" />
<filter token="DETAILS" value="${@{module}-details}" />
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addrollup">
<attribute name="file" />
<attribute name="module" />
<attribute name="details" default="" />
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}-details" value="" />
</then>
<else>
<property name="@{module}-details" value=",@{details}" />
</else>
</if>
<loadfile srcfile="@{file}" property="@{module}-@{file}-code" />
<echo level="info">Adding Rollup @{file} using YUI.add</echo>
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{file}" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{file}-code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}"/>
<filter token="DETAILS" value="${@{module}-details}"/>
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addlangrollup">
<attribute name="module" />
<attribute name="dir" />
<sequential>
<echo level="info">Registering rollup info for lang files in @{dir} using YUI.add</echo>
<for list="${component.rollup.lang}" param="lang" trim="true">
<sequential>
<loadfile srcfile="@{dir}/@{module}_@{lang}.js" property="@{module}-@{lang}-code" />
<var name="lang.use" value="{use:[" />
<for list="${component.lang.use}" param="submod" trim="true">
<sequential>
<var name="lang.use" value="${lang.use}'lang/@{submod}_@{lang}'," />
</sequential>
</for>
<var name="lang.use" value="${lang.use}]}" />
<propertyregex property="@{module}-@{lang}-details"
input="${lang.use}"
regexp="(\,\s*?\])"
replace="]"
casesensitive="false" />
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{dir}/@{module}_@{lang}.js" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{lang}-code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="lang/@{module}_@{lang}"/>
<filter token="DETAILS" value=", ${@{module}-@{lang}-details}"/>
</filterset>
</copy>
</sequential>
</for>
<loadfile srcfile="@{dir}/@{module}.js" property="@{module}--code" />
<var name="lang.use" value="{use:[" />
<for list="${component.lang.use}" param="submod" trim="true">
<sequential>
<var name="lang.use" value="${lang.use}'lang/@{submod}'," />
</sequential>
</for>
<var name="lang.use" value="${lang.use}]}" />
<propertyregex property="@{module}--details"
input="${lang.use}"
regexp="(\,\s*?\])"
replace="]"
casesensitive="false" />
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{dir}/@{module}.js" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}--code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="lang/@{module}"/>
<filter token="DETAILS" value=", ${@{module}--details}"/>
</filterset>
</copy>
</sequential>
</macrodef>
</project>
diff --git a/componentbuild/shared/properties.xml b/componentbuild/shared/properties.xml
index 9ee5a43..272235f 100644
--- a/componentbuild/shared/properties.xml
+++ b/componentbuild/shared/properties.xml
@@ -1,169 +1,166 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiSharedProperties">
<!-- ANT contrib library for loops, if/else support, with property fix for FOR task -->
<taskdef resource="antcontrib.properties">
<classpath>
<pathelement location="${builddir}/lib/ant-contrib/ant-contrib-1.0b3-modified.jar" />
</classpath>
</taskdef>
<dirname property="buildfile.dir" file="${ant.file}" />
<!--
builddir : The path to the builder/componentbuild directory from the component build file
srcdir : The path to top of the project source directory (e.g. yui2) from the component build file
-->
<property name="builddir" location="../../../builder/componentbuild" />
<property name="srcdir" location="../.." />
<!-- buildfiles.eol : End of line char to use for built files -->
<property name="buildfiles.eol" value="lf"/>
<!-- Supporting Tools -->
<property name="rhino.jar" location="${builddir}/lib/rhino/js.jar" />
<property name="jslintconsole.js" location="${builddir}/lib/jslint/jslint-console.js" />
<property name="jslintsrc.js" location="${builddir}/lib/jslint/fulljslint.js" />
- <property name="yuicompressor.jar" location="${builddir}/lib/yuicompressor/yuicompressor-2.4.2.jar" />
- <property name="yuicompressor.ant.jar" location="${builddir}/lib/yuicompressor/yuicompressor-2.4.3-dinoboff.jar" />
+ <property name="yuicompressor.jar" location="${builddir}/lib/yuicompressor/yuicompressor-2.4.5pre.jar" />
<property name="yrb2jsonconsole.js" location="${builddir}/lib/yrb2json/yrb2json-console.js" />
<property name="yrb2jsonsrc.js" location="${builddir}/lib/yrb2json/yrb2json.js" />
- <available file="${yuicompressor.ant.jar}" property="yuicompressor.ant"/>
-
<!-- YUI Compressor arguments for JS and CSS files -->
- <property name="yuicompressor.linebreak" value="6000" />
-
- <property name="yuicompressor.css.args" value="--type css --line-break 6000" />
- <property name="yuicompressor.js.args" value="--disable-optimizations --preserve-semi --line-break 6000" />
<property name="yuicompressor.js.charset" value="utf-8" />
<property name="yuicompressor.css.charset" value="utf-8" />
+ <property name="yuicompressor.js.args" value="--disable-optimizations --preserve-semi --line-break 6000" />
+ <property name="yuicompressor.port" value="8091"/>
+
<!-- Enable/Disable YUI Compressor verbosity. NOTE: Checked in build files should not disable this flag -->
<property name="yuicompressor.js.verbose" value="true" />
<property name="yuicompressor.css.verbose" value="true" />
<condition property="yuicompressor.js.args.internal" value="-v --charset ${yuicompressor.js.charset} ${yuicompressor.js.args}" else="--charset ${yuicompressor.js.charset} ${yuicompressor.js.args}">
<istrue value="${yuicompressor.js.verbose}" />
</condition>
<condition property="yuicompressor.css.args.internal" value="-v --charset ${yuicompressor.css.charset} ${yuicompressor.css.args}" else="--charset ${yuicompressor.css.charset} ${yuicompressor.css.args}">
<istrue value="${yuicompressor.css.verbose}" />
</condition>
<!-- Top Level Build Directories (e.g. yui2/build, yui3/build)-->
<property name="global.build.base" location="${srcdir}/build" />
<property name="global.build.component" location="${global.build.base}/${component}" />
<property name="global.build.component.assets" location="${global.build.component}/assets" />
<!-- Component Properties -->
<property name="component.module" value="${component}" />
<property name="component.basedir" location="${buildfile.dir}" />
<property name="component.jsfiles.base" location="${component.basedir}/js" />
<property name="component.lang.base" location="${component.basedir}/lang" />
<property name="component.assets.flatten" value="true" />
<property name="component.assets.base" location="${component.basedir}/assets" />
<property name="component.assets.files" value="**/*" />
<property name="component.assets.legacy.flatten" value="true" />
<property name="component.assets.legacy.base" location="${component.assets.base}/legacy" />
<property name="component.assets.legacy.files" value="**/*" />
<property name="component.assets.skins.base" location="${component.assets.base}/skins" />
<property name="component.assets.skins.files" value="**/*" />
<condition property="component.skins.exist">
<and>
<available file="${component.assets.base}/${component}-core.css" type="file" />
<available file="${component.assets.base}/skins" type="dir" />
</and>
</condition>
<!-- component is part of a rollup build, so rollup skins to parent -->
<condition property="rollupskins">
<and>
<istrue value="${rollup}" />
<istrue value="${component.skins.exist}" />
</and>
</condition>
<available file="${component.assets.base}" type="dir" property="component.assets.exist"/>
<condition property="component.langs.exist">
<and>
<or>
<isset property="component.lang" />
<isset property="component.rollup.lang" />
</or>
</and>
</condition>
<condition property="rolluplangs">
<and>
<istrue value="${rollup}" />
<istrue value="${component.langs.exist}" />
</and>
</condition>
<!--
DEPRECATED: component.basefilename and component.releasetype are deprecated
We used to mark filenames with suffixes (-beta, -experimental), which we no longer do
-->
<condition property="component.basefilename" value="${component}" else="${component}">
<isset property="component.releasetype"/>
</condition>
<!-- Default logger regex values if not provided -->
<property name="component.logger.regex" value="^.*?(?:logger|YAHOO.log).*?(?:;|\).*;|(?:\r?\n.*?)*?\).*;).*;?.*?\r?\n" />
<property name="component.logger.regex.replace" value="" />
<property name="component.logger.regex.flags" value="mg" />
<property name="component.logger.regex.byline" value="false" />
<!-- Rollup support, currently only used for YUI 3 -->
<property name="component.rollup" value="false"/>
<property name="component.rollup.target" value="all"/>
<condition property="component.builddir" value="${component.basedir}/build_rollup_tmp" else="${component.basedir}/build_tmp">
<istrue value="${component.rollup}"/>
</condition>
<condition property="rollup.skins.exist">
<and>
<istrue value="${component.rollup}" />
<available file="${component.assets.base}/skins" type="dir" />
</and>
</condition>
<condition property="skins.exist">
<or>
<istrue value="${rollup.skins.exist}" />
<istrue value="${component.skins.exist}" />
</or>
</condition>
<!-- The temporary working directory used by the build process -->
<property name="workingdir" location="${component.builddir}/ant" />
<!-- Directory for language resource bundles in JSON format derived from YRB format -->
<property name="component.langbuilddir" value="${component.basedir}/build_lang_tmp" />
<!-- The file which defines the default targets for the particular type of component (module, rollup, css) -->
<condition property="targetbase" value="rollup" else="module">
<istrue value="${component.rollup}"/>
</condition>
<condition property="targets" value="../shared/cssmodule.xml" else="${targetbase}.xml">
<isset property="component.cssfiles" />
</condition>
<!-- By default, jslint failure should fail the build.
This can be overridden on the command line. -->
<property name="lint.failonerror" value="true"/>
<property name="node.jslint.url" value="http://127.0.0.1:8081/"/>
+ <property name="yuicompressor.url" value="http://127.0.0.1:${yuicompressor.port}/compress"/>
</project>
diff --git a/componentbuild/shared/targets.xml b/componentbuild/shared/targets.xml
index f81f625..8e4c9df 100644
--- a/componentbuild/shared/targets.xml
+++ b/componentbuild/shared/targets.xml
@@ -1,179 +1,201 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiSharedTargets">
<echo level="info">Starting Build For ${component}</echo>
<echo level="info">Ant Properties</echo>
<echo level="info"> Home : ${ant.home}</echo>
<echo level="info"> Ant Version : ${ant.version}</echo>
<echo level="info"> Build File : ${ant.file}</echo>
<echo level="info">Local Build Properties</echo>
<echo level="info"> version : ${yui.version}</echo>
<echo level="info"> srcdir : ${srcdir}</echo>
<echo level="info"> builddir : ${builddir}</echo>
<echo level="info"> component : ${component}</echo>
<echo level="info"> component.basefilename : ${component.basefilename}</echo>
<echo level="info"> component.basedir : ${component.basedir}</echo>
<echo level="info"> component.builddir : ${component.builddir}</echo>
<echo level="info">Global Build Properties</echo>
<echo level="info"> global.build.base : ${global.build.base}</echo>
<echo level="info"> global.build.component : ${global.build.component}</echo>
<echo level="info"> global.build.component.assets : ${global.build.component.assets}</echo>
<dirname property="targets.basedir" file="${ant.file.YuiSharedTargets}"/>
<import file="${targets.basedir}/macrolib.xml" description="Macrodef definitions - jslint, yuicompessor, registerversion" />
<target name="all" depends="local, deploy" description="Build and Deploy to Global Build Directory" />
<target name="local" depends="clean, init, build, minify, lint" description="Build and Deploy to Local Build Directory" />
<target name="init">
<tstamp/>
<mkdir dir="${component.builddir}" />
<createdetails />
+ <antcall target="-yuicompressor"/>
<antcall target="-lint-server"/>
</target>
<target name="-lint-server" description="Start JSLint Server" unless="lint.skip">
<antcall target="-node">
<param name="src" value="${builddir}/lib/jslint/jslint-node.js"/>
</antcall>
</target>
<target name="-node" description="Start NodeJS Server" unless="node.spawn">
<if>
<not>
<http url="${node.jslint.url}"/>
</not>
<then>
<echo level="info">Attempting to start NodeJS app at: ${src}</echo>
<exec executable="node" spawn="true">
<arg value="${src}"/>
</exec>
<!-- Don't fail if node doesn't exist, fails to start, etc.
We will fallback to the slow Rhino engine later. -->
</then>
</if>
<!-- Don't try to start again. -->
<property name="node.spawn" value="true"/>
</target>
+ <target name="-yuicompressor" description="Start YUI Compressor Server" unless="yuicompressor.spawn">
+ <if>
+ <not>
+ <http url="${yuicompressor.url}"/>
+ </not>
+ <then>
+ <echo level="info">Attempting to start YUI Compressor server.</echo>
+ <java classname="com.yahoo.platform.yui.compressor.Bootstrap" fork="true" spawn="true">
+ <arg line="--server"/>
+ <arg line="${yuicompressor.port}"/>
+ <arg line="${yuicompressor.js.args}"/>
+ <arg line="${yuicompressor.js.args.internal}"/>
+ <classpath>
+ <pathelement location="${yuicompressor.jar}"/>
+ </classpath>
+ </java>
+ </then>
+ </if>
+ <property name="yuicompressor.spawn" value="true"/>
+ </target>
+
<target name="clean" description="Clean Local Build Directory" unless="clean.skip">
<delete dir="${component.builddir}" />
</target>
<target name="build" />
<!-- MIN -->
<target name="minify" description="Create component-min.js from component.js">
<yuicompress src="${component.builddir}/${component.basefilename}.js" dest="${component.builddir}/${component.basefilename}-min.js" args="${yuicompressor.js.args.internal}" />
<if>
<available file="${component.builddir}/lang" type="dir" />
<then>
<for param="file">
<path>
<fileset dir="${component.builddir}/lang" includes="*.js"/>
</path>
<sequential>
<yuicompress src="@{file}" dest="@{file}" args="${yuicompressor.js.args.internal}" />
</sequential>
</for>
</then>
</if>
</target>
<target name="lint" description="Run jslint over the local build files (default settings)" unless="lint.skip">
<jslint>
<jsfiles>
<fileset dir="${component.builddir}" includes="*.js" />
</jsfiles>
</jslint>
</target>
<!-- DEPLOY -->
<target name="deploy" description="Copy files to global location" depends="deploybuild, deployassets, deployskins, deploylang, deploydocs"></target>
<target name="deploybuild" description="Copy built files to global build location">
<copy todir="${global.build.component}" overwrite="true" verbose="true">
<fileset dir="${component.builddir}" includes="*.js" />
</copy>
</target>
<target name="deployassets" if="component.assets.exist">
<copy todir="${global.build.component.assets}" flatten="${component.assets.flatten}" overwrite="true" verbose="true">
<fileset dir="${component.assets.base}" includes="${component.assets.files}" excludes="skins/, legacy/" />
</copy>
<copy todir="${global.build.component.assets}" flatten="${component.assets.legacy.flatten}" preservelastmodified="true" failonerror="false" verbose="true">
<fileset dir="${component.assets.legacy.base}" includes="${component.assets.legacy.files}" excludes="skins/" />
</copy>
</target>
<target name="deployskins" if="skins.exist">
<copy todir="${global.build.component.assets}/skins/sam" overwrite="true" verbose="true">
<fileset dir="${component.builddir}/assets/skins/sam" includes="${component}.css" />
</copy>
<copy todir="${global.build.component.assets}/skins/sam" overwrite="true" verbose="true">
<fileset dir="${component.assets.skins.base}/sam" includes="${component.assets.skins.files}" />
</copy>
</target>
<target name="deploylang" description="Copy language bundles to global build location">
<copy todir="${global.build.component}/lang" overwrite="true" failonerror="false" verbose="true">
<fileset dir="${component.builddir}/lang" includes="*.js" />
</copy>
</target>
<target name="deploydocs" description="Copy doc files to global doc locations">
<!-- TODO -->
</target>
<target name="-prepend" if="component.prependfiles">
<concat destfile="${workingdir}/${component.basefilename}.js.tmp" fixlastline="true">
<filelist dir="${component.basedir}" files="${component.prependfiles}" />
<filterchain>
<tokenfilter>
<filetokenizer/>
<replaceregex
pattern="${component.logger.regex}"
replace="${component.logger.regex.replace}"
flags="${component.logger.regex.flags}" />
</tokenfilter>
</filterchain>
</concat>
<concat destfile="${workingdir}/${component.basefilename}.js.tmp" fixlastline="true" append="true">
<filelist dir="${component.builddir}" files="${component.basefilename}.js" />
</concat>
<move file="${workingdir}/${component.basefilename}.js.tmp" tofile="${component.builddir}/${component.basefilename}.js" />
</target>
<target name="-append" if="component.appendfiles">
<concat destfile="${component.builddir}/${component.basefilename}.js" fixlastline="true" append="true">
<filelist dir="${component.basedir}" files="${component.appendfiles}" />
<filterchain>
<tokenfilter>
<filetokenizer/>
<replaceregex
pattern="${component.logger.regex}"
replace="${component.logger.regex.replace}"
flags="${component.logger.regex.flags}" />
</tokenfilter>
</filterchain>
</concat>
</target>
<target name="-prependdebug" if="component.prependfiles">
<concat destfile="${workingdir}/${component.basefilename}-debug.js.tmp" fixlastline="true" >
<filelist dir="${component.basedir}" files="${component.prependfiles}" />
<filelist dir="${component.builddir}" files="${component.basefilename}-debug.js" />
</concat>
<move file="${workingdir}/${component.basefilename}-debug.js.tmp" tofile="${component.builddir}/${component.basefilename}-debug.js" />
</target>
<target name="-appenddebug" if="component.appendfiles">
<concat destfile="${component.builddir}/${component.basefilename}-debug.js" fixlastline="true" append="true">
<filelist dir="${component.basedir}" files="${component.appendfiles}" />
</concat>
</target>
</project>
|
yui/builder
|
cd712cf13a18cd0334f5f1d506e7c998a5bf2f9e
|
Interim release -- css compress improvements, removes YUI token warning, handles preserved comments better, prefers lower case replacement tokens, can process multiple files at once.
|
diff --git a/componentbuild/lib/yuicompressor/yuicompressor-2.4.4.jar b/componentbuild/lib/yuicompressor/yuicompressor-2.4.4.jar
new file mode 100644
index 0000000..d9ddb33
Binary files /dev/null and b/componentbuild/lib/yuicompressor/yuicompressor-2.4.4.jar differ
|
yui/builder
|
abb7f98a642fb620e44d43dda7fbdf0b8f9db534
|
Introduce component.cssfiles.base. [fix #19]
|
diff --git a/componentbuild/shared/cssmodule.xml b/componentbuild/shared/cssmodule.xml
index 8ac8370..f95b9b9 100644
--- a/componentbuild/shared/cssmodule.xml
+++ b/componentbuild/shared/cssmodule.xml
@@ -1,27 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiCssModuleTargets">
<dirname property="cssmodule.basedir" file="${ant.file.YuiCssModuleTargets}"/>
<import file="${cssmodule.basedir}/../shared/targets.xml" description="Targets common to Rollup/Module" />
<target name="build" depends="buildcore" />
<target name="buildcore">
- <concatsource destfile="${component.builddir}/${component.basefilename}.css" sourcedir="${component.basedir}/css" sourcefiles="${component.cssfiles}" />
+ <concatsource destfile="${component.builddir}/${component.basefilename}.css" sourcedir="${component.cssfiles.base}" sourcefiles="${component.cssfiles}" />
</target>
<target name="minify">
<yuicompress src="${component.builddir}/${component.basefilename}.css" dest="${component.builddir}/${component.basefilename}-min.css" args="${yuicompressor.css.args.internal}" />
</target>
<target name="lint">
<!-- TODO : CSS Lint support. Currently need to add @charset "UTF-8";-->
</target>
<target name="deploybuild" description="Copy built files to global build location">
<copy todir="${global.build.component}" preservelastmodified="true">
<fileset dir="${component.builddir}" includes="*.css" />
</copy>
</target>
</project>
diff --git a/componentbuild/shared/properties.xml b/componentbuild/shared/properties.xml
index d6f31f9..e0cd944 100644
--- a/componentbuild/shared/properties.xml
+++ b/componentbuild/shared/properties.xml
@@ -1,158 +1,159 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiSharedProperties">
<!-- ANT contrib library for loops, if/else support, with property fix for FOR task -->
<taskdef resource="antcontrib.properties">
<classpath>
<pathelement location="${builddir}/lib/ant-contrib/ant-contrib-1.0b3-modified.jar" />
</classpath>
</taskdef>
<dirname property="buildfile.dir" file="${ant.file}" />
<!--
builddir : The path to the builder/componentbuild directory from the component build file
srcdir : The path to top of the project source directory (e.g. yui2) from the component build file
-->
<property name="builddir" location="../../../builder/componentbuild" />
<property name="srcdir" location="../.." />
<!-- buildfiles.eol : End of line char to use for built files -->
<property name="buildfiles.eol" value="lf"/>
<!-- Supporting Tools -->
<property name="rhino.jar" location="${builddir}/lib/rhino/js.jar" />
<property name="jslintconsole.js" location="${builddir}/lib/jslint/jslint-console.js" />
<property name="jslintsrc.js" location="${builddir}/lib/jslint/fulljslint.js" />
<property name="yuicompressor.jar" location="${builddir}/lib/yuicompressor/yuicompressor-2.4.jar" />
<property name="yrb2jsonconsole.js" location="${builddir}/lib/yrb2json/yrb2json-console.js" />
<property name="yrb2jsonsrc.js" location="${builddir}/lib/yrb2json/yrb2json.js" />
<!-- YUI Compressor arguments for JS and CSS files -->
<property name="yuicompressor.css.args" value="--type css --line-break 6000" />
<property name="yuicompressor.js.args" value="--disable-optimizations --preserve-semi --line-break 6000" />
<property name="yuicompressor.js.charset" value="utf-8" />
<property name="yuicompressor.css.charset" value="utf-8" />
<!-- Enable/Disable YUI Compressor verbosity. NOTE: Checked in build files should not disable this flag -->
<property name="yuicompressor.js.verbose" value="true" />
<property name="yuicompressor.css.verbose" value="true" />
<condition property="yuicompressor.js.args.internal" value="-v --charset ${yuicompressor.js.charset} ${yuicompressor.js.args}" else="--charset ${yuicompressor.js.charset} ${yuicompressor.js.args}">
<istrue value="${yuicompressor.js.verbose}" />
</condition>
<condition property="yuicompressor.css.args.internal" value="-v --charset ${yuicompressor.css.charset} ${yuicompressor.css.args}" else="--charset ${yuicompressor.css.charset} ${yuicompressor.css.args}">
<istrue value="${yuicompressor.css.verbose}" />
</condition>
<!-- Top Level Build Directories (e.g. yui2/build, yui3/build)-->
<property name="global.build.base" location="${srcdir}/build" />
<property name="global.build.component" location="${global.build.base}/${component}" />
<property name="global.build.component.assets" location="${global.build.component}/assets" />
<!-- Component Properties -->
<property name="component.module" value="${component}" />
<property name="component.basedir" location="${buildfile.dir}" />
<property name="component.jsfiles.base" location="${component.basedir}/js" />
+ <property name="component.cssfiles.base" location="${component.basedir}/css" />
<property name="component.lang.base" location="${component.basedir}/lang" />
<property name="component.assets.flatten" value="true" />
<property name="component.assets.base" location="${component.basedir}/assets" />
<property name="component.assets.files" value="**/*" />
<property name="component.assets.legacy.flatten" value="true" />
<property name="component.assets.legacy.base" location="${component.assets.base}/legacy" />
<property name="component.assets.legacy.files" value="**/*" />
<property name="component.assets.skins.base" location="${component.assets.base}/skins" />
<property name="component.assets.skins.files" value="**/*" />
<condition property="component.skins.exist">
<and>
<available file="${component.assets.base}/${component}-core.css" type="file" />
<available file="${component.assets.base}/skins" type="dir" />
</and>
</condition>
<!-- component is part of a rollup build, so rollup skins to parent -->
<condition property="rollupskins">
<and>
<istrue value="${rollup}" />
<istrue value="${component.skins.exist}" />
</and>
</condition>
<available file="${component.assets.base}" type="dir" property="component.assets.exist"/>
<condition property="component.langs.exist">
<and>
<or>
<isset property="component.lang" />
<isset property="component.rollup.lang" />
</or>
</and>
</condition>
<condition property="rolluplangs">
<and>
<istrue value="${rollup}" />
<istrue value="${component.langs.exist}" />
</and>
</condition>
<!--
DEPRECATED: component.basefilename and component.releasetype are deprecated
We used to mark filenames with suffixes (-beta, -experimental), which we no longer do
-->
<condition property="component.basefilename" value="${component}" else="${component}">
<isset property="component.releasetype"/>
</condition>
<!-- Default logger regex values if not provided -->
<property name="component.logger.regex" value="^.*?(?:logger|YAHOO.log).*?(?:;|\).*;|(?:\r?\n.*?)*?\).*;).*;?.*?\r?\n" />
<property name="component.logger.regex.replace" value="" />
<property name="component.logger.regex.flags" value="mg" />
<property name="component.logger.regex.byline" value="false" />
<!-- Rollup support, currently only used for YUI 3 -->
<property name="component.rollup" value="false"/>
<property name="component.rollup.target" value="all"/>
<condition property="component.builddir" value="${component.basedir}/build_rollup_tmp" else="${component.basedir}/build_tmp">
<istrue value="${component.rollup}"/>
</condition>
<condition property="rollup.skins.exist">
<and>
<istrue value="${component.rollup}" />
<available file="${component.assets.base}/skins" type="dir" />
</and>
</condition>
<condition property="skins.exist">
<or>
<istrue value="${rollup.skins.exist}" />
<istrue value="${component.skins.exist}" />
</or>
</condition>
<!-- The temporary working directory used by the build process -->
<property name="workingdir" location="${component.builddir}/ant" />
<!-- Directory for language resource bundles in JSON format derived from YRB format -->
<property name="component.langbuilddir" value="${component.basedir}/build_lang_tmp" />
<!-- The file which defines the default targets for the particular type of component (module, rollup, css) -->
<condition property="targetbase" value="rollup" else="module">
<istrue value="${component.rollup}"/>
</condition>
<condition property="targets" value="../shared/cssmodule.xml" else="${targetbase}.xml">
<isset property="component.cssfiles" />
</condition>
</project>
|
yui/builder
|
b39dca7d41e9868cd7b6abb2431737ab5d60c498
|
Welcome to YUI Builder.
|
diff --git a/componentbuild/README b/componentbuild/README
index 86db405..32227d9 100644
--- a/componentbuild/README
+++ b/componentbuild/README
@@ -1,230 +1,232 @@
+Welcome to YUI Builder.
+
INTRODUCTION
------------
YUI uses ANT to create component build files from individual source files.
Each component has its own ANT build file residing in the component's
source folder with an associated properties file used to define build
parameters specific to the component e.g:
yui2/src/autocomplete/build.xml
yui2/src/autocomplete/build.properties
The component build will automate the conversion from component source
to <component>.js, <component>-min.js, <component>-debug.js by:
a) Concatenating individual source files
b) Stripping logger statements
c) Compressing files, using yuicompressor
d) Running jslint on all 3 built files
e) Adding boiler plate module/version registration code
f) Building skin files from <component>-core.css, <component>-skin.css
g) Deploying built JS, CSS and assets to <project>/build
The same component build system is also used for CSS components such as
reset, base, fonts and grids.
The component build does not currently:
a) Check in any code
The developer is responsible for checking modified source code
into the <project>/src directory, and built code into the
<project>/build directory, allowing them to review diffs,
before committing changes.
b) Generate API documentation
INSTALLATION
------------
Below is a brief summary as well as a detailed step-by-step guide
for installing the build system, allowing you to build the "src"
component code.
SUMMARY
1) Install ANT 1.7 or above, and add ant to your path
2) Clone the YUI "builder" project from http://github.com/yui/builder/
3) At the command line, cd to the source directory of the component
you wish to build, and execute "ant all" to build, e.g.:
prompt> cd yui2/src/autocomplete
prompt> ant all
DETAILED INSTRUCTIONS
To use the build system, you'll need to install ANT and obtain
the YUI build infrastructure from github.
These are both one-time install tasks.
INSTALLING ANT
1) Download and install ANT 1.7 (or above)
http://ant.apache.org/bindownload.cgi
2) Be sure to define an ANT_HOME environment variable to point to
your ANT install root, and add the ANT executable to your
environment's PATH variable.
INSTALLING YUI BUILD INFRASTRUCTURE
1) Clone the YUI "builder" project from github:
http://github.com/yui/builder/
This project contains the files used by the
YUI ant build process.
2) Out of the box, the build system is designed to work
when cloned to the default "builder" directory, parallel
to the project source directories:
<gitroot>/yui2 [ cloned yui2 project ]
<gitroot>/yui3 [ cloned yui2 project ]
<gitroot>/builder [ cloned builder project ]
Cloning it to the default location will allow you to
build any of the components without having to modify any
component build scripts.
NOTE: YUI Builder is also available for download as a zip from
http://yuilibrary.com/downloads. If downloading from this location
to build yui2 or yui3 source, make sure to unzip the contents into
the directory structure mentioned above, to have the build work out
of the box.
BUILDING AN EXISTING COMPONENT
------------------------------
With ANT and the YUI build infrastructure installed, you can now build any
of the components from source, using the build.xml file in the component's
source directory.
The build system allows you to build locally, within the component's
source directory, and also run a full build to update the top level build
directory for a component.
FULL BUILD
To perform a full build for a component, run ant with the "all" target:
e.g:
prompt> cd yui2/src/autocomplete
prompt> ant all
The "all" build target will build the component from its source files AND
deploy the built files, as well as any assets, to the top level build
folder:
<project>/build/<component>
So, for autocomplete, the built files would be copied to:
yui2/build/autocomplete
NOTE: When invoking ant without a file argument, as we do above, it will
use build.xml, if present in the current directory - which is what we want.
LOCAL BUILD
To perform a local build for a component, run ant without a target:
e.g:
prompt> cd yui2/src/autocomplete
prompt> ant
This will run the default target, which is "local".
The "local" build target will build the autocomplete component from its
source files, but will NOT deploy the built files to the top level build
folder.
The locally built files are stored in the temporary directory:
<project>/src/<component>/build_tmp
So, for autocomplete, the built files can be found in the directory below:
yui2/src/autocomplete/build_tmp
BUILD OUTPUT
ANT will output build information to the screen, as it runs through the
build, which can be redirected to a file if required:
prompt> ant all
Buildfile: build.xml
[echo] Starting Build For autocomplete
...
[echo] builddir : ../../../builder/componentbuild
...
...
BUILD SUCCESSFUL
Total time: 7 seconds
prompt>
NOTE: Most components will have warnings which are output during the
"minify" and "lint" steps, which the component developer has evaluated
and determined to have no impact on functionality.
CREATING BUILD FILES FOR A NEW COMPONENT
----------------------------------------
The builder/componentbuild/templates directory has basic build.xml and
build.properties templates for the various component types supported.
For most new components, you should be able to start with the
appropriate template files and simply change the values of the basic
properties defined to suit your component.
If you're creating:
* A YUI 2 Component (either a JS or CSS component), use:
builder/componentbuild/templates/yui2
build.xml
build.properties
* A YUI 3 Component (either a JS or CSS component), use:
builder/componentbuild/templates/yui3
build.xml
build.properties
* A YUI 3 Rollup Component, use:
builder/componentbuild/templates/yui3/rollup
For the rollup component:
build.xml
build.properties
For the sub components:
subcomponentone.xml
subcomponentone.properties
subcomponenttwo.xml
subcomponenttwo.properties
FURTHER CUSTOMIZATION
If required, you can define custom values for any of the properties
defined in builder/componentbuild/docs/properties.html to customize the
build for your new component, however as mentioned above, for most
components the properties defined in the template files should be
sufficient.
You can also override or extend existing targets, to customize the actual
build process for a component if required. The list of targets and their
role is defined in builder/componentbuild/docs/targets.html.
|
yui/builder
|
e6f6c278d4a41b8535bf4b12687eee541c47b5ab
|
Changed cssmodule to support component.basefilename
|
diff --git a/componentbuild/shared/cssmodule.xml b/componentbuild/shared/cssmodule.xml
index 54ac37d..8ac8370 100644
--- a/componentbuild/shared/cssmodule.xml
+++ b/componentbuild/shared/cssmodule.xml
@@ -1,27 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiCssModuleTargets">
<dirname property="cssmodule.basedir" file="${ant.file.YuiCssModuleTargets}"/>
<import file="${cssmodule.basedir}/../shared/targets.xml" description="Targets common to Rollup/Module" />
<target name="build" depends="buildcore" />
<target name="buildcore">
- <concatsource destfile="${component.builddir}/${component}.css" sourcedir="${component.basedir}/css" sourcefiles="${component.cssfiles}" />
+ <concatsource destfile="${component.builddir}/${component.basefilename}.css" sourcedir="${component.basedir}/css" sourcefiles="${component.cssfiles}" />
</target>
<target name="minify">
- <yuicompress src="${component.builddir}/${component}.css" dest="${component.builddir}/${component}-min.css" args="${yuicompressor.css.args.internal}" />
+ <yuicompress src="${component.builddir}/${component.basefilename}.css" dest="${component.builddir}/${component.basefilename}-min.css" args="${yuicompressor.css.args.internal}" />
</target>
<target name="lint">
<!-- TODO : CSS Lint support. Currently need to add @charset "UTF-8";-->
</target>
<target name="deploybuild" description="Copy built files to global build location">
<copy todir="${global.build.component}" preservelastmodified="true">
<fileset dir="${component.builddir}" includes="*.css" />
</copy>
</target>
</project>
|
yui/builder
|
5ff10ceedb1d4dde12a8b6662ceac00cce4975be
|
Fallback to forked compressor if native ant task isn't available.
|
diff --git a/componentbuild/shared/macrolib.xml b/componentbuild/shared/macrolib.xml
index 56dd24c..029407c 100644
--- a/componentbuild/shared/macrolib.xml
+++ b/componentbuild/shared/macrolib.xml
@@ -1,385 +1,407 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiMacroLib">
<macrodef name="arrayliteral">
<attribute name="from" />
<attribute name="to" />
<attribute name="key" />
<sequential>
<if>
<and>
<isset property="@{from}" />
<length string="${@{from}}" when="ne" length="0" />
</and>
<then>
<propertyregex property="array"
override="true"
input="${@{from}}"
casesensitive="false"
regexp="([^\,\s]+)"
replace="'\1'"
/>
<property name="@{to}" value="@{key}:[${array}]" />
</then>
</if>
</sequential>
</macrodef>
<macrodef name="createdetails">
<sequential>
<arrayliteral from="component.use" to="component.details.use" key="use" />
<arrayliteral from="component.supersedes" to="component.details.supersedes" key="supersedes" />
<arrayliteral from="component.requires" to="component.details.requires" key="requires" />
<arrayliteral from="component.optional" to="component.details.optional" key="optional" />
<arrayliteral from="component.lang" to="component.details.lang" key="lang" />
<if>
<isset property="component.skinnable" />
<then>
<property name="component.details.skinnable" value="skinnable:${component.skinnable}" />
</then>
</if>
<propertyselector property="details.list"
delimiter=","
match="component\.details.([^\.]*)"
select="\1"
casesensitive="false" />
<var name="details" value="" />
<if>
<isset property="details.list" />
<then>
<for list="${details.list}" param="val">
<sequential>
<var name="details" value="${component.details.@{val}}, ${details}" />
</sequential>
</for>
<propertyregex property="component.details.hash"
input="{${details}}"
regexp="(\,\s*?\})"
replace="}"
casesensitive="false" />
</then>
<else>
<property name="component.details.hash" value="" />
</else>
</if>
</sequential>
</macrodef>
- <taskdef
- name="jscompressor"
- classname="com.yahoo.platform.yui.compressor.ant.JavaScriptCompressorTask"
- classpath="${yuicompressor.jar}"/>
- <taskdef
- name="csscompressor"
- classname="com.yahoo.platform.yui.compressor.ant.CssCompressorTask"
- classpath="${yuicompressor.jar}"/>
+ <if>
+ <istrue value="${yuicompressor.ant}"/>
+ <then>
+ <taskdef
+ name="jscompressor"
+ classname="com.yahoo.platform.yui.compressor.ant.JavaScriptCompressorTask"
+ classpath="${yuicompressor.ant.jar}"/>
+ <taskdef
+ name="csscompressor"
+ classname="com.yahoo.platform.yui.compressor.ant.CssCompressorTask"
+ classpath="${yuicompressor.ant.jar}"/>
- <macrodef name="yuicompress">
- <attribute name="src" />
- <attribute name="dest" />
- <attribute name="args" /> <!-- not used anymore -->
- <attribute name="type" default="js"/>
- <sequential>
- <if>
- <equals arg1="@{type}" arg2="css"/>
- <then>
- <csscompressor srcfile="@{src}" destfile="@{dest}" linebreak="${yuicompressor.linebreak}" charset="${yuicompressor.css.charset}" verbose="${yuicompressor.css.verbose}"/>
- </then>
- <else>
- <jscompressor srcfile="@{src}" destfile="@{dest}" linebreak="${yuicompressor.linebreak}" preservesemicolons="true" disableoptimizations="true" charset="${yuicompressor.js.charset}" verbose="${yuicompressor.js.verbose}"/>
- </else>
- </if>
- </sequential>
- </macrodef>
+ <macrodef name="yuicompress">
+ <attribute name="src" />
+ <attribute name="dest" />
+ <attribute name="args" /> <!-- not used by this task branch -->
+ <attribute name="type" default="js"/>
+ <sequential>
+ <if>
+ <equals arg1="@{type}" arg2="css"/>
+ <then>
+ <csscompressor srcfile="@{src}" destfile="@{dest}" linebreak="${yuicompressor.linebreak}" charset="${yuicompressor.css.charset}" verbose="${yuicompressor.css.verbose}"/>
+ </then>
+ <else>
+ <jscompressor srcfile="@{src}" destfile="@{dest}" linebreak="${yuicompressor.linebreak}" preservesemicolons="true" disableoptimizations="true" charset="${yuicompressor.js.charset}" verbose="${yuicompressor.js.verbose}"/>
+ </else>
+ </if>
+ </sequential>
+ </macrodef>
+ </then>
+ <else>
+ <echo level="info">Using forked yuicompressor, to speed up builds include a yuicompressor.ant.jar.</echo>
+ <macrodef name="yuicompress">
+ <attribute name="src" />
+ <attribute name="dest" />
+ <attribute name="args" />
+ <attribute name="type" default="js"/> <!-- not used by this task branch -->
+ <sequential>
+ <echo level="info">Running yuicompressor on @{src}</echo>
+ <java jar="${yuicompressor.jar}" fork="true" failonerror="true">
+ <arg line="@{args} -o" />
+ <arg file="@{dest}" />
+ <arg file="@{src}" />
+ </java>
+ </sequential>
+ </macrodef>
+ </else>
+ </if>
<macrodef name="concatsource">
<attribute name="destfile" />
<attribute name="sourcedir" />
<attribute name="sourcefiles" />
<attribute name="workingdir" default="${workingdir}" />
<element name="filters" optional="true" description="Additonal filters to apply to individual files"/>
<sequential>
<echo level="info">Concatenating</echo>
<echo level="info"> Source Files : @{sourcefiles}</echo>
<echo level="info"> In Source Dir : @{sourcedir}</echo>
<echo level="info"> To : @{destfile}</echo>
<delete dir="@{workingdir}" quiet="true"/>
<copy todir="@{workingdir}">
<filelist dir="@{sourcedir}" files="@{sourcefiles}" />
<filterchain>
<filters />
<fixcrlf fixlast="true" eof="remove"/>
</filterchain>
</copy>
<concat destfile="@{destfile}" fixlastline="true">
<filelist dir="@{workingdir}" files="@{sourcefiles}" />
</concat>
<delete dir="${workingdir}" quiet="true" />
</sequential>
</macrodef>
<macrodef name="jslint">
<element name="jsfiles" optional="false" />
<sequential>
<pathconvert pathsep="' '" property="jsfileargs">
<jsfiles />
</pathconvert>
<if>
<or>
<istrue value="${node.online}"/>
<http url="${node.jslint.url}"/>
</or>
<then>
<property name="node.online" value="true"/>
<post to="${node.jslint.url}" property="node.jslint.response" failonerror="${lint.failonerror}">
<prop name="files" value="${jsfileargs}"/>
<prop name="failonerror" value="${lint.failonerror}"/>
</post>
<!-- Since Ant doesn't really failonerror for the post task,
handle this ourselves: -->
<if>
<not>
<isset property="node.jslint.response"/>
</not>
<then>
<fail>JSLint failed. To view lint output and continue the build, run ant with -Dlint.failonerror=false.</fail>
</then>
</if>
<!-- Clear property for next run: -->
<var name="node.jslint.response" unset="true"/>
</then>
<else>
<echo>Using Rhino. Install nodejs to improve jslint speed, or skip with -Dlint.skip=true</echo>
<!--
Need to find a way to convert fileset to args (script?) to
avoid ' ', which will break for files with ' in them
Evaluates to the following java execution line...
java -r js.jar jslintconsole.js 'file1.js' 'file2.js' 'file3.js'
-->
<java jar="${rhino.jar}" fork="true" failonerror="${jslint.failonerror}">
<arg file="${jslintconsole.js}" />
<arg value="${jslintsrc.js}" />
<arg line="'${jsfileargs}'" />
</java>
</else>
</if>
</sequential>
</macrodef>
<macrodef name="registerversion">
<attribute name="module" />
<attribute name="classname" />
<attribute name="file" />
<sequential>
<loadfile srcfile="${builddir}/files/versioncode.txt" property="@{module}-@{classname}-version" >
<filterchain>
<replacetokens>
<token key="MODULE" value="@{module}"/>
<token key="CLASSNAME" value="@{classname}"/>
</replacetokens>
</filterchain>
</loadfile>
<echo level="info">Adding Version Registration Code to @{file}</echo>
<concat destfile="@{file}" append="true" fixlastline="true">${@{module}-@{classname}-version}</concat>
</sequential>
</macrodef>
<macrodef name="addlang">
<attribute name="dir" />
<attribute name="module" />
<attribute name="dest" />
<attribute name="lang" default="" />
<attribute name="details" default = ""/>
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}@{lang}_details" value="" />
</then>
<else>
<property name="@{module}@{lang}_details" value=",@{details}" />
</else>
</if>
<if>
<equals arg1="@{lang}" arg2="" />
<then>
<property name="@{module}@{lang}_fullname" value="@{module}" />
</then>
<else>
<property name="@{module}@{lang}_fullname" value="@{module}_@{lang}" />
</else>
</if>
<if>
<available file="@{dir}/${@{module}@{lang}_fullname}.pres" />
<then>
<mkdir dir="${component.langbuilddir}" />
<java jar="${rhino.jar}" fork="true" failonerror="true">
<jvmarg value="-Dfile.encoding=utf-8" />
<arg file="${yrb2jsonconsole.js}" />
<arg file="${yrb2jsonsrc.js}" />
<arg file="@{dir}/${@{module}@{lang}_fullname}.pres" />
<arg file="${component.langbuilddir}/${@{module}@{lang}_fullname}.js" />
</java>
<echo level="info">Wrapping ${component.langbuilddir}/${@{module}@{lang}_fullname}.js in YUI.add, Y.Intl.add</echo>
<loadfile srcfile="${component.langbuilddir}/${@{module}@{lang}_fullname}.js" property="@{module}@{lang}-strs-loaded" encoding="utf-8" />
</then>
<else>
<echo level="info">Wrapping @{dir}/${@{module}@{lang}_fullname}.js in YUI.add, Y.Intl.add</echo>
<loadfile srcfile="@{dir}/${@{module}@{lang}_fullname}.js" property="@{module}@{lang}-strs-loaded" encoding="utf-8" />
</else>
</if>
<copy file="${builddir}/files/langtemplate.txt" tofile="@{dest}/${@{module}@{lang}_fullname}.js" overwrite="true" outputencoding="utf-8">
<filterset>
<filter token="LANG" value="@{lang}" />
<filter token="LANG_MODULE" value="lang/${@{module}@{lang}_fullname}" />
<filter token="STRINGS" value="${@{module}@{lang}-strs-loaded}" />
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}" />
<filter token="LANG_DETAILS" value="${@{module}@{lang}_details}" />
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addmodule">
<attribute name="file" />
<attribute name="module" />
<attribute name="details" default="" />
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}-details" value="" />
</then>
<else>
<property name="@{module}-details" value=",@{details}" />
</else>
</if>
<loadfile srcfile="@{file}" property="@{module}-@{file}-code" />
<echo level="info">Wrapping @{file} in YUI.add module</echo>
<copy file="${builddir}/files/moduletemplate.txt" tofile="@{file}" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{file}-code}" />
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}" />
<filter token="DETAILS" value="${@{module}-details}" />
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addrollup">
<attribute name="file" />
<attribute name="module" />
<attribute name="details" default="" />
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}-details" value="" />
</then>
<else>
<property name="@{module}-details" value=",@{details}" />
</else>
</if>
<loadfile srcfile="@{file}" property="@{module}-@{file}-code" />
<echo level="info">Adding Rollup @{file} using YUI.add</echo>
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{file}" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{file}-code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}"/>
<filter token="DETAILS" value="${@{module}-details}"/>
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addlangrollup">
<attribute name="module" />
<attribute name="dir" />
<sequential>
<echo level="info">Registering rollup info for lang files in @{dir} using YUI.add</echo>
<for list="${component.rollup.lang}" param="lang" trim="true">
<sequential>
<loadfile srcfile="@{dir}/@{module}_@{lang}.js" property="@{module}-@{lang}-code" />
<var name="lang.use" value="{use:[" />
<for list="${component.lang.use}" param="submod" trim="true">
<sequential>
<var name="lang.use" value="${lang.use}'lang/@{submod}_@{lang}'," />
</sequential>
</for>
<var name="lang.use" value="${lang.use}]}" />
<propertyregex property="@{module}-@{lang}-details"
input="${lang.use}"
regexp="(\,\s*?\])"
replace="]"
casesensitive="false" />
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{dir}/@{module}_@{lang}.js" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{lang}-code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="lang/@{module}_@{lang}"/>
<filter token="DETAILS" value=", ${@{module}-@{lang}-details}"/>
</filterset>
</copy>
</sequential>
</for>
<loadfile srcfile="@{dir}/@{module}.js" property="@{module}--code" />
<var name="lang.use" value="{use:[" />
<for list="${component.lang.use}" param="submod" trim="true">
<sequential>
<var name="lang.use" value="${lang.use}'lang/@{submod}'," />
</sequential>
</for>
<var name="lang.use" value="${lang.use}]}" />
<propertyregex property="@{module}--details"
input="${lang.use}"
regexp="(\,\s*?\])"
replace="]"
casesensitive="false" />
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{dir}/@{module}.js" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}--code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="lang/@{module}"/>
<filter token="DETAILS" value=", ${@{module}--details}"/>
</filterset>
</copy>
</sequential>
</macrodef>
</project>
diff --git a/componentbuild/shared/properties.xml b/componentbuild/shared/properties.xml
index 8ea1798..9ee5a43 100644
--- a/componentbuild/shared/properties.xml
+++ b/componentbuild/shared/properties.xml
@@ -1,166 +1,169 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiSharedProperties">
<!-- ANT contrib library for loops, if/else support, with property fix for FOR task -->
<taskdef resource="antcontrib.properties">
<classpath>
<pathelement location="${builddir}/lib/ant-contrib/ant-contrib-1.0b3-modified.jar" />
</classpath>
</taskdef>
<dirname property="buildfile.dir" file="${ant.file}" />
<!--
builddir : The path to the builder/componentbuild directory from the component build file
srcdir : The path to top of the project source directory (e.g. yui2) from the component build file
-->
<property name="builddir" location="../../../builder/componentbuild" />
<property name="srcdir" location="../.." />
<!-- buildfiles.eol : End of line char to use for built files -->
<property name="buildfiles.eol" value="lf"/>
<!-- Supporting Tools -->
<property name="rhino.jar" location="${builddir}/lib/rhino/js.jar" />
<property name="jslintconsole.js" location="${builddir}/lib/jslint/jslint-console.js" />
<property name="jslintsrc.js" location="${builddir}/lib/jslint/fulljslint.js" />
- <property name="yuicompressor.jar" location="${builddir}/lib/yuicompressor/yuicompressor-2.4.3-dinoboff.jar" />
+ <property name="yuicompressor.jar" location="${builddir}/lib/yuicompressor/yuicompressor-2.4.2.jar" />
+ <property name="yuicompressor.ant.jar" location="${builddir}/lib/yuicompressor/yuicompressor-2.4.3-dinoboff.jar" />
<property name="yrb2jsonconsole.js" location="${builddir}/lib/yrb2json/yrb2json-console.js" />
<property name="yrb2jsonsrc.js" location="${builddir}/lib/yrb2json/yrb2json.js" />
+ <available file="${yuicompressor.ant.jar}" property="yuicompressor.ant"/>
+
<!-- YUI Compressor arguments for JS and CSS files -->
<property name="yuicompressor.linebreak" value="6000" />
<property name="yuicompressor.css.args" value="--type css --line-break 6000" />
<property name="yuicompressor.js.args" value="--disable-optimizations --preserve-semi --line-break 6000" />
<property name="yuicompressor.js.charset" value="utf-8" />
<property name="yuicompressor.css.charset" value="utf-8" />
<!-- Enable/Disable YUI Compressor verbosity. NOTE: Checked in build files should not disable this flag -->
<property name="yuicompressor.js.verbose" value="true" />
<property name="yuicompressor.css.verbose" value="true" />
<condition property="yuicompressor.js.args.internal" value="-v --charset ${yuicompressor.js.charset} ${yuicompressor.js.args}" else="--charset ${yuicompressor.js.charset} ${yuicompressor.js.args}">
<istrue value="${yuicompressor.js.verbose}" />
</condition>
<condition property="yuicompressor.css.args.internal" value="-v --charset ${yuicompressor.css.charset} ${yuicompressor.css.args}" else="--charset ${yuicompressor.css.charset} ${yuicompressor.css.args}">
<istrue value="${yuicompressor.css.verbose}" />
</condition>
<!-- Top Level Build Directories (e.g. yui2/build, yui3/build)-->
<property name="global.build.base" location="${srcdir}/build" />
<property name="global.build.component" location="${global.build.base}/${component}" />
<property name="global.build.component.assets" location="${global.build.component}/assets" />
<!-- Component Properties -->
<property name="component.module" value="${component}" />
<property name="component.basedir" location="${buildfile.dir}" />
<property name="component.jsfiles.base" location="${component.basedir}/js" />
<property name="component.lang.base" location="${component.basedir}/lang" />
<property name="component.assets.flatten" value="true" />
<property name="component.assets.base" location="${component.basedir}/assets" />
<property name="component.assets.files" value="**/*" />
<property name="component.assets.legacy.flatten" value="true" />
<property name="component.assets.legacy.base" location="${component.assets.base}/legacy" />
<property name="component.assets.legacy.files" value="**/*" />
<property name="component.assets.skins.base" location="${component.assets.base}/skins" />
<property name="component.assets.skins.files" value="**/*" />
<condition property="component.skins.exist">
<and>
<available file="${component.assets.base}/${component}-core.css" type="file" />
<available file="${component.assets.base}/skins" type="dir" />
</and>
</condition>
<!-- component is part of a rollup build, so rollup skins to parent -->
<condition property="rollupskins">
<and>
<istrue value="${rollup}" />
<istrue value="${component.skins.exist}" />
</and>
</condition>
<available file="${component.assets.base}" type="dir" property="component.assets.exist"/>
<condition property="component.langs.exist">
<and>
<or>
<isset property="component.lang" />
<isset property="component.rollup.lang" />
</or>
</and>
</condition>
<condition property="rolluplangs">
<and>
<istrue value="${rollup}" />
<istrue value="${component.langs.exist}" />
</and>
</condition>
<!--
DEPRECATED: component.basefilename and component.releasetype are deprecated
We used to mark filenames with suffixes (-beta, -experimental), which we no longer do
-->
<condition property="component.basefilename" value="${component}" else="${component}">
<isset property="component.releasetype"/>
</condition>
<!-- Default logger regex values if not provided -->
<property name="component.logger.regex" value="^.*?(?:logger|YAHOO.log).*?(?:;|\).*;|(?:\r?\n.*?)*?\).*;).*;?.*?\r?\n" />
<property name="component.logger.regex.replace" value="" />
<property name="component.logger.regex.flags" value="mg" />
<property name="component.logger.regex.byline" value="false" />
<!-- Rollup support, currently only used for YUI 3 -->
<property name="component.rollup" value="false"/>
<property name="component.rollup.target" value="all"/>
<condition property="component.builddir" value="${component.basedir}/build_rollup_tmp" else="${component.basedir}/build_tmp">
<istrue value="${component.rollup}"/>
</condition>
<condition property="rollup.skins.exist">
<and>
<istrue value="${component.rollup}" />
<available file="${component.assets.base}/skins" type="dir" />
</and>
</condition>
<condition property="skins.exist">
<or>
<istrue value="${rollup.skins.exist}" />
<istrue value="${component.skins.exist}" />
</or>
</condition>
<!-- The temporary working directory used by the build process -->
<property name="workingdir" location="${component.builddir}/ant" />
<!-- Directory for language resource bundles in JSON format derived from YRB format -->
<property name="component.langbuilddir" value="${component.basedir}/build_lang_tmp" />
<!-- The file which defines the default targets for the particular type of component (module, rollup, css) -->
<condition property="targetbase" value="rollup" else="module">
<istrue value="${component.rollup}"/>
</condition>
<condition property="targets" value="../shared/cssmodule.xml" else="${targetbase}.xml">
<isset property="component.cssfiles" />
</condition>
<!-- By default, jslint failure should fail the build.
This can be overridden on the command line. -->
<property name="lint.failonerror" value="true"/>
<property name="node.jslint.url" value="http://127.0.0.1:8081/"/>
</project>
|
yui/builder
|
069d3e0b42d41f3bb5e8e046d0bfe773cbb3ad18
|
Don't start the lint server if lint.skip=true.
|
diff --git a/componentbuild/shared/targets.xml b/componentbuild/shared/targets.xml
index 9c1dfe2..f81f625 100644
--- a/componentbuild/shared/targets.xml
+++ b/componentbuild/shared/targets.xml
@@ -1,170 +1,179 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiSharedTargets">
<echo level="info">Starting Build For ${component}</echo>
<echo level="info">Ant Properties</echo>
<echo level="info"> Home : ${ant.home}</echo>
<echo level="info"> Ant Version : ${ant.version}</echo>
<echo level="info"> Build File : ${ant.file}</echo>
<echo level="info">Local Build Properties</echo>
<echo level="info"> version : ${yui.version}</echo>
<echo level="info"> srcdir : ${srcdir}</echo>
<echo level="info"> builddir : ${builddir}</echo>
<echo level="info"> component : ${component}</echo>
<echo level="info"> component.basefilename : ${component.basefilename}</echo>
<echo level="info"> component.basedir : ${component.basedir}</echo>
<echo level="info"> component.builddir : ${component.builddir}</echo>
<echo level="info">Global Build Properties</echo>
<echo level="info"> global.build.base : ${global.build.base}</echo>
<echo level="info"> global.build.component : ${global.build.component}</echo>
<echo level="info"> global.build.component.assets : ${global.build.component.assets}</echo>
<dirname property="targets.basedir" file="${ant.file.YuiSharedTargets}"/>
<import file="${targets.basedir}/macrolib.xml" description="Macrodef definitions - jslint, yuicompessor, registerversion" />
<target name="all" depends="local, deploy" description="Build and Deploy to Global Build Directory" />
<target name="local" depends="clean, init, build, minify, lint" description="Build and Deploy to Local Build Directory" />
<target name="init">
<tstamp/>
<mkdir dir="${component.builddir}" />
<createdetails />
- <antcall target="-node-spawn"/>
+ <antcall target="-lint-server"/>
</target>
- <target name="-node-spawn" description="Start NodeJS Servers" unless="node.spawn">
+ <target name="-lint-server" description="Start JSLint Server" unless="lint.skip">
+ <antcall target="-node">
+ <param name="src" value="${builddir}/lib/jslint/jslint-node.js"/>
+ </antcall>
+ </target>
+
+ <target name="-node" description="Start NodeJS Server" unless="node.spawn">
<if>
<not>
<http url="${node.jslint.url}"/>
</not>
<then>
+ <echo level="info">Attempting to start NodeJS app at: ${src}</echo>
<exec executable="node" spawn="true">
- <arg value="${builddir}/lib/jslint/jslint-node.js"/>
+ <arg value="${src}"/>
</exec>
+ <!-- Don't fail if node doesn't exist, fails to start, etc.
+ We will fallback to the slow Rhino engine later. -->
</then>
</if>
- <!-- Don't try to start again: -->
+ <!-- Don't try to start again. -->
<property name="node.spawn" value="true"/>
</target>
<target name="clean" description="Clean Local Build Directory" unless="clean.skip">
<delete dir="${component.builddir}" />
</target>
<target name="build" />
<!-- MIN -->
<target name="minify" description="Create component-min.js from component.js">
<yuicompress src="${component.builddir}/${component.basefilename}.js" dest="${component.builddir}/${component.basefilename}-min.js" args="${yuicompressor.js.args.internal}" />
<if>
<available file="${component.builddir}/lang" type="dir" />
<then>
<for param="file">
<path>
<fileset dir="${component.builddir}/lang" includes="*.js"/>
</path>
<sequential>
<yuicompress src="@{file}" dest="@{file}" args="${yuicompressor.js.args.internal}" />
</sequential>
</for>
</then>
</if>
</target>
<target name="lint" description="Run jslint over the local build files (default settings)" unless="lint.skip">
<jslint>
<jsfiles>
<fileset dir="${component.builddir}" includes="*.js" />
</jsfiles>
</jslint>
</target>
<!-- DEPLOY -->
<target name="deploy" description="Copy files to global location" depends="deploybuild, deployassets, deployskins, deploylang, deploydocs"></target>
<target name="deploybuild" description="Copy built files to global build location">
<copy todir="${global.build.component}" overwrite="true" verbose="true">
<fileset dir="${component.builddir}" includes="*.js" />
</copy>
</target>
<target name="deployassets" if="component.assets.exist">
<copy todir="${global.build.component.assets}" flatten="${component.assets.flatten}" overwrite="true" verbose="true">
<fileset dir="${component.assets.base}" includes="${component.assets.files}" excludes="skins/, legacy/" />
</copy>
<copy todir="${global.build.component.assets}" flatten="${component.assets.legacy.flatten}" preservelastmodified="true" failonerror="false" verbose="true">
<fileset dir="${component.assets.legacy.base}" includes="${component.assets.legacy.files}" excludes="skins/" />
</copy>
</target>
<target name="deployskins" if="skins.exist">
<copy todir="${global.build.component.assets}/skins/sam" overwrite="true" verbose="true">
<fileset dir="${component.builddir}/assets/skins/sam" includes="${component}.css" />
</copy>
<copy todir="${global.build.component.assets}/skins/sam" overwrite="true" verbose="true">
<fileset dir="${component.assets.skins.base}/sam" includes="${component.assets.skins.files}" />
</copy>
</target>
<target name="deploylang" description="Copy language bundles to global build location">
<copy todir="${global.build.component}/lang" overwrite="true" failonerror="false" verbose="true">
<fileset dir="${component.builddir}/lang" includes="*.js" />
</copy>
</target>
<target name="deploydocs" description="Copy doc files to global doc locations">
<!-- TODO -->
</target>
<target name="-prepend" if="component.prependfiles">
<concat destfile="${workingdir}/${component.basefilename}.js.tmp" fixlastline="true">
<filelist dir="${component.basedir}" files="${component.prependfiles}" />
<filterchain>
<tokenfilter>
<filetokenizer/>
<replaceregex
pattern="${component.logger.regex}"
replace="${component.logger.regex.replace}"
flags="${component.logger.regex.flags}" />
</tokenfilter>
</filterchain>
</concat>
<concat destfile="${workingdir}/${component.basefilename}.js.tmp" fixlastline="true" append="true">
<filelist dir="${component.builddir}" files="${component.basefilename}.js" />
</concat>
<move file="${workingdir}/${component.basefilename}.js.tmp" tofile="${component.builddir}/${component.basefilename}.js" />
</target>
<target name="-append" if="component.appendfiles">
<concat destfile="${component.builddir}/${component.basefilename}.js" fixlastline="true" append="true">
<filelist dir="${component.basedir}" files="${component.appendfiles}" />
<filterchain>
<tokenfilter>
<filetokenizer/>
<replaceregex
pattern="${component.logger.regex}"
replace="${component.logger.regex.replace}"
flags="${component.logger.regex.flags}" />
</tokenfilter>
</filterchain>
</concat>
</target>
<target name="-prependdebug" if="component.prependfiles">
<concat destfile="${workingdir}/${component.basefilename}-debug.js.tmp" fixlastline="true" >
<filelist dir="${component.basedir}" files="${component.prependfiles}" />
<filelist dir="${component.builddir}" files="${component.basefilename}-debug.js" />
</concat>
<move file="${workingdir}/${component.basefilename}-debug.js.tmp" tofile="${component.builddir}/${component.basefilename}-debug.js" />
</target>
<target name="-appenddebug" if="component.appendfiles">
<concat destfile="${component.builddir}/${component.basefilename}-debug.js" fixlastline="true" append="true">
<filelist dir="${component.basedir}" files="${component.appendfiles}" />
</concat>
</target>
</project>
|
yui/builder
|
1ece969c9b25eba5ad0bc1d1925ff9c5e9f2643e
|
Fail when JSLint fails and lint.failonerror=true.
|
diff --git a/componentbuild/lib/jslint/jslint-node.js b/componentbuild/lib/jslint/jslint-node.js
index 6db012f..4ca1f16 100644
--- a/componentbuild/lib/jslint/jslint-node.js
+++ b/componentbuild/lib/jslint/jslint-node.js
@@ -1,106 +1,117 @@
/**
* Javascript Shell Script to Load and JSLint js files through Rhino Javascript Shell
* The jslint source file is expected as the first argument, followed by the list of JS files to JSLint
*
* e.g.
* java -j js.jar /tools/fulljslint.js testFile1.js testFile2.js testFile3.js
**/
JSLINT = require("./fulljslint").JSLINT;
(function(){ // Just to keep stuff seperate from JSLINT code
var PORT = parseInt(process.argv[2]) || 8081;
var OPTS = {
browser : true,
//laxLineEnd : true,
undef: true,
newcap: false
};
function test(js) {
- if (!js) throw new Error("No JS provided");
+ var body = "", code = 200;
- var body = "";
- var success = JSLINT(js, OPTS);
+ var success = JSLINT(js, OPTS);
if (success) {
return "OK";
} else {
for (var i=0; i < JSLINT.errors.length; ++i) {
var e = JSLINT.errors[i];
if (e) {
body += ("\t" + e.line + ", " + e.character + ": " + e.reason + "\n\t" + clean(e.evidence) + "\n");
}
}
body += "\n";
- return body;
+
+ // Last item is null if JSLint hit a fatal error
+ if (JSLINT.errors && JSLINT.errors[JSLINT.errors.length-1] === null) {
+ code = 500;
+ }
+ return {
+ "content" : body,
+ "code" : code
+ };
}
}
function clean(str) {
var trimmed = "";
if (str) {
if(str.length <= 500) {
trimmed = str.replace(/^\s*(\S*(\s+\S+)*)\s*$/, "$1");
} else {
trimmed = "[Code Evidence Omitted: Greater than 500 chars]";
}
}
return trimmed;
}
var qs = require("querystring");
var fs = require("fs");
var EventEmitter = require("events").EventEmitter;
var ticket = 0;
require("http").createServer(function (req, res) {
var data = "";
req.addListener("data", function (chunk) {
data += chunk;
});
var proc = new EventEmitter();
proc.addListener("end", function (code, body, die) {
res.writeHead(code, {"Content-type" : "text/plain"});
res.end(body);
if (die) process.exit(0);
});
req.addListener("end", function () {
ticket++;
var code = 200, body;
var die = "/kill" === req.url;
if (die) body = "Goodbye.";
else if (req.method === "POST") {
- var files = qs.parse(data)["files"].split("' '");
+ var query = qs.parse(data);
+ var files = query["files"].split("' '");
+ var failOnError = query["failonerror"] == "true";
var results = [];
files.forEach(function (file) {
fs.readFile(file, function (err, data) {
- data = data.toString("utf8");
- try {
- results.push(test(data));
- } catch (ex) {
- proc.emit("end", 500, err.message);
- }
+ var diagnosis = test(data.toString("utf8"));
+ results.push(diagnosis.content);
+
+ code = (
+ failOnError &&
+ diagnosis.code !== 200
+ ) ? diagnosis.code : code;
+
if (results.length == files.length) proc.emit("end", code, results.join("\n"));
});
});
} else {
body = "Ready.";
}
if (body) proc.emit("end", code, body, die);
});
}).listen(PORT, "127.0.0.1");
require("sys").puts("Server started on port " + PORT);
(function () {
var reap;
setInterval(function () {
if (reap == ticket) process.exit(0);
reap = ticket;
}, 10000);
})();
})();
diff --git a/componentbuild/shared/macrolib.xml b/componentbuild/shared/macrolib.xml
index b956e74..56dd24c 100644
--- a/componentbuild/shared/macrolib.xml
+++ b/componentbuild/shared/macrolib.xml
@@ -1,372 +1,385 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiMacroLib">
<macrodef name="arrayliteral">
<attribute name="from" />
<attribute name="to" />
<attribute name="key" />
<sequential>
<if>
<and>
<isset property="@{from}" />
<length string="${@{from}}" when="ne" length="0" />
</and>
<then>
<propertyregex property="array"
override="true"
input="${@{from}}"
casesensitive="false"
regexp="([^\,\s]+)"
replace="'\1'"
/>
<property name="@{to}" value="@{key}:[${array}]" />
</then>
</if>
</sequential>
</macrodef>
<macrodef name="createdetails">
<sequential>
<arrayliteral from="component.use" to="component.details.use" key="use" />
<arrayliteral from="component.supersedes" to="component.details.supersedes" key="supersedes" />
<arrayliteral from="component.requires" to="component.details.requires" key="requires" />
<arrayliteral from="component.optional" to="component.details.optional" key="optional" />
<arrayliteral from="component.lang" to="component.details.lang" key="lang" />
<if>
<isset property="component.skinnable" />
<then>
<property name="component.details.skinnable" value="skinnable:${component.skinnable}" />
</then>
</if>
<propertyselector property="details.list"
delimiter=","
match="component\.details.([^\.]*)"
select="\1"
casesensitive="false" />
<var name="details" value="" />
<if>
<isset property="details.list" />
<then>
<for list="${details.list}" param="val">
<sequential>
<var name="details" value="${component.details.@{val}}, ${details}" />
</sequential>
</for>
<propertyregex property="component.details.hash"
input="{${details}}"
regexp="(\,\s*?\})"
replace="}"
casesensitive="false" />
</then>
<else>
<property name="component.details.hash" value="" />
</else>
</if>
</sequential>
</macrodef>
<taskdef
name="jscompressor"
classname="com.yahoo.platform.yui.compressor.ant.JavaScriptCompressorTask"
classpath="${yuicompressor.jar}"/>
<taskdef
name="csscompressor"
classname="com.yahoo.platform.yui.compressor.ant.CssCompressorTask"
classpath="${yuicompressor.jar}"/>
<macrodef name="yuicompress">
<attribute name="src" />
<attribute name="dest" />
<attribute name="args" /> <!-- not used anymore -->
<attribute name="type" default="js"/>
<sequential>
<if>
<equals arg1="@{type}" arg2="css"/>
<then>
<csscompressor srcfile="@{src}" destfile="@{dest}" linebreak="${yuicompressor.linebreak}" charset="${yuicompressor.css.charset}" verbose="${yuicompressor.css.verbose}"/>
</then>
<else>
<jscompressor srcfile="@{src}" destfile="@{dest}" linebreak="${yuicompressor.linebreak}" preservesemicolons="true" disableoptimizations="true" charset="${yuicompressor.js.charset}" verbose="${yuicompressor.js.verbose}"/>
</else>
</if>
</sequential>
</macrodef>
<macrodef name="concatsource">
<attribute name="destfile" />
<attribute name="sourcedir" />
<attribute name="sourcefiles" />
<attribute name="workingdir" default="${workingdir}" />
<element name="filters" optional="true" description="Additonal filters to apply to individual files"/>
<sequential>
<echo level="info">Concatenating</echo>
<echo level="info"> Source Files : @{sourcefiles}</echo>
<echo level="info"> In Source Dir : @{sourcedir}</echo>
<echo level="info"> To : @{destfile}</echo>
<delete dir="@{workingdir}" quiet="true"/>
<copy todir="@{workingdir}">
<filelist dir="@{sourcedir}" files="@{sourcefiles}" />
<filterchain>
<filters />
<fixcrlf fixlast="true" eof="remove"/>
</filterchain>
</copy>
<concat destfile="@{destfile}" fixlastline="true">
<filelist dir="@{workingdir}" files="@{sourcefiles}" />
</concat>
<delete dir="${workingdir}" quiet="true" />
</sequential>
</macrodef>
<macrodef name="jslint">
<element name="jsfiles" optional="false" />
<sequential>
<pathconvert pathsep="' '" property="jsfileargs">
<jsfiles />
</pathconvert>
<if>
<or>
<istrue value="${node.online}"/>
<http url="${node.jslint.url}"/>
</or>
<then>
<property name="node.online" value="true"/>
- <post to="${node.jslint.url}" failonerror="${lint.failonerror}">
+ <post to="${node.jslint.url}" property="node.jslint.response" failonerror="${lint.failonerror}">
<prop name="files" value="${jsfileargs}"/>
+ <prop name="failonerror" value="${lint.failonerror}"/>
</post>
+ <!-- Since Ant doesn't really failonerror for the post task,
+ handle this ourselves: -->
+ <if>
+ <not>
+ <isset property="node.jslint.response"/>
+ </not>
+ <then>
+ <fail>JSLint failed. To view lint output and continue the build, run ant with -Dlint.failonerror=false.</fail>
+ </then>
+ </if>
+ <!-- Clear property for next run: -->
+ <var name="node.jslint.response" unset="true"/>
</then>
<else>
<echo>Using Rhino. Install nodejs to improve jslint speed, or skip with -Dlint.skip=true</echo>
<!--
Need to find a way to convert fileset to args (script?) to
avoid ' ', which will break for files with ' in them
Evaluates to the following java execution line...
java -r js.jar jslintconsole.js 'file1.js' 'file2.js' 'file3.js'
-->
<java jar="${rhino.jar}" fork="true" failonerror="${jslint.failonerror}">
<arg file="${jslintconsole.js}" />
<arg value="${jslintsrc.js}" />
<arg line="'${jsfileargs}'" />
</java>
</else>
</if>
</sequential>
</macrodef>
<macrodef name="registerversion">
<attribute name="module" />
<attribute name="classname" />
<attribute name="file" />
<sequential>
<loadfile srcfile="${builddir}/files/versioncode.txt" property="@{module}-@{classname}-version" >
<filterchain>
<replacetokens>
<token key="MODULE" value="@{module}"/>
<token key="CLASSNAME" value="@{classname}"/>
</replacetokens>
</filterchain>
</loadfile>
<echo level="info">Adding Version Registration Code to @{file}</echo>
<concat destfile="@{file}" append="true" fixlastline="true">${@{module}-@{classname}-version}</concat>
</sequential>
</macrodef>
<macrodef name="addlang">
<attribute name="dir" />
<attribute name="module" />
<attribute name="dest" />
<attribute name="lang" default="" />
<attribute name="details" default = ""/>
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}@{lang}_details" value="" />
</then>
<else>
<property name="@{module}@{lang}_details" value=",@{details}" />
</else>
</if>
<if>
<equals arg1="@{lang}" arg2="" />
<then>
<property name="@{module}@{lang}_fullname" value="@{module}" />
</then>
<else>
<property name="@{module}@{lang}_fullname" value="@{module}_@{lang}" />
</else>
</if>
<if>
<available file="@{dir}/${@{module}@{lang}_fullname}.pres" />
<then>
<mkdir dir="${component.langbuilddir}" />
<java jar="${rhino.jar}" fork="true" failonerror="true">
<jvmarg value="-Dfile.encoding=utf-8" />
<arg file="${yrb2jsonconsole.js}" />
<arg file="${yrb2jsonsrc.js}" />
<arg file="@{dir}/${@{module}@{lang}_fullname}.pres" />
<arg file="${component.langbuilddir}/${@{module}@{lang}_fullname}.js" />
</java>
<echo level="info">Wrapping ${component.langbuilddir}/${@{module}@{lang}_fullname}.js in YUI.add, Y.Intl.add</echo>
<loadfile srcfile="${component.langbuilddir}/${@{module}@{lang}_fullname}.js" property="@{module}@{lang}-strs-loaded" encoding="utf-8" />
</then>
<else>
<echo level="info">Wrapping @{dir}/${@{module}@{lang}_fullname}.js in YUI.add, Y.Intl.add</echo>
<loadfile srcfile="@{dir}/${@{module}@{lang}_fullname}.js" property="@{module}@{lang}-strs-loaded" encoding="utf-8" />
</else>
</if>
<copy file="${builddir}/files/langtemplate.txt" tofile="@{dest}/${@{module}@{lang}_fullname}.js" overwrite="true" outputencoding="utf-8">
<filterset>
<filter token="LANG" value="@{lang}" />
<filter token="LANG_MODULE" value="lang/${@{module}@{lang}_fullname}" />
<filter token="STRINGS" value="${@{module}@{lang}-strs-loaded}" />
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}" />
<filter token="LANG_DETAILS" value="${@{module}@{lang}_details}" />
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addmodule">
<attribute name="file" />
<attribute name="module" />
<attribute name="details" default="" />
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}-details" value="" />
</then>
<else>
<property name="@{module}-details" value=",@{details}" />
</else>
</if>
<loadfile srcfile="@{file}" property="@{module}-@{file}-code" />
<echo level="info">Wrapping @{file} in YUI.add module</echo>
<copy file="${builddir}/files/moduletemplate.txt" tofile="@{file}" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{file}-code}" />
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}" />
<filter token="DETAILS" value="${@{module}-details}" />
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addrollup">
<attribute name="file" />
<attribute name="module" />
<attribute name="details" default="" />
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}-details" value="" />
</then>
<else>
<property name="@{module}-details" value=",@{details}" />
</else>
</if>
<loadfile srcfile="@{file}" property="@{module}-@{file}-code" />
<echo level="info">Adding Rollup @{file} using YUI.add</echo>
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{file}" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{file}-code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}"/>
<filter token="DETAILS" value="${@{module}-details}"/>
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addlangrollup">
<attribute name="module" />
<attribute name="dir" />
<sequential>
<echo level="info">Registering rollup info for lang files in @{dir} using YUI.add</echo>
<for list="${component.rollup.lang}" param="lang" trim="true">
<sequential>
<loadfile srcfile="@{dir}/@{module}_@{lang}.js" property="@{module}-@{lang}-code" />
<var name="lang.use" value="{use:[" />
<for list="${component.lang.use}" param="submod" trim="true">
<sequential>
<var name="lang.use" value="${lang.use}'lang/@{submod}_@{lang}'," />
</sequential>
</for>
<var name="lang.use" value="${lang.use}]}" />
<propertyregex property="@{module}-@{lang}-details"
input="${lang.use}"
regexp="(\,\s*?\])"
replace="]"
casesensitive="false" />
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{dir}/@{module}_@{lang}.js" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{lang}-code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="lang/@{module}_@{lang}"/>
<filter token="DETAILS" value=", ${@{module}-@{lang}-details}"/>
</filterset>
</copy>
</sequential>
</for>
<loadfile srcfile="@{dir}/@{module}.js" property="@{module}--code" />
<var name="lang.use" value="{use:[" />
<for list="${component.lang.use}" param="submod" trim="true">
<sequential>
<var name="lang.use" value="${lang.use}'lang/@{submod}'," />
</sequential>
</for>
<var name="lang.use" value="${lang.use}]}" />
<propertyregex property="@{module}--details"
input="${lang.use}"
regexp="(\,\s*?\])"
replace="]"
casesensitive="false" />
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{dir}/@{module}.js" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}--code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="lang/@{module}"/>
<filter token="DETAILS" value=", ${@{module}--details}"/>
</filterset>
</copy>
</sequential>
</macrodef>
</project>
|
yui/builder
|
c76f06535bddf80ceb15ca45b82f6e7aa3b1c8e5
|
Prevent Rhino fallback when Node hasn't started yet.
|
diff --git a/componentbuild/shared/macrolib.xml b/componentbuild/shared/macrolib.xml
index 17a75ca..b956e74 100644
--- a/componentbuild/shared/macrolib.xml
+++ b/componentbuild/shared/macrolib.xml
@@ -1,377 +1,372 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiMacroLib">
<macrodef name="arrayliteral">
<attribute name="from" />
<attribute name="to" />
<attribute name="key" />
<sequential>
<if>
<and>
<isset property="@{from}" />
<length string="${@{from}}" when="ne" length="0" />
</and>
<then>
<propertyregex property="array"
override="true"
input="${@{from}}"
casesensitive="false"
regexp="([^\,\s]+)"
replace="'\1'"
/>
<property name="@{to}" value="@{key}:[${array}]" />
</then>
</if>
</sequential>
</macrodef>
<macrodef name="createdetails">
<sequential>
<arrayliteral from="component.use" to="component.details.use" key="use" />
<arrayliteral from="component.supersedes" to="component.details.supersedes" key="supersedes" />
<arrayliteral from="component.requires" to="component.details.requires" key="requires" />
<arrayliteral from="component.optional" to="component.details.optional" key="optional" />
<arrayliteral from="component.lang" to="component.details.lang" key="lang" />
<if>
<isset property="component.skinnable" />
<then>
<property name="component.details.skinnable" value="skinnable:${component.skinnable}" />
</then>
</if>
<propertyselector property="details.list"
delimiter=","
match="component\.details.([^\.]*)"
select="\1"
casesensitive="false" />
<var name="details" value="" />
<if>
<isset property="details.list" />
<then>
<for list="${details.list}" param="val">
<sequential>
<var name="details" value="${component.details.@{val}}, ${details}" />
</sequential>
</for>
<propertyregex property="component.details.hash"
input="{${details}}"
regexp="(\,\s*?\})"
replace="}"
casesensitive="false" />
</then>
<else>
<property name="component.details.hash" value="" />
</else>
</if>
</sequential>
</macrodef>
<taskdef
name="jscompressor"
classname="com.yahoo.platform.yui.compressor.ant.JavaScriptCompressorTask"
classpath="${yuicompressor.jar}"/>
<taskdef
name="csscompressor"
classname="com.yahoo.platform.yui.compressor.ant.CssCompressorTask"
classpath="${yuicompressor.jar}"/>
<macrodef name="yuicompress">
<attribute name="src" />
<attribute name="dest" />
<attribute name="args" /> <!-- not used anymore -->
<attribute name="type" default="js"/>
<sequential>
<if>
<equals arg1="@{type}" arg2="css"/>
<then>
<csscompressor srcfile="@{src}" destfile="@{dest}" linebreak="${yuicompressor.linebreak}" charset="${yuicompressor.css.charset}" verbose="${yuicompressor.css.verbose}"/>
</then>
<else>
<jscompressor srcfile="@{src}" destfile="@{dest}" linebreak="${yuicompressor.linebreak}" preservesemicolons="true" disableoptimizations="true" charset="${yuicompressor.js.charset}" verbose="${yuicompressor.js.verbose}"/>
</else>
</if>
</sequential>
</macrodef>
<macrodef name="concatsource">
<attribute name="destfile" />
<attribute name="sourcedir" />
<attribute name="sourcefiles" />
<attribute name="workingdir" default="${workingdir}" />
<element name="filters" optional="true" description="Additonal filters to apply to individual files"/>
<sequential>
<echo level="info">Concatenating</echo>
<echo level="info"> Source Files : @{sourcefiles}</echo>
<echo level="info"> In Source Dir : @{sourcedir}</echo>
<echo level="info"> To : @{destfile}</echo>
<delete dir="@{workingdir}" quiet="true"/>
<copy todir="@{workingdir}">
<filelist dir="@{sourcedir}" files="@{sourcefiles}" />
<filterchain>
<filters />
<fixcrlf fixlast="true" eof="remove"/>
</filterchain>
</copy>
<concat destfile="@{destfile}" fixlastline="true">
<filelist dir="@{workingdir}" files="@{sourcefiles}" />
</concat>
<delete dir="${workingdir}" quiet="true" />
</sequential>
</macrodef>
- <if>
- <http url="${node.jslint.url}"/>
- <then>
- <macrodef name="jslint">
- <element name="jsfiles" optional="false" />
+ <macrodef name="jslint">
+ <element name="jsfiles" optional="false" />
- <sequential>
- <pathconvert pathsep="' '" property="jsfileargs">
- <jsfiles />
- </pathconvert>
+ <sequential>
+ <pathconvert pathsep="' '" property="jsfileargs">
+ <jsfiles />
+ </pathconvert>
+ <if>
+ <or>
+ <istrue value="${node.online}"/>
+ <http url="${node.jslint.url}"/>
+ </or>
+ <then>
+ <property name="node.online" value="true"/>
<post to="${node.jslint.url}" failonerror="${lint.failonerror}">
<prop name="files" value="${jsfileargs}"/>
</post>
- </sequential>
- </macrodef>
- </then>
- <else>
- <macrodef name="jslint">
- <element name="jsfiles" optional="false" />
-
- <sequential>
- <pathconvert pathsep="' '" property="jsfileargs">
- <jsfiles />
- </pathconvert>
- <echo>Using Rhino</echo>
+ </then>
+ <else>
+ <echo>Using Rhino. Install nodejs to improve jslint speed, or skip with -Dlint.skip=true</echo>
<!--
Need to find a way to convert fileset to args (script?) to
avoid ' ', which will break for files with ' in them
Evaluates to the following java execution line...
java -r js.jar jslintconsole.js 'file1.js' 'file2.js' 'file3.js'
-->
<java jar="${rhino.jar}" fork="true" failonerror="${jslint.failonerror}">
<arg file="${jslintconsole.js}" />
<arg value="${jslintsrc.js}" />
<arg line="'${jsfileargs}'" />
</java>
- </sequential>
- </macrodef>
- </else>
- </if>
+ </else>
+ </if>
+ </sequential>
+ </macrodef>
<macrodef name="registerversion">
<attribute name="module" />
<attribute name="classname" />
<attribute name="file" />
<sequential>
<loadfile srcfile="${builddir}/files/versioncode.txt" property="@{module}-@{classname}-version" >
<filterchain>
<replacetokens>
<token key="MODULE" value="@{module}"/>
<token key="CLASSNAME" value="@{classname}"/>
</replacetokens>
</filterchain>
</loadfile>
<echo level="info">Adding Version Registration Code to @{file}</echo>
<concat destfile="@{file}" append="true" fixlastline="true">${@{module}-@{classname}-version}</concat>
</sequential>
</macrodef>
<macrodef name="addlang">
<attribute name="dir" />
<attribute name="module" />
<attribute name="dest" />
<attribute name="lang" default="" />
<attribute name="details" default = ""/>
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}@{lang}_details" value="" />
</then>
<else>
<property name="@{module}@{lang}_details" value=",@{details}" />
</else>
</if>
<if>
<equals arg1="@{lang}" arg2="" />
<then>
<property name="@{module}@{lang}_fullname" value="@{module}" />
</then>
<else>
<property name="@{module}@{lang}_fullname" value="@{module}_@{lang}" />
</else>
</if>
<if>
<available file="@{dir}/${@{module}@{lang}_fullname}.pres" />
<then>
<mkdir dir="${component.langbuilddir}" />
<java jar="${rhino.jar}" fork="true" failonerror="true">
<jvmarg value="-Dfile.encoding=utf-8" />
<arg file="${yrb2jsonconsole.js}" />
<arg file="${yrb2jsonsrc.js}" />
<arg file="@{dir}/${@{module}@{lang}_fullname}.pres" />
<arg file="${component.langbuilddir}/${@{module}@{lang}_fullname}.js" />
</java>
<echo level="info">Wrapping ${component.langbuilddir}/${@{module}@{lang}_fullname}.js in YUI.add, Y.Intl.add</echo>
<loadfile srcfile="${component.langbuilddir}/${@{module}@{lang}_fullname}.js" property="@{module}@{lang}-strs-loaded" encoding="utf-8" />
</then>
<else>
<echo level="info">Wrapping @{dir}/${@{module}@{lang}_fullname}.js in YUI.add, Y.Intl.add</echo>
<loadfile srcfile="@{dir}/${@{module}@{lang}_fullname}.js" property="@{module}@{lang}-strs-loaded" encoding="utf-8" />
</else>
</if>
<copy file="${builddir}/files/langtemplate.txt" tofile="@{dest}/${@{module}@{lang}_fullname}.js" overwrite="true" outputencoding="utf-8">
<filterset>
<filter token="LANG" value="@{lang}" />
<filter token="LANG_MODULE" value="lang/${@{module}@{lang}_fullname}" />
<filter token="STRINGS" value="${@{module}@{lang}-strs-loaded}" />
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}" />
<filter token="LANG_DETAILS" value="${@{module}@{lang}_details}" />
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addmodule">
<attribute name="file" />
<attribute name="module" />
<attribute name="details" default="" />
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}-details" value="" />
</then>
<else>
<property name="@{module}-details" value=",@{details}" />
</else>
</if>
<loadfile srcfile="@{file}" property="@{module}-@{file}-code" />
<echo level="info">Wrapping @{file} in YUI.add module</echo>
<copy file="${builddir}/files/moduletemplate.txt" tofile="@{file}" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{file}-code}" />
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}" />
<filter token="DETAILS" value="${@{module}-details}" />
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addrollup">
<attribute name="file" />
<attribute name="module" />
<attribute name="details" default="" />
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}-details" value="" />
</then>
<else>
<property name="@{module}-details" value=",@{details}" />
</else>
</if>
<loadfile srcfile="@{file}" property="@{module}-@{file}-code" />
<echo level="info">Adding Rollup @{file} using YUI.add</echo>
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{file}" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{file}-code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}"/>
<filter token="DETAILS" value="${@{module}-details}"/>
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addlangrollup">
<attribute name="module" />
<attribute name="dir" />
<sequential>
<echo level="info">Registering rollup info for lang files in @{dir} using YUI.add</echo>
<for list="${component.rollup.lang}" param="lang" trim="true">
<sequential>
<loadfile srcfile="@{dir}/@{module}_@{lang}.js" property="@{module}-@{lang}-code" />
<var name="lang.use" value="{use:[" />
<for list="${component.lang.use}" param="submod" trim="true">
<sequential>
<var name="lang.use" value="${lang.use}'lang/@{submod}_@{lang}'," />
</sequential>
</for>
<var name="lang.use" value="${lang.use}]}" />
<propertyregex property="@{module}-@{lang}-details"
input="${lang.use}"
regexp="(\,\s*?\])"
replace="]"
casesensitive="false" />
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{dir}/@{module}_@{lang}.js" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{lang}-code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="lang/@{module}_@{lang}"/>
<filter token="DETAILS" value=", ${@{module}-@{lang}-details}"/>
</filterset>
</copy>
</sequential>
</for>
<loadfile srcfile="@{dir}/@{module}.js" property="@{module}--code" />
<var name="lang.use" value="{use:[" />
<for list="${component.lang.use}" param="submod" trim="true">
<sequential>
<var name="lang.use" value="${lang.use}'lang/@{submod}'," />
</sequential>
</for>
<var name="lang.use" value="${lang.use}]}" />
<propertyregex property="@{module}--details"
input="${lang.use}"
regexp="(\,\s*?\])"
replace="]"
casesensitive="false" />
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{dir}/@{module}.js" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}--code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="lang/@{module}"/>
<filter token="DETAILS" value=", ${@{module}--details}"/>
</filterset>
</copy>
</sequential>
</macrodef>
</project>
|
yui/builder
|
d38925c37ab6343149b1ecd3cbe97a8ca9e16dbf
|
Server exits by itself after 10 seconds of silence.
|
diff --git a/componentbuild/lib/jslint/jslint-node.js b/componentbuild/lib/jslint/jslint-node.js
index d04a1aa..6db012f 100644
--- a/componentbuild/lib/jslint/jslint-node.js
+++ b/componentbuild/lib/jslint/jslint-node.js
@@ -1,96 +1,106 @@
/**
* Javascript Shell Script to Load and JSLint js files through Rhino Javascript Shell
* The jslint source file is expected as the first argument, followed by the list of JS files to JSLint
*
* e.g.
* java -j js.jar /tools/fulljslint.js testFile1.js testFile2.js testFile3.js
**/
JSLINT = require("./fulljslint").JSLINT;
(function(){ // Just to keep stuff seperate from JSLINT code
var PORT = parseInt(process.argv[2]) || 8081;
var OPTS = {
browser : true,
//laxLineEnd : true,
undef: true,
newcap: false
};
function test(js) {
if (!js) throw new Error("No JS provided");
var body = "";
var success = JSLINT(js, OPTS);
if (success) {
return "OK";
} else {
for (var i=0; i < JSLINT.errors.length; ++i) {
var e = JSLINT.errors[i];
if (e) {
body += ("\t" + e.line + ", " + e.character + ": " + e.reason + "\n\t" + clean(e.evidence) + "\n");
}
}
body += "\n";
return body;
}
}
function clean(str) {
var trimmed = "";
if (str) {
if(str.length <= 500) {
trimmed = str.replace(/^\s*(\S*(\s+\S+)*)\s*$/, "$1");
} else {
trimmed = "[Code Evidence Omitted: Greater than 500 chars]";
}
}
return trimmed;
}
var qs = require("querystring");
var fs = require("fs");
var EventEmitter = require("events").EventEmitter;
+ var ticket = 0;
+
require("http").createServer(function (req, res) {
var data = "";
req.addListener("data", function (chunk) {
data += chunk;
});
var proc = new EventEmitter();
proc.addListener("end", function (code, body, die) {
res.writeHead(code, {"Content-type" : "text/plain"});
res.end(body);
if (die) process.exit(0);
});
req.addListener("end", function () {
+ ticket++;
var code = 200, body;
var die = "/kill" === req.url;
if (die) body = "Goodbye.";
else if (req.method === "POST") {
var files = qs.parse(data)["files"].split("' '");
var results = [];
files.forEach(function (file) {
fs.readFile(file, function (err, data) {
data = data.toString("utf8");
try {
results.push(test(data));
} catch (ex) {
proc.emit("end", 500, err.message);
}
if (results.length == files.length) proc.emit("end", code, results.join("\n"));
});
});
} else {
body = "Ready.";
}
if (body) proc.emit("end", code, body, die);
});
}).listen(PORT, "127.0.0.1");
require("sys").puts("Server started on port " + PORT);
+ (function () {
+ var reap;
+ setInterval(function () {
+ if (reap == ticket) process.exit(0);
+ reap = ticket;
+ }, 10000);
+ })();
})();
|
yui/builder
|
cefb5cf2fe48cfcd5ef6e3a5b97378f8971d53d7
|
Add -node-spawn target.
|
diff --git a/componentbuild/shared/targets.xml b/componentbuild/shared/targets.xml
index f8286de..9c1dfe2 100644
--- a/componentbuild/shared/targets.xml
+++ b/componentbuild/shared/targets.xml
@@ -1,154 +1,170 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiSharedTargets">
<echo level="info">Starting Build For ${component}</echo>
<echo level="info">Ant Properties</echo>
<echo level="info"> Home : ${ant.home}</echo>
<echo level="info"> Ant Version : ${ant.version}</echo>
<echo level="info"> Build File : ${ant.file}</echo>
<echo level="info">Local Build Properties</echo>
<echo level="info"> version : ${yui.version}</echo>
<echo level="info"> srcdir : ${srcdir}</echo>
<echo level="info"> builddir : ${builddir}</echo>
<echo level="info"> component : ${component}</echo>
<echo level="info"> component.basefilename : ${component.basefilename}</echo>
<echo level="info"> component.basedir : ${component.basedir}</echo>
<echo level="info"> component.builddir : ${component.builddir}</echo>
<echo level="info">Global Build Properties</echo>
<echo level="info"> global.build.base : ${global.build.base}</echo>
<echo level="info"> global.build.component : ${global.build.component}</echo>
<echo level="info"> global.build.component.assets : ${global.build.component.assets}</echo>
<dirname property="targets.basedir" file="${ant.file.YuiSharedTargets}"/>
<import file="${targets.basedir}/macrolib.xml" description="Macrodef definitions - jslint, yuicompessor, registerversion" />
<target name="all" depends="local, deploy" description="Build and Deploy to Global Build Directory" />
<target name="local" depends="clean, init, build, minify, lint" description="Build and Deploy to Local Build Directory" />
<target name="init">
<tstamp/>
<mkdir dir="${component.builddir}" />
<createdetails />
+ <antcall target="-node-spawn"/>
+ </target>
+
+ <target name="-node-spawn" description="Start NodeJS Servers" unless="node.spawn">
+ <if>
+ <not>
+ <http url="${node.jslint.url}"/>
+ </not>
+ <then>
+ <exec executable="node" spawn="true">
+ <arg value="${builddir}/lib/jslint/jslint-node.js"/>
+ </exec>
+ </then>
+ </if>
+ <!-- Don't try to start again: -->
+ <property name="node.spawn" value="true"/>
</target>
<target name="clean" description="Clean Local Build Directory" unless="clean.skip">
<delete dir="${component.builddir}" />
</target>
<target name="build" />
<!-- MIN -->
<target name="minify" description="Create component-min.js from component.js">
<yuicompress src="${component.builddir}/${component.basefilename}.js" dest="${component.builddir}/${component.basefilename}-min.js" args="${yuicompressor.js.args.internal}" />
<if>
<available file="${component.builddir}/lang" type="dir" />
<then>
<for param="file">
<path>
<fileset dir="${component.builddir}/lang" includes="*.js"/>
</path>
<sequential>
<yuicompress src="@{file}" dest="@{file}" args="${yuicompressor.js.args.internal}" />
</sequential>
</for>
</then>
</if>
</target>
<target name="lint" description="Run jslint over the local build files (default settings)" unless="lint.skip">
<jslint>
<jsfiles>
<fileset dir="${component.builddir}" includes="*.js" />
</jsfiles>
</jslint>
</target>
<!-- DEPLOY -->
<target name="deploy" description="Copy files to global location" depends="deploybuild, deployassets, deployskins, deploylang, deploydocs"></target>
<target name="deploybuild" description="Copy built files to global build location">
<copy todir="${global.build.component}" overwrite="true" verbose="true">
<fileset dir="${component.builddir}" includes="*.js" />
</copy>
</target>
<target name="deployassets" if="component.assets.exist">
<copy todir="${global.build.component.assets}" flatten="${component.assets.flatten}" overwrite="true" verbose="true">
<fileset dir="${component.assets.base}" includes="${component.assets.files}" excludes="skins/, legacy/" />
</copy>
<copy todir="${global.build.component.assets}" flatten="${component.assets.legacy.flatten}" preservelastmodified="true" failonerror="false" verbose="true">
<fileset dir="${component.assets.legacy.base}" includes="${component.assets.legacy.files}" excludes="skins/" />
</copy>
</target>
<target name="deployskins" if="skins.exist">
<copy todir="${global.build.component.assets}/skins/sam" overwrite="true" verbose="true">
<fileset dir="${component.builddir}/assets/skins/sam" includes="${component}.css" />
</copy>
<copy todir="${global.build.component.assets}/skins/sam" overwrite="true" verbose="true">
<fileset dir="${component.assets.skins.base}/sam" includes="${component.assets.skins.files}" />
</copy>
</target>
<target name="deploylang" description="Copy language bundles to global build location">
<copy todir="${global.build.component}/lang" overwrite="true" failonerror="false" verbose="true">
<fileset dir="${component.builddir}/lang" includes="*.js" />
</copy>
</target>
<target name="deploydocs" description="Copy doc files to global doc locations">
<!-- TODO -->
</target>
<target name="-prepend" if="component.prependfiles">
<concat destfile="${workingdir}/${component.basefilename}.js.tmp" fixlastline="true">
<filelist dir="${component.basedir}" files="${component.prependfiles}" />
<filterchain>
<tokenfilter>
<filetokenizer/>
<replaceregex
pattern="${component.logger.regex}"
replace="${component.logger.regex.replace}"
flags="${component.logger.regex.flags}" />
</tokenfilter>
</filterchain>
</concat>
<concat destfile="${workingdir}/${component.basefilename}.js.tmp" fixlastline="true" append="true">
<filelist dir="${component.builddir}" files="${component.basefilename}.js" />
</concat>
<move file="${workingdir}/${component.basefilename}.js.tmp" tofile="${component.builddir}/${component.basefilename}.js" />
</target>
<target name="-append" if="component.appendfiles">
<concat destfile="${component.builddir}/${component.basefilename}.js" fixlastline="true" append="true">
<filelist dir="${component.basedir}" files="${component.appendfiles}" />
<filterchain>
<tokenfilter>
<filetokenizer/>
<replaceregex
pattern="${component.logger.regex}"
replace="${component.logger.regex.replace}"
flags="${component.logger.regex.flags}" />
</tokenfilter>
</filterchain>
</concat>
</target>
<target name="-prependdebug" if="component.prependfiles">
<concat destfile="${workingdir}/${component.basefilename}-debug.js.tmp" fixlastline="true" >
<filelist dir="${component.basedir}" files="${component.prependfiles}" />
<filelist dir="${component.builddir}" files="${component.basefilename}-debug.js" />
</concat>
<move file="${workingdir}/${component.basefilename}-debug.js.tmp" tofile="${component.builddir}/${component.basefilename}-debug.js" />
</target>
<target name="-appenddebug" if="component.appendfiles">
<concat destfile="${component.builddir}/${component.basefilename}-debug.js" fixlastline="true" append="true">
<filelist dir="${component.basedir}" files="${component.appendfiles}" />
</concat>
</target>
</project>
|
yui/builder
|
e6ba7e78210bec1203b1d23068fbe5e939d0769c
|
Remove debugging and dead code.
|
diff --git a/componentbuild/lib/jslint/jslint-node.js b/componentbuild/lib/jslint/jslint-node.js
index 782beda..d04a1aa 100644
--- a/componentbuild/lib/jslint/jslint-node.js
+++ b/componentbuild/lib/jslint/jslint-node.js
@@ -1,103 +1,96 @@
/**
* Javascript Shell Script to Load and JSLint js files through Rhino Javascript Shell
* The jslint source file is expected as the first argument, followed by the list of JS files to JSLint
*
* e.g.
* java -j js.jar /tools/fulljslint.js testFile1.js testFile2.js testFile3.js
**/
JSLINT = require("./fulljslint").JSLINT;
(function(){ // Just to keep stuff seperate from JSLINT code
var PORT = parseInt(process.argv[2]) || 8081;
var OPTS = {
browser : true,
//laxLineEnd : true,
undef: true,
newcap: false
};
function test(js) {
if (!js) throw new Error("No JS provided");
var body = "";
var success = JSLINT(js, OPTS);
if (success) {
return "OK";
} else {
for (var i=0; i < JSLINT.errors.length; ++i) {
var e = JSLINT.errors[i];
if (e) {
body += ("\t" + e.line + ", " + e.character + ": " + e.reason + "\n\t" + clean(e.evidence) + "\n");
}
}
body += "\n";
return body;
-
- // Last item is null if JSLint hit a fatal error
- if (JSLINT.errors && JSLINT.errors[JSLINT.errors.length-1] === null) {
- throw new Error("Fatal JSLint Exception. Stopped lint");
- }
}
}
function clean(str) {
var trimmed = "";
if (str) {
if(str.length <= 500) {
trimmed = str.replace(/^\s*(\S*(\s+\S+)*)\s*$/, "$1");
} else {
trimmed = "[Code Evidence Omitted: Greater than 500 chars]";
}
}
return trimmed;
}
var qs = require("querystring");
var fs = require("fs");
var EventEmitter = require("events").EventEmitter;
require("http").createServer(function (req, res) {
var data = "";
req.addListener("data", function (chunk) {
data += chunk;
});
var proc = new EventEmitter();
proc.addListener("end", function (code, body, die) {
res.writeHead(code, {"Content-type" : "text/plain"});
res.end(body);
if (die) process.exit(0);
});
req.addListener("end", function () {
var code = 200, body;
var die = "/kill" === req.url;
if (die) body = "Goodbye.";
else if (req.method === "POST") {
var files = qs.parse(data)["files"].split("' '");
var results = [];
files.forEach(function (file) {
fs.readFile(file, function (err, data) {
data = data.toString("utf8");
- require("sys").puts(require("sys").inspect(data));
try {
results.push(test(data));
} catch (ex) {
- require("sys").puts(require("sys").inspect(err));
proc.emit("end", 500, err.message);
}
if (results.length == files.length) proc.emit("end", code, results.join("\n"));
});
});
} else {
body = "Ready.";
}
if (body) proc.emit("end", code, body, die);
});
}).listen(PORT, "127.0.0.1");
require("sys").puts("Server started on port " + PORT);
})();
|
yui/builder
|
51fe7361f1fe3db802c9ac8c5509164d2e22adc0
|
JSLint server accepts filenames instead of script
|
diff --git a/componentbuild/lib/jslint/jslint-node.js b/componentbuild/lib/jslint/jslint-node.js
index 47e954a..782beda 100644
--- a/componentbuild/lib/jslint/jslint-node.js
+++ b/componentbuild/lib/jslint/jslint-node.js
@@ -1,90 +1,103 @@
/**
* Javascript Shell Script to Load and JSLint js files through Rhino Javascript Shell
* The jslint source file is expected as the first argument, followed by the list of JS files to JSLint
*
* e.g.
* java -j js.jar /tools/fulljslint.js testFile1.js testFile2.js testFile3.js
**/
JSLINT = require("./fulljslint").JSLINT;
(function(){ // Just to keep stuff seperate from JSLINT code
var PORT = parseInt(process.argv[2]) || 8081;
var OPTS = {
browser : true,
//laxLineEnd : true,
undef: true,
newcap: false
};
function test(js) {
if (!js) throw new Error("No JS provided");
var body = "";
var success = JSLINT(js, OPTS);
if (success) {
return "OK";
} else {
for (var i=0; i < JSLINT.errors.length; ++i) {
var e = JSLINT.errors[i];
if (e) {
body += ("\t" + e.line + ", " + e.character + ": " + e.reason + "\n\t" + clean(e.evidence) + "\n");
}
}
body += "\n";
return body;
// Last item is null if JSLint hit a fatal error
if (JSLINT.errors && JSLINT.errors[JSLINT.errors.length-1] === null) {
throw new Error("Fatal JSLint Exception. Stopped lint");
}
}
}
function clean(str) {
var trimmed = "";
if (str) {
if(str.length <= 500) {
trimmed = str.replace(/^\s*(\S*(\s+\S+)*)\s*$/, "$1");
} else {
trimmed = "[Code Evidence Omitted: Greater than 500 chars]";
}
}
return trimmed;
}
var qs = require("querystring");
+ var fs = require("fs");
+ var EventEmitter = require("events").EventEmitter;
require("http").createServer(function (req, res) {
var data = "";
req.addListener("data", function (chunk) {
data += chunk;
});
+ var proc = new EventEmitter();
+ proc.addListener("end", function (code, body, die) {
+ res.writeHead(code, {"Content-type" : "text/plain"});
+ res.end(body);
+ if (die) process.exit(0);
+ });
req.addListener("end", function () {
var code = 200, body;
var die = "/kill" === req.url;
- if (req.method === "POST") {
- try {
- data = qs.parse(data)["data"];
- body = test(data);
- } catch (ex) {
- code = 500;
- body = ex.message;
- }
- } else if (die) {
- body = "Goodbye.";
+ if (die) body = "Goodbye.";
+ else if (req.method === "POST") {
+ var files = qs.parse(data)["files"].split("' '");
+ var results = [];
+ files.forEach(function (file) {
+ fs.readFile(file, function (err, data) {
+ data = data.toString("utf8");
+ require("sys").puts(require("sys").inspect(data));
+ try {
+ results.push(test(data));
+ } catch (ex) {
+ require("sys").puts(require("sys").inspect(err));
+ proc.emit("end", 500, err.message);
+ }
+ if (results.length == files.length) proc.emit("end", code, results.join("\n"));
+ });
+ });
} else {
body = "Ready.";
}
- res.writeHead(code, {"Content-type" : "text/plain"});
- res.end(body);
- if (die) process.exit(0);
+ if (body) proc.emit("end", code, body, die);
});
}).listen(PORT, "127.0.0.1");
require("sys").puts("Server started on port " + PORT);
})();
diff --git a/componentbuild/shared/macrolib.xml b/componentbuild/shared/macrolib.xml
index e5d63fe..17a75ca 100644
--- a/componentbuild/shared/macrolib.xml
+++ b/componentbuild/shared/macrolib.xml
@@ -1,410 +1,377 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiMacroLib">
<macrodef name="arrayliteral">
<attribute name="from" />
<attribute name="to" />
<attribute name="key" />
<sequential>
<if>
<and>
<isset property="@{from}" />
<length string="${@{from}}" when="ne" length="0" />
</and>
<then>
<propertyregex property="array"
override="true"
input="${@{from}}"
casesensitive="false"
regexp="([^\,\s]+)"
replace="'\1'"
/>
<property name="@{to}" value="@{key}:[${array}]" />
</then>
</if>
</sequential>
</macrodef>
<macrodef name="createdetails">
<sequential>
<arrayliteral from="component.use" to="component.details.use" key="use" />
<arrayliteral from="component.supersedes" to="component.details.supersedes" key="supersedes" />
<arrayliteral from="component.requires" to="component.details.requires" key="requires" />
<arrayliteral from="component.optional" to="component.details.optional" key="optional" />
<arrayliteral from="component.lang" to="component.details.lang" key="lang" />
<if>
<isset property="component.skinnable" />
<then>
<property name="component.details.skinnable" value="skinnable:${component.skinnable}" />
</then>
</if>
<propertyselector property="details.list"
delimiter=","
match="component\.details.([^\.]*)"
select="\1"
casesensitive="false" />
<var name="details" value="" />
<if>
<isset property="details.list" />
<then>
<for list="${details.list}" param="val">
<sequential>
<var name="details" value="${component.details.@{val}}, ${details}" />
</sequential>
</for>
<propertyregex property="component.details.hash"
input="{${details}}"
regexp="(\,\s*?\})"
replace="}"
casesensitive="false" />
</then>
<else>
<property name="component.details.hash" value="" />
</else>
</if>
</sequential>
</macrodef>
<taskdef
name="jscompressor"
classname="com.yahoo.platform.yui.compressor.ant.JavaScriptCompressorTask"
classpath="${yuicompressor.jar}"/>
<taskdef
name="csscompressor"
classname="com.yahoo.platform.yui.compressor.ant.CssCompressorTask"
classpath="${yuicompressor.jar}"/>
<macrodef name="yuicompress">
<attribute name="src" />
<attribute name="dest" />
<attribute name="args" /> <!-- not used anymore -->
<attribute name="type" default="js"/>
<sequential>
<if>
<equals arg1="@{type}" arg2="css"/>
<then>
<csscompressor srcfile="@{src}" destfile="@{dest}" linebreak="${yuicompressor.linebreak}" charset="${yuicompressor.css.charset}" verbose="${yuicompressor.css.verbose}"/>
</then>
<else>
<jscompressor srcfile="@{src}" destfile="@{dest}" linebreak="${yuicompressor.linebreak}" preservesemicolons="true" disableoptimizations="true" charset="${yuicompressor.js.charset}" verbose="${yuicompressor.js.verbose}"/>
</else>
</if>
</sequential>
</macrodef>
<macrodef name="concatsource">
<attribute name="destfile" />
<attribute name="sourcedir" />
<attribute name="sourcefiles" />
<attribute name="workingdir" default="${workingdir}" />
<element name="filters" optional="true" description="Additonal filters to apply to individual files"/>
<sequential>
<echo level="info">Concatenating</echo>
<echo level="info"> Source Files : @{sourcefiles}</echo>
<echo level="info"> In Source Dir : @{sourcedir}</echo>
<echo level="info"> To : @{destfile}</echo>
<delete dir="@{workingdir}" quiet="true"/>
<copy todir="@{workingdir}">
<filelist dir="@{sourcedir}" files="@{sourcefiles}" />
<filterchain>
<filters />
<fixcrlf fixlast="true" eof="remove"/>
</filterchain>
</copy>
<concat destfile="@{destfile}" fixlastline="true">
<filelist dir="@{workingdir}" files="@{sourcefiles}" />
</concat>
<delete dir="${workingdir}" quiet="true" />
</sequential>
</macrodef>
<if>
- <isset property="jslint.skip"/>
+ <http url="${node.jslint.url}"/>
<then>
<macrodef name="jslint">
<element name="jsfiles" optional="false" />
+
<sequential>
- <echo level="info">Skipping JSLint</echo>
+ <pathconvert pathsep="' '" property="jsfileargs">
+ <jsfiles />
+ </pathconvert>
+ <post to="${node.jslint.url}" failonerror="${lint.failonerror}">
+ <prop name="files" value="${jsfileargs}"/>
+ </post>
</sequential>
</macrodef>
</then>
<else>
- <!-- By default, jslint failure should fail the build.
- This can be overridden on the command line. -->
- <property name="jslint.failonerror" value="true"/>
-
- <!-- Try to start the node jslint server. -->
- <exec executable="node" spawn="true">
- <arg value="${builddir}/lib/jslint/jslint-node.js"/>
- </exec>
-
- <property name="node.jslint.url" value="http://127.0.0.1:8081/"/>
-<!--
- <echo level="info">Waiting for node server spinup...</echo>
- <sleep milliseconds="500"/>
--->
-
<macrodef name="jslint">
<element name="jsfiles" optional="false" />
<sequential>
<pathconvert pathsep="' '" property="jsfileargs">
<jsfiles />
</pathconvert>
- <if>
- <http url="${node.jslint.url}"/>
- <then>
- <echo>Using NodeJS</echo>
- <foreach list="${jsfileargs}" delimiter="' '" target="-jslint-nodejs" param="node.jslint.filename"/>
- </then>
- <else>
- <echo>Using Rhino</echo>
- <!--
- Need to find a way to convert fileset to args (script?) to
- avoid ' ', which will break for files with ' in them
-
- Evaluates to the following java execution line...
- java -r js.jar jslintconsole.js 'file1.js' 'file2.js' 'file3.js'
- -->
-
- <java jar="${rhino.jar}" fork="true" failonerror="${jslint.failonerror}">
- <arg file="${jslintconsole.js}" />
- <arg value="${jslintsrc.js}" />
- <arg line="'${jsfileargs}'" />
- </java>
- </else>
- </if>
+ <echo>Using Rhino</echo>
+ <!--
+ Need to find a way to convert fileset to args (script?) to
+ avoid ' ', which will break for files with ' in them
+
+ Evaluates to the following java execution line...
+ java -r js.jar jslintconsole.js 'file1.js' 'file2.js' 'file3.js'
+ -->
+
+ <java jar="${rhino.jar}" fork="true" failonerror="${jslint.failonerror}">
+ <arg file="${jslintconsole.js}" />
+ <arg value="${jslintsrc.js}" />
+ <arg line="'${jsfileargs}'" />
+ </java>
</sequential>
</macrodef>
</else>
</if>
<macrodef name="registerversion">
<attribute name="module" />
<attribute name="classname" />
<attribute name="file" />
<sequential>
<loadfile srcfile="${builddir}/files/versioncode.txt" property="@{module}-@{classname}-version" >
<filterchain>
<replacetokens>
<token key="MODULE" value="@{module}"/>
<token key="CLASSNAME" value="@{classname}"/>
</replacetokens>
</filterchain>
</loadfile>
<echo level="info">Adding Version Registration Code to @{file}</echo>
<concat destfile="@{file}" append="true" fixlastline="true">${@{module}-@{classname}-version}</concat>
</sequential>
</macrodef>
<macrodef name="addlang">
<attribute name="dir" />
<attribute name="module" />
<attribute name="dest" />
<attribute name="lang" default="" />
<attribute name="details" default = ""/>
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}@{lang}_details" value="" />
</then>
<else>
<property name="@{module}@{lang}_details" value=",@{details}" />
</else>
</if>
<if>
<equals arg1="@{lang}" arg2="" />
<then>
<property name="@{module}@{lang}_fullname" value="@{module}" />
</then>
<else>
<property name="@{module}@{lang}_fullname" value="@{module}_@{lang}" />
</else>
</if>
<if>
<available file="@{dir}/${@{module}@{lang}_fullname}.pres" />
<then>
<mkdir dir="${component.langbuilddir}" />
<java jar="${rhino.jar}" fork="true" failonerror="true">
<jvmarg value="-Dfile.encoding=utf-8" />
<arg file="${yrb2jsonconsole.js}" />
<arg file="${yrb2jsonsrc.js}" />
<arg file="@{dir}/${@{module}@{lang}_fullname}.pres" />
<arg file="${component.langbuilddir}/${@{module}@{lang}_fullname}.js" />
</java>
<echo level="info">Wrapping ${component.langbuilddir}/${@{module}@{lang}_fullname}.js in YUI.add, Y.Intl.add</echo>
<loadfile srcfile="${component.langbuilddir}/${@{module}@{lang}_fullname}.js" property="@{module}@{lang}-strs-loaded" encoding="utf-8" />
</then>
<else>
<echo level="info">Wrapping @{dir}/${@{module}@{lang}_fullname}.js in YUI.add, Y.Intl.add</echo>
<loadfile srcfile="@{dir}/${@{module}@{lang}_fullname}.js" property="@{module}@{lang}-strs-loaded" encoding="utf-8" />
</else>
</if>
<copy file="${builddir}/files/langtemplate.txt" tofile="@{dest}/${@{module}@{lang}_fullname}.js" overwrite="true" outputencoding="utf-8">
<filterset>
<filter token="LANG" value="@{lang}" />
<filter token="LANG_MODULE" value="lang/${@{module}@{lang}_fullname}" />
<filter token="STRINGS" value="${@{module}@{lang}-strs-loaded}" />
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}" />
<filter token="LANG_DETAILS" value="${@{module}@{lang}_details}" />
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addmodule">
<attribute name="file" />
<attribute name="module" />
<attribute name="details" default="" />
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}-details" value="" />
</then>
<else>
<property name="@{module}-details" value=",@{details}" />
</else>
</if>
<loadfile srcfile="@{file}" property="@{module}-@{file}-code" />
<echo level="info">Wrapping @{file} in YUI.add module</echo>
<copy file="${builddir}/files/moduletemplate.txt" tofile="@{file}" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{file}-code}" />
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}" />
<filter token="DETAILS" value="${@{module}-details}" />
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addrollup">
<attribute name="file" />
<attribute name="module" />
<attribute name="details" default="" />
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}-details" value="" />
</then>
<else>
<property name="@{module}-details" value=",@{details}" />
</else>
</if>
<loadfile srcfile="@{file}" property="@{module}-@{file}-code" />
<echo level="info">Adding Rollup @{file} using YUI.add</echo>
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{file}" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{file}-code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}"/>
<filter token="DETAILS" value="${@{module}-details}"/>
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addlangrollup">
<attribute name="module" />
<attribute name="dir" />
<sequential>
<echo level="info">Registering rollup info for lang files in @{dir} using YUI.add</echo>
<for list="${component.rollup.lang}" param="lang" trim="true">
<sequential>
<loadfile srcfile="@{dir}/@{module}_@{lang}.js" property="@{module}-@{lang}-code" />
<var name="lang.use" value="{use:[" />
<for list="${component.lang.use}" param="submod" trim="true">
<sequential>
<var name="lang.use" value="${lang.use}'lang/@{submod}_@{lang}'," />
</sequential>
</for>
<var name="lang.use" value="${lang.use}]}" />
<propertyregex property="@{module}-@{lang}-details"
input="${lang.use}"
regexp="(\,\s*?\])"
replace="]"
casesensitive="false" />
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{dir}/@{module}_@{lang}.js" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{lang}-code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="lang/@{module}_@{lang}"/>
<filter token="DETAILS" value=", ${@{module}-@{lang}-details}"/>
</filterset>
</copy>
</sequential>
</for>
<loadfile srcfile="@{dir}/@{module}.js" property="@{module}--code" />
<var name="lang.use" value="{use:[" />
<for list="${component.lang.use}" param="submod" trim="true">
<sequential>
<var name="lang.use" value="${lang.use}'lang/@{submod}'," />
</sequential>
</for>
<var name="lang.use" value="${lang.use}]}" />
<propertyregex property="@{module}--details"
input="${lang.use}"
regexp="(\,\s*?\])"
replace="]"
casesensitive="false" />
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{dir}/@{module}.js" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}--code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="lang/@{module}"/>
<filter token="DETAILS" value=", ${@{module}--details}"/>
</filterset>
</copy>
</sequential>
</macrodef>
-
- <target name="-jslint-nodejs">
- <if>
- <length file="${node.jslint.filename}" when="greater" length="0"/>
- <then>
- <loadfile property="node.jslint.file" srcFile="${node.jslint.filename}"/>
- <post to="${node.jslint.url}" property="node.jslint.response" failonerror="#{jslint.failonerror}">
- <prop name="data" value="${node.jslint.file}"/>
- </post>
- </then>
- </if>
- <var name="node.jslint.file" unset="true"/>
- <var name="node.jslint.filename" unset="true"/>
- <var name="node.jslint.response" unset="true"/>
- </target>
</project>
diff --git a/componentbuild/shared/properties.xml b/componentbuild/shared/properties.xml
index 31f4fe3..8ea1798 100644
--- a/componentbuild/shared/properties.xml
+++ b/componentbuild/shared/properties.xml
@@ -1,160 +1,166 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiSharedProperties">
<!-- ANT contrib library for loops, if/else support, with property fix for FOR task -->
<taskdef resource="antcontrib.properties">
<classpath>
<pathelement location="${builddir}/lib/ant-contrib/ant-contrib-1.0b3-modified.jar" />
</classpath>
</taskdef>
<dirname property="buildfile.dir" file="${ant.file}" />
<!--
builddir : The path to the builder/componentbuild directory from the component build file
srcdir : The path to top of the project source directory (e.g. yui2) from the component build file
-->
<property name="builddir" location="../../../builder/componentbuild" />
<property name="srcdir" location="../.." />
<!-- buildfiles.eol : End of line char to use for built files -->
<property name="buildfiles.eol" value="lf"/>
<!-- Supporting Tools -->
<property name="rhino.jar" location="${builddir}/lib/rhino/js.jar" />
<property name="jslintconsole.js" location="${builddir}/lib/jslint/jslint-console.js" />
<property name="jslintsrc.js" location="${builddir}/lib/jslint/fulljslint.js" />
<property name="yuicompressor.jar" location="${builddir}/lib/yuicompressor/yuicompressor-2.4.3-dinoboff.jar" />
<property name="yrb2jsonconsole.js" location="${builddir}/lib/yrb2json/yrb2json-console.js" />
<property name="yrb2jsonsrc.js" location="${builddir}/lib/yrb2json/yrb2json.js" />
<!-- YUI Compressor arguments for JS and CSS files -->
<property name="yuicompressor.linebreak" value="6000" />
<property name="yuicompressor.css.args" value="--type css --line-break 6000" />
<property name="yuicompressor.js.args" value="--disable-optimizations --preserve-semi --line-break 6000" />
<property name="yuicompressor.js.charset" value="utf-8" />
<property name="yuicompressor.css.charset" value="utf-8" />
<!-- Enable/Disable YUI Compressor verbosity. NOTE: Checked in build files should not disable this flag -->
<property name="yuicompressor.js.verbose" value="true" />
<property name="yuicompressor.css.verbose" value="true" />
<condition property="yuicompressor.js.args.internal" value="-v --charset ${yuicompressor.js.charset} ${yuicompressor.js.args}" else="--charset ${yuicompressor.js.charset} ${yuicompressor.js.args}">
<istrue value="${yuicompressor.js.verbose}" />
</condition>
<condition property="yuicompressor.css.args.internal" value="-v --charset ${yuicompressor.css.charset} ${yuicompressor.css.args}" else="--charset ${yuicompressor.css.charset} ${yuicompressor.css.args}">
<istrue value="${yuicompressor.css.verbose}" />
</condition>
<!-- Top Level Build Directories (e.g. yui2/build, yui3/build)-->
<property name="global.build.base" location="${srcdir}/build" />
<property name="global.build.component" location="${global.build.base}/${component}" />
<property name="global.build.component.assets" location="${global.build.component}/assets" />
<!-- Component Properties -->
<property name="component.module" value="${component}" />
<property name="component.basedir" location="${buildfile.dir}" />
<property name="component.jsfiles.base" location="${component.basedir}/js" />
<property name="component.lang.base" location="${component.basedir}/lang" />
<property name="component.assets.flatten" value="true" />
<property name="component.assets.base" location="${component.basedir}/assets" />
<property name="component.assets.files" value="**/*" />
<property name="component.assets.legacy.flatten" value="true" />
<property name="component.assets.legacy.base" location="${component.assets.base}/legacy" />
<property name="component.assets.legacy.files" value="**/*" />
<property name="component.assets.skins.base" location="${component.assets.base}/skins" />
<property name="component.assets.skins.files" value="**/*" />
<condition property="component.skins.exist">
<and>
<available file="${component.assets.base}/${component}-core.css" type="file" />
<available file="${component.assets.base}/skins" type="dir" />
</and>
</condition>
<!-- component is part of a rollup build, so rollup skins to parent -->
<condition property="rollupskins">
<and>
<istrue value="${rollup}" />
<istrue value="${component.skins.exist}" />
</and>
</condition>
<available file="${component.assets.base}" type="dir" property="component.assets.exist"/>
<condition property="component.langs.exist">
<and>
<or>
<isset property="component.lang" />
<isset property="component.rollup.lang" />
</or>
</and>
</condition>
<condition property="rolluplangs">
<and>
<istrue value="${rollup}" />
<istrue value="${component.langs.exist}" />
</and>
</condition>
<!--
DEPRECATED: component.basefilename and component.releasetype are deprecated
We used to mark filenames with suffixes (-beta, -experimental), which we no longer do
-->
<condition property="component.basefilename" value="${component}" else="${component}">
<isset property="component.releasetype"/>
</condition>
<!-- Default logger regex values if not provided -->
<property name="component.logger.regex" value="^.*?(?:logger|YAHOO.log).*?(?:;|\).*;|(?:\r?\n.*?)*?\).*;).*;?.*?\r?\n" />
<property name="component.logger.regex.replace" value="" />
<property name="component.logger.regex.flags" value="mg" />
<property name="component.logger.regex.byline" value="false" />
<!-- Rollup support, currently only used for YUI 3 -->
<property name="component.rollup" value="false"/>
<property name="component.rollup.target" value="all"/>
<condition property="component.builddir" value="${component.basedir}/build_rollup_tmp" else="${component.basedir}/build_tmp">
<istrue value="${component.rollup}"/>
</condition>
<condition property="rollup.skins.exist">
<and>
<istrue value="${component.rollup}" />
<available file="${component.assets.base}/skins" type="dir" />
</and>
</condition>
<condition property="skins.exist">
<or>
<istrue value="${rollup.skins.exist}" />
<istrue value="${component.skins.exist}" />
</or>
</condition>
<!-- The temporary working directory used by the build process -->
<property name="workingdir" location="${component.builddir}/ant" />
<!-- Directory for language resource bundles in JSON format derived from YRB format -->
<property name="component.langbuilddir" value="${component.basedir}/build_lang_tmp" />
<!-- The file which defines the default targets for the particular type of component (module, rollup, css) -->
<condition property="targetbase" value="rollup" else="module">
<istrue value="${component.rollup}"/>
</condition>
<condition property="targets" value="../shared/cssmodule.xml" else="${targetbase}.xml">
<isset property="component.cssfiles" />
</condition>
+ <!-- By default, jslint failure should fail the build.
+ This can be overridden on the command line. -->
+ <property name="lint.failonerror" value="true"/>
+
+ <property name="node.jslint.url" value="http://127.0.0.1:8081/"/>
+
</project>
|
yui/builder
|
aa966fa49f27ee804e29c7885c9cf3572d7cd78e
|
NodeJS based JSLint server.
|
diff --git a/componentbuild/lib/jslint/fulljslint.js b/componentbuild/lib/jslint/fulljslint.js
index 9dcc2b6..7c7bd57 100644
--- a/componentbuild/lib/jslint/fulljslint.js
+++ b/componentbuild/lib/jslint/fulljslint.js
@@ -5106,512 +5106,514 @@ loop: for (;;) {
reachable('return');
return this;
}).exps = true;
stmt('throw', function () {
nolinebreak(this);
nonadjacent(token, nexttoken);
this.first = parse(20);
reachable('throw');
return this;
}).exps = true;
reserve('void');
// Superfluous reserved words
reserve('class');
reserve('const');
reserve('enum');
reserve('export');
reserve('extends');
reserve('import');
reserve('super');
reserve('let');
reserve('yield');
reserve('implements');
reserve('interface');
reserve('package');
reserve('private');
reserve('protected');
reserve('public');
reserve('static');
// Parse JSON
function jsonValue() {
function jsonObject() {
var o = {}, t = nexttoken;
advance('{');
if (nexttoken.id !== '}') {
for (;;) {
if (nexttoken.id === '(end)') {
error("Missing '}' to match '{' from line {a}.",
nexttoken, t.line);
} else if (nexttoken.id === '}') {
warning("Unexpected comma.", token);
break;
} else if (nexttoken.id === ',') {
error("Unexpected comma.", nexttoken);
} else if (nexttoken.id !== '(string)') {
warning("Expected a string and instead saw {a}.",
nexttoken, nexttoken.value);
}
if (o[nexttoken.value] === true) {
warning("Duplicate key '{a}'.",
nexttoken, nexttoken.value);
} else if (nexttoken.value === '__proto__') {
warning("Stupid key '{a}'.",
nexttoken, nexttoken.value);
} else {
o[nexttoken.value] = true;
}
advance();
advance(':');
jsonValue();
if (nexttoken.id !== ',') {
break;
}
advance(',');
}
}
advance('}');
}
function jsonArray() {
var t = nexttoken;
advance('[');
if (nexttoken.id !== ']') {
for (;;) {
if (nexttoken.id === '(end)') {
error("Missing ']' to match '[' from line {a}.",
nexttoken, t.line);
} else if (nexttoken.id === ']') {
warning("Unexpected comma.", token);
break;
} else if (nexttoken.id === ',') {
error("Unexpected comma.", nexttoken);
}
jsonValue();
if (nexttoken.id !== ',') {
break;
}
advance(',');
}
}
advance(']');
}
switch (nexttoken.id) {
case '{':
jsonObject();
break;
case '[':
jsonArray();
break;
case 'true':
case 'false':
case 'null':
case '(number)':
case '(string)':
advance();
break;
case '-':
advance('-');
if (token.character !== nexttoken.from) {
warning("Unexpected space after '-'.", token);
}
adjacent(token, nexttoken);
advance('(number)');
break;
default:
error("Expected a JSON value.", nexttoken);
}
}
// The actual JSLINT function itself.
var itself = function (s, o) {
var a, i;
JSLINT.errors = [];
predefined = Object.create(standard);
if (o) {
a = o.predef;
if (a instanceof Array) {
for (i = 0; i < a.length; i += 1) {
predefined[a[i]] = true;
}
}
if (o.adsafe) {
o.safe = true;
}
if (o.safe) {
o.browser = false;
o.css = false;
o.debug = false;
o.devel = false;
o.eqeqeq = true;
o.evil = false;
o.forin = false;
o.nomen = true;
o.on = false;
o.rhino = false;
o.safe = true;
o.windows = false;
o.strict = true;
o.sub = false;
o.undef = true;
o.widget = false;
predefined.Date = null;
predefined['eval'] = null;
predefined.Function = null;
predefined.Object = null;
predefined.ADSAFE = false;
predefined.lib = false;
}
option = o;
} else {
option = {};
}
option.indent = option.indent || 4;
option.maxerr = option.maxerr || 50;
adsafe_id = '';
adsafe_may = false;
adsafe_went = false;
approved = {};
if (option.approved) {
for (i = 0; i < option.approved.length; i += 1) {
approved[option.approved[i]] = option.approved[i];
}
} else {
approved.test = 'test';
}
tab = '';
for (i = 0; i < option.indent; i += 1) {
tab += ' ';
}
indent = 1;
global = Object.create(predefined);
scope = global;
funct = {
'(global)': true,
'(name)': '(global)',
'(scope)': scope,
'(breakage)': 0,
'(loopage)': 0
};
functions = [funct];
ids = {};
urls = [];
src = false;
xmode = false;
stack = null;
member = {};
membersOnly = null;
implied = {};
inblock = false;
lookahead = [];
jsonmode = false;
warnings = 0;
lex.init(s);
prereg = true;
strict_mode = false;
prevtoken = token = nexttoken = syntax['(begin)'];
assume();
try {
advance();
if (nexttoken.value.charAt(0) === '<') {
html();
if (option.adsafe && !adsafe_went) {
warning("ADsafe violation: Missing ADSAFE.go.", this);
}
} else {
switch (nexttoken.id) {
case '{':
case '[':
option.laxbreak = true;
jsonmode = true;
jsonValue();
break;
case '@':
case '*':
case '#':
case '.':
case ':':
xmode = 'style';
advance();
if (token.id !== '@' || !nexttoken.identifier ||
nexttoken.value !== 'charset' || token.line !== 1 ||
token.from !== 1) {
error('A css file should begin with @charset "UTF-8";');
}
advance();
if (nexttoken.type !== '(string)' &&
nexttoken.value !== 'UTF-8') {
error('A css file should begin with @charset "UTF-8";');
}
advance();
advance(';');
styles();
break;
default:
if (option.adsafe && option.fragment) {
error("Expected '{a}' and instead saw '{b}'.",
nexttoken, '<div>', nexttoken.value);
}
statements('lib');
}
}
advance('(end)');
} catch (e) {
if (e) {
JSLINT.errors.push({
reason : e.message,
line : e.line || nexttoken.line,
character : e.character || nexttoken.from
}, null);
}
}
return JSLINT.errors.length === 0;
};
function is_array(o) {
return Object.prototype.toString.apply(o) === '[object Array]';
}
function to_array(o) {
var a = [], k;
for (k in o) {
if (is_own(o, k)) {
a.push(k);
}
}
return a;
}
// Data summary.
itself.data = function () {
var data = {functions: []}, fu, globals, implieds = [], f, i, j,
members = [], n, unused = [], v;
if (itself.errors.length) {
data.errors = itself.errors;
}
if (jsonmode) {
data.json = true;
}
for (n in implied) {
if (is_own(implied, n)) {
implieds.push({
name: n,
line: implied[n]
});
}
}
if (implieds.length > 0) {
data.implieds = implieds;
}
if (urls.length > 0) {
data.urls = urls;
}
globals = to_array(scope);
if (globals.length > 0) {
data.globals = globals;
}
for (i = 1; i < functions.length; i += 1) {
f = functions[i];
fu = {};
for (j = 0; j < functionicity.length; j += 1) {
fu[functionicity[j]] = [];
}
for (n in f) {
if (is_own(f, n) && n.charAt(0) !== '(') {
v = f[n];
if (is_array(fu[v])) {
fu[v].push(n);
if (v === 'unused') {
unused.push({
name: n,
line: f['(line)'],
'function': f['(name)']
});
}
}
}
}
for (j = 0; j < functionicity.length; j += 1) {
if (fu[functionicity[j]].length === 0) {
delete fu[functionicity[j]];
}
}
fu.name = f['(name)'];
fu.param = f['(params)'];
fu.line = f['(line)'];
fu.last = f['(last)'];
data.functions.push(fu);
}
if (unused.length > 0) {
data.unused = unused;
}
members = [];
for (n in member) {
if (typeof member[n] === 'number') {
data.member = member;
break;
}
}
return data;
};
itself.report = function (option) {
var data = itself.data();
var a = [], c, e, err, f, i, k, l, m = '', n, o = [], s;
function detail(h, array) {
var b, i, singularity;
if (array) {
o.push('<div><i>' + h + '</i> ');
array = array.sort();
for (i = 0; i < array.length; i += 1) {
if (array[i] !== singularity) {
singularity = array[i];
o.push((b ? ', ' : '') + singularity);
b = true;
}
}
o.push('</div>');
}
}
if (data.errors || data.implieds || data.unused) {
err = true;
o.push('<div id=errors><i>Error:</i>');
if (data.errors) {
for (i = 0; i < data.errors.length; i += 1) {
c = data.errors[i];
if (c) {
e = c.evidence || '';
o.push('<p>Problem' + (isFinite(c.line) ? ' at line ' +
c.line + ' character ' + c.character : '') +
': ' + c.reason.entityify() +
'</p><p class=evidence>' +
(e && (e.length > 80 ? e.slice(0, 77) + '...' :
e).entityify()) + '</p>');
}
}
}
if (data.implieds) {
s = [];
for (i = 0; i < data.implieds.length; i += 1) {
s[i] = '<code>' + data.implieds[i].name + '</code> <i>' +
data.implieds[i].line + '</i>';
}
o.push('<p><i>Implied global:</i> ' + s.join(', ') + '</p>');
}
if (data.unused) {
s = [];
for (i = 0; i < data.unused.length; i += 1) {
s[i] = '<code><u>' + data.unused[i].name + '</u></code> <i>' +
data.unused[i].line + '</i> <code>' +
data.unused[i]['function'] + '</code>';
}
o.push('<p><i>Unused variable:</i> ' + s.join(', ') + '</p>');
}
if (data.json) {
o.push('<p>JSON: bad.</p>');
}
o.push('</div>');
}
if (!option) {
o.push('<br><div id=functions>');
if (data.urls) {
detail("URLs<br>", data.urls, '<br>');
}
if (xmode === 'style') {
o.push('<p>CSS.</p>');
} else if (data.json && !err) {
o.push('<p>JSON: good.</p>');
} else if (data.globals) {
o.push('<div><i>Global</i> ' +
data.globals.sort().join(', ') + '</div>');
} else {
o.push('<div><i>No new global variables introduced.</i></div>');
}
for (i = 0; i < data.functions.length; i += 1) {
f = data.functions[i];
o.push('<br><div class=function><i>' + f.line + '-' +
f.last + '</i> ' + (f.name || '') + '(' +
(f.param ? f.param.join(', ') : '') + ')</div>');
detail('<big><b>Unused</b></big>', f.unused);
detail('Closure', f.closure);
detail('Variable', f['var']);
detail('Exception', f.exception);
detail('Outer', f.outer);
detail('Global', f.global);
detail('Label', f.label);
}
if (data.member) {
a = to_array(data.member);
if (a.length) {
a = a.sort();
m = '<br><pre id=members>/*members ';
l = 10;
for (i = 0; i < a.length; i += 1) {
k = a[i];
n = k.name();
if (l + n.length > 72) {
o.push(m + '<br>');
m = ' ';
l = 1;
}
l += n.length + 2;
if (data.member[k] === 1) {
n = '<i>' + n + '</i>';
}
if (i < a.length - 1) {
n += ', ';
}
m += n;
}
o.push(m + '<br>*/</pre>');
}
o.push('</div>');
}
}
return o.join('');
};
itself.jslint = itself;
itself.edition = '2010-04-06';
return itself;
}());
+
+exports.JSLINT = JSLINT;
diff --git a/componentbuild/lib/jslint/jslint-node.js b/componentbuild/lib/jslint/jslint-node.js
new file mode 100644
index 0000000..47e954a
--- /dev/null
+++ b/componentbuild/lib/jslint/jslint-node.js
@@ -0,0 +1,90 @@
+/**
+ * Javascript Shell Script to Load and JSLint js files through Rhino Javascript Shell
+ * The jslint source file is expected as the first argument, followed by the list of JS files to JSLint
+ *
+ * e.g.
+ * java -j js.jar /tools/fulljslint.js testFile1.js testFile2.js testFile3.js
+ **/
+
+JSLINT = require("./fulljslint").JSLINT;
+
+(function(){ // Just to keep stuff seperate from JSLINT code
+
+ var PORT = parseInt(process.argv[2]) || 8081;
+
+ var OPTS = {
+ browser : true,
+ //laxLineEnd : true,
+ undef: true,
+ newcap: false
+ };
+
+ function test(js) {
+ if (!js) throw new Error("No JS provided");
+
+ var body = "";
+ var success = JSLINT(js, OPTS);
+ if (success) {
+ return "OK";
+ } else {
+ for (var i=0; i < JSLINT.errors.length; ++i) {
+ var e = JSLINT.errors[i];
+ if (e) {
+ body += ("\t" + e.line + ", " + e.character + ": " + e.reason + "\n\t" + clean(e.evidence) + "\n");
+ }
+ }
+ body += "\n";
+ return body;
+
+ // Last item is null if JSLint hit a fatal error
+ if (JSLINT.errors && JSLINT.errors[JSLINT.errors.length-1] === null) {
+ throw new Error("Fatal JSLint Exception. Stopped lint");
+ }
+ }
+ }
+
+ function clean(str) {
+ var trimmed = "";
+ if (str) {
+ if(str.length <= 500) {
+ trimmed = str.replace(/^\s*(\S*(\s+\S+)*)\s*$/, "$1");
+ } else {
+ trimmed = "[Code Evidence Omitted: Greater than 500 chars]";
+ }
+ }
+ return trimmed;
+ }
+
+ var qs = require("querystring");
+
+ require("http").createServer(function (req, res) {
+ var data = "";
+ req.addListener("data", function (chunk) {
+ data += chunk;
+ });
+ req.addListener("end", function () {
+ var code = 200, body;
+ var die = "/kill" === req.url;
+ if (req.method === "POST") {
+ try {
+ data = qs.parse(data)["data"];
+ body = test(data);
+ } catch (ex) {
+ code = 500;
+ body = ex.message;
+ }
+ } else if (die) {
+ body = "Goodbye.";
+ } else {
+ body = "Ready.";
+ }
+ res.writeHead(code, {"Content-type" : "text/plain"});
+ res.end(body);
+ if (die) process.exit(0);
+ });
+ }).listen(PORT, "127.0.0.1");
+
+ require("sys").puts("Server started on port " + PORT);
+
+})();
+
diff --git a/componentbuild/shared/macrolib.xml b/componentbuild/shared/macrolib.xml
index 11f4e32..e5d63fe 100644
--- a/componentbuild/shared/macrolib.xml
+++ b/componentbuild/shared/macrolib.xml
@@ -1,376 +1,410 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiMacroLib">
<macrodef name="arrayliteral">
<attribute name="from" />
<attribute name="to" />
<attribute name="key" />
<sequential>
<if>
<and>
<isset property="@{from}" />
<length string="${@{from}}" when="ne" length="0" />
</and>
<then>
<propertyregex property="array"
override="true"
input="${@{from}}"
casesensitive="false"
regexp="([^\,\s]+)"
replace="'\1'"
/>
<property name="@{to}" value="@{key}:[${array}]" />
</then>
</if>
</sequential>
</macrodef>
<macrodef name="createdetails">
<sequential>
<arrayliteral from="component.use" to="component.details.use" key="use" />
<arrayliteral from="component.supersedes" to="component.details.supersedes" key="supersedes" />
<arrayliteral from="component.requires" to="component.details.requires" key="requires" />
<arrayliteral from="component.optional" to="component.details.optional" key="optional" />
<arrayliteral from="component.lang" to="component.details.lang" key="lang" />
<if>
<isset property="component.skinnable" />
<then>
<property name="component.details.skinnable" value="skinnable:${component.skinnable}" />
</then>
</if>
<propertyselector property="details.list"
delimiter=","
match="component\.details.([^\.]*)"
select="\1"
casesensitive="false" />
<var name="details" value="" />
<if>
<isset property="details.list" />
<then>
<for list="${details.list}" param="val">
<sequential>
<var name="details" value="${component.details.@{val}}, ${details}" />
</sequential>
</for>
<propertyregex property="component.details.hash"
input="{${details}}"
regexp="(\,\s*?\})"
replace="}"
casesensitive="false" />
</then>
<else>
<property name="component.details.hash" value="" />
</else>
</if>
</sequential>
</macrodef>
<taskdef
name="jscompressor"
classname="com.yahoo.platform.yui.compressor.ant.JavaScriptCompressorTask"
classpath="${yuicompressor.jar}"/>
<taskdef
name="csscompressor"
classname="com.yahoo.platform.yui.compressor.ant.CssCompressorTask"
classpath="${yuicompressor.jar}"/>
<macrodef name="yuicompress">
<attribute name="src" />
<attribute name="dest" />
<attribute name="args" /> <!-- not used anymore -->
<attribute name="type" default="js"/>
<sequential>
- <echo level="info">Running yuicompressor on @{src}</echo>
<if>
<equals arg1="@{type}" arg2="css"/>
<then>
- <csscompressor srcfile="@{src}" destfile="@{dest}" charset="${yuicompressor.css.charset}" verbose="${yuicompressor.css.verbose}"/>
+ <csscompressor srcfile="@{src}" destfile="@{dest}" linebreak="${yuicompressor.linebreak}" charset="${yuicompressor.css.charset}" verbose="${yuicompressor.css.verbose}"/>
</then>
<else>
- <jscompressor srcfile="@{src}" destfile="@{dest}" charset="${yuicompressor.js.charset}" verbose="${yuicompressor.js.verbose}"/>
+ <jscompressor srcfile="@{src}" destfile="@{dest}" linebreak="${yuicompressor.linebreak}" preservesemicolons="true" disableoptimizations="true" charset="${yuicompressor.js.charset}" verbose="${yuicompressor.js.verbose}"/>
</else>
</if>
</sequential>
</macrodef>
<macrodef name="concatsource">
<attribute name="destfile" />
<attribute name="sourcedir" />
<attribute name="sourcefiles" />
<attribute name="workingdir" default="${workingdir}" />
<element name="filters" optional="true" description="Additonal filters to apply to individual files"/>
<sequential>
<echo level="info">Concatenating</echo>
<echo level="info"> Source Files : @{sourcefiles}</echo>
<echo level="info"> In Source Dir : @{sourcedir}</echo>
<echo level="info"> To : @{destfile}</echo>
<delete dir="@{workingdir}" quiet="true"/>
<copy todir="@{workingdir}">
<filelist dir="@{sourcedir}" files="@{sourcefiles}" />
<filterchain>
<filters />
<fixcrlf fixlast="true" eof="remove"/>
</filterchain>
</copy>
<concat destfile="@{destfile}" fixlastline="true">
<filelist dir="@{workingdir}" files="@{sourcefiles}" />
</concat>
<delete dir="${workingdir}" quiet="true" />
</sequential>
</macrodef>
<if>
<isset property="jslint.skip"/>
<then>
<macrodef name="jslint">
<element name="jsfiles" optional="false" />
<sequential>
<echo level="info">Skipping JSLint</echo>
</sequential>
</macrodef>
</then>
<else>
<!-- By default, jslint failure should fail the build.
This can be overridden on the command line. -->
<property name="jslint.failonerror" value="true"/>
-
+
+ <!-- Try to start the node jslint server. -->
+ <exec executable="node" spawn="true">
+ <arg value="${builddir}/lib/jslint/jslint-node.js"/>
+ </exec>
+
+ <property name="node.jslint.url" value="http://127.0.0.1:8081/"/>
+<!--
+ <echo level="info">Waiting for node server spinup...</echo>
+ <sleep milliseconds="500"/>
+-->
+
<macrodef name="jslint">
<element name="jsfiles" optional="false" />
<sequential>
- <!--
- Need to find a way to convert fileset to args (script?) to
- avoid ' ', which will break for files with ' in them
-
- Evaluates to the following java execution line...
- java -r js.jar jslintconsole.js 'file1.js' 'file2.js' 'file3.js'
- -->
<pathconvert pathsep="' '" property="jsfileargs">
<jsfiles />
</pathconvert>
-
- <java jar="${rhino.jar}" fork="true" failonerror="${jslint.failonerror}">
- <arg file="${jslintconsole.js}" />
- <arg value="${jslintsrc.js}" />
- <arg line="'${jsfileargs}'" />
- </java>
-
+ <if>
+ <http url="${node.jslint.url}"/>
+ <then>
+ <echo>Using NodeJS</echo>
+ <foreach list="${jsfileargs}" delimiter="' '" target="-jslint-nodejs" param="node.jslint.filename"/>
+ </then>
+ <else>
+ <echo>Using Rhino</echo>
+ <!--
+ Need to find a way to convert fileset to args (script?) to
+ avoid ' ', which will break for files with ' in them
+
+ Evaluates to the following java execution line...
+ java -r js.jar jslintconsole.js 'file1.js' 'file2.js' 'file3.js'
+ -->
+
+ <java jar="${rhino.jar}" fork="true" failonerror="${jslint.failonerror}">
+ <arg file="${jslintconsole.js}" />
+ <arg value="${jslintsrc.js}" />
+ <arg line="'${jsfileargs}'" />
+ </java>
+ </else>
+ </if>
</sequential>
</macrodef>
</else>
</if>
<macrodef name="registerversion">
<attribute name="module" />
<attribute name="classname" />
<attribute name="file" />
<sequential>
<loadfile srcfile="${builddir}/files/versioncode.txt" property="@{module}-@{classname}-version" >
<filterchain>
<replacetokens>
<token key="MODULE" value="@{module}"/>
<token key="CLASSNAME" value="@{classname}"/>
</replacetokens>
</filterchain>
</loadfile>
<echo level="info">Adding Version Registration Code to @{file}</echo>
<concat destfile="@{file}" append="true" fixlastline="true">${@{module}-@{classname}-version}</concat>
</sequential>
</macrodef>
<macrodef name="addlang">
<attribute name="dir" />
<attribute name="module" />
<attribute name="dest" />
<attribute name="lang" default="" />
<attribute name="details" default = ""/>
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}@{lang}_details" value="" />
</then>
<else>
<property name="@{module}@{lang}_details" value=",@{details}" />
</else>
</if>
<if>
<equals arg1="@{lang}" arg2="" />
<then>
<property name="@{module}@{lang}_fullname" value="@{module}" />
</then>
<else>
<property name="@{module}@{lang}_fullname" value="@{module}_@{lang}" />
</else>
</if>
<if>
<available file="@{dir}/${@{module}@{lang}_fullname}.pres" />
<then>
<mkdir dir="${component.langbuilddir}" />
<java jar="${rhino.jar}" fork="true" failonerror="true">
<jvmarg value="-Dfile.encoding=utf-8" />
<arg file="${yrb2jsonconsole.js}" />
<arg file="${yrb2jsonsrc.js}" />
<arg file="@{dir}/${@{module}@{lang}_fullname}.pres" />
<arg file="${component.langbuilddir}/${@{module}@{lang}_fullname}.js" />
</java>
<echo level="info">Wrapping ${component.langbuilddir}/${@{module}@{lang}_fullname}.js in YUI.add, Y.Intl.add</echo>
<loadfile srcfile="${component.langbuilddir}/${@{module}@{lang}_fullname}.js" property="@{module}@{lang}-strs-loaded" encoding="utf-8" />
</then>
<else>
<echo level="info">Wrapping @{dir}/${@{module}@{lang}_fullname}.js in YUI.add, Y.Intl.add</echo>
<loadfile srcfile="@{dir}/${@{module}@{lang}_fullname}.js" property="@{module}@{lang}-strs-loaded" encoding="utf-8" />
</else>
</if>
<copy file="${builddir}/files/langtemplate.txt" tofile="@{dest}/${@{module}@{lang}_fullname}.js" overwrite="true" outputencoding="utf-8">
<filterset>
<filter token="LANG" value="@{lang}" />
<filter token="LANG_MODULE" value="lang/${@{module}@{lang}_fullname}" />
<filter token="STRINGS" value="${@{module}@{lang}-strs-loaded}" />
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}" />
<filter token="LANG_DETAILS" value="${@{module}@{lang}_details}" />
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addmodule">
<attribute name="file" />
<attribute name="module" />
<attribute name="details" default="" />
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}-details" value="" />
</then>
<else>
<property name="@{module}-details" value=",@{details}" />
</else>
</if>
<loadfile srcfile="@{file}" property="@{module}-@{file}-code" />
<echo level="info">Wrapping @{file} in YUI.add module</echo>
<copy file="${builddir}/files/moduletemplate.txt" tofile="@{file}" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{file}-code}" />
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}" />
<filter token="DETAILS" value="${@{module}-details}" />
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addrollup">
<attribute name="file" />
<attribute name="module" />
<attribute name="details" default="" />
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}-details" value="" />
</then>
<else>
<property name="@{module}-details" value=",@{details}" />
</else>
</if>
<loadfile srcfile="@{file}" property="@{module}-@{file}-code" />
<echo level="info">Adding Rollup @{file} using YUI.add</echo>
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{file}" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{file}-code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}"/>
<filter token="DETAILS" value="${@{module}-details}"/>
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addlangrollup">
<attribute name="module" />
<attribute name="dir" />
<sequential>
<echo level="info">Registering rollup info for lang files in @{dir} using YUI.add</echo>
<for list="${component.rollup.lang}" param="lang" trim="true">
<sequential>
<loadfile srcfile="@{dir}/@{module}_@{lang}.js" property="@{module}-@{lang}-code" />
<var name="lang.use" value="{use:[" />
<for list="${component.lang.use}" param="submod" trim="true">
<sequential>
<var name="lang.use" value="${lang.use}'lang/@{submod}_@{lang}'," />
</sequential>
</for>
<var name="lang.use" value="${lang.use}]}" />
<propertyregex property="@{module}-@{lang}-details"
input="${lang.use}"
regexp="(\,\s*?\])"
replace="]"
casesensitive="false" />
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{dir}/@{module}_@{lang}.js" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{lang}-code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="lang/@{module}_@{lang}"/>
<filter token="DETAILS" value=", ${@{module}-@{lang}-details}"/>
</filterset>
</copy>
</sequential>
</for>
<loadfile srcfile="@{dir}/@{module}.js" property="@{module}--code" />
<var name="lang.use" value="{use:[" />
<for list="${component.lang.use}" param="submod" trim="true">
<sequential>
<var name="lang.use" value="${lang.use}'lang/@{submod}'," />
</sequential>
</for>
<var name="lang.use" value="${lang.use}]}" />
<propertyregex property="@{module}--details"
input="${lang.use}"
regexp="(\,\s*?\])"
replace="]"
casesensitive="false" />
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{dir}/@{module}.js" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}--code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="lang/@{module}"/>
<filter token="DETAILS" value=", ${@{module}--details}"/>
</filterset>
</copy>
</sequential>
</macrodef>
+
+ <target name="-jslint-nodejs">
+ <if>
+ <length file="${node.jslint.filename}" when="greater" length="0"/>
+ <then>
+ <loadfile property="node.jslint.file" srcFile="${node.jslint.filename}"/>
+ <post to="${node.jslint.url}" property="node.jslint.response" failonerror="#{jslint.failonerror}">
+ <prop name="data" value="${node.jslint.file}"/>
+ </post>
+ </then>
+ </if>
+ <var name="node.jslint.file" unset="true"/>
+ <var name="node.jslint.filename" unset="true"/>
+ <var name="node.jslint.response" unset="true"/>
+ </target>
</project>
diff --git a/componentbuild/shared/properties.xml b/componentbuild/shared/properties.xml
index 3517ce0..31f4fe3 100644
--- a/componentbuild/shared/properties.xml
+++ b/componentbuild/shared/properties.xml
@@ -1,158 +1,160 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiSharedProperties">
<!-- ANT contrib library for loops, if/else support, with property fix for FOR task -->
<taskdef resource="antcontrib.properties">
<classpath>
<pathelement location="${builddir}/lib/ant-contrib/ant-contrib-1.0b3-modified.jar" />
</classpath>
</taskdef>
<dirname property="buildfile.dir" file="${ant.file}" />
<!--
builddir : The path to the builder/componentbuild directory from the component build file
srcdir : The path to top of the project source directory (e.g. yui2) from the component build file
-->
<property name="builddir" location="../../../builder/componentbuild" />
<property name="srcdir" location="../.." />
<!-- buildfiles.eol : End of line char to use for built files -->
<property name="buildfiles.eol" value="lf"/>
<!-- Supporting Tools -->
<property name="rhino.jar" location="${builddir}/lib/rhino/js.jar" />
<property name="jslintconsole.js" location="${builddir}/lib/jslint/jslint-console.js" />
<property name="jslintsrc.js" location="${builddir}/lib/jslint/fulljslint.js" />
<property name="yuicompressor.jar" location="${builddir}/lib/yuicompressor/yuicompressor-2.4.3-dinoboff.jar" />
<property name="yrb2jsonconsole.js" location="${builddir}/lib/yrb2json/yrb2json-console.js" />
<property name="yrb2jsonsrc.js" location="${builddir}/lib/yrb2json/yrb2json.js" />
<!-- YUI Compressor arguments for JS and CSS files -->
+ <property name="yuicompressor.linebreak" value="6000" />
+
<property name="yuicompressor.css.args" value="--type css --line-break 6000" />
<property name="yuicompressor.js.args" value="--disable-optimizations --preserve-semi --line-break 6000" />
<property name="yuicompressor.js.charset" value="utf-8" />
<property name="yuicompressor.css.charset" value="utf-8" />
<!-- Enable/Disable YUI Compressor verbosity. NOTE: Checked in build files should not disable this flag -->
<property name="yuicompressor.js.verbose" value="true" />
<property name="yuicompressor.css.verbose" value="true" />
<condition property="yuicompressor.js.args.internal" value="-v --charset ${yuicompressor.js.charset} ${yuicompressor.js.args}" else="--charset ${yuicompressor.js.charset} ${yuicompressor.js.args}">
<istrue value="${yuicompressor.js.verbose}" />
</condition>
<condition property="yuicompressor.css.args.internal" value="-v --charset ${yuicompressor.css.charset} ${yuicompressor.css.args}" else="--charset ${yuicompressor.css.charset} ${yuicompressor.css.args}">
<istrue value="${yuicompressor.css.verbose}" />
</condition>
<!-- Top Level Build Directories (e.g. yui2/build, yui3/build)-->
<property name="global.build.base" location="${srcdir}/build" />
<property name="global.build.component" location="${global.build.base}/${component}" />
<property name="global.build.component.assets" location="${global.build.component}/assets" />
<!-- Component Properties -->
<property name="component.module" value="${component}" />
<property name="component.basedir" location="${buildfile.dir}" />
<property name="component.jsfiles.base" location="${component.basedir}/js" />
<property name="component.lang.base" location="${component.basedir}/lang" />
<property name="component.assets.flatten" value="true" />
<property name="component.assets.base" location="${component.basedir}/assets" />
<property name="component.assets.files" value="**/*" />
<property name="component.assets.legacy.flatten" value="true" />
<property name="component.assets.legacy.base" location="${component.assets.base}/legacy" />
<property name="component.assets.legacy.files" value="**/*" />
<property name="component.assets.skins.base" location="${component.assets.base}/skins" />
<property name="component.assets.skins.files" value="**/*" />
<condition property="component.skins.exist">
<and>
<available file="${component.assets.base}/${component}-core.css" type="file" />
<available file="${component.assets.base}/skins" type="dir" />
</and>
</condition>
<!-- component is part of a rollup build, so rollup skins to parent -->
<condition property="rollupskins">
<and>
<istrue value="${rollup}" />
<istrue value="${component.skins.exist}" />
</and>
</condition>
<available file="${component.assets.base}" type="dir" property="component.assets.exist"/>
<condition property="component.langs.exist">
<and>
<or>
<isset property="component.lang" />
<isset property="component.rollup.lang" />
</or>
</and>
</condition>
<condition property="rolluplangs">
<and>
<istrue value="${rollup}" />
<istrue value="${component.langs.exist}" />
</and>
</condition>
<!--
DEPRECATED: component.basefilename and component.releasetype are deprecated
We used to mark filenames with suffixes (-beta, -experimental), which we no longer do
-->
<condition property="component.basefilename" value="${component}" else="${component}">
<isset property="component.releasetype"/>
</condition>
<!-- Default logger regex values if not provided -->
<property name="component.logger.regex" value="^.*?(?:logger|YAHOO.log).*?(?:;|\).*;|(?:\r?\n.*?)*?\).*;).*;?.*?\r?\n" />
<property name="component.logger.regex.replace" value="" />
<property name="component.logger.regex.flags" value="mg" />
<property name="component.logger.regex.byline" value="false" />
<!-- Rollup support, currently only used for YUI 3 -->
<property name="component.rollup" value="false"/>
<property name="component.rollup.target" value="all"/>
<condition property="component.builddir" value="${component.basedir}/build_rollup_tmp" else="${component.basedir}/build_tmp">
<istrue value="${component.rollup}"/>
</condition>
<condition property="rollup.skins.exist">
<and>
<istrue value="${component.rollup}" />
<available file="${component.assets.base}/skins" type="dir" />
</and>
</condition>
<condition property="skins.exist">
<or>
<istrue value="${rollup.skins.exist}" />
<istrue value="${component.skins.exist}" />
</or>
</condition>
<!-- The temporary working directory used by the build process -->
<property name="workingdir" location="${component.builddir}/ant" />
<!-- Directory for language resource bundles in JSON format derived from YRB format -->
<property name="component.langbuilddir" value="${component.basedir}/build_lang_tmp" />
<!-- The file which defines the default targets for the particular type of component (module, rollup, css) -->
<condition property="targetbase" value="rollup" else="module">
<istrue value="${component.rollup}"/>
</condition>
<condition property="targets" value="../shared/cssmodule.xml" else="${targetbase}.xml">
<isset property="component.cssfiles" />
</condition>
</project>
|
yui/builder
|
6cd837556639ebec46b313e75479f23e6defee06
|
Support for CSS compression.
|
diff --git a/componentbuild/3.x/module.xml b/componentbuild/3.x/module.xml
index 8bfb8d1..e0ba31b 100644
--- a/componentbuild/3.x/module.xml
+++ b/componentbuild/3.x/module.xml
@@ -1,108 +1,108 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiModuleTargets">
<dirname property="module.basedir" file="${ant.file.YuiModuleTargets}"/>
<import file="${module.basedir}/../shared/targets.xml" description="Targets common to Rollup/Module" />
<target name="build" depends="buildcore, -rollupjs, buildskins, buildlangs" />
<target name="buildskins" depends="-buildskins, -rollupcss" />
<target name="buildlangs" depends="-buildlangs, -rolluplangs" />
<!-- CORE -->
<target name="buildcore" depends="builddebug, -createcore, -loggerregex" description="Create component.js">
<fixcrlf srcdir="${component.builddir}" includes="${component.basefilename}.js" eol="${buildfiles.eol}" />
</target>
<target name="-createcore">
<copy file="${component.builddir}/${component.basefilename}-debug.js" tofile="${component.builddir}/${component.basefilename}.js" />
</target>
<target name="-loggerregex" description="Replace logger statements" unless="component.logger.regex.skip">
<echo level="info">Replacing Logger Statements in ${component.builddir}/${component.basefilename}.js</echo>
<replaceregexp file="${component.builddir}/${component.basefilename}.js"
byline="${component.logger.regex.byline}"
match="${component.logger.regex}"
replace="${component.logger.regex.replace}"
flags="${component.logger.regex.flags}" />
</target>
<!-- DEBUG -->
<target name="builddebug" depends="-concatdebug, -registerdebug, -prependdebug, -appenddebug" description="Create component-debug.js">
<fixcrlf srcdir="${component.builddir}" includes="${component.basefilename}-debug.js" eol="${buildfiles.eol}" />
</target>
<target name="-concatdebug">
<concatsource destfile="${component.builddir}/${component.basefilename}-debug.js" sourcedir="${component.jsfiles.base}" sourcefiles="${component.jsfiles}" />
</target>
<target name="-registerdebug" unless="register.skip">
<addmodule module="${component.module}" file="${component.builddir}/${component.basefilename}-debug.js" details="${component.details.hash}" />
</target>
<target name="-rollupjs" if="rollup">
<if>
<isset property="rollup.sub"/>
<then>
<echo level="info">Module: Build a rollup of a rollup; moving rollup.sub properties into rollup properties.</echo>
<var name="rollup.builddir" unset="true"/>
<var name="rollup.component" unset="true"/>
<var name="rollup.component.basefilename" unset="true"/>
<propertycopy name="rollup.builddir" from="rollup.sub.builddir"/>
<propertycopy name="rollup.component" from="rollup.sub.component"/>
<propertycopy name="rollup.component.basefilename" from="rollup.sub.component.basefilename"/>
</then>
</if>
<echo level="info">Module: Rolling up ${component.basefilename}-debug.js into ${rollup.component.basefilename}-debug.js</echo>
<concat destfile="${rollup.builddir}/${rollup.component.basefilename}.js" append="true" fixlastline="true">
<filelist dir="${component.builddir}" files="${component.basefilename}.js" />
</concat>
<concat destfile="${rollup.builddir}/${rollup.component.basefilename}-debug.js" append="true" fixlastline="true">
<filelist dir="${component.builddir}" files="${component.basefilename}-debug.js" />
</concat>
</target>
<!-- SKINS -->
<target name="-buildskins" depends="-concatskins" description="Create skin rollup in local component build directory" if="component.skins.exist">
<fixcrlf srcdir="${component.builddir}/assets/skins/sam" includes="${component}.css" eol="${buildfiles.eol}" />
</target>
<target name="-buildlangs" description="Create language packs in the local component build directory" if="component.langs.exist">
<mkdir dir="${component.builddir}/lang" />
<for list="${component.lang}" param="lang" trim="true">
<sequential>
<addlang dir="${component.lang.base}" module="${component}" lang="@{lang}" dest="${component.builddir}/lang" />
</sequential>
</for>
<addlang dir="${component.lang.base}" module="${component}" lang="" dest="${component.builddir}/lang/" />
</target>
<target name="-rolluplangs" if="rolluplangs">
<for list="${component.lang}" param="lang" trim="true">
<sequential>
<concat destfile="${rollup.builddir}/lang/${rollup.component}_@{lang}.js" append="true" fixlastline="true">
<fileset dir="${component.builddir}/lang" includes="*_@{lang}.js" />
</concat>
</sequential>
</for>
<concat destfile="${rollup.builddir}/lang/${rollup.component}.js" append="true" fixlastline="true">
<filelist dir="${component.builddir}/lang" files="${component}.js" />
</concat>
</target>
<target name="-concatskins" if="component.skins.exist">
<concatsource destfile="${component.builddir}/assets/skins/sam/${component}.css" sourcedir="${component.assets.base}" sourcefiles="${component}-core.css, skins/sam/${component}-skin.css" />
- <yuicompress src="${component.builddir}/assets/skins/sam/${component}.css" dest="${component.builddir}/assets/skins/sam/${component}.css" args="${yuicompressor.css.args.internal}" />
+ <yuicompress type="css" src="${component.builddir}/assets/skins/sam/${component}.css" dest="${component.builddir}/assets/skins/sam/${component}.css" args="${yuicompressor.css.args.internal}" />
</target>
<target name="-rollupcss" if="rollupskins">
<echo level="info">Rolling up ${component}.css into ${rollup.component}.css</echo>
<concat destfile="${rollup.builddir}/assets/skins/sam/${rollup.component}.css" append="true" fixlastline="true">
<filelist dir="${component.builddir}/assets/skins/sam" files="${component}.css" />
</concat>
</target>
</project>
diff --git a/componentbuild/shared/cssmodule.xml b/componentbuild/shared/cssmodule.xml
index 54ac37d..a20d362 100644
--- a/componentbuild/shared/cssmodule.xml
+++ b/componentbuild/shared/cssmodule.xml
@@ -1,27 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiCssModuleTargets">
<dirname property="cssmodule.basedir" file="${ant.file.YuiCssModuleTargets}"/>
<import file="${cssmodule.basedir}/../shared/targets.xml" description="Targets common to Rollup/Module" />
<target name="build" depends="buildcore" />
<target name="buildcore">
<concatsource destfile="${component.builddir}/${component}.css" sourcedir="${component.basedir}/css" sourcefiles="${component.cssfiles}" />
</target>
<target name="minify">
- <yuicompress src="${component.builddir}/${component}.css" dest="${component.builddir}/${component}-min.css" args="${yuicompressor.css.args.internal}" />
+ <yuicompress type="css" src="${component.builddir}/${component}.css" dest="${component.builddir}/${component}-min.css" args="${yuicompressor.css.args.internal}" />
</target>
<target name="lint">
<!-- TODO : CSS Lint support. Currently need to add @charset "UTF-8";-->
</target>
<target name="deploybuild" description="Copy built files to global build location">
<copy todir="${global.build.component}" preservelastmodified="true">
<fileset dir="${component.builddir}" includes="*.css" />
</copy>
</target>
</project>
diff --git a/componentbuild/shared/macrolib.xml b/componentbuild/shared/macrolib.xml
index 3ed78b8..11f4e32 100644
--- a/componentbuild/shared/macrolib.xml
+++ b/componentbuild/shared/macrolib.xml
@@ -1,368 +1,376 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiMacroLib">
<macrodef name="arrayliteral">
<attribute name="from" />
<attribute name="to" />
<attribute name="key" />
<sequential>
<if>
<and>
<isset property="@{from}" />
<length string="${@{from}}" when="ne" length="0" />
</and>
<then>
<propertyregex property="array"
override="true"
input="${@{from}}"
casesensitive="false"
regexp="([^\,\s]+)"
replace="'\1'"
/>
<property name="@{to}" value="@{key}:[${array}]" />
</then>
</if>
</sequential>
</macrodef>
<macrodef name="createdetails">
<sequential>
<arrayliteral from="component.use" to="component.details.use" key="use" />
<arrayliteral from="component.supersedes" to="component.details.supersedes" key="supersedes" />
<arrayliteral from="component.requires" to="component.details.requires" key="requires" />
<arrayliteral from="component.optional" to="component.details.optional" key="optional" />
<arrayliteral from="component.lang" to="component.details.lang" key="lang" />
<if>
<isset property="component.skinnable" />
<then>
<property name="component.details.skinnable" value="skinnable:${component.skinnable}" />
</then>
</if>
<propertyselector property="details.list"
delimiter=","
match="component\.details.([^\.]*)"
select="\1"
casesensitive="false" />
<var name="details" value="" />
<if>
<isset property="details.list" />
<then>
<for list="${details.list}" param="val">
<sequential>
<var name="details" value="${component.details.@{val}}, ${details}" />
</sequential>
</for>
<propertyregex property="component.details.hash"
input="{${details}}"
regexp="(\,\s*?\})"
replace="}"
casesensitive="false" />
</then>
<else>
<property name="component.details.hash" value="" />
</else>
</if>
</sequential>
</macrodef>
<taskdef
name="jscompressor"
classname="com.yahoo.platform.yui.compressor.ant.JavaScriptCompressorTask"
classpath="${yuicompressor.jar}"/>
<taskdef
name="csscompressor"
classname="com.yahoo.platform.yui.compressor.ant.CssCompressorTask"
classpath="${yuicompressor.jar}"/>
<macrodef name="yuicompress">
<attribute name="src" />
<attribute name="dest" />
- <attribute name="args" />
-
+ <attribute name="args" /> <!-- not used anymore -->
+ <attribute name="type" default="js"/>
<sequential>
- <echo level="info">Running yuicompressor [js] on @{src}</echo>
- <jscompressor srcfile="@{src}" destfile="@{dest}" charset="${yuicompressor.js.charset}" verbose="${yuicompressor.js.verbose}"/>
+ <echo level="info">Running yuicompressor on @{src}</echo>
+ <if>
+ <equals arg1="@{type}" arg2="css"/>
+ <then>
+ <csscompressor srcfile="@{src}" destfile="@{dest}" charset="${yuicompressor.css.charset}" verbose="${yuicompressor.css.verbose}"/>
+ </then>
+ <else>
+ <jscompressor srcfile="@{src}" destfile="@{dest}" charset="${yuicompressor.js.charset}" verbose="${yuicompressor.js.verbose}"/>
+ </else>
+ </if>
</sequential>
</macrodef>
<macrodef name="concatsource">
<attribute name="destfile" />
<attribute name="sourcedir" />
<attribute name="sourcefiles" />
<attribute name="workingdir" default="${workingdir}" />
<element name="filters" optional="true" description="Additonal filters to apply to individual files"/>
<sequential>
<echo level="info">Concatenating</echo>
<echo level="info"> Source Files : @{sourcefiles}</echo>
<echo level="info"> In Source Dir : @{sourcedir}</echo>
<echo level="info"> To : @{destfile}</echo>
<delete dir="@{workingdir}" quiet="true"/>
<copy todir="@{workingdir}">
<filelist dir="@{sourcedir}" files="@{sourcefiles}" />
<filterchain>
<filters />
<fixcrlf fixlast="true" eof="remove"/>
</filterchain>
</copy>
<concat destfile="@{destfile}" fixlastline="true">
<filelist dir="@{workingdir}" files="@{sourcefiles}" />
</concat>
<delete dir="${workingdir}" quiet="true" />
</sequential>
</macrodef>
<if>
<isset property="jslint.skip"/>
<then>
<macrodef name="jslint">
<element name="jsfiles" optional="false" />
<sequential>
<echo level="info">Skipping JSLint</echo>
</sequential>
</macrodef>
</then>
<else>
<!-- By default, jslint failure should fail the build.
This can be overridden on the command line. -->
<property name="jslint.failonerror" value="true"/>
<macrodef name="jslint">
<element name="jsfiles" optional="false" />
<sequential>
<!--
Need to find a way to convert fileset to args (script?) to
avoid ' ', which will break for files with ' in them
Evaluates to the following java execution line...
java -r js.jar jslintconsole.js 'file1.js' 'file2.js' 'file3.js'
-->
<pathconvert pathsep="' '" property="jsfileargs">
<jsfiles />
</pathconvert>
<java jar="${rhino.jar}" fork="true" failonerror="${jslint.failonerror}">
<arg file="${jslintconsole.js}" />
<arg value="${jslintsrc.js}" />
<arg line="'${jsfileargs}'" />
</java>
</sequential>
</macrodef>
</else>
</if>
<macrodef name="registerversion">
<attribute name="module" />
<attribute name="classname" />
<attribute name="file" />
<sequential>
<loadfile srcfile="${builddir}/files/versioncode.txt" property="@{module}-@{classname}-version" >
<filterchain>
<replacetokens>
<token key="MODULE" value="@{module}"/>
<token key="CLASSNAME" value="@{classname}"/>
</replacetokens>
</filterchain>
</loadfile>
<echo level="info">Adding Version Registration Code to @{file}</echo>
<concat destfile="@{file}" append="true" fixlastline="true">${@{module}-@{classname}-version}</concat>
</sequential>
</macrodef>
<macrodef name="addlang">
<attribute name="dir" />
<attribute name="module" />
<attribute name="dest" />
<attribute name="lang" default="" />
<attribute name="details" default = ""/>
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}@{lang}_details" value="" />
</then>
<else>
<property name="@{module}@{lang}_details" value=",@{details}" />
</else>
</if>
<if>
<equals arg1="@{lang}" arg2="" />
<then>
<property name="@{module}@{lang}_fullname" value="@{module}" />
</then>
<else>
<property name="@{module}@{lang}_fullname" value="@{module}_@{lang}" />
</else>
</if>
<if>
<available file="@{dir}/${@{module}@{lang}_fullname}.pres" />
<then>
<mkdir dir="${component.langbuilddir}" />
<java jar="${rhino.jar}" fork="true" failonerror="true">
<jvmarg value="-Dfile.encoding=utf-8" />
<arg file="${yrb2jsonconsole.js}" />
<arg file="${yrb2jsonsrc.js}" />
<arg file="@{dir}/${@{module}@{lang}_fullname}.pres" />
<arg file="${component.langbuilddir}/${@{module}@{lang}_fullname}.js" />
</java>
<echo level="info">Wrapping ${component.langbuilddir}/${@{module}@{lang}_fullname}.js in YUI.add, Y.Intl.add</echo>
<loadfile srcfile="${component.langbuilddir}/${@{module}@{lang}_fullname}.js" property="@{module}@{lang}-strs-loaded" encoding="utf-8" />
</then>
<else>
<echo level="info">Wrapping @{dir}/${@{module}@{lang}_fullname}.js in YUI.add, Y.Intl.add</echo>
<loadfile srcfile="@{dir}/${@{module}@{lang}_fullname}.js" property="@{module}@{lang}-strs-loaded" encoding="utf-8" />
</else>
</if>
<copy file="${builddir}/files/langtemplate.txt" tofile="@{dest}/${@{module}@{lang}_fullname}.js" overwrite="true" outputencoding="utf-8">
<filterset>
<filter token="LANG" value="@{lang}" />
<filter token="LANG_MODULE" value="lang/${@{module}@{lang}_fullname}" />
<filter token="STRINGS" value="${@{module}@{lang}-strs-loaded}" />
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}" />
<filter token="LANG_DETAILS" value="${@{module}@{lang}_details}" />
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addmodule">
<attribute name="file" />
<attribute name="module" />
<attribute name="details" default="" />
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}-details" value="" />
</then>
<else>
<property name="@{module}-details" value=",@{details}" />
</else>
</if>
<loadfile srcfile="@{file}" property="@{module}-@{file}-code" />
<echo level="info">Wrapping @{file} in YUI.add module</echo>
<copy file="${builddir}/files/moduletemplate.txt" tofile="@{file}" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{file}-code}" />
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}" />
<filter token="DETAILS" value="${@{module}-details}" />
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addrollup">
<attribute name="file" />
<attribute name="module" />
<attribute name="details" default="" />
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}-details" value="" />
</then>
<else>
<property name="@{module}-details" value=",@{details}" />
</else>
</if>
<loadfile srcfile="@{file}" property="@{module}-@{file}-code" />
<echo level="info">Adding Rollup @{file} using YUI.add</echo>
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{file}" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{file}-code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}"/>
<filter token="DETAILS" value="${@{module}-details}"/>
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addlangrollup">
<attribute name="module" />
<attribute name="dir" />
<sequential>
<echo level="info">Registering rollup info for lang files in @{dir} using YUI.add</echo>
<for list="${component.rollup.lang}" param="lang" trim="true">
<sequential>
<loadfile srcfile="@{dir}/@{module}_@{lang}.js" property="@{module}-@{lang}-code" />
<var name="lang.use" value="{use:[" />
<for list="${component.lang.use}" param="submod" trim="true">
<sequential>
<var name="lang.use" value="${lang.use}'lang/@{submod}_@{lang}'," />
</sequential>
</for>
<var name="lang.use" value="${lang.use}]}" />
<propertyregex property="@{module}-@{lang}-details"
input="${lang.use}"
regexp="(\,\s*?\])"
replace="]"
casesensitive="false" />
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{dir}/@{module}_@{lang}.js" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{lang}-code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="lang/@{module}_@{lang}"/>
<filter token="DETAILS" value=", ${@{module}-@{lang}-details}"/>
</filterset>
</copy>
</sequential>
</for>
<loadfile srcfile="@{dir}/@{module}.js" property="@{module}--code" />
<var name="lang.use" value="{use:[" />
<for list="${component.lang.use}" param="submod" trim="true">
<sequential>
<var name="lang.use" value="${lang.use}'lang/@{submod}'," />
</sequential>
</for>
<var name="lang.use" value="${lang.use}]}" />
<propertyregex property="@{module}--details"
input="${lang.use}"
regexp="(\,\s*?\])"
replace="]"
casesensitive="false" />
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{dir}/@{module}.js" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}--code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="lang/@{module}"/>
<filter token="DETAILS" value=", ${@{module}--details}"/>
</filterset>
</copy>
</sequential>
</macrodef>
</project>
|
yui/builder
|
018f7b500544f6eedaabcc856997d4ee1d94a9ef
|
Add jslint.skip property.
|
diff --git a/componentbuild/shared/macrolib.xml b/componentbuild/shared/macrolib.xml
index d66df0e..3ed78b8 100644
--- a/componentbuild/shared/macrolib.xml
+++ b/componentbuild/shared/macrolib.xml
@@ -1,354 +1,368 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiMacroLib">
<macrodef name="arrayliteral">
<attribute name="from" />
<attribute name="to" />
<attribute name="key" />
<sequential>
<if>
<and>
<isset property="@{from}" />
<length string="${@{from}}" when="ne" length="0" />
</and>
<then>
<propertyregex property="array"
override="true"
input="${@{from}}"
casesensitive="false"
regexp="([^\,\s]+)"
replace="'\1'"
/>
<property name="@{to}" value="@{key}:[${array}]" />
</then>
</if>
</sequential>
</macrodef>
<macrodef name="createdetails">
<sequential>
<arrayliteral from="component.use" to="component.details.use" key="use" />
<arrayliteral from="component.supersedes" to="component.details.supersedes" key="supersedes" />
<arrayliteral from="component.requires" to="component.details.requires" key="requires" />
<arrayliteral from="component.optional" to="component.details.optional" key="optional" />
<arrayliteral from="component.lang" to="component.details.lang" key="lang" />
<if>
<isset property="component.skinnable" />
<then>
<property name="component.details.skinnable" value="skinnable:${component.skinnable}" />
</then>
</if>
<propertyselector property="details.list"
delimiter=","
match="component\.details.([^\.]*)"
select="\1"
casesensitive="false" />
<var name="details" value="" />
<if>
<isset property="details.list" />
<then>
<for list="${details.list}" param="val">
<sequential>
<var name="details" value="${component.details.@{val}}, ${details}" />
</sequential>
</for>
<propertyregex property="component.details.hash"
input="{${details}}"
regexp="(\,\s*?\})"
replace="}"
casesensitive="false" />
</then>
<else>
<property name="component.details.hash" value="" />
</else>
</if>
</sequential>
</macrodef>
<taskdef
name="jscompressor"
classname="com.yahoo.platform.yui.compressor.ant.JavaScriptCompressorTask"
classpath="${yuicompressor.jar}"/>
<taskdef
name="csscompressor"
classname="com.yahoo.platform.yui.compressor.ant.CssCompressorTask"
classpath="${yuicompressor.jar}"/>
<macrodef name="yuicompress">
<attribute name="src" />
<attribute name="dest" />
<attribute name="args" />
<sequential>
<echo level="info">Running yuicompressor [js] on @{src}</echo>
<jscompressor srcfile="@{src}" destfile="@{dest}" charset="${yuicompressor.js.charset}" verbose="${yuicompressor.js.verbose}"/>
</sequential>
</macrodef>
<macrodef name="concatsource">
<attribute name="destfile" />
<attribute name="sourcedir" />
<attribute name="sourcefiles" />
<attribute name="workingdir" default="${workingdir}" />
<element name="filters" optional="true" description="Additonal filters to apply to individual files"/>
<sequential>
<echo level="info">Concatenating</echo>
<echo level="info"> Source Files : @{sourcefiles}</echo>
<echo level="info"> In Source Dir : @{sourcedir}</echo>
<echo level="info"> To : @{destfile}</echo>
<delete dir="@{workingdir}" quiet="true"/>
<copy todir="@{workingdir}">
<filelist dir="@{sourcedir}" files="@{sourcefiles}" />
<filterchain>
<filters />
<fixcrlf fixlast="true" eof="remove"/>
</filterchain>
</copy>
<concat destfile="@{destfile}" fixlastline="true">
<filelist dir="@{workingdir}" files="@{sourcefiles}" />
</concat>
<delete dir="${workingdir}" quiet="true" />
</sequential>
</macrodef>
- <!-- By default, jslint failure should fail the build.
- This can be overridden on the command line. -->
- <property name="jslint.failonerror" value="true"/>
+ <if>
+ <isset property="jslint.skip"/>
+ <then>
+ <macrodef name="jslint">
+ <element name="jsfiles" optional="false" />
+ <sequential>
+ <echo level="info">Skipping JSLint</echo>
+ </sequential>
+ </macrodef>
+ </then>
+ <else>
+ <!-- By default, jslint failure should fail the build.
+ This can be overridden on the command line. -->
+ <property name="jslint.failonerror" value="true"/>
+
+ <macrodef name="jslint">
+ <element name="jsfiles" optional="false" />
- <macrodef name="jslint">
- <element name="jsfiles" optional="false" />
- <sequential>
- <!--
- Need to find a way to convert fileset to args (script?) to
- avoid ' ', which will break for files with ' in them
-
- Evaluates to the following java execution line...
- java -r js.jar jslintconsole.js 'file1.js' 'file2.js' 'file3.js'
- -->
- <pathconvert pathsep="' '" property="jsfileargs">
- <jsfiles />
- </pathconvert>
-
- <java jar="${rhino.jar}" fork="true" failonerror="${jslint.failonerror}">
- <arg file="${jslintconsole.js}" />
- <arg value="${jslintsrc.js}" />
- <arg line="'${jsfileargs}'" />
- </java>
+ <sequential>
+ <!--
+ Need to find a way to convert fileset to args (script?) to
+ avoid ' ', which will break for files with ' in them
+
+ Evaluates to the following java execution line...
+ java -r js.jar jslintconsole.js 'file1.js' 'file2.js' 'file3.js'
+ -->
+ <pathconvert pathsep="' '" property="jsfileargs">
+ <jsfiles />
+ </pathconvert>
+
+ <java jar="${rhino.jar}" fork="true" failonerror="${jslint.failonerror}">
+ <arg file="${jslintconsole.js}" />
+ <arg value="${jslintsrc.js}" />
+ <arg line="'${jsfileargs}'" />
+ </java>
- </sequential>
- </macrodef>
+ </sequential>
+ </macrodef>
+ </else>
+ </if>
<macrodef name="registerversion">
<attribute name="module" />
<attribute name="classname" />
<attribute name="file" />
<sequential>
<loadfile srcfile="${builddir}/files/versioncode.txt" property="@{module}-@{classname}-version" >
<filterchain>
<replacetokens>
<token key="MODULE" value="@{module}"/>
<token key="CLASSNAME" value="@{classname}"/>
</replacetokens>
</filterchain>
</loadfile>
<echo level="info">Adding Version Registration Code to @{file}</echo>
<concat destfile="@{file}" append="true" fixlastline="true">${@{module}-@{classname}-version}</concat>
</sequential>
</macrodef>
<macrodef name="addlang">
<attribute name="dir" />
<attribute name="module" />
<attribute name="dest" />
<attribute name="lang" default="" />
<attribute name="details" default = ""/>
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}@{lang}_details" value="" />
</then>
<else>
<property name="@{module}@{lang}_details" value=",@{details}" />
</else>
</if>
<if>
<equals arg1="@{lang}" arg2="" />
<then>
<property name="@{module}@{lang}_fullname" value="@{module}" />
</then>
<else>
<property name="@{module}@{lang}_fullname" value="@{module}_@{lang}" />
</else>
</if>
<if>
<available file="@{dir}/${@{module}@{lang}_fullname}.pres" />
<then>
<mkdir dir="${component.langbuilddir}" />
<java jar="${rhino.jar}" fork="true" failonerror="true">
<jvmarg value="-Dfile.encoding=utf-8" />
<arg file="${yrb2jsonconsole.js}" />
<arg file="${yrb2jsonsrc.js}" />
<arg file="@{dir}/${@{module}@{lang}_fullname}.pres" />
<arg file="${component.langbuilddir}/${@{module}@{lang}_fullname}.js" />
</java>
<echo level="info">Wrapping ${component.langbuilddir}/${@{module}@{lang}_fullname}.js in YUI.add, Y.Intl.add</echo>
<loadfile srcfile="${component.langbuilddir}/${@{module}@{lang}_fullname}.js" property="@{module}@{lang}-strs-loaded" encoding="utf-8" />
</then>
<else>
<echo level="info">Wrapping @{dir}/${@{module}@{lang}_fullname}.js in YUI.add, Y.Intl.add</echo>
<loadfile srcfile="@{dir}/${@{module}@{lang}_fullname}.js" property="@{module}@{lang}-strs-loaded" encoding="utf-8" />
</else>
</if>
<copy file="${builddir}/files/langtemplate.txt" tofile="@{dest}/${@{module}@{lang}_fullname}.js" overwrite="true" outputencoding="utf-8">
<filterset>
<filter token="LANG" value="@{lang}" />
<filter token="LANG_MODULE" value="lang/${@{module}@{lang}_fullname}" />
<filter token="STRINGS" value="${@{module}@{lang}-strs-loaded}" />
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}" />
<filter token="LANG_DETAILS" value="${@{module}@{lang}_details}" />
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addmodule">
<attribute name="file" />
<attribute name="module" />
<attribute name="details" default="" />
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}-details" value="" />
</then>
<else>
<property name="@{module}-details" value=",@{details}" />
</else>
</if>
<loadfile srcfile="@{file}" property="@{module}-@{file}-code" />
<echo level="info">Wrapping @{file} in YUI.add module</echo>
<copy file="${builddir}/files/moduletemplate.txt" tofile="@{file}" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{file}-code}" />
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}" />
<filter token="DETAILS" value="${@{module}-details}" />
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addrollup">
<attribute name="file" />
<attribute name="module" />
<attribute name="details" default="" />
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}-details" value="" />
</then>
<else>
<property name="@{module}-details" value=",@{details}" />
</else>
</if>
<loadfile srcfile="@{file}" property="@{module}-@{file}-code" />
<echo level="info">Adding Rollup @{file} using YUI.add</echo>
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{file}" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{file}-code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}"/>
<filter token="DETAILS" value="${@{module}-details}"/>
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addlangrollup">
<attribute name="module" />
<attribute name="dir" />
<sequential>
<echo level="info">Registering rollup info for lang files in @{dir} using YUI.add</echo>
<for list="${component.rollup.lang}" param="lang" trim="true">
<sequential>
<loadfile srcfile="@{dir}/@{module}_@{lang}.js" property="@{module}-@{lang}-code" />
<var name="lang.use" value="{use:[" />
<for list="${component.lang.use}" param="submod" trim="true">
<sequential>
<var name="lang.use" value="${lang.use}'lang/@{submod}_@{lang}'," />
</sequential>
</for>
<var name="lang.use" value="${lang.use}]}" />
<propertyregex property="@{module}-@{lang}-details"
input="${lang.use}"
regexp="(\,\s*?\])"
replace="]"
casesensitive="false" />
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{dir}/@{module}_@{lang}.js" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{lang}-code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="lang/@{module}_@{lang}"/>
<filter token="DETAILS" value=", ${@{module}-@{lang}-details}"/>
</filterset>
</copy>
</sequential>
</for>
<loadfile srcfile="@{dir}/@{module}.js" property="@{module}--code" />
<var name="lang.use" value="{use:[" />
<for list="${component.lang.use}" param="submod" trim="true">
<sequential>
<var name="lang.use" value="${lang.use}'lang/@{submod}'," />
</sequential>
</for>
<var name="lang.use" value="${lang.use}]}" />
<propertyregex property="@{module}--details"
input="${lang.use}"
regexp="(\,\s*?\])"
replace="]"
casesensitive="false" />
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{dir}/@{module}.js" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}--code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="lang/@{module}"/>
<filter token="DETAILS" value=", ${@{module}--details}"/>
</filterset>
</copy>
</sequential>
</macrodef>
</project>
|
yui/builder
|
e63df502ffe71e519b7e3af9e8d9c3da1526238d
|
Compress JS without forking.
|
diff --git a/componentbuild/shared/macrolib.xml b/componentbuild/shared/macrolib.xml
index 00cd8bd..d66df0e 100644
--- a/componentbuild/shared/macrolib.xml
+++ b/componentbuild/shared/macrolib.xml
@@ -1,349 +1,354 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiMacroLib">
<macrodef name="arrayliteral">
<attribute name="from" />
<attribute name="to" />
<attribute name="key" />
<sequential>
<if>
<and>
<isset property="@{from}" />
<length string="${@{from}}" when="ne" length="0" />
</and>
<then>
<propertyregex property="array"
override="true"
input="${@{from}}"
casesensitive="false"
regexp="([^\,\s]+)"
replace="'\1'"
/>
<property name="@{to}" value="@{key}:[${array}]" />
</then>
</if>
</sequential>
</macrodef>
<macrodef name="createdetails">
<sequential>
<arrayliteral from="component.use" to="component.details.use" key="use" />
<arrayliteral from="component.supersedes" to="component.details.supersedes" key="supersedes" />
<arrayliteral from="component.requires" to="component.details.requires" key="requires" />
<arrayliteral from="component.optional" to="component.details.optional" key="optional" />
<arrayliteral from="component.lang" to="component.details.lang" key="lang" />
<if>
<isset property="component.skinnable" />
<then>
<property name="component.details.skinnable" value="skinnable:${component.skinnable}" />
</then>
</if>
<propertyselector property="details.list"
delimiter=","
match="component\.details.([^\.]*)"
select="\1"
casesensitive="false" />
<var name="details" value="" />
<if>
<isset property="details.list" />
<then>
<for list="${details.list}" param="val">
<sequential>
<var name="details" value="${component.details.@{val}}, ${details}" />
</sequential>
</for>
<propertyregex property="component.details.hash"
input="{${details}}"
regexp="(\,\s*?\})"
replace="}"
casesensitive="false" />
</then>
<else>
<property name="component.details.hash" value="" />
</else>
</if>
</sequential>
</macrodef>
+ <taskdef
+ name="jscompressor"
+ classname="com.yahoo.platform.yui.compressor.ant.JavaScriptCompressorTask"
+ classpath="${yuicompressor.jar}"/>
+ <taskdef
+ name="csscompressor"
+ classname="com.yahoo.platform.yui.compressor.ant.CssCompressorTask"
+ classpath="${yuicompressor.jar}"/>
+
<macrodef name="yuicompress">
<attribute name="src" />
<attribute name="dest" />
<attribute name="args" />
<sequential>
- <echo level="info">Running yuicompressor on @{src}</echo>
- <java jar="${yuicompressor.jar}" fork="true" failonerror="true">
- <arg line="@{args} -o" />
- <arg file="@{dest}" />
- <arg file="@{src}" />
- </java>
+ <echo level="info">Running yuicompressor [js] on @{src}</echo>
+ <jscompressor srcfile="@{src}" destfile="@{dest}" charset="${yuicompressor.js.charset}" verbose="${yuicompressor.js.verbose}"/>
</sequential>
</macrodef>
<macrodef name="concatsource">
<attribute name="destfile" />
<attribute name="sourcedir" />
<attribute name="sourcefiles" />
<attribute name="workingdir" default="${workingdir}" />
<element name="filters" optional="true" description="Additonal filters to apply to individual files"/>
<sequential>
<echo level="info">Concatenating</echo>
<echo level="info"> Source Files : @{sourcefiles}</echo>
<echo level="info"> In Source Dir : @{sourcedir}</echo>
<echo level="info"> To : @{destfile}</echo>
<delete dir="@{workingdir}" quiet="true"/>
<copy todir="@{workingdir}">
<filelist dir="@{sourcedir}" files="@{sourcefiles}" />
<filterchain>
<filters />
<fixcrlf fixlast="true" eof="remove"/>
</filterchain>
</copy>
<concat destfile="@{destfile}" fixlastline="true">
<filelist dir="@{workingdir}" files="@{sourcefiles}" />
</concat>
<delete dir="${workingdir}" quiet="true" />
</sequential>
</macrodef>
<!-- By default, jslint failure should fail the build.
This can be overridden on the command line. -->
<property name="jslint.failonerror" value="true"/>
<macrodef name="jslint">
<element name="jsfiles" optional="false" />
<sequential>
<!--
Need to find a way to convert fileset to args (script?) to
avoid ' ', which will break for files with ' in them
Evaluates to the following java execution line...
java -r js.jar jslintconsole.js 'file1.js' 'file2.js' 'file3.js'
-->
<pathconvert pathsep="' '" property="jsfileargs">
<jsfiles />
</pathconvert>
<java jar="${rhino.jar}" fork="true" failonerror="${jslint.failonerror}">
<arg file="${jslintconsole.js}" />
<arg value="${jslintsrc.js}" />
<arg line="'${jsfileargs}'" />
</java>
</sequential>
</macrodef>
<macrodef name="registerversion">
<attribute name="module" />
<attribute name="classname" />
<attribute name="file" />
<sequential>
<loadfile srcfile="${builddir}/files/versioncode.txt" property="@{module}-@{classname}-version" >
<filterchain>
<replacetokens>
<token key="MODULE" value="@{module}"/>
<token key="CLASSNAME" value="@{classname}"/>
</replacetokens>
</filterchain>
</loadfile>
<echo level="info">Adding Version Registration Code to @{file}</echo>
<concat destfile="@{file}" append="true" fixlastline="true">${@{module}-@{classname}-version}</concat>
</sequential>
</macrodef>
<macrodef name="addlang">
<attribute name="dir" />
<attribute name="module" />
<attribute name="dest" />
<attribute name="lang" default="" />
<attribute name="details" default = ""/>
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}@{lang}_details" value="" />
</then>
<else>
<property name="@{module}@{lang}_details" value=",@{details}" />
</else>
</if>
<if>
<equals arg1="@{lang}" arg2="" />
<then>
<property name="@{module}@{lang}_fullname" value="@{module}" />
</then>
<else>
<property name="@{module}@{lang}_fullname" value="@{module}_@{lang}" />
</else>
</if>
<if>
<available file="@{dir}/${@{module}@{lang}_fullname}.pres" />
<then>
<mkdir dir="${component.langbuilddir}" />
<java jar="${rhino.jar}" fork="true" failonerror="true">
<jvmarg value="-Dfile.encoding=utf-8" />
<arg file="${yrb2jsonconsole.js}" />
<arg file="${yrb2jsonsrc.js}" />
<arg file="@{dir}/${@{module}@{lang}_fullname}.pres" />
<arg file="${component.langbuilddir}/${@{module}@{lang}_fullname}.js" />
</java>
<echo level="info">Wrapping ${component.langbuilddir}/${@{module}@{lang}_fullname}.js in YUI.add, Y.Intl.add</echo>
<loadfile srcfile="${component.langbuilddir}/${@{module}@{lang}_fullname}.js" property="@{module}@{lang}-strs-loaded" encoding="utf-8" />
</then>
<else>
<echo level="info">Wrapping @{dir}/${@{module}@{lang}_fullname}.js in YUI.add, Y.Intl.add</echo>
<loadfile srcfile="@{dir}/${@{module}@{lang}_fullname}.js" property="@{module}@{lang}-strs-loaded" encoding="utf-8" />
</else>
</if>
<copy file="${builddir}/files/langtemplate.txt" tofile="@{dest}/${@{module}@{lang}_fullname}.js" overwrite="true" outputencoding="utf-8">
<filterset>
<filter token="LANG" value="@{lang}" />
<filter token="LANG_MODULE" value="lang/${@{module}@{lang}_fullname}" />
<filter token="STRINGS" value="${@{module}@{lang}-strs-loaded}" />
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}" />
<filter token="LANG_DETAILS" value="${@{module}@{lang}_details}" />
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addmodule">
<attribute name="file" />
<attribute name="module" />
<attribute name="details" default="" />
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}-details" value="" />
</then>
<else>
<property name="@{module}-details" value=",@{details}" />
</else>
</if>
<loadfile srcfile="@{file}" property="@{module}-@{file}-code" />
<echo level="info">Wrapping @{file} in YUI.add module</echo>
<copy file="${builddir}/files/moduletemplate.txt" tofile="@{file}" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{file}-code}" />
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}" />
<filter token="DETAILS" value="${@{module}-details}" />
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addrollup">
<attribute name="file" />
<attribute name="module" />
<attribute name="details" default="" />
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}-details" value="" />
</then>
<else>
<property name="@{module}-details" value=",@{details}" />
</else>
</if>
<loadfile srcfile="@{file}" property="@{module}-@{file}-code" />
<echo level="info">Adding Rollup @{file} using YUI.add</echo>
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{file}" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{file}-code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}"/>
<filter token="DETAILS" value="${@{module}-details}"/>
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addlangrollup">
<attribute name="module" />
<attribute name="dir" />
<sequential>
<echo level="info">Registering rollup info for lang files in @{dir} using YUI.add</echo>
<for list="${component.rollup.lang}" param="lang" trim="true">
<sequential>
<loadfile srcfile="@{dir}/@{module}_@{lang}.js" property="@{module}-@{lang}-code" />
<var name="lang.use" value="{use:[" />
<for list="${component.lang.use}" param="submod" trim="true">
<sequential>
<var name="lang.use" value="${lang.use}'lang/@{submod}_@{lang}'," />
</sequential>
</for>
<var name="lang.use" value="${lang.use}]}" />
<propertyregex property="@{module}-@{lang}-details"
input="${lang.use}"
regexp="(\,\s*?\])"
replace="]"
casesensitive="false" />
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{dir}/@{module}_@{lang}.js" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{lang}-code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="lang/@{module}_@{lang}"/>
<filter token="DETAILS" value=", ${@{module}-@{lang}-details}"/>
</filterset>
</copy>
</sequential>
</for>
<loadfile srcfile="@{dir}/@{module}.js" property="@{module}--code" />
<var name="lang.use" value="{use:[" />
<for list="${component.lang.use}" param="submod" trim="true">
<sequential>
<var name="lang.use" value="${lang.use}'lang/@{submod}'," />
</sequential>
</for>
<var name="lang.use" value="${lang.use}]}" />
<propertyregex property="@{module}--details"
input="${lang.use}"
regexp="(\,\s*?\])"
replace="]"
casesensitive="false" />
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{dir}/@{module}.js" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}--code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="lang/@{module}"/>
<filter token="DETAILS" value=", ${@{module}--details}"/>
</filterset>
</copy>
</sequential>
</macrodef>
</project>
diff --git a/componentbuild/shared/properties.xml b/componentbuild/shared/properties.xml
index d6f31f9..3517ce0 100644
--- a/componentbuild/shared/properties.xml
+++ b/componentbuild/shared/properties.xml
@@ -1,158 +1,158 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiSharedProperties">
<!-- ANT contrib library for loops, if/else support, with property fix for FOR task -->
<taskdef resource="antcontrib.properties">
<classpath>
<pathelement location="${builddir}/lib/ant-contrib/ant-contrib-1.0b3-modified.jar" />
</classpath>
</taskdef>
<dirname property="buildfile.dir" file="${ant.file}" />
<!--
builddir : The path to the builder/componentbuild directory from the component build file
srcdir : The path to top of the project source directory (e.g. yui2) from the component build file
-->
<property name="builddir" location="../../../builder/componentbuild" />
<property name="srcdir" location="../.." />
<!-- buildfiles.eol : End of line char to use for built files -->
<property name="buildfiles.eol" value="lf"/>
<!-- Supporting Tools -->
<property name="rhino.jar" location="${builddir}/lib/rhino/js.jar" />
<property name="jslintconsole.js" location="${builddir}/lib/jslint/jslint-console.js" />
<property name="jslintsrc.js" location="${builddir}/lib/jslint/fulljslint.js" />
- <property name="yuicompressor.jar" location="${builddir}/lib/yuicompressor/yuicompressor-2.4.jar" />
+ <property name="yuicompressor.jar" location="${builddir}/lib/yuicompressor/yuicompressor-2.4.3-dinoboff.jar" />
<property name="yrb2jsonconsole.js" location="${builddir}/lib/yrb2json/yrb2json-console.js" />
<property name="yrb2jsonsrc.js" location="${builddir}/lib/yrb2json/yrb2json.js" />
<!-- YUI Compressor arguments for JS and CSS files -->
<property name="yuicompressor.css.args" value="--type css --line-break 6000" />
<property name="yuicompressor.js.args" value="--disable-optimizations --preserve-semi --line-break 6000" />
<property name="yuicompressor.js.charset" value="utf-8" />
<property name="yuicompressor.css.charset" value="utf-8" />
<!-- Enable/Disable YUI Compressor verbosity. NOTE: Checked in build files should not disable this flag -->
<property name="yuicompressor.js.verbose" value="true" />
<property name="yuicompressor.css.verbose" value="true" />
<condition property="yuicompressor.js.args.internal" value="-v --charset ${yuicompressor.js.charset} ${yuicompressor.js.args}" else="--charset ${yuicompressor.js.charset} ${yuicompressor.js.args}">
<istrue value="${yuicompressor.js.verbose}" />
</condition>
<condition property="yuicompressor.css.args.internal" value="-v --charset ${yuicompressor.css.charset} ${yuicompressor.css.args}" else="--charset ${yuicompressor.css.charset} ${yuicompressor.css.args}">
<istrue value="${yuicompressor.css.verbose}" />
</condition>
<!-- Top Level Build Directories (e.g. yui2/build, yui3/build)-->
<property name="global.build.base" location="${srcdir}/build" />
<property name="global.build.component" location="${global.build.base}/${component}" />
<property name="global.build.component.assets" location="${global.build.component}/assets" />
<!-- Component Properties -->
<property name="component.module" value="${component}" />
<property name="component.basedir" location="${buildfile.dir}" />
<property name="component.jsfiles.base" location="${component.basedir}/js" />
<property name="component.lang.base" location="${component.basedir}/lang" />
<property name="component.assets.flatten" value="true" />
<property name="component.assets.base" location="${component.basedir}/assets" />
<property name="component.assets.files" value="**/*" />
<property name="component.assets.legacy.flatten" value="true" />
<property name="component.assets.legacy.base" location="${component.assets.base}/legacy" />
<property name="component.assets.legacy.files" value="**/*" />
<property name="component.assets.skins.base" location="${component.assets.base}/skins" />
<property name="component.assets.skins.files" value="**/*" />
<condition property="component.skins.exist">
<and>
<available file="${component.assets.base}/${component}-core.css" type="file" />
<available file="${component.assets.base}/skins" type="dir" />
</and>
</condition>
<!-- component is part of a rollup build, so rollup skins to parent -->
<condition property="rollupskins">
<and>
<istrue value="${rollup}" />
<istrue value="${component.skins.exist}" />
</and>
</condition>
<available file="${component.assets.base}" type="dir" property="component.assets.exist"/>
<condition property="component.langs.exist">
<and>
<or>
<isset property="component.lang" />
<isset property="component.rollup.lang" />
</or>
</and>
</condition>
<condition property="rolluplangs">
<and>
<istrue value="${rollup}" />
<istrue value="${component.langs.exist}" />
</and>
</condition>
<!--
DEPRECATED: component.basefilename and component.releasetype are deprecated
We used to mark filenames with suffixes (-beta, -experimental), which we no longer do
-->
<condition property="component.basefilename" value="${component}" else="${component}">
<isset property="component.releasetype"/>
</condition>
<!-- Default logger regex values if not provided -->
<property name="component.logger.regex" value="^.*?(?:logger|YAHOO.log).*?(?:;|\).*;|(?:\r?\n.*?)*?\).*;).*;?.*?\r?\n" />
<property name="component.logger.regex.replace" value="" />
<property name="component.logger.regex.flags" value="mg" />
<property name="component.logger.regex.byline" value="false" />
<!-- Rollup support, currently only used for YUI 3 -->
<property name="component.rollup" value="false"/>
<property name="component.rollup.target" value="all"/>
<condition property="component.builddir" value="${component.basedir}/build_rollup_tmp" else="${component.basedir}/build_tmp">
<istrue value="${component.rollup}"/>
</condition>
<condition property="rollup.skins.exist">
<and>
<istrue value="${component.rollup}" />
<available file="${component.assets.base}/skins" type="dir" />
</and>
</condition>
<condition property="skins.exist">
<or>
<istrue value="${rollup.skins.exist}" />
<istrue value="${component.skins.exist}" />
</or>
</condition>
<!-- The temporary working directory used by the build process -->
<property name="workingdir" location="${component.builddir}/ant" />
<!-- Directory for language resource bundles in JSON format derived from YRB format -->
<property name="component.langbuilddir" value="${component.basedir}/build_lang_tmp" />
<!-- The file which defines the default targets for the particular type of component (module, rollup, css) -->
<condition property="targetbase" value="rollup" else="module">
<istrue value="${component.rollup}"/>
</condition>
<condition property="targets" value="../shared/cssmodule.xml" else="${targetbase}.xml">
<isset property="component.cssfiles" />
</condition>
</project>
|
yui/builder
|
1b9871cb92899d0a0fa3849f53d2584934bdb35c
|
Add jslint.failonerror property.
|
diff --git a/componentbuild/shared/macrolib.xml b/componentbuild/shared/macrolib.xml
index e5cb122..00cd8bd 100644
--- a/componentbuild/shared/macrolib.xml
+++ b/componentbuild/shared/macrolib.xml
@@ -1,345 +1,349 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiMacroLib">
<macrodef name="arrayliteral">
<attribute name="from" />
<attribute name="to" />
<attribute name="key" />
<sequential>
<if>
<and>
<isset property="@{from}" />
<length string="${@{from}}" when="ne" length="0" />
</and>
<then>
<propertyregex property="array"
override="true"
input="${@{from}}"
casesensitive="false"
regexp="([^\,\s]+)"
replace="'\1'"
/>
<property name="@{to}" value="@{key}:[${array}]" />
</then>
</if>
</sequential>
</macrodef>
<macrodef name="createdetails">
<sequential>
<arrayliteral from="component.use" to="component.details.use" key="use" />
<arrayliteral from="component.supersedes" to="component.details.supersedes" key="supersedes" />
<arrayliteral from="component.requires" to="component.details.requires" key="requires" />
<arrayliteral from="component.optional" to="component.details.optional" key="optional" />
<arrayliteral from="component.lang" to="component.details.lang" key="lang" />
<if>
<isset property="component.skinnable" />
<then>
<property name="component.details.skinnable" value="skinnable:${component.skinnable}" />
</then>
</if>
<propertyselector property="details.list"
delimiter=","
match="component\.details.([^\.]*)"
select="\1"
casesensitive="false" />
<var name="details" value="" />
<if>
<isset property="details.list" />
<then>
<for list="${details.list}" param="val">
<sequential>
<var name="details" value="${component.details.@{val}}, ${details}" />
</sequential>
</for>
<propertyregex property="component.details.hash"
input="{${details}}"
regexp="(\,\s*?\})"
replace="}"
casesensitive="false" />
</then>
<else>
<property name="component.details.hash" value="" />
</else>
</if>
</sequential>
</macrodef>
<macrodef name="yuicompress">
<attribute name="src" />
<attribute name="dest" />
<attribute name="args" />
<sequential>
<echo level="info">Running yuicompressor on @{src}</echo>
<java jar="${yuicompressor.jar}" fork="true" failonerror="true">
<arg line="@{args} -o" />
<arg file="@{dest}" />
<arg file="@{src}" />
</java>
</sequential>
</macrodef>
<macrodef name="concatsource">
<attribute name="destfile" />
<attribute name="sourcedir" />
<attribute name="sourcefiles" />
<attribute name="workingdir" default="${workingdir}" />
<element name="filters" optional="true" description="Additonal filters to apply to individual files"/>
<sequential>
<echo level="info">Concatenating</echo>
<echo level="info"> Source Files : @{sourcefiles}</echo>
<echo level="info"> In Source Dir : @{sourcedir}</echo>
<echo level="info"> To : @{destfile}</echo>
<delete dir="@{workingdir}" quiet="true"/>
<copy todir="@{workingdir}">
<filelist dir="@{sourcedir}" files="@{sourcefiles}" />
<filterchain>
<filters />
<fixcrlf fixlast="true" eof="remove"/>
</filterchain>
</copy>
<concat destfile="@{destfile}" fixlastline="true">
<filelist dir="@{workingdir}" files="@{sourcefiles}" />
</concat>
<delete dir="${workingdir}" quiet="true" />
</sequential>
</macrodef>
+ <!-- By default, jslint failure should fail the build.
+ This can be overridden on the command line. -->
+ <property name="jslint.failonerror" value="true"/>
+
<macrodef name="jslint">
<element name="jsfiles" optional="false" />
<sequential>
<!--
Need to find a way to convert fileset to args (script?) to
avoid ' ', which will break for files with ' in them
Evaluates to the following java execution line...
java -r js.jar jslintconsole.js 'file1.js' 'file2.js' 'file3.js'
-->
<pathconvert pathsep="' '" property="jsfileargs">
<jsfiles />
</pathconvert>
- <java jar="${rhino.jar}" fork="true" failonerror="true">
+ <java jar="${rhino.jar}" fork="true" failonerror="${jslint.failonerror}">
<arg file="${jslintconsole.js}" />
<arg value="${jslintsrc.js}" />
<arg line="'${jsfileargs}'" />
</java>
</sequential>
</macrodef>
<macrodef name="registerversion">
<attribute name="module" />
<attribute name="classname" />
<attribute name="file" />
<sequential>
<loadfile srcfile="${builddir}/files/versioncode.txt" property="@{module}-@{classname}-version" >
<filterchain>
<replacetokens>
<token key="MODULE" value="@{module}"/>
<token key="CLASSNAME" value="@{classname}"/>
</replacetokens>
</filterchain>
</loadfile>
<echo level="info">Adding Version Registration Code to @{file}</echo>
<concat destfile="@{file}" append="true" fixlastline="true">${@{module}-@{classname}-version}</concat>
</sequential>
</macrodef>
<macrodef name="addlang">
<attribute name="dir" />
<attribute name="module" />
<attribute name="dest" />
<attribute name="lang" default="" />
<attribute name="details" default = ""/>
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}@{lang}_details" value="" />
</then>
<else>
<property name="@{module}@{lang}_details" value=",@{details}" />
</else>
</if>
<if>
<equals arg1="@{lang}" arg2="" />
<then>
<property name="@{module}@{lang}_fullname" value="@{module}" />
</then>
<else>
<property name="@{module}@{lang}_fullname" value="@{module}_@{lang}" />
</else>
</if>
<if>
<available file="@{dir}/${@{module}@{lang}_fullname}.pres" />
<then>
<mkdir dir="${component.langbuilddir}" />
<java jar="${rhino.jar}" fork="true" failonerror="true">
<jvmarg value="-Dfile.encoding=utf-8" />
<arg file="${yrb2jsonconsole.js}" />
<arg file="${yrb2jsonsrc.js}" />
<arg file="@{dir}/${@{module}@{lang}_fullname}.pres" />
<arg file="${component.langbuilddir}/${@{module}@{lang}_fullname}.js" />
</java>
<echo level="info">Wrapping ${component.langbuilddir}/${@{module}@{lang}_fullname}.js in YUI.add, Y.Intl.add</echo>
<loadfile srcfile="${component.langbuilddir}/${@{module}@{lang}_fullname}.js" property="@{module}@{lang}-strs-loaded" encoding="utf-8" />
</then>
<else>
<echo level="info">Wrapping @{dir}/${@{module}@{lang}_fullname}.js in YUI.add, Y.Intl.add</echo>
<loadfile srcfile="@{dir}/${@{module}@{lang}_fullname}.js" property="@{module}@{lang}-strs-loaded" encoding="utf-8" />
</else>
</if>
<copy file="${builddir}/files/langtemplate.txt" tofile="@{dest}/${@{module}@{lang}_fullname}.js" overwrite="true" outputencoding="utf-8">
<filterset>
<filter token="LANG" value="@{lang}" />
<filter token="LANG_MODULE" value="lang/${@{module}@{lang}_fullname}" />
<filter token="STRINGS" value="${@{module}@{lang}-strs-loaded}" />
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}" />
<filter token="LANG_DETAILS" value="${@{module}@{lang}_details}" />
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addmodule">
<attribute name="file" />
<attribute name="module" />
<attribute name="details" default="" />
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}-details" value="" />
</then>
<else>
<property name="@{module}-details" value=",@{details}" />
</else>
</if>
<loadfile srcfile="@{file}" property="@{module}-@{file}-code" />
<echo level="info">Wrapping @{file} in YUI.add module</echo>
<copy file="${builddir}/files/moduletemplate.txt" tofile="@{file}" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{file}-code}" />
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}" />
<filter token="DETAILS" value="${@{module}-details}" />
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addrollup">
<attribute name="file" />
<attribute name="module" />
<attribute name="details" default="" />
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}-details" value="" />
</then>
<else>
<property name="@{module}-details" value=",@{details}" />
</else>
</if>
<loadfile srcfile="@{file}" property="@{module}-@{file}-code" />
<echo level="info">Adding Rollup @{file} using YUI.add</echo>
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{file}" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{file}-code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}"/>
<filter token="DETAILS" value="${@{module}-details}"/>
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addlangrollup">
<attribute name="module" />
<attribute name="dir" />
<sequential>
<echo level="info">Registering rollup info for lang files in @{dir} using YUI.add</echo>
<for list="${component.rollup.lang}" param="lang" trim="true">
<sequential>
<loadfile srcfile="@{dir}/@{module}_@{lang}.js" property="@{module}-@{lang}-code" />
<var name="lang.use" value="{use:[" />
<for list="${component.lang.use}" param="submod" trim="true">
<sequential>
<var name="lang.use" value="${lang.use}'lang/@{submod}_@{lang}'," />
</sequential>
</for>
<var name="lang.use" value="${lang.use}]}" />
<propertyregex property="@{module}-@{lang}-details"
input="${lang.use}"
regexp="(\,\s*?\])"
replace="]"
casesensitive="false" />
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{dir}/@{module}_@{lang}.js" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{lang}-code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="lang/@{module}_@{lang}"/>
<filter token="DETAILS" value=", ${@{module}-@{lang}-details}"/>
</filterset>
</copy>
</sequential>
</for>
<loadfile srcfile="@{dir}/@{module}.js" property="@{module}--code" />
<var name="lang.use" value="{use:[" />
<for list="${component.lang.use}" param="submod" trim="true">
<sequential>
<var name="lang.use" value="${lang.use}'lang/@{submod}'," />
</sequential>
</for>
<var name="lang.use" value="${lang.use}]}" />
<propertyregex property="@{module}--details"
input="${lang.use}"
regexp="(\,\s*?\])"
replace="]"
casesensitive="false" />
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{dir}/@{module}.js" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}--code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="lang/@{module}"/>
<filter token="DETAILS" value=", ${@{module}--details}"/>
</filterset>
</copy>
</sequential>
</macrodef>
</project>
|
yui/builder
|
61b67a5bb65f4f797879d95120a9e826d14538a5
|
datatype component builds with Ant 1.8.1
|
diff --git a/componentbuild/3.x/module.xml b/componentbuild/3.x/module.xml
index 5301109..8bfb8d1 100644
--- a/componentbuild/3.x/module.xml
+++ b/componentbuild/3.x/module.xml
@@ -1,96 +1,108 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiModuleTargets">
<dirname property="module.basedir" file="${ant.file.YuiModuleTargets}"/>
<import file="${module.basedir}/../shared/targets.xml" description="Targets common to Rollup/Module" />
<target name="build" depends="buildcore, -rollupjs, buildskins, buildlangs" />
<target name="buildskins" depends="-buildskins, -rollupcss" />
<target name="buildlangs" depends="-buildlangs, -rolluplangs" />
<!-- CORE -->
<target name="buildcore" depends="builddebug, -createcore, -loggerregex" description="Create component.js">
<fixcrlf srcdir="${component.builddir}" includes="${component.basefilename}.js" eol="${buildfiles.eol}" />
</target>
<target name="-createcore">
<copy file="${component.builddir}/${component.basefilename}-debug.js" tofile="${component.builddir}/${component.basefilename}.js" />
</target>
<target name="-loggerregex" description="Replace logger statements" unless="component.logger.regex.skip">
<echo level="info">Replacing Logger Statements in ${component.builddir}/${component.basefilename}.js</echo>
<replaceregexp file="${component.builddir}/${component.basefilename}.js"
byline="${component.logger.regex.byline}"
match="${component.logger.regex}"
replace="${component.logger.regex.replace}"
flags="${component.logger.regex.flags}" />
</target>
<!-- DEBUG -->
<target name="builddebug" depends="-concatdebug, -registerdebug, -prependdebug, -appenddebug" description="Create component-debug.js">
<fixcrlf srcdir="${component.builddir}" includes="${component.basefilename}-debug.js" eol="${buildfiles.eol}" />
</target>
<target name="-concatdebug">
<concatsource destfile="${component.builddir}/${component.basefilename}-debug.js" sourcedir="${component.jsfiles.base}" sourcefiles="${component.jsfiles}" />
</target>
<target name="-registerdebug" unless="register.skip">
<addmodule module="${component.module}" file="${component.builddir}/${component.basefilename}-debug.js" details="${component.details.hash}" />
</target>
<target name="-rollupjs" if="rollup">
- <echo level="info">Rolling up ${component.basefilename}-debug.js into ${rollup.component.basefilename}-debug.js</echo>
+ <if>
+ <isset property="rollup.sub"/>
+ <then>
+ <echo level="info">Module: Build a rollup of a rollup; moving rollup.sub properties into rollup properties.</echo>
+ <var name="rollup.builddir" unset="true"/>
+ <var name="rollup.component" unset="true"/>
+ <var name="rollup.component.basefilename" unset="true"/>
+ <propertycopy name="rollup.builddir" from="rollup.sub.builddir"/>
+ <propertycopy name="rollup.component" from="rollup.sub.component"/>
+ <propertycopy name="rollup.component.basefilename" from="rollup.sub.component.basefilename"/>
+ </then>
+ </if>
+ <echo level="info">Module: Rolling up ${component.basefilename}-debug.js into ${rollup.component.basefilename}-debug.js</echo>
<concat destfile="${rollup.builddir}/${rollup.component.basefilename}.js" append="true" fixlastline="true">
<filelist dir="${component.builddir}" files="${component.basefilename}.js" />
</concat>
<concat destfile="${rollup.builddir}/${rollup.component.basefilename}-debug.js" append="true" fixlastline="true">
<filelist dir="${component.builddir}" files="${component.basefilename}-debug.js" />
</concat>
</target>
<!-- SKINS -->
<target name="-buildskins" depends="-concatskins" description="Create skin rollup in local component build directory" if="component.skins.exist">
<fixcrlf srcdir="${component.builddir}/assets/skins/sam" includes="${component}.css" eol="${buildfiles.eol}" />
</target>
<target name="-buildlangs" description="Create language packs in the local component build directory" if="component.langs.exist">
<mkdir dir="${component.builddir}/lang" />
<for list="${component.lang}" param="lang" trim="true">
<sequential>
<addlang dir="${component.lang.base}" module="${component}" lang="@{lang}" dest="${component.builddir}/lang" />
</sequential>
</for>
<addlang dir="${component.lang.base}" module="${component}" lang="" dest="${component.builddir}/lang/" />
</target>
<target name="-rolluplangs" if="rolluplangs">
<for list="${component.lang}" param="lang" trim="true">
<sequential>
<concat destfile="${rollup.builddir}/lang/${rollup.component}_@{lang}.js" append="true" fixlastline="true">
<fileset dir="${component.builddir}/lang" includes="*_@{lang}.js" />
</concat>
</sequential>
</for>
<concat destfile="${rollup.builddir}/lang/${rollup.component}.js" append="true" fixlastline="true">
<filelist dir="${component.builddir}/lang" files="${component}.js" />
</concat>
</target>
<target name="-concatskins" if="component.skins.exist">
<concatsource destfile="${component.builddir}/assets/skins/sam/${component}.css" sourcedir="${component.assets.base}" sourcefiles="${component}-core.css, skins/sam/${component}-skin.css" />
<yuicompress src="${component.builddir}/assets/skins/sam/${component}.css" dest="${component.builddir}/assets/skins/sam/${component}.css" args="${yuicompressor.css.args.internal}" />
</target>
<target name="-rollupcss" if="rollupskins">
<echo level="info">Rolling up ${component}.css into ${rollup.component}.css</echo>
<concat destfile="${rollup.builddir}/assets/skins/sam/${rollup.component}.css" append="true" fixlastline="true">
<filelist dir="${component.builddir}/assets/skins/sam" files="${component}.css" />
</concat>
</target>
-</project>
\ No newline at end of file
+</project>
diff --git a/componentbuild/3.x/rollup.xml b/componentbuild/3.x/rollup.xml
index bc29084..20aa9ca 100644
--- a/componentbuild/3.x/rollup.xml
+++ b/componentbuild/3.x/rollup.xml
@@ -1,61 +1,80 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiRollupTargets">
<dirname property="rolluptargets.basedir" file="${ant.file.YuiRollupTargets}"/>
<import file="${rolluptargets.basedir}/../shared/targets.xml" description="Targets common to Rollup/Module" />
<target name="build" depends="buildmodules" description="Create component.js"></target>
<target name="buildmodules" depends="-buildmodules, -registerall, -prependall, -appendall, -rollupjs, -rolluplangs">
<fixcrlf srcdir="${component.builddir}" eol="${buildfiles.eol}" />
</target>
<target name="-buildmodules">
- <subant target="${component.rollup.target}" inheritall="false" >
- <filelist dir="${buildfile.dir}" files="${component.rollup.modules.buildfiles}" />
- <property name="rollup" value="true" />
- <property name="rollup.builddir" value="${component.builddir}" />
- <property name="rollup.component" value="${component}" />
- <property name="rollup.component.basefilename" value="${component.basefilename}" />
- </subant>
+ <!-- Since Ant 1.8, properties defined in subant tasks can never, ever be set again.
+ In order for datatype's rollups of rollups to work, we must use new property
+ names for the nested rollup task. module.xml then renames rollup.sub to rollup. -->
+ <if>
+ <isset property="rollup"/>
+ <then>
+ <fail if="rollup.sub">You're trying to build a rollup of a rollup of a rollup. Are you sure that's what you want?</fail>
+ <echo level="info">Rollup of rollup detected; setting rollup.sub properties.</echo>
+ <subant target="${component.rollup.target}" inheritall="false" >
+ <filelist dir="${buildfile.dir}" files="${component.rollup.modules.buildfiles}" />
+ <property name="rollup.sub" value="true" />
+ <property name="rollup.sub.builddir" value="${component.builddir}" />
+ <property name="rollup.sub.component" value="${component}" />
+ <property name="rollup.sub.component.basefilename" value="${component.basefilename}" />
+ </subant>
+ </then>
+ <else>
+ <subant target="${component.rollup.target}" inheritall="false" >
+ <filelist dir="${buildfile.dir}" files="${component.rollup.modules.buildfiles}" />
+ <property name="rollup" value="true" />
+ <property name="rollup.builddir" value="${component.builddir}" />
+ <property name="rollup.component" value="${component}" />
+ <property name="rollup.component.basefilename" value="${component.basefilename}" />
+ </subant>
+ </else>
+ </if>
</target>
<target name="-rollupjs" if="rollup">
- <echo level="info">Rolling up ${component.basefilename}-debug.js into ${rollup.component.basefilename}-debug.js</echo>
+ <echo level="info">Rollup: Rolling up ${component.basefilename}-debug.js into ${rollup.component.basefilename}-debug.js</echo>
<concat destfile="${rollup.builddir}/${rollup.component.basefilename}.js" append="true" fixlastline="true" >
<filelist dir="${component.builddir}" files="${component.basefilename}.js" />
</concat>
<concat destfile="${rollup.builddir}/${rollup.component.basefilename}-debug.js" append="true" fixlastline="true">
<filelist dir="${component.builddir}" files="${component.basefilename}-debug.js" />
</concat>
</target>
<target name="-rolluplangs" if="rolluplangs">
<for list="${component.rollup.lang}" param="lang" trim="true">
<sequential>
<concat destfile="${rollup.builddir}/lang/${rollup.component}_@{lang}.js" append="true" fixlastline="true">
<fileset dir="${component.builddir}/lang" includes="*_@{lang}.js" />
</concat>
</sequential>
</for>
<concat destfile="${rollup.builddir}/lang/${rollup.component}.js" append="true" fixlastline="true">
<filelist dir="${component.builddir}/lang" files="${component}.js" />
</concat>
</target>
<target name="-prependall" depends="-prependdebug, -prepend" if="component.prependfiles" />
<target name="-appendall" depends="-appenddebug, -append" if="component.appendfiles" />
<target name="-registerall" unless="register.skip">
<addrollup module="${component.module}" file="${component.builddir}/${component.basefilename}-debug.js" details="${component.details.hash}" />
<addrollup module="${component.module}" file="${component.builddir}/${component.basefilename}.js" details="${component.details.hash}" />
<if>
<available file="${component.builddir}/lang/" type="dir" />
<then>
<addlangrollup module="${component.module}" dir="${component.builddir}/lang/" />
</then>
</if>
</target>
</project>
|
yui/builder
|
7e26762c181d59363dc3cc12a32a58e29afaae2f
|
Added more verbose output to deploy steps, to help id gallery issue, if it happens again.
|
diff --git a/componentbuild/shared/targets.xml b/componentbuild/shared/targets.xml
index 18892b0..f8286de 100644
--- a/componentbuild/shared/targets.xml
+++ b/componentbuild/shared/targets.xml
@@ -1,154 +1,154 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiSharedTargets">
<echo level="info">Starting Build For ${component}</echo>
<echo level="info">Ant Properties</echo>
<echo level="info"> Home : ${ant.home}</echo>
<echo level="info"> Ant Version : ${ant.version}</echo>
<echo level="info"> Build File : ${ant.file}</echo>
<echo level="info">Local Build Properties</echo>
<echo level="info"> version : ${yui.version}</echo>
<echo level="info"> srcdir : ${srcdir}</echo>
<echo level="info"> builddir : ${builddir}</echo>
<echo level="info"> component : ${component}</echo>
<echo level="info"> component.basefilename : ${component.basefilename}</echo>
<echo level="info"> component.basedir : ${component.basedir}</echo>
<echo level="info"> component.builddir : ${component.builddir}</echo>
<echo level="info">Global Build Properties</echo>
<echo level="info"> global.build.base : ${global.build.base}</echo>
<echo level="info"> global.build.component : ${global.build.component}</echo>
<echo level="info"> global.build.component.assets : ${global.build.component.assets}</echo>
<dirname property="targets.basedir" file="${ant.file.YuiSharedTargets}"/>
<import file="${targets.basedir}/macrolib.xml" description="Macrodef definitions - jslint, yuicompessor, registerversion" />
<target name="all" depends="local, deploy" description="Build and Deploy to Global Build Directory" />
<target name="local" depends="clean, init, build, minify, lint" description="Build and Deploy to Local Build Directory" />
<target name="init">
<tstamp/>
<mkdir dir="${component.builddir}" />
<createdetails />
</target>
<target name="clean" description="Clean Local Build Directory" unless="clean.skip">
<delete dir="${component.builddir}" />
</target>
<target name="build" />
<!-- MIN -->
<target name="minify" description="Create component-min.js from component.js">
<yuicompress src="${component.builddir}/${component.basefilename}.js" dest="${component.builddir}/${component.basefilename}-min.js" args="${yuicompressor.js.args.internal}" />
<if>
<available file="${component.builddir}/lang" type="dir" />
<then>
<for param="file">
<path>
<fileset dir="${component.builddir}/lang" includes="*.js"/>
</path>
<sequential>
<yuicompress src="@{file}" dest="@{file}" args="${yuicompressor.js.args.internal}" />
</sequential>
</for>
</then>
</if>
</target>
<target name="lint" description="Run jslint over the local build files (default settings)" unless="lint.skip">
<jslint>
<jsfiles>
<fileset dir="${component.builddir}" includes="*.js" />
</jsfiles>
</jslint>
</target>
<!-- DEPLOY -->
<target name="deploy" description="Copy files to global location" depends="deploybuild, deployassets, deployskins, deploylang, deploydocs"></target>
<target name="deploybuild" description="Copy built files to global build location">
- <copy todir="${global.build.component}" overwrite="true">
+ <copy todir="${global.build.component}" overwrite="true" verbose="true">
<fileset dir="${component.builddir}" includes="*.js" />
</copy>
</target>
<target name="deployassets" if="component.assets.exist">
- <copy todir="${global.build.component.assets}" flatten="${component.assets.flatten}" overwrite="true">
+ <copy todir="${global.build.component.assets}" flatten="${component.assets.flatten}" overwrite="true" verbose="true">
<fileset dir="${component.assets.base}" includes="${component.assets.files}" excludes="skins/, legacy/" />
</copy>
- <copy todir="${global.build.component.assets}" flatten="${component.assets.legacy.flatten}" preservelastmodified="true" failonerror="false">
+ <copy todir="${global.build.component.assets}" flatten="${component.assets.legacy.flatten}" preservelastmodified="true" failonerror="false" verbose="true">
<fileset dir="${component.assets.legacy.base}" includes="${component.assets.legacy.files}" excludes="skins/" />
</copy>
</target>
<target name="deployskins" if="skins.exist">
- <copy todir="${global.build.component.assets}/skins/sam" overwrite="true">
+ <copy todir="${global.build.component.assets}/skins/sam" overwrite="true" verbose="true">
<fileset dir="${component.builddir}/assets/skins/sam" includes="${component}.css" />
</copy>
- <copy todir="${global.build.component.assets}/skins/sam" overwrite="true">
+ <copy todir="${global.build.component.assets}/skins/sam" overwrite="true" verbose="true">
<fileset dir="${component.assets.skins.base}/sam" includes="${component.assets.skins.files}" />
</copy>
</target>
<target name="deploylang" description="Copy language bundles to global build location">
- <copy todir="${global.build.component}/lang" overwrite="true" failonerror="false">
+ <copy todir="${global.build.component}/lang" overwrite="true" failonerror="false" verbose="true">
<fileset dir="${component.builddir}/lang" includes="*.js" />
</copy>
</target>
<target name="deploydocs" description="Copy doc files to global doc locations">
<!-- TODO -->
</target>
<target name="-prepend" if="component.prependfiles">
<concat destfile="${workingdir}/${component.basefilename}.js.tmp" fixlastline="true">
<filelist dir="${component.basedir}" files="${component.prependfiles}" />
<filterchain>
<tokenfilter>
<filetokenizer/>
<replaceregex
pattern="${component.logger.regex}"
replace="${component.logger.regex.replace}"
flags="${component.logger.regex.flags}" />
</tokenfilter>
</filterchain>
</concat>
<concat destfile="${workingdir}/${component.basefilename}.js.tmp" fixlastline="true" append="true">
<filelist dir="${component.builddir}" files="${component.basefilename}.js" />
</concat>
<move file="${workingdir}/${component.basefilename}.js.tmp" tofile="${component.builddir}/${component.basefilename}.js" />
</target>
<target name="-append" if="component.appendfiles">
<concat destfile="${component.builddir}/${component.basefilename}.js" fixlastline="true" append="true">
<filelist dir="${component.basedir}" files="${component.appendfiles}" />
<filterchain>
<tokenfilter>
<filetokenizer/>
<replaceregex
pattern="${component.logger.regex}"
replace="${component.logger.regex.replace}"
flags="${component.logger.regex.flags}" />
</tokenfilter>
</filterchain>
</concat>
</target>
<target name="-prependdebug" if="component.prependfiles">
<concat destfile="${workingdir}/${component.basefilename}-debug.js.tmp" fixlastline="true" >
<filelist dir="${component.basedir}" files="${component.prependfiles}" />
<filelist dir="${component.builddir}" files="${component.basefilename}-debug.js" />
</concat>
<move file="${workingdir}/${component.basefilename}-debug.js.tmp" tofile="${component.builddir}/${component.basefilename}-debug.js" />
</target>
<target name="-appenddebug" if="component.appendfiles">
<concat destfile="${component.builddir}/${component.basefilename}-debug.js" fixlastline="true" append="true">
<filelist dir="${component.basedir}" files="${component.appendfiles}" />
</concat>
</target>
</project>
|
yui/builder
|
74815e1694671431fb084adc9003866dc2c45f26
|
Added overwrite=true to deploy steps, to see if it helps with gallery build problem - in case it's a timestamp issue. Also removed preservelastmodified
|
diff --git a/componentbuild/shared/targets.xml b/componentbuild/shared/targets.xml
index 7059aec..18892b0 100644
--- a/componentbuild/shared/targets.xml
+++ b/componentbuild/shared/targets.xml
@@ -1,154 +1,154 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiSharedTargets">
<echo level="info">Starting Build For ${component}</echo>
<echo level="info">Ant Properties</echo>
<echo level="info"> Home : ${ant.home}</echo>
<echo level="info"> Ant Version : ${ant.version}</echo>
<echo level="info"> Build File : ${ant.file}</echo>
<echo level="info">Local Build Properties</echo>
<echo level="info"> version : ${yui.version}</echo>
<echo level="info"> srcdir : ${srcdir}</echo>
<echo level="info"> builddir : ${builddir}</echo>
<echo level="info"> component : ${component}</echo>
<echo level="info"> component.basefilename : ${component.basefilename}</echo>
<echo level="info"> component.basedir : ${component.basedir}</echo>
<echo level="info"> component.builddir : ${component.builddir}</echo>
<echo level="info">Global Build Properties</echo>
<echo level="info"> global.build.base : ${global.build.base}</echo>
<echo level="info"> global.build.component : ${global.build.component}</echo>
<echo level="info"> global.build.component.assets : ${global.build.component.assets}</echo>
<dirname property="targets.basedir" file="${ant.file.YuiSharedTargets}"/>
<import file="${targets.basedir}/macrolib.xml" description="Macrodef definitions - jslint, yuicompessor, registerversion" />
<target name="all" depends="local, deploy" description="Build and Deploy to Global Build Directory" />
<target name="local" depends="clean, init, build, minify, lint" description="Build and Deploy to Local Build Directory" />
<target name="init">
<tstamp/>
<mkdir dir="${component.builddir}" />
<createdetails />
</target>
<target name="clean" description="Clean Local Build Directory" unless="clean.skip">
<delete dir="${component.builddir}" />
</target>
<target name="build" />
<!-- MIN -->
<target name="minify" description="Create component-min.js from component.js">
<yuicompress src="${component.builddir}/${component.basefilename}.js" dest="${component.builddir}/${component.basefilename}-min.js" args="${yuicompressor.js.args.internal}" />
<if>
<available file="${component.builddir}/lang" type="dir" />
<then>
<for param="file">
<path>
<fileset dir="${component.builddir}/lang" includes="*.js"/>
</path>
<sequential>
<yuicompress src="@{file}" dest="@{file}" args="${yuicompressor.js.args.internal}" />
</sequential>
</for>
</then>
</if>
</target>
<target name="lint" description="Run jslint over the local build files (default settings)" unless="lint.skip">
<jslint>
<jsfiles>
<fileset dir="${component.builddir}" includes="*.js" />
</jsfiles>
</jslint>
</target>
<!-- DEPLOY -->
<target name="deploy" description="Copy files to global location" depends="deploybuild, deployassets, deployskins, deploylang, deploydocs"></target>
<target name="deploybuild" description="Copy built files to global build location">
- <copy todir="${global.build.component}" preservelastmodified="true">
+ <copy todir="${global.build.component}" overwrite="true">
<fileset dir="${component.builddir}" includes="*.js" />
</copy>
</target>
<target name="deployassets" if="component.assets.exist">
- <copy todir="${global.build.component.assets}" flatten="${component.assets.flatten}" preservelastmodified="true">
+ <copy todir="${global.build.component.assets}" flatten="${component.assets.flatten}" overwrite="true">
<fileset dir="${component.assets.base}" includes="${component.assets.files}" excludes="skins/, legacy/" />
</copy>
<copy todir="${global.build.component.assets}" flatten="${component.assets.legacy.flatten}" preservelastmodified="true" failonerror="false">
<fileset dir="${component.assets.legacy.base}" includes="${component.assets.legacy.files}" excludes="skins/" />
</copy>
</target>
<target name="deployskins" if="skins.exist">
- <copy todir="${global.build.component.assets}/skins/sam" preservelastmodified="true">
+ <copy todir="${global.build.component.assets}/skins/sam" overwrite="true">
<fileset dir="${component.builddir}/assets/skins/sam" includes="${component}.css" />
</copy>
- <copy todir="${global.build.component.assets}/skins/sam" preservelastmodified="true">
+ <copy todir="${global.build.component.assets}/skins/sam" overwrite="true">
<fileset dir="${component.assets.skins.base}/sam" includes="${component.assets.skins.files}" />
</copy>
</target>
<target name="deploylang" description="Copy language bundles to global build location">
- <copy todir="${global.build.component}/lang" preservelastmodified="true" failonerror="false">
+ <copy todir="${global.build.component}/lang" overwrite="true" failonerror="false">
<fileset dir="${component.builddir}/lang" includes="*.js" />
</copy>
</target>
<target name="deploydocs" description="Copy doc files to global doc locations">
<!-- TODO -->
</target>
<target name="-prepend" if="component.prependfiles">
<concat destfile="${workingdir}/${component.basefilename}.js.tmp" fixlastline="true">
<filelist dir="${component.basedir}" files="${component.prependfiles}" />
<filterchain>
<tokenfilter>
<filetokenizer/>
<replaceregex
pattern="${component.logger.regex}"
replace="${component.logger.regex.replace}"
flags="${component.logger.regex.flags}" />
</tokenfilter>
</filterchain>
</concat>
<concat destfile="${workingdir}/${component.basefilename}.js.tmp" fixlastline="true" append="true">
<filelist dir="${component.builddir}" files="${component.basefilename}.js" />
</concat>
<move file="${workingdir}/${component.basefilename}.js.tmp" tofile="${component.builddir}/${component.basefilename}.js" />
</target>
<target name="-append" if="component.appendfiles">
<concat destfile="${component.builddir}/${component.basefilename}.js" fixlastline="true" append="true">
<filelist dir="${component.basedir}" files="${component.appendfiles}" />
<filterchain>
<tokenfilter>
<filetokenizer/>
<replaceregex
pattern="${component.logger.regex}"
replace="${component.logger.regex.replace}"
flags="${component.logger.regex.flags}" />
</tokenfilter>
</filterchain>
</concat>
</target>
<target name="-prependdebug" if="component.prependfiles">
<concat destfile="${workingdir}/${component.basefilename}-debug.js.tmp" fixlastline="true" >
<filelist dir="${component.basedir}" files="${component.prependfiles}" />
<filelist dir="${component.builddir}" files="${component.basefilename}-debug.js" />
</concat>
<move file="${workingdir}/${component.basefilename}-debug.js.tmp" tofile="${component.builddir}/${component.basefilename}-debug.js" />
</target>
<target name="-appenddebug" if="component.appendfiles">
<concat destfile="${component.builddir}/${component.basefilename}-debug.js" fixlastline="true" append="true">
<filelist dir="${component.basedir}" files="${component.appendfiles}" />
</concat>
</target>
</project>
|
yui/builder
|
9b5587f4e5f32cf8fb4fb35d16e96ca3f1625142
|
Changed componentbuild infrastructure files to use relative paths from "ant.file.[projectName]" as suggested by ANT Import docs, when importing other infrastructure files instead of using builddir, which wouldn't work when src area for a component existed at a depth different from the yui src structure.
|
diff --git a/componentbuild/2.x/bootstrap.xml b/componentbuild/2.x/bootstrap.xml
index 541166e..7a3f3f7 100644
--- a/componentbuild/2.x/bootstrap.xml
+++ b/componentbuild/2.x/bootstrap.xml
@@ -1,8 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiDefaultProperties">
<property name="yui.version" value="2"/>
- <import file="${builddir}/shared/properties.xml" description="Properties common to yui2/yui3" />
- <import file="${targets}" description="Build Targets" />
+ <dirname property="bootstrap.basedir" file="${ant.file.YuiDefaultProperties}"/>
+
+ <import file="${bootstrap.basedir}/../shared/properties.xml" description="Properties common to yui2/yui3" />
+ <import file="${bootstrap.basedir}/${targets}" description="Build Targets" />
</project>
diff --git a/componentbuild/2.x/module.xml b/componentbuild/2.x/module.xml
index e4d3514..c88cab9 100644
--- a/componentbuild/2.x/module.xml
+++ b/componentbuild/2.x/module.xml
@@ -1,51 +1,52 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiModuleTargets">
- <import file="${builddir}/shared/targets.xml" description="Targets common to Rollup/Module" />
+ <dirname property="module.basedir" file="${ant.file.YuiModuleTargets}"/>
+ <import file="${module.basedir}/../shared/targets.xml" description="Targets common to Rollup/Module" />
<target name="build" depends="buildcore, buildskins" />
<target name="buildskins" depends="-buildskins" />
<!-- CORE -->
<target name="buildcore" depends="builddebug, -createcore, -loggerregex" description="Create component.js">
<fixcrlf srcdir="${component.builddir}" includes="${component.basefilename}.js" eol="${buildfiles.eol}" />
</target>
<target name="-createcore">
<copy file="${component.builddir}/${component.basefilename}-debug.js" tofile="${component.builddir}/${component.basefilename}.js" />
</target>
<target name="-loggerregex" description="Replace logger statements" unless="component.logger.regex.skip">
<echo level="info">Replacing Logger Statements in ${component.builddir}/${component.basefilename}.js</echo>
<replaceregexp file="${component.builddir}/${component.basefilename}.js"
byline="${component.logger.regex.byline}"
match="${component.logger.regex}"
replace="${component.logger.regex.replace}"
flags="${component.logger.regex.flags}" />
</target>
<!-- DEBUG -->
<target name="builddebug" depends="-concatdebug, -registerdebug, -prependdebug, -appenddebug" description="Create component-debug.js">
<fixcrlf srcdir="${component.builddir}" includes="${component.basefilename}-debug.js" eol="${buildfiles.eol}" />
</target>
<target name="-concatdebug">
<concatsource destfile="${component.builddir}/${component.basefilename}-debug.js" sourcedir="${component.jsfiles.base}" sourcefiles="${component.jsfiles}" />
</target>
<target name="-registerdebug" unless="register.skip">
<registerversion classname="${component.mainclass}" module="${component.module}" file="${component.builddir}/${component.basefilename}-debug.js" />
</target>
<!-- SKINS -->
<target name="-buildskins" depends="-concatskins" description="Create skin file in local component build directory" if="component.skins.exist">
<fixcrlf srcdir="${component.builddir}/assets/skins/sam" includes="${component}.css" eol="${buildfiles.eol}" />
</target>
<target name="-concatskins" if="component.skins.exist">
<concatsource destfile="${component.builddir}/assets/skins/sam/${component}.css" sourcedir="${component.assets.base}" sourcefiles="${component}-core.css, skins/sam/${component}-skin.css" />
<yuicompress src="${component.builddir}/assets/skins/sam/${component}.css" dest="${component.builddir}/assets/skins/sam/${component}.css" args="${yuicompressor.css.args.internal}" />
</target>
</project>
diff --git a/componentbuild/3.x/bootstrap.xml b/componentbuild/3.x/bootstrap.xml
index dabc455..744515b 100644
--- a/componentbuild/3.x/bootstrap.xml
+++ b/componentbuild/3.x/bootstrap.xml
@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiDefaultProperties">
-
<!-- Default Library Version Build -->
<property name="yui.version" value="3"/>
<property name="yui.variable" value="Y"/>
<property name="component.logger.regex" value="^.*?(?:logger|Y.log).*?(?:;|\).*;|(?:\r?\n.*?)*?\).*;).*;?.*?\r?\n" />
- <import file="${builddir}/shared/properties.xml" description="Properties common to yui2/yui3" />
+ <dirname property="bootstrap.basedir" file="${ant.file.YuiDefaultProperties}"/>
+
+ <import file="${bootstrap.basedir}/../shared/properties.xml" description="Properties common to yui2/yui3" />
+ <import file="${bootstrap.basedir}/${targets}" description="Build Targets" />
- <import file="${targets}" description="Build Targets" />
</project>
\ No newline at end of file
diff --git a/componentbuild/3.x/module.xml b/componentbuild/3.x/module.xml
index 419dec7..5301109 100644
--- a/componentbuild/3.x/module.xml
+++ b/componentbuild/3.x/module.xml
@@ -1,95 +1,96 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiModuleTargets">
- <import file="${builddir}/shared/targets.xml" description="Targets common to Rollup/Module" />
+ <dirname property="module.basedir" file="${ant.file.YuiModuleTargets}"/>
+ <import file="${module.basedir}/../shared/targets.xml" description="Targets common to Rollup/Module" />
<target name="build" depends="buildcore, -rollupjs, buildskins, buildlangs" />
<target name="buildskins" depends="-buildskins, -rollupcss" />
<target name="buildlangs" depends="-buildlangs, -rolluplangs" />
<!-- CORE -->
<target name="buildcore" depends="builddebug, -createcore, -loggerregex" description="Create component.js">
<fixcrlf srcdir="${component.builddir}" includes="${component.basefilename}.js" eol="${buildfiles.eol}" />
</target>
<target name="-createcore">
<copy file="${component.builddir}/${component.basefilename}-debug.js" tofile="${component.builddir}/${component.basefilename}.js" />
</target>
<target name="-loggerregex" description="Replace logger statements" unless="component.logger.regex.skip">
<echo level="info">Replacing Logger Statements in ${component.builddir}/${component.basefilename}.js</echo>
<replaceregexp file="${component.builddir}/${component.basefilename}.js"
byline="${component.logger.regex.byline}"
match="${component.logger.regex}"
replace="${component.logger.regex.replace}"
flags="${component.logger.regex.flags}" />
</target>
<!-- DEBUG -->
<target name="builddebug" depends="-concatdebug, -registerdebug, -prependdebug, -appenddebug" description="Create component-debug.js">
<fixcrlf srcdir="${component.builddir}" includes="${component.basefilename}-debug.js" eol="${buildfiles.eol}" />
</target>
<target name="-concatdebug">
<concatsource destfile="${component.builddir}/${component.basefilename}-debug.js" sourcedir="${component.jsfiles.base}" sourcefiles="${component.jsfiles}" />
</target>
<target name="-registerdebug" unless="register.skip">
<addmodule module="${component.module}" file="${component.builddir}/${component.basefilename}-debug.js" details="${component.details.hash}" />
</target>
<target name="-rollupjs" if="rollup">
<echo level="info">Rolling up ${component.basefilename}-debug.js into ${rollup.component.basefilename}-debug.js</echo>
<concat destfile="${rollup.builddir}/${rollup.component.basefilename}.js" append="true" fixlastline="true">
<filelist dir="${component.builddir}" files="${component.basefilename}.js" />
</concat>
<concat destfile="${rollup.builddir}/${rollup.component.basefilename}-debug.js" append="true" fixlastline="true">
<filelist dir="${component.builddir}" files="${component.basefilename}-debug.js" />
</concat>
</target>
<!-- SKINS -->
<target name="-buildskins" depends="-concatskins" description="Create skin rollup in local component build directory" if="component.skins.exist">
<fixcrlf srcdir="${component.builddir}/assets/skins/sam" includes="${component}.css" eol="${buildfiles.eol}" />
</target>
<target name="-buildlangs" description="Create language packs in the local component build directory" if="component.langs.exist">
<mkdir dir="${component.builddir}/lang" />
<for list="${component.lang}" param="lang" trim="true">
<sequential>
<addlang dir="${component.lang.base}" module="${component}" lang="@{lang}" dest="${component.builddir}/lang" />
</sequential>
</for>
<addlang dir="${component.lang.base}" module="${component}" lang="" dest="${component.builddir}/lang/" />
</target>
<target name="-rolluplangs" if="rolluplangs">
<for list="${component.lang}" param="lang" trim="true">
<sequential>
<concat destfile="${rollup.builddir}/lang/${rollup.component}_@{lang}.js" append="true" fixlastline="true">
<fileset dir="${component.builddir}/lang" includes="*_@{lang}.js" />
</concat>
</sequential>
</for>
<concat destfile="${rollup.builddir}/lang/${rollup.component}.js" append="true" fixlastline="true">
<filelist dir="${component.builddir}/lang" files="${component}.js" />
</concat>
</target>
<target name="-concatskins" if="component.skins.exist">
<concatsource destfile="${component.builddir}/assets/skins/sam/${component}.css" sourcedir="${component.assets.base}" sourcefiles="${component}-core.css, skins/sam/${component}-skin.css" />
<yuicompress src="${component.builddir}/assets/skins/sam/${component}.css" dest="${component.builddir}/assets/skins/sam/${component}.css" args="${yuicompressor.css.args.internal}" />
</target>
<target name="-rollupcss" if="rollupskins">
<echo level="info">Rolling up ${component}.css into ${rollup.component}.css</echo>
<concat destfile="${rollup.builddir}/assets/skins/sam/${rollup.component}.css" append="true" fixlastline="true">
<filelist dir="${component.builddir}/assets/skins/sam" files="${component}.css" />
</concat>
</target>
</project>
\ No newline at end of file
diff --git a/componentbuild/3.x/rollup.xml b/componentbuild/3.x/rollup.xml
index 70c665b..bc29084 100644
--- a/componentbuild/3.x/rollup.xml
+++ b/componentbuild/3.x/rollup.xml
@@ -1,60 +1,61 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiRollupTargets">
- <import file="${builddir}/shared/targets.xml" description="Targets common to Rollup/Module" />
+ <dirname property="rolluptargets.basedir" file="${ant.file.YuiRollupTargets}"/>
+ <import file="${rolluptargets.basedir}/../shared/targets.xml" description="Targets common to Rollup/Module" />
<target name="build" depends="buildmodules" description="Create component.js"></target>
<target name="buildmodules" depends="-buildmodules, -registerall, -prependall, -appendall, -rollupjs, -rolluplangs">
<fixcrlf srcdir="${component.builddir}" eol="${buildfiles.eol}" />
</target>
<target name="-buildmodules">
<subant target="${component.rollup.target}" inheritall="false" >
<filelist dir="${buildfile.dir}" files="${component.rollup.modules.buildfiles}" />
<property name="rollup" value="true" />
<property name="rollup.builddir" value="${component.builddir}" />
<property name="rollup.component" value="${component}" />
<property name="rollup.component.basefilename" value="${component.basefilename}" />
</subant>
</target>
<target name="-rollupjs" if="rollup">
<echo level="info">Rolling up ${component.basefilename}-debug.js into ${rollup.component.basefilename}-debug.js</echo>
<concat destfile="${rollup.builddir}/${rollup.component.basefilename}.js" append="true" fixlastline="true" >
<filelist dir="${component.builddir}" files="${component.basefilename}.js" />
</concat>
<concat destfile="${rollup.builddir}/${rollup.component.basefilename}-debug.js" append="true" fixlastline="true">
<filelist dir="${component.builddir}" files="${component.basefilename}-debug.js" />
</concat>
</target>
<target name="-rolluplangs" if="rolluplangs">
<for list="${component.rollup.lang}" param="lang" trim="true">
<sequential>
<concat destfile="${rollup.builddir}/lang/${rollup.component}_@{lang}.js" append="true" fixlastline="true">
<fileset dir="${component.builddir}/lang" includes="*_@{lang}.js" />
</concat>
</sequential>
</for>
<concat destfile="${rollup.builddir}/lang/${rollup.component}.js" append="true" fixlastline="true">
<filelist dir="${component.builddir}/lang" files="${component}.js" />
</concat>
</target>
<target name="-prependall" depends="-prependdebug, -prepend" if="component.prependfiles" />
<target name="-appendall" depends="-appenddebug, -append" if="component.appendfiles" />
<target name="-registerall" unless="register.skip">
<addrollup module="${component.module}" file="${component.builddir}/${component.basefilename}-debug.js" details="${component.details.hash}" />
<addrollup module="${component.module}" file="${component.builddir}/${component.basefilename}.js" details="${component.details.hash}" />
<if>
<available file="${component.builddir}/lang/" type="dir" />
<then>
<addlangrollup module="${component.module}" dir="${component.builddir}/lang/" />
</then>
</if>
</target>
</project>
diff --git a/componentbuild/shared/cssmodule.xml b/componentbuild/shared/cssmodule.xml
index 8f6fff7..54ac37d 100644
--- a/componentbuild/shared/cssmodule.xml
+++ b/componentbuild/shared/cssmodule.xml
@@ -1,26 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiCssModuleTargets">
- <import file="${builddir}/shared/targets.xml" description="Targets common to Rollup/Module" />
+ <dirname property="cssmodule.basedir" file="${ant.file.YuiCssModuleTargets}"/>
+ <import file="${cssmodule.basedir}/../shared/targets.xml" description="Targets common to Rollup/Module" />
<target name="build" depends="buildcore" />
<target name="buildcore">
<concatsource destfile="${component.builddir}/${component}.css" sourcedir="${component.basedir}/css" sourcefiles="${component.cssfiles}" />
</target>
<target name="minify">
<yuicompress src="${component.builddir}/${component}.css" dest="${component.builddir}/${component}-min.css" args="${yuicompressor.css.args.internal}" />
</target>
<target name="lint">
<!-- TODO : CSS Lint support. Currently need to add @charset "UTF-8";-->
</target>
<target name="deploybuild" description="Copy built files to global build location">
<copy todir="${global.build.component}" preservelastmodified="true">
<fileset dir="${component.builddir}" includes="*.css" />
</copy>
</target>
</project>
diff --git a/componentbuild/shared/properties.xml b/componentbuild/shared/properties.xml
index 582fb0f..d6f31f9 100644
--- a/componentbuild/shared/properties.xml
+++ b/componentbuild/shared/properties.xml
@@ -1,158 +1,158 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiSharedProperties">
<!-- ANT contrib library for loops, if/else support, with property fix for FOR task -->
<taskdef resource="antcontrib.properties">
<classpath>
<pathelement location="${builddir}/lib/ant-contrib/ant-contrib-1.0b3-modified.jar" />
</classpath>
</taskdef>
<dirname property="buildfile.dir" file="${ant.file}" />
<!--
builddir : The path to the builder/componentbuild directory from the component build file
srcdir : The path to top of the project source directory (e.g. yui2) from the component build file
-->
<property name="builddir" location="../../../builder/componentbuild" />
<property name="srcdir" location="../.." />
<!-- buildfiles.eol : End of line char to use for built files -->
<property name="buildfiles.eol" value="lf"/>
<!-- Supporting Tools -->
<property name="rhino.jar" location="${builddir}/lib/rhino/js.jar" />
<property name="jslintconsole.js" location="${builddir}/lib/jslint/jslint-console.js" />
<property name="jslintsrc.js" location="${builddir}/lib/jslint/fulljslint.js" />
<property name="yuicompressor.jar" location="${builddir}/lib/yuicompressor/yuicompressor-2.4.jar" />
<property name="yrb2jsonconsole.js" location="${builddir}/lib/yrb2json/yrb2json-console.js" />
<property name="yrb2jsonsrc.js" location="${builddir}/lib/yrb2json/yrb2json.js" />
<!-- YUI Compressor arguments for JS and CSS files -->
<property name="yuicompressor.css.args" value="--type css --line-break 6000" />
<property name="yuicompressor.js.args" value="--disable-optimizations --preserve-semi --line-break 6000" />
<property name="yuicompressor.js.charset" value="utf-8" />
<property name="yuicompressor.css.charset" value="utf-8" />
<!-- Enable/Disable YUI Compressor verbosity. NOTE: Checked in build files should not disable this flag -->
<property name="yuicompressor.js.verbose" value="true" />
<property name="yuicompressor.css.verbose" value="true" />
<condition property="yuicompressor.js.args.internal" value="-v --charset ${yuicompressor.js.charset} ${yuicompressor.js.args}" else="--charset ${yuicompressor.js.charset} ${yuicompressor.js.args}">
<istrue value="${yuicompressor.js.verbose}" />
</condition>
<condition property="yuicompressor.css.args.internal" value="-v --charset ${yuicompressor.css.charset} ${yuicompressor.css.args}" else="--charset ${yuicompressor.css.charset} ${yuicompressor.css.args}">
<istrue value="${yuicompressor.css.verbose}" />
</condition>
<!-- Top Level Build Directories (e.g. yui2/build, yui3/build)-->
<property name="global.build.base" location="${srcdir}/build" />
<property name="global.build.component" location="${global.build.base}/${component}" />
<property name="global.build.component.assets" location="${global.build.component}/assets" />
<!-- Component Properties -->
<property name="component.module" value="${component}" />
<property name="component.basedir" location="${buildfile.dir}" />
<property name="component.jsfiles.base" location="${component.basedir}/js" />
<property name="component.lang.base" location="${component.basedir}/lang" />
<property name="component.assets.flatten" value="true" />
<property name="component.assets.base" location="${component.basedir}/assets" />
<property name="component.assets.files" value="**/*" />
<property name="component.assets.legacy.flatten" value="true" />
<property name="component.assets.legacy.base" location="${component.assets.base}/legacy" />
<property name="component.assets.legacy.files" value="**/*" />
<property name="component.assets.skins.base" location="${component.assets.base}/skins" />
<property name="component.assets.skins.files" value="**/*" />
<condition property="component.skins.exist">
<and>
<available file="${component.assets.base}/${component}-core.css" type="file" />
<available file="${component.assets.base}/skins" type="dir" />
</and>
</condition>
<!-- component is part of a rollup build, so rollup skins to parent -->
<condition property="rollupskins">
<and>
<istrue value="${rollup}" />
<istrue value="${component.skins.exist}" />
</and>
</condition>
<available file="${component.assets.base}" type="dir" property="component.assets.exist"/>
<condition property="component.langs.exist">
<and>
<or>
<isset property="component.lang" />
<isset property="component.rollup.lang" />
</or>
</and>
</condition>
<condition property="rolluplangs">
<and>
<istrue value="${rollup}" />
<istrue value="${component.langs.exist}" />
</and>
</condition>
<!--
DEPRECATED: component.basefilename and component.releasetype are deprecated
We used to mark filenames with suffixes (-beta, -experimental), which we no longer do
-->
<condition property="component.basefilename" value="${component}" else="${component}">
<isset property="component.releasetype"/>
</condition>
<!-- Default logger regex values if not provided -->
<property name="component.logger.regex" value="^.*?(?:logger|YAHOO.log).*?(?:;|\).*;|(?:\r?\n.*?)*?\).*;).*;?.*?\r?\n" />
<property name="component.logger.regex.replace" value="" />
<property name="component.logger.regex.flags" value="mg" />
<property name="component.logger.regex.byline" value="false" />
<!-- Rollup support, currently only used for YUI 3 -->
<property name="component.rollup" value="false"/>
<property name="component.rollup.target" value="all"/>
<condition property="component.builddir" value="${component.basedir}/build_rollup_tmp" else="${component.basedir}/build_tmp">
<istrue value="${component.rollup}"/>
</condition>
<condition property="rollup.skins.exist">
<and>
<istrue value="${component.rollup}" />
<available file="${component.assets.base}/skins" type="dir" />
</and>
</condition>
<condition property="skins.exist">
<or>
<istrue value="${rollup.skins.exist}" />
<istrue value="${component.skins.exist}" />
</or>
</condition>
<!-- The temporary working directory used by the build process -->
<property name="workingdir" location="${component.builddir}/ant" />
<!-- Directory for language resource bundles in JSON format derived from YRB format -->
<property name="component.langbuilddir" value="${component.basedir}/build_lang_tmp" />
<!-- The file which defines the default targets for the particular type of component (module, rollup, css) -->
<condition property="targetbase" value="rollup" else="module">
<istrue value="${component.rollup}"/>
</condition>
- <condition property="targets" value="${builddir}/shared/cssmodule.xml" else="${targetbase}.xml">
+ <condition property="targets" value="../shared/cssmodule.xml" else="${targetbase}.xml">
<isset property="component.cssfiles" />
</condition>
</project>
diff --git a/componentbuild/shared/targets.xml b/componentbuild/shared/targets.xml
index 0cb3225..7059aec 100644
--- a/componentbuild/shared/targets.xml
+++ b/componentbuild/shared/targets.xml
@@ -1,153 +1,154 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiSharedTargets">
<echo level="info">Starting Build For ${component}</echo>
<echo level="info">Ant Properties</echo>
<echo level="info"> Home : ${ant.home}</echo>
<echo level="info"> Ant Version : ${ant.version}</echo>
<echo level="info"> Build File : ${ant.file}</echo>
<echo level="info">Local Build Properties</echo>
<echo level="info"> version : ${yui.version}</echo>
<echo level="info"> srcdir : ${srcdir}</echo>
<echo level="info"> builddir : ${builddir}</echo>
<echo level="info"> component : ${component}</echo>
<echo level="info"> component.basefilename : ${component.basefilename}</echo>
<echo level="info"> component.basedir : ${component.basedir}</echo>
<echo level="info"> component.builddir : ${component.builddir}</echo>
<echo level="info">Global Build Properties</echo>
<echo level="info"> global.build.base : ${global.build.base}</echo>
<echo level="info"> global.build.component : ${global.build.component}</echo>
<echo level="info"> global.build.component.assets : ${global.build.component.assets}</echo>
- <import file="${builddir}/shared/macrolib.xml" description="Macrodef definitions - jslint, yuicompessor, registerversion" />
+ <dirname property="targets.basedir" file="${ant.file.YuiSharedTargets}"/>
+ <import file="${targets.basedir}/macrolib.xml" description="Macrodef definitions - jslint, yuicompessor, registerversion" />
<target name="all" depends="local, deploy" description="Build and Deploy to Global Build Directory" />
<target name="local" depends="clean, init, build, minify, lint" description="Build and Deploy to Local Build Directory" />
<target name="init">
<tstamp/>
<mkdir dir="${component.builddir}" />
<createdetails />
</target>
<target name="clean" description="Clean Local Build Directory" unless="clean.skip">
<delete dir="${component.builddir}" />
</target>
<target name="build" />
<!-- MIN -->
<target name="minify" description="Create component-min.js from component.js">
<yuicompress src="${component.builddir}/${component.basefilename}.js" dest="${component.builddir}/${component.basefilename}-min.js" args="${yuicompressor.js.args.internal}" />
<if>
<available file="${component.builddir}/lang" type="dir" />
<then>
<for param="file">
<path>
<fileset dir="${component.builddir}/lang" includes="*.js"/>
</path>
<sequential>
<yuicompress src="@{file}" dest="@{file}" args="${yuicompressor.js.args.internal}" />
</sequential>
</for>
</then>
</if>
</target>
<target name="lint" description="Run jslint over the local build files (default settings)" unless="lint.skip">
<jslint>
<jsfiles>
<fileset dir="${component.builddir}" includes="*.js" />
</jsfiles>
</jslint>
</target>
<!-- DEPLOY -->
<target name="deploy" description="Copy files to global location" depends="deploybuild, deployassets, deployskins, deploylang, deploydocs"></target>
<target name="deploybuild" description="Copy built files to global build location">
<copy todir="${global.build.component}" preservelastmodified="true">
<fileset dir="${component.builddir}" includes="*.js" />
</copy>
</target>
<target name="deployassets" if="component.assets.exist">
<copy todir="${global.build.component.assets}" flatten="${component.assets.flatten}" preservelastmodified="true">
<fileset dir="${component.assets.base}" includes="${component.assets.files}" excludes="skins/, legacy/" />
</copy>
<copy todir="${global.build.component.assets}" flatten="${component.assets.legacy.flatten}" preservelastmodified="true" failonerror="false">
<fileset dir="${component.assets.legacy.base}" includes="${component.assets.legacy.files}" excludes="skins/" />
</copy>
</target>
<target name="deployskins" if="skins.exist">
<copy todir="${global.build.component.assets}/skins/sam" preservelastmodified="true">
<fileset dir="${component.builddir}/assets/skins/sam" includes="${component}.css" />
</copy>
<copy todir="${global.build.component.assets}/skins/sam" preservelastmodified="true">
<fileset dir="${component.assets.skins.base}/sam" includes="${component.assets.skins.files}" />
</copy>
</target>
<target name="deploylang" description="Copy language bundles to global build location">
<copy todir="${global.build.component}/lang" preservelastmodified="true" failonerror="false">
<fileset dir="${component.builddir}/lang" includes="*.js" />
</copy>
</target>
<target name="deploydocs" description="Copy doc files to global doc locations">
<!-- TODO -->
</target>
<target name="-prepend" if="component.prependfiles">
<concat destfile="${workingdir}/${component.basefilename}.js.tmp" fixlastline="true">
<filelist dir="${component.basedir}" files="${component.prependfiles}" />
<filterchain>
<tokenfilter>
<filetokenizer/>
<replaceregex
pattern="${component.logger.regex}"
replace="${component.logger.regex.replace}"
flags="${component.logger.regex.flags}" />
</tokenfilter>
</filterchain>
</concat>
<concat destfile="${workingdir}/${component.basefilename}.js.tmp" fixlastline="true" append="true">
<filelist dir="${component.builddir}" files="${component.basefilename}.js" />
</concat>
<move file="${workingdir}/${component.basefilename}.js.tmp" tofile="${component.builddir}/${component.basefilename}.js" />
</target>
<target name="-append" if="component.appendfiles">
<concat destfile="${component.builddir}/${component.basefilename}.js" fixlastline="true" append="true">
<filelist dir="${component.basedir}" files="${component.appendfiles}" />
<filterchain>
<tokenfilter>
<filetokenizer/>
<replaceregex
pattern="${component.logger.regex}"
replace="${component.logger.regex.replace}"
flags="${component.logger.regex.flags}" />
</tokenfilter>
</filterchain>
</concat>
</target>
<target name="-prependdebug" if="component.prependfiles">
<concat destfile="${workingdir}/${component.basefilename}-debug.js.tmp" fixlastline="true" >
<filelist dir="${component.basedir}" files="${component.prependfiles}" />
<filelist dir="${component.builddir}" files="${component.basefilename}-debug.js" />
</concat>
<move file="${workingdir}/${component.basefilename}-debug.js.tmp" tofile="${component.builddir}/${component.basefilename}-debug.js" />
</target>
<target name="-appenddebug" if="component.appendfiles">
<concat destfile="${component.builddir}/${component.basefilename}-debug.js" fixlastline="true" append="true">
<filelist dir="${component.basedir}" files="${component.appendfiles}" />
</concat>
</target>
</project>
|
yui/builder
|
d3db9bfc4836e6978aa8a4f1602aac81821f5378
|
Added support for Yahoo Resource Bundles: YRB->JSON converter, integration into build scripts.
|
diff --git a/componentbuild/lib/yrb2json/yrb2json-console.js b/componentbuild/lib/yrb2json/yrb2json-console.js
new file mode 100644
index 0000000..97b0d06
--- /dev/null
+++ b/componentbuild/lib/yrb2json/yrb2json-console.js
@@ -0,0 +1,41 @@
+/**
+ * Converts resource bundles provided in YRB format into JSON format.
+ *
+ * YRB format is documented at
+ * http://developer.yahoo.com/yui/3/intl/index.html#yrb
+ *
+ * Run as:
+ * java -jar js.jar yrb2json-console.js yrb2json.js inputFile outputFile
+ *
+ */
+
+/*jslint rhino: true, onevar: true, undef: true, nomen: true, eqeqeq: true, bitwise: true, regexp: true, newcap: true, immed: true */
+/*global java: false, yrb2json: false */
+
+if (arguments.length !== 3) {
+ print("Usage: java -jar yrb2json-console.js yrb2json.js inputFile outputFile");
+ java.lang.System.exit(1);
+}
+
+load(arguments[0]);
+
+(function (inputFile, outputFile) {
+
+ var yrb, json, writer;
+
+ print("Converting " + inputFile + " to " + outputFile);
+
+ try {
+ yrb = readFile(inputFile, "utf-8");
+ json = yrb2json.convert(yrb);
+
+ outputFile = outputFile.replace(/\//, java.io.File.separator);
+ writer = new java.io.OutputStreamWriter(new java.io.FileOutputStream(outputFile), "utf-8");
+ writer.write(json, 0, json.length);
+ writer.flush();
+ } catch (e) {
+ print(e.toString());
+ java.lang.System.exit(1);
+ }
+}(arguments[1], arguments[2]));
+
diff --git a/componentbuild/lib/yrb2json/yrb2json-test.js b/componentbuild/lib/yrb2json/yrb2json-test.js
new file mode 100644
index 0000000..31525cf
--- /dev/null
+++ b/componentbuild/lib/yrb2json/yrb2json-test.js
@@ -0,0 +1,90 @@
+/**
+ * Tests yrb2json.
+ *
+ * Run as:
+ * java -jar js.jar yrb2json-test.js
+ */
+
+/*jslint rhino: true, onevar: true, undef: true, nomen: true, eqeqeq: true, bitwise: true, regexp: true, newcap: true, immed: true */
+/*global java: false, yrb2json: false */
+
+load("yrb2json.js");
+
+(function () {
+
+ var errors, source, expectedJSON, actual, j, invalidInput, input;
+
+ errors = 0;
+ print("Starting yrb2json test.");
+
+ // expected JSON output for test.pres file
+ expectedJSON =
+ '{"MONTHS_SHORT":"1ì, 2ì, 3ì, 4ì, 5ì, 6ì, 7ì, 8ì, 9ì, 10ì, 11ì, 12ì",' +
+ '"MONTHS_LONG":"1ì\\n2ì\\n3ì\\n4ì\\n5ì\\n6ì\\n7ì\\n8ì\\n9ì\\n10ì\\n11ì\\n12ì",' +
+ '"ESCAPES":" \\\\\\n\\t# ",' +
+ '"KEY WITH SPACES":"1ì, 2ì, 3ì, 4ì, 5ì, 6ì, 7ì, 8ì, 9ì, 10ì, 11ì, 12ì",' +
+ '"WITH QUOTES \\"":"\\"",' +
+ '"EMPTY":"",' +
+ '"EMPTY HEREDOC":""}';
+
+ // test.pres has valid data
+ source = readFile("yrb2json-test.pres");
+ if (source) {
+ try {
+ actual = yrb2json.convert(source);
+ if (actual !== expectedJSON) {
+ print("Wrong result for good input:");
+ print("actual : " + actual);
+ print("expected: " + expectedJSON);
+ print(actual.length + "/" + expectedJSON.length);
+ for (j = 0; j < Math.min(actual.length, expectedJSON.length); j++) {
+ if (actual.charAt(j) !== expectedJSON.charAt(j)) {
+ print(j);
+ print(actual.charAt(j) + "/" + expectedJSON.charAt(j));
+ }
+ }
+ errors++;
+ }
+ } catch (e1) {
+ print(e1.toString());
+ errors++;
+ }
+ } else {
+ print("Empty test data - make sure to run test from yrb2json directory.");
+ errors++;
+ }
+
+ invalidInput = {
+ "&": "Missing '=' in line &.",
+ "=": "Empty key not allowed.",
+ "= value": "Empty key not allowed.",
+ "key = <<<": "Incomplete heredoc with id .",
+ "key = value\\": "Illegal escape sequence: unaccompanied \\",
+ "key = v\\u0061lue": "Illegal escape sequence: \\u",
+ "key = value\\\"": "Illegal escape sequence: \\\"",
+ "k\\#ey = value": "Backslash not allowed in key: k\\#ey",
+ "key = <<< end\nend ": "Incomplete heredoc with id end.",
+ "key = <<< end": "Incomplete heredoc with id end.",
+ "key = <<< end\n": "Incomplete heredoc with id end.",
+ "key = <<< end\nend; ": "Incomplete heredoc with id end."
+ };
+ for (input in invalidInput) {
+ if (invalidInput.hasOwnProperty(input)) {
+ try {
+ actual = yrb2json.convert(input);
+ } catch (e2) {
+ if (e2.message !== invalidInput[input]) {
+ print("Didn't get expected exception for " + input + "; exception: " + e2.toString());
+ errors++;
+ }
+ continue;
+ }
+ print("Didn't get expected exception for " + input);
+ errors++;
+ }
+ }
+ print(errors + (errors === 1 ? " error." : " errors."));
+ print("Finished yrb2json test.");
+ java.lang.System.exit(errors);
+}());
+
diff --git a/componentbuild/lib/yrb2json/yrb2json-test.pres b/componentbuild/lib/yrb2json/yrb2json-test.pres
new file mode 100644
index 0000000..5709c4d
--- /dev/null
+++ b/componentbuild/lib/yrb2json/yrb2json-test.pres
@@ -0,0 +1,44 @@
+# This is a test data file.
+ # It does not represent useful data.
+ # And it mixes languages
+#
+
+# note that whitespace is stripped, so the value of the
+# following entry really means
+# "1ì, 2ì, 3ì, 4ì, 5ì, 6ì, 7ì, 8ì, 9ì, 10ì, 11ì, 12ì"
+
+MONTHS_SHORT = 1ì, 2ì, 3ì, 4ì, 5ì, 6ì, 7ì, 8ì, 9ì, 10ì, 11ì, 12ì
+
+# this is a twelve-line value
+
+MONTHS_LONG = <<< end
+1ì
+2ì
+3ì
+4ì
+5ì
+6ì
+# yes there are comments within heredocs
+ # and they don't have to start at the beginning of the line
+ # and they can use a tab as whitespace
+7ì
+8ì
+9ì
+10ì
+11ì
+12ì
+end;
+
+# this entry has all escape sequences, with an escaped space at the end
+
+ESCAPES = \ \\\n\t\#\
+
+KEY WITH SPACES = 1ì, 2ì, 3ì, 4ì, 5ì, 6ì, 7ì, 8ì, 9ì, 10ì, 11ì, 12ì
+
+WITH QUOTES " = "
+
+EMPTY =
+
+EMPTY HEREDOC = <<< end
+end
+
diff --git a/componentbuild/lib/yrb2json/yrb2json.js b/componentbuild/lib/yrb2json/yrb2json.js
new file mode 100644
index 0000000..2ce417b
--- /dev/null
+++ b/componentbuild/lib/yrb2json/yrb2json.js
@@ -0,0 +1,183 @@
+/**
+ * Converts resource bundles provided in YRB format into JSON format.
+ *
+ * YRB format is documented at
+ * http://developer.yahoo.com/yui/3/intl/index.html#yrb
+ */
+
+/*jslint onevar: true, undef: true, nomen: true, eqeqeq: true, bitwise: true, regexp: true, newcap: true, immed: true */
+
+var yrb2json = (function() {
+
+var result = {};
+
+function isCommentLine(line) {
+ return (line.match(/^[ \t]*#/) !== null);
+}
+
+function isWhitespaceLine(line) {
+ return (line.match(/^[ \t]*$/) !== null);
+}
+
+function isWhitespaceChar(c) {
+ return c === " " || c === "\t";
+}
+
+/**
+ * Checks whether the given key is not empty and doesn't contain backslashes.
+ */
+function checkKey(key) {
+ if (key.length === 0) {
+ throw new Error("Empty key not allowed.");
+ }
+ if (key.indexOf("\\") >= 0) {
+ throw new Error("Backslash not allowed in key: " + key);
+ }
+}
+
+function trimWhitespace(s) {
+ var start = 0, end = s.length;
+ while (start < s.length && isWhitespaceChar(s.charAt(start))) {
+ start++;
+ }
+ while (end > start && isWhitespaceChar(s.charAt(end - 1))) {
+ end--;
+ }
+ return s.substring(start, end);
+}
+
+/**
+ * Unescapes all escape sequences that occur in s. Optionally trims whitespace
+ * from beginning and end of string, taking care not to trim whitespace
+ * that's part of an escape sequence.
+ */
+function unescapeValue(s, trim) {
+ var pos, start, end, result;
+
+ pos = s.indexOf("\\");
+ if (pos >= 0) {
+ result = "";
+ start = 0;
+ if (trim) {
+ while (isWhitespaceChar(s.charAt(start))) {
+ start++;
+ }
+ }
+ while (pos >= 0) {
+ result += s.substring(start, pos);
+ if (pos + 1 >= s.length) {
+ throw new Error("Illegal escape sequence: unaccompanied \\");
+ }
+ switch (s.charAt(pos + 1)) {
+ case "\\":
+ result += "\\";
+ break;
+ case "n":
+ result += "\n";
+ break;
+ case "t":
+ result += "\t";
+ break;
+ case " ":
+ result += " ";
+ break;
+ case "#":
+ result += "#";
+ break;
+ default:
+ throw new Error("Illegal escape sequence: \\" + s.charAt(pos + 1));
+ }
+ start = pos + 2;
+ pos = s.indexOf("\\", start);
+ }
+ end = s.length;
+ if (trim) {
+ while (end > start && isWhitespaceChar(s.charAt(end - 1))) {
+ end--;
+ }
+ }
+ result += s.substring(start, end);
+ } else {
+ result = trim ? trimWhitespace(s) : s;
+ }
+ return result;
+}
+
+/**
+ * Convert a string into JSON representation. Should use stringify once Rhino gets it.
+ */
+function jsonString(s) {
+ return "\"" + s.replace(/\\/g, "\\\\").replace(/\"/g, "\\\"").replace(/\n/g, "\\n").replace(/\t/g, "\\t") + "\"";
+}
+
+function jsonKeyValue(key, value) {
+ return jsonString(key) + ":" + jsonString(value);
+}
+
+/**
+ * Converts the contents of one YRB file into corresponding JSON content.
+ */
+result.convert = function (source) {
+ var lines, properties, hereDocId, i, line, equalsPos, key, remainder,
+ match, value;
+
+ if (source.length > 0 && source.charAt(0) === "\ufeff") {
+ // remove BOM
+ source = source.substring(1);
+ }
+ lines = source.replace(/\r\n/g, '\n').replace(/\r/g, '\n').split('\n');
+
+ properties = [];
+ hereDocId = null; // null indicates we're not inside heredoc section
+
+ for (i = 0; i < lines.length; i++) {
+ line = lines[i];
+ if (isCommentLine(line)) {
+ continue;
+ }
+ if (hereDocId === null) {
+ if (isWhitespaceLine(line)) {
+ continue;
+ }
+
+ // extract the key
+ equalsPos = line.indexOf("=");
+ if (equalsPos < 0) {
+ throw new Error("Missing '=' in line " + line + ".");
+ }
+ key = trimWhitespace(line.substring(0, equalsPos));
+ checkKey(key);
+
+ // decide whether it's simple or heredoc form
+ remainder = line.substring(equalsPos + 1);
+ if ((match = remainder.match(/^[ \t]*<<</)) !== null) {
+ hereDocId = trimWhitespace(remainder.substring(match[0].length));
+ value = null;
+ } else {
+ value = unescapeValue(remainder, true);
+ properties.push(jsonKeyValue(key, value));
+ }
+ } else {
+ if (line === hereDocId || line === hereDocId + ";") {
+ value = value || "";
+ properties.push(jsonKeyValue(key, value));
+ hereDocId = null;
+ } else {
+ if (value === null) {
+ value = unescapeValue(line, false);
+ } else {
+ value += "\n" + unescapeValue(line, false);
+ }
+ }
+ }
+ }
+ if (hereDocId !== null) {
+ throw new Error("Incomplete heredoc with id " + hereDocId + ".");
+ }
+ return '{' + properties.join(",") + "}";
+};
+
+return result;
+
+}());
+
diff --git a/componentbuild/shared/macrolib.xml b/componentbuild/shared/macrolib.xml
index 7ea87b8..e5cb122 100644
--- a/componentbuild/shared/macrolib.xml
+++ b/componentbuild/shared/macrolib.xml
@@ -1,329 +1,345 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiMacroLib">
<macrodef name="arrayliteral">
<attribute name="from" />
<attribute name="to" />
<attribute name="key" />
<sequential>
<if>
<and>
<isset property="@{from}" />
<length string="${@{from}}" when="ne" length="0" />
</and>
<then>
<propertyregex property="array"
override="true"
input="${@{from}}"
casesensitive="false"
regexp="([^\,\s]+)"
replace="'\1'"
/>
<property name="@{to}" value="@{key}:[${array}]" />
</then>
</if>
</sequential>
</macrodef>
<macrodef name="createdetails">
<sequential>
<arrayliteral from="component.use" to="component.details.use" key="use" />
<arrayliteral from="component.supersedes" to="component.details.supersedes" key="supersedes" />
<arrayliteral from="component.requires" to="component.details.requires" key="requires" />
<arrayliteral from="component.optional" to="component.details.optional" key="optional" />
<arrayliteral from="component.lang" to="component.details.lang" key="lang" />
<if>
<isset property="component.skinnable" />
<then>
<property name="component.details.skinnable" value="skinnable:${component.skinnable}" />
</then>
</if>
<propertyselector property="details.list"
delimiter=","
match="component\.details.([^\.]*)"
select="\1"
casesensitive="false" />
<var name="details" value="" />
<if>
<isset property="details.list" />
<then>
<for list="${details.list}" param="val">
<sequential>
<var name="details" value="${component.details.@{val}}, ${details}" />
</sequential>
</for>
<propertyregex property="component.details.hash"
input="{${details}}"
regexp="(\,\s*?\})"
replace="}"
casesensitive="false" />
</then>
<else>
<property name="component.details.hash" value="" />
</else>
</if>
</sequential>
</macrodef>
<macrodef name="yuicompress">
<attribute name="src" />
<attribute name="dest" />
<attribute name="args" />
<sequential>
<echo level="info">Running yuicompressor on @{src}</echo>
<java jar="${yuicompressor.jar}" fork="true" failonerror="true">
<arg line="@{args} -o" />
<arg file="@{dest}" />
<arg file="@{src}" />
</java>
</sequential>
</macrodef>
<macrodef name="concatsource">
<attribute name="destfile" />
<attribute name="sourcedir" />
<attribute name="sourcefiles" />
<attribute name="workingdir" default="${workingdir}" />
<element name="filters" optional="true" description="Additonal filters to apply to individual files"/>
<sequential>
<echo level="info">Concatenating</echo>
<echo level="info"> Source Files : @{sourcefiles}</echo>
<echo level="info"> In Source Dir : @{sourcedir}</echo>
<echo level="info"> To : @{destfile}</echo>
<delete dir="@{workingdir}" quiet="true"/>
<copy todir="@{workingdir}">
<filelist dir="@{sourcedir}" files="@{sourcefiles}" />
<filterchain>
<filters />
<fixcrlf fixlast="true" eof="remove"/>
</filterchain>
</copy>
<concat destfile="@{destfile}" fixlastline="true">
<filelist dir="@{workingdir}" files="@{sourcefiles}" />
</concat>
<delete dir="${workingdir}" quiet="true" />
</sequential>
</macrodef>
<macrodef name="jslint">
<element name="jsfiles" optional="false" />
<sequential>
<!--
Need to find a way to convert fileset to args (script?) to
avoid ' ', which will break for files with ' in them
Evaluates to the following java execution line...
java -r js.jar jslintconsole.js 'file1.js' 'file2.js' 'file3.js'
-->
<pathconvert pathsep="' '" property="jsfileargs">
<jsfiles />
</pathconvert>
<java jar="${rhino.jar}" fork="true" failonerror="true">
<arg file="${jslintconsole.js}" />
<arg value="${jslintsrc.js}" />
<arg line="'${jsfileargs}'" />
</java>
</sequential>
</macrodef>
<macrodef name="registerversion">
<attribute name="module" />
<attribute name="classname" />
<attribute name="file" />
<sequential>
<loadfile srcfile="${builddir}/files/versioncode.txt" property="@{module}-@{classname}-version" >
<filterchain>
<replacetokens>
<token key="MODULE" value="@{module}"/>
<token key="CLASSNAME" value="@{classname}"/>
</replacetokens>
</filterchain>
</loadfile>
<echo level="info">Adding Version Registration Code to @{file}</echo>
<concat destfile="@{file}" append="true" fixlastline="true">${@{module}-@{classname}-version}</concat>
</sequential>
</macrodef>
<macrodef name="addlang">
<attribute name="dir" />
<attribute name="module" />
<attribute name="dest" />
<attribute name="lang" default="" />
<attribute name="details" default = ""/>
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}@{lang}_details" value="" />
</then>
<else>
<property name="@{module}@{lang}_details" value=",@{details}" />
</else>
</if>
<if>
<equals arg1="@{lang}" arg2="" />
<then>
<property name="@{module}@{lang}_fullname" value="@{module}" />
</then>
<else>
<property name="@{module}@{lang}_fullname" value="@{module}_@{lang}" />
</else>
</if>
+
+ <if>
+ <available file="@{dir}/${@{module}@{lang}_fullname}.pres" />
+ <then>
+ <mkdir dir="${component.langbuilddir}" />
+ <java jar="${rhino.jar}" fork="true" failonerror="true">
+ <jvmarg value="-Dfile.encoding=utf-8" />
+ <arg file="${yrb2jsonconsole.js}" />
+ <arg file="${yrb2jsonsrc.js}" />
+ <arg file="@{dir}/${@{module}@{lang}_fullname}.pres" />
+ <arg file="${component.langbuilddir}/${@{module}@{lang}_fullname}.js" />
+ </java>
+ <echo level="info">Wrapping ${component.langbuilddir}/${@{module}@{lang}_fullname}.js in YUI.add, Y.Intl.add</echo>
+ <loadfile srcfile="${component.langbuilddir}/${@{module}@{lang}_fullname}.js" property="@{module}@{lang}-strs-loaded" encoding="utf-8" />
+ </then>
+ <else>
+ <echo level="info">Wrapping @{dir}/${@{module}@{lang}_fullname}.js in YUI.add, Y.Intl.add</echo>
+ <loadfile srcfile="@{dir}/${@{module}@{lang}_fullname}.js" property="@{module}@{lang}-strs-loaded" encoding="utf-8" />
+ </else>
+ </if>
- <loadfile srcfile="@{dir}/${@{module}@{lang}_fullname}.js" property="@{module}@{lang}-strs-loaded" />
-
- <echo level="info">Wrapping @{dir}/${@{module}@{lang}_fullname}.js in YUI.add, Y.Intl.add</echo>
-
- <copy file="${builddir}/files/langtemplate.txt" tofile="@{dest}/${@{module}@{lang}_fullname}.js" overwrite="true">
+ <copy file="${builddir}/files/langtemplate.txt" tofile="@{dest}/${@{module}@{lang}_fullname}.js" overwrite="true" outputencoding="utf-8">
<filterset>
<filter token="LANG" value="@{lang}" />
<filter token="LANG_MODULE" value="lang/${@{module}@{lang}_fullname}" />
<filter token="STRINGS" value="${@{module}@{lang}-strs-loaded}" />
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}" />
<filter token="LANG_DETAILS" value="${@{module}@{lang}_details}" />
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addmodule">
<attribute name="file" />
<attribute name="module" />
<attribute name="details" default="" />
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}-details" value="" />
</then>
<else>
<property name="@{module}-details" value=",@{details}" />
</else>
</if>
<loadfile srcfile="@{file}" property="@{module}-@{file}-code" />
<echo level="info">Wrapping @{file} in YUI.add module</echo>
<copy file="${builddir}/files/moduletemplate.txt" tofile="@{file}" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{file}-code}" />
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}" />
<filter token="DETAILS" value="${@{module}-details}" />
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addrollup">
<attribute name="file" />
<attribute name="module" />
<attribute name="details" default="" />
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}-details" value="" />
</then>
<else>
<property name="@{module}-details" value=",@{details}" />
</else>
</if>
<loadfile srcfile="@{file}" property="@{module}-@{file}-code" />
<echo level="info">Adding Rollup @{file} using YUI.add</echo>
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{file}" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{file}-code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}"/>
<filter token="DETAILS" value="${@{module}-details}"/>
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addlangrollup">
<attribute name="module" />
<attribute name="dir" />
<sequential>
<echo level="info">Registering rollup info for lang files in @{dir} using YUI.add</echo>
<for list="${component.rollup.lang}" param="lang" trim="true">
<sequential>
<loadfile srcfile="@{dir}/@{module}_@{lang}.js" property="@{module}-@{lang}-code" />
<var name="lang.use" value="{use:[" />
<for list="${component.lang.use}" param="submod" trim="true">
<sequential>
<var name="lang.use" value="${lang.use}'lang/@{submod}_@{lang}'," />
</sequential>
</for>
<var name="lang.use" value="${lang.use}]}" />
<propertyregex property="@{module}-@{lang}-details"
input="${lang.use}"
regexp="(\,\s*?\])"
replace="]"
casesensitive="false" />
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{dir}/@{module}_@{lang}.js" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{lang}-code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="lang/@{module}_@{lang}"/>
<filter token="DETAILS" value=", ${@{module}-@{lang}-details}"/>
</filterset>
</copy>
</sequential>
</for>
<loadfile srcfile="@{dir}/@{module}.js" property="@{module}--code" />
<var name="lang.use" value="{use:[" />
<for list="${component.lang.use}" param="submod" trim="true">
<sequential>
<var name="lang.use" value="${lang.use}'lang/@{submod}'," />
</sequential>
</for>
<var name="lang.use" value="${lang.use}]}" />
<propertyregex property="@{module}--details"
input="${lang.use}"
regexp="(\,\s*?\])"
replace="]"
casesensitive="false" />
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{dir}/@{module}.js" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}--code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="lang/@{module}"/>
<filter token="DETAILS" value=", ${@{module}--details}"/>
</filterset>
</copy>
</sequential>
</macrodef>
</project>
diff --git a/componentbuild/shared/properties.xml b/componentbuild/shared/properties.xml
index 370c1bf..582fb0f 100644
--- a/componentbuild/shared/properties.xml
+++ b/componentbuild/shared/properties.xml
@@ -1,153 +1,158 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiSharedProperties">
<!-- ANT contrib library for loops, if/else support, with property fix for FOR task -->
<taskdef resource="antcontrib.properties">
<classpath>
<pathelement location="${builddir}/lib/ant-contrib/ant-contrib-1.0b3-modified.jar" />
</classpath>
</taskdef>
<dirname property="buildfile.dir" file="${ant.file}" />
<!--
builddir : The path to the builder/componentbuild directory from the component build file
srcdir : The path to top of the project source directory (e.g. yui2) from the component build file
-->
<property name="builddir" location="../../../builder/componentbuild" />
<property name="srcdir" location="../.." />
<!-- buildfiles.eol : End of line char to use for built files -->
<property name="buildfiles.eol" value="lf"/>
<!-- Supporting Tools -->
<property name="rhino.jar" location="${builddir}/lib/rhino/js.jar" />
<property name="jslintconsole.js" location="${builddir}/lib/jslint/jslint-console.js" />
<property name="jslintsrc.js" location="${builddir}/lib/jslint/fulljslint.js" />
<property name="yuicompressor.jar" location="${builddir}/lib/yuicompressor/yuicompressor-2.4.jar" />
+ <property name="yrb2jsonconsole.js" location="${builddir}/lib/yrb2json/yrb2json-console.js" />
+ <property name="yrb2jsonsrc.js" location="${builddir}/lib/yrb2json/yrb2json.js" />
<!-- YUI Compressor arguments for JS and CSS files -->
<property name="yuicompressor.css.args" value="--type css --line-break 6000" />
<property name="yuicompressor.js.args" value="--disable-optimizations --preserve-semi --line-break 6000" />
<property name="yuicompressor.js.charset" value="utf-8" />
<property name="yuicompressor.css.charset" value="utf-8" />
<!-- Enable/Disable YUI Compressor verbosity. NOTE: Checked in build files should not disable this flag -->
<property name="yuicompressor.js.verbose" value="true" />
<property name="yuicompressor.css.verbose" value="true" />
<condition property="yuicompressor.js.args.internal" value="-v --charset ${yuicompressor.js.charset} ${yuicompressor.js.args}" else="--charset ${yuicompressor.js.charset} ${yuicompressor.js.args}">
<istrue value="${yuicompressor.js.verbose}" />
</condition>
<condition property="yuicompressor.css.args.internal" value="-v --charset ${yuicompressor.css.charset} ${yuicompressor.css.args}" else="--charset ${yuicompressor.css.charset} ${yuicompressor.css.args}">
<istrue value="${yuicompressor.css.verbose}" />
</condition>
<!-- Top Level Build Directories (e.g. yui2/build, yui3/build)-->
<property name="global.build.base" location="${srcdir}/build" />
<property name="global.build.component" location="${global.build.base}/${component}" />
<property name="global.build.component.assets" location="${global.build.component}/assets" />
<!-- Component Properties -->
<property name="component.module" value="${component}" />
<property name="component.basedir" location="${buildfile.dir}" />
<property name="component.jsfiles.base" location="${component.basedir}/js" />
<property name="component.lang.base" location="${component.basedir}/lang" />
<property name="component.assets.flatten" value="true" />
<property name="component.assets.base" location="${component.basedir}/assets" />
<property name="component.assets.files" value="**/*" />
<property name="component.assets.legacy.flatten" value="true" />
<property name="component.assets.legacy.base" location="${component.assets.base}/legacy" />
<property name="component.assets.legacy.files" value="**/*" />
<property name="component.assets.skins.base" location="${component.assets.base}/skins" />
<property name="component.assets.skins.files" value="**/*" />
<condition property="component.skins.exist">
<and>
<available file="${component.assets.base}/${component}-core.css" type="file" />
<available file="${component.assets.base}/skins" type="dir" />
</and>
</condition>
<!-- component is part of a rollup build, so rollup skins to parent -->
<condition property="rollupskins">
<and>
<istrue value="${rollup}" />
<istrue value="${component.skins.exist}" />
</and>
</condition>
<available file="${component.assets.base}" type="dir" property="component.assets.exist"/>
<condition property="component.langs.exist">
<and>
<or>
<isset property="component.lang" />
<isset property="component.rollup.lang" />
</or>
</and>
</condition>
<condition property="rolluplangs">
<and>
<istrue value="${rollup}" />
<istrue value="${component.langs.exist}" />
</and>
</condition>
<!--
DEPRECATED: component.basefilename and component.releasetype are deprecated
We used to mark filenames with suffixes (-beta, -experimental), which we no longer do
-->
<condition property="component.basefilename" value="${component}" else="${component}">
<isset property="component.releasetype"/>
</condition>
<!-- Default logger regex values if not provided -->
<property name="component.logger.regex" value="^.*?(?:logger|YAHOO.log).*?(?:;|\).*;|(?:\r?\n.*?)*?\).*;).*;?.*?\r?\n" />
<property name="component.logger.regex.replace" value="" />
<property name="component.logger.regex.flags" value="mg" />
<property name="component.logger.regex.byline" value="false" />
<!-- Rollup support, currently only used for YUI 3 -->
<property name="component.rollup" value="false"/>
<property name="component.rollup.target" value="all"/>
<condition property="component.builddir" value="${component.basedir}/build_rollup_tmp" else="${component.basedir}/build_tmp">
<istrue value="${component.rollup}"/>
</condition>
<condition property="rollup.skins.exist">
<and>
<istrue value="${component.rollup}" />
<available file="${component.assets.base}/skins" type="dir" />
</and>
</condition>
<condition property="skins.exist">
<or>
<istrue value="${rollup.skins.exist}" />
<istrue value="${component.skins.exist}" />
</or>
</condition>
<!-- The temporary working directory used by the build process -->
<property name="workingdir" location="${component.builddir}/ant" />
+
+ <!-- Directory for language resource bundles in JSON format derived from YRB format -->
+ <property name="component.langbuilddir" value="${component.basedir}/build_lang_tmp" />
<!-- The file which defines the default targets for the particular type of component (module, rollup, css) -->
<condition property="targetbase" value="rollup" else="module">
<istrue value="${component.rollup}"/>
</condition>
<condition property="targets" value="${builddir}/shared/cssmodule.xml" else="${targetbase}.xml">
<isset property="component.cssfiles" />
</condition>
</project>
|
yui/builder
|
fabdfb9dc1ea4f2d62afe0b9c2757b672db6c481
|
Added preview of the 2.4.3 release of the compressor
|
diff --git a/componentbuild/lib/yuicompressor/yuicompressor-2.4.3pr1.jar b/componentbuild/lib/yuicompressor/yuicompressor-2.4.3pr1.jar
new file mode 100644
index 0000000..34e3104
Binary files /dev/null and b/componentbuild/lib/yuicompressor/yuicompressor-2.4.3pr1.jar differ
|
yui/builder
|
422b2389d81a61aacc99091aa654b08993265bd1
|
Only building min version of lang packs, to avoid file explosion. Since the lang packs are basically json structures, supporing raw and debug versions doesn't seem as valuable
|
diff --git a/componentbuild/3.x/module.xml b/componentbuild/3.x/module.xml
index 115acfa..419dec7 100644
--- a/componentbuild/3.x/module.xml
+++ b/componentbuild/3.x/module.xml
@@ -1,96 +1,95 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiModuleTargets">
<import file="${builddir}/shared/targets.xml" description="Targets common to Rollup/Module" />
<target name="build" depends="buildcore, -rollupjs, buildskins, buildlangs" />
<target name="buildskins" depends="-buildskins, -rollupcss" />
<target name="buildlangs" depends="-buildlangs, -rolluplangs" />
<!-- CORE -->
<target name="buildcore" depends="builddebug, -createcore, -loggerregex" description="Create component.js">
<fixcrlf srcdir="${component.builddir}" includes="${component.basefilename}.js" eol="${buildfiles.eol}" />
</target>
<target name="-createcore">
<copy file="${component.builddir}/${component.basefilename}-debug.js" tofile="${component.builddir}/${component.basefilename}.js" />
</target>
<target name="-loggerregex" description="Replace logger statements" unless="component.logger.regex.skip">
<echo level="info">Replacing Logger Statements in ${component.builddir}/${component.basefilename}.js</echo>
<replaceregexp file="${component.builddir}/${component.basefilename}.js"
byline="${component.logger.regex.byline}"
match="${component.logger.regex}"
replace="${component.logger.regex.replace}"
flags="${component.logger.regex.flags}" />
</target>
<!-- DEBUG -->
<target name="builddebug" depends="-concatdebug, -registerdebug, -prependdebug, -appenddebug" description="Create component-debug.js">
<fixcrlf srcdir="${component.builddir}" includes="${component.basefilename}-debug.js" eol="${buildfiles.eol}" />
</target>
<target name="-concatdebug">
<concatsource destfile="${component.builddir}/${component.basefilename}-debug.js" sourcedir="${component.jsfiles.base}" sourcefiles="${component.jsfiles}" />
</target>
<target name="-registerdebug" unless="register.skip">
<addmodule module="${component.module}" file="${component.builddir}/${component.basefilename}-debug.js" details="${component.details.hash}" />
</target>
<target name="-rollupjs" if="rollup">
<echo level="info">Rolling up ${component.basefilename}-debug.js into ${rollup.component.basefilename}-debug.js</echo>
<concat destfile="${rollup.builddir}/${rollup.component.basefilename}.js" append="true" fixlastline="true">
<filelist dir="${component.builddir}" files="${component.basefilename}.js" />
</concat>
<concat destfile="${rollup.builddir}/${rollup.component.basefilename}-debug.js" append="true" fixlastline="true">
<filelist dir="${component.builddir}" files="${component.basefilename}-debug.js" />
</concat>
</target>
<!-- SKINS -->
<target name="-buildskins" depends="-concatskins" description="Create skin rollup in local component build directory" if="component.skins.exist">
<fixcrlf srcdir="${component.builddir}/assets/skins/sam" includes="${component}.css" eol="${buildfiles.eol}" />
</target>
<target name="-buildlangs" description="Create language packs in the local component build directory" if="component.langs.exist">
<mkdir dir="${component.builddir}/lang" />
- <!-- TODO: Break compress/concat out into separate pieces -->
<for list="${component.lang}" param="lang" trim="true">
<sequential>
<addlang dir="${component.lang.base}" module="${component}" lang="@{lang}" dest="${component.builddir}/lang" />
</sequential>
</for>
<addlang dir="${component.lang.base}" module="${component}" lang="" dest="${component.builddir}/lang/" />
</target>
<target name="-rolluplangs" if="rolluplangs">
<for list="${component.lang}" param="lang" trim="true">
<sequential>
<concat destfile="${rollup.builddir}/lang/${rollup.component}_@{lang}.js" append="true" fixlastline="true">
<fileset dir="${component.builddir}/lang" includes="*_@{lang}.js" />
</concat>
</sequential>
</for>
<concat destfile="${rollup.builddir}/lang/${rollup.component}.js" append="true" fixlastline="true">
<filelist dir="${component.builddir}/lang" files="${component}.js" />
</concat>
</target>
<target name="-concatskins" if="component.skins.exist">
<concatsource destfile="${component.builddir}/assets/skins/sam/${component}.css" sourcedir="${component.assets.base}" sourcefiles="${component}-core.css, skins/sam/${component}-skin.css" />
<yuicompress src="${component.builddir}/assets/skins/sam/${component}.css" dest="${component.builddir}/assets/skins/sam/${component}.css" args="${yuicompressor.css.args.internal}" />
</target>
<target name="-rollupcss" if="rollupskins">
<echo level="info">Rolling up ${component}.css into ${rollup.component}.css</echo>
<concat destfile="${rollup.builddir}/assets/skins/sam/${rollup.component}.css" append="true" fixlastline="true">
<filelist dir="${component.builddir}/assets/skins/sam" files="${component}.css" />
</concat>
</target>
</project>
\ No newline at end of file
diff --git a/componentbuild/shared/macrolib.xml b/componentbuild/shared/macrolib.xml
index d68cea6..7ea87b8 100644
--- a/componentbuild/shared/macrolib.xml
+++ b/componentbuild/shared/macrolib.xml
@@ -1,329 +1,329 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiMacroLib">
<macrodef name="arrayliteral">
<attribute name="from" />
<attribute name="to" />
<attribute name="key" />
<sequential>
<if>
<and>
<isset property="@{from}" />
<length string="${@{from}}" when="ne" length="0" />
</and>
<then>
<propertyregex property="array"
override="true"
input="${@{from}}"
casesensitive="false"
regexp="([^\,\s]+)"
replace="'\1'"
/>
<property name="@{to}" value="@{key}:[${array}]" />
</then>
</if>
</sequential>
</macrodef>
<macrodef name="createdetails">
<sequential>
<arrayliteral from="component.use" to="component.details.use" key="use" />
<arrayliteral from="component.supersedes" to="component.details.supersedes" key="supersedes" />
<arrayliteral from="component.requires" to="component.details.requires" key="requires" />
<arrayliteral from="component.optional" to="component.details.optional" key="optional" />
<arrayliteral from="component.lang" to="component.details.lang" key="lang" />
<if>
<isset property="component.skinnable" />
<then>
<property name="component.details.skinnable" value="skinnable:${component.skinnable}" />
</then>
</if>
<propertyselector property="details.list"
delimiter=","
match="component\.details.([^\.]*)"
select="\1"
casesensitive="false" />
<var name="details" value="" />
<if>
<isset property="details.list" />
<then>
<for list="${details.list}" param="val">
<sequential>
<var name="details" value="${component.details.@{val}}, ${details}" />
</sequential>
</for>
<propertyregex property="component.details.hash"
input="{${details}}"
regexp="(\,\s*?\})"
replace="}"
casesensitive="false" />
</then>
<else>
<property name="component.details.hash" value="" />
</else>
</if>
</sequential>
</macrodef>
<macrodef name="yuicompress">
<attribute name="src" />
<attribute name="dest" />
<attribute name="args" />
<sequential>
<echo level="info">Running yuicompressor on @{src}</echo>
<java jar="${yuicompressor.jar}" fork="true" failonerror="true">
<arg line="@{args} -o" />
<arg file="@{dest}" />
<arg file="@{src}" />
</java>
</sequential>
</macrodef>
<macrodef name="concatsource">
<attribute name="destfile" />
<attribute name="sourcedir" />
<attribute name="sourcefiles" />
<attribute name="workingdir" default="${workingdir}" />
<element name="filters" optional="true" description="Additonal filters to apply to individual files"/>
<sequential>
<echo level="info">Concatenating</echo>
<echo level="info"> Source Files : @{sourcefiles}</echo>
<echo level="info"> In Source Dir : @{sourcedir}</echo>
<echo level="info"> To : @{destfile}</echo>
<delete dir="@{workingdir}" quiet="true"/>
<copy todir="@{workingdir}">
<filelist dir="@{sourcedir}" files="@{sourcefiles}" />
<filterchain>
<filters />
<fixcrlf fixlast="true" eof="remove"/>
</filterchain>
</copy>
<concat destfile="@{destfile}" fixlastline="true">
<filelist dir="@{workingdir}" files="@{sourcefiles}" />
</concat>
<delete dir="${workingdir}" quiet="true" />
</sequential>
</macrodef>
<macrodef name="jslint">
<element name="jsfiles" optional="false" />
<sequential>
<!--
Need to find a way to convert fileset to args (script?) to
avoid ' ', which will break for files with ' in them
Evaluates to the following java execution line...
java -r js.jar jslintconsole.js 'file1.js' 'file2.js' 'file3.js'
-->
<pathconvert pathsep="' '" property="jsfileargs">
<jsfiles />
</pathconvert>
<java jar="${rhino.jar}" fork="true" failonerror="true">
<arg file="${jslintconsole.js}" />
<arg value="${jslintsrc.js}" />
<arg line="'${jsfileargs}'" />
</java>
</sequential>
</macrodef>
<macrodef name="registerversion">
<attribute name="module" />
<attribute name="classname" />
<attribute name="file" />
<sequential>
<loadfile srcfile="${builddir}/files/versioncode.txt" property="@{module}-@{classname}-version" >
<filterchain>
<replacetokens>
<token key="MODULE" value="@{module}"/>
<token key="CLASSNAME" value="@{classname}"/>
</replacetokens>
</filterchain>
</loadfile>
<echo level="info">Adding Version Registration Code to @{file}</echo>
<concat destfile="@{file}" append="true" fixlastline="true">${@{module}-@{classname}-version}</concat>
</sequential>
</macrodef>
<macrodef name="addlang">
<attribute name="dir" />
<attribute name="module" />
<attribute name="dest" />
<attribute name="lang" default="" />
<attribute name="details" default = ""/>
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}@{lang}_details" value="" />
</then>
<else>
<property name="@{module}@{lang}_details" value=",@{details}" />
</else>
</if>
<if>
<equals arg1="@{lang}" arg2="" />
<then>
<property name="@{module}@{lang}_fullname" value="@{module}" />
</then>
<else>
<property name="@{module}@{lang}_fullname" value="@{module}_@{lang}" />
</else>
</if>
<loadfile srcfile="@{dir}/${@{module}@{lang}_fullname}.js" property="@{module}@{lang}-strs-loaded" />
- <echo level="info">Wrapping @{dir}/${@{module}@{lang}_strs} in YUI.add, Y.Intl.add</echo>
+ <echo level="info">Wrapping @{dir}/${@{module}@{lang}_fullname}.js in YUI.add, Y.Intl.add</echo>
<copy file="${builddir}/files/langtemplate.txt" tofile="@{dest}/${@{module}@{lang}_fullname}.js" overwrite="true">
<filterset>
- <filter token="LANG" value="@{lang}" />
- <filter token="LANG_MODULE" value="lang/${@{module}@{lang}_fullname}" />
+ <filter token="LANG" value="@{lang}" />
+ <filter token="LANG_MODULE" value="lang/${@{module}@{lang}_fullname}" />
<filter token="STRINGS" value="${@{module}@{lang}-strs-loaded}" />
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}" />
<filter token="LANG_DETAILS" value="${@{module}@{lang}_details}" />
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addmodule">
<attribute name="file" />
<attribute name="module" />
<attribute name="details" default="" />
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}-details" value="" />
</then>
<else>
<property name="@{module}-details" value=",@{details}" />
</else>
</if>
<loadfile srcfile="@{file}" property="@{module}-@{file}-code" />
<echo level="info">Wrapping @{file} in YUI.add module</echo>
<copy file="${builddir}/files/moduletemplate.txt" tofile="@{file}" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{file}-code}" />
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}" />
<filter token="DETAILS" value="${@{module}-details}" />
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addrollup">
<attribute name="file" />
<attribute name="module" />
<attribute name="details" default="" />
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}-details" value="" />
</then>
<else>
<property name="@{module}-details" value=",@{details}" />
</else>
</if>
<loadfile srcfile="@{file}" property="@{module}-@{file}-code" />
<echo level="info">Adding Rollup @{file} using YUI.add</echo>
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{file}" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{file}-code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}"/>
<filter token="DETAILS" value="${@{module}-details}"/>
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addlangrollup">
<attribute name="module" />
<attribute name="dir" />
<sequential>
<echo level="info">Registering rollup info for lang files in @{dir} using YUI.add</echo>
<for list="${component.rollup.lang}" param="lang" trim="true">
<sequential>
<loadfile srcfile="@{dir}/@{module}_@{lang}.js" property="@{module}-@{lang}-code" />
<var name="lang.use" value="{use:[" />
<for list="${component.lang.use}" param="submod" trim="true">
<sequential>
<var name="lang.use" value="${lang.use}'lang/@{submod}_@{lang}'," />
</sequential>
</for>
<var name="lang.use" value="${lang.use}]}" />
<propertyregex property="@{module}-@{lang}-details"
input="${lang.use}"
regexp="(\,\s*?\])"
replace="]"
casesensitive="false" />
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{dir}/@{module}_@{lang}.js" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{lang}-code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="lang/@{module}_@{lang}"/>
<filter token="DETAILS" value=", ${@{module}-@{lang}-details}"/>
</filterset>
</copy>
</sequential>
</for>
<loadfile srcfile="@{dir}/@{module}.js" property="@{module}--code" />
<var name="lang.use" value="{use:[" />
<for list="${component.lang.use}" param="submod" trim="true">
<sequential>
<var name="lang.use" value="${lang.use}'lang/@{submod}'," />
</sequential>
</for>
<var name="lang.use" value="${lang.use}]}" />
<propertyregex property="@{module}--details"
input="${lang.use}"
regexp="(\,\s*?\])"
replace="]"
casesensitive="false" />
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{dir}/@{module}.js" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}--code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="lang/@{module}"/>
<filter token="DETAILS" value=", ${@{module}--details}"/>
</filterset>
</copy>
</sequential>
</macrodef>
</project>
diff --git a/componentbuild/shared/targets.xml b/componentbuild/shared/targets.xml
index 4431e2e..0cb3225 100644
--- a/componentbuild/shared/targets.xml
+++ b/componentbuild/shared/targets.xml
@@ -1,154 +1,153 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiSharedTargets">
<echo level="info">Starting Build For ${component}</echo>
<echo level="info">Ant Properties</echo>
<echo level="info"> Home : ${ant.home}</echo>
<echo level="info"> Ant Version : ${ant.version}</echo>
<echo level="info"> Build File : ${ant.file}</echo>
<echo level="info">Local Build Properties</echo>
<echo level="info"> version : ${yui.version}</echo>
<echo level="info"> srcdir : ${srcdir}</echo>
<echo level="info"> builddir : ${builddir}</echo>
<echo level="info"> component : ${component}</echo>
<echo level="info"> component.basefilename : ${component.basefilename}</echo>
<echo level="info"> component.basedir : ${component.basedir}</echo>
<echo level="info"> component.builddir : ${component.builddir}</echo>
<echo level="info">Global Build Properties</echo>
<echo level="info"> global.build.base : ${global.build.base}</echo>
<echo level="info"> global.build.component : ${global.build.component}</echo>
<echo level="info"> global.build.component.assets : ${global.build.component.assets}</echo>
<import file="${builddir}/shared/macrolib.xml" description="Macrodef definitions - jslint, yuicompessor, registerversion" />
<target name="all" depends="local, deploy" description="Build and Deploy to Global Build Directory" />
<target name="local" depends="clean, init, build, minify, lint" description="Build and Deploy to Local Build Directory" />
<target name="init">
<tstamp/>
<mkdir dir="${component.builddir}" />
<createdetails />
</target>
<target name="clean" description="Clean Local Build Directory" unless="clean.skip">
<delete dir="${component.builddir}" />
</target>
<target name="build" />
<!-- MIN -->
<target name="minify" description="Create component-min.js from component.js">
<yuicompress src="${component.builddir}/${component.basefilename}.js" dest="${component.builddir}/${component.basefilename}-min.js" args="${yuicompressor.js.args.internal}" />
<if>
<available file="${component.builddir}/lang" type="dir" />
<then>
<for param="file">
<path>
<fileset dir="${component.builddir}/lang" includes="*.js"/>
</path>
<sequential>
- <basename file="@{file}" property="@{file}" suffix=".js" />
- <yuicompress src="@{file}" dest="${component.builddir}/lang/${@{file}}-min.js" args="${yuicompressor.js.args.internal}" />
+ <yuicompress src="@{file}" dest="@{file}" args="${yuicompressor.js.args.internal}" />
</sequential>
</for>
</then>
</if>
</target>
<target name="lint" description="Run jslint over the local build files (default settings)" unless="lint.skip">
<jslint>
<jsfiles>
<fileset dir="${component.builddir}" includes="*.js" />
</jsfiles>
</jslint>
</target>
<!-- DEPLOY -->
<target name="deploy" description="Copy files to global location" depends="deploybuild, deployassets, deployskins, deploylang, deploydocs"></target>
<target name="deploybuild" description="Copy built files to global build location">
<copy todir="${global.build.component}" preservelastmodified="true">
<fileset dir="${component.builddir}" includes="*.js" />
</copy>
</target>
<target name="deployassets" if="component.assets.exist">
<copy todir="${global.build.component.assets}" flatten="${component.assets.flatten}" preservelastmodified="true">
<fileset dir="${component.assets.base}" includes="${component.assets.files}" excludes="skins/, legacy/" />
</copy>
<copy todir="${global.build.component.assets}" flatten="${component.assets.legacy.flatten}" preservelastmodified="true" failonerror="false">
<fileset dir="${component.assets.legacy.base}" includes="${component.assets.legacy.files}" excludes="skins/" />
</copy>
</target>
<target name="deployskins" if="skins.exist">
<copy todir="${global.build.component.assets}/skins/sam" preservelastmodified="true">
<fileset dir="${component.builddir}/assets/skins/sam" includes="${component}.css" />
</copy>
<copy todir="${global.build.component.assets}/skins/sam" preservelastmodified="true">
<fileset dir="${component.assets.skins.base}/sam" includes="${component.assets.skins.files}" />
</copy>
</target>
<target name="deploylang" description="Copy language bundles to global build location">
<copy todir="${global.build.component}/lang" preservelastmodified="true" failonerror="false">
<fileset dir="${component.builddir}/lang" includes="*.js" />
</copy>
</target>
<target name="deploydocs" description="Copy doc files to global doc locations">
<!-- TODO -->
</target>
<target name="-prepend" if="component.prependfiles">
<concat destfile="${workingdir}/${component.basefilename}.js.tmp" fixlastline="true">
<filelist dir="${component.basedir}" files="${component.prependfiles}" />
<filterchain>
<tokenfilter>
<filetokenizer/>
<replaceregex
pattern="${component.logger.regex}"
replace="${component.logger.regex.replace}"
flags="${component.logger.regex.flags}" />
</tokenfilter>
</filterchain>
</concat>
<concat destfile="${workingdir}/${component.basefilename}.js.tmp" fixlastline="true" append="true">
<filelist dir="${component.builddir}" files="${component.basefilename}.js" />
</concat>
<move file="${workingdir}/${component.basefilename}.js.tmp" tofile="${component.builddir}/${component.basefilename}.js" />
</target>
<target name="-append" if="component.appendfiles">
<concat destfile="${component.builddir}/${component.basefilename}.js" fixlastline="true" append="true">
<filelist dir="${component.basedir}" files="${component.appendfiles}" />
<filterchain>
<tokenfilter>
<filetokenizer/>
<replaceregex
pattern="${component.logger.regex}"
replace="${component.logger.regex.replace}"
flags="${component.logger.regex.flags}" />
</tokenfilter>
</filterchain>
</concat>
</target>
<target name="-prependdebug" if="component.prependfiles">
<concat destfile="${workingdir}/${component.basefilename}-debug.js.tmp" fixlastline="true" >
<filelist dir="${component.basedir}" files="${component.prependfiles}" />
<filelist dir="${component.builddir}" files="${component.basefilename}-debug.js" />
</concat>
<move file="${workingdir}/${component.basefilename}-debug.js.tmp" tofile="${component.builddir}/${component.basefilename}-debug.js" />
</target>
<target name="-appenddebug" if="component.appendfiles">
<concat destfile="${component.builddir}/${component.basefilename}-debug.js" fixlastline="true" append="true">
<filelist dir="${component.basedir}" files="${component.appendfiles}" />
</concat>
</target>
</project>
|
yui/builder
|
937cc5955400cd5e8cd306e6bfc3f66a88965d84
|
Rollup lang support fixed - now adds rollup YUI.add correctly
|
diff --git a/componentbuild/3.x/module.xml b/componentbuild/3.x/module.xml
index b9dbbb9..115acfa 100644
--- a/componentbuild/3.x/module.xml
+++ b/componentbuild/3.x/module.xml
@@ -1,104 +1,96 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiModuleTargets">
<import file="${builddir}/shared/targets.xml" description="Targets common to Rollup/Module" />
<target name="build" depends="buildcore, -rollupjs, buildskins, buildlangs" />
<target name="buildskins" depends="-buildskins, -rollupcss" />
<target name="buildlangs" depends="-buildlangs, -rolluplangs" />
<!-- CORE -->
<target name="buildcore" depends="builddebug, -createcore, -loggerregex" description="Create component.js">
<fixcrlf srcdir="${component.builddir}" includes="${component.basefilename}.js" eol="${buildfiles.eol}" />
</target>
<target name="-createcore">
<copy file="${component.builddir}/${component.basefilename}-debug.js" tofile="${component.builddir}/${component.basefilename}.js" />
</target>
<target name="-loggerregex" description="Replace logger statements" unless="component.logger.regex.skip">
<echo level="info">Replacing Logger Statements in ${component.builddir}/${component.basefilename}.js</echo>
<replaceregexp file="${component.builddir}/${component.basefilename}.js"
byline="${component.logger.regex.byline}"
match="${component.logger.regex}"
replace="${component.logger.regex.replace}"
flags="${component.logger.regex.flags}" />
</target>
<!-- DEBUG -->
<target name="builddebug" depends="-concatdebug, -registerdebug, -prependdebug, -appenddebug" description="Create component-debug.js">
<fixcrlf srcdir="${component.builddir}" includes="${component.basefilename}-debug.js" eol="${buildfiles.eol}" />
</target>
<target name="-concatdebug">
<concatsource destfile="${component.builddir}/${component.basefilename}-debug.js" sourcedir="${component.jsfiles.base}" sourcefiles="${component.jsfiles}" />
</target>
<target name="-registerdebug" unless="register.skip">
<addmodule module="${component.module}" file="${component.builddir}/${component.basefilename}-debug.js" details="${component.details.hash}" />
</target>
<target name="-rollupjs" if="rollup">
<echo level="info">Rolling up ${component.basefilename}-debug.js into ${rollup.component.basefilename}-debug.js</echo>
<concat destfile="${rollup.builddir}/${rollup.component.basefilename}.js" append="true" fixlastline="true">
<filelist dir="${component.builddir}" files="${component.basefilename}.js" />
</concat>
<concat destfile="${rollup.builddir}/${rollup.component.basefilename}-debug.js" append="true" fixlastline="true">
<filelist dir="${component.builddir}" files="${component.basefilename}-debug.js" />
</concat>
</target>
<!-- SKINS -->
<target name="-buildskins" depends="-concatskins" description="Create skin rollup in local component build directory" if="component.skins.exist">
<fixcrlf srcdir="${component.builddir}/assets/skins/sam" includes="${component}.css" eol="${buildfiles.eol}" />
</target>
<target name="-buildlangs" description="Create language packs in the local component build directory" if="component.langs.exist">
<mkdir dir="${component.builddir}/lang" />
<!-- TODO: Break compress/concat out into separate pieces -->
<for list="${component.lang}" param="lang" trim="true">
<sequential>
<addlang dir="${component.lang.base}" module="${component}" lang="@{lang}" dest="${component.builddir}/lang" />
- <yuicompress src="${component.builddir}/lang/${component}_@{lang}.js" dest="${component.builddir}/lang/${component}_@{lang}-min.js" args="${yuicompressor.js.args.internal}" />
</sequential>
</for>
<addlang dir="${component.lang.base}" module="${component}" lang="" dest="${component.builddir}/lang/" />
- <yuicompress src="${component.builddir}/lang/${component}.js" dest="${component.builddir}/lang/${component}-min.js" args="${yuicompressor.js.args.internal}" />
</target>
<target name="-rolluplangs" if="rolluplangs">
<for list="${component.lang}" param="lang" trim="true">
<sequential>
<concat destfile="${rollup.builddir}/lang/${rollup.component}_@{lang}.js" append="true" fixlastline="true">
<fileset dir="${component.builddir}/lang" includes="*_@{lang}.js" />
</concat>
- <concat destfile="${rollup.builddir}/lang/${rollup.component}_@{lang}-min.js" append="true" fixlastline="true">
- <fileset dir="${component.builddir}/lang" includes="*_@{lang}-min.js" />
- </concat>
</sequential>
</for>
<concat destfile="${rollup.builddir}/lang/${rollup.component}.js" append="true" fixlastline="true">
<filelist dir="${component.builddir}/lang" files="${component}.js" />
</concat>
- <concat destfile="${rollup.builddir}/lang/${rollup.component}-min.js" append="true" fixlastline="true">
- <filelist dir="${component.builddir}/lang" files="${component}-min.js" />
- </concat>
</target>
<target name="-concatskins" if="component.skins.exist">
<concatsource destfile="${component.builddir}/assets/skins/sam/${component}.css" sourcedir="${component.assets.base}" sourcefiles="${component}-core.css, skins/sam/${component}-skin.css" />
<yuicompress src="${component.builddir}/assets/skins/sam/${component}.css" dest="${component.builddir}/assets/skins/sam/${component}.css" args="${yuicompressor.css.args.internal}" />
</target>
<target name="-rollupcss" if="rollupskins">
<echo level="info">Rolling up ${component}.css into ${rollup.component}.css</echo>
<concat destfile="${rollup.builddir}/assets/skins/sam/${rollup.component}.css" append="true" fixlastline="true">
<filelist dir="${component.builddir}/assets/skins/sam" files="${component}.css" />
</concat>
</target>
</project>
\ No newline at end of file
diff --git a/componentbuild/3.x/rollup.xml b/componentbuild/3.x/rollup.xml
index cba77fd..70c665b 100644
--- a/componentbuild/3.x/rollup.xml
+++ b/componentbuild/3.x/rollup.xml
@@ -1,62 +1,60 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiRollupTargets">
<import file="${builddir}/shared/targets.xml" description="Targets common to Rollup/Module" />
<target name="build" depends="buildmodules" description="Create component.js"></target>
<target name="buildmodules" depends="-buildmodules, -registerall, -prependall, -appendall, -rollupjs, -rolluplangs">
<fixcrlf srcdir="${component.builddir}" eol="${buildfiles.eol}" />
</target>
<target name="-buildmodules">
<subant target="${component.rollup.target}" inheritall="false" >
<filelist dir="${buildfile.dir}" files="${component.rollup.modules.buildfiles}" />
<property name="rollup" value="true" />
<property name="rollup.builddir" value="${component.builddir}" />
<property name="rollup.component" value="${component}" />
<property name="rollup.component.basefilename" value="${component.basefilename}" />
</subant>
</target>
<target name="-rollupjs" if="rollup">
<echo level="info">Rolling up ${component.basefilename}-debug.js into ${rollup.component.basefilename}-debug.js</echo>
<concat destfile="${rollup.builddir}/${rollup.component.basefilename}.js" append="true" fixlastline="true" >
<filelist dir="${component.builddir}" files="${component.basefilename}.js" />
</concat>
<concat destfile="${rollup.builddir}/${rollup.component.basefilename}-debug.js" append="true" fixlastline="true">
<filelist dir="${component.builddir}" files="${component.basefilename}-debug.js" />
</concat>
</target>
<target name="-rolluplangs" if="rolluplangs">
- <echo>${component}</echo>
- <echo>${component.lang}</echo>
- <echo>${component.langs.exist}</echo>
- <for list="${component.lang}" param="lang" trim="true">
+ <for list="${component.rollup.lang}" param="lang" trim="true">
<sequential>
<concat destfile="${rollup.builddir}/lang/${rollup.component}_@{lang}.js" append="true" fixlastline="true">
<fileset dir="${component.builddir}/lang" includes="*_@{lang}.js" />
</concat>
- <concat destfile="${rollup.builddir}/lang/${rollup.component}_@{lang}-min.js" append="true" fixlastline="true">
- <fileset dir="${component.builddir}/lang" includes="*_@{lang}-min.js" />
- </concat>
</sequential>
</for>
<concat destfile="${rollup.builddir}/lang/${rollup.component}.js" append="true" fixlastline="true">
<filelist dir="${component.builddir}/lang" files="${component}.js" />
</concat>
- <concat destfile="${rollup.builddir}/lang/${rollup.component}-min.js" append="true" fixlastline="true">
- <filelist dir="${component.builddir}/lang" files="${component}-min.js" />
- </concat>
</target>
<target name="-prependall" depends="-prependdebug, -prepend" if="component.prependfiles" />
<target name="-appendall" depends="-appenddebug, -append" if="component.appendfiles" />
<target name="-registerall" unless="register.skip">
<addrollup module="${component.module}" file="${component.builddir}/${component.basefilename}-debug.js" details="${component.details.hash}" />
<addrollup module="${component.module}" file="${component.builddir}/${component.basefilename}.js" details="${component.details.hash}" />
+
+ <if>
+ <available file="${component.builddir}/lang/" type="dir" />
+ <then>
+ <addlangrollup module="${component.module}" dir="${component.builddir}/lang/" />
+ </then>
+ </if>
</target>
</project>
diff --git a/componentbuild/shared/macrolib.xml b/componentbuild/shared/macrolib.xml
index ffde60e..d68cea6 100644
--- a/componentbuild/shared/macrolib.xml
+++ b/componentbuild/shared/macrolib.xml
@@ -1,263 +1,329 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiMacroLib">
<macrodef name="arrayliteral">
<attribute name="from" />
<attribute name="to" />
<attribute name="key" />
<sequential>
<if>
<and>
<isset property="@{from}" />
<length string="${@{from}}" when="ne" length="0" />
</and>
<then>
<propertyregex property="array"
override="true"
input="${@{from}}"
casesensitive="false"
regexp="([^\,\s]+)"
replace="'\1'"
/>
<property name="@{to}" value="@{key}:[${array}]" />
</then>
</if>
</sequential>
</macrodef>
<macrodef name="createdetails">
<sequential>
<arrayliteral from="component.use" to="component.details.use" key="use" />
<arrayliteral from="component.supersedes" to="component.details.supersedes" key="supersedes" />
<arrayliteral from="component.requires" to="component.details.requires" key="requires" />
<arrayliteral from="component.optional" to="component.details.optional" key="optional" />
<arrayliteral from="component.lang" to="component.details.lang" key="lang" />
<if>
<isset property="component.skinnable" />
<then>
<property name="component.details.skinnable" value="skinnable:${component.skinnable}" />
</then>
</if>
<propertyselector property="details.list"
delimiter=","
match="component\.details.([^\.]*)"
select="\1"
casesensitive="false" />
<var name="details" value="" />
<if>
<isset property="details.list" />
<then>
<for list="${details.list}" param="val">
<sequential>
<var name="details" value="${component.details.@{val}}, ${details}" />
</sequential>
</for>
<propertyregex property="component.details.hash"
input="{${details}}"
regexp="(\,\s*?\})"
replace="}"
casesensitive="false" />
</then>
<else>
<property name="component.details.hash" value="" />
</else>
</if>
</sequential>
</macrodef>
<macrodef name="yuicompress">
<attribute name="src" />
<attribute name="dest" />
<attribute name="args" />
<sequential>
<echo level="info">Running yuicompressor on @{src}</echo>
<java jar="${yuicompressor.jar}" fork="true" failonerror="true">
<arg line="@{args} -o" />
<arg file="@{dest}" />
<arg file="@{src}" />
</java>
</sequential>
</macrodef>
<macrodef name="concatsource">
<attribute name="destfile" />
<attribute name="sourcedir" />
<attribute name="sourcefiles" />
<attribute name="workingdir" default="${workingdir}" />
<element name="filters" optional="true" description="Additonal filters to apply to individual files"/>
<sequential>
<echo level="info">Concatenating</echo>
<echo level="info"> Source Files : @{sourcefiles}</echo>
<echo level="info"> In Source Dir : @{sourcedir}</echo>
<echo level="info"> To : @{destfile}</echo>
<delete dir="@{workingdir}" quiet="true"/>
<copy todir="@{workingdir}">
<filelist dir="@{sourcedir}" files="@{sourcefiles}" />
<filterchain>
<filters />
<fixcrlf fixlast="true" eof="remove"/>
</filterchain>
</copy>
<concat destfile="@{destfile}" fixlastline="true">
<filelist dir="@{workingdir}" files="@{sourcefiles}" />
</concat>
<delete dir="${workingdir}" quiet="true" />
</sequential>
</macrodef>
<macrodef name="jslint">
<element name="jsfiles" optional="false" />
<sequential>
<!--
Need to find a way to convert fileset to args (script?) to
avoid ' ', which will break for files with ' in them
Evaluates to the following java execution line...
java -r js.jar jslintconsole.js 'file1.js' 'file2.js' 'file3.js'
-->
<pathconvert pathsep="' '" property="jsfileargs">
<jsfiles />
</pathconvert>
<java jar="${rhino.jar}" fork="true" failonerror="true">
<arg file="${jslintconsole.js}" />
<arg value="${jslintsrc.js}" />
<arg line="'${jsfileargs}'" />
</java>
</sequential>
</macrodef>
<macrodef name="registerversion">
<attribute name="module" />
<attribute name="classname" />
<attribute name="file" />
<sequential>
<loadfile srcfile="${builddir}/files/versioncode.txt" property="@{module}-@{classname}-version" >
<filterchain>
<replacetokens>
<token key="MODULE" value="@{module}"/>
<token key="CLASSNAME" value="@{classname}"/>
</replacetokens>
</filterchain>
</loadfile>
<echo level="info">Adding Version Registration Code to @{file}</echo>
<concat destfile="@{file}" append="true" fixlastline="true">${@{module}-@{classname}-version}</concat>
</sequential>
</macrodef>
<macrodef name="addlang">
<attribute name="dir" />
<attribute name="module" />
<attribute name="dest" />
<attribute name="lang" default="" />
<attribute name="details" default = ""/>
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}@{lang}_details" value="" />
</then>
<else>
<property name="@{module}@{lang}_details" value=",@{details}" />
</else>
</if>
<if>
<equals arg1="@{lang}" arg2="" />
<then>
- <property name="@{module}@{lang}_strs" value="@{module}.js" />
+ <property name="@{module}@{lang}_fullname" value="@{module}" />
</then>
<else>
- <property name="@{module}@{lang}_strs" value="@{module}_@{lang}.js" />
+ <property name="@{module}@{lang}_fullname" value="@{module}_@{lang}" />
</else>
</if>
- <loadfile srcfile="@{dir}/${@{module}@{lang}_strs}" property="@{module}@{lang}-strs-loaded" />
+ <loadfile srcfile="@{dir}/${@{module}@{lang}_fullname}.js" property="@{module}@{lang}-strs-loaded" />
<echo level="info">Wrapping @{dir}/${@{module}@{lang}_strs} in YUI.add, Y.Intl.add</echo>
- <copy file="${builddir}/files/langtemplate.txt" tofile="@{dest}/${@{module}@{lang}_strs}" overwrite="true">
+ <copy file="${builddir}/files/langtemplate.txt" tofile="@{dest}/${@{module}@{lang}_fullname}.js" overwrite="true">
<filterset>
- <!-- TODO - Integration -->
<filter token="LANG" value="@{lang}" />
- <filter token="LANG_MODULE" value="@{module};lang:@{lang}" />
+ <filter token="LANG_MODULE" value="lang/${@{module}@{lang}_fullname}" />
<filter token="STRINGS" value="${@{module}@{lang}-strs-loaded}" />
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}" />
<filter token="LANG_DETAILS" value="${@{module}@{lang}_details}" />
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addmodule">
<attribute name="file" />
<attribute name="module" />
<attribute name="details" default="" />
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}-details" value="" />
</then>
<else>
<property name="@{module}-details" value=",@{details}" />
</else>
</if>
<loadfile srcfile="@{file}" property="@{module}-@{file}-code" />
<echo level="info">Wrapping @{file} in YUI.add module</echo>
<copy file="${builddir}/files/moduletemplate.txt" tofile="@{file}" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{file}-code}" />
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}" />
<filter token="DETAILS" value="${@{module}-details}" />
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addrollup">
<attribute name="file" />
<attribute name="module" />
<attribute name="details" default="" />
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}-details" value="" />
</then>
<else>
<property name="@{module}-details" value=",@{details}" />
</else>
</if>
<loadfile srcfile="@{file}" property="@{module}-@{file}-code" />
<echo level="info">Adding Rollup @{file} using YUI.add</echo>
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{file}" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{file}-code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}"/>
<filter token="DETAILS" value="${@{module}-details}"/>
</filterset>
</copy>
</sequential>
</macrodef>
+ <macrodef name="addlangrollup">
+
+ <attribute name="module" />
+ <attribute name="dir" />
+
+ <sequential>
+ <echo level="info">Registering rollup info for lang files in @{dir} using YUI.add</echo>
+
+ <for list="${component.rollup.lang}" param="lang" trim="true">
+ <sequential>
+ <loadfile srcfile="@{dir}/@{module}_@{lang}.js" property="@{module}-@{lang}-code" />
+
+ <var name="lang.use" value="{use:[" />
+
+ <for list="${component.lang.use}" param="submod" trim="true">
+ <sequential>
+ <var name="lang.use" value="${lang.use}'lang/@{submod}_@{lang}'," />
+ </sequential>
+ </for>
+
+ <var name="lang.use" value="${lang.use}]}" />
+
+ <propertyregex property="@{module}-@{lang}-details"
+ input="${lang.use}"
+ regexp="(\,\s*?\])"
+ replace="]"
+ casesensitive="false" />
+
+ <copy file="${builddir}/files/rolluptemplate.txt" tofile="@{dir}/@{module}_@{lang}.js" overwrite="true">
+ <filterset>
+ <filter token="CODE" value="${@{module}-@{lang}-code}"/>
+ <filter token="YUIVAR" value="${yui.variable}" />
+ <filter token="MODULE" value="lang/@{module}_@{lang}"/>
+ <filter token="DETAILS" value=", ${@{module}-@{lang}-details}"/>
+ </filterset>
+ </copy>
+ </sequential>
+ </for>
+
+ <loadfile srcfile="@{dir}/@{module}.js" property="@{module}--code" />
+
+ <var name="lang.use" value="{use:[" />
+ <for list="${component.lang.use}" param="submod" trim="true">
+ <sequential>
+ <var name="lang.use" value="${lang.use}'lang/@{submod}'," />
+ </sequential>
+ </for>
+ <var name="lang.use" value="${lang.use}]}" />
+
+ <propertyregex property="@{module}--details"
+ input="${lang.use}"
+ regexp="(\,\s*?\])"
+ replace="]"
+ casesensitive="false" />
+
+ <copy file="${builddir}/files/rolluptemplate.txt" tofile="@{dir}/@{module}.js" overwrite="true">
+ <filterset>
+ <filter token="CODE" value="${@{module}--code}"/>
+ <filter token="YUIVAR" value="${yui.variable}" />
+ <filter token="MODULE" value="lang/@{module}"/>
+ <filter token="DETAILS" value=", ${@{module}--details}"/>
+ </filterset>
+ </copy>
+
+ </sequential>
+ </macrodef>
+
</project>
diff --git a/componentbuild/shared/properties.xml b/componentbuild/shared/properties.xml
index c409554..370c1bf 100644
--- a/componentbuild/shared/properties.xml
+++ b/componentbuild/shared/properties.xml
@@ -1,151 +1,153 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiSharedProperties">
<!-- ANT contrib library for loops, if/else support, with property fix for FOR task -->
<taskdef resource="antcontrib.properties">
<classpath>
<pathelement location="${builddir}/lib/ant-contrib/ant-contrib-1.0b3-modified.jar" />
</classpath>
</taskdef>
<dirname property="buildfile.dir" file="${ant.file}" />
<!--
builddir : The path to the builder/componentbuild directory from the component build file
srcdir : The path to top of the project source directory (e.g. yui2) from the component build file
-->
<property name="builddir" location="../../../builder/componentbuild" />
<property name="srcdir" location="../.." />
<!-- buildfiles.eol : End of line char to use for built files -->
<property name="buildfiles.eol" value="lf"/>
<!-- Supporting Tools -->
<property name="rhino.jar" location="${builddir}/lib/rhino/js.jar" />
<property name="jslintconsole.js" location="${builddir}/lib/jslint/jslint-console.js" />
<property name="jslintsrc.js" location="${builddir}/lib/jslint/fulljslint.js" />
<property name="yuicompressor.jar" location="${builddir}/lib/yuicompressor/yuicompressor-2.4.jar" />
<!-- YUI Compressor arguments for JS and CSS files -->
<property name="yuicompressor.css.args" value="--type css --line-break 6000" />
<property name="yuicompressor.js.args" value="--disable-optimizations --preserve-semi --line-break 6000" />
<property name="yuicompressor.js.charset" value="utf-8" />
<property name="yuicompressor.css.charset" value="utf-8" />
<!-- Enable/Disable YUI Compressor verbosity. NOTE: Checked in build files should not disable this flag -->
<property name="yuicompressor.js.verbose" value="true" />
<property name="yuicompressor.css.verbose" value="true" />
<condition property="yuicompressor.js.args.internal" value="-v --charset ${yuicompressor.js.charset} ${yuicompressor.js.args}" else="--charset ${yuicompressor.js.charset} ${yuicompressor.js.args}">
<istrue value="${yuicompressor.js.verbose}" />
</condition>
<condition property="yuicompressor.css.args.internal" value="-v --charset ${yuicompressor.css.charset} ${yuicompressor.css.args}" else="--charset ${yuicompressor.css.charset} ${yuicompressor.css.args}">
<istrue value="${yuicompressor.css.verbose}" />
</condition>
<!-- Top Level Build Directories (e.g. yui2/build, yui3/build)-->
<property name="global.build.base" location="${srcdir}/build" />
<property name="global.build.component" location="${global.build.base}/${component}" />
<property name="global.build.component.assets" location="${global.build.component}/assets" />
<!-- Component Properties -->
<property name="component.module" value="${component}" />
<property name="component.basedir" location="${buildfile.dir}" />
<property name="component.jsfiles.base" location="${component.basedir}/js" />
<property name="component.lang.base" location="${component.basedir}/lang" />
<property name="component.assets.flatten" value="true" />
<property name="component.assets.base" location="${component.basedir}/assets" />
<property name="component.assets.files" value="**/*" />
<property name="component.assets.legacy.flatten" value="true" />
<property name="component.assets.legacy.base" location="${component.assets.base}/legacy" />
<property name="component.assets.legacy.files" value="**/*" />
<property name="component.assets.skins.base" location="${component.assets.base}/skins" />
<property name="component.assets.skins.files" value="**/*" />
<condition property="component.skins.exist">
<and>
<available file="${component.assets.base}/${component}-core.css" type="file" />
<available file="${component.assets.base}/skins" type="dir" />
</and>
</condition>
<!-- component is part of a rollup build, so rollup skins to parent -->
<condition property="rollupskins">
<and>
<istrue value="${rollup}" />
<istrue value="${component.skins.exist}" />
</and>
</condition>
<available file="${component.assets.base}" type="dir" property="component.assets.exist"/>
<condition property="component.langs.exist">
<and>
- <isset property="component.lang" />
- <available file="${component.lang.base}" type="dir" />
+ <or>
+ <isset property="component.lang" />
+ <isset property="component.rollup.lang" />
+ </or>
</and>
</condition>
<condition property="rolluplangs">
<and>
<istrue value="${rollup}" />
<istrue value="${component.langs.exist}" />
</and>
</condition>
<!--
DEPRECATED: component.basefilename and component.releasetype are deprecated
We used to mark filenames with suffixes (-beta, -experimental), which we no longer do
-->
<condition property="component.basefilename" value="${component}" else="${component}">
<isset property="component.releasetype"/>
</condition>
<!-- Default logger regex values if not provided -->
<property name="component.logger.regex" value="^.*?(?:logger|YAHOO.log).*?(?:;|\).*;|(?:\r?\n.*?)*?\).*;).*;?.*?\r?\n" />
<property name="component.logger.regex.replace" value="" />
<property name="component.logger.regex.flags" value="mg" />
<property name="component.logger.regex.byline" value="false" />
<!-- Rollup support, currently only used for YUI 3 -->
<property name="component.rollup" value="false"/>
<property name="component.rollup.target" value="all"/>
<condition property="component.builddir" value="${component.basedir}/build_rollup_tmp" else="${component.basedir}/build_tmp">
<istrue value="${component.rollup}"/>
</condition>
<condition property="rollup.skins.exist">
<and>
<istrue value="${component.rollup}" />
<available file="${component.assets.base}/skins" type="dir" />
</and>
</condition>
<condition property="skins.exist">
<or>
<istrue value="${rollup.skins.exist}" />
<istrue value="${component.skins.exist}" />
</or>
</condition>
<!-- The temporary working directory used by the build process -->
<property name="workingdir" location="${component.builddir}/ant" />
<!-- The file which defines the default targets for the particular type of component (module, rollup, css) -->
<condition property="targetbase" value="rollup" else="module">
<istrue value="${component.rollup}"/>
</condition>
<condition property="targets" value="${builddir}/shared/cssmodule.xml" else="${targetbase}.xml">
<isset property="component.cssfiles" />
</condition>
</project>
diff --git a/componentbuild/shared/targets.xml b/componentbuild/shared/targets.xml
index 09f7875..4431e2e 100644
--- a/componentbuild/shared/targets.xml
+++ b/componentbuild/shared/targets.xml
@@ -1,140 +1,154 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiSharedTargets">
<echo level="info">Starting Build For ${component}</echo>
<echo level="info">Ant Properties</echo>
<echo level="info"> Home : ${ant.home}</echo>
<echo level="info"> Ant Version : ${ant.version}</echo>
<echo level="info"> Build File : ${ant.file}</echo>
<echo level="info">Local Build Properties</echo>
<echo level="info"> version : ${yui.version}</echo>
<echo level="info"> srcdir : ${srcdir}</echo>
<echo level="info"> builddir : ${builddir}</echo>
<echo level="info"> component : ${component}</echo>
<echo level="info"> component.basefilename : ${component.basefilename}</echo>
<echo level="info"> component.basedir : ${component.basedir}</echo>
<echo level="info"> component.builddir : ${component.builddir}</echo>
<echo level="info">Global Build Properties</echo>
<echo level="info"> global.build.base : ${global.build.base}</echo>
<echo level="info"> global.build.component : ${global.build.component}</echo>
<echo level="info"> global.build.component.assets : ${global.build.component.assets}</echo>
<import file="${builddir}/shared/macrolib.xml" description="Macrodef definitions - jslint, yuicompessor, registerversion" />
<target name="all" depends="local, deploy" description="Build and Deploy to Global Build Directory" />
<target name="local" depends="clean, init, build, minify, lint" description="Build and Deploy to Local Build Directory" />
<target name="init">
<tstamp/>
<mkdir dir="${component.builddir}" />
<createdetails />
</target>
<target name="clean" description="Clean Local Build Directory" unless="clean.skip">
<delete dir="${component.builddir}" />
</target>
<target name="build" />
<!-- MIN -->
<target name="minify" description="Create component-min.js from component.js">
<yuicompress src="${component.builddir}/${component.basefilename}.js" dest="${component.builddir}/${component.basefilename}-min.js" args="${yuicompressor.js.args.internal}" />
+ <if>
+ <available file="${component.builddir}/lang" type="dir" />
+ <then>
+ <for param="file">
+ <path>
+ <fileset dir="${component.builddir}/lang" includes="*.js"/>
+ </path>
+ <sequential>
+ <basename file="@{file}" property="@{file}" suffix=".js" />
+ <yuicompress src="@{file}" dest="${component.builddir}/lang/${@{file}}-min.js" args="${yuicompressor.js.args.internal}" />
+ </sequential>
+ </for>
+ </then>
+ </if>
</target>
<target name="lint" description="Run jslint over the local build files (default settings)" unless="lint.skip">
<jslint>
<jsfiles>
<fileset dir="${component.builddir}" includes="*.js" />
</jsfiles>
</jslint>
</target>
<!-- DEPLOY -->
<target name="deploy" description="Copy files to global location" depends="deploybuild, deployassets, deployskins, deploylang, deploydocs"></target>
<target name="deploybuild" description="Copy built files to global build location">
<copy todir="${global.build.component}" preservelastmodified="true">
<fileset dir="${component.builddir}" includes="*.js" />
</copy>
</target>
<target name="deployassets" if="component.assets.exist">
<copy todir="${global.build.component.assets}" flatten="${component.assets.flatten}" preservelastmodified="true">
<fileset dir="${component.assets.base}" includes="${component.assets.files}" excludes="skins/, legacy/" />
</copy>
<copy todir="${global.build.component.assets}" flatten="${component.assets.legacy.flatten}" preservelastmodified="true" failonerror="false">
<fileset dir="${component.assets.legacy.base}" includes="${component.assets.legacy.files}" excludes="skins/" />
</copy>
</target>
<target name="deployskins" if="skins.exist">
<copy todir="${global.build.component.assets}/skins/sam" preservelastmodified="true">
<fileset dir="${component.builddir}/assets/skins/sam" includes="${component}.css" />
</copy>
<copy todir="${global.build.component.assets}/skins/sam" preservelastmodified="true">
<fileset dir="${component.assets.skins.base}/sam" includes="${component.assets.skins.files}" />
</copy>
</target>
<target name="deploylang" description="Copy language bundles to global build location">
<copy todir="${global.build.component}/lang" preservelastmodified="true" failonerror="false">
<fileset dir="${component.builddir}/lang" includes="*.js" />
</copy>
</target>
<target name="deploydocs" description="Copy doc files to global doc locations">
<!-- TODO -->
</target>
<target name="-prepend" if="component.prependfiles">
<concat destfile="${workingdir}/${component.basefilename}.js.tmp" fixlastline="true">
<filelist dir="${component.basedir}" files="${component.prependfiles}" />
<filterchain>
<tokenfilter>
<filetokenizer/>
<replaceregex
pattern="${component.logger.regex}"
replace="${component.logger.regex.replace}"
flags="${component.logger.regex.flags}" />
</tokenfilter>
</filterchain>
</concat>
<concat destfile="${workingdir}/${component.basefilename}.js.tmp" fixlastline="true" append="true">
<filelist dir="${component.builddir}" files="${component.basefilename}.js" />
</concat>
<move file="${workingdir}/${component.basefilename}.js.tmp" tofile="${component.builddir}/${component.basefilename}.js" />
</target>
<target name="-append" if="component.appendfiles">
<concat destfile="${component.builddir}/${component.basefilename}.js" fixlastline="true" append="true">
<filelist dir="${component.basedir}" files="${component.appendfiles}" />
<filterchain>
<tokenfilter>
<filetokenizer/>
<replaceregex
pattern="${component.logger.regex}"
replace="${component.logger.regex.replace}"
flags="${component.logger.regex.flags}" />
</tokenfilter>
</filterchain>
</concat>
</target>
<target name="-prependdebug" if="component.prependfiles">
<concat destfile="${workingdir}/${component.basefilename}-debug.js.tmp" fixlastline="true" >
<filelist dir="${component.basedir}" files="${component.prependfiles}" />
<filelist dir="${component.builddir}" files="${component.basefilename}-debug.js" />
</concat>
<move file="${workingdir}/${component.basefilename}-debug.js.tmp" tofile="${component.builddir}/${component.basefilename}-debug.js" />
</target>
<target name="-appenddebug" if="component.appendfiles">
<concat destfile="${component.builddir}/${component.basefilename}-debug.js" fixlastline="true" append="true">
<filelist dir="${component.basedir}" files="${component.appendfiles}" />
</concat>
</target>
</project>
|
yui/builder
|
d24c924515f99c4254881cfbff68081873a896ba
|
Added rudimentary support for language bundles for rollups of rollups (e.g. datatype_en-US.js, datatype-date_en-US.js, datatype-date-format_en-US.js)
|
diff --git a/componentbuild/3.x/module.xml b/componentbuild/3.x/module.xml
index 9528c00..b9dbbb9 100644
--- a/componentbuild/3.x/module.xml
+++ b/componentbuild/3.x/module.xml
@@ -1,84 +1,104 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiModuleTargets">
<import file="${builddir}/shared/targets.xml" description="Targets common to Rollup/Module" />
<target name="build" depends="buildcore, -rollupjs, buildskins, buildlangs" />
<target name="buildskins" depends="-buildskins, -rollupcss" />
- <target name="buildlangs" depends="-buildlangs" />
+ <target name="buildlangs" depends="-buildlangs, -rolluplangs" />
<!-- CORE -->
<target name="buildcore" depends="builddebug, -createcore, -loggerregex" description="Create component.js">
<fixcrlf srcdir="${component.builddir}" includes="${component.basefilename}.js" eol="${buildfiles.eol}" />
</target>
<target name="-createcore">
<copy file="${component.builddir}/${component.basefilename}-debug.js" tofile="${component.builddir}/${component.basefilename}.js" />
</target>
<target name="-loggerregex" description="Replace logger statements" unless="component.logger.regex.skip">
<echo level="info">Replacing Logger Statements in ${component.builddir}/${component.basefilename}.js</echo>
<replaceregexp file="${component.builddir}/${component.basefilename}.js"
byline="${component.logger.regex.byline}"
match="${component.logger.regex}"
replace="${component.logger.regex.replace}"
flags="${component.logger.regex.flags}" />
</target>
<!-- DEBUG -->
<target name="builddebug" depends="-concatdebug, -registerdebug, -prependdebug, -appenddebug" description="Create component-debug.js">
<fixcrlf srcdir="${component.builddir}" includes="${component.basefilename}-debug.js" eol="${buildfiles.eol}" />
</target>
<target name="-concatdebug">
<concatsource destfile="${component.builddir}/${component.basefilename}-debug.js" sourcedir="${component.jsfiles.base}" sourcefiles="${component.jsfiles}" />
</target>
<target name="-registerdebug" unless="register.skip">
<addmodule module="${component.module}" file="${component.builddir}/${component.basefilename}-debug.js" details="${component.details.hash}" />
</target>
<target name="-rollupjs" if="rollup">
<echo level="info">Rolling up ${component.basefilename}-debug.js into ${rollup.component.basefilename}-debug.js</echo>
<concat destfile="${rollup.builddir}/${rollup.component.basefilename}.js" append="true" fixlastline="true">
<filelist dir="${component.builddir}" files="${component.basefilename}.js" />
</concat>
<concat destfile="${rollup.builddir}/${rollup.component.basefilename}-debug.js" append="true" fixlastline="true">
<filelist dir="${component.builddir}" files="${component.basefilename}-debug.js" />
</concat>
</target>
<!-- SKINS -->
<target name="-buildskins" depends="-concatskins" description="Create skin rollup in local component build directory" if="component.skins.exist">
<fixcrlf srcdir="${component.builddir}/assets/skins/sam" includes="${component}.css" eol="${buildfiles.eol}" />
</target>
<target name="-buildlangs" description="Create language packs in the local component build directory" if="component.langs.exist">
<mkdir dir="${component.builddir}/lang" />
+ <!-- TODO: Break compress/concat out into separate pieces -->
<for list="${component.lang}" param="lang" trim="true">
<sequential>
<addlang dir="${component.lang.base}" module="${component}" lang="@{lang}" dest="${component.builddir}/lang" />
<yuicompress src="${component.builddir}/lang/${component}_@{lang}.js" dest="${component.builddir}/lang/${component}_@{lang}-min.js" args="${yuicompressor.js.args.internal}" />
</sequential>
</for>
<addlang dir="${component.lang.base}" module="${component}" lang="" dest="${component.builddir}/lang/" />
<yuicompress src="${component.builddir}/lang/${component}.js" dest="${component.builddir}/lang/${component}-min.js" args="${yuicompressor.js.args.internal}" />
-
+
</target>
+ <target name="-rolluplangs" if="rolluplangs">
+ <for list="${component.lang}" param="lang" trim="true">
+ <sequential>
+ <concat destfile="${rollup.builddir}/lang/${rollup.component}_@{lang}.js" append="true" fixlastline="true">
+ <fileset dir="${component.builddir}/lang" includes="*_@{lang}.js" />
+ </concat>
+ <concat destfile="${rollup.builddir}/lang/${rollup.component}_@{lang}-min.js" append="true" fixlastline="true">
+ <fileset dir="${component.builddir}/lang" includes="*_@{lang}-min.js" />
+ </concat>
+ </sequential>
+ </for>
+ <concat destfile="${rollup.builddir}/lang/${rollup.component}.js" append="true" fixlastline="true">
+ <filelist dir="${component.builddir}/lang" files="${component}.js" />
+ </concat>
+ <concat destfile="${rollup.builddir}/lang/${rollup.component}-min.js" append="true" fixlastline="true">
+ <filelist dir="${component.builddir}/lang" files="${component}-min.js" />
+ </concat>
+ </target>
+
<target name="-concatskins" if="component.skins.exist">
<concatsource destfile="${component.builddir}/assets/skins/sam/${component}.css" sourcedir="${component.assets.base}" sourcefiles="${component}-core.css, skins/sam/${component}-skin.css" />
<yuicompress src="${component.builddir}/assets/skins/sam/${component}.css" dest="${component.builddir}/assets/skins/sam/${component}.css" args="${yuicompressor.css.args.internal}" />
</target>
<target name="-rollupcss" if="rollupskins">
<echo level="info">Rolling up ${component}.css into ${rollup.component}.css</echo>
<concat destfile="${rollup.builddir}/assets/skins/sam/${rollup.component}.css" append="true" fixlastline="true">
<filelist dir="${component.builddir}/assets/skins/sam" files="${component}.css" />
</concat>
</target>
</project>
\ No newline at end of file
diff --git a/componentbuild/3.x/rollup.xml b/componentbuild/3.x/rollup.xml
index 1611b5e..cba77fd 100644
--- a/componentbuild/3.x/rollup.xml
+++ b/componentbuild/3.x/rollup.xml
@@ -1,40 +1,62 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiRollupTargets">
<import file="${builddir}/shared/targets.xml" description="Targets common to Rollup/Module" />
<target name="build" depends="buildmodules" description="Create component.js"></target>
- <target name="buildmodules" depends="-buildmodules, -registerall, -prependall, -appendall, -rollupjs">
+ <target name="buildmodules" depends="-buildmodules, -registerall, -prependall, -appendall, -rollupjs, -rolluplangs">
<fixcrlf srcdir="${component.builddir}" eol="${buildfiles.eol}" />
</target>
<target name="-buildmodules">
<subant target="${component.rollup.target}" inheritall="false" >
<filelist dir="${buildfile.dir}" files="${component.rollup.modules.buildfiles}" />
<property name="rollup" value="true" />
<property name="rollup.builddir" value="${component.builddir}" />
<property name="rollup.component" value="${component}" />
<property name="rollup.component.basefilename" value="${component.basefilename}" />
</subant>
</target>
<target name="-rollupjs" if="rollup">
<echo level="info">Rolling up ${component.basefilename}-debug.js into ${rollup.component.basefilename}-debug.js</echo>
- <concat destfile="${rollup.builddir}/${rollup.component.basefilename}.js" append="true" fixlastline="true">
+ <concat destfile="${rollup.builddir}/${rollup.component.basefilename}.js" append="true" fixlastline="true" >
<filelist dir="${component.builddir}" files="${component.basefilename}.js" />
</concat>
<concat destfile="${rollup.builddir}/${rollup.component.basefilename}-debug.js" append="true" fixlastline="true">
<filelist dir="${component.builddir}" files="${component.basefilename}-debug.js" />
</concat>
</target>
+ <target name="-rolluplangs" if="rolluplangs">
+ <echo>${component}</echo>
+ <echo>${component.lang}</echo>
+ <echo>${component.langs.exist}</echo>
+ <for list="${component.lang}" param="lang" trim="true">
+ <sequential>
+ <concat destfile="${rollup.builddir}/lang/${rollup.component}_@{lang}.js" append="true" fixlastline="true">
+ <fileset dir="${component.builddir}/lang" includes="*_@{lang}.js" />
+ </concat>
+ <concat destfile="${rollup.builddir}/lang/${rollup.component}_@{lang}-min.js" append="true" fixlastline="true">
+ <fileset dir="${component.builddir}/lang" includes="*_@{lang}-min.js" />
+ </concat>
+ </sequential>
+ </for>
+ <concat destfile="${rollup.builddir}/lang/${rollup.component}.js" append="true" fixlastline="true">
+ <filelist dir="${component.builddir}/lang" files="${component}.js" />
+ </concat>
+ <concat destfile="${rollup.builddir}/lang/${rollup.component}-min.js" append="true" fixlastline="true">
+ <filelist dir="${component.builddir}/lang" files="${component}-min.js" />
+ </concat>
+ </target>
+
<target name="-prependall" depends="-prependdebug, -prepend" if="component.prependfiles" />
<target name="-appendall" depends="-appenddebug, -append" if="component.appendfiles" />
<target name="-registerall" unless="register.skip">
<addrollup module="${component.module}" file="${component.builddir}/${component.basefilename}-debug.js" details="${component.details.hash}" />
<addrollup module="${component.module}" file="${component.builddir}/${component.basefilename}.js" details="${component.details.hash}" />
</target>
</project>
diff --git a/componentbuild/docs/properties.html b/componentbuild/docs/properties.html
index 43b7efb..b030650 100644
--- a/componentbuild/docs/properties.html
+++ b/componentbuild/docs/properties.html
@@ -1,373 +1,373 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<title>YUI ANT Property Definitions</title>
<link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.7.0/build/reset/reset-min.css">
<link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.7.0/build/fonts/fonts-min.css">
<link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.7.0/build/base/base-min.css">
<link rel="stylesheet" type="text/css" href="docs.css">
</head>
<body>
<table class="desc">
<caption>
<p>BOOTSTRAP PROPERTIES</p>
</caption>
<thead>
<tr>
<th>Property</th>
<th>Description</th>
<th>Default</th>
</tr>
</thead>
<tbody>
<tr>
<td class="term">builddir</td>
<td>The path to the builder/componentbuild directory from the component build file. If the builder directory sits next to the yui2/yui3 source code directory then this does not need to be changed from the default value.</td>
<td class="default">../../../builder/componentbuild</td>
</tr>
<tr>
<td class="term">srcdir</td>
<td>The path to top of the project source directory (e.g. yui2/, yui3/) from the component build file.</td>
<td class="default">../..</td>
</tr>
<tr>
<td class="term">buildfile.dir</td>
<td>The directory containing the component build file.</td>
<td class="default">${ant.file}</td>
</tr>
</tbody>
</table>
<table class="desc">
<caption>
<p>BUILD FILE PATHS</p>
</caption>
<thead>
<tr>
<th>Property</th>
<th>Description</th>
<th>Default</th>
</tr>
</thead>
<tbody>
<tr>
<td class="term">global.build.base</td>
<td>The path to the top level build directory</td>
<td class="default">${srcdir}/build</td>
</tr>
<tr>
<td class="term">global.build.component</td>
<td>The path to the top level build directory for the component being built (e.g. yui2/build/autocomplete)</td>
<td class="default">${global.build.base}/${component}</td>
</tr>
<tr>
<td class="term">global.build.component.assets</td>
<td>The path to the top level assets directory for the component being built (e.g. yui2/build/autocomplete/assets)</td>
<td class="default">${global.build.component}/${assets}</td>
</tr>
</tbody>
</table>
<table class="desc">
<caption>
<p>COMPONENT CONFIGURATION</p>
</caption>
<thead>
<tr>
<th>Property</th>
<th>Description</th>
<th>Default</th>
</tr>
</thead>
<tbody>
<tr>
<td class="term">component</td>
<td>Component name, lower-case. Used for build filenames(e.g. component.js, component-min.js)</td>
<td class="default"><p>No Default Value.</p><p>Required in build.properties.</p></td>
</tr>
<tr>
<td class="term">component.module</td>
<td>Module name, mostly always the same as component</td>
<td class="default">${component}</td>
</tr>
<tr>
<td class="term">component.mainclass</td>
<td>Main JS class representing the module. Version code will be added to this class. [YUI2 Only]</td>
<td class="default"><p>No Default Value.</p><p>Required in build.properties.</p></td>
</tr>
<tr>
<td class="term">component.rollup</td>
<td>Whether or not the component is a rollup. [YUI3 Only]</td>
<td class="default">false</td>
</tr>
<tr>
<td class="term">component.rollup.modules.buildfiles</td>
<td>The build files for the sub-modules making up the rollup. [YUI3 Only]</td>
<td class="default breakable"><p>No Default Value.</p><p>Required in build.properties, if component.rollup is set to true.</p></td>
</tr>
<tr>
<td class="term">component.rollup.target</td>
<td>The default target to run on sub-module builds, initiated by the rollup build. [YUI3 Only]</td>
<td class="default">all</td>
</tr>
<tr>
<td class="term">component.use</td>
<td>Comma separated list of modules which the built module should "use". Used in generating the boilerplate registration code [YUI3 Only].</td>
<td class="default">No Default Value</td>
</tr>
<tr>
<td class="term">component.supersedes</td>
<td>Comma separated list of modules which the built module "supercedes". Used in generating the boilerplate registration code [YUI3 Only].</td>
<td class="default">No Default Value</td>
</tr>
<tr>
<td class="term">component.requires</td>
<td>Comma separated list of modules which the built module "requires". Used in generating the boilerplate registration code [YUI3 Only].</td>
<td class="default">No Default Value</td>
</tr>
<tr>
<td class="term">component.optional</td>
<td>Comma separated list of "optional" modules for the built module. Used in generating the boilerplate registration code [YUI3 Only].</td>
<td class="default">No Default Value</td>
</tr>
<tr>
<td class="term">component.skinnable</td>
<td>Whether or not the component is "skinnable". Used in generating the boilerplate registration code [YUI3 Only].</td>
<td class="default">No Default Value</td>
</tr>
<tr>
<td class="term">component.lang</td>
- <td>Comma separated list of BCP 47 language codes, specifying the language packs which are available for this module [YUI3 Only].</td>
+ <td>Comma separated list of BCP 47 language tags, specifying the language packs which are available for this module [YUI3 Only].</td>
<td class="default">No Default Value</td>
</tr>
<tr>
<td class="term">component.logger.regex</td>
<td>
<p>Regex used to strip logger statements</p>
<p><strong>IMPORTANT :</strong></p>
<ul>
<li>Log statements need to end in semi-colons, otherwise the default regex will strip out code until the next semi-colon is hit.</li>
<li>Any code on the same line as the start or end of a Log statement will be stripped. Hence Log statments should be on their own lines.</li>
</ul>
</td>
<td class="default breakable">^.*?(?:logger|YAHOO.log).*?(?:;|\).*;|(?:\r?\n.*?)*?\).*;).*;?.*?\r?\n</td>
</tr>
<tr>
<td class="term">component.logger.regex.byline</td>
<td>If component.logger.regex.byline is false, regex will match against the entire file as opposed to line by line - required for multiline search.</td>
<td class="default">false</td>
</tr>
<tr>
<td class="term">component.logger.regex.flags</td>
<td>The set of standard Perl5 regex flags which apply.</td>
<td class="default">mg</td>
</tr>
<tr>
<td class="term">component.logger.regex.replace</td>
<td>The replacement string to use.</td>
<td class="default">""</td>
</tr>
<tr>
<td class="term">component.logger.regex.skip</td>
<td>Can be set to true, to skip the logger regex replacement step.</td>
<td class="default">false</td>
</tr>
</tbody>
</table>
<table class="desc">
<caption>
<p>COMPONENT FILE PATHS</p>
</caption>
<thead>
<tr>
<th>Property</th>
<th>Description</th>
<th>Default</th>
</tr>
</thead>
<tbody>
<tr>
<td class="term">component.basedir</td>
<td>Absolute path to the component's base directory (e.g. yui2/src/autocomplete)</td>
<td class="default">${buildfile.dir}</td>
</tr>
<tr>
<td class="term">component.builddir</td>
<td>Absolute path to the component's local build directory (e.g. yui2/src/autocomplete/build_tmp)</td>
<td class="default"><p>${component.basedir}/build_tmp (non-rollups)</p><p>${component.basedir}/build_rollup_tmp (rollups)</p></td>
</tr>
<tr>
<td class="term">component.jsfiles</td>
<td>Comma seperated ordered list of JS source files to be concatenated, relative to ${component.basedir}/js</td>
<td class="default"><p>No Default Value.</p><p>Required in build.properties (for JS modules).</p></td>
</tr>
<tr>
<td class="term">component.cssfiles</td>
<td>Comma seperated ordered list of CSS source files to be concatenated (for CSS modules), relative to ${component.basedir}/css</td>
<td class="default"><p>No Default Value.</p><p>Required in build.properties (for CSS modules).</p></td>
</tr>
<tr>
<td class="term">component.prependfiles</td>
<td>Comma separated list of files to prepend to the built files (in the case of YUI 3, this content would reside outside the registration boilerplate code). Filepaths are relative to component.basedir.</td>
<td class="default">No Default Value</td>
</tr>
<tr>
<td class="term">component.appendfiles</td>
<td>Comma separated list of files to append to the built files (in the case of YUI 3, this content would reside outside the registration boilerplate code). Filepaths are relative to component.basedir.</td>
<td class="default">No Default Value</td>
</tr>
<tr>
<td class="term">component.assets.skins.base</td>
<td>
<p>Base directory for the component's skinning assets (e.g. yui2/src/autocomplete/assets/skins).</p>
<p>If this value is set, the build expects the following directory structure, in the component's assets directory:</p>
<pre>
<component.assets.base>
- <component>-core.css
- skins/sam/<component>-skin.css
- skins/sam/*.gif, *.png, *.jpg
</pre>
</td>
<td class="default">${component.assets.base}/skins</td>
</tr>
<tr>
<td class="term">component.assets.skins.files</td>
<td>Set of skinning assets to deploy.</td>
<td class="default">**/*</td>
</tr>
<tr>
<td class="term">component.assets.base</td>
<td>Base directory for the component's non-skinning related assets. e.g. SWFs and non-skinned images.</td>
<td class="default">${component.basedir}/assets</td>
</tr>
<tr>
<td class="term">component.assets.files</td>
<td>Set of asset files to deploy.</td>
<td class="default">**/*</td>
</tr>
<tr>
<td class="term">component.assets.flatten</td>
<td>Whether or not to flatten the asset directory structure when deploying to build.</td>
<td class="default">true</td>
</tr>
</tbody>
</table>
<table class="desc">
<caption>
<p>EXTERNAL TOOLS</p>
</caption>
<thead>
<tr>
<th>Property</th>
<th>Description</th>
<th>Default</th>
</tr>
</thead>
<tbody>
<tr>
<td class="term">rhino.jar</td>
<td>Path to rhino.jar, used to run jslint.</td>
<td class="default">${builddir}/lib/rhino/js.jar</td>
</tr>
<tr>
<td class="term">jslintconsole.js</td>
<td>Path to the console script used to run jslint.</td>
<td class="default">${builddir}/lib/jslint/jslint-console.js</td>
</tr>
<tr>
<td class="term">jslintsrc.js</td>
<td>Path to the jslint implementation.</td>
<td class="default">${builddir}/lib/jslint/fulljslint.js</td>
</tr>
<tr>
<td class="term">yuicompressor.jar</td>
<td>Path to the YUI Compressor jar, used for minification.</td>
<td class="default breakable">${builddir}/lib/yuicompressor/yuicompressor-2.4.jar</td>
</tr>
<tr>
<td class="term">yuicompressor.css.args</td>
<td>YUI Compressor args for CSS compression.</td>
<td class="default">--type css --line-break 6000</td>
</tr>
<tr>
<td class="term">yuicompressor.js.args</td>
<td>YUI Compressor args for JS compression.</td>
<td class="default breakable">--disable-optimizations --preserve-semi --line-break 6000</td>
</tr>
<tr>
<td class="term">yuicompressor.js.verbose</td>
<td>Whether or not YUI Compressor should run with verbose output enabled for JS compression. If enabled, YUI Compressor will show code related warnings/suggestions during compression. NOTE: Checked in build files should have been compressed with this flag set to true.</td>
<td class="default">true</td>
</tr>
<tr>
<td class="term">yuicompressor.css.verbose</td>
<td>Whether or not YUI Compressor should run with verbose output enabled for CSS compession.</td>
<td class="default">true</td>
</tr>
<tr>
<td class="term">yuicompressor.js.charset</td>
<td>The charset to use both for reading the js file to compress and when writing the generated min file.</td>
<td class="default">utf-8</td>
</tr>
<tr>
<td class="term">yuicompressor.css.charset</td>
<td>The charset to use both for reading the css file to compress and when writing the generated min file.</td>
<td class="default">utf-8</td>
</tr>
</tbody>
</table>
<table class="desc">
<caption>
<p>MISCELLANEOUS</p>
</caption>
<thead>
<tr>
<th>Property</th>
<th>Description</th>
<th>Default</th>
</tr>
</thead>
<tbody>
<tr>
<td class="term">buildfiles.eol</td>
<td>The EOL character to use for built files.</td>
<td class="default">lf</td>
</tr>
<tr>
<td class="term">workingdir</td>
<td>The temporary directory which ant should use during the build. This directory will be deleted at the end of the build.</td>
<td class="default">${component.builddir}/ant</td>
</tr>
<tr>
<td class="term">yui.version</td>
<td>The version of YUI component being built.</td>
<td class="default breakable">2 for YUI 2, 3 for YUI 3</td>
</tr>
<tr>
<td class="term">yui.variable</td>
<td>The YUI instance variable name to use when generating the YUI.add(function(YUIInstanceVariable) {}) wrapper. [YUI3 Only]</td>
<td class="default">Y</td>
</tr>
<tr>
<td class="term">lint.skip</td>
<td>Set to true to skip the lint step, during a build. NOTE: Checked in build files should not have this flag set to true. Checked in component code needs to have gone through lint.</td>
<td class="default">false</td>
</tr>
<tr>
<td class="term">register.skip</td>
<td>Set to true to skip the build step which adds the boiler plate registration code. This can be used if your code has the registration code added manually, however this is not recommended.</td>
<td class="default">false</td>
</tr>
<tr>
<td class="term">clean.skip</td>
<td>Set to true to skip the build step which deletes the local build directory (build_tmp) before each build.</td>
<td class="default">false</td>
</tr>
</tbody>
</table>
</body>
</html>
diff --git a/componentbuild/shared/properties.xml b/componentbuild/shared/properties.xml
index 2ab1a50..c409554 100644
--- a/componentbuild/shared/properties.xml
+++ b/componentbuild/shared/properties.xml
@@ -1,141 +1,151 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiSharedProperties">
<!-- ANT contrib library for loops, if/else support, with property fix for FOR task -->
<taskdef resource="antcontrib.properties">
<classpath>
<pathelement location="${builddir}/lib/ant-contrib/ant-contrib-1.0b3-modified.jar" />
</classpath>
</taskdef>
<dirname property="buildfile.dir" file="${ant.file}" />
<!--
builddir : The path to the builder/componentbuild directory from the component build file
srcdir : The path to top of the project source directory (e.g. yui2) from the component build file
-->
<property name="builddir" location="../../../builder/componentbuild" />
<property name="srcdir" location="../.." />
<!-- buildfiles.eol : End of line char to use for built files -->
<property name="buildfiles.eol" value="lf"/>
<!-- Supporting Tools -->
<property name="rhino.jar" location="${builddir}/lib/rhino/js.jar" />
<property name="jslintconsole.js" location="${builddir}/lib/jslint/jslint-console.js" />
<property name="jslintsrc.js" location="${builddir}/lib/jslint/fulljslint.js" />
<property name="yuicompressor.jar" location="${builddir}/lib/yuicompressor/yuicompressor-2.4.jar" />
<!-- YUI Compressor arguments for JS and CSS files -->
<property name="yuicompressor.css.args" value="--type css --line-break 6000" />
<property name="yuicompressor.js.args" value="--disable-optimizations --preserve-semi --line-break 6000" />
<property name="yuicompressor.js.charset" value="utf-8" />
<property name="yuicompressor.css.charset" value="utf-8" />
<!-- Enable/Disable YUI Compressor verbosity. NOTE: Checked in build files should not disable this flag -->
<property name="yuicompressor.js.verbose" value="true" />
<property name="yuicompressor.css.verbose" value="true" />
<condition property="yuicompressor.js.args.internal" value="-v --charset ${yuicompressor.js.charset} ${yuicompressor.js.args}" else="--charset ${yuicompressor.js.charset} ${yuicompressor.js.args}">
<istrue value="${yuicompressor.js.verbose}" />
</condition>
<condition property="yuicompressor.css.args.internal" value="-v --charset ${yuicompressor.css.charset} ${yuicompressor.css.args}" else="--charset ${yuicompressor.css.charset} ${yuicompressor.css.args}">
<istrue value="${yuicompressor.css.verbose}" />
</condition>
<!-- Top Level Build Directories (e.g. yui2/build, yui3/build)-->
<property name="global.build.base" location="${srcdir}/build" />
<property name="global.build.component" location="${global.build.base}/${component}" />
<property name="global.build.component.assets" location="${global.build.component}/assets" />
<!-- Component Properties -->
<property name="component.module" value="${component}" />
<property name="component.basedir" location="${buildfile.dir}" />
<property name="component.jsfiles.base" location="${component.basedir}/js" />
<property name="component.lang.base" location="${component.basedir}/lang" />
<property name="component.assets.flatten" value="true" />
<property name="component.assets.base" location="${component.basedir}/assets" />
<property name="component.assets.files" value="**/*" />
<property name="component.assets.legacy.flatten" value="true" />
<property name="component.assets.legacy.base" location="${component.assets.base}/legacy" />
<property name="component.assets.legacy.files" value="**/*" />
<property name="component.assets.skins.base" location="${component.assets.base}/skins" />
<property name="component.assets.skins.files" value="**/*" />
<condition property="component.skins.exist">
<and>
<available file="${component.assets.base}/${component}-core.css" type="file" />
<available file="${component.assets.base}/skins" type="dir" />
</and>
</condition>
<!-- component is part of a rollup build, so rollup skins to parent -->
<condition property="rollupskins">
<and>
<istrue value="${rollup}" />
<istrue value="${component.skins.exist}" />
</and>
</condition>
<available file="${component.assets.base}" type="dir" property="component.assets.exist"/>
<condition property="component.langs.exist">
- <isset property="component.lang" />
+ <and>
+ <isset property="component.lang" />
+ <available file="${component.lang.base}" type="dir" />
+ </and>
</condition>
+ <condition property="rolluplangs">
+ <and>
+ <istrue value="${rollup}" />
+ <istrue value="${component.langs.exist}" />
+ </and>
+ </condition>
+
<!--
DEPRECATED: component.basefilename and component.releasetype are deprecated
We used to mark filenames with suffixes (-beta, -experimental), which we no longer do
-->
<condition property="component.basefilename" value="${component}" else="${component}">
<isset property="component.releasetype"/>
</condition>
<!-- Default logger regex values if not provided -->
<property name="component.logger.regex" value="^.*?(?:logger|YAHOO.log).*?(?:;|\).*;|(?:\r?\n.*?)*?\).*;).*;?.*?\r?\n" />
<property name="component.logger.regex.replace" value="" />
<property name="component.logger.regex.flags" value="mg" />
<property name="component.logger.regex.byline" value="false" />
<!-- Rollup support, currently only used for YUI 3 -->
<property name="component.rollup" value="false"/>
<property name="component.rollup.target" value="all"/>
<condition property="component.builddir" value="${component.basedir}/build_rollup_tmp" else="${component.basedir}/build_tmp">
<istrue value="${component.rollup}"/>
</condition>
<condition property="rollup.skins.exist">
<and>
<istrue value="${component.rollup}" />
<available file="${component.assets.base}/skins" type="dir" />
</and>
</condition>
<condition property="skins.exist">
<or>
<istrue value="${rollup.skins.exist}" />
<istrue value="${component.skins.exist}" />
</or>
</condition>
<!-- The temporary working directory used by the build process -->
<property name="workingdir" location="${component.builddir}/ant" />
<!-- The file which defines the default targets for the particular type of component (module, rollup, css) -->
<condition property="targetbase" value="rollup" else="module">
<istrue value="${component.rollup}"/>
</condition>
<condition property="targets" value="${builddir}/shared/cssmodule.xml" else="${targetbase}.xml">
<isset property="component.cssfiles" />
</condition>
</project>
diff --git a/componentbuild/shared/targets.xml b/componentbuild/shared/targets.xml
index 51744eb..09f7875 100644
--- a/componentbuild/shared/targets.xml
+++ b/componentbuild/shared/targets.xml
@@ -1,140 +1,140 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiSharedTargets">
<echo level="info">Starting Build For ${component}</echo>
<echo level="info">Ant Properties</echo>
<echo level="info"> Home : ${ant.home}</echo>
<echo level="info"> Ant Version : ${ant.version}</echo>
<echo level="info"> Build File : ${ant.file}</echo>
<echo level="info">Local Build Properties</echo>
<echo level="info"> version : ${yui.version}</echo>
<echo level="info"> srcdir : ${srcdir}</echo>
<echo level="info"> builddir : ${builddir}</echo>
<echo level="info"> component : ${component}</echo>
<echo level="info"> component.basefilename : ${component.basefilename}</echo>
<echo level="info"> component.basedir : ${component.basedir}</echo>
<echo level="info"> component.builddir : ${component.builddir}</echo>
<echo level="info">Global Build Properties</echo>
<echo level="info"> global.build.base : ${global.build.base}</echo>
<echo level="info"> global.build.component : ${global.build.component}</echo>
<echo level="info"> global.build.component.assets : ${global.build.component.assets}</echo>
<import file="${builddir}/shared/macrolib.xml" description="Macrodef definitions - jslint, yuicompessor, registerversion" />
<target name="all" depends="local, deploy" description="Build and Deploy to Global Build Directory" />
<target name="local" depends="clean, init, build, minify, lint" description="Build and Deploy to Local Build Directory" />
<target name="init">
<tstamp/>
<mkdir dir="${component.builddir}" />
<createdetails />
</target>
<target name="clean" description="Clean Local Build Directory" unless="clean.skip">
<delete dir="${component.builddir}" />
</target>
<target name="build" />
<!-- MIN -->
<target name="minify" description="Create component-min.js from component.js">
<yuicompress src="${component.builddir}/${component.basefilename}.js" dest="${component.builddir}/${component.basefilename}-min.js" args="${yuicompressor.js.args.internal}" />
</target>
<target name="lint" description="Run jslint over the local build files (default settings)" unless="lint.skip">
<jslint>
<jsfiles>
<fileset dir="${component.builddir}" includes="*.js" />
</jsfiles>
</jslint>
</target>
<!-- DEPLOY -->
- <target name="deploy" description="Copy files to global location" depends="deploybuild, deployassets, deployskins, deploydocs"></target>
+ <target name="deploy" description="Copy files to global location" depends="deploybuild, deployassets, deployskins, deploylang, deploydocs"></target>
<target name="deploybuild" description="Copy built files to global build location">
<copy todir="${global.build.component}" preservelastmodified="true">
<fileset dir="${component.builddir}" includes="*.js" />
</copy>
</target>
<target name="deployassets" if="component.assets.exist">
<copy todir="${global.build.component.assets}" flatten="${component.assets.flatten}" preservelastmodified="true">
<fileset dir="${component.assets.base}" includes="${component.assets.files}" excludes="skins/, legacy/" />
</copy>
<copy todir="${global.build.component.assets}" flatten="${component.assets.legacy.flatten}" preservelastmodified="true" failonerror="false">
<fileset dir="${component.assets.legacy.base}" includes="${component.assets.legacy.files}" excludes="skins/" />
</copy>
</target>
<target name="deployskins" if="skins.exist">
<copy todir="${global.build.component.assets}/skins/sam" preservelastmodified="true">
<fileset dir="${component.builddir}/assets/skins/sam" includes="${component}.css" />
</copy>
<copy todir="${global.build.component.assets}/skins/sam" preservelastmodified="true">
<fileset dir="${component.assets.skins.base}/sam" includes="${component.assets.skins.files}" />
</copy>
</target>
- <target name="deploylang" description="Copy language bundles to global build location" if="component.langs.exist">
- <copy todir="${global.build.component.assets}/lang" preservelastmodified="true">
+ <target name="deploylang" description="Copy language bundles to global build location">
+ <copy todir="${global.build.component}/lang" preservelastmodified="true" failonerror="false">
<fileset dir="${component.builddir}/lang" includes="*.js" />
</copy>
</target>
<target name="deploydocs" description="Copy doc files to global doc locations">
<!-- TODO -->
</target>
<target name="-prepend" if="component.prependfiles">
<concat destfile="${workingdir}/${component.basefilename}.js.tmp" fixlastline="true">
<filelist dir="${component.basedir}" files="${component.prependfiles}" />
<filterchain>
<tokenfilter>
<filetokenizer/>
<replaceregex
pattern="${component.logger.regex}"
replace="${component.logger.regex.replace}"
flags="${component.logger.regex.flags}" />
</tokenfilter>
</filterchain>
</concat>
<concat destfile="${workingdir}/${component.basefilename}.js.tmp" fixlastline="true" append="true">
<filelist dir="${component.builddir}" files="${component.basefilename}.js" />
</concat>
<move file="${workingdir}/${component.basefilename}.js.tmp" tofile="${component.builddir}/${component.basefilename}.js" />
</target>
<target name="-append" if="component.appendfiles">
<concat destfile="${component.builddir}/${component.basefilename}.js" fixlastline="true" append="true">
<filelist dir="${component.basedir}" files="${component.appendfiles}" />
<filterchain>
<tokenfilter>
<filetokenizer/>
<replaceregex
pattern="${component.logger.regex}"
replace="${component.logger.regex.replace}"
flags="${component.logger.regex.flags}" />
</tokenfilter>
</filterchain>
</concat>
</target>
<target name="-prependdebug" if="component.prependfiles">
<concat destfile="${workingdir}/${component.basefilename}-debug.js.tmp" fixlastline="true" >
<filelist dir="${component.basedir}" files="${component.prependfiles}" />
<filelist dir="${component.builddir}" files="${component.basefilename}-debug.js" />
</concat>
<move file="${workingdir}/${component.basefilename}-debug.js.tmp" tofile="${component.builddir}/${component.basefilename}-debug.js" />
</target>
<target name="-appenddebug" if="component.appendfiles">
<concat destfile="${component.builddir}/${component.basefilename}-debug.js" fixlastline="true" append="true">
<filelist dir="${component.basedir}" files="${component.appendfiles}" />
</concat>
</target>
</project>
|
yui/builder
|
1e6e3fa1519c4b6a0373125891b8016c1d4a49ce
|
Added lang pack build support at the module level
|
diff --git a/componentbuild/3.x/module.xml b/componentbuild/3.x/module.xml
index 472b4b5..9528c00 100644
--- a/componentbuild/3.x/module.xml
+++ b/componentbuild/3.x/module.xml
@@ -1,68 +1,84 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiModuleTargets">
<import file="${builddir}/shared/targets.xml" description="Targets common to Rollup/Module" />
- <target name="build" depends="buildcore, -rollupjs, buildskins" />
+ <target name="build" depends="buildcore, -rollupjs, buildskins, buildlangs" />
<target name="buildskins" depends="-buildskins, -rollupcss" />
+ <target name="buildlangs" depends="-buildlangs" />
<!-- CORE -->
<target name="buildcore" depends="builddebug, -createcore, -loggerregex" description="Create component.js">
<fixcrlf srcdir="${component.builddir}" includes="${component.basefilename}.js" eol="${buildfiles.eol}" />
</target>
<target name="-createcore">
<copy file="${component.builddir}/${component.basefilename}-debug.js" tofile="${component.builddir}/${component.basefilename}.js" />
</target>
<target name="-loggerregex" description="Replace logger statements" unless="component.logger.regex.skip">
<echo level="info">Replacing Logger Statements in ${component.builddir}/${component.basefilename}.js</echo>
<replaceregexp file="${component.builddir}/${component.basefilename}.js"
byline="${component.logger.regex.byline}"
match="${component.logger.regex}"
replace="${component.logger.regex.replace}"
flags="${component.logger.regex.flags}" />
</target>
<!-- DEBUG -->
<target name="builddebug" depends="-concatdebug, -registerdebug, -prependdebug, -appenddebug" description="Create component-debug.js">
<fixcrlf srcdir="${component.builddir}" includes="${component.basefilename}-debug.js" eol="${buildfiles.eol}" />
</target>
<target name="-concatdebug">
<concatsource destfile="${component.builddir}/${component.basefilename}-debug.js" sourcedir="${component.jsfiles.base}" sourcefiles="${component.jsfiles}" />
</target>
<target name="-registerdebug" unless="register.skip">
<addmodule module="${component.module}" file="${component.builddir}/${component.basefilename}-debug.js" details="${component.details.hash}" />
</target>
<target name="-rollupjs" if="rollup">
<echo level="info">Rolling up ${component.basefilename}-debug.js into ${rollup.component.basefilename}-debug.js</echo>
<concat destfile="${rollup.builddir}/${rollup.component.basefilename}.js" append="true" fixlastline="true">
<filelist dir="${component.builddir}" files="${component.basefilename}.js" />
</concat>
<concat destfile="${rollup.builddir}/${rollup.component.basefilename}-debug.js" append="true" fixlastline="true">
<filelist dir="${component.builddir}" files="${component.basefilename}-debug.js" />
</concat>
</target>
<!-- SKINS -->
<target name="-buildskins" depends="-concatskins" description="Create skin rollup in local component build directory" if="component.skins.exist">
<fixcrlf srcdir="${component.builddir}/assets/skins/sam" includes="${component}.css" eol="${buildfiles.eol}" />
</target>
+ <target name="-buildlangs" description="Create language packs in the local component build directory" if="component.langs.exist">
+ <mkdir dir="${component.builddir}/lang" />
+
+ <for list="${component.lang}" param="lang" trim="true">
+ <sequential>
+ <addlang dir="${component.lang.base}" module="${component}" lang="@{lang}" dest="${component.builddir}/lang" />
+ <yuicompress src="${component.builddir}/lang/${component}_@{lang}.js" dest="${component.builddir}/lang/${component}_@{lang}-min.js" args="${yuicompressor.js.args.internal}" />
+ </sequential>
+ </for>
+
+ <addlang dir="${component.lang.base}" module="${component}" lang="" dest="${component.builddir}/lang/" />
+ <yuicompress src="${component.builddir}/lang/${component}.js" dest="${component.builddir}/lang/${component}-min.js" args="${yuicompressor.js.args.internal}" />
+
+ </target>
+
<target name="-concatskins" if="component.skins.exist">
<concatsource destfile="${component.builddir}/assets/skins/sam/${component}.css" sourcedir="${component.assets.base}" sourcefiles="${component}-core.css, skins/sam/${component}-skin.css" />
<yuicompress src="${component.builddir}/assets/skins/sam/${component}.css" dest="${component.builddir}/assets/skins/sam/${component}.css" args="${yuicompressor.css.args.internal}" />
</target>
<target name="-rollupcss" if="rollupskins">
<echo level="info">Rolling up ${component}.css into ${rollup.component}.css</echo>
<concat destfile="${rollup.builddir}/assets/skins/sam/${rollup.component}.css" append="true" fixlastline="true">
<filelist dir="${component.builddir}/assets/skins/sam" files="${component}.css" />
</concat>
</target>
</project>
\ No newline at end of file
diff --git a/componentbuild/files/langtemplate.txt b/componentbuild/files/langtemplate.txt
new file mode 100644
index 0000000..6e822c0
--- /dev/null
+++ b/componentbuild/files/langtemplate.txt
@@ -0,0 +1,9 @@
+YUI.add('@LANG_MODULE@', function(@YUIVAR@) {
+
+Y.Intl.add(
+'@MODULE@',
+'@LANG@',
+@STRINGS@
+);
+
+}, '@VERSION@' @LANG_DETAILS@);
\ No newline at end of file
diff --git a/componentbuild/shared/macrolib.xml b/componentbuild/shared/macrolib.xml
index ae64009..ffde60e 100644
--- a/componentbuild/shared/macrolib.xml
+++ b/componentbuild/shared/macrolib.xml
@@ -1,215 +1,263 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiMacroLib">
<macrodef name="arrayliteral">
<attribute name="from" />
<attribute name="to" />
<attribute name="key" />
<sequential>
<if>
<and>
<isset property="@{from}" />
<length string="${@{from}}" when="ne" length="0" />
</and>
<then>
<propertyregex property="array"
override="true"
input="${@{from}}"
casesensitive="false"
regexp="([^\,\s]+)"
replace="'\1'"
/>
<property name="@{to}" value="@{key}:[${array}]" />
</then>
</if>
</sequential>
</macrodef>
<macrodef name="createdetails">
<sequential>
<arrayliteral from="component.use" to="component.details.use" key="use" />
<arrayliteral from="component.supersedes" to="component.details.supersedes" key="supersedes" />
<arrayliteral from="component.requires" to="component.details.requires" key="requires" />
<arrayliteral from="component.optional" to="component.details.optional" key="optional" />
<arrayliteral from="component.lang" to="component.details.lang" key="lang" />
<if>
<isset property="component.skinnable" />
<then>
<property name="component.details.skinnable" value="skinnable:${component.skinnable}" />
</then>
</if>
<propertyselector property="details.list"
delimiter=","
match="component\.details.([^\.]*)"
select="\1"
casesensitive="false" />
<var name="details" value="" />
<if>
<isset property="details.list" />
<then>
<for list="${details.list}" param="val">
<sequential>
<var name="details" value="${component.details.@{val}}, ${details}" />
</sequential>
</for>
<propertyregex property="component.details.hash"
input="{${details}}"
regexp="(\,\s*?\})"
replace="}"
casesensitive="false" />
</then>
<else>
<property name="component.details.hash" value="" />
</else>
</if>
</sequential>
</macrodef>
<macrodef name="yuicompress">
<attribute name="src" />
<attribute name="dest" />
<attribute name="args" />
<sequential>
<echo level="info">Running yuicompressor on @{src}</echo>
<java jar="${yuicompressor.jar}" fork="true" failonerror="true">
<arg line="@{args} -o" />
<arg file="@{dest}" />
<arg file="@{src}" />
</java>
</sequential>
</macrodef>
<macrodef name="concatsource">
<attribute name="destfile" />
<attribute name="sourcedir" />
<attribute name="sourcefiles" />
<attribute name="workingdir" default="${workingdir}" />
<element name="filters" optional="true" description="Additonal filters to apply to individual files"/>
<sequential>
<echo level="info">Concatenating</echo>
<echo level="info"> Source Files : @{sourcefiles}</echo>
<echo level="info"> In Source Dir : @{sourcedir}</echo>
<echo level="info"> To : @{destfile}</echo>
<delete dir="@{workingdir}" quiet="true"/>
<copy todir="@{workingdir}">
<filelist dir="@{sourcedir}" files="@{sourcefiles}" />
<filterchain>
<filters />
<fixcrlf fixlast="true" eof="remove"/>
</filterchain>
</copy>
<concat destfile="@{destfile}" fixlastline="true">
<filelist dir="@{workingdir}" files="@{sourcefiles}" />
</concat>
<delete dir="${workingdir}" quiet="true" />
</sequential>
</macrodef>
<macrodef name="jslint">
<element name="jsfiles" optional="false" />
<sequential>
<!--
Need to find a way to convert fileset to args (script?) to
avoid ' ', which will break for files with ' in them
Evaluates to the following java execution line...
java -r js.jar jslintconsole.js 'file1.js' 'file2.js' 'file3.js'
-->
<pathconvert pathsep="' '" property="jsfileargs">
<jsfiles />
</pathconvert>
<java jar="${rhino.jar}" fork="true" failonerror="true">
<arg file="${jslintconsole.js}" />
<arg value="${jslintsrc.js}" />
<arg line="'${jsfileargs}'" />
</java>
</sequential>
</macrodef>
<macrodef name="registerversion">
<attribute name="module" />
<attribute name="classname" />
<attribute name="file" />
<sequential>
<loadfile srcfile="${builddir}/files/versioncode.txt" property="@{module}-@{classname}-version" >
<filterchain>
<replacetokens>
<token key="MODULE" value="@{module}"/>
<token key="CLASSNAME" value="@{classname}"/>
</replacetokens>
</filterchain>
</loadfile>
<echo level="info">Adding Version Registration Code to @{file}</echo>
<concat destfile="@{file}" append="true" fixlastline="true">${@{module}-@{classname}-version}</concat>
</sequential>
</macrodef>
+ <macrodef name="addlang">
+
+ <attribute name="dir" />
+ <attribute name="module" />
+ <attribute name="dest" />
+ <attribute name="lang" default="" />
+ <attribute name="details" default = ""/>
+
+ <sequential>
+ <if>
+ <equals arg1="@{details}" arg2="" />
+ <then>
+ <property name="@{module}@{lang}_details" value="" />
+ </then>
+ <else>
+ <property name="@{module}@{lang}_details" value=",@{details}" />
+ </else>
+ </if>
+
+ <if>
+ <equals arg1="@{lang}" arg2="" />
+ <then>
+ <property name="@{module}@{lang}_strs" value="@{module}.js" />
+ </then>
+ <else>
+ <property name="@{module}@{lang}_strs" value="@{module}_@{lang}.js" />
+ </else>
+ </if>
+
+ <loadfile srcfile="@{dir}/${@{module}@{lang}_strs}" property="@{module}@{lang}-strs-loaded" />
+
+ <echo level="info">Wrapping @{dir}/${@{module}@{lang}_strs} in YUI.add, Y.Intl.add</echo>
+
+ <copy file="${builddir}/files/langtemplate.txt" tofile="@{dest}/${@{module}@{lang}_strs}" overwrite="true">
+ <filterset>
+ <!-- TODO - Integration -->
+ <filter token="LANG" value="@{lang}" />
+ <filter token="LANG_MODULE" value="@{module};lang:@{lang}" />
+ <filter token="STRINGS" value="${@{module}@{lang}-strs-loaded}" />
+ <filter token="YUIVAR" value="${yui.variable}" />
+ <filter token="MODULE" value="@{module}" />
+ <filter token="LANG_DETAILS" value="${@{module}@{lang}_details}" />
+ </filterset>
+ </copy>
+ </sequential>
+
+ </macrodef>
+
<macrodef name="addmodule">
<attribute name="file" />
<attribute name="module" />
<attribute name="details" default="" />
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}-details" value="" />
</then>
<else>
<property name="@{module}-details" value=",@{details}" />
</else>
</if>
<loadfile srcfile="@{file}" property="@{module}-@{file}-code" />
<echo level="info">Wrapping @{file} in YUI.add module</echo>
<copy file="${builddir}/files/moduletemplate.txt" tofile="@{file}" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{file}-code}" />
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}" />
<filter token="DETAILS" value="${@{module}-details}" />
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addrollup">
<attribute name="file" />
<attribute name="module" />
<attribute name="details" default="" />
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}-details" value="" />
</then>
<else>
<property name="@{module}-details" value=",@{details}" />
</else>
</if>
<loadfile srcfile="@{file}" property="@{module}-@{file}-code" />
<echo level="info">Adding Rollup @{file} using YUI.add</echo>
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{file}" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{file}-code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}"/>
<filter token="DETAILS" value="${@{module}-details}"/>
</filterset>
</copy>
</sequential>
</macrodef>
</project>
diff --git a/componentbuild/shared/properties.xml b/componentbuild/shared/properties.xml
index 3dec5dd..2ab1a50 100644
--- a/componentbuild/shared/properties.xml
+++ b/componentbuild/shared/properties.xml
@@ -1,135 +1,141 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiSharedProperties">
<!-- ANT contrib library for loops, if/else support, with property fix for FOR task -->
<taskdef resource="antcontrib.properties">
<classpath>
<pathelement location="${builddir}/lib/ant-contrib/ant-contrib-1.0b3-modified.jar" />
</classpath>
</taskdef>
<dirname property="buildfile.dir" file="${ant.file}" />
<!--
builddir : The path to the builder/componentbuild directory from the component build file
srcdir : The path to top of the project source directory (e.g. yui2) from the component build file
-->
<property name="builddir" location="../../../builder/componentbuild" />
<property name="srcdir" location="../.." />
<!-- buildfiles.eol : End of line char to use for built files -->
<property name="buildfiles.eol" value="lf"/>
<!-- Supporting Tools -->
<property name="rhino.jar" location="${builddir}/lib/rhino/js.jar" />
<property name="jslintconsole.js" location="${builddir}/lib/jslint/jslint-console.js" />
<property name="jslintsrc.js" location="${builddir}/lib/jslint/fulljslint.js" />
<property name="yuicompressor.jar" location="${builddir}/lib/yuicompressor/yuicompressor-2.4.jar" />
<!-- YUI Compressor arguments for JS and CSS files -->
<property name="yuicompressor.css.args" value="--type css --line-break 6000" />
<property name="yuicompressor.js.args" value="--disable-optimizations --preserve-semi --line-break 6000" />
<property name="yuicompressor.js.charset" value="utf-8" />
<property name="yuicompressor.css.charset" value="utf-8" />
<!-- Enable/Disable YUI Compressor verbosity. NOTE: Checked in build files should not disable this flag -->
<property name="yuicompressor.js.verbose" value="true" />
<property name="yuicompressor.css.verbose" value="true" />
<condition property="yuicompressor.js.args.internal" value="-v --charset ${yuicompressor.js.charset} ${yuicompressor.js.args}" else="--charset ${yuicompressor.js.charset} ${yuicompressor.js.args}">
<istrue value="${yuicompressor.js.verbose}" />
</condition>
<condition property="yuicompressor.css.args.internal" value="-v --charset ${yuicompressor.css.charset} ${yuicompressor.css.args}" else="--charset ${yuicompressor.css.charset} ${yuicompressor.css.args}">
<istrue value="${yuicompressor.css.verbose}" />
</condition>
<!-- Top Level Build Directories (e.g. yui2/build, yui3/build)-->
<property name="global.build.base" location="${srcdir}/build" />
<property name="global.build.component" location="${global.build.base}/${component}" />
<property name="global.build.component.assets" location="${global.build.component}/assets" />
<!-- Component Properties -->
<property name="component.module" value="${component}" />
<property name="component.basedir" location="${buildfile.dir}" />
- <property name="component.jsfiles.base" value="${component.basedir}/js" />
+ <property name="component.jsfiles.base" location="${component.basedir}/js" />
+ <property name="component.lang.base" location="${component.basedir}/lang" />
+
<property name="component.assets.flatten" value="true" />
- <property name="component.assets.base" value="${component.basedir}/assets" />
+ <property name="component.assets.base" location="${component.basedir}/assets" />
<property name="component.assets.files" value="**/*" />
<property name="component.assets.legacy.flatten" value="true" />
- <property name="component.assets.legacy.base" value="${component.assets.base}/legacy" />
+ <property name="component.assets.legacy.base" location="${component.assets.base}/legacy" />
<property name="component.assets.legacy.files" value="**/*" />
- <property name="component.assets.skins.base" value="${component.assets.base}/skins" />
+ <property name="component.assets.skins.base" location="${component.assets.base}/skins" />
<property name="component.assets.skins.files" value="**/*" />
<condition property="component.skins.exist">
<and>
<available file="${component.assets.base}/${component}-core.css" type="file" />
<available file="${component.assets.base}/skins" type="dir" />
</and>
</condition>
<!-- component is part of a rollup build, so rollup skins to parent -->
<condition property="rollupskins">
<and>
<istrue value="${rollup}" />
<istrue value="${component.skins.exist}" />
</and>
</condition>
<available file="${component.assets.base}" type="dir" property="component.assets.exist"/>
+ <condition property="component.langs.exist">
+ <isset property="component.lang" />
+ </condition>
+
<!--
DEPRECATED: component.basefilename and component.releasetype are deprecated
We used to mark filenames with suffixes (-beta, -experimental), which we no longer do
-->
<condition property="component.basefilename" value="${component}" else="${component}">
<isset property="component.releasetype"/>
</condition>
<!-- Default logger regex values if not provided -->
<property name="component.logger.regex" value="^.*?(?:logger|YAHOO.log).*?(?:;|\).*;|(?:\r?\n.*?)*?\).*;).*;?.*?\r?\n" />
<property name="component.logger.regex.replace" value="" />
<property name="component.logger.regex.flags" value="mg" />
<property name="component.logger.regex.byline" value="false" />
<!-- Rollup support, currently only used for YUI 3 -->
<property name="component.rollup" value="false"/>
<property name="component.rollup.target" value="all"/>
<condition property="component.builddir" value="${component.basedir}/build_rollup_tmp" else="${component.basedir}/build_tmp">
<istrue value="${component.rollup}"/>
</condition>
<condition property="rollup.skins.exist">
<and>
<istrue value="${component.rollup}" />
<available file="${component.assets.base}/skins" type="dir" />
</and>
</condition>
<condition property="skins.exist">
<or>
<istrue value="${rollup.skins.exist}" />
<istrue value="${component.skins.exist}" />
</or>
</condition>
<!-- The temporary working directory used by the build process -->
<property name="workingdir" location="${component.builddir}/ant" />
<!-- The file which defines the default targets for the particular type of component (module, rollup, css) -->
<condition property="targetbase" value="rollup" else="module">
<istrue value="${component.rollup}"/>
</condition>
<condition property="targets" value="${builddir}/shared/cssmodule.xml" else="${targetbase}.xml">
<isset property="component.cssfiles" />
</condition>
</project>
diff --git a/componentbuild/shared/targets.xml b/componentbuild/shared/targets.xml
index 475a2da..51744eb 100644
--- a/componentbuild/shared/targets.xml
+++ b/componentbuild/shared/targets.xml
@@ -1,134 +1,140 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiSharedTargets">
<echo level="info">Starting Build For ${component}</echo>
<echo level="info">Ant Properties</echo>
<echo level="info"> Home : ${ant.home}</echo>
<echo level="info"> Ant Version : ${ant.version}</echo>
<echo level="info"> Build File : ${ant.file}</echo>
<echo level="info">Local Build Properties</echo>
<echo level="info"> version : ${yui.version}</echo>
<echo level="info"> srcdir : ${srcdir}</echo>
<echo level="info"> builddir : ${builddir}</echo>
<echo level="info"> component : ${component}</echo>
<echo level="info"> component.basefilename : ${component.basefilename}</echo>
<echo level="info"> component.basedir : ${component.basedir}</echo>
<echo level="info"> component.builddir : ${component.builddir}</echo>
<echo level="info">Global Build Properties</echo>
<echo level="info"> global.build.base : ${global.build.base}</echo>
<echo level="info"> global.build.component : ${global.build.component}</echo>
<echo level="info"> global.build.component.assets : ${global.build.component.assets}</echo>
<import file="${builddir}/shared/macrolib.xml" description="Macrodef definitions - jslint, yuicompessor, registerversion" />
<target name="all" depends="local, deploy" description="Build and Deploy to Global Build Directory" />
<target name="local" depends="clean, init, build, minify, lint" description="Build and Deploy to Local Build Directory" />
<target name="init">
<tstamp/>
<mkdir dir="${component.builddir}" />
<createdetails />
</target>
<target name="clean" description="Clean Local Build Directory" unless="clean.skip">
<delete dir="${component.builddir}" />
</target>
<target name="build" />
<!-- MIN -->
<target name="minify" description="Create component-min.js from component.js">
<yuicompress src="${component.builddir}/${component.basefilename}.js" dest="${component.builddir}/${component.basefilename}-min.js" args="${yuicompressor.js.args.internal}" />
</target>
<target name="lint" description="Run jslint over the local build files (default settings)" unless="lint.skip">
<jslint>
<jsfiles>
<fileset dir="${component.builddir}" includes="*.js" />
</jsfiles>
</jslint>
</target>
<!-- DEPLOY -->
<target name="deploy" description="Copy files to global location" depends="deploybuild, deployassets, deployskins, deploydocs"></target>
<target name="deploybuild" description="Copy built files to global build location">
<copy todir="${global.build.component}" preservelastmodified="true">
<fileset dir="${component.builddir}" includes="*.js" />
</copy>
</target>
<target name="deployassets" if="component.assets.exist">
<copy todir="${global.build.component.assets}" flatten="${component.assets.flatten}" preservelastmodified="true">
<fileset dir="${component.assets.base}" includes="${component.assets.files}" excludes="skins/, legacy/" />
</copy>
<copy todir="${global.build.component.assets}" flatten="${component.assets.legacy.flatten}" preservelastmodified="true" failonerror="false">
<fileset dir="${component.assets.legacy.base}" includes="${component.assets.legacy.files}" excludes="skins/" />
</copy>
</target>
<target name="deployskins" if="skins.exist">
<copy todir="${global.build.component.assets}/skins/sam" preservelastmodified="true">
<fileset dir="${component.builddir}/assets/skins/sam" includes="${component}.css" />
</copy>
<copy todir="${global.build.component.assets}/skins/sam" preservelastmodified="true">
<fileset dir="${component.assets.skins.base}/sam" includes="${component.assets.skins.files}" />
</copy>
</target>
+ <target name="deploylang" description="Copy language bundles to global build location" if="component.langs.exist">
+ <copy todir="${global.build.component.assets}/lang" preservelastmodified="true">
+ <fileset dir="${component.builddir}/lang" includes="*.js" />
+ </copy>
+ </target>
+
<target name="deploydocs" description="Copy doc files to global doc locations">
<!-- TODO -->
</target>
<target name="-prepend" if="component.prependfiles">
<concat destfile="${workingdir}/${component.basefilename}.js.tmp" fixlastline="true">
<filelist dir="${component.basedir}" files="${component.prependfiles}" />
<filterchain>
<tokenfilter>
<filetokenizer/>
<replaceregex
pattern="${component.logger.regex}"
replace="${component.logger.regex.replace}"
flags="${component.logger.regex.flags}" />
</tokenfilter>
</filterchain>
</concat>
<concat destfile="${workingdir}/${component.basefilename}.js.tmp" fixlastline="true" append="true">
<filelist dir="${component.builddir}" files="${component.basefilename}.js" />
</concat>
<move file="${workingdir}/${component.basefilename}.js.tmp" tofile="${component.builddir}/${component.basefilename}.js" />
</target>
<target name="-append" if="component.appendfiles">
<concat destfile="${component.builddir}/${component.basefilename}.js" fixlastline="true" append="true">
<filelist dir="${component.basedir}" files="${component.appendfiles}" />
<filterchain>
<tokenfilter>
<filetokenizer/>
<replaceregex
pattern="${component.logger.regex}"
replace="${component.logger.regex.replace}"
flags="${component.logger.regex.flags}" />
</tokenfilter>
</filterchain>
</concat>
</target>
<target name="-prependdebug" if="component.prependfiles">
<concat destfile="${workingdir}/${component.basefilename}-debug.js.tmp" fixlastline="true" >
<filelist dir="${component.basedir}" files="${component.prependfiles}" />
<filelist dir="${component.builddir}" files="${component.basefilename}-debug.js" />
</concat>
<move file="${workingdir}/${component.basefilename}-debug.js.tmp" tofile="${component.builddir}/${component.basefilename}-debug.js" />
</target>
<target name="-appenddebug" if="component.appendfiles">
<concat destfile="${component.builddir}/${component.basefilename}-debug.js" fixlastline="true" append="true">
<filelist dir="${component.basedir}" files="${component.appendfiles}" />
</concat>
</target>
</project>
|
yui/builder
|
a85a94f971076403ae08cf752dbea9d88cf7b97d
|
Added support for component.lang for YUI.add() call
|
diff --git a/componentbuild/docs/properties.html b/componentbuild/docs/properties.html
index 0f3f4a0..43b7efb 100644
--- a/componentbuild/docs/properties.html
+++ b/componentbuild/docs/properties.html
@@ -1,368 +1,373 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<title>YUI ANT Property Definitions</title>
<link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.7.0/build/reset/reset-min.css">
<link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.7.0/build/fonts/fonts-min.css">
<link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.7.0/build/base/base-min.css">
<link rel="stylesheet" type="text/css" href="docs.css">
</head>
<body>
<table class="desc">
<caption>
<p>BOOTSTRAP PROPERTIES</p>
</caption>
<thead>
<tr>
<th>Property</th>
<th>Description</th>
<th>Default</th>
</tr>
</thead>
<tbody>
<tr>
<td class="term">builddir</td>
<td>The path to the builder/componentbuild directory from the component build file. If the builder directory sits next to the yui2/yui3 source code directory then this does not need to be changed from the default value.</td>
<td class="default">../../../builder/componentbuild</td>
</tr>
<tr>
<td class="term">srcdir</td>
<td>The path to top of the project source directory (e.g. yui2/, yui3/) from the component build file.</td>
<td class="default">../..</td>
</tr>
<tr>
<td class="term">buildfile.dir</td>
<td>The directory containing the component build file.</td>
<td class="default">${ant.file}</td>
</tr>
</tbody>
</table>
<table class="desc">
<caption>
<p>BUILD FILE PATHS</p>
</caption>
<thead>
<tr>
<th>Property</th>
<th>Description</th>
<th>Default</th>
</tr>
</thead>
<tbody>
<tr>
<td class="term">global.build.base</td>
<td>The path to the top level build directory</td>
<td class="default">${srcdir}/build</td>
</tr>
<tr>
<td class="term">global.build.component</td>
<td>The path to the top level build directory for the component being built (e.g. yui2/build/autocomplete)</td>
<td class="default">${global.build.base}/${component}</td>
</tr>
<tr>
<td class="term">global.build.component.assets</td>
<td>The path to the top level assets directory for the component being built (e.g. yui2/build/autocomplete/assets)</td>
<td class="default">${global.build.component}/${assets}</td>
</tr>
</tbody>
</table>
<table class="desc">
<caption>
<p>COMPONENT CONFIGURATION</p>
</caption>
<thead>
<tr>
<th>Property</th>
<th>Description</th>
<th>Default</th>
</tr>
</thead>
<tbody>
<tr>
<td class="term">component</td>
<td>Component name, lower-case. Used for build filenames(e.g. component.js, component-min.js)</td>
<td class="default"><p>No Default Value.</p><p>Required in build.properties.</p></td>
</tr>
<tr>
<td class="term">component.module</td>
<td>Module name, mostly always the same as component</td>
<td class="default">${component}</td>
</tr>
<tr>
<td class="term">component.mainclass</td>
<td>Main JS class representing the module. Version code will be added to this class. [YUI2 Only]</td>
<td class="default"><p>No Default Value.</p><p>Required in build.properties.</p></td>
</tr>
<tr>
<td class="term">component.rollup</td>
<td>Whether or not the component is a rollup. [YUI3 Only]</td>
<td class="default">false</td>
</tr>
<tr>
<td class="term">component.rollup.modules.buildfiles</td>
<td>The build files for the sub-modules making up the rollup. [YUI3 Only]</td>
<td class="default breakable"><p>No Default Value.</p><p>Required in build.properties, if component.rollup is set to true.</p></td>
</tr>
<tr>
<td class="term">component.rollup.target</td>
<td>The default target to run on sub-module builds, initiated by the rollup build. [YUI3 Only]</td>
<td class="default">all</td>
</tr>
<tr>
<td class="term">component.use</td>
<td>Comma separated list of modules which the built module should "use". Used in generating the boilerplate registration code [YUI3 Only].</td>
<td class="default">No Default Value</td>
</tr>
<tr>
<td class="term">component.supersedes</td>
<td>Comma separated list of modules which the built module "supercedes". Used in generating the boilerplate registration code [YUI3 Only].</td>
<td class="default">No Default Value</td>
</tr>
<tr>
<td class="term">component.requires</td>
<td>Comma separated list of modules which the built module "requires". Used in generating the boilerplate registration code [YUI3 Only].</td>
<td class="default">No Default Value</td>
</tr>
<tr>
<td class="term">component.optional</td>
<td>Comma separated list of "optional" modules for the built module. Used in generating the boilerplate registration code [YUI3 Only].</td>
<td class="default">No Default Value</td>
</tr>
<tr>
<td class="term">component.skinnable</td>
<td>Whether or not the component is "skinnable". Used in generating the boilerplate registration code [YUI3 Only].</td>
<td class="default">No Default Value</td>
</tr>
+ <tr>
+ <td class="term">component.lang</td>
+ <td>Comma separated list of BCP 47 language codes, specifying the language packs which are available for this module [YUI3 Only].</td>
+ <td class="default">No Default Value</td>
+ </tr>
<tr>
<td class="term">component.logger.regex</td>
<td>
<p>Regex used to strip logger statements</p>
<p><strong>IMPORTANT :</strong></p>
<ul>
<li>Log statements need to end in semi-colons, otherwise the default regex will strip out code until the next semi-colon is hit.</li>
<li>Any code on the same line as the start or end of a Log statement will be stripped. Hence Log statments should be on their own lines.</li>
</ul>
</td>
<td class="default breakable">^.*?(?:logger|YAHOO.log).*?(?:;|\).*;|(?:\r?\n.*?)*?\).*;).*;?.*?\r?\n</td>
</tr>
<tr>
<td class="term">component.logger.regex.byline</td>
<td>If component.logger.regex.byline is false, regex will match against the entire file as opposed to line by line - required for multiline search.</td>
<td class="default">false</td>
</tr>
<tr>
<td class="term">component.logger.regex.flags</td>
<td>The set of standard Perl5 regex flags which apply.</td>
<td class="default">mg</td>
</tr>
<tr>
<td class="term">component.logger.regex.replace</td>
<td>The replacement string to use.</td>
<td class="default">""</td>
</tr>
<tr>
<td class="term">component.logger.regex.skip</td>
<td>Can be set to true, to skip the logger regex replacement step.</td>
<td class="default">false</td>
</tr>
</tbody>
</table>
<table class="desc">
<caption>
<p>COMPONENT FILE PATHS</p>
</caption>
<thead>
<tr>
<th>Property</th>
<th>Description</th>
<th>Default</th>
</tr>
</thead>
<tbody>
<tr>
<td class="term">component.basedir</td>
<td>Absolute path to the component's base directory (e.g. yui2/src/autocomplete)</td>
<td class="default">${buildfile.dir}</td>
</tr>
<tr>
<td class="term">component.builddir</td>
<td>Absolute path to the component's local build directory (e.g. yui2/src/autocomplete/build_tmp)</td>
<td class="default"><p>${component.basedir}/build_tmp (non-rollups)</p><p>${component.basedir}/build_rollup_tmp (rollups)</p></td>
</tr>
<tr>
<td class="term">component.jsfiles</td>
<td>Comma seperated ordered list of JS source files to be concatenated, relative to ${component.basedir}/js</td>
<td class="default"><p>No Default Value.</p><p>Required in build.properties (for JS modules).</p></td>
</tr>
<tr>
<td class="term">component.cssfiles</td>
<td>Comma seperated ordered list of CSS source files to be concatenated (for CSS modules), relative to ${component.basedir}/css</td>
<td class="default"><p>No Default Value.</p><p>Required in build.properties (for CSS modules).</p></td>
</tr>
<tr>
<td class="term">component.prependfiles</td>
<td>Comma separated list of files to prepend to the built files (in the case of YUI 3, this content would reside outside the registration boilerplate code). Filepaths are relative to component.basedir.</td>
<td class="default">No Default Value</td>
</tr>
<tr>
<td class="term">component.appendfiles</td>
<td>Comma separated list of files to append to the built files (in the case of YUI 3, this content would reside outside the registration boilerplate code). Filepaths are relative to component.basedir.</td>
<td class="default">No Default Value</td>
</tr>
<tr>
<td class="term">component.assets.skins.base</td>
<td>
<p>Base directory for the component's skinning assets (e.g. yui2/src/autocomplete/assets/skins).</p>
<p>If this value is set, the build expects the following directory structure, in the component's assets directory:</p>
<pre>
<component.assets.base>
- <component>-core.css
- skins/sam/<component>-skin.css
- skins/sam/*.gif, *.png, *.jpg
</pre>
</td>
<td class="default">${component.assets.base}/skins</td>
</tr>
<tr>
<td class="term">component.assets.skins.files</td>
<td>Set of skinning assets to deploy.</td>
<td class="default">**/*</td>
</tr>
<tr>
<td class="term">component.assets.base</td>
<td>Base directory for the component's non-skinning related assets. e.g. SWFs and non-skinned images.</td>
<td class="default">${component.basedir}/assets</td>
</tr>
<tr>
<td class="term">component.assets.files</td>
<td>Set of asset files to deploy.</td>
<td class="default">**/*</td>
</tr>
<tr>
<td class="term">component.assets.flatten</td>
<td>Whether or not to flatten the asset directory structure when deploying to build.</td>
<td class="default">true</td>
</tr>
</tbody>
</table>
<table class="desc">
<caption>
<p>EXTERNAL TOOLS</p>
</caption>
<thead>
<tr>
<th>Property</th>
<th>Description</th>
<th>Default</th>
</tr>
</thead>
<tbody>
<tr>
<td class="term">rhino.jar</td>
<td>Path to rhino.jar, used to run jslint.</td>
<td class="default">${builddir}/lib/rhino/js.jar</td>
</tr>
<tr>
<td class="term">jslintconsole.js</td>
<td>Path to the console script used to run jslint.</td>
<td class="default">${builddir}/lib/jslint/jslint-console.js</td>
</tr>
<tr>
<td class="term">jslintsrc.js</td>
<td>Path to the jslint implementation.</td>
<td class="default">${builddir}/lib/jslint/fulljslint.js</td>
</tr>
<tr>
<td class="term">yuicompressor.jar</td>
<td>Path to the YUI Compressor jar, used for minification.</td>
<td class="default breakable">${builddir}/lib/yuicompressor/yuicompressor-2.4.jar</td>
</tr>
<tr>
<td class="term">yuicompressor.css.args</td>
<td>YUI Compressor args for CSS compression.</td>
<td class="default">--type css --line-break 6000</td>
</tr>
<tr>
<td class="term">yuicompressor.js.args</td>
<td>YUI Compressor args for JS compression.</td>
<td class="default breakable">--disable-optimizations --preserve-semi --line-break 6000</td>
</tr>
<tr>
<td class="term">yuicompressor.js.verbose</td>
<td>Whether or not YUI Compressor should run with verbose output enabled for JS compression. If enabled, YUI Compressor will show code related warnings/suggestions during compression. NOTE: Checked in build files should have been compressed with this flag set to true.</td>
<td class="default">true</td>
</tr>
<tr>
<td class="term">yuicompressor.css.verbose</td>
<td>Whether or not YUI Compressor should run with verbose output enabled for CSS compession.</td>
<td class="default">true</td>
</tr>
<tr>
<td class="term">yuicompressor.js.charset</td>
<td>The charset to use both for reading the js file to compress and when writing the generated min file.</td>
<td class="default">utf-8</td>
</tr>
<tr>
<td class="term">yuicompressor.css.charset</td>
<td>The charset to use both for reading the css file to compress and when writing the generated min file.</td>
<td class="default">utf-8</td>
</tr>
</tbody>
</table>
<table class="desc">
<caption>
<p>MISCELLANEOUS</p>
</caption>
<thead>
<tr>
<th>Property</th>
<th>Description</th>
<th>Default</th>
</tr>
</thead>
<tbody>
<tr>
<td class="term">buildfiles.eol</td>
<td>The EOL character to use for built files.</td>
<td class="default">lf</td>
</tr>
<tr>
<td class="term">workingdir</td>
<td>The temporary directory which ant should use during the build. This directory will be deleted at the end of the build.</td>
<td class="default">${component.builddir}/ant</td>
</tr>
<tr>
<td class="term">yui.version</td>
<td>The version of YUI component being built.</td>
<td class="default breakable">2 for YUI 2, 3 for YUI 3</td>
</tr>
<tr>
<td class="term">yui.variable</td>
<td>The YUI instance variable name to use when generating the YUI.add(function(YUIInstanceVariable) {}) wrapper. [YUI3 Only]</td>
<td class="default">Y</td>
</tr>
<tr>
<td class="term">lint.skip</td>
<td>Set to true to skip the lint step, during a build. NOTE: Checked in build files should not have this flag set to true. Checked in component code needs to have gone through lint.</td>
<td class="default">false</td>
</tr>
<tr>
<td class="term">register.skip</td>
<td>Set to true to skip the build step which adds the boiler plate registration code. This can be used if your code has the registration code added manually, however this is not recommended.</td>
<td class="default">false</td>
</tr>
<tr>
<td class="term">clean.skip</td>
<td>Set to true to skip the build step which deletes the local build directory (build_tmp) before each build.</td>
<td class="default">false</td>
</tr>
</tbody>
</table>
</body>
</html>
diff --git a/componentbuild/shared/macrolib.xml b/componentbuild/shared/macrolib.xml
index 24b4f2f..ae64009 100644
--- a/componentbuild/shared/macrolib.xml
+++ b/componentbuild/shared/macrolib.xml
@@ -1,214 +1,215 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiMacroLib">
<macrodef name="arrayliteral">
<attribute name="from" />
<attribute name="to" />
<attribute name="key" />
<sequential>
<if>
<and>
<isset property="@{from}" />
<length string="${@{from}}" when="ne" length="0" />
</and>
<then>
<propertyregex property="array"
override="true"
input="${@{from}}"
casesensitive="false"
regexp="([^\,\s]+)"
replace="'\1'"
/>
<property name="@{to}" value="@{key}:[${array}]" />
</then>
</if>
</sequential>
</macrodef>
<macrodef name="createdetails">
<sequential>
<arrayliteral from="component.use" to="component.details.use" key="use" />
<arrayliteral from="component.supersedes" to="component.details.supersedes" key="supersedes" />
<arrayliteral from="component.requires" to="component.details.requires" key="requires" />
<arrayliteral from="component.optional" to="component.details.optional" key="optional" />
+ <arrayliteral from="component.lang" to="component.details.lang" key="lang" />
<if>
<isset property="component.skinnable" />
<then>
<property name="component.details.skinnable" value="skinnable:${component.skinnable}" />
</then>
</if>
<propertyselector property="details.list"
delimiter=","
match="component\.details.([^\.]*)"
select="\1"
casesensitive="false" />
<var name="details" value="" />
<if>
<isset property="details.list" />
<then>
<for list="${details.list}" param="val">
<sequential>
<var name="details" value="${component.details.@{val}}, ${details}" />
</sequential>
</for>
<propertyregex property="component.details.hash"
input="{${details}}"
regexp="(\,\s*?\})"
replace="}"
casesensitive="false" />
</then>
<else>
<property name="component.details.hash" value="" />
</else>
</if>
</sequential>
</macrodef>
<macrodef name="yuicompress">
<attribute name="src" />
<attribute name="dest" />
<attribute name="args" />
<sequential>
<echo level="info">Running yuicompressor on @{src}</echo>
<java jar="${yuicompressor.jar}" fork="true" failonerror="true">
<arg line="@{args} -o" />
<arg file="@{dest}" />
<arg file="@{src}" />
</java>
</sequential>
</macrodef>
<macrodef name="concatsource">
<attribute name="destfile" />
<attribute name="sourcedir" />
<attribute name="sourcefiles" />
<attribute name="workingdir" default="${workingdir}" />
<element name="filters" optional="true" description="Additonal filters to apply to individual files"/>
<sequential>
<echo level="info">Concatenating</echo>
<echo level="info"> Source Files : @{sourcefiles}</echo>
<echo level="info"> In Source Dir : @{sourcedir}</echo>
<echo level="info"> To : @{destfile}</echo>
<delete dir="@{workingdir}" quiet="true"/>
<copy todir="@{workingdir}">
<filelist dir="@{sourcedir}" files="@{sourcefiles}" />
<filterchain>
<filters />
<fixcrlf fixlast="true" eof="remove"/>
</filterchain>
</copy>
<concat destfile="@{destfile}" fixlastline="true">
<filelist dir="@{workingdir}" files="@{sourcefiles}" />
</concat>
<delete dir="${workingdir}" quiet="true" />
</sequential>
</macrodef>
<macrodef name="jslint">
<element name="jsfiles" optional="false" />
<sequential>
<!--
Need to find a way to convert fileset to args (script?) to
avoid ' ', which will break for files with ' in them
Evaluates to the following java execution line...
java -r js.jar jslintconsole.js 'file1.js' 'file2.js' 'file3.js'
-->
<pathconvert pathsep="' '" property="jsfileargs">
<jsfiles />
</pathconvert>
<java jar="${rhino.jar}" fork="true" failonerror="true">
<arg file="${jslintconsole.js}" />
<arg value="${jslintsrc.js}" />
<arg line="'${jsfileargs}'" />
</java>
</sequential>
</macrodef>
<macrodef name="registerversion">
<attribute name="module" />
<attribute name="classname" />
<attribute name="file" />
<sequential>
<loadfile srcfile="${builddir}/files/versioncode.txt" property="@{module}-@{classname}-version" >
<filterchain>
<replacetokens>
<token key="MODULE" value="@{module}"/>
<token key="CLASSNAME" value="@{classname}"/>
</replacetokens>
</filterchain>
</loadfile>
<echo level="info">Adding Version Registration Code to @{file}</echo>
<concat destfile="@{file}" append="true" fixlastline="true">${@{module}-@{classname}-version}</concat>
</sequential>
</macrodef>
<macrodef name="addmodule">
<attribute name="file" />
<attribute name="module" />
<attribute name="details" default="" />
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}-details" value="" />
</then>
<else>
<property name="@{module}-details" value=",@{details}" />
</else>
</if>
<loadfile srcfile="@{file}" property="@{module}-@{file}-code" />
<echo level="info">Wrapping @{file} in YUI.add module</echo>
<copy file="${builddir}/files/moduletemplate.txt" tofile="@{file}" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{file}-code}" />
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}" />
<filter token="DETAILS" value="${@{module}-details}" />
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addrollup">
<attribute name="file" />
<attribute name="module" />
<attribute name="details" default="" />
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}-details" value="" />
</then>
<else>
<property name="@{module}-details" value=",@{details}" />
</else>
</if>
<loadfile srcfile="@{file}" property="@{module}-@{file}-code" />
<echo level="info">Adding Rollup @{file} using YUI.add</echo>
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{file}" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{file}-code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}"/>
<filter token="DETAILS" value="${@{module}-details}"/>
</filterset>
</copy>
</sequential>
</macrodef>
</project>
|
yui/builder
|
b6ecbfbb803f5559148aa52a3fa9a9fae7483784
|
Added charset argument for yuicompressor. Defaults to utf-8. Overrideable using yuicompressor.js.charset and yuicompressor.css.charset
|
diff --git a/componentbuild/docs/properties.html b/componentbuild/docs/properties.html
index 317f69c..0f3f4a0 100644
--- a/componentbuild/docs/properties.html
+++ b/componentbuild/docs/properties.html
@@ -1,358 +1,368 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<title>YUI ANT Property Definitions</title>
<link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.7.0/build/reset/reset-min.css">
<link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.7.0/build/fonts/fonts-min.css">
<link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.7.0/build/base/base-min.css">
<link rel="stylesheet" type="text/css" href="docs.css">
</head>
<body>
<table class="desc">
<caption>
<p>BOOTSTRAP PROPERTIES</p>
</caption>
<thead>
<tr>
<th>Property</th>
<th>Description</th>
<th>Default</th>
</tr>
</thead>
<tbody>
<tr>
<td class="term">builddir</td>
<td>The path to the builder/componentbuild directory from the component build file. If the builder directory sits next to the yui2/yui3 source code directory then this does not need to be changed from the default value.</td>
<td class="default">../../../builder/componentbuild</td>
</tr>
<tr>
<td class="term">srcdir</td>
<td>The path to top of the project source directory (e.g. yui2/, yui3/) from the component build file.</td>
<td class="default">../..</td>
</tr>
<tr>
<td class="term">buildfile.dir</td>
<td>The directory containing the component build file.</td>
<td class="default">${ant.file}</td>
</tr>
</tbody>
</table>
<table class="desc">
<caption>
<p>BUILD FILE PATHS</p>
</caption>
<thead>
<tr>
<th>Property</th>
<th>Description</th>
<th>Default</th>
</tr>
</thead>
<tbody>
<tr>
<td class="term">global.build.base</td>
<td>The path to the top level build directory</td>
<td class="default">${srcdir}/build</td>
</tr>
<tr>
<td class="term">global.build.component</td>
<td>The path to the top level build directory for the component being built (e.g. yui2/build/autocomplete)</td>
<td class="default">${global.build.base}/${component}</td>
</tr>
<tr>
<td class="term">global.build.component.assets</td>
<td>The path to the top level assets directory for the component being built (e.g. yui2/build/autocomplete/assets)</td>
<td class="default">${global.build.component}/${assets}</td>
</tr>
</tbody>
</table>
<table class="desc">
<caption>
<p>COMPONENT CONFIGURATION</p>
</caption>
<thead>
<tr>
<th>Property</th>
<th>Description</th>
<th>Default</th>
</tr>
</thead>
<tbody>
<tr>
<td class="term">component</td>
<td>Component name, lower-case. Used for build filenames(e.g. component.js, component-min.js)</td>
<td class="default"><p>No Default Value.</p><p>Required in build.properties.</p></td>
</tr>
<tr>
<td class="term">component.module</td>
<td>Module name, mostly always the same as component</td>
<td class="default">${component}</td>
</tr>
<tr>
<td class="term">component.mainclass</td>
<td>Main JS class representing the module. Version code will be added to this class. [YUI2 Only]</td>
<td class="default"><p>No Default Value.</p><p>Required in build.properties.</p></td>
</tr>
<tr>
<td class="term">component.rollup</td>
<td>Whether or not the component is a rollup. [YUI3 Only]</td>
<td class="default">false</td>
</tr>
<tr>
<td class="term">component.rollup.modules.buildfiles</td>
<td>The build files for the sub-modules making up the rollup. [YUI3 Only]</td>
<td class="default breakable"><p>No Default Value.</p><p>Required in build.properties, if component.rollup is set to true.</p></td>
</tr>
<tr>
<td class="term">component.rollup.target</td>
<td>The default target to run on sub-module builds, initiated by the rollup build. [YUI3 Only]</td>
<td class="default">all</td>
</tr>
<tr>
<td class="term">component.use</td>
<td>Comma separated list of modules which the built module should "use". Used in generating the boilerplate registration code [YUI3 Only].</td>
<td class="default">No Default Value</td>
</tr>
<tr>
<td class="term">component.supersedes</td>
<td>Comma separated list of modules which the built module "supercedes". Used in generating the boilerplate registration code [YUI3 Only].</td>
<td class="default">No Default Value</td>
</tr>
<tr>
<td class="term">component.requires</td>
<td>Comma separated list of modules which the built module "requires". Used in generating the boilerplate registration code [YUI3 Only].</td>
<td class="default">No Default Value</td>
</tr>
<tr>
<td class="term">component.optional</td>
<td>Comma separated list of "optional" modules for the built module. Used in generating the boilerplate registration code [YUI3 Only].</td>
<td class="default">No Default Value</td>
</tr>
<tr>
<td class="term">component.skinnable</td>
<td>Whether or not the component is "skinnable". Used in generating the boilerplate registration code [YUI3 Only].</td>
<td class="default">No Default Value</td>
</tr>
<tr>
<td class="term">component.logger.regex</td>
<td>
<p>Regex used to strip logger statements</p>
<p><strong>IMPORTANT :</strong></p>
<ul>
<li>Log statements need to end in semi-colons, otherwise the default regex will strip out code until the next semi-colon is hit.</li>
<li>Any code on the same line as the start or end of a Log statement will be stripped. Hence Log statments should be on their own lines.</li>
</ul>
</td>
<td class="default breakable">^.*?(?:logger|YAHOO.log).*?(?:;|\).*;|(?:\r?\n.*?)*?\).*;).*;?.*?\r?\n</td>
</tr>
<tr>
<td class="term">component.logger.regex.byline</td>
<td>If component.logger.regex.byline is false, regex will match against the entire file as opposed to line by line - required for multiline search.</td>
<td class="default">false</td>
</tr>
<tr>
<td class="term">component.logger.regex.flags</td>
<td>The set of standard Perl5 regex flags which apply.</td>
<td class="default">mg</td>
</tr>
<tr>
<td class="term">component.logger.regex.replace</td>
<td>The replacement string to use.</td>
<td class="default">""</td>
</tr>
<tr>
<td class="term">component.logger.regex.skip</td>
<td>Can be set to true, to skip the logger regex replacement step.</td>
<td class="default">false</td>
</tr>
</tbody>
</table>
<table class="desc">
<caption>
<p>COMPONENT FILE PATHS</p>
</caption>
<thead>
<tr>
<th>Property</th>
<th>Description</th>
<th>Default</th>
</tr>
</thead>
<tbody>
<tr>
<td class="term">component.basedir</td>
<td>Absolute path to the component's base directory (e.g. yui2/src/autocomplete)</td>
<td class="default">${buildfile.dir}</td>
</tr>
<tr>
<td class="term">component.builddir</td>
<td>Absolute path to the component's local build directory (e.g. yui2/src/autocomplete/build_tmp)</td>
<td class="default"><p>${component.basedir}/build_tmp (non-rollups)</p><p>${component.basedir}/build_rollup_tmp (rollups)</p></td>
</tr>
<tr>
<td class="term">component.jsfiles</td>
<td>Comma seperated ordered list of JS source files to be concatenated, relative to ${component.basedir}/js</td>
<td class="default"><p>No Default Value.</p><p>Required in build.properties (for JS modules).</p></td>
</tr>
<tr>
<td class="term">component.cssfiles</td>
<td>Comma seperated ordered list of CSS source files to be concatenated (for CSS modules), relative to ${component.basedir}/css</td>
<td class="default"><p>No Default Value.</p><p>Required in build.properties (for CSS modules).</p></td>
</tr>
<tr>
<td class="term">component.prependfiles</td>
<td>Comma separated list of files to prepend to the built files (in the case of YUI 3, this content would reside outside the registration boilerplate code). Filepaths are relative to component.basedir.</td>
<td class="default">No Default Value</td>
</tr>
<tr>
<td class="term">component.appendfiles</td>
<td>Comma separated list of files to append to the built files (in the case of YUI 3, this content would reside outside the registration boilerplate code). Filepaths are relative to component.basedir.</td>
<td class="default">No Default Value</td>
</tr>
<tr>
<td class="term">component.assets.skins.base</td>
<td>
<p>Base directory for the component's skinning assets (e.g. yui2/src/autocomplete/assets/skins).</p>
<p>If this value is set, the build expects the following directory structure, in the component's assets directory:</p>
<pre>
<component.assets.base>
- <component>-core.css
- skins/sam/<component>-skin.css
- skins/sam/*.gif, *.png, *.jpg
</pre>
</td>
<td class="default">${component.assets.base}/skins</td>
</tr>
<tr>
<td class="term">component.assets.skins.files</td>
<td>Set of skinning assets to deploy.</td>
<td class="default">**/*</td>
</tr>
<tr>
<td class="term">component.assets.base</td>
<td>Base directory for the component's non-skinning related assets. e.g. SWFs and non-skinned images.</td>
<td class="default">${component.basedir}/assets</td>
</tr>
<tr>
<td class="term">component.assets.files</td>
<td>Set of asset files to deploy.</td>
<td class="default">**/*</td>
</tr>
<tr>
<td class="term">component.assets.flatten</td>
<td>Whether or not to flatten the asset directory structure when deploying to build.</td>
<td class="default">true</td>
</tr>
</tbody>
</table>
<table class="desc">
<caption>
<p>EXTERNAL TOOLS</p>
</caption>
<thead>
<tr>
<th>Property</th>
<th>Description</th>
<th>Default</th>
</tr>
</thead>
<tbody>
<tr>
<td class="term">rhino.jar</td>
<td>Path to rhino.jar, used to run jslint.</td>
<td class="default">${builddir}/lib/rhino/js.jar</td>
</tr>
<tr>
<td class="term">jslintconsole.js</td>
<td>Path to the console script used to run jslint.</td>
<td class="default">${builddir}/lib/jslint/jslint-console.js</td>
</tr>
<tr>
<td class="term">jslintsrc.js</td>
<td>Path to the jslint implementation.</td>
<td class="default">${builddir}/lib/jslint/fulljslint.js</td>
</tr>
<tr>
<td class="term">yuicompressor.jar</td>
<td>Path to the YUI Compressor jar, used for minification.</td>
<td class="default breakable">${builddir}/lib/yuicompressor/yuicompressor-2.4.jar</td>
</tr>
<tr>
<td class="term">yuicompressor.css.args</td>
<td>YUI Compressor args for CSS compression.</td>
<td class="default">--type css --line-break 6000</td>
</tr>
<tr>
<td class="term">yuicompressor.js.args</td>
<td>YUI Compressor args for JS compression.</td>
<td class="default breakable">--disable-optimizations --preserve-semi --line-break 6000</td>
</tr>
<tr>
<td class="term">yuicompressor.js.verbose</td>
<td>Whether or not YUI Compressor should run with verbose output enabled for JS compression. If enabled, YUI Compressor will show code related warnings/suggestions during compression. NOTE: Checked in build files should have been compressed with this flag set to true.</td>
<td class="default">true</td>
</tr>
<tr>
<td class="term">yuicompressor.css.verbose</td>
<td>Whether or not YUI Compressor should run with verbose output enabled for CSS compession.</td>
<td class="default">true</td>
</tr>
+ <tr>
+ <td class="term">yuicompressor.js.charset</td>
+ <td>The charset to use both for reading the js file to compress and when writing the generated min file.</td>
+ <td class="default">utf-8</td>
+ </tr>
+ <tr>
+ <td class="term">yuicompressor.css.charset</td>
+ <td>The charset to use both for reading the css file to compress and when writing the generated min file.</td>
+ <td class="default">utf-8</td>
+ </tr>
</tbody>
</table>
<table class="desc">
<caption>
<p>MISCELLANEOUS</p>
</caption>
<thead>
<tr>
<th>Property</th>
<th>Description</th>
<th>Default</th>
</tr>
</thead>
<tbody>
<tr>
<td class="term">buildfiles.eol</td>
<td>The EOL character to use for built files.</td>
<td class="default">lf</td>
</tr>
<tr>
<td class="term">workingdir</td>
<td>The temporary directory which ant should use during the build. This directory will be deleted at the end of the build.</td>
<td class="default">${component.builddir}/ant</td>
</tr>
<tr>
<td class="term">yui.version</td>
<td>The version of YUI component being built.</td>
<td class="default breakable">2 for YUI 2, 3 for YUI 3</td>
</tr>
<tr>
<td class="term">yui.variable</td>
<td>The YUI instance variable name to use when generating the YUI.add(function(YUIInstanceVariable) {}) wrapper. [YUI3 Only]</td>
<td class="default">Y</td>
</tr>
<tr>
<td class="term">lint.skip</td>
<td>Set to true to skip the lint step, during a build. NOTE: Checked in build files should not have this flag set to true. Checked in component code needs to have gone through lint.</td>
<td class="default">false</td>
</tr>
<tr>
<td class="term">register.skip</td>
<td>Set to true to skip the build step which adds the boiler plate registration code. This can be used if your code has the registration code added manually, however this is not recommended.</td>
<td class="default">false</td>
</tr>
<tr>
<td class="term">clean.skip</td>
<td>Set to true to skip the build step which deletes the local build directory (build_tmp) before each build.</td>
<td class="default">false</td>
</tr>
</tbody>
</table>
</body>
</html>
diff --git a/componentbuild/shared/properties.xml b/componentbuild/shared/properties.xml
index 0363e10..3dec5dd 100644
--- a/componentbuild/shared/properties.xml
+++ b/componentbuild/shared/properties.xml
@@ -1,132 +1,135 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiSharedProperties">
<!-- ANT contrib library for loops, if/else support, with property fix for FOR task -->
<taskdef resource="antcontrib.properties">
<classpath>
<pathelement location="${builddir}/lib/ant-contrib/ant-contrib-1.0b3-modified.jar" />
</classpath>
</taskdef>
<dirname property="buildfile.dir" file="${ant.file}" />
<!--
builddir : The path to the builder/componentbuild directory from the component build file
srcdir : The path to top of the project source directory (e.g. yui2) from the component build file
-->
<property name="builddir" location="../../../builder/componentbuild" />
<property name="srcdir" location="../.." />
<!-- buildfiles.eol : End of line char to use for built files -->
<property name="buildfiles.eol" value="lf"/>
<!-- Supporting Tools -->
<property name="rhino.jar" location="${builddir}/lib/rhino/js.jar" />
<property name="jslintconsole.js" location="${builddir}/lib/jslint/jslint-console.js" />
<property name="jslintsrc.js" location="${builddir}/lib/jslint/fulljslint.js" />
<property name="yuicompressor.jar" location="${builddir}/lib/yuicompressor/yuicompressor-2.4.jar" />
<!-- YUI Compressor arguments for JS and CSS files -->
<property name="yuicompressor.css.args" value="--type css --line-break 6000" />
<property name="yuicompressor.js.args" value="--disable-optimizations --preserve-semi --line-break 6000" />
+ <property name="yuicompressor.js.charset" value="utf-8" />
+ <property name="yuicompressor.css.charset" value="utf-8" />
+
<!-- Enable/Disable YUI Compressor verbosity. NOTE: Checked in build files should not disable this flag -->
<property name="yuicompressor.js.verbose" value="true" />
<property name="yuicompressor.css.verbose" value="true" />
- <condition property="yuicompressor.js.args.internal" value="-v ${yuicompressor.js.args}" else="${yuicompressor.js.args}">
+ <condition property="yuicompressor.js.args.internal" value="-v --charset ${yuicompressor.js.charset} ${yuicompressor.js.args}" else="--charset ${yuicompressor.js.charset} ${yuicompressor.js.args}">
<istrue value="${yuicompressor.js.verbose}" />
</condition>
- <condition property="yuicompressor.css.args.internal" value="-v ${yuicompressor.css.args}" else="${yuicompressor.css.args}">
+ <condition property="yuicompressor.css.args.internal" value="-v --charset ${yuicompressor.css.charset} ${yuicompressor.css.args}" else="--charset ${yuicompressor.css.charset} ${yuicompressor.css.args}">
<istrue value="${yuicompressor.css.verbose}" />
</condition>
<!-- Top Level Build Directories (e.g. yui2/build, yui3/build)-->
<property name="global.build.base" location="${srcdir}/build" />
<property name="global.build.component" location="${global.build.base}/${component}" />
<property name="global.build.component.assets" location="${global.build.component}/assets" />
<!-- Component Properties -->
<property name="component.module" value="${component}" />
<property name="component.basedir" location="${buildfile.dir}" />
<property name="component.jsfiles.base" value="${component.basedir}/js" />
<property name="component.assets.flatten" value="true" />
<property name="component.assets.base" value="${component.basedir}/assets" />
<property name="component.assets.files" value="**/*" />
<property name="component.assets.legacy.flatten" value="true" />
<property name="component.assets.legacy.base" value="${component.assets.base}/legacy" />
<property name="component.assets.legacy.files" value="**/*" />
<property name="component.assets.skins.base" value="${component.assets.base}/skins" />
<property name="component.assets.skins.files" value="**/*" />
<condition property="component.skins.exist">
<and>
<available file="${component.assets.base}/${component}-core.css" type="file" />
<available file="${component.assets.base}/skins" type="dir" />
</and>
</condition>
<!-- component is part of a rollup build, so rollup skins to parent -->
<condition property="rollupskins">
<and>
<istrue value="${rollup}" />
<istrue value="${component.skins.exist}" />
</and>
</condition>
<available file="${component.assets.base}" type="dir" property="component.assets.exist"/>
<!--
DEPRECATED: component.basefilename and component.releasetype are deprecated
We used to mark filenames with suffixes (-beta, -experimental), which we no longer do
-->
<condition property="component.basefilename" value="${component}" else="${component}">
<isset property="component.releasetype"/>
</condition>
<!-- Default logger regex values if not provided -->
<property name="component.logger.regex" value="^.*?(?:logger|YAHOO.log).*?(?:;|\).*;|(?:\r?\n.*?)*?\).*;).*;?.*?\r?\n" />
<property name="component.logger.regex.replace" value="" />
<property name="component.logger.regex.flags" value="mg" />
<property name="component.logger.regex.byline" value="false" />
<!-- Rollup support, currently only used for YUI 3 -->
<property name="component.rollup" value="false"/>
<property name="component.rollup.target" value="all"/>
<condition property="component.builddir" value="${component.basedir}/build_rollup_tmp" else="${component.basedir}/build_tmp">
<istrue value="${component.rollup}"/>
</condition>
<condition property="rollup.skins.exist">
<and>
<istrue value="${component.rollup}" />
<available file="${component.assets.base}/skins" type="dir" />
</and>
</condition>
<condition property="skins.exist">
<or>
<istrue value="${rollup.skins.exist}" />
<istrue value="${component.skins.exist}" />
</or>
</condition>
<!-- The temporary working directory used by the build process -->
<property name="workingdir" location="${component.builddir}/ant" />
<!-- The file which defines the default targets for the particular type of component (module, rollup, css) -->
<condition property="targetbase" value="rollup" else="module">
<istrue value="${component.rollup}"/>
</condition>
<condition property="targets" value="${builddir}/shared/cssmodule.xml" else="${targetbase}.xml">
<isset property="component.cssfiles" />
</condition>
</project>
|
yui/builder
|
7d7e583f7f627398d03b8234ab85ad3c24d24009
|
2009 -> 2010
|
diff --git a/componentbuild/LICENSE b/componentbuild/LICENSE
index 24d009b..ead055a 100644
--- a/componentbuild/LICENSE
+++ b/componentbuild/LICENSE
@@ -1,53 +1,53 @@
All code under this directory and any subdirectories, with the exception
of the "lib" directory, is licensed under the BSD license, presented below:
- Copyright (c) 2009, Yahoo! Inc. All rights reserved.
+ Copyright (c) 2010, Yahoo! Inc. All rights reserved.
Code licensed under the BSD License:
http://developer.yahoo.net/yui/license.txt
The "lib" directory contains build support tools, which are packaged
along with the YUI component build code, in order to simplify installation.
The contents of "lib" are covered by the individual licenses below:
1). lib/ant-contrib/ant-contrib-1.0b3-modified.jar:
Is issued under the Apache Software License. For more information, see:
http://ant-contrib.sourceforge.net/
http://ant-contrib.sourceforge.net/LICENSE.txt
The ant-contrib-1.0b3 release has been modified by YUI to add the
missing lookup entry for the "for" task to antcontrib.properties:
for=net.sf.antcontrib.logic.ForTask
2). lib/rhino/js.jar:
Rhino is issued under the Mozilla Public License (MPL), and MPL applies
to the Rhino source and binaries that are distributed under the
"lib/rhino" directory. For more information on Rhino licensing, see:
https://developer.mozilla.org/en/Rhino_License
3). lib/jslint/jslint-console.js:
Is derived from rhino.js available at www.jslint.com/rhino/rhino.js,
the contents of which are in the public domain. See the contents of the
file for licensing information.
4). lib/jslint/fulljslint.js:
Is derived from fulljslint.js, available at
http://www.jslint.com/fulljslint.js, the contents of which are in the public
domain. See the contents of the file for licensing information.
5). lib/yuicompressor:
Is covered by the BSD license, specified on
http://developer.yahoo.com/yui/compressor/
YUI Compressor ships with a modified version of Rhino, which is covered by
the Mozilla Public License, further details of which can be found at the above
-url.
\ No newline at end of file
+url.
|
yui/builder
|
7840dd727c88f48741f938df8ac0e789b224566b
|
Fixed 3.x rollup support for skin css
|
diff --git a/componentbuild/3.x/module.xml b/componentbuild/3.x/module.xml
index 942a5b6..472b4b5 100644
--- a/componentbuild/3.x/module.xml
+++ b/componentbuild/3.x/module.xml
@@ -1,68 +1,68 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiModuleTargets">
<import file="${builddir}/shared/targets.xml" description="Targets common to Rollup/Module" />
<target name="build" depends="buildcore, -rollupjs, buildskins" />
<target name="buildskins" depends="-buildskins, -rollupcss" />
<!-- CORE -->
<target name="buildcore" depends="builddebug, -createcore, -loggerregex" description="Create component.js">
<fixcrlf srcdir="${component.builddir}" includes="${component.basefilename}.js" eol="${buildfiles.eol}" />
</target>
<target name="-createcore">
<copy file="${component.builddir}/${component.basefilename}-debug.js" tofile="${component.builddir}/${component.basefilename}.js" />
</target>
<target name="-loggerregex" description="Replace logger statements" unless="component.logger.regex.skip">
<echo level="info">Replacing Logger Statements in ${component.builddir}/${component.basefilename}.js</echo>
<replaceregexp file="${component.builddir}/${component.basefilename}.js"
byline="${component.logger.regex.byline}"
match="${component.logger.regex}"
replace="${component.logger.regex.replace}"
flags="${component.logger.regex.flags}" />
</target>
<!-- DEBUG -->
<target name="builddebug" depends="-concatdebug, -registerdebug, -prependdebug, -appenddebug" description="Create component-debug.js">
<fixcrlf srcdir="${component.builddir}" includes="${component.basefilename}-debug.js" eol="${buildfiles.eol}" />
</target>
<target name="-concatdebug">
<concatsource destfile="${component.builddir}/${component.basefilename}-debug.js" sourcedir="${component.jsfiles.base}" sourcefiles="${component.jsfiles}" />
</target>
<target name="-registerdebug" unless="register.skip">
<addmodule module="${component.module}" file="${component.builddir}/${component.basefilename}-debug.js" details="${component.details.hash}" />
</target>
<target name="-rollupjs" if="rollup">
<echo level="info">Rolling up ${component.basefilename}-debug.js into ${rollup.component.basefilename}-debug.js</echo>
<concat destfile="${rollup.builddir}/${rollup.component.basefilename}.js" append="true" fixlastline="true">
<filelist dir="${component.builddir}" files="${component.basefilename}.js" />
</concat>
<concat destfile="${rollup.builddir}/${rollup.component.basefilename}-debug.js" append="true" fixlastline="true">
<filelist dir="${component.builddir}" files="${component.basefilename}-debug.js" />
</concat>
</target>
<!-- SKINS -->
<target name="-buildskins" depends="-concatskins" description="Create skin rollup in local component build directory" if="component.skins.exist">
<fixcrlf srcdir="${component.builddir}/assets/skins/sam" includes="${component}.css" eol="${buildfiles.eol}" />
</target>
<target name="-concatskins" if="component.skins.exist">
<concatsource destfile="${component.builddir}/assets/skins/sam/${component}.css" sourcedir="${component.assets.base}" sourcefiles="${component}-core.css, skins/sam/${component}-skin.css" />
<yuicompress src="${component.builddir}/assets/skins/sam/${component}.css" dest="${component.builddir}/assets/skins/sam/${component}.css" args="${yuicompressor.css.args.internal}" />
</target>
- <target name="-rollupcss" if="rollup.skins.exist">
+ <target name="-rollupcss" if="rollupskins">
<echo level="info">Rolling up ${component}.css into ${rollup.component}.css</echo>
<concat destfile="${rollup.builddir}/assets/skins/sam/${rollup.component}.css" append="true" fixlastline="true">
<filelist dir="${component.builddir}/assets/skins/sam" files="${component}.css" />
</concat>
</target>
</project>
\ No newline at end of file
diff --git a/componentbuild/shared/properties.xml b/componentbuild/shared/properties.xml
index 0e5fcf9..0363e10 100644
--- a/componentbuild/shared/properties.xml
+++ b/componentbuild/shared/properties.xml
@@ -1,111 +1,132 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiSharedProperties">
<!-- ANT contrib library for loops, if/else support, with property fix for FOR task -->
<taskdef resource="antcontrib.properties">
<classpath>
<pathelement location="${builddir}/lib/ant-contrib/ant-contrib-1.0b3-modified.jar" />
</classpath>
</taskdef>
<dirname property="buildfile.dir" file="${ant.file}" />
<!--
builddir : The path to the builder/componentbuild directory from the component build file
srcdir : The path to top of the project source directory (e.g. yui2) from the component build file
-->
<property name="builddir" location="../../../builder/componentbuild" />
<property name="srcdir" location="../.." />
<!-- buildfiles.eol : End of line char to use for built files -->
<property name="buildfiles.eol" value="lf"/>
<!-- Supporting Tools -->
<property name="rhino.jar" location="${builddir}/lib/rhino/js.jar" />
<property name="jslintconsole.js" location="${builddir}/lib/jslint/jslint-console.js" />
<property name="jslintsrc.js" location="${builddir}/lib/jslint/fulljslint.js" />
<property name="yuicompressor.jar" location="${builddir}/lib/yuicompressor/yuicompressor-2.4.jar" />
<!-- YUI Compressor arguments for JS and CSS files -->
<property name="yuicompressor.css.args" value="--type css --line-break 6000" />
<property name="yuicompressor.js.args" value="--disable-optimizations --preserve-semi --line-break 6000" />
<!-- Enable/Disable YUI Compressor verbosity. NOTE: Checked in build files should not disable this flag -->
<property name="yuicompressor.js.verbose" value="true" />
<property name="yuicompressor.css.verbose" value="true" />
<condition property="yuicompressor.js.args.internal" value="-v ${yuicompressor.js.args}" else="${yuicompressor.js.args}">
<istrue value="${yuicompressor.js.verbose}" />
</condition>
<condition property="yuicompressor.css.args.internal" value="-v ${yuicompressor.css.args}" else="${yuicompressor.css.args}">
<istrue value="${yuicompressor.css.verbose}" />
</condition>
<!-- Top Level Build Directories (e.g. yui2/build, yui3/build)-->
<property name="global.build.base" location="${srcdir}/build" />
<property name="global.build.component" location="${global.build.base}/${component}" />
<property name="global.build.component.assets" location="${global.build.component}/assets" />
<!-- Component Properties -->
<property name="component.module" value="${component}" />
<property name="component.basedir" location="${buildfile.dir}" />
<property name="component.jsfiles.base" value="${component.basedir}/js" />
<property name="component.assets.flatten" value="true" />
<property name="component.assets.base" value="${component.basedir}/assets" />
<property name="component.assets.files" value="**/*" />
<property name="component.assets.legacy.flatten" value="true" />
<property name="component.assets.legacy.base" value="${component.assets.base}/legacy" />
<property name="component.assets.legacy.files" value="**/*" />
<property name="component.assets.skins.base" value="${component.assets.base}/skins" />
<property name="component.assets.skins.files" value="**/*" />
- <available file="${component.assets.base}/skins" type="dir" property="component.skins.exist"/>
+ <condition property="component.skins.exist">
+ <and>
+ <available file="${component.assets.base}/${component}-core.css" type="file" />
+ <available file="${component.assets.base}/skins" type="dir" />
+ </and>
+ </condition>
+
+ <!-- component is part of a rollup build, so rollup skins to parent -->
+ <condition property="rollupskins">
+ <and>
+ <istrue value="${rollup}" />
+ <istrue value="${component.skins.exist}" />
+ </and>
+ </condition>
+
<available file="${component.assets.base}" type="dir" property="component.assets.exist"/>
<!--
DEPRECATED: component.basefilename and component.releasetype are deprecated
We used to mark filenames with suffixes (-beta, -experimental), which we no longer do
-->
<condition property="component.basefilename" value="${component}" else="${component}">
<isset property="component.releasetype"/>
</condition>
<!-- Default logger regex values if not provided -->
<property name="component.logger.regex" value="^.*?(?:logger|YAHOO.log).*?(?:;|\).*;|(?:\r?\n.*?)*?\).*;).*;?.*?\r?\n" />
<property name="component.logger.regex.replace" value="" />
<property name="component.logger.regex.flags" value="mg" />
<property name="component.logger.regex.byline" value="false" />
<!-- Rollup support, currently only used for YUI 3 -->
<property name="component.rollup" value="false"/>
<property name="component.rollup.target" value="all"/>
<condition property="component.builddir" value="${component.basedir}/build_rollup_tmp" else="${component.basedir}/build_tmp">
<istrue value="${component.rollup}"/>
</condition>
<condition property="rollup.skins.exist">
<and>
<istrue value="${component.rollup}" />
- <istrue value="${component.skins.exist}" />
+ <available file="${component.assets.base}/skins" type="dir" />
</and>
</condition>
+ <condition property="skins.exist">
+ <or>
+ <istrue value="${rollup.skins.exist}" />
+ <istrue value="${component.skins.exist}" />
+ </or>
+ </condition>
+
<!-- The temporary working directory used by the build process -->
<property name="workingdir" location="${component.builddir}/ant" />
<!-- The file which defines the default targets for the particular type of component (module, rollup, css) -->
<condition property="targetbase" value="rollup" else="module">
<istrue value="${component.rollup}"/>
</condition>
<condition property="targets" value="${builddir}/shared/cssmodule.xml" else="${targetbase}.xml">
<isset property="component.cssfiles" />
</condition>
</project>
diff --git a/componentbuild/shared/targets.xml b/componentbuild/shared/targets.xml
index 351e08c..475a2da 100644
--- a/componentbuild/shared/targets.xml
+++ b/componentbuild/shared/targets.xml
@@ -1,134 +1,134 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiSharedTargets">
<echo level="info">Starting Build For ${component}</echo>
<echo level="info">Ant Properties</echo>
<echo level="info"> Home : ${ant.home}</echo>
<echo level="info"> Ant Version : ${ant.version}</echo>
<echo level="info"> Build File : ${ant.file}</echo>
<echo level="info">Local Build Properties</echo>
<echo level="info"> version : ${yui.version}</echo>
<echo level="info"> srcdir : ${srcdir}</echo>
<echo level="info"> builddir : ${builddir}</echo>
<echo level="info"> component : ${component}</echo>
<echo level="info"> component.basefilename : ${component.basefilename}</echo>
<echo level="info"> component.basedir : ${component.basedir}</echo>
<echo level="info"> component.builddir : ${component.builddir}</echo>
<echo level="info">Global Build Properties</echo>
<echo level="info"> global.build.base : ${global.build.base}</echo>
<echo level="info"> global.build.component : ${global.build.component}</echo>
<echo level="info"> global.build.component.assets : ${global.build.component.assets}</echo>
<import file="${builddir}/shared/macrolib.xml" description="Macrodef definitions - jslint, yuicompessor, registerversion" />
<target name="all" depends="local, deploy" description="Build and Deploy to Global Build Directory" />
<target name="local" depends="clean, init, build, minify, lint" description="Build and Deploy to Local Build Directory" />
<target name="init">
<tstamp/>
<mkdir dir="${component.builddir}" />
<createdetails />
</target>
<target name="clean" description="Clean Local Build Directory" unless="clean.skip">
<delete dir="${component.builddir}" />
</target>
<target name="build" />
<!-- MIN -->
<target name="minify" description="Create component-min.js from component.js">
<yuicompress src="${component.builddir}/${component.basefilename}.js" dest="${component.builddir}/${component.basefilename}-min.js" args="${yuicompressor.js.args.internal}" />
</target>
<target name="lint" description="Run jslint over the local build files (default settings)" unless="lint.skip">
<jslint>
<jsfiles>
<fileset dir="${component.builddir}" includes="*.js" />
</jsfiles>
</jslint>
</target>
<!-- DEPLOY -->
<target name="deploy" description="Copy files to global location" depends="deploybuild, deployassets, deployskins, deploydocs"></target>
<target name="deploybuild" description="Copy built files to global build location">
<copy todir="${global.build.component}" preservelastmodified="true">
<fileset dir="${component.builddir}" includes="*.js" />
</copy>
</target>
<target name="deployassets" if="component.assets.exist">
<copy todir="${global.build.component.assets}" flatten="${component.assets.flatten}" preservelastmodified="true">
<fileset dir="${component.assets.base}" includes="${component.assets.files}" excludes="skins/, legacy/" />
</copy>
<copy todir="${global.build.component.assets}" flatten="${component.assets.legacy.flatten}" preservelastmodified="true" failonerror="false">
<fileset dir="${component.assets.legacy.base}" includes="${component.assets.legacy.files}" excludes="skins/" />
</copy>
</target>
- <target name="deployskins" if="component.skins.exist">
+ <target name="deployskins" if="skins.exist">
<copy todir="${global.build.component.assets}/skins/sam" preservelastmodified="true">
<fileset dir="${component.builddir}/assets/skins/sam" includes="${component}.css" />
</copy>
<copy todir="${global.build.component.assets}/skins/sam" preservelastmodified="true">
<fileset dir="${component.assets.skins.base}/sam" includes="${component.assets.skins.files}" />
</copy>
</target>
<target name="deploydocs" description="Copy doc files to global doc locations">
<!-- TODO -->
</target>
<target name="-prepend" if="component.prependfiles">
<concat destfile="${workingdir}/${component.basefilename}.js.tmp" fixlastline="true">
<filelist dir="${component.basedir}" files="${component.prependfiles}" />
<filterchain>
<tokenfilter>
<filetokenizer/>
<replaceregex
pattern="${component.logger.regex}"
replace="${component.logger.regex.replace}"
flags="${component.logger.regex.flags}" />
</tokenfilter>
</filterchain>
</concat>
<concat destfile="${workingdir}/${component.basefilename}.js.tmp" fixlastline="true" append="true">
<filelist dir="${component.builddir}" files="${component.basefilename}.js" />
</concat>
<move file="${workingdir}/${component.basefilename}.js.tmp" tofile="${component.builddir}/${component.basefilename}.js" />
</target>
<target name="-append" if="component.appendfiles">
<concat destfile="${component.builddir}/${component.basefilename}.js" fixlastline="true" append="true">
<filelist dir="${component.basedir}" files="${component.appendfiles}" />
<filterchain>
<tokenfilter>
<filetokenizer/>
<replaceregex
pattern="${component.logger.regex}"
replace="${component.logger.regex.replace}"
flags="${component.logger.regex.flags}" />
</tokenfilter>
</filterchain>
</concat>
</target>
<target name="-prependdebug" if="component.prependfiles">
<concat destfile="${workingdir}/${component.basefilename}-debug.js.tmp" fixlastline="true" >
<filelist dir="${component.basedir}" files="${component.prependfiles}" />
<filelist dir="${component.builddir}" files="${component.basefilename}-debug.js" />
</concat>
<move file="${workingdir}/${component.basefilename}-debug.js.tmp" tofile="${component.builddir}/${component.basefilename}-debug.js" />
</target>
<target name="-appenddebug" if="component.appendfiles">
<concat destfile="${component.builddir}/${component.basefilename}-debug.js" fixlastline="true" append="true">
<filelist dir="${component.basedir}" files="${component.appendfiles}" />
</concat>
</target>
</project>
|
yui/builder
|
da3e8d4a07b95f53c9761d6538e9a23905c8dd7a
|
Adding whitespace to verify CC CI builds are disabled
|
diff --git a/componentbuild/README b/componentbuild/README
index 1ce700d..1edfd26 100644
--- a/componentbuild/README
+++ b/componentbuild/README
@@ -1,230 +1,231 @@
INTRODUCTION
------------
YUI uses ANT to create component build files from individual source files.
Each component has its own ANT build file residing in the component's
source folder with an associated properties file used to define build
parameters specific to the component e.g:
yui2/src/autocomplete/build.xml
yui2/src/autocomplete/build.properties
The component build will automate the conversion from component source
to <component>.js, <component>-min.js, <component>-debug.js by:
a) Concatenating individual source files
b) Stripping logger statements
c) Compressing files, using yuicompressor
d) Running jslint on all 3 built files
e) Adding boiler plate module/version registration code
f) Building skin files from <component>-core.css, <component>-skin.css
g) Deploying built JS, CSS and assets to <project>/build
The same component build system is also used for CSS components such as
reset, base, fonts and grids.
The component build does not currently:
a) Check in any code
The developer is responsible for checking modified source code
into the <project>/src directory, and built code into the
<project>/build directory, allowing them to review diffs,
before committing changes.
b) Generate API documentation
INSTALLATION
------------
Below is a brief summary as well as a detailed step-by-step guide
for installing the build system, allowing you to build the "src"
component code.
SUMMARY
1) Install ANT 1.7 or above, and add ant to your path
2) Clone the YUI "builder" project from http://github.com/yui/builder/
3) At the command line, cd to the source directory of the component
you wish to build, and execute "ant all" to build, e.g.:
prompt> cd yui2/src/autocomplete
prompt> ant all
DETAILED INSTRUCTIONS
To use the build system, you'll need to install ANT and obtain
the YUI build infrastructure from github.
These are both one-time install tasks.
INSTALLING ANT
1) Download and install ANT 1.7 (or above)
http://ant.apache.org/bindownload.cgi
2) Be sure to define an ANT_HOME environment variable to point to
your ANT install root, and add the ANT executable to your
environment's PATH variable.
INSTALLING YUI BUILD INFRASTRUCTURE
1) Clone the YUI "builder" project from github:
http://github.com/yui/builder/
This project contains the files used by the
YUI ant build process.
2) Out of the box, the build system is designed to work
when cloned to the default "builder" directory, parallel
to the project source directories:
<gitroot>/yui2 [ cloned yui2 project ]
<gitroot>/yui3 [ cloned yui2 project ]
<gitroot>/builder [ cloned builder project ]
Cloning it to the default location will allow you to
build any of the components without having to modify any
component build scripts.
NOTE: YUI Builder is also available for download as a zip from
http://yuilibrary.com/downloads. If downloading from this location
to build yui2 or yui3 source, make sure to unzip the contents into
the directory structure mentioned above, to have the build work out
of the box.
BUILDING AN EXISTING COMPONENT
------------------------------
With ANT and the YUI build infrastructure installed, you can now build any
of the components from source, using the build.xml file in the component's
source directory.
The build system allows you to build locally, within the component's
source directory, and also run a full build to update the top level build
directory for a component.
FULL BUILD
To perform a full build for a component, run ant with the "all" target:
e.g:
prompt> cd yui2/src/autocomplete
prompt> ant all
The "all" build target will build the component from its source files AND
deploy the built files, as well as any assets, to the top level build
folder:
<project>/build/<component>
So, for autocomplete, the built files would be copied to:
yui2/build/autocomplete
NOTE: When invoking ant without a file argument, as we do above, it will
use build.xml, if present in the current directory - which is what we want.
LOCAL BUILD
To perform a local build for a component, run ant without a target:
e.g:
prompt> cd yui2/src/autocomplete
prompt> ant
This will run the default target, which is "local".
The "local" build target will build the autocomplete component from its
source files, but will NOT deploy the built files to the top level build
folder.
The locally built files are stored in the temporary directory:
<project>/src/<component>/build_tmp
So, for autocomplete, the built files can be found in the directory below:
yui2/src/autocomplete/build_tmp
BUILD OUTPUT
ANT will output build information to the screen, as it runs through the
build, which can be redirected to a file if required:
prompt> ant all
Buildfile: build.xml
[echo] Starting Build For autocomplete
...
[echo] builddir : ../../../builder/componentbuild
...
...
BUILD SUCCESSFUL
Total time: 7 seconds
prompt>
NOTE: Most components will have warnings which are output during the
"minify" and "lint" steps, which the component developer has evaluated
and determined to have no impact on functionality.
CREATING BUILD FILES FOR A NEW COMPONENT
----------------------------------------
The builder/componentbuild/templates directory has basic build.xml and
build.properties templates for the various component types supported.
For most new components, you should be able to start with the
appropriate template files and simply change the values of the basic
properties defined to suit your component.
If you're creating:
* A YUI 2 Component (either a JS or CSS component), use:
builder/componentbuild/templates/yui2
build.xml
build.properties
* A YUI 3 Component (either a JS or CSS component), use:
builder/componentbuild/templates/yui3
build.xml
build.properties
* A YUI 3 Rollup Component, use:
builder/componentbuild/templates/yui3/rollup
For the rollup component:
build.xml
build.properties
For the sub components:
subcomponentone.xml
subcomponentone.properties
subcomponenttwo.xml
subcomponenttwo.properties
FURTHER CUSTOMIZATION
If required, you can define custom values for any of the properties
defined in builder/componentbuild/docs/properties.html to customize the
build for your new component, however as mentioned above, for most
components the properties defined in the template files should be
sufficient.
You can also override or extend existing targets, to customize the actual
build process for a component if required. The list of targets and their
role is defined in builder/componentbuild/docs/targets.html.
+
|
yui/builder
|
74f5b71dca6b9651478af5fd2fbeac11f718a004
|
Added standard .gitignore, in prep for hudson builds
|
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b1f1def
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,10 @@
+build_tmp/
+build_rollup_tmp/
+.DS_Store
+.*.swp
+.svn
+CVS/
+# Ignore all backup files
+*~
+# Ignore Emacs auto saved files
+*#*#
|
yui/builder
|
71f459ce3a1b4ad453a698260e947b0c81cbecda
|
Added whitespace to test builds
|
diff --git a/componentbuild/README b/componentbuild/README
index 22df996..1ce700d 100644
--- a/componentbuild/README
+++ b/componentbuild/README
@@ -1,229 +1,230 @@
INTRODUCTION
------------
YUI uses ANT to create component build files from individual source files.
Each component has its own ANT build file residing in the component's
source folder with an associated properties file used to define build
parameters specific to the component e.g:
yui2/src/autocomplete/build.xml
yui2/src/autocomplete/build.properties
The component build will automate the conversion from component source
to <component>.js, <component>-min.js, <component>-debug.js by:
a) Concatenating individual source files
b) Stripping logger statements
c) Compressing files, using yuicompressor
d) Running jslint on all 3 built files
e) Adding boiler plate module/version registration code
f) Building skin files from <component>-core.css, <component>-skin.css
g) Deploying built JS, CSS and assets to <project>/build
The same component build system is also used for CSS components such as
reset, base, fonts and grids.
The component build does not currently:
a) Check in any code
The developer is responsible for checking modified source code
into the <project>/src directory, and built code into the
<project>/build directory, allowing them to review diffs,
before committing changes.
b) Generate API documentation
+
INSTALLATION
------------
Below is a brief summary as well as a detailed step-by-step guide
for installing the build system, allowing you to build the "src"
component code.
SUMMARY
1) Install ANT 1.7 or above, and add ant to your path
2) Clone the YUI "builder" project from http://github.com/yui/builder/
3) At the command line, cd to the source directory of the component
you wish to build, and execute "ant all" to build, e.g.:
prompt> cd yui2/src/autocomplete
prompt> ant all
DETAILED INSTRUCTIONS
To use the build system, you'll need to install ANT and obtain
the YUI build infrastructure from github.
These are both one-time install tasks.
INSTALLING ANT
1) Download and install ANT 1.7 (or above)
http://ant.apache.org/bindownload.cgi
2) Be sure to define an ANT_HOME environment variable to point to
your ANT install root, and add the ANT executable to your
environment's PATH variable.
INSTALLING YUI BUILD INFRASTRUCTURE
1) Clone the YUI "builder" project from github:
http://github.com/yui/builder/
This project contains the files used by the
YUI ant build process.
2) Out of the box, the build system is designed to work
when cloned to the default "builder" directory, parallel
to the project source directories:
<gitroot>/yui2 [ cloned yui2 project ]
<gitroot>/yui3 [ cloned yui2 project ]
<gitroot>/builder [ cloned builder project ]
Cloning it to the default location will allow you to
build any of the components without having to modify any
component build scripts.
NOTE: YUI Builder is also available for download as a zip from
http://yuilibrary.com/downloads. If downloading from this location
to build yui2 or yui3 source, make sure to unzip the contents into
the directory structure mentioned above, to have the build work out
of the box.
BUILDING AN EXISTING COMPONENT
------------------------------
With ANT and the YUI build infrastructure installed, you can now build any
of the components from source, using the build.xml file in the component's
source directory.
The build system allows you to build locally, within the component's
source directory, and also run a full build to update the top level build
directory for a component.
FULL BUILD
To perform a full build for a component, run ant with the "all" target:
e.g:
prompt> cd yui2/src/autocomplete
prompt> ant all
The "all" build target will build the component from its source files AND
deploy the built files, as well as any assets, to the top level build
folder:
<project>/build/<component>
So, for autocomplete, the built files would be copied to:
yui2/build/autocomplete
NOTE: When invoking ant without a file argument, as we do above, it will
use build.xml, if present in the current directory - which is what we want.
LOCAL BUILD
To perform a local build for a component, run ant without a target:
e.g:
prompt> cd yui2/src/autocomplete
prompt> ant
This will run the default target, which is "local".
The "local" build target will build the autocomplete component from its
source files, but will NOT deploy the built files to the top level build
folder.
The locally built files are stored in the temporary directory:
<project>/src/<component>/build_tmp
So, for autocomplete, the built files can be found in the directory below:
yui2/src/autocomplete/build_tmp
BUILD OUTPUT
ANT will output build information to the screen, as it runs through the
build, which can be redirected to a file if required:
prompt> ant all
Buildfile: build.xml
[echo] Starting Build For autocomplete
...
[echo] builddir : ../../../builder/componentbuild
...
...
BUILD SUCCESSFUL
Total time: 7 seconds
prompt>
NOTE: Most components will have warnings which are output during the
"minify" and "lint" steps, which the component developer has evaluated
and determined to have no impact on functionality.
CREATING BUILD FILES FOR A NEW COMPONENT
----------------------------------------
The builder/componentbuild/templates directory has basic build.xml and
build.properties templates for the various component types supported.
For most new components, you should be able to start with the
appropriate template files and simply change the values of the basic
properties defined to suit your component.
If you're creating:
* A YUI 2 Component (either a JS or CSS component), use:
builder/componentbuild/templates/yui2
build.xml
build.properties
* A YUI 3 Component (either a JS or CSS component), use:
builder/componentbuild/templates/yui3
build.xml
build.properties
* A YUI 3 Rollup Component, use:
builder/componentbuild/templates/yui3/rollup
For the rollup component:
build.xml
build.properties
For the sub components:
subcomponentone.xml
subcomponentone.properties
subcomponenttwo.xml
subcomponenttwo.properties
FURTHER CUSTOMIZATION
If required, you can define custom values for any of the properties
defined in builder/componentbuild/docs/properties.html to customize the
build for your new component, however as mentioned above, for most
components the properties defined in the template files should be
sufficient.
You can also override or extend existing targets, to customize the actual
build process for a component if required. The list of targets and their
role is defined in builder/componentbuild/docs/targets.html.
|
yui/builder
|
39007ada282c85502c1ce7e8e3fab41b04206b7b
|
Added failonerror to lint and yuicompress tasks, to force build failure on compressor or lint fatal errors
|
diff --git a/componentbuild/shared/macrolib.xml b/componentbuild/shared/macrolib.xml
index f454dba..24b4f2f 100644
--- a/componentbuild/shared/macrolib.xml
+++ b/componentbuild/shared/macrolib.xml
@@ -1,214 +1,214 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiMacroLib">
<macrodef name="arrayliteral">
<attribute name="from" />
<attribute name="to" />
<attribute name="key" />
<sequential>
<if>
<and>
<isset property="@{from}" />
<length string="${@{from}}" when="ne" length="0" />
</and>
<then>
<propertyregex property="array"
override="true"
input="${@{from}}"
casesensitive="false"
regexp="([^\,\s]+)"
replace="'\1'"
/>
<property name="@{to}" value="@{key}:[${array}]" />
</then>
</if>
</sequential>
</macrodef>
<macrodef name="createdetails">
<sequential>
<arrayliteral from="component.use" to="component.details.use" key="use" />
<arrayliteral from="component.supersedes" to="component.details.supersedes" key="supersedes" />
<arrayliteral from="component.requires" to="component.details.requires" key="requires" />
<arrayliteral from="component.optional" to="component.details.optional" key="optional" />
<if>
<isset property="component.skinnable" />
<then>
<property name="component.details.skinnable" value="skinnable:${component.skinnable}" />
</then>
</if>
<propertyselector property="details.list"
delimiter=","
match="component\.details.([^\.]*)"
select="\1"
casesensitive="false" />
<var name="details" value="" />
<if>
<isset property="details.list" />
<then>
<for list="${details.list}" param="val">
<sequential>
<var name="details" value="${component.details.@{val}}, ${details}" />
</sequential>
</for>
<propertyregex property="component.details.hash"
input="{${details}}"
regexp="(\,\s*?\})"
replace="}"
casesensitive="false" />
</then>
<else>
<property name="component.details.hash" value="" />
</else>
</if>
</sequential>
</macrodef>
<macrodef name="yuicompress">
<attribute name="src" />
<attribute name="dest" />
<attribute name="args" />
<sequential>
<echo level="info">Running yuicompressor on @{src}</echo>
- <java jar="${yuicompressor.jar}" fork="true">
+ <java jar="${yuicompressor.jar}" fork="true" failonerror="true">
<arg line="@{args} -o" />
<arg file="@{dest}" />
<arg file="@{src}" />
</java>
</sequential>
</macrodef>
<macrodef name="concatsource">
<attribute name="destfile" />
<attribute name="sourcedir" />
<attribute name="sourcefiles" />
<attribute name="workingdir" default="${workingdir}" />
<element name="filters" optional="true" description="Additonal filters to apply to individual files"/>
<sequential>
<echo level="info">Concatenating</echo>
<echo level="info"> Source Files : @{sourcefiles}</echo>
<echo level="info"> In Source Dir : @{sourcedir}</echo>
<echo level="info"> To : @{destfile}</echo>
-
+
<delete dir="@{workingdir}" quiet="true"/>
<copy todir="@{workingdir}">
<filelist dir="@{sourcedir}" files="@{sourcefiles}" />
<filterchain>
<filters />
<fixcrlf fixlast="true" eof="remove"/>
</filterchain>
</copy>
- <concat destfile="@{destfile}" fixlastline="true" >
+ <concat destfile="@{destfile}" fixlastline="true">
<filelist dir="@{workingdir}" files="@{sourcefiles}" />
</concat>
-
- <delete dir="${workingdir}" quiet="true"/>
+
+ <delete dir="${workingdir}" quiet="true" />
</sequential>
</macrodef>
<macrodef name="jslint">
<element name="jsfiles" optional="false" />
<sequential>
<!--
Need to find a way to convert fileset to args (script?) to
avoid ' ', which will break for files with ' in them
Evaluates to the following java execution line...
java -r js.jar jslintconsole.js 'file1.js' 'file2.js' 'file3.js'
-->
<pathconvert pathsep="' '" property="jsfileargs">
<jsfiles />
</pathconvert>
- <java jar="${rhino.jar}" fork="true">
+ <java jar="${rhino.jar}" fork="true" failonerror="true">
<arg file="${jslintconsole.js}" />
<arg value="${jslintsrc.js}" />
<arg line="'${jsfileargs}'" />
</java>
</sequential>
</macrodef>
<macrodef name="registerversion">
<attribute name="module" />
<attribute name="classname" />
<attribute name="file" />
<sequential>
<loadfile srcfile="${builddir}/files/versioncode.txt" property="@{module}-@{classname}-version" >
<filterchain>
<replacetokens>
<token key="MODULE" value="@{module}"/>
<token key="CLASSNAME" value="@{classname}"/>
</replacetokens>
</filterchain>
</loadfile>
<echo level="info">Adding Version Registration Code to @{file}</echo>
<concat destfile="@{file}" append="true" fixlastline="true">${@{module}-@{classname}-version}</concat>
</sequential>
</macrodef>
<macrodef name="addmodule">
<attribute name="file" />
<attribute name="module" />
<attribute name="details" default="" />
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}-details" value="" />
</then>
<else>
<property name="@{module}-details" value=",@{details}" />
</else>
</if>
<loadfile srcfile="@{file}" property="@{module}-@{file}-code" />
<echo level="info">Wrapping @{file} in YUI.add module</echo>
<copy file="${builddir}/files/moduletemplate.txt" tofile="@{file}" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{file}-code}" />
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}" />
<filter token="DETAILS" value="${@{module}-details}" />
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addrollup">
<attribute name="file" />
<attribute name="module" />
<attribute name="details" default="" />
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}-details" value="" />
</then>
<else>
<property name="@{module}-details" value=",@{details}" />
</else>
</if>
<loadfile srcfile="@{file}" property="@{module}-@{file}-code" />
<echo level="info">Adding Rollup @{file} using YUI.add</echo>
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{file}" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{file}-code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}"/>
<filter token="DETAILS" value="${@{module}-details}"/>
</filterset>
</copy>
</sequential>
</macrodef>
</project>
|
yui/builder
|
7878c0101a03b65a5f8788cfff65e34155fb0e14
|
Added throw new Error, for fatal JS lint errors. Allows us to failonerror if required, as part of build
|
diff --git a/componentbuild/lib/jslint/jslint-console.js b/componentbuild/lib/jslint/jslint-console.js
index 0a90359..6eb6da9 100644
--- a/componentbuild/lib/jslint/jslint-console.js
+++ b/componentbuild/lib/jslint/jslint-console.js
@@ -1,64 +1,70 @@
/**
* Javascript Shell Script to Load and JSLint js files through Rhino Javascript Shell
* The jslint source file is expected as the first argument, followed by the list of JS files to JSLint
*
* e.g.
* java -j js.jar /tools/fulljslint.js testFile1.js testFile2.js testFile3.js
**/
var jslintsrc = arguments.splice(0,1);
var scripts = arguments;
load(jslintsrc);
(function(){ // Just to keep stuff seperate from JSLINT code
var OPTS = {
browser : true,
//laxLineEnd : true,
undef: true,
newcap: false
};
function test(jsFile) {
print("Running JSLint on : " + jsFile);
var js = readFile(jsFile);
var success = JSLINT(js, OPTS);
if (success) {
print("- OK");
} else {
print(" \n");
+
for (var i=0; i < JSLINT.errors.length; ++i) {
var e = JSLINT.errors[i];
if (e) {
print("\t" + e.line + ", " + e.character + ": " + e.reason + "\n\t" + clean(e.evidence) + "\n");
}
}
- print(" \n");
+ print(" \n");
+
+ // Last item is null if JSLint hit a fatal error
+ if (JSLINT.errors && JSLINT.errors[JSLINT.errors.length-1] === null) {
+ throw new Error("Fatal JSLint Exception. Stopped lint");
+ }
}
}
function clean(str) {
var trimmed = "";
if (str) {
if(str.length <= 500) {
trimmed = str.replace(/^\s*(\S*(\s+\S+)*)\s*$/, "$1");
} else {
trimmed = "[Code Evidence Omitted: Greater than 500 chars]";
}
}
return trimmed;
}
function jslint(aScripts) {
for (var i = 0; i < aScripts.length; ++i) {
test(aScripts[i]);
}
};
jslint(scripts);
})();
|
yui/builder
|
a04030193c48087c5d3f980c5c7b7fdc04a4bc28
|
Fixed handling of empty details fields. Fixes #12
|
diff --git a/componentbuild/shared/macrolib.xml b/componentbuild/shared/macrolib.xml
index c526924..f454dba 100644
--- a/componentbuild/shared/macrolib.xml
+++ b/componentbuild/shared/macrolib.xml
@@ -1,211 +1,214 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiMacroLib">
<macrodef name="arrayliteral">
<attribute name="from" />
<attribute name="to" />
<attribute name="key" />
<sequential>
<if>
- <isset property="@{from}" />
+ <and>
+ <isset property="@{from}" />
+ <length string="${@{from}}" when="ne" length="0" />
+ </and>
<then>
<propertyregex property="array"
override="true"
input="${@{from}}"
casesensitive="false"
regexp="([^\,\s]+)"
replace="'\1'"
/>
<property name="@{to}" value="@{key}:[${array}]" />
</then>
</if>
</sequential>
</macrodef>
<macrodef name="createdetails">
<sequential>
<arrayliteral from="component.use" to="component.details.use" key="use" />
<arrayliteral from="component.supersedes" to="component.details.supersedes" key="supersedes" />
<arrayliteral from="component.requires" to="component.details.requires" key="requires" />
<arrayliteral from="component.optional" to="component.details.optional" key="optional" />
<if>
<isset property="component.skinnable" />
<then>
<property name="component.details.skinnable" value="skinnable:${component.skinnable}" />
</then>
</if>
<propertyselector property="details.list"
delimiter=","
match="component\.details.([^\.]*)"
select="\1"
casesensitive="false" />
<var name="details" value="" />
<if>
<isset property="details.list" />
<then>
<for list="${details.list}" param="val">
<sequential>
<var name="details" value="${component.details.@{val}}, ${details}" />
</sequential>
</for>
<propertyregex property="component.details.hash"
input="{${details}}"
regexp="(\,\s*?\})"
replace="}"
casesensitive="false" />
</then>
<else>
<property name="component.details.hash" value="" />
</else>
</if>
</sequential>
</macrodef>
<macrodef name="yuicompress">
<attribute name="src" />
<attribute name="dest" />
<attribute name="args" />
<sequential>
<echo level="info">Running yuicompressor on @{src}</echo>
<java jar="${yuicompressor.jar}" fork="true">
<arg line="@{args} -o" />
<arg file="@{dest}" />
<arg file="@{src}" />
</java>
</sequential>
</macrodef>
<macrodef name="concatsource">
<attribute name="destfile" />
<attribute name="sourcedir" />
<attribute name="sourcefiles" />
<attribute name="workingdir" default="${workingdir}" />
<element name="filters" optional="true" description="Additonal filters to apply to individual files"/>
<sequential>
<echo level="info">Concatenating</echo>
<echo level="info"> Source Files : @{sourcefiles}</echo>
<echo level="info"> In Source Dir : @{sourcedir}</echo>
<echo level="info"> To : @{destfile}</echo>
<delete dir="@{workingdir}" quiet="true"/>
<copy todir="@{workingdir}">
<filelist dir="@{sourcedir}" files="@{sourcefiles}" />
<filterchain>
<filters />
<fixcrlf fixlast="true" eof="remove"/>
</filterchain>
</copy>
<concat destfile="@{destfile}" fixlastline="true" >
<filelist dir="@{workingdir}" files="@{sourcefiles}" />
</concat>
<delete dir="${workingdir}" quiet="true"/>
</sequential>
</macrodef>
<macrodef name="jslint">
<element name="jsfiles" optional="false" />
<sequential>
<!--
Need to find a way to convert fileset to args (script?) to
avoid ' ', which will break for files with ' in them
Evaluates to the following java execution line...
java -r js.jar jslintconsole.js 'file1.js' 'file2.js' 'file3.js'
-->
<pathconvert pathsep="' '" property="jsfileargs">
<jsfiles />
</pathconvert>
<java jar="${rhino.jar}" fork="true">
<arg file="${jslintconsole.js}" />
<arg value="${jslintsrc.js}" />
<arg line="'${jsfileargs}'" />
</java>
</sequential>
</macrodef>
<macrodef name="registerversion">
<attribute name="module" />
<attribute name="classname" />
<attribute name="file" />
<sequential>
<loadfile srcfile="${builddir}/files/versioncode.txt" property="@{module}-@{classname}-version" >
<filterchain>
<replacetokens>
<token key="MODULE" value="@{module}"/>
<token key="CLASSNAME" value="@{classname}"/>
</replacetokens>
</filterchain>
</loadfile>
<echo level="info">Adding Version Registration Code to @{file}</echo>
<concat destfile="@{file}" append="true" fixlastline="true">${@{module}-@{classname}-version}</concat>
</sequential>
</macrodef>
<macrodef name="addmodule">
<attribute name="file" />
<attribute name="module" />
<attribute name="details" default="" />
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}-details" value="" />
</then>
<else>
<property name="@{module}-details" value=",@{details}" />
</else>
</if>
<loadfile srcfile="@{file}" property="@{module}-@{file}-code" />
<echo level="info">Wrapping @{file} in YUI.add module</echo>
<copy file="${builddir}/files/moduletemplate.txt" tofile="@{file}" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{file}-code}" />
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}" />
<filter token="DETAILS" value="${@{module}-details}" />
</filterset>
</copy>
</sequential>
</macrodef>
<macrodef name="addrollup">
<attribute name="file" />
<attribute name="module" />
<attribute name="details" default="" />
<sequential>
<if>
<equals arg1="@{details}" arg2="" />
<then>
<property name="@{module}-details" value="" />
</then>
<else>
<property name="@{module}-details" value=",@{details}" />
</else>
</if>
<loadfile srcfile="@{file}" property="@{module}-@{file}-code" />
<echo level="info">Adding Rollup @{file} using YUI.add</echo>
<copy file="${builddir}/files/rolluptemplate.txt" tofile="@{file}" overwrite="true">
<filterset>
<filter token="CODE" value="${@{module}-@{file}-code}"/>
<filter token="YUIVAR" value="${yui.variable}" />
<filter token="MODULE" value="@{module}"/>
<filter token="DETAILS" value="${@{module}-details}"/>
</filterset>
</copy>
</sequential>
</macrodef>
</project>
|
yui/builder
|
6b230fe9b28c64403acd80c41e3cffa19d3ababe
|
Added -rollupjs step to rollup.xml to allow creation of rollup of rollups. TODO: Need to add -rollupcss step also
|
diff --git a/componentbuild/3.x/rollup.xml b/componentbuild/3.x/rollup.xml
index 19683c7..1611b5e 100644
--- a/componentbuild/3.x/rollup.xml
+++ b/componentbuild/3.x/rollup.xml
@@ -1,30 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiRollupTargets">
<import file="${builddir}/shared/targets.xml" description="Targets common to Rollup/Module" />
<target name="build" depends="buildmodules" description="Create component.js"></target>
- <target name="buildmodules" depends="-buildmodules, -registerall, -prependall, -appendall">
+ <target name="buildmodules" depends="-buildmodules, -registerall, -prependall, -appendall, -rollupjs">
<fixcrlf srcdir="${component.builddir}" eol="${buildfiles.eol}" />
</target>
<target name="-buildmodules">
<subant target="${component.rollup.target}" inheritall="false" >
<filelist dir="${buildfile.dir}" files="${component.rollup.modules.buildfiles}" />
<property name="rollup" value="true" />
<property name="rollup.builddir" value="${component.builddir}" />
<property name="rollup.component" value="${component}" />
<property name="rollup.component.basefilename" value="${component.basefilename}" />
</subant>
</target>
+ <target name="-rollupjs" if="rollup">
+ <echo level="info">Rolling up ${component.basefilename}-debug.js into ${rollup.component.basefilename}-debug.js</echo>
+ <concat destfile="${rollup.builddir}/${rollup.component.basefilename}.js" append="true" fixlastline="true">
+ <filelist dir="${component.builddir}" files="${component.basefilename}.js" />
+ </concat>
+ <concat destfile="${rollup.builddir}/${rollup.component.basefilename}-debug.js" append="true" fixlastline="true">
+ <filelist dir="${component.builddir}" files="${component.basefilename}-debug.js" />
+ </concat>
+ </target>
+
<target name="-prependall" depends="-prependdebug, -prepend" if="component.prependfiles" />
<target name="-appendall" depends="-appenddebug, -append" if="component.appendfiles" />
<target name="-registerall" unless="register.skip">
<addrollup module="${component.module}" file="${component.builddir}/${component.basefilename}-debug.js" details="${component.details.hash}" />
<addrollup module="${component.module}" file="${component.builddir}/${component.basefilename}.js" details="${component.details.hash}" />
</target>
</project>
|
yui/builder
|
0e54d65696edde33501862877d8a1b4f0182821d
|
Added download link to README. yuilibrary.com download page update pending.
|
diff --git a/componentbuild/README b/componentbuild/README
index f0ad50c..22df996 100644
--- a/componentbuild/README
+++ b/componentbuild/README
@@ -1,221 +1,229 @@
INTRODUCTION
------------
YUI uses ANT to create component build files from individual source files.
Each component has its own ANT build file residing in the component's
source folder with an associated properties file used to define build
parameters specific to the component e.g:
yui2/src/autocomplete/build.xml
yui2/src/autocomplete/build.properties
The component build will automate the conversion from component source
to <component>.js, <component>-min.js, <component>-debug.js by:
a) Concatenating individual source files
b) Stripping logger statements
c) Compressing files, using yuicompressor
d) Running jslint on all 3 built files
e) Adding boiler plate module/version registration code
f) Building skin files from <component>-core.css, <component>-skin.css
g) Deploying built JS, CSS and assets to <project>/build
The same component build system is also used for CSS components such as
reset, base, fonts and grids.
The component build does not currently:
a) Check in any code
The developer is responsible for checking modified source code
into the <project>/src directory, and built code into the
<project>/build directory, allowing them to review diffs,
before committing changes.
b) Generate API documentation
INSTALLATION
------------
Below is a brief summary as well as a detailed step-by-step guide
for installing the build system, allowing you to build the "src"
component code.
SUMMARY
1) Install ANT 1.7 or above, and add ant to your path
2) Clone the YUI "builder" project from http://github.com/yui/builder/
3) At the command line, cd to the source directory of the component
you wish to build, and execute "ant all" to build, e.g.:
- cd yui2/src/autocomplete
- ant all
+ prompt> cd yui2/src/autocomplete
+ prompt> ant all
DETAILED INSTRUCTIONS
To use the build system, you'll need to install ANT and obtain
the YUI build infrastructure from github.
These are both one-time install tasks.
INSTALLING ANT
1) Download and install ANT 1.7 (or above)
http://ant.apache.org/bindownload.cgi
2) Be sure to define an ANT_HOME environment variable to point to
your ANT install root, and add the ANT executable to your
environment's PATH variable.
INSTALLING YUI BUILD INFRASTRUCTURE
1) Clone the YUI "builder" project from github:
http://github.com/yui/builder/
This project contains the files used by the
YUI ant build process.
2) Out of the box, the build system is designed to work
when cloned to the default "builder" directory, parallel
to the project source directories:
<gitroot>/yui2 [ cloned yui2 project ]
<gitroot>/yui3 [ cloned yui2 project ]
<gitroot>/builder [ cloned builder project ]
Cloning it to the default location will allow you to
build any of the components without having to modify any
component build scripts.
+ NOTE: YUI Builder is also available for download as a zip from
+ http://yuilibrary.com/downloads. If downloading from this location
+ to build yui2 or yui3 source, make sure to unzip the contents into
+ the directory structure mentioned above, to have the build work out
+ of the box.
+
BUILDING AN EXISTING COMPONENT
------------------------------
With ANT and the YUI build infrastructure installed, you can now build any
of the components from source, using the build.xml file in the component's
source directory.
The build system allows you to build locally, within the component's
source directory, and also run a full build to update the top level build
directory for a component.
FULL BUILD
To perform a full build for a component, run ant with the "all" target:
e.g:
prompt> cd yui2/src/autocomplete
prompt> ant all
The "all" build target will build the component from its source files AND
deploy the built files, as well as any assets, to the top level build
folder:
<project>/build/<component>
So, for autocomplete, the built files would be copied to:
yui2/build/autocomplete
NOTE: When invoking ant without a file argument, as we do above, it will
use build.xml, if present in the current directory - which is what we want.
LOCAL BUILD
To perform a local build for a component, run ant without a target:
e.g:
prompt> cd yui2/src/autocomplete
prompt> ant
This will run the default target, which is "local".
The "local" build target will build the autocomplete component from its
source files, but will NOT deploy the built files to the top level build
folder.
The locally built files are stored in the temporary directory:
<project>/src/<component>/build_tmp
So, for autocomplete, the built files can be found in the directory below:
yui2/src/autocomplete/build_tmp
BUILD OUTPUT
ANT will output build information to the screen, as it runs through the
build, which can be redirected to a file if required:
prompt> ant all
Buildfile: build.xml
[echo] Starting Build For autocomplete
...
[echo] builddir : ../../../builder/componentbuild
...
...
BUILD SUCCESSFUL
Total time: 7 seconds
prompt>
NOTE: Most components will have warnings which are output during the
"minify" and "lint" steps, which the component developer has evaluated
and determined to have no impact on functionality.
CREATING BUILD FILES FOR A NEW COMPONENT
----------------------------------------
The builder/componentbuild/templates directory has basic build.xml and
build.properties templates for the various component types supported.
For most new components, you should be able to start with the
appropriate template files and simply change the values of the basic
properties defined to suit your component.
If you're creating:
* A YUI 2 Component (either a JS or CSS component), use:
builder/componentbuild/templates/yui2
+
build.xml
build.properties
* A YUI 3 Component (either a JS or CSS component), use:
builder/componentbuild/templates/yui3
+
build.xml
build.properties
* A YUI 3 Rollup Component, use:
builder/componentbuild/templates/yui3/rollup
For the rollup component:
build.xml
build.properties
For the sub components:
subcomponentone.xml
subcomponentone.properties
subcomponenttwo.xml
subcomponenttwo.properties
FURTHER CUSTOMIZATION
If required, you can define custom values for any of the properties
defined in builder/componentbuild/docs/properties.html to customize the
build for your new component, however as mentioned above, for most
components the properties defined in the template files should be
sufficient.
You can also override or extend existing targets, to customize the actual
build process for a component if required. The list of targets and their
role is defined in builder/componentbuild/docs/targets.html.
|
yui/builder
|
930ef382f4ca553f176b132e84a10cc83e6d7b0c
|
Editorial changes on license file.
|
diff --git a/componentbuild/LICENSE b/componentbuild/LICENSE
index 3bc5303..24d009b 100644
--- a/componentbuild/LICENSE
+++ b/componentbuild/LICENSE
@@ -1,51 +1,53 @@
All code under this directory and any subdirectories, with the exception
of the "lib" directory, is licensed under the BSD license, presented below:
Copyright (c) 2009, Yahoo! Inc. All rights reserved.
Code licensed under the BSD License:
http://developer.yahoo.net/yui/license.txt
The "lib" directory contains build support tools, which are packaged
along with the YUI component build code, in order to simplify installation.
The contents of "lib" are covered by the individual licenses below:
1). lib/ant-contrib/ant-contrib-1.0b3-modified.jar:
-Is issued under the Apache Software License, as mentioned below:
+Is issued under the Apache Software License. For more information, see:
http://ant-contrib.sourceforge.net/
http://ant-contrib.sourceforge.net/LICENSE.txt
The ant-contrib-1.0b3 release has been modified by YUI to add the
missing lookup entry for the "for" task to antcontrib.properties:
for=net.sf.antcontrib.logic.ForTask
2). lib/rhino/js.jar:
Rhino is issued under the Mozilla Public License (MPL), and MPL applies
to the Rhino source and binaries that are distributed under the
-"lib/rhino" directory.
+"lib/rhino" directory. For more information on Rhino licensing, see:
+
+ https://developer.mozilla.org/en/Rhino_License
3). lib/jslint/jslint-console.js:
Is derived from rhino.js available at www.jslint.com/rhino/rhino.js,
the contents of which are in the public domain. See the contents of the
file for licensing information.
4). lib/jslint/fulljslint.js:
Is derived from fulljslint.js, available at
http://www.jslint.com/fulljslint.js, the contents of which are in the public
domain. See the contents of the file for licensing information.
5). lib/yuicompressor:
Is covered by the BSD license, specified on
http://developer.yahoo.com/yui/compressor/
-YUI Compressor bundles it's own version of Rhino, which is covered by the
-Mozilla Public License, further details of which can be found at the above
+YUI Compressor ships with a modified version of Rhino, which is covered by
+the Mozilla Public License, further details of which can be found at the above
url.
\ No newline at end of file
|
mex868/Nissi.Solution
|
eeca08f1f08e2f6190406a3551a103d44840c66d
|
Correcao no arquivo do projeto web
|
diff --git a/Nissi.WebPresentation/Nissi.WebPresentation.csproj b/Nissi.WebPresentation/Nissi.WebPresentation.csproj
index 77b28ab..0c7e2e5 100644
--- a/Nissi.WebPresentation/Nissi.WebPresentation.csproj
+++ b/Nissi.WebPresentation/Nissi.WebPresentation.csproj
@@ -299,528 +299,525 @@
<Compile Include="EntradaEstoque\CadastraEntradaEstoque.aspx.designer.cs">
<DependentUpon>CadastraEntradaEstoque.aspx</DependentUpon>
</Compile>
<Compile Include="EntradaEstoque\ListaEntradaEstoque.aspx.cs">
<DependentUpon>ListaEntradaEstoque.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="EntradaEstoque\ListaEntradaEstoque.aspx.designer.cs">
<DependentUpon>ListaEntradaEstoque.aspx</DependentUpon>
</Compile>
<Compile Include="FormaPgto\CadastraFormaPgto.aspx.cs">
<DependentUpon>CadastraFormaPgto.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="FormaPgto\CadastraFormaPgto.aspx.designer.cs">
<DependentUpon>CadastraFormaPgto.aspx</DependentUpon>
</Compile>
<Compile Include="Funcionario\CadastraCargo.aspx.cs">
<DependentUpon>CadastraCargo.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Funcionario\CadastraCargo.aspx.designer.cs">
<DependentUpon>CadastraCargo.aspx</DependentUpon>
</Compile>
<Compile Include="Funcionario\CadastraDepartamento.aspx.cs">
<DependentUpon>CadastraDepartamento.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Funcionario\CadastraDepartamento.aspx.designer.cs">
<DependentUpon>CadastraDepartamento.aspx</DependentUpon>
</Compile>
<Compile Include="GeraImagem.aspx.cs">
<DependentUpon>GeraImagem.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="GeraImagem.aspx.designer.cs">
<DependentUpon>GeraImagem.aspx</DependentUpon>
</Compile>
<Compile Include="EntradaEstoque\GerarPDF.aspx.cs">
<DependentUpon>GerarPDF.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="EntradaEstoque\GerarPDF.aspx.designer.cs">
<DependentUpon>GerarPDF.aspx</DependentUpon>
</Compile>
<Compile Include="Global.asax.cs">
<DependentUpon>Global.asax</DependentUpon>
</Compile>
<Compile Include="MateriaPrima\CadastraBitola.aspx.cs">
<DependentUpon>CadastraBitola.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="MateriaPrima\CadastraBitola.aspx.designer.cs">
<DependentUpon>CadastraBitola.aspx</DependentUpon>
</Compile>
<Compile Include="MateriaPrima\CadastraMateriaPrima.aspx.cs">
<DependentUpon>CadastraMateriaPrima.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="MateriaPrima\CadastraMateriaPrima.aspx.designer.cs">
<DependentUpon>CadastraMateriaPrima.aspx</DependentUpon>
</Compile>
<Compile Include="MateriaPrima\CadastraClasseTipo.aspx.cs">
<DependentUpon>CadastraClasseTipo.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="MateriaPrima\CadastraClasseTipo.aspx.designer.cs">
<DependentUpon>CadastraClasseTipo.aspx</DependentUpon>
</Compile>
<Compile Include="MateriaPrima\CadastraNorma.aspx.cs">
<DependentUpon>CadastraNorma.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="MateriaPrima\CadastraNorma.aspx.designer.cs">
<DependentUpon>CadastraNorma.aspx</DependentUpon>
</Compile>
<Compile Include="MensagenNF\CadastraMensagemNF.aspx.cs">
<DependentUpon>CadastraMensagemNF.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="MensagenNF\CadastraMensagemNF.aspx.designer.cs">
<DependentUpon>CadastraMensagemNF.aspx</DependentUpon>
</Compile>
<Compile Include="nfe-procNFe.cs">
<DependentUpon>nfe-procNFe.xsd</DependentUpon>
<SubType>Component</SubType>
</Compile>
<Compile Include="nfe-procNFe.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>nfe-procNFe.xsd</DependentUpon>
</Compile>
<Compile Include="NFe\CadastraItemNFe.aspx.cs">
<DependentUpon>CadastraItemNFe.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="NFe\CadastraItemNFe.aspx.designer.cs">
<DependentUpon>CadastraItemNFe.aspx</DependentUpon>
</Compile>
<Compile Include="NFe\CadastraNFe.aspx.cs">
<DependentUpon>CadastraNFe.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="NFe\CadastraNFe.aspx.designer.cs">
<DependentUpon>CadastraNFe.aspx</DependentUpon>
</Compile>
<Compile Include="NFe\ListaNFe.aspx.cs">
<DependentUpon>ListaNFe.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="NFe\ListaNFe.aspx.designer.cs">
<DependentUpon>ListaNFe.aspx</DependentUpon>
</Compile>
<Compile Include="NFe\VisualizarNFe.aspx.cs">
<DependentUpon>VisualizarNFe.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="NFe\VisualizarNFe.aspx.designer.cs">
<DependentUpon>VisualizarNFe.aspx</DependentUpon>
</Compile>
<Compile Include="Parametro\NFEParametros.aspx.cs">
<DependentUpon>NFEParametros.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Parametro\NFEParametros.aspx.designer.cs">
<DependentUpon>NFEParametros.aspx</DependentUpon>
</Compile>
<Compile Include="PedidoCompra\CadastraPedidoCompra.aspx.cs">
<DependentUpon>CadastraPedidoCompra.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="PedidoCompra\CadastraPedidoCompra.aspx.designer.cs">
<DependentUpon>CadastraPedidoCompra.aspx</DependentUpon>
</Compile>
<Compile Include="PedidoCompra\CadastraPedidoCompraInsumo.aspx.cs">
<DependentUpon>CadastraPedidoCompraInsumo.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="PedidoCompra\CadastraPedidoCompraInsumo.aspx.designer.cs">
<DependentUpon>CadastraPedidoCompraInsumo.aspx</DependentUpon>
</Compile>
<Compile Include="PedidoCompra\ListaPedidoCompra.aspx.cs">
<DependentUpon>ListaPedidoCompra.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="PedidoCompra\ListaPedidoCompra.aspx.designer.cs">
<DependentUpon>ListaPedidoCompra.aspx</DependentUpon>
</Compile>
<Compile Include="PerfilAcesso\CadastraPerfilAcesso.aspx.cs">
<DependentUpon>CadastraPerfilAcesso.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="PrazoEntrega\CadastraPrazoEntrega.aspx.cs">
<DependentUpon>CadastraPrazoEntrega.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="PrazoEntrega\CadastraPrazoEntrega.aspx.designer.cs">
<DependentUpon>CadastraPrazoEntrega.aspx</DependentUpon>
</Compile>
<Compile Include="Produto\CadastraProduto.aspx.cs">
<DependentUpon>CadastraProduto.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Produto\CadastraProduto.aspx.designer.cs">
<DependentUpon>CadastraProduto.aspx</DependentUpon>
</Compile>
<Compile Include="Produto\CadastraUnidade.aspx.cs">
<DependentUpon>CadastraUnidade.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Produto\CadastraUnidade.aspx.designer.cs">
<DependentUpon>CadastraUnidade.aspx</DependentUpon>
</Compile>
<Compile Include="Produto\CadastroICMS.aspx.cs">
<DependentUpon>CadastroICMS.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Produto\CadastroICMS.aspx.designer.cs">
<DependentUpon>CadastroICMS.aspx</DependentUpon>
</Compile>
<Compile Include="Cliente\CadastraCliente.aspx.cs">
<DependentUpon>CadastraCliente.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Cliente\CadastraCliente.aspx.designer.cs">
<DependentUpon>CadastraCliente.aspx</DependentUpon>
</Compile>
<Compile Include="Default.aspx.cs">
<DependentUpon>Default.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Default.aspx.designer.cs">
<DependentUpon>Default.aspx</DependentUpon>
</Compile>
<Compile Include="Fornecedor\CadastraFornecedor.aspx.cs">
<DependentUpon>CadastraFornecedor.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Fornecedor\CadastraFornecedor.aspx.designer.cs">
<DependentUpon>CadastraFornecedor.aspx</DependentUpon>
</Compile>
<Compile Include="Funcionario\CadastraFuncionario.aspx.cs">
<DependentUpon>CadastraFuncionario.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Funcionario\CadastraFuncionario.aspx.designer.cs">
<DependentUpon>CadastraFuncionario.aspx</DependentUpon>
</Compile>
<Compile Include="Login.aspx.cs">
<DependentUpon>Login.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Login.aspx.designer.cs">
<DependentUpon>Login.aspx</DependentUpon>
</Compile>
<Compile Include="MasterPage.Master.cs">
<DependentUpon>MasterPage.Master</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="MasterPage.Master.designer.cs">
<DependentUpon>MasterPage.Master</DependentUpon>
</Compile>
<Compile Include="PerfilAcesso\ListaPerfilAcesso.aspx.cs">
<DependentUpon>ListaPerfilAcesso.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="PerfilAcesso\ListaPerfilAcesso.aspx.designer.cs">
<DependentUpon>ListaPerfilAcesso.aspx</DependentUpon>
</Compile>
<Compile Include="Produto\CadastraProdutoInsumo.aspx.cs">
<DependentUpon>CadastraProdutoInsumo.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Produto\CadastraProdutoInsumo.aspx.designer.cs">
<DependentUpon>CadastraProdutoInsumo.aspx</DependentUpon>
</Compile>
<Compile Include="Produto\ListaProduto.aspx.cs">
<DependentUpon>ListaProduto.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Produto\ListaProduto.aspx.designer.cs">
<DependentUpon>ListaProduto.aspx</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
<DependentUpon>Settings.settings</DependentUpon>
</Compile>
<Compile Include="Relatorios\EmitirRelatorios.aspx.cs">
<DependentUpon>EmitirRelatorios.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Relatorios\EmitirRelatorios.aspx.designer.cs">
<DependentUpon>EmitirRelatorios.aspx</DependentUpon>
</Compile>
<Compile Include="Relatorios\NotaFiscal\RelNotaFiscalPrincipal.aspx.cs">
<DependentUpon>RelNotaFiscalPrincipal.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Relatorios\NotaFiscal\RelNotaFiscalPrincipal.aspx.designer.cs">
<DependentUpon>RelNotaFiscalPrincipal.aspx</DependentUpon>
</Compile>
<Compile Include="Relatorios\PedidoCompra.aspx.cs">
<DependentUpon>PedidoCompra.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Relatorios\PedidoCompra.aspx.designer.cs">
<DependentUpon>PedidoCompra.aspx</DependentUpon>
</Compile>
<Compile Include="Relatorios\relCliente.aspx.cs">
<DependentUpon>relCliente.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Relatorios\relCliente.aspx.designer.cs">
<DependentUpon>relCliente.aspx</DependentUpon>
</Compile>
<Compile Include="Relatorios\RelDuplicata.aspx.cs">
<DependentUpon>RelDuplicata.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Relatorios\RelDuplicata.aspx.designer.cs">
<DependentUpon>RelDuplicata.aspx</DependentUpon>
</Compile>
<Compile Include="Relatorios\relFornecedor.aspx.cs">
<DependentUpon>relFornecedor.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Relatorios\relFornecedor.aspx.designer.cs">
<DependentUpon>relFornecedor.aspx</DependentUpon>
</Compile>
<Compile Include="Relatorios\relNotaFiscal.aspx.cs">
<DependentUpon>relNotaFiscal.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Relatorios\relNotaFiscal.aspx.designer.cs">
<DependentUpon>relNotaFiscal.aspx</DependentUpon>
</Compile>
<Compile Include="Relatorios\relProduto.aspx.cs">
<DependentUpon>relProduto.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Relatorios\relProduto.aspx.designer.cs">
<DependentUpon>relProduto.aspx</DependentUpon>
</Compile>
<Compile Include="Relatorios\relTransportadora.aspx.cs">
<DependentUpon>relTransportadora.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Relatorios\relTransportadora.aspx.designer.cs">
<DependentUpon>relTransportadora.aspx</DependentUpon>
</Compile>
<Compile Include="Transportadora\CadastraTransportadora.aspx.cs">
<DependentUpon>CadastraTransportadora.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Transportadora\CadastraTransportadora.aspx.designer.cs">
<DependentUpon>CadastraTransportadora.aspx</DependentUpon>
</Compile>
<Compile Include="UserControl\Banco.ascx.cs">
<DependentUpon>Banco.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="UserControl\Banco.ascx.designer.cs">
<DependentUpon>Banco.ascx</DependentUpon>
</Compile>
<Compile Include="UserControl\Endereco.ascx.cs">
<DependentUpon>Endereco.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="UserControl\Endereco.ascx.designer.cs">
<DependentUpon>Endereco.ascx</DependentUpon>
</Compile>
<Compile Include="Web References\WSCEPServices1\Reference.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Reference.map</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<Content Include="Administracao\Menu\ListaMenu.aspx" />
<Content Include="Administracao\Menu\ListaSubMenu.aspx" />
<Content Include="Emitente\CadastraEmitente.aspx" />
<Content Include="Funcionario\CadastraCargo.aspx" />
<Content Include="Funcionario\CadastraDepartamento.aspx" />
<Content Include="GeraImagem.aspx" />
<Content Include="Imagens\Enviar.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Imagens\excluir.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Imagens\IncluirItem.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Imagens\NFeFail.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Imagens\NFeOk.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Imagens\Imprimir.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Imagens\NissiLogo.jpg">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="NFe\CadastraItemNFe.aspx" />
<Content Include="NFe\CadastraNFe.aspx" />
<Content Include="NFe\ListaNFe.aspx" />
<Content Include="PerfilAcesso\CadastraPerfilAcesso.aspx" />
<Content Include="Produto\CadastraProduto.aspx" />
<Content Include="Produto\CadastraUnidade.aspx" />
<Content Include="Produto\CadastroICMS.aspx" />
<Content Include="CascadingWS.asmx" />
<Content Include="Cliente\CadastraCliente.aspx" />
<Content Include="Fornecedor\CadastraFornecedor.aspx" />
<Content Include="Funcionario\CadastraFuncionario.aspx" />
<Content Include="Imagens\AdpDiagramRelationships.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Imagens\apps.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Imagens\DatabasePermissionsMenu.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Imagens\Incluir.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="MasterPage.Master" />
<Content Include="menu.xml">
<SubType>Designer</SubType>
</Content>
<Content Include="PerfilAcesso\ListaPerfilAcesso.aspx" />
<Content Include="Transportadora\CadastraTransportadora.aspx" />
<Content Include="UserControl\Banco.ascx" />
<Content Include="UserControl\Endereco.ascx" />
<None Include="App_Themes\Theme1\images\tabs\vssver.scc" />
<None Include="DataSet.xsc">
<DependentUpon>DataSet.xsd</DependentUpon>
</None>
<None Include="DataSet.xsd">
<SubType>Designer</SubType>
<Generator>MSDataSetGenerator</Generator>
<LastGenOutput>DataSet.Designer.cs</LastGenOutput>
</None>
<None Include="DataSet.xss">
<DependentUpon>DataSet.xsd</DependentUpon>
</None>
<None Include="nfe-procNFe.xsc">
<DependentUpon>nfe-procNFe.xsd</DependentUpon>
</None>
<None Include="nfe-procNFe.xsd">
<Generator>MSDataSetGenerator</Generator>
<SubType>Designer</SubType>
<LastGenOutput>nfe-procNFe.Designer.cs</LastGenOutput>
</None>
<None Include="nfe-procNFe.xss">
<DependentUpon>nfe-procNFe.xsd</DependentUpon>
</None>
<None Include="nfe-procNFe_app1.xsd">
<SubType>Designer</SubType>
</None>
<None Include="Web References\WSCEPServices1\cep.disco" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Nissi.Business\Nissi.Business.csproj">
<Project>{53B43FD9-8814-418C-AC11-9BECBAF1DA4B}</Project>
<Name>Nissi.Business</Name>
</ProjectReference>
<ProjectReference Include="..\Nissi.Model\Nissi.Model.csproj">
<Project>{14A3EBFF-8C71-41FA-B0A9-69CA50A724DC}</Project>
<Name>Nissi.Model</Name>
</ProjectReference>
<ProjectReference Include="..\Nissi.Util\Nissi.Util.csproj">
<Project>{EDAEF629-CEC4-4EC4-A1FA-3D37E487C5A7}</Project>
<Name>Nissi.Util</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<WebReferences Include="Web References\" />
</ItemGroup>
<ItemGroup>
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
<None Include="Web References\WSCEPServices1\cep.wsdl" />
<None Include="Web References\WSCEPServices1\Logradouro.datasource">
<DependentUpon>Reference.map</DependentUpon>
</None>
<None Include="Web References\WSCEPServices1\Reference.map">
<Generator>MSDiscoCodeGenerator</Generator>
<LastGenOutput>Reference.cs</LastGenOutput>
</None>
</ItemGroup>
<ItemGroup>
<WebReferenceUrl Include="http://www.diastek.com.br/ws/cep.asmx">
<UrlBehavior>Dynamic</UrlBehavior>
<RelPath>Web References\WSCEPServices1\</RelPath>
<UpdateFromURL>http://www.diastek.com.br/ws/cep.asmx</UpdateFromURL>
<ServiceLocationURL>
</ServiceLocationURL>
<CachedDynamicPropName>
</CachedDynamicPropName>
<CachedAppSettingsObjectName>Settings</CachedAppSettingsObjectName>
<CachedSettingsPropName>Nissi_WebPresentation_WSCEPServices1_Service</CachedSettingsPropName>
</WebReferenceUrl>
</ItemGroup>
<ItemGroup>
<Folder Include="App_Data\" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Relatorios\NotaFiscal\RelPrincipal.rdlc" />
<EmbeddedResource Include="Relatorios\PedidoCompra.rdlc">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="Relatorios\relClientes.rdlc">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="Relatorios\RelDuplicata.rdlc">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="Relatorios\relFornecedor.rdlc">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="Relatorios\relNotaFiscal.rdlc">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="Relatorios\relProduto.rdlc">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="Relatorios\relTransportadora.rdlc">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</EmbeddedResource>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties>
<UseIIS>False</UseIIS>
<AutoAssignPort>True</AutoAssignPort>
-<<<<<<< HEAD
<DevelopmentServerPort>39443</DevelopmentServerPort>
-=======
<DevelopmentServerPort>55828</DevelopmentServerPort>
->>>>>>> 0e7e752c875b412e16e75c56679cd0618d11db3e
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://localhost/Nissi.WebPresentation</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>http://localhost/Nissi.WebPresentation</CustomServerUrl>
<SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
</WebProjectProperties>
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
</Project>
\ No newline at end of file
|
bfritscher/www-itunesu
|
bfc5cd537ada606f07f1f7c6cc4b83389bccb255
|
fixed for iTunes 9.1
|
diff --git a/WebContent/WEB-INF/groovy/index.groovy b/WebContent/WEB-INF/groovy/index.groovy
index dbd7f09..c2ee616 100644
--- a/WebContent/WEB-INF/groovy/index.groovy
+++ b/WebContent/WEB-INF/groovy/index.groovy
@@ -1,32 +1,32 @@
/**
* Browsing iTunesU without installing iTunes
* iTunesU xml to html - proxy application
*
* Proof of concept - free to use, modify and share
*
* Boris Fritscher boris.fritscher@unil.ch
*/
import xmlwise.*
import groovy.xml.StreamingMarkupBuilder
def handle = "http://deimos.apple.com/WebObjects/Core.woa/Browse/unil.ch"
if(request.getParameter("handle")){
handle = request.getParameter("handle")
}
/** fix namespace when outputing xml from MarkupBuilder */
def getXml(item){
def outputBuilder = new StreamingMarkupBuilder()
outputBuilder.encoding = "UTF-8"
String result = outputBuilder.bind{
mkp.declareNamespace("":"http://www.apple.com/itms/")
mkp.yield item }
}
def xml
def conn = new URL(handle).openConnection()
-conn.setRequestProperty ( "User-Agent", "iTunes/8.1" )
+conn.setRequestProperty ( "User-Agent", "iTunes/9.1" )
def putBackTogether = new StringBuffer()
def r = new InputStreamReader ( conn.getInputStream(), "UTF-8" )
char [ ] cb = new char [ 2048 ]
int amtRead = r.read ( cb )
while ( amtRead > 0 ) {
putBackTogether.append ( cb, 0, amtRead )
amtRead = r.read ( cb )
}
xml = putBackTogether.toString()
xml = new XmlSlurper().parseText(xml)
/**
* find first image and based on it decided which page type
* we are on. If it has a reflection attribute we are on a
* course page (track listing).
*/
def topimg = xml.'**'.find{ it.name() == "PictureView"}
def reflect = topimg?.'@reflection'==1 //true = course page
/**
* get font colors
*/
def titleFontStyle = xml.'**'.find{it.name() == "FontStyle" && it.'@name' == "normalTitleFontStyle"}?.'@color'
if(titleFontStyle == null){
titleFontStyle = xml.'**'.find{it.name() == "FontStyle" && it.'@name' == "outlineTitleFontStyle"}?.'@color'
}
def textFontStyle = xml.'**'.find{it.name() == "FontStyle" && it.'@name' == "normalTextFontStyle"}?.'@color'
if(textFontStyle == null){
textFontStyle = xml.'**'.find{it.name() == "FontStyle" && it.'@name' == "outlineTextFontStyle"}?.'@color'
}
/**
* header
*/
println """<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">"""
html.html(xmlns:"http://www.w3.org/1999/xhtml",lang:"en",'xml:lang':"en") {
head {
title xml.Path.PathElement.collect{it.'@displayName'}.join(" > ")
meta('http-equiv':"X-UA-Compatible", content:"IE=8")
meta('http-equiv':"content-type",content:"application/xhtml+xml; charset=UTF-8")
link(rel:"stylesheet", href:"css/blueprint/screen.css", type:"text/css", media:"screen, projection")
link(rel:"stylesheet", href:"css/blueprint/print.css", type:"text/css", media:"print")
println "<!--[if IE]>"
link(rel:"stylesheet", href:"css/blueprint/ie.css", type:"text/css", media:"screen, projection")
println "<![endif]-->"
link(rel:"stylesheet", href:"css/tablesorter/style.css", type:"text/css")
link(rel:"stylesheet", href:"css/main.css", type:"text/css")
link(rel:"shortcut icon", href:"favicon.ico", type:"image/x-icon")
script(type:"text/javascript", src:"js/jquery-1.3.2.min.js","")
script(type:"text/javascript", src:"js/reflection.js","")
script(type:"text/javascript", src:"js/jquery.tablesorter.min.js","")
script(type:"text/javascript", src:"js/main.js","")
if(reflect){
script(type:"text/javascript", src:"js/mootools-1.2.1-core-jm.js","")
script(type:"text/javascript", src:"js/mediaboxAdv99f.js","")
link(rel:"stylesheet", href:"css/mediaboxAdvBlack.css", type:"text/css")
}
style(type:"text/css","""
.body, p, li, .section a, .linkbox a{
color: #${textFontStyle}
}
h1, h2, h3{
color: #${titleFontStyle}
}
""")
}
/**
* Body
*/
- body(style:"background: #${xml.'*'.find{ it.'@backColor' != ''}.'@backColor'}"){
div(class:"container"){
div(class:"span-24 last nav"){
def list = xml.Path.PathElement
def last = list.size()-1
list.eachWithIndex{ pe,i ->
if(i == 0){
a(class:"first",href:"index.groovy?handle=${pe.text().trim()}"){
span(){
mkp.yieldUnescaped " "
}
}
}else{
a(class:"${i == last ? 'last' : ''}",href:"index.groovy?handle=${pe.text().trim()}", pe.'@displayName')
}
}
}
div(class:"span-24 last header", style:"${reflect ? '' : 'background: url('+topimg?.'@url'+') no-repeat top left'};min-height:${topimg.'@height'}px;"){
div(class:"span-16 course-detail"){
//COURSE PAGE
if(reflect){ //only if displaying a course page
def topurl = xml.'**'.find{it.name() == "GotoURL"}
def content = topurl?.parent()?.'**'.findAll{it.name() == "TextView"}.collect{it.toString().trim()}
h1 content[0]
div(class:"span-5", style:"height:${Math.round(1.25 * Integer.parseInt(topimg.'@height'.toString()))}px;"){
img(src:topimg.'@url',width:topimg.'@width', height:topimg.'@height', class:"reflect")
}
def descriptionIndex = content.indexOf("DESCRIPTION")
descriptionIndex = descriptionIndex == null ? 3 : descriptionIndex
content[1..descriptionIndex-1].each{ text ->
p text
}
//a(href:"${topurl.'@url'}","Open in iTunes")
xml.'**'.find{it.name() == "GotoURL" && it.PictureButtonView?.'@alt'=="Subscribe"}.each{ subscribe ->
//xml
p{
a(href:"${subscribe.'@draggingURL'}"){
img(src:"img/rss-podcast.png")
}
br()
a(href:"http://subscribe.getmiro.com/?url1=${subscribe.'@draggingURL'}",
title:"Miro: Internet TV"){
img(src:"http://subscribe.getmiro.com/img/buttons/patrace1.png",alt:"Miro Video Player")
}
br()
a(href:"${topurl.'@url'}",class:"subscribe"){
img(src:"img/logo_itunes_badge.gif")
}
}
}
if(content.size()>descriptionIndex){
h2(content[descriptionIndex].toString().trim())
content[descriptionIndex+1..content.size()-1].each{ text ->
p text.toString().trim()
}
}
}else{
mkp.yieldUnescaped " "
}
}
//RIGHTBOX
div(class:"span-8 last rightbox"){
div(class:"description"){
xml.ScrollView.View.MatrixView.View?.'**'.find{
it?.name()== "VBoxView" && it?.parent()?.name()== "VBoxView" && it?.parent()?.parent()?.name()== "VBoxView" && it?.parent()?.parent()?.parent()?.name()== "VBoxView"
}?.'*'.findAll{ it?.name() == "TextView"}.each{ text ->
p text
}
mkp.yieldUnescaped " "
}
def linkbox = xml.'**'.findAll{it.name() == "VBoxView" && it?.FontStyle.size() == 2 }[reflect? 1 : 0]?.parent()?.parent() //move over recommand if on course page
if(linkbox != null){
div(class:"linkbox",style:"background: url(${linkbox.parent()?.'**'.find{it.name() == 'PictureView'}.'@url'}) top left"){
linkbox?.'**'.findAll{it.name() == "VBoxView" && it?.FontStyle.size() == 2 }.each{ cat ->
h3(style:"color: #${cat.FontStyle[0].'@color'};border: 1px solid #${cat.View[0].Test[0].View.'@borderColor'}", cat?.'**'.find{it.name() == "TextView"}.toString().trim())
ul{
def els = cat?.'**'.findAll{it.name() == "OpenURL"}
if (els.size()==0){
els = cat.parent()?.'**'.findAll{it.name() == "OpenURL"}
}
els.each{ url ->
li{
def urlstring = url.'@url'
def matcher = ( urlstring =~ /^itms(.+)/ )
if(matcher.count > 0){
urlstring = "index.groovy?handle=http${matcher[0][1]}"
}
a(href:urlstring,url.'@draggingName')
}
}
}
}
}
}
}
}//header
//sections
xml.'**'.findAll{it.name() == "View" && !it.HBoxView.isEmpty() && !it.HBoxView.PictureView.isEmpty() }.each{ view ->
div(class:"span-24 last section"){
div(class:"sectionhead",style:"background: url(${view.HBoxView[0].PictureView[2].'@url'}) no-repeat top right;"){
div(style:"background: url(${view.HBoxView[0].PictureView[0].'@url'}) no-repeat top left;"){
h2(style:"background: url(${view.HBoxView[0].PictureView[1].'@url'}) repeat-x top left;" , view.VBoxView?.'**'.find{it.name() == "TextView" }.text().trim())
}
}
def border = view.parent().parent().View.VBoxView[0]?.'**'.findAll{ it.name() == "PictureView"}
div(class:"span-24 last sectionbody", style:"background: url(${border[0].'@url'}) top left;"){
//items
view.parent().parent()?.'**'.findAll{ it.name() == "HBoxView" && !it.GotoURL.isEmpty() && !it.GotoURL.PictureView.isEmpty()}.eachWithIndex{ item, i-> //HBoxView
div(class:"span-8 ${(i+1) % 3 == 0 ? 'last' : ''} course"){
a(href:"index.groovy?handle=${item.GotoURL.'@url'}"){ //GotoURL
img(src:item.GotoURL.PictureView.'@url',alt:item.GotoURL.'@draggingName') //PictureView
}
div{ //VBoxView
a(href:"index.groovy?handle=${item.VBoxView.GotoURL.'@url'}",item.VBoxView.GotoURL.'@draggingName') //GotoURL
p{
item.VBoxView.TextView.each{ tv ->
mkp.yield tv.text().trim()
br()
}
}
}
}
}
}
}
}
if(reflect){
div(class:"span-24 groups"){
def groups = xml.'**'.findAll{ it.name() == "GotoURL" && !it.PictureView.isEmpty()}.each{ group ->
def imgs = group.children()?.'**'.grep{it.'@url' !=""}.'@url'*.text()
def color = group?.'**'.find{it.'@color' !=""}?.'@color'.text();
div(style:"background: url(${imgs[2]}) no-repeat top right;"){
div(style:"background: url(${imgs[1]}) no-repeat top left;"){
a(style:"background: url(${imgs[0]}) repeat-x top left;color:#${color};",
href:"?handle=${group.'@url'}",group.toString().trim())
}
}
}
}
if(xml.'*'.find{it.name() == "TrackList"}.size()>0){
div(class:"span-24 last tracklist"){
table(cellspacing:"1", class:"tablesorter"){
thead{
tr{
th ""
th "Name"
th "Time"
th "Artist"
th "Release Date"
th ""
}
}
tbody{
def plist = Plist.fromXml(getXml(xml.TrackList.plist))
plist.items.eachWithIndex{ track, i ->
/* debug list all keys
ul{
track.each{ key,value->
li("${key}: ${value}")
}
}*/
int seconds = (track["duration"] /1000)
int minutes = seconds % 3600
int hours = (seconds - minutes) / 3600
seconds = minutes % 60
minutes = (minutes - seconds) / 60
tr(class:i % 2 == 0 ? "even" : "odd"){
td track["rank"]
td track["songName"]
td ((hours > 0 ? String.format("%02d",hours) + ":" : "")+ String.format("%02d",minutes) + ":" + String.format("%02d",seconds))
td track["artistName"]
td track["releaseDate"][0..9]
td{
a(href:"proxy.groovy?url=" + track["previewURL"],rel:"lightbox[set 480 380]",title:track["songName"], "view")
mkp.yieldUnescaped(" ")
a(href:"proxy.groovy?url=" + track["previewURL"],title:track["songName"], "download")
}
}
}
}
}
}
}
}
/*
div(class:"span-24 last debug"){
xml.'**'.findAll{ it.name() == "TextView"}.each{ item ->
p(item.text().trim())
}
xml.'**'.findAll{ it.name() == "PictureView"}.each{ item ->
a(href:""){
img(src:item.'@url')
}
}
xml.'**'.findAll{ it.name() == "GotoURL"}.each{ item ->
a(href:"index.groovy?handle=${item.'@url'}",item.'@draggingName')
}
} //debug
*/
} //container
+ body(style:"background: #${xml.'*'.find{ it.'@backColor' != ''}.'@backColor'}"){
div(class:"container"){
div(class:"span-24 last nav"){
def list = xml.'**'.find{it.name() == "HBoxView"}.'**'.findAll{ it.name() == "GotoURL" && it.parent().name() == "TextView"}
def last = list.size()-1
list.eachWithIndex{ pe,i ->
if(i == 0){
a(class:"first",href:"index.groovy?handle=${pe.'@url'}"){
span(){
mkp.yieldUnescaped " "
}
}
}else{
a(class:"${i == last ? 'last' : ''}",href:"index.groovy?handle=${pe.'@url'}", pe.text())
}
}
if(list.size() == 0){
def uphandle = handle =~ /(.*?)\.[0-9]+/
uphandle = uphandle ? uphandle[0][1] : handle
a(class:"first",href:"index.groovy?handle=${uphandle}"){
span(){
mkp.yieldUnescaped " "
}
}
}
}
div(class:"span-24 last header", style:"${reflect ? '' : 'background: url('+topimg?.'@url'+') no-repeat top left'};min-height:${topimg.'@height'}px;"){
div(class:"span-16 course-detail"){
//COURSE PAGE
if(reflect){ //only if displaying a course page
//def topurl = xml.'**'.find{it.name() == "GotoURL"}
def content = topimg.parent().parent().parent().'**'.findAll{it.name() == "TextView"}.collect{it.toString().trim()}
h1 topimg.'@alt'
div(class:"span-5", style:"height:${Math.round(1.25 * Integer.parseInt(topimg.'@height'.toString()))}px;"){
img(src:topimg.'@url',width:topimg.'@width', height:topimg.'@height', class:"reflect")
}
def descriptionIndex = content.indexOf("DESCRIPTION")
descriptionIndex = descriptionIndex == null ? 3 : descriptionIndex
content[0..descriptionIndex-1].each{ text ->
p text
}
//a(href:"${topurl.'@url'}","Open in iTunes")
xml.'**'.find{it.name() == "GotoURL" && it.PictureButtonView?.'@alt'=="Subscribe"}.each{ subscribe ->
//xml
p{
a(href:"${subscribe.'@draggingURL'}"){
img(src:"img/rss-podcast.png")
}
br()
a(href:"http://subscribe.getmiro.com/?url1=${subscribe.'@draggingURL'}",
title:"Miro: Internet TV"){
img(src:"http://subscribe.getmiro.com/img/buttons/patrace1.png",alt:"Miro Video Player")
}
br()
//a(href:"${topurl.'@url'}",class:"subscribe"){
// img(src:"img/logo_itunes_badge.gif")
//}
}
}
if(content.size()>descriptionIndex){
h2(content[descriptionIndex].toString().trim())
content[descriptionIndex+1..content.size()-1].each{ text ->
p text.toString().trim()
}
}
}else{
mkp.yieldUnescaped " "
}
}
//RIGHTBOX
div(class:"span-8 last rightbox"){
div(class:"description"){
xml.ScrollView.View.MatrixView.View?.'**'.find{
it?.name()== "VBoxView" && it?.parent()?.name()== "VBoxView" && it?.parent()?.parent()?.name()== "VBoxView" && it?.parent()?.parent()?.parent()?.name()== "VBoxView"
}?.'*'.findAll{ it?.name() == "TextView"}.each{ text ->
p text
}
mkp.yieldUnescaped " "
}
def linkbox = xml.'**'.findAll{it.name() == "VBoxView" && it?.FontStyle.size() == 2 }[reflect? 1 : 0]?.parent()?.parent() //move over recommand if on course page
if(linkbox != null){
div(class:"linkbox",style:"background: url(${linkbox.parent()?.'**'.find{it.name() == 'PictureView'}.'@url'}) top left"){
linkbox?.'**'.findAll{it.name() == "VBoxView" && it?.FontStyle.size() == 2 }.each{ cat ->
h3(style:"color: #${cat.FontStyle[0].'@color'};border: 1px solid #${cat.View[0].Test[0].View.'@borderColor'}", cat?.'**'.find{it.name() == "TextView"}.toString().trim())
ul{
def els = cat?.'**'.findAll{it.name() == "OpenURL"}
if (els.size()==0){
els = cat.parent()?.'**'.findAll{it.name() == "OpenURL"}
}
els.each{ url ->
li{
def urlstring = url.'@url'
def matcher = ( urlstring =~ /^itms(.+)/ )
if(matcher.count > 0){
urlstring = "index.groovy?handle=http${matcher[0][1]}"
}
a(href:urlstring,url.'@draggingName')
}
}
}
}
}
}
}
}//header
//sections
xml.'**'.findAll{it.name() == "View" && !it.HBoxView.isEmpty() && !it.HBoxView.PictureView.isEmpty() }.each{ view ->
div(class:"span-24 last section"){
div(class:"sectionhead",style:"background: url(${view.HBoxView[0].PictureView[2].'@url'}) no-repeat top right;"){
div(style:"background: url(${view.HBoxView[0].PictureView[0].'@url'}) no-repeat top left;"){
h2(style:"background: url(${view.HBoxView[0].PictureView[1].'@url'}) repeat-x top left;" , view.VBoxView?.'**'.find{it.name() == "TextView" }.text().trim())
}
}
def border = view.parent().parent().View.VBoxView[0]?.'**'.findAll{ it.name() == "PictureView"}
div(class:"span-24 last sectionbody", style:"background: url(${border[0].'@url'}) top left;"){
//items
view.parent().parent()?.'**'.findAll{ it.name() == "HBoxView" && !it.GotoURL.isEmpty() && !it.GotoURL.PictureView.isEmpty()}.eachWithIndex{ item, i-> //HBoxView
div(class:"span-8 ${(i+1) % 3 == 0 ? 'last' : ''} course"){
a(href:"index.groovy?handle=${item.GotoURL.'@url'}"){ //GotoURL
img(src:item.GotoURL.PictureView.'@url',alt:item.GotoURL.'@draggingName') //PictureView
}
div{ //VBoxView
a(href:"index.groovy?handle=${item.VBoxView.GotoURL.'@url'}",item.VBoxView.GotoURL.'@draggingName') //GotoURL
p{
item.VBoxView.TextView.each{ tv ->
mkp.yield tv.text().trim()
br()
}
}
}
}
}
}
}
}
if(reflect){
div(class:"span-24 groups"){
def groups = xml.'**'.findAll{ it.name() == "GotoURL" && !it.PictureView.isEmpty()}.each{ group ->
def imgs = group.children()?.'**'.grep{it.'@url' !=""}.'@url'*.text()
def color = group?.'**'.find{it.'@color' !=""}?.'@color'.text();
div(style:"background: url(${imgs[2]}) no-repeat top right;"){
div(style:"background: url(${imgs[1]}) no-repeat top left;"){
a(style:"background: url(${imgs[0]}) repeat-x top left;color:#${color};",
href:"?handle=${group.'@url'}",group.toString().trim())
}
}
}
}
if(xml.'*'.find{it.name() == "TrackList"}.size()>0){
div(class:"span-24 last tracklist"){
table(cellspacing:"1", class:"tablesorter"){
thead{
tr{
th ""
th "Name"
th "Time"
th "Artist"
th "Release Date"
th ""
}
}
tbody{
def plist = Plist.fromXml(getXml(xml.TrackList.plist))
plist.items.eachWithIndex{ track, i ->
/* debug list all keys
ul{
track.each{ key,value->
li("${key}: ${value}")
}
}*/
int seconds = (track["duration"] /1000)
int minutes = seconds % 3600
int hours = (seconds - minutes) / 3600
seconds = minutes % 60
minutes = (minutes - seconds) / 60
tr(class:i % 2 == 0 ? "even" : "odd"){
td track["rank"]
td track["songName"]
td ((hours > 0 ? String.format("%02d",hours) + ":" : "")+ String.format("%02d",minutes) + ":" + String.format("%02d",seconds))
td track["artistName"]
td track["releaseDate"][0..9]
td{
a(href:"proxy.groovy?url=" + track["previewURL"],rel:"lightbox[set 480 380]",title:track["songName"], "view")
mkp.yieldUnescaped(" ")
a(href:"proxy.groovy?url=" + track["previewURL"],title:track["songName"], "download")
}
}
}
}
}
}
}
}
/*
div(class:"span-24 last debug"){
xml.'**'.findAll{ it.name() == "TextView"}.each{ item ->
p(item.text().trim())
}
xml.'**'.findAll{ it.name() == "PictureView"}.each{ item ->
a(href:""){
img(src:item.'@url')
}
}
xml.'**'.findAll{ it.name() == "GotoURL"}.each{ item ->
a(href:"index.groovy?handle=${item.'@url'}",item.'@draggingName')
}
} //debug
*/
} //container
} //body
}
\ No newline at end of file
diff --git a/WebContent/WEB-INF/lib/groovy-all-1.6.1.jar b/WebContent/WEB-INF/lib/groovy-all-1.6.1.jar
deleted file mode 100644
index afa7ad0..0000000
Binary files a/WebContent/WEB-INF/lib/groovy-all-1.6.1.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/groovy-all-1.7.2.jar b/WebContent/WEB-INF/lib/groovy-all-1.7.2.jar
new file mode 100644
index 0000000..7b50f70
Binary files /dev/null and b/WebContent/WEB-INF/lib/groovy-all-1.7.2.jar differ
|
bfritscher/www-itunesu
|
d6c3794e154edcf14e18a2d7e7b94cb26e9f0f1a
|
fixed url
|
diff --git a/WebContent/WEB-INF/groovy/proxy.groovy b/WebContent/WEB-INF/groovy/proxy.groovy
index 1ceff0a..3523bbf 100644
--- a/WebContent/WEB-INF/groovy/proxy.groovy
+++ b/WebContent/WEB-INF/groovy/proxy.groovy
@@ -1,13 +1,13 @@
if(request.getParameter("url")){
def url = request.getParameter("url")
- def conn = "http://deimos.apple.com/WebObjects/Core.woa/DownloadRedirectedTrackPreview/unil.ch.2244181544.02244181550.2374720214.m4v".toURL().openConnection()
+ def conn = url.toURL().openConnection()
conn.setRequestProperty ( "User-Agent", "iTunes/8.1" )
conn.getHeaderFields()
response.sendRedirect( ( conn.getURL() =~ /http:\/\/deimos3.apple.com\/DeliverPreview/).replaceFirst("http:/") )
} else {
println "please provide an url parameter"
}
diff --git a/build/classes/xmlwise/Plist$ElementType.class b/build/classes/xmlwise/Plist$ElementType.class
deleted file mode 100644
index e959f5b..0000000
Binary files a/build/classes/xmlwise/Plist$ElementType.class and /dev/null differ
diff --git a/build/classes/xmlwise/Plist.class b/build/classes/xmlwise/Plist.class
deleted file mode 100644
index 2b8dac9..0000000
Binary files a/build/classes/xmlwise/Plist.class and /dev/null differ
diff --git a/build/classes/xmlwise/XmlElement.class b/build/classes/xmlwise/XmlElement.class
deleted file mode 100644
index 00a6302..0000000
Binary files a/build/classes/xmlwise/XmlElement.class and /dev/null differ
diff --git a/build/classes/xmlwise/XmlElementAttributes.class b/build/classes/xmlwise/XmlElementAttributes.class
deleted file mode 100644
index aa70e03..0000000
Binary files a/build/classes/xmlwise/XmlElementAttributes.class and /dev/null differ
diff --git a/build/classes/xmlwise/XmlParseException.class b/build/classes/xmlwise/XmlParseException.class
deleted file mode 100644
index ce70e6f..0000000
Binary files a/build/classes/xmlwise/XmlParseException.class and /dev/null differ
diff --git a/build/classes/xmlwise/Xmlwise.class b/build/classes/xmlwise/Xmlwise.class
deleted file mode 100644
index 9f54b75..0000000
Binary files a/build/classes/xmlwise/Xmlwise.class and /dev/null differ
|
bfritscher/www-itunesu
|
542d16fbeb2d620145e5000b468b9d90d32c6416
|
created proxy for redirecting url of media files
|
diff --git a/.project b/.project
index eab949c..a596c57 100644
--- a/.project
+++ b/.project
@@ -1,42 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>itunesu</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
- <buildCommand>
- <name>org.codehaus.groovy.eclipse.groovyBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
<buildCommand>
<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.wst.common.project.facet.core.builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.wst.validation.validationbuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.jdt.groovy.core.groovyNature</nature>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
- <nature>org.codehaus.groovy.eclipse.groovyNature</nature>
</natures>
</projectDescription>
diff --git a/WebContent/WEB-INF/groovy/index.groovy b/WebContent/WEB-INF/groovy/index.groovy
index 6325beb..dbd7f09 100644
--- a/WebContent/WEB-INF/groovy/index.groovy
+++ b/WebContent/WEB-INF/groovy/index.groovy
@@ -1,32 +1,32 @@
/**
* Browsing iTunesU without installing iTunes
* iTunesU xml to html - proxy application
*
* Proof of concept - free to use, modify and share
*
* Boris Fritscher boris.fritscher@unil.ch
*/
import xmlwise.*
import groovy.xml.StreamingMarkupBuilder
def handle = "http://deimos.apple.com/WebObjects/Core.woa/Browse/unil.ch"
if(request.getParameter("handle")){
handle = request.getParameter("handle")
}
/** fix namespace when outputing xml from MarkupBuilder */
def getXml(item){
def outputBuilder = new StreamingMarkupBuilder()
outputBuilder.encoding = "UTF-8"
String result = outputBuilder.bind{
mkp.declareNamespace("":"http://www.apple.com/itms/")
mkp.yield item }
}
def xml
def conn = new URL(handle).openConnection()
conn.setRequestProperty ( "User-Agent", "iTunes/8.1" )
def putBackTogether = new StringBuffer()
def r = new InputStreamReader ( conn.getInputStream(), "UTF-8" )
char [ ] cb = new char [ 2048 ]
int amtRead = r.read ( cb )
while ( amtRead > 0 ) {
putBackTogether.append ( cb, 0, amtRead )
amtRead = r.read ( cb )
}
xml = putBackTogether.toString()
xml = new XmlSlurper().parseText(xml)
/**
* find first image and based on it decided which page type
* we are on. If it has a reflection attribute we are on a
* course page (track listing).
*/
def topimg = xml.'**'.find{ it.name() == "PictureView"}
def reflect = topimg?.'@reflection'==1 //true = course page
/**
* get font colors
*/
def titleFontStyle = xml.'**'.find{it.name() == "FontStyle" && it.'@name' == "normalTitleFontStyle"}?.'@color'
if(titleFontStyle == null){
titleFontStyle = xml.'**'.find{it.name() == "FontStyle" && it.'@name' == "outlineTitleFontStyle"}?.'@color'
}
def textFontStyle = xml.'**'.find{it.name() == "FontStyle" && it.'@name' == "normalTextFontStyle"}?.'@color'
if(textFontStyle == null){
textFontStyle = xml.'**'.find{it.name() == "FontStyle" && it.'@name' == "outlineTextFontStyle"}?.'@color'
}
/**
* header
*/
println """<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">"""
html.html(xmlns:"http://www.w3.org/1999/xhtml",lang:"en",'xml:lang':"en") {
head {
title xml.Path.PathElement.collect{it.'@displayName'}.join(" > ")
meta('http-equiv':"X-UA-Compatible", content:"IE=8")
meta('http-equiv':"content-type",content:"application/xhtml+xml; charset=UTF-8")
link(rel:"stylesheet", href:"css/blueprint/screen.css", type:"text/css", media:"screen, projection")
link(rel:"stylesheet", href:"css/blueprint/print.css", type:"text/css", media:"print")
println "<!--[if IE]>"
link(rel:"stylesheet", href:"css/blueprint/ie.css", type:"text/css", media:"screen, projection")
println "<![endif]-->"
link(rel:"stylesheet", href:"css/tablesorter/style.css", type:"text/css")
link(rel:"stylesheet", href:"css/main.css", type:"text/css")
link(rel:"shortcut icon", href:"favicon.ico", type:"image/x-icon")
script(type:"text/javascript", src:"js/jquery-1.3.2.min.js","")
script(type:"text/javascript", src:"js/reflection.js","")
script(type:"text/javascript", src:"js/jquery.tablesorter.min.js","")
script(type:"text/javascript", src:"js/main.js","")
if(reflect){
script(type:"text/javascript", src:"js/mootools-1.2.1-core-jm.js","")
script(type:"text/javascript", src:"js/mediaboxAdv99f.js","")
link(rel:"stylesheet", href:"css/mediaboxAdvBlack.css", type:"text/css")
}
style(type:"text/css","""
.body, p, li, .section a, .linkbox a{
color: #${textFontStyle}
}
h1, h2, h3{
color: #${titleFontStyle}
}
""")
}
/**
* Body
*/
- body(style:"background: #${xml.'*'.find{ it.'@backColor' != ''}.'@backColor'}"){
div(class:"container"){
div(class:"span-24 last nav"){
def list = xml.Path.PathElement
def last = list.size()-1
list.eachWithIndex{ pe,i ->
if(i == 0){
a(class:"first",href:"index.groovy?handle=${pe.text().trim()}"){
span(){
mkp.yieldUnescaped " "
}
}
}else{
a(class:"${i == last ? 'last' : ''}",href:"index.groovy?handle=${pe.text().trim()}", pe.'@displayName')
}
}
}
div(class:"span-24 last header", style:"${reflect ? '' : 'background: url('+topimg?.'@url'+') no-repeat top left'};min-height:${topimg.'@height'}px;"){
div(class:"span-16 course-detail"){
//COURSE PAGE
if(reflect){ //only if displaying a course page
def topurl = xml.'**'.find{it.name() == "GotoURL"}
def content = topurl?.parent()?.'**'.findAll{it.name() == "TextView"}.collect{it.toString().trim()}
h1 content[0]
div(class:"span-5", style:"height:${Math.round(1.25 * Integer.parseInt(topimg.'@height'.toString()))}px;"){
img(src:topimg.'@url',width:topimg.'@width', height:topimg.'@height', class:"reflect")
}
def descriptionIndex = content.indexOf("DESCRIPTION")
descriptionIndex = descriptionIndex == null ? 3 : descriptionIndex
content[1..descriptionIndex-1].each{ text ->
p text
}
//a(href:"${topurl.'@url'}","Open in iTunes")
xml.'**'.find{it.name() == "GotoURL" && it.PictureButtonView?.'@alt'=="Subscribe"}.each{ subscribe ->
//xml
p{
a(href:"${subscribe.'@draggingURL'}"){
img(src:"img/rss-podcast.png")
}
br()
a(href:"http://subscribe.getmiro.com/?url1=${subscribe.'@draggingURL'}",
title:"Miro: Internet TV"){
img(src:"http://subscribe.getmiro.com/img/buttons/patrace1.png",alt:"Miro Video Player")
}
br()
a(href:"${topurl.'@url'}",class:"subscribe"){
img(src:"img/logo_itunes_badge.gif")
}
}
}
if(content.size()>descriptionIndex){
h2(content[descriptionIndex].toString().trim())
content[descriptionIndex+1..content.size()-1].each{ text ->
p text.toString().trim()
}
}
}else{
mkp.yieldUnescaped " "
}
}
//RIGHTBOX
div(class:"span-8 last rightbox"){
div(class:"description"){
xml.ScrollView.View.MatrixView.View?.'**'.find{
it?.name()== "VBoxView" && it?.parent()?.name()== "VBoxView" && it?.parent()?.parent()?.name()== "VBoxView" && it?.parent()?.parent()?.parent()?.name()== "VBoxView"
}?.'*'.findAll{ it?.name() == "TextView"}.each{ text ->
p text
}
mkp.yieldUnescaped " "
}
def linkbox = xml.'**'.findAll{it.name() == "VBoxView" && it?.FontStyle.size() == 2 }[reflect? 1 : 0]?.parent()?.parent() //move over recommand if on course page
if(linkbox != null){
div(class:"linkbox",style:"background: url(${linkbox.parent()?.'**'.find{it.name() == 'PictureView'}.'@url'}) top left"){
linkbox?.'**'.findAll{it.name() == "VBoxView" && it?.FontStyle.size() == 2 }.each{ cat ->
h3(style:"color: #${cat.FontStyle[0].'@color'};border: 1px solid #${cat.View[0].Test[0].View.'@borderColor'}", cat?.'**'.find{it.name() == "TextView"}.toString().trim())
ul{
def els = cat?.'**'.findAll{it.name() == "OpenURL"}
if (els.size()==0){
els = cat.parent()?.'**'.findAll{it.name() == "OpenURL"}
}
els.each{ url ->
li{
def urlstring = url.'@url'
def matcher = ( urlstring =~ /^itms(.+)/ )
if(matcher.count > 0){
urlstring = "index.groovy?handle=http${matcher[0][1]}"
}
a(href:urlstring,url.'@draggingName')
}
}
}
}
}
}
}
}//header
//sections
xml.'**'.findAll{it.name() == "View" && !it.HBoxView.isEmpty() && !it.HBoxView.PictureView.isEmpty() }.each{ view ->
div(class:"span-24 last section"){
div(class:"sectionhead",style:"background: url(${view.HBoxView[0].PictureView[2].'@url'}) no-repeat top right;"){
div(style:"background: url(${view.HBoxView[0].PictureView[0].'@url'}) no-repeat top left;"){
h2(style:"background: url(${view.HBoxView[0].PictureView[1].'@url'}) repeat-x top left;" , view.VBoxView?.'**'.find{it.name() == "TextView" }.text().trim())
}
}
def border = view.parent().parent().View.VBoxView[0]?.'**'.findAll{ it.name() == "PictureView"}
div(class:"span-24 last sectionbody", style:"background: url(${border[0].'@url'}) top left;"){
//items
view.parent().parent()?.'**'.findAll{ it.name() == "HBoxView" && !it.GotoURL.isEmpty() && !it.GotoURL.PictureView.isEmpty()}.eachWithIndex{ item, i-> //HBoxView
div(class:"span-8 ${(i+1) % 3 == 0 ? 'last' : ''} course"){
a(href:"index.groovy?handle=${item.GotoURL.'@url'}"){ //GotoURL
img(src:item.GotoURL.PictureView.'@url',alt:item.GotoURL.'@draggingName') //PictureView
}
div{ //VBoxView
a(href:"index.groovy?handle=${item.VBoxView.GotoURL.'@url'}",item.VBoxView.GotoURL.'@draggingName') //GotoURL
p{
item.VBoxView.TextView.each{ tv ->
mkp.yield tv.text().trim()
br()
}
}
}
}
}
}
}
}
if(reflect){
div(class:"span-24 groups"){
def groups = xml.'**'.findAll{ it.name() == "GotoURL" && !it.PictureView.isEmpty()}.each{ group ->
def imgs = group.children()?.'**'.grep{it.'@url' !=""}.'@url'*.text()
def color = group?.'**'.find{it.'@color' !=""}?.'@color'.text();
div(style:"background: url(${imgs[2]}) no-repeat top right;"){
div(style:"background: url(${imgs[1]}) no-repeat top left;"){
a(style:"background: url(${imgs[0]}) repeat-x top left;color:#${color};",
href:"?handle=${group.'@url'}",group.toString().trim())
}
}
}
}
if(xml.'*'.find{it.name() == "TrackList"}.size()>0){
div(class:"span-24 last tracklist"){
table(cellspacing:"1", class:"tablesorter"){
thead{
tr{
th ""
th "Name"
th "Time"
th "Artist"
th "Release Date"
th ""
}
}
tbody{
def plist = Plist.fromXml(getXml(xml.TrackList.plist))
plist.items.eachWithIndex{ track, i ->
/* debug list all keys
ul{
track.each{ key,value->
li("${key}: ${value}")
}
}*/
int seconds = (track["duration"] /1000)
int minutes = seconds % 3600
int hours = (seconds - minutes) / 3600
seconds = minutes % 60
minutes = (minutes - seconds) / 60
tr(class:i % 2 == 0 ? "even" : "odd"){
td track["rank"]
td track["songName"]
td ((hours > 0 ? String.format("%02d",hours) + ":" : "")+ String.format("%02d",minutes) + ":" + String.format("%02d",seconds))
td track["artistName"]
td track["releaseDate"][0..9]
td{
a(href:track["previewURL"],rel:"lightbox[set 480 380]",title:track["songName"], "view")
mkp.yieldUnescaped(" ")
a(href:track["previewURL"],title:track["songName"], "download")
}
}
}
}
}
}
}
}
/*
div(class:"span-24 last debug"){
xml.'**'.findAll{ it.name() == "TextView"}.each{ item ->
p(item.text().trim())
}
xml.'**'.findAll{ it.name() == "PictureView"}.each{ item ->
a(href:""){
img(src:item.'@url')
}
}
xml.'**'.findAll{ it.name() == "GotoURL"}.each{ item ->
a(href:"index.groovy?handle=${item.'@url'}",item.'@draggingName')
}
} //debug
*/
} //container
+ body(style:"background: #${xml.'*'.find{ it.'@backColor' != ''}.'@backColor'}"){
div(class:"container"){
div(class:"span-24 last nav"){
def list = xml.Path.PathElement
def last = list.size()-1
list.eachWithIndex{ pe,i ->
if(i == 0){
a(class:"first",href:"index.groovy?handle=${pe.text().trim()}"){
span(){
mkp.yieldUnescaped " "
}
}
}else{
a(class:"${i == last ? 'last' : ''}",href:"index.groovy?handle=${pe.text().trim()}", pe.'@displayName')
}
}
}
div(class:"span-24 last header", style:"${reflect ? '' : 'background: url('+topimg?.'@url'+') no-repeat top left'};min-height:${topimg.'@height'}px;"){
div(class:"span-16 course-detail"){
//COURSE PAGE
if(reflect){ //only if displaying a course page
def topurl = xml.'**'.find{it.name() == "GotoURL"}
def content = topurl?.parent()?.'**'.findAll{it.name() == "TextView"}.collect{it.toString().trim()}
h1 content[0]
div(class:"span-5", style:"height:${Math.round(1.25 * Integer.parseInt(topimg.'@height'.toString()))}px;"){
img(src:topimg.'@url',width:topimg.'@width', height:topimg.'@height', class:"reflect")
}
def descriptionIndex = content.indexOf("DESCRIPTION")
descriptionIndex = descriptionIndex == null ? 3 : descriptionIndex
content[1..descriptionIndex-1].each{ text ->
p text
}
//a(href:"${topurl.'@url'}","Open in iTunes")
xml.'**'.find{it.name() == "GotoURL" && it.PictureButtonView?.'@alt'=="Subscribe"}.each{ subscribe ->
//xml
p{
a(href:"${subscribe.'@draggingURL'}"){
img(src:"img/rss-podcast.png")
}
br()
a(href:"http://subscribe.getmiro.com/?url1=${subscribe.'@draggingURL'}",
title:"Miro: Internet TV"){
img(src:"http://subscribe.getmiro.com/img/buttons/patrace1.png",alt:"Miro Video Player")
}
br()
a(href:"${topurl.'@url'}",class:"subscribe"){
img(src:"img/logo_itunes_badge.gif")
}
}
}
if(content.size()>descriptionIndex){
h2(content[descriptionIndex].toString().trim())
content[descriptionIndex+1..content.size()-1].each{ text ->
p text.toString().trim()
}
}
}else{
mkp.yieldUnescaped " "
}
}
//RIGHTBOX
div(class:"span-8 last rightbox"){
div(class:"description"){
xml.ScrollView.View.MatrixView.View?.'**'.find{
it?.name()== "VBoxView" && it?.parent()?.name()== "VBoxView" && it?.parent()?.parent()?.name()== "VBoxView" && it?.parent()?.parent()?.parent()?.name()== "VBoxView"
}?.'*'.findAll{ it?.name() == "TextView"}.each{ text ->
p text
}
mkp.yieldUnescaped " "
}
def linkbox = xml.'**'.findAll{it.name() == "VBoxView" && it?.FontStyle.size() == 2 }[reflect? 1 : 0]?.parent()?.parent() //move over recommand if on course page
if(linkbox != null){
div(class:"linkbox",style:"background: url(${linkbox.parent()?.'**'.find{it.name() == 'PictureView'}.'@url'}) top left"){
linkbox?.'**'.findAll{it.name() == "VBoxView" && it?.FontStyle.size() == 2 }.each{ cat ->
h3(style:"color: #${cat.FontStyle[0].'@color'};border: 1px solid #${cat.View[0].Test[0].View.'@borderColor'}", cat?.'**'.find{it.name() == "TextView"}.toString().trim())
ul{
def els = cat?.'**'.findAll{it.name() == "OpenURL"}
if (els.size()==0){
els = cat.parent()?.'**'.findAll{it.name() == "OpenURL"}
}
els.each{ url ->
li{
def urlstring = url.'@url'
def matcher = ( urlstring =~ /^itms(.+)/ )
if(matcher.count > 0){
urlstring = "index.groovy?handle=http${matcher[0][1]}"
}
a(href:urlstring,url.'@draggingName')
}
}
}
}
}
}
}
}//header
//sections
xml.'**'.findAll{it.name() == "View" && !it.HBoxView.isEmpty() && !it.HBoxView.PictureView.isEmpty() }.each{ view ->
div(class:"span-24 last section"){
div(class:"sectionhead",style:"background: url(${view.HBoxView[0].PictureView[2].'@url'}) no-repeat top right;"){
div(style:"background: url(${view.HBoxView[0].PictureView[0].'@url'}) no-repeat top left;"){
h2(style:"background: url(${view.HBoxView[0].PictureView[1].'@url'}) repeat-x top left;" , view.VBoxView?.'**'.find{it.name() == "TextView" }.text().trim())
}
}
def border = view.parent().parent().View.VBoxView[0]?.'**'.findAll{ it.name() == "PictureView"}
div(class:"span-24 last sectionbody", style:"background: url(${border[0].'@url'}) top left;"){
//items
view.parent().parent()?.'**'.findAll{ it.name() == "HBoxView" && !it.GotoURL.isEmpty() && !it.GotoURL.PictureView.isEmpty()}.eachWithIndex{ item, i-> //HBoxView
div(class:"span-8 ${(i+1) % 3 == 0 ? 'last' : ''} course"){
a(href:"index.groovy?handle=${item.GotoURL.'@url'}"){ //GotoURL
img(src:item.GotoURL.PictureView.'@url',alt:item.GotoURL.'@draggingName') //PictureView
}
div{ //VBoxView
a(href:"index.groovy?handle=${item.VBoxView.GotoURL.'@url'}",item.VBoxView.GotoURL.'@draggingName') //GotoURL
p{
item.VBoxView.TextView.each{ tv ->
mkp.yield tv.text().trim()
br()
}
}
}
}
}
}
}
}
if(reflect){
div(class:"span-24 groups"){
def groups = xml.'**'.findAll{ it.name() == "GotoURL" && !it.PictureView.isEmpty()}.each{ group ->
def imgs = group.children()?.'**'.grep{it.'@url' !=""}.'@url'*.text()
def color = group?.'**'.find{it.'@color' !=""}?.'@color'.text();
div(style:"background: url(${imgs[2]}) no-repeat top right;"){
div(style:"background: url(${imgs[1]}) no-repeat top left;"){
a(style:"background: url(${imgs[0]}) repeat-x top left;color:#${color};",
href:"?handle=${group.'@url'}",group.toString().trim())
}
}
}
}
if(xml.'*'.find{it.name() == "TrackList"}.size()>0){
div(class:"span-24 last tracklist"){
table(cellspacing:"1", class:"tablesorter"){
thead{
tr{
th ""
th "Name"
th "Time"
th "Artist"
th "Release Date"
th ""
}
}
tbody{
def plist = Plist.fromXml(getXml(xml.TrackList.plist))
plist.items.eachWithIndex{ track, i ->
/* debug list all keys
ul{
track.each{ key,value->
li("${key}: ${value}")
}
}*/
int seconds = (track["duration"] /1000)
int minutes = seconds % 3600
int hours = (seconds - minutes) / 3600
seconds = minutes % 60
minutes = (minutes - seconds) / 60
tr(class:i % 2 == 0 ? "even" : "odd"){
td track["rank"]
td track["songName"]
td ((hours > 0 ? String.format("%02d",hours) + ":" : "")+ String.format("%02d",minutes) + ":" + String.format("%02d",seconds))
td track["artistName"]
td track["releaseDate"][0..9]
td{
a(href:"proxy.groovy?url=" + track["previewURL"],rel:"lightbox[set 480 380]",title:track["songName"], "view")
mkp.yieldUnescaped(" ")
a(href:"proxy.groovy?url=" + track["previewURL"],title:track["songName"], "download")
}
}
}
}
}
}
}
}
/*
div(class:"span-24 last debug"){
xml.'**'.findAll{ it.name() == "TextView"}.each{ item ->
p(item.text().trim())
}
xml.'**'.findAll{ it.name() == "PictureView"}.each{ item ->
a(href:""){
img(src:item.'@url')
}
}
xml.'**'.findAll{ it.name() == "GotoURL"}.each{ item ->
a(href:"index.groovy?handle=${item.'@url'}",item.'@draggingName')
}
} //debug
*/
} //container
} //body
}
\ No newline at end of file
diff --git a/WebContent/WEB-INF/groovy/proxy.groovy b/WebContent/WEB-INF/groovy/proxy.groovy
new file mode 100644
index 0000000..1ceff0a
--- /dev/null
+++ b/WebContent/WEB-INF/groovy/proxy.groovy
@@ -0,0 +1,13 @@
+if(request.getParameter("url")){
+ def url = request.getParameter("url")
+ def conn = "http://deimos.apple.com/WebObjects/Core.woa/DownloadRedirectedTrackPreview/unil.ch.2244181544.02244181550.2374720214.m4v".toURL().openConnection()
+ conn.setRequestProperty ( "User-Agent", "iTunes/8.1" )
+ conn.getHeaderFields()
+ response.sendRedirect( ( conn.getURL() =~ /http:\/\/deimos3.apple.com\/DeliverPreview/).replaceFirst("http:/") )
+} else {
+ println "please provide an url parameter"
+}
+
+
+
+
diff --git a/build/classes/xmlwise/Plist$ElementType.class b/build/classes/xmlwise/Plist$ElementType.class
new file mode 100644
index 0000000..e959f5b
Binary files /dev/null and b/build/classes/xmlwise/Plist$ElementType.class differ
diff --git a/build/classes/xmlwise/Plist.class b/build/classes/xmlwise/Plist.class
new file mode 100644
index 0000000..2b8dac9
Binary files /dev/null and b/build/classes/xmlwise/Plist.class differ
diff --git a/build/classes/xmlwise/XmlElement.class b/build/classes/xmlwise/XmlElement.class
new file mode 100644
index 0000000..00a6302
Binary files /dev/null and b/build/classes/xmlwise/XmlElement.class differ
diff --git a/build/classes/xmlwise/XmlElementAttributes.class b/build/classes/xmlwise/XmlElementAttributes.class
new file mode 100644
index 0000000..aa70e03
Binary files /dev/null and b/build/classes/xmlwise/XmlElementAttributes.class differ
diff --git a/build/classes/xmlwise/XmlParseException.class b/build/classes/xmlwise/XmlParseException.class
new file mode 100644
index 0000000..ce70e6f
Binary files /dev/null and b/build/classes/xmlwise/XmlParseException.class differ
diff --git a/build/classes/xmlwise/Xmlwise.class b/build/classes/xmlwise/Xmlwise.class
new file mode 100644
index 0000000..9f54b75
Binary files /dev/null and b/build/classes/xmlwise/Xmlwise.class differ
|
bfritscher/www-itunesu
|
b6ebc102d64918c5faa5be5fde47f92b02a567de
|
some comments
|
diff --git a/WebContent/WEB-INF/groovy/index.groovy b/WebContent/WEB-INF/groovy/index.groovy
index f845e35..6325beb 100644
--- a/WebContent/WEB-INF/groovy/index.groovy
+++ b/WebContent/WEB-INF/groovy/index.groovy
@@ -1,32 +1,32 @@
-import xmlwise.*
import groovy.xml.StreamingMarkupBuilder
-
def handle = "http://deimos.apple.com/WebObjects/Core.woa/Browse/unil.ch"
if(request.getParameter("handle")){
handle = request.getParameter("handle")
}
+/**
* Browsing iTunesU without installing iTunes
* iTunesU xml to html - proxy application
*
* Proof of concept - free to use, modify and share
*
* Boris Fritscher boris.fritscher@unil.ch
*/
import xmlwise.*
import groovy.xml.StreamingMarkupBuilder
+
def handle = "http://deimos.apple.com/WebObjects/Core.woa/Browse/unil.ch"
if(request.getParameter("handle")){
handle = request.getParameter("handle")
}
/** fix namespace when outputing xml from MarkupBuilder */
def getXml(item){
def outputBuilder = new StreamingMarkupBuilder()
outputBuilder.encoding = "UTF-8"
String result = outputBuilder.bind{
mkp.declareNamespace("":"http://www.apple.com/itms/")
mkp.yield item }
}
def xml
def conn = new URL(handle).openConnection()
conn.setRequestProperty ( "User-Agent", "iTunes/8.1" )
def putBackTogether = new StringBuffer()
def r = new InputStreamReader ( conn.getInputStream(), "UTF-8" )
char [ ] cb = new char [ 2048 ]
int amtRead = r.read ( cb )
while ( amtRead > 0 ) {
putBackTogether.append ( cb, 0, amtRead )
amtRead = r.read ( cb )
}
xml = putBackTogether.toString()
-
xml = new XmlSlurper().parseText(xml)
def topimg = xml.'**'.find{ it.name() == "PictureView"}
def reflect = topimg?.'@reflection'==1 //true = course page
def titleFontStyle = xml.'**'.find{it.name() == "FontStyle" && it.'@name' == "normalTitleFontStyle"}?.'@color'
if(titleFontStyle == null){
titleFontStyle = xml.'**'.find{it.name() == "FontStyle" && it.'@name' == "outlineTitleFontStyle"}?.'@color'
}
def textFontStyle = xml.'**'.find{it.name() == "FontStyle" && it.'@name' == "normalTextFontStyle"}?.'@color'
if(textFontStyle == null){
textFontStyle = xml.'**'.find{it.name() == "FontStyle" && it.'@name' == "outlineTextFontStyle"}?.'@color'
}
+
xml = new XmlSlurper().parseText(xml)
/**
* find first image and based on it decided which page type
* we are on. If it has a reflection attribute we are on a
* course page (track listing).
*/
def topimg = xml.'**'.find{ it.name() == "PictureView"}
def reflect = topimg?.'@reflection'==1 //true = course page
/**
* get font colors
*/
def titleFontStyle = xml.'**'.find{it.name() == "FontStyle" && it.'@name' == "normalTitleFontStyle"}?.'@color'
if(titleFontStyle == null){
titleFontStyle = xml.'**'.find{it.name() == "FontStyle" && it.'@name' == "outlineTitleFontStyle"}?.'@color'
}
def textFontStyle = xml.'**'.find{it.name() == "FontStyle" && it.'@name' == "normalTextFontStyle"}?.'@color'
if(textFontStyle == null){
textFontStyle = xml.'**'.find{it.name() == "FontStyle" && it.'@name' == "outlineTextFontStyle"}?.'@color'
}
/**
* header
*/
println """<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">"""
html.html(xmlns:"http://www.w3.org/1999/xhtml",lang:"en",'xml:lang':"en") {
head {
title xml.Path.PathElement.collect{it.'@displayName'}.join(" > ")
meta('http-equiv':"X-UA-Compatible", content:"IE=8")
meta('http-equiv':"content-type",content:"application/xhtml+xml; charset=UTF-8")
link(rel:"stylesheet", href:"css/blueprint/screen.css", type:"text/css", media:"screen, projection")
link(rel:"stylesheet", href:"css/blueprint/print.css", type:"text/css", media:"print")
println "<!--[if IE]>"
link(rel:"stylesheet", href:"css/blueprint/ie.css", type:"text/css", media:"screen, projection")
println "<![endif]-->"
link(rel:"stylesheet", href:"css/tablesorter/style.css", type:"text/css")
link(rel:"stylesheet", href:"css/main.css", type:"text/css")
link(rel:"shortcut icon", href:"favicon.ico", type:"image/x-icon")
script(type:"text/javascript", src:"js/jquery-1.3.2.min.js","")
script(type:"text/javascript", src:"js/reflection.js","")
script(type:"text/javascript", src:"js/jquery.tablesorter.min.js","")
script(type:"text/javascript", src:"js/main.js","")
if(reflect){
script(type:"text/javascript", src:"js/mootools-1.2.1-core-jm.js","")
script(type:"text/javascript", src:"js/mediaboxAdv99f.js","")
link(rel:"stylesheet", href:"css/mediaboxAdvBlack.css", type:"text/css")
}
style(type:"text/css","""
.body, p, li, .section a, .linkbox a{
color: #${textFontStyle}
}
h1, h2, h3{
color: #${titleFontStyle}
}
""")
- }
- body(style:"background: #${xml.'*'.find{ it.'@backColor' != ''}.'@backColor'}"){
div(class:"container"){
div(class:"span-24 last nav"){
def list = xml.Path.PathElement
def last = list.size()-1
list.eachWithIndex{ pe,i ->
if(i == 0){
a(class:"first",href:"http://www.unil.ch/"){
span(){
mkp.yieldUnescaped " "
}
}
}else{
a(class:"${i == last ? 'last' : ''}",href:"index.groovy?handle=${pe.text().trim()}", pe.'@displayName')
}
}
}
div(class:"span-24 last header", style:"${reflect ? '' : 'background: url('+topimg?.'@url'+') no-repeat top left'};min-height:${topimg.'@height'}px;"){
div(class:"span-16 course-detail"){
//COURSE PAGE
if(reflect){ //only if displaying a course page
def topurl = xml.'**'.find{it.name() == "GotoURL"}
def content = topurl?.parent()?.'**'.findAll{it.name() == "TextView"}.collect{it.toString().trim()}
h1 content[0]
div(class:"span-5", style:"height:${Math.round(1.25 * Integer.parseInt(topimg.'@height'.toString()))}px;"){
img(src:topimg.'@url',width:topimg.'@width', height:topimg.'@height', class:"reflect")
}
def descriptionIndex = content.indexOf("DESCRIPTION")
descriptionIndex = descriptionIndex == null ? 3 : descriptionIndex
content[1..descriptionIndex-1].each{ text ->
p text
}
//a(href:"${topurl.'@url'}","Open in iTunes")
xml.'**'.find{it.name() == "GotoURL" && it.PictureButtonView?.'@alt'=="Subscribe"}.each{ subscribe ->
//xml
p{
a(href:"${subscribe.'@draggingURL'}"){
img(src:"img/rss-podcast.png")
}
br()
a(href:"http://subscribe.getmiro.com/?url1=${subscribe.'@draggingURL'}",
title:"Miro: Internet TV"){
img(src:"http://subscribe.getmiro.com/img/buttons/patrace1.png",alt:"Miro Video Player")
}
br()
a(href:"${topurl.'@url'}",class:"subscribe"){
img(src:"img/logo_itunes_badge.gif")
}
}
}
if(content.size()>descriptionIndex){
h2(content[descriptionIndex].toString().trim())
content[descriptionIndex+1..content.size()-1].each{ text ->
p text.toString().trim()
}
}
}else{
mkp.yieldUnescaped " "
}
}
//RIGHTBOX
div(class:"span-8 last rightbox"){
div(class:"description"){
xml.ScrollView.View.MatrixView.View?.'**'.find{
it?.name()== "VBoxView" && it?.parent()?.name()== "VBoxView" && it?.parent()?.parent()?.name()== "VBoxView" && it?.parent()?.parent()?.parent()?.name()== "VBoxView"
}?.'*'.findAll{ it?.name() == "TextView"}.each{ text ->
p text
}
mkp.yieldUnescaped " "
}
def linkbox = xml.'**'.findAll{it.name() == "VBoxView" && it?.FontStyle.size() == 2 }[reflect? 1 : 0]?.parent()?.parent() //move over recommand if on course page
if(linkbox != null){
div(class:"linkbox",style:"background: url(${linkbox.parent()?.'**'.find{it.name() == 'PictureView'}.'@url'}) top left"){
linkbox?.'**'.findAll{it.name() == "VBoxView" && it?.FontStyle.size() == 2 }.each{ cat ->
h3(style:"color: #${cat.FontStyle[0].'@color'};border: 1px solid #${cat.View[0].Test[0].View.'@borderColor'}", cat?.'**'.find{it.name() == "TextView"}.toString().trim())
ul{
def els = cat?.'**'.findAll{it.name() == "OpenURL"}
if (els.size()==0){
els = cat.parent()?.'**'.findAll{it.name() == "OpenURL"}
}
els.each{ url ->
li{
def urlstring = url.'@url'
def matcher = ( urlstring =~ /^itms(.+)/ )
if(matcher.count > 0){
urlstring = "index.groovy?handle=http${matcher[0][1]}"
}
a(href:urlstring,url.'@draggingName')
}
}
}
}
}
}
}
}//header
//sections
xml.'**'.findAll{it.name() == "View" && !it.HBoxView.isEmpty() && !it.HBoxView.PictureView.isEmpty() }.each{ view ->
div(class:"span-24 last section"){
div(class:"sectionhead",style:"background: url(${view.HBoxView[0].PictureView[2].'@url'}) no-repeat top right;"){
div(style:"background: url(${view.HBoxView[0].PictureView[0].'@url'}) no-repeat top left;"){
h2(style:"background: url(${view.HBoxView[0].PictureView[1].'@url'}) repeat-x top left;" , view.VBoxView?.'**'.find{it.name() == "TextView" }.text().trim())
}
}
def border = view.parent().parent().View.VBoxView[0]?.'**'.findAll{ it.name() == "PictureView"}
div(class:"span-24 last sectionbody", style:"background: url(${border[0].'@url'}) top left;"){
//items
view.parent().parent()?.'**'.findAll{ it.name() == "HBoxView" && !it.GotoURL.isEmpty() && !it.GotoURL.PictureView.isEmpty()}.eachWithIndex{ item, i-> //HBoxView
div(class:"span-8 ${(i+1) % 3 == 0 ? 'last' : ''} course"){
a(href:"index.groovy?handle=${item.GotoURL.'@url'}"){ //GotoURL
img(src:item.GotoURL.PictureView.'@url',alt:item.GotoURL.'@draggingName') //PictureView
}
div{ //VBoxView
a(href:"index.groovy?handle=${item.VBoxView.GotoURL.'@url'}",item.VBoxView.GotoURL.'@draggingName') //GotoURL
p{
item.VBoxView.TextView.each{ tv ->
mkp.yield tv.text().trim()
br()
}
}
}
}
}
}
}
}
if(reflect){
div(class:"span-24 groups"){
def groups = xml.'**'.findAll{ it.name() == "GotoURL" && !it.PictureView.isEmpty()}.each{ group ->
def imgs = group.children()?.'**'.grep{it.'@url' !=""}.'@url'*.text()
def color = group?.'**'.find{it.'@color' !=""}?.'@color'.text();
div(style:"background: url(${imgs[2]}) no-repeat top right;"){
div(style:"background: url(${imgs[1]}) no-repeat top left;"){
a(style:"background: url(${imgs[0]}) repeat-x top left;color:#${color};",
href:"?handle=${group.'@url'}",group.toString().trim())
}
}
}
}
if(xml.'*'.find{it.name() == "TrackList"}.size()>0){
div(class:"span-24 last tracklist"){
table(cellspacing:"1", class:"tablesorter"){
thead{
tr{
th ""
th "Name"
th "Time"
th "Artist"
th "Release Date"
th ""
}
}
tbody{
def plist = Plist.fromXml(getXml(xml.TrackList.plist))
plist.items.eachWithIndex{ track, i ->
/* debug list all keys
ul{
track.each{ key,value->
li("${key}: ${value}")
}
}*/
int seconds = (track["duration"] /1000)
int minutes = seconds % 3600
int hours = (seconds - minutes) / 3600
seconds = minutes % 60
minutes = (minutes - seconds) / 60
tr(class:i % 2 == 0 ? "even" : "odd"){
td track["rank"]
td track["songName"]
td ((hours > 0 ? String.format("%02d",hours) + ":" : "")+ String.format("%02d",minutes) + ":" + String.format("%02d",seconds))
td track["artistName"]
td track["releaseDate"][0..9]
td{
a(href:track["previewURL"],rel:"lightbox[set 480 380]",title:track["songName"], "view")
mkp.yieldUnescaped(" ")
a(href:track["previewURL"],title:track["songName"], "download")
}
}
}
}
}
}
}
}
/*
div(class:"span-24 last debug"){
xml.'**'.findAll{ it.name() == "TextView"}.each{ item ->
p(item.text().trim())
}
xml.'**'.findAll{ it.name() == "PictureView"}.each{ item ->
a(href:""){
img(src:item.'@url')
}
}
xml.'**'.findAll{ it.name() == "GotoURL"}.each{ item ->
a(href:"index.groovy?handle=${item.'@url'}",item.'@draggingName')
}
} //debug
*/
} //container
+ }
/**
* Body
*/
+ body(style:"background: #${xml.'*'.find{ it.'@backColor' != ''}.'@backColor'}"){
div(class:"container"){
div(class:"span-24 last nav"){
def list = xml.Path.PathElement
def last = list.size()-1
list.eachWithIndex{ pe,i ->
if(i == 0){
a(class:"first",href:"index.groovy?handle=${pe.text().trim()}"){
span(){
mkp.yieldUnescaped " "
}
}
}else{
a(class:"${i == last ? 'last' : ''}",href:"index.groovy?handle=${pe.text().trim()}", pe.'@displayName')
}
}
}
div(class:"span-24 last header", style:"${reflect ? '' : 'background: url('+topimg?.'@url'+') no-repeat top left'};min-height:${topimg.'@height'}px;"){
div(class:"span-16 course-detail"){
//COURSE PAGE
if(reflect){ //only if displaying a course page
def topurl = xml.'**'.find{it.name() == "GotoURL"}
def content = topurl?.parent()?.'**'.findAll{it.name() == "TextView"}.collect{it.toString().trim()}
h1 content[0]
div(class:"span-5", style:"height:${Math.round(1.25 * Integer.parseInt(topimg.'@height'.toString()))}px;"){
img(src:topimg.'@url',width:topimg.'@width', height:topimg.'@height', class:"reflect")
}
def descriptionIndex = content.indexOf("DESCRIPTION")
descriptionIndex = descriptionIndex == null ? 3 : descriptionIndex
content[1..descriptionIndex-1].each{ text ->
p text
}
//a(href:"${topurl.'@url'}","Open in iTunes")
xml.'**'.find{it.name() == "GotoURL" && it.PictureButtonView?.'@alt'=="Subscribe"}.each{ subscribe ->
//xml
p{
a(href:"${subscribe.'@draggingURL'}"){
img(src:"img/rss-podcast.png")
}
br()
a(href:"http://subscribe.getmiro.com/?url1=${subscribe.'@draggingURL'}",
title:"Miro: Internet TV"){
img(src:"http://subscribe.getmiro.com/img/buttons/patrace1.png",alt:"Miro Video Player")
}
br()
a(href:"${topurl.'@url'}",class:"subscribe"){
img(src:"img/logo_itunes_badge.gif")
}
}
}
if(content.size()>descriptionIndex){
h2(content[descriptionIndex].toString().trim())
content[descriptionIndex+1..content.size()-1].each{ text ->
p text.toString().trim()
}
}
}else{
mkp.yieldUnescaped " "
}
}
//RIGHTBOX
div(class:"span-8 last rightbox"){
div(class:"description"){
xml.ScrollView.View.MatrixView.View?.'**'.find{
it?.name()== "VBoxView" && it?.parent()?.name()== "VBoxView" && it?.parent()?.parent()?.name()== "VBoxView" && it?.parent()?.parent()?.parent()?.name()== "VBoxView"
}?.'*'.findAll{ it?.name() == "TextView"}.each{ text ->
p text
}
mkp.yieldUnescaped " "
}
def linkbox = xml.'**'.findAll{it.name() == "VBoxView" && it?.FontStyle.size() == 2 }[reflect? 1 : 0]?.parent()?.parent() //move over recommand if on course page
if(linkbox != null){
div(class:"linkbox",style:"background: url(${linkbox.parent()?.'**'.find{it.name() == 'PictureView'}.'@url'}) top left"){
linkbox?.'**'.findAll{it.name() == "VBoxView" && it?.FontStyle.size() == 2 }.each{ cat ->
h3(style:"color: #${cat.FontStyle[0].'@color'};border: 1px solid #${cat.View[0].Test[0].View.'@borderColor'}", cat?.'**'.find{it.name() == "TextView"}.toString().trim())
ul{
def els = cat?.'**'.findAll{it.name() == "OpenURL"}
if (els.size()==0){
els = cat.parent()?.'**'.findAll{it.name() == "OpenURL"}
}
els.each{ url ->
li{
def urlstring = url.'@url'
def matcher = ( urlstring =~ /^itms(.+)/ )
if(matcher.count > 0){
urlstring = "index.groovy?handle=http${matcher[0][1]}"
}
a(href:urlstring,url.'@draggingName')
}
}
}
}
}
}
}
}//header
//sections
xml.'**'.findAll{it.name() == "View" && !it.HBoxView.isEmpty() && !it.HBoxView.PictureView.isEmpty() }.each{ view ->
div(class:"span-24 last section"){
div(class:"sectionhead",style:"background: url(${view.HBoxView[0].PictureView[2].'@url'}) no-repeat top right;"){
div(style:"background: url(${view.HBoxView[0].PictureView[0].'@url'}) no-repeat top left;"){
h2(style:"background: url(${view.HBoxView[0].PictureView[1].'@url'}) repeat-x top left;" , view.VBoxView?.'**'.find{it.name() == "TextView" }.text().trim())
}
}
def border = view.parent().parent().View.VBoxView[0]?.'**'.findAll{ it.name() == "PictureView"}
div(class:"span-24 last sectionbody", style:"background: url(${border[0].'@url'}) top left;"){
//items
view.parent().parent()?.'**'.findAll{ it.name() == "HBoxView" && !it.GotoURL.isEmpty() && !it.GotoURL.PictureView.isEmpty()}.eachWithIndex{ item, i-> //HBoxView
div(class:"span-8 ${(i+1) % 3 == 0 ? 'last' : ''} course"){
a(href:"index.groovy?handle=${item.GotoURL.'@url'}"){ //GotoURL
img(src:item.GotoURL.PictureView.'@url',alt:item.GotoURL.'@draggingName') //PictureView
}
div{ //VBoxView
a(href:"index.groovy?handle=${item.VBoxView.GotoURL.'@url'}",item.VBoxView.GotoURL.'@draggingName') //GotoURL
p{
item.VBoxView.TextView.each{ tv ->
mkp.yield tv.text().trim()
br()
}
}
}
}
}
}
}
}
if(reflect){
div(class:"span-24 groups"){
def groups = xml.'**'.findAll{ it.name() == "GotoURL" && !it.PictureView.isEmpty()}.each{ group ->
def imgs = group.children()?.'**'.grep{it.'@url' !=""}.'@url'*.text()
def color = group?.'**'.find{it.'@color' !=""}?.'@color'.text();
div(style:"background: url(${imgs[2]}) no-repeat top right;"){
div(style:"background: url(${imgs[1]}) no-repeat top left;"){
a(style:"background: url(${imgs[0]}) repeat-x top left;color:#${color};",
href:"?handle=${group.'@url'}",group.toString().trim())
}
}
}
}
if(xml.'*'.find{it.name() == "TrackList"}.size()>0){
div(class:"span-24 last tracklist"){
table(cellspacing:"1", class:"tablesorter"){
thead{
tr{
th ""
th "Name"
th "Time"
th "Artist"
th "Release Date"
th ""
}
}
tbody{
def plist = Plist.fromXml(getXml(xml.TrackList.plist))
plist.items.eachWithIndex{ track, i ->
/* debug list all keys
ul{
track.each{ key,value->
li("${key}: ${value}")
}
}*/
int seconds = (track["duration"] /1000)
int minutes = seconds % 3600
int hours = (seconds - minutes) / 3600
seconds = minutes % 60
minutes = (minutes - seconds) / 60
tr(class:i % 2 == 0 ? "even" : "odd"){
td track["rank"]
td track["songName"]
td ((hours > 0 ? String.format("%02d",hours) + ":" : "")+ String.format("%02d",minutes) + ":" + String.format("%02d",seconds))
td track["artistName"]
td track["releaseDate"][0..9]
td{
a(href:track["previewURL"],rel:"lightbox[set 480 380]",title:track["songName"], "view")
mkp.yieldUnescaped(" ")
a(href:track["previewURL"],title:track["songName"], "download")
}
}
}
}
}
}
}
}
/*
div(class:"span-24 last debug"){
xml.'**'.findAll{ it.name() == "TextView"}.each{ item ->
p(item.text().trim())
}
xml.'**'.findAll{ it.name() == "PictureView"}.each{ item ->
a(href:""){
img(src:item.'@url')
}
}
xml.'**'.findAll{ it.name() == "GotoURL"}.each{ item ->
a(href:"index.groovy?handle=${item.'@url'}",item.'@draggingName')
}
} //debug
*/
} //container
} //body
}
\ No newline at end of file
|
bfritscher/www-itunesu
|
6c593a6f1cf446aad74253680e5df646a339a1e2
|
cleanup fixes for some paths
|
diff --git a/WebContent/WEB-INF/groovy/index.groovy b/WebContent/WEB-INF/groovy/index.groovy
index 3e06db6..f845e35 100644
--- a/WebContent/WEB-INF/groovy/index.groovy
+++ b/WebContent/WEB-INF/groovy/index.groovy
@@ -1,32 +1,32 @@
import xmlwise.*
import groovy.xml.StreamingMarkupBuilder
def handle = "http://deimos.apple.com/WebObjects/Core.woa/Browse/unil.ch"
if(request.getParameter("handle")){
handle = request.getParameter("handle")
}
def getXml(item){
def outputBuilder = new StreamingMarkupBuilder()
outputBuilder.encoding = "UTF-8"
String result = outputBuilder.bind{
mkp.declareNamespace("":"http://www.apple.com/itms/")
mkp.yield item }
}
def xml
def conn = new URL(handle).openConnection()
conn.setRequestProperty ( "User-Agent", "iTunes/8.1" )
def putBackTogether = new StringBuffer()
def r = new InputStreamReader ( conn.getInputStream(), "UTF-8" )
char [ ] cb = new char [ 2048 ]
int amtRead = r.read ( cb )
while ( amtRead > 0 ) {
putBackTogether.append ( cb, 0, amtRead )
amtRead = r.read ( cb )
}
xml = putBackTogether.toString()
xml = new XmlSlurper().parseText(xml)
def topimg = xml.'**'.find{ it.name() == "PictureView"}
def reflect = topimg?.'@reflection'==1 //true = course page
def titleFontStyle = xml.'**'.find{it.name() == "FontStyle" && it.'@name' == "normalTitleFontStyle"}?.'@color'
if(titleFontStyle == null){
titleFontStyle = xml.'**'.find{it.name() == "FontStyle" && it.'@name' == "outlineTitleFontStyle"}?.'@color'
}
def textFontStyle = xml.'**'.find{it.name() == "FontStyle" && it.'@name' == "normalTextFontStyle"}?.'@color'
if(textFontStyle == null){
textFontStyle = xml.'**'.find{it.name() == "FontStyle" && it.'@name' == "outlineTextFontStyle"}?.'@color'
}
println """<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">"""
html.html(xmlns:"http://www.w3.org/1999/xhtml",lang:"en",'xml:lang':"en") {
head {
title xml.Path.PathElement.collect{it.'@displayName'}.join(" > ")
meta('http-equiv':"X-UA-Compatible", content:"IE=8")
- meta('http-equiv':"content-type",content:"application/xhtml+xml; charset=UTF-8")
link(rel:"stylesheet", href:"css/blueprint/screen.css", type:"text/css", media:"screen, projection")
link(rel:"stylesheet", href:"css/blueprint/print.css", type:"text/css", media:"print")
println "<!--[if IE]>"
link(rel:"stylesheet", href:"css/blueprint/ie.css", type:"text/css", media:"screen, projection")
println "<![endif]-->"
link(rel:"stylesheet", href:"css/smoothness/jquery-ui-1.7.1.custom.css", type:"text/css")
link(rel:"stylesheet", href:"css/tablesorter/style.css", type:"text/css")
link(rel:"stylesheet", href:"css/main.css", type:"text/css")
link(rel:"shortcut icon", href:"favicon.ico", type:"image/x-icon")
script(type:"text/javascript", src:"js/jquery-1.3.2.min.js","")
script(type:"text/javascript", src:"js/jquery-ui-1.7.1.custom.min.js","")
script(type:"text/javascript", src:"js/reflection.js","")
script(type:"text/javascript", src:"js/jquery.tablesorter.min.js","")
script(type:"text/javascript", src:"js/main.js","")
if(reflect){
script(type:"text/javascript", src:"js/mootools-1.2.1-core-jm.js","")
script(type:"text/javascript", src:"js/mediaboxAdv99f.js","")
link(rel:"stylesheet", href:"css/mediaboxAdvBlack.css", type:"text/css")
}
style(type:"text/css","""
.body, p, li, .section a, .linkbox a{
color: #${textFontStyle}
}
h1, h2, h3{
color: #${titleFontStyle}
}
""")
+ meta('http-equiv':"content-type",content:"application/xhtml+xml; charset=UTF-8")
link(rel:"stylesheet", href:"css/blueprint/screen.css", type:"text/css", media:"screen, projection")
link(rel:"stylesheet", href:"css/blueprint/print.css", type:"text/css", media:"print")
println "<!--[if IE]>"
link(rel:"stylesheet", href:"css/blueprint/ie.css", type:"text/css", media:"screen, projection")
println "<![endif]-->"
link(rel:"stylesheet", href:"css/tablesorter/style.css", type:"text/css")
link(rel:"stylesheet", href:"css/main.css", type:"text/css")
link(rel:"shortcut icon", href:"favicon.ico", type:"image/x-icon")
script(type:"text/javascript", src:"js/jquery-1.3.2.min.js","")
script(type:"text/javascript", src:"js/reflection.js","")
script(type:"text/javascript", src:"js/jquery.tablesorter.min.js","")
script(type:"text/javascript", src:"js/main.js","")
if(reflect){
script(type:"text/javascript", src:"js/mootools-1.2.1-core-jm.js","")
script(type:"text/javascript", src:"js/mediaboxAdv99f.js","")
link(rel:"stylesheet", href:"css/mediaboxAdvBlack.css", type:"text/css")
}
style(type:"text/css","""
.body, p, li, .section a, .linkbox a{
color: #${textFontStyle}
}
h1, h2, h3{
color: #${titleFontStyle}
}
""")
}
- body(style:"background: #${xml.'*'.find{ it.'@backColor' != ''}.'@backColor'}"){
div(class:"container"){
div(class:"span-24 last nav"){
def list = xml.Path.PathElement
def last = list.size()-1
list.eachWithIndex{ pe,i ->
if(i == 0){
a(class:"first",href:"index.groovy?handle=${pe.text().trim()}"){
span(){
mkp.yieldUnescaped " "
}
}
}else{
a(class:"${i == last ? 'last' : ''}",href:"index.groovy?handle=${pe.text().trim()}", pe.'@displayName')
}
}
}
div(class:"span-24 last header", style:"${reflect ? '' : 'background: url('+topimg?.'@url'+') no-repeat top left'};min-height:${topimg.'@height'}px;"){
div(class:"span-16 course-detail"){
//COURSE PAGE
if(reflect){ //only if displaying a course page
def topurl = xml.'**'.find{it.name() == "GotoURL"}
def content = topurl?.parent()?.'**'.findAll{it.name() == "TextView"}.collect{it.toString().trim()}
h1 content[0]
div(class:"span-5", style:"height:${Math.round(1.25 * Integer.parseInt(topimg.'@height'.toString()))}px;"){
img(src:topimg.'@url',width:topimg.'@width', height:topimg.'@height', class:"reflect")
}
def descriptionIndex = content.indexOf("DESCRIPTION")
descriptionIndex = descriptionIndex == null ? 3 : descriptionIndex
content[1..descriptionIndex-1].each{ text ->
p text
}
//a(href:"${topurl.'@url'}","Open in iTunes")
xml.'**'.find{it.name() == "GotoURL" && it.PictureButtonView?.'@alt'=="Subscribe"}.each{ subscribe ->
//xml
p{
a(href:"${subscribe.'@draggingURL'}"){
img(src:"img/rss-podcast.png")
}
br()
a(href:"http://subscribe.getmiro.com/?url1=${subscribe.'@draggingURL'}",
title:"Miro: Internet TV"){
img(src:"http://subscribe.getmiro.com/img/buttons/patrace1.png",alt:"Miro Video Player")
}
br()
a(href:"${topurl.'@url'}",class:"subscribe"){
img(src:"img/logo_itunes_badge.gif")
}
}
}
if(content.size()>descriptionIndex){
h2(content[descriptionIndex].toString().trim())
content[descriptionIndex+1..content.size()-1].each{ text ->
p text.toString().trim()
}
}
}else{
mkp.yieldUnescaped " "
}
}
//RIGHTBOX
div(class:"span-8 last rightbox"){
div(class:"description"){
xml.ScrollView.View.MatrixView.View?.'**'.find{
it?.name()== "VBoxView" && it?.parent()?.name()== "VBoxView" && it?.parent()?.parent()?.name()== "VBoxView" && it?.parent()?.parent()?.parent()?.name()== "VBoxView"
}?.'*'.findAll{ it?.name() == "TextView"}.each{ text ->
p text
}
mkp.yieldUnescaped " "
}
def linkbox = xml.'**'.findAll{it.name() == "VBoxView" && it?.FontStyle.size() == 2 }[reflect? 1 : 0]?.parent()?.parent() //move over recommand if on course page
if(linkbox != null){
div(class:"linkbox",style:"background: url(${linkbox.parent()?.'**'.find{it.name() == 'PictureView'}.'@url'}) top left"){
linkbox?.'**'.findAll{it.name() == "VBoxView" && it?.FontStyle.size() == 2 }.each{ cat ->
h3(style:"color: #${cat.FontStyle[0].'@color'};border: 1px solid #${cat.View[0].Test[0].View.'@borderColor'}", cat?.'**'.find{it.name() == "TextView"}.toString().trim())
ul{
def els = cat?.'**'.findAll{it.name() == "OpenURL"}
if (els.size()==0){
els = cat.parent()?.'**'.findAll{it.name() == "OpenURL"}
}
els.each{ url ->
li{
def urlstring = url.'@url'
def matcher = ( urlstring =~ /^itms(.+)/ )
if(matcher.count > 0){
urlstring = "index.groovy?handle=http${matcher[0][1]}"
}
a(href:urlstring,url.'@draggingName')
}
}
}
}
}
}
}
}//header
//sections
xml.'**'.findAll{it.name() == "View" && !it.HBoxView.isEmpty() && !it.HBoxView.PictureView.isEmpty() }.each{ view ->
div(class:"span-24 last section"){
div(class:"sectionhead",style:"background: url(${view.HBoxView[0].PictureView[2].'@url'}) no-repeat top right;"){
div(style:"background: url(${view.HBoxView[0].PictureView[0].'@url'}) no-repeat top left;"){
h2(style:"background: url(${view.HBoxView[0].PictureView[1].'@url'}) repeat-x top left;" , view.VBoxView?.'**'.find{it.name() == "TextView" }.text().trim())
}
}
def border = view.parent().parent().View.VBoxView[0]?.'**'.findAll{ it.name() == "PictureView"}
div(class:"span-24 last sectionbody", style:"background: url(${border[0].'@url'}) top left;"){
//items
view.parent().parent()?.'**'.findAll{ it.name() == "HBoxView" && !it.GotoURL.isEmpty() && !it.GotoURL.PictureView.isEmpty()}.eachWithIndex{ item, i-> //HBoxView
div(class:"span-8 ${(i+1) % 3 == 0 ? 'last' : ''} course"){
a(href:"index.groovy?handle=${item.GotoURL.'@url'}"){ //GotoURL
img(src:item.GotoURL.PictureView.'@url',alt:item.GotoURL.'@draggingName') //PictureView
}
div{ //VBoxView
a(href:"index.groovy?handle=${item.VBoxView.GotoURL.'@url'}",item.VBoxView.GotoURL.'@draggingName') //GotoURL
p{
item.VBoxView.TextView.each{ tv ->
mkp.yield tv.text().trim()
br()
}
}
}
}
}
}
}
}
if(reflect){
div(class:"span-24 groups"){
def groups = xml.'**'.findAll{ it.name() == "GotoURL" && !it.PictureView.isEmpty()}.each{ group ->
def imgs = group.children()?.'**'.grep{it.'@url' !=""}.'@url'*.text()
def color = group?.'**'.find{it.'@color' !=""}?.'@color'.text();
div(style:"background: url(${imgs[2]}) no-repeat top right;"){
div(style:"background: url(${imgs[1]}) no-repeat top left;"){
a(style:"background: url(${imgs[0]}) repeat-x top left;color:#${color};",
href:"?handle=${group.'@url'}",group.toString().trim())
}
}
}
}
if(xml.'*'.find{it.name() == "TrackList"}.size()>0){
div(class:"span-24 last tracklist"){
table(cellspacing:"1", class:"tablesorter"){
thead{
tr{
th ""
th "Name"
th "Time"
th "Artist"
th "Release Date"
th ""
}
}
tbody{
def plist = Plist.fromXml(getXml(xml.TrackList.plist))
plist.items.eachWithIndex{ track, i ->
/* debug list all keys
ul{
track.each{ key,value->
li("${key}: ${value}")
}
}*/
int seconds = (track["duration"] /1000)
int minutes = seconds % 3600
int hours = (seconds - minutes) / 3600
seconds = minutes % 60
minutes = (minutes - seconds) / 60
tr(class:i % 2 == 0 ? "even" : "odd"){
td track["rank"]
td track["songName"]
td ((hours > 0 ? String.format("%02d",hours) + ":" : "")+ String.format("%02d",minutes) + ":" + String.format("%02d",seconds))
td track["artistName"]
td track["releaseDate"][0..9]
td{
a(href:track["previewURL"],rel:"lightbox[set 480 380]",title:track["songName"], "view")
mkp.yieldUnescaped(" ")
a(href:track["previewURL"],title:track["songName"], "download")
}
}
}
}
}
}
}
}
/*
div(class:"span-24 last debug"){
xml.'**'.findAll{ it.name() == "TextView"}.each{ item ->
p(item.text().trim())
}
xml.'**'.findAll{ it.name() == "PictureView"}.each{ item ->
a(href:""){
img(src:item.'@url')
}
}
xml.'**'.findAll{ it.name() == "GotoURL"}.each{ item ->
a(href:"index.groovy?handle=${item.'@url'}",item.'@draggingName')
}
} //debug
*/
} //container
+ body(style:"background: #${xml.'*'.find{ it.'@backColor' != ''}.'@backColor'}"){
div(class:"container"){
div(class:"span-24 last nav"){
def list = xml.Path.PathElement
def last = list.size()-1
list.eachWithIndex{ pe,i ->
if(i == 0){
a(class:"first",href:"http://www.unil.ch/"){
span(){
mkp.yieldUnescaped " "
}
}
}else{
a(class:"${i == last ? 'last' : ''}",href:"index.groovy?handle=${pe.text().trim()}", pe.'@displayName')
}
}
}
div(class:"span-24 last header", style:"${reflect ? '' : 'background: url('+topimg?.'@url'+') no-repeat top left'};min-height:${topimg.'@height'}px;"){
div(class:"span-16 course-detail"){
//COURSE PAGE
if(reflect){ //only if displaying a course page
def topurl = xml.'**'.find{it.name() == "GotoURL"}
def content = topurl?.parent()?.'**'.findAll{it.name() == "TextView"}.collect{it.toString().trim()}
h1 content[0]
div(class:"span-5", style:"height:${Math.round(1.25 * Integer.parseInt(topimg.'@height'.toString()))}px;"){
img(src:topimg.'@url',width:topimg.'@width', height:topimg.'@height', class:"reflect")
}
def descriptionIndex = content.indexOf("DESCRIPTION")
descriptionIndex = descriptionIndex == null ? 3 : descriptionIndex
content[1..descriptionIndex-1].each{ text ->
p text
}
//a(href:"${topurl.'@url'}","Open in iTunes")
xml.'**'.find{it.name() == "GotoURL" && it.PictureButtonView?.'@alt'=="Subscribe"}.each{ subscribe ->
//xml
p{
a(href:"${subscribe.'@draggingURL'}"){
img(src:"img/rss-podcast.png")
}
br()
a(href:"http://subscribe.getmiro.com/?url1=${subscribe.'@draggingURL'}",
title:"Miro: Internet TV"){
img(src:"http://subscribe.getmiro.com/img/buttons/patrace1.png",alt:"Miro Video Player")
}
br()
a(href:"${topurl.'@url'}",class:"subscribe"){
img(src:"img/logo_itunes_badge.gif")
}
}
}
if(content.size()>descriptionIndex){
h2(content[descriptionIndex].toString().trim())
content[descriptionIndex+1..content.size()-1].each{ text ->
p text.toString().trim()
}
}
}else{
mkp.yieldUnescaped " "
}
}
//RIGHTBOX
div(class:"span-8 last rightbox"){
div(class:"description"){
xml.ScrollView.View.MatrixView.View?.'**'.find{
it?.name()== "VBoxView" && it?.parent()?.name()== "VBoxView" && it?.parent()?.parent()?.name()== "VBoxView" && it?.parent()?.parent()?.parent()?.name()== "VBoxView"
}?.'*'.findAll{ it?.name() == "TextView"}.each{ text ->
p text
}
mkp.yieldUnescaped " "
}
def linkbox = xml.'**'.findAll{it.name() == "VBoxView" && it?.FontStyle.size() == 2 }[reflect? 1 : 0]?.parent()?.parent() //move over recommand if on course page
if(linkbox != null){
div(class:"linkbox",style:"background: url(${linkbox.parent()?.'**'.find{it.name() == 'PictureView'}.'@url'}) top left"){
linkbox?.'**'.findAll{it.name() == "VBoxView" && it?.FontStyle.size() == 2 }.each{ cat ->
h3(style:"color: #${cat.FontStyle[0].'@color'};border: 1px solid #${cat.View[0].Test[0].View.'@borderColor'}", cat?.'**'.find{it.name() == "TextView"}.toString().trim())
ul{
def els = cat?.'**'.findAll{it.name() == "OpenURL"}
if (els.size()==0){
els = cat.parent()?.'**'.findAll{it.name() == "OpenURL"}
}
els.each{ url ->
li{
def urlstring = url.'@url'
def matcher = ( urlstring =~ /^itms(.+)/ )
if(matcher.count > 0){
urlstring = "index.groovy?handle=http${matcher[0][1]}"
}
a(href:urlstring,url.'@draggingName')
}
}
}
}
}
}
}
}//header
//sections
xml.'**'.findAll{it.name() == "View" && !it.HBoxView.isEmpty() && !it.HBoxView.PictureView.isEmpty() }.each{ view ->
div(class:"span-24 last section"){
div(class:"sectionhead",style:"background: url(${view.HBoxView[0].PictureView[2].'@url'}) no-repeat top right;"){
div(style:"background: url(${view.HBoxView[0].PictureView[0].'@url'}) no-repeat top left;"){
h2(style:"background: url(${view.HBoxView[0].PictureView[1].'@url'}) repeat-x top left;" , view.VBoxView?.'**'.find{it.name() == "TextView" }.text().trim())
}
}
def border = view.parent().parent().View.VBoxView[0]?.'**'.findAll{ it.name() == "PictureView"}
div(class:"span-24 last sectionbody", style:"background: url(${border[0].'@url'}) top left;"){
//items
view.parent().parent()?.'**'.findAll{ it.name() == "HBoxView" && !it.GotoURL.isEmpty() && !it.GotoURL.PictureView.isEmpty()}.eachWithIndex{ item, i-> //HBoxView
div(class:"span-8 ${(i+1) % 3 == 0 ? 'last' : ''} course"){
a(href:"index.groovy?handle=${item.GotoURL.'@url'}"){ //GotoURL
img(src:item.GotoURL.PictureView.'@url',alt:item.GotoURL.'@draggingName') //PictureView
}
div{ //VBoxView
a(href:"index.groovy?handle=${item.VBoxView.GotoURL.'@url'}",item.VBoxView.GotoURL.'@draggingName') //GotoURL
p{
item.VBoxView.TextView.each{ tv ->
mkp.yield tv.text().trim()
br()
}
}
}
}
}
}
}
}
if(reflect){
div(class:"span-24 groups"){
def groups = xml.'**'.findAll{ it.name() == "GotoURL" && !it.PictureView.isEmpty()}.each{ group ->
def imgs = group.children()?.'**'.grep{it.'@url' !=""}.'@url'*.text()
def color = group?.'**'.find{it.'@color' !=""}?.'@color'.text();
div(style:"background: url(${imgs[2]}) no-repeat top right;"){
div(style:"background: url(${imgs[1]}) no-repeat top left;"){
a(style:"background: url(${imgs[0]}) repeat-x top left;color:#${color};",
href:"?handle=${group.'@url'}",group.toString().trim())
}
}
}
}
if(xml.'*'.find{it.name() == "TrackList"}.size()>0){
div(class:"span-24 last tracklist"){
table(cellspacing:"1", class:"tablesorter"){
thead{
tr{
th ""
th "Name"
th "Time"
th "Artist"
th "Release Date"
th ""
}
}
tbody{
def plist = Plist.fromXml(getXml(xml.TrackList.plist))
plist.items.eachWithIndex{ track, i ->
/* debug list all keys
ul{
track.each{ key,value->
li("${key}: ${value}")
}
}*/
int seconds = (track["duration"] /1000)
int minutes = seconds % 3600
int hours = (seconds - minutes) / 3600
seconds = minutes % 60
minutes = (minutes - seconds) / 60
tr(class:i % 2 == 0 ? "even" : "odd"){
td track["rank"]
td track["songName"]
td ((hours > 0 ? String.format("%02d",hours) + ":" : "")+ String.format("%02d",minutes) + ":" + String.format("%02d",seconds))
td track["artistName"]
td track["releaseDate"][0..9]
td{
a(href:track["previewURL"],rel:"lightbox[set 480 380]",title:track["songName"], "view")
mkp.yieldUnescaped(" ")
a(href:track["previewURL"],title:track["songName"], "download")
}
}
}
}
}
}
}
}
/*
div(class:"span-24 last debug"){
xml.'**'.findAll{ it.name() == "TextView"}.each{ item ->
p(item.text().trim())
}
xml.'**'.findAll{ it.name() == "PictureView"}.each{ item ->
a(href:""){
img(src:item.'@url')
}
}
xml.'**'.findAll{ it.name() == "GotoURL"}.each{ item ->
a(href:"index.groovy?handle=${item.'@url'}",item.'@draggingName')
}
} //debug
*/
} //container
} //body
}
\ No newline at end of file
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index 8159961..a1f3f91 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -1,16 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app id="itunesu" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
<display-name>itunesu</display-name>
<servlet>
<servlet-name>Groovlet</servlet-name>
<servlet-class>groovy.servlet.GroovyServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet-mapping>
<servlet-name>Groovlet</servlet-name>
<url-pattern>*.groovy</url-pattern>
</servlet-mapping>
<welcome-file-list>
<welcome-file>index.html</welcome-file>
+ <welcome-file>index.groovy</welcome-file>
</welcome-file-list>
</web-app>
diff --git a/WebContent/css/main.css b/WebContent/css/main.css
index 402bd37..9441dbc 100644
--- a/WebContent/css/main.css
+++ b/WebContent/css/main.css
@@ -1,118 +1,118 @@
ul{
list-style-type: none;
}
.nav{
border:solid 1px #dedede;
background:#fff;
height: 20px;
}
.nav a.first span{
display:block;
height: 16px;
width: 16px;
margin: 2px;
- background:url(img/IconHome.gif) no-repeat 0 0;
+ background:url(../img/IconHome.gif) no-repeat 0 0;
}
.nav a.first:hover span{
background-position: 0 -16px;
}
.nav a:hover{
text-decoration: underline;
}
.nav a, .nav a.first:hover{
text-decoration:none;
}
.nav a.last{
background: none;
}
.nav a{
display: block;
float: left;
- background: url(img/Chevron.gif) no-repeat 100% 0;
+ background: url(../img/Chevron.gif) no-repeat 100% 0;
padding-right: 20px;
margin-left: 10px;
line-height: 20px;
height: 20px
}
h1{
font-size:2.5em;
}
h2{
font-size:1.5em;
}
h3{
font-size:1em;
}
p{
margin-bottom: 0.5em;
font-size:0.9em;
}
.sectionhead h2{
margin: 0 9px 0 9px;
height: 20px;
font-size: 15px;
font-weight:bold;
}
.sectionbody{
padding-bottom: 5px;
-moz-border-radius-bottomleft: 5px;
-moz-border-radius-bottomright: 5px;
-webkit-border-radius-bottomleft: 5px;
-webkit-border-radius-bottomright: 5px;
}
.sectionbody img{
width: 60px;
height: 60px;
margin: 5px;
float: left;
border: 0;
}
.sectionbody a, .linkbox a{
font-weight: bold;
text-decoration: none;
}
.sectionbody a:hover, .linkbox a:hover{
text-decoration: underline;
}
div.section {
margin-bottom: 20px;
}
.course div{
padding-top: 5px;
}
.rightbox{
float:right;
}
.linkbox {
padding-top: 2px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
}
.linkbox h3{
margin: 5px;
padding: 5px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
}
.linkbox ul{
padding: 0 5px 5px 5px;
}
.course-detail h2{
clear:both;
}
.groups div{
min-width:50px;
float:left;
}
.groups a{
display:block;
height:18px;
margin: 0 5px 0 6px;
padding: 0 10px 0 10px;
text-decoration:none;
font-weight:bold
}
\ No newline at end of file
diff --git a/WebContent/index.html b/WebContent/index.html
deleted file mode 100644
index 06f75b1..0000000
--- a/WebContent/index.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>iTunesU without iTunes</title>
-<script type="text/javascript">
-<!--
-window.location = "http://itunesu.morphexchange.com/index.groovy"
-//-->
-</script>
-</head>
-<body>
-</body>
-</html>
\ No newline at end of file
diff --git a/WebContent/js/jquery-ui-1.7.1.custom.min.js b/WebContent/js/jquery-ui-1.7.1.custom.min.js
deleted file mode 100644
index 11e49a0..0000000
--- a/WebContent/js/jquery-ui-1.7.1.custom.min.js
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- * jQuery UI 1.7.1
- *
- * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI
- */
jQuery.ui||(function(c){var i=c.fn.remove,d=c.browser.mozilla&&(parseFloat(c.browser.version)<1.9);c.ui={version:"1.7.1",plugin:{add:function(k,l,n){var m=c.ui[k].prototype;for(var j in n){m.plugins[j]=m.plugins[j]||[];m.plugins[j].push([l,n[j]])}},call:function(j,l,k){var n=j.plugins[l];if(!n||!j.element[0].parentNode){return}for(var m=0;m<n.length;m++){if(j.options[n[m][0]]){n[m][1].apply(j.element,k)}}}},contains:function(k,j){return document.compareDocumentPosition?k.compareDocumentPosition(j)&16:k!==j&&k.contains(j)},hasScroll:function(m,k){if(c(m).css("overflow")=="hidden"){return false}var j=(k&&k=="left")?"scrollLeft":"scrollTop",l=false;if(m[j]>0){return true}m[j]=1;l=(m[j]>0);m[j]=0;return l},isOverAxis:function(k,j,l){return(k>j)&&(k<(j+l))},isOver:function(o,k,n,m,j,l){return c.ui.isOverAxis(o,n,j)&&c.ui.isOverAxis(k,m,l)},keyCode:{BACKSPACE:8,CAPS_LOCK:20,COMMA:188,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38}};if(d){var f=c.attr,e=c.fn.removeAttr,h="http://www.w3.org/2005/07/aaa",a=/^aria-/,b=/^wairole:/;c.attr=function(k,j,l){var m=l!==undefined;return(j=="role"?(m?f.call(this,k,j,"wairole:"+l):(f.apply(this,arguments)||"").replace(b,"")):(a.test(j)?(m?k.setAttributeNS(h,j.replace(a,"aaa:"),l):f.call(this,k,j.replace(a,"aaa:"))):f.apply(this,arguments)))};c.fn.removeAttr=function(j){return(a.test(j)?this.each(function(){this.removeAttributeNS(h,j.replace(a,""))}):e.call(this,j))}}c.fn.extend({remove:function(){c("*",this).add(this).each(function(){c(this).triggerHandler("remove")});return i.apply(this,arguments)},enableSelection:function(){return this.attr("unselectable","off").css("MozUserSelect","").unbind("selectstart.ui")},disableSelection:function(){return this.attr("unselectable","on").css("MozUserSelect","none").bind("selectstart.ui",function(){return false})},scrollParent:function(){var j;if((c.browser.msie&&(/(static|relative)/).test(this.css("position")))||(/absolute/).test(this.css("position"))){j=this.parents().filter(function(){return(/(relative|absolute|fixed)/).test(c.curCSS(this,"position",1))&&(/(auto|scroll)/).test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0)}else{j=this.parents().filter(function(){return(/(auto|scroll)/).test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0)}return(/fixed/).test(this.css("position"))||!j.length?c(document):j}});c.extend(c.expr[":"],{data:function(l,k,j){return !!c.data(l,j[3])},focusable:function(k){var l=k.nodeName.toLowerCase(),j=c.attr(k,"tabindex");return(/input|select|textarea|button|object/.test(l)?!k.disabled:"a"==l||"area"==l?k.href||!isNaN(j):!isNaN(j))&&!c(k)["area"==l?"parents":"closest"](":hidden").length},tabbable:function(k){var j=c.attr(k,"tabindex");return(isNaN(j)||j>=0)&&c(k).is(":focusable")}});function g(m,n,o,l){function k(q){var p=c[m][n][q]||[];return(typeof p=="string"?p.split(/,?\s+/):p)}var j=k("getter");if(l.length==1&&typeof l[0]=="string"){j=j.concat(k("getterSetter"))}return(c.inArray(o,j)!=-1)}c.widget=function(k,j){var l=k.split(".")[0];k=k.split(".")[1];c.fn[k]=function(p){var n=(typeof p=="string"),o=Array.prototype.slice.call(arguments,1);if(n&&p.substring(0,1)=="_"){return this}if(n&&g(l,k,p,o)){var m=c.data(this[0],k);return(m?m[p].apply(m,o):undefined)}return this.each(function(){var q=c.data(this,k);(!q&&!n&&c.data(this,k,new c[l][k](this,p))._init());(q&&n&&c.isFunction(q[p])&&q[p].apply(q,o))})};c[l]=c[l]||{};c[l][k]=function(o,n){var m=this;this.namespace=l;this.widgetName=k;this.widgetEventPrefix=c[l][k].eventPrefix||k;this.widgetBaseClass=l+"-"+k;this.options=c.extend({},c.widget.defaults,c[l][k].defaults,c.metadata&&c.metadata.get(o)[k],n);this.element=c(o).bind("setData."+k,function(q,p,r){if(q.target==o){return m._setData(p,r)}}).bind("getData."+k,function(q,p){if(q.target==o){return m._getData(p)}}).bind("remove",function(){return m.destroy()})};c[l][k].prototype=c.extend({},c.widget.prototype,j);c[l][k].getterSetter="option"};c.widget.prototype={_init:function(){},destroy:function(){this.element.removeData(this.widgetName).removeClass(this.widgetBaseClass+"-disabled "+this.namespace+"-state-disabled").removeAttr("aria-disabled")},option:function(l,m){var k=l,j=this;if(typeof l=="string"){if(m===undefined){return this._getData(l)}k={};k[l]=m}c.each(k,function(n,o){j._setData(n,o)})},_getData:function(j){return this.options[j]},_setData:function(j,k){this.options[j]=k;if(j=="disabled"){this.element[k?"addClass":"removeClass"](this.widgetBaseClass+"-disabled "+this.namespace+"-state-disabled").attr("aria-disabled",k)}},enable:function(){this._setData("disabled",false)},disable:function(){this._setData("disabled",true)},_trigger:function(l,m,n){var p=this.options[l],j=(l==this.widgetEventPrefix?l:this.widgetEventPrefix+l);m=c.Event(m);m.type=j;if(m.originalEvent){for(var k=c.event.props.length,o;k;){o=c.event.props[--k];m[o]=m.originalEvent[o]}}this.element.trigger(m,n);return !(c.isFunction(p)&&p.call(this.element[0],m,n)===false||m.isDefaultPrevented())}};c.widget.defaults={disabled:false};c.ui.mouse={_mouseInit:function(){var j=this;this.element.bind("mousedown."+this.widgetName,function(k){return j._mouseDown(k)}).bind("click."+this.widgetName,function(k){if(j._preventClickEvent){j._preventClickEvent=false;k.stopImmediatePropagation();return false}});if(c.browser.msie){this._mouseUnselectable=this.element.attr("unselectable");this.element.attr("unselectable","on")}this.started=false},_mouseDestroy:function(){this.element.unbind("."+this.widgetName);(c.browser.msie&&this.element.attr("unselectable",this._mouseUnselectable))},_mouseDown:function(l){l.originalEvent=l.originalEvent||{};if(l.originalEvent.mouseHandled){return}(this._mouseStarted&&this._mouseUp(l));this._mouseDownEvent=l;var k=this,m=(l.which==1),j=(typeof this.options.cancel=="string"?c(l.target).parents().add(l.target).filter(this.options.cancel).length:false);if(!m||j||!this._mouseCapture(l)){return true}this.mouseDelayMet=!this.options.delay;if(!this.mouseDelayMet){this._mouseDelayTimer=setTimeout(function(){k.mouseDelayMet=true},this.options.delay)}if(this._mouseDistanceMet(l)&&this._mouseDelayMet(l)){this._mouseStarted=(this._mouseStart(l)!==false);if(!this._mouseStarted){l.preventDefault();return true}}this._mouseMoveDelegate=function(n){return k._mouseMove(n)};this._mouseUpDelegate=function(n){return k._mouseUp(n)};c(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate);(c.browser.safari||l.preventDefault());l.originalEvent.mouseHandled=true;return true},_mouseMove:function(j){if(c.browser.msie&&!j.button){return this._mouseUp(j)}if(this._mouseStarted){this._mouseDrag(j);return j.preventDefault()}if(this._mouseDistanceMet(j)&&this._mouseDelayMet(j)){this._mouseStarted=(this._mouseStart(this._mouseDownEvent,j)!==false);(this._mouseStarted?this._mouseDrag(j):this._mouseUp(j))}return !this._mouseStarted},_mouseUp:function(j){c(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate);if(this._mouseStarted){this._mouseStarted=false;this._preventClickEvent=(j.target==this._mouseDownEvent.target);this._mouseStop(j)}return false},_mouseDistanceMet:function(j){return(Math.max(Math.abs(this._mouseDownEvent.pageX-j.pageX),Math.abs(this._mouseDownEvent.pageY-j.pageY))>=this.options.distance)},_mouseDelayMet:function(j){return this.mouseDelayMet},_mouseStart:function(j){},_mouseDrag:function(j){},_mouseStop:function(j){},_mouseCapture:function(j){return true}};c.ui.mouse.defaults={cancel:null,distance:1,delay:0}})(jQuery);;/*
- * jQuery UI Draggable 1.7.1
- *
- * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Draggables
- *
- * Depends:
- * ui.core.js
- */
(function(a){a.widget("ui.draggable",a.extend({},a.ui.mouse,{_init:function(){if(this.options.helper=="original"&&!(/^(?:r|a|f)/).test(this.element.css("position"))){this.element[0].style.position="relative"}(this.options.addClasses&&this.element.addClass("ui-draggable"));(this.options.disabled&&this.element.addClass("ui-draggable-disabled"));this._mouseInit()},destroy:function(){if(!this.element.data("draggable")){return}this.element.removeData("draggable").unbind(".draggable").removeClass("ui-draggable ui-draggable-dragging ui-draggable-disabled");this._mouseDestroy()},_mouseCapture:function(b){var c=this.options;if(this.helper||c.disabled||a(b.target).is(".ui-resizable-handle")){return false}this.handle=this._getHandle(b);if(!this.handle){return false}return true},_mouseStart:function(b){var c=this.options;this.helper=this._createHelper(b);this._cacheHelperProportions();if(a.ui.ddmanager){a.ui.ddmanager.current=this}this._cacheMargins();this.cssPosition=this.helper.css("position");this.scrollParent=this.helper.scrollParent();this.offset=this.element.offset();this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left};a.extend(this.offset,{click:{left:b.pageX-this.offset.left,top:b.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()});this.originalPosition=this._generatePosition(b);this.originalPageX=b.pageX;this.originalPageY=b.pageY;if(c.cursorAt){this._adjustOffsetFromHelper(c.cursorAt)}if(c.containment){this._setContainment()}this._trigger("start",b);this._cacheHelperProportions();if(a.ui.ddmanager&&!c.dropBehaviour){a.ui.ddmanager.prepareOffsets(this,b)}this.helper.addClass("ui-draggable-dragging");this._mouseDrag(b,true);return true},_mouseDrag:function(b,d){this.position=this._generatePosition(b);this.positionAbs=this._convertPositionTo("absolute");if(!d){var c=this._uiHash();this._trigger("drag",b,c);this.position=c.position}if(!this.options.axis||this.options.axis!="y"){this.helper[0].style.left=this.position.left+"px"}if(!this.options.axis||this.options.axis!="x"){this.helper[0].style.top=this.position.top+"px"}if(a.ui.ddmanager){a.ui.ddmanager.drag(this,b)}return false},_mouseStop:function(c){var d=false;if(a.ui.ddmanager&&!this.options.dropBehaviour){d=a.ui.ddmanager.drop(this,c)}if(this.dropped){d=this.dropped;this.dropped=false}if((this.options.revert=="invalid"&&!d)||(this.options.revert=="valid"&&d)||this.options.revert===true||(a.isFunction(this.options.revert)&&this.options.revert.call(this.element,d))){var b=this;a(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,10),function(){b._trigger("stop",c);b._clear()})}else{this._trigger("stop",c);this._clear()}return false},_getHandle:function(b){var c=!this.options.handle||!a(this.options.handle,this.element).length?true:false;a(this.options.handle,this.element).find("*").andSelf().each(function(){if(this==b.target){c=true}});return c},_createHelper:function(c){var d=this.options;var b=a.isFunction(d.helper)?a(d.helper.apply(this.element[0],[c])):(d.helper=="clone"?this.element.clone():this.element);if(!b.parents("body").length){b.appendTo((d.appendTo=="parent"?this.element[0].parentNode:d.appendTo))}if(b[0]!=this.element[0]&&!(/(fixed|absolute)/).test(b.css("position"))){b.css("position","absolute")}return b},_adjustOffsetFromHelper:function(b){if(b.left!=undefined){this.offset.click.left=b.left+this.margins.left}if(b.right!=undefined){this.offset.click.left=this.helperProportions.width-b.right+this.margins.left}if(b.top!=undefined){this.offset.click.top=b.top+this.margins.top}if(b.bottom!=undefined){this.offset.click.top=this.helperProportions.height-b.bottom+this.margins.top}},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var b=this.offsetParent.offset();if(this.cssPosition=="absolute"&&this.scrollParent[0]!=document&&a.ui.contains(this.scrollParent[0],this.offsetParent[0])){b.left+=this.scrollParent.scrollLeft();b.top+=this.scrollParent.scrollTop()}if((this.offsetParent[0]==document.body)||(this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&a.browser.msie)){b={top:0,left:0}}return{top:b.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:b.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=="relative"){var b=this.element.position();return{top:b.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:b.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}else{return{top:0,left:0}}},_cacheMargins:function(){this.margins={left:(parseInt(this.element.css("marginLeft"),10)||0),top:(parseInt(this.element.css("marginTop"),10)||0)}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var e=this.options;if(e.containment=="parent"){e.containment=this.helper[0].parentNode}if(e.containment=="document"||e.containment=="window"){this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,a(e.containment=="document"?document:window).width()-this.helperProportions.width-this.margins.left,(a(e.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top]}if(!(/^(document|window|parent)$/).test(e.containment)&&e.containment.constructor!=Array){var c=a(e.containment)[0];if(!c){return}var d=a(e.containment).offset();var b=(a(c).css("overflow")!="hidden");this.containment=[d.left+(parseInt(a(c).css("borderLeftWidth"),10)||0)+(parseInt(a(c).css("paddingLeft"),10)||0)-this.margins.left,d.top+(parseInt(a(c).css("borderTopWidth"),10)||0)+(parseInt(a(c).css("paddingTop"),10)||0)-this.margins.top,d.left+(b?Math.max(c.scrollWidth,c.offsetWidth):c.offsetWidth)-(parseInt(a(c).css("borderLeftWidth"),10)||0)-(parseInt(a(c).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,d.top+(b?Math.max(c.scrollHeight,c.offsetHeight):c.offsetHeight)-(parseInt(a(c).css("borderTopWidth"),10)||0)-(parseInt(a(c).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top]}else{if(e.containment.constructor==Array){this.containment=e.containment}}},_convertPositionTo:function(f,h){if(!h){h=this.position}var c=f=="absolute"?1:-1;var e=this.options,b=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&a.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,g=(/(html|body)/i).test(b[0].tagName);return{top:(h.top+this.offset.relative.top*c+this.offset.parent.top*c-(a.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():(g?0:b.scrollTop()))*c)),left:(h.left+this.offset.relative.left*c+this.offset.parent.left*c-(a.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():g?0:b.scrollLeft())*c))}},_generatePosition:function(e){var h=this.options,b=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&a.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,i=(/(html|body)/i).test(b[0].tagName);if(this.cssPosition=="relative"&&!(this.scrollParent[0]!=document&&this.scrollParent[0]!=this.offsetParent[0])){this.offset.relative=this._getRelativeOffset()}var d=e.pageX;var c=e.pageY;if(this.originalPosition){if(this.containment){if(e.pageX-this.offset.click.left<this.containment[0]){d=this.containment[0]+this.offset.click.left}if(e.pageY-this.offset.click.top<this.containment[1]){c=this.containment[1]+this.offset.click.top}if(e.pageX-this.offset.click.left>this.containment[2]){d=this.containment[2]+this.offset.click.left}if(e.pageY-this.offset.click.top>this.containment[3]){c=this.containment[3]+this.offset.click.top}}if(h.grid){var g=this.originalPageY+Math.round((c-this.originalPageY)/h.grid[1])*h.grid[1];c=this.containment?(!(g-this.offset.click.top<this.containment[1]||g-this.offset.click.top>this.containment[3])?g:(!(g-this.offset.click.top<this.containment[1])?g-h.grid[1]:g+h.grid[1])):g;var f=this.originalPageX+Math.round((d-this.originalPageX)/h.grid[0])*h.grid[0];d=this.containment?(!(f-this.offset.click.left<this.containment[0]||f-this.offset.click.left>this.containment[2])?f:(!(f-this.offset.click.left<this.containment[0])?f-h.grid[0]:f+h.grid[0])):f}}return{top:(c-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(a.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():(i?0:b.scrollTop())))),left:(d-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(a.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():i?0:b.scrollLeft())))}},_clear:function(){this.helper.removeClass("ui-draggable-dragging");if(this.helper[0]!=this.element[0]&&!this.cancelHelperRemoval){this.helper.remove()}this.helper=null;this.cancelHelperRemoval=false},_trigger:function(b,c,d){d=d||this._uiHash();a.ui.plugin.call(this,b,[c,d]);if(b=="drag"){this.positionAbs=this._convertPositionTo("absolute")}return a.widget.prototype._trigger.call(this,b,c,d)},plugins:{},_uiHash:function(b){return{helper:this.helper,position:this.position,absolutePosition:this.positionAbs,offset:this.positionAbs}}}));a.extend(a.ui.draggable,{version:"1.7.1",eventPrefix:"drag",defaults:{addClasses:true,appendTo:"parent",axis:false,cancel:":input,option",connectToSortable:false,containment:false,cursor:"auto",cursorAt:false,delay:0,distance:1,grid:false,handle:false,helper:"original",iframeFix:false,opacity:false,refreshPositions:false,revert:false,revertDuration:500,scope:"default",scroll:true,scrollSensitivity:20,scrollSpeed:20,snap:false,snapMode:"both",snapTolerance:20,stack:false,zIndex:false}});a.ui.plugin.add("draggable","connectToSortable",{start:function(c,e){var d=a(this).data("draggable"),f=d.options,b=a.extend({},e,{item:d.element});d.sortables=[];a(f.connectToSortable).each(function(){var g=a.data(this,"sortable");if(g&&!g.options.disabled){d.sortables.push({instance:g,shouldRevert:g.options.revert});g._refreshItems();g._trigger("activate",c,b)}})},stop:function(c,e){var d=a(this).data("draggable"),b=a.extend({},e,{item:d.element});a.each(d.sortables,function(){if(this.instance.isOver){this.instance.isOver=0;d.cancelHelperRemoval=true;this.instance.cancelHelperRemoval=false;if(this.shouldRevert){this.instance.options.revert=true}this.instance._mouseStop(c);this.instance.options.helper=this.instance.options._helper;if(d.options.helper=="original"){this.instance.currentItem.css({top:"auto",left:"auto"})}}else{this.instance.cancelHelperRemoval=false;this.instance._trigger("deactivate",c,b)}})},drag:function(c,f){var e=a(this).data("draggable"),b=this;var d=function(i){var n=this.offset.click.top,m=this.offset.click.left;var g=this.positionAbs.top,k=this.positionAbs.left;var j=i.height,l=i.width;var p=i.top,h=i.left;return a.ui.isOver(g+n,k+m,p,h,j,l)};a.each(e.sortables,function(g){this.instance.positionAbs=e.positionAbs;this.instance.helperProportions=e.helperProportions;this.instance.offset.click=e.offset.click;if(this.instance._intersectsWith(this.instance.containerCache)){if(!this.instance.isOver){this.instance.isOver=1;this.instance.currentItem=a(b).clone().appendTo(this.instance.element).data("sortable-item",true);this.instance.options._helper=this.instance.options.helper;this.instance.options.helper=function(){return f.helper[0]};c.target=this.instance.currentItem[0];this.instance._mouseCapture(c,true);this.instance._mouseStart(c,true,true);this.instance.offset.click.top=e.offset.click.top;this.instance.offset.click.left=e.offset.click.left;this.instance.offset.parent.left-=e.offset.parent.left-this.instance.offset.parent.left;this.instance.offset.parent.top-=e.offset.parent.top-this.instance.offset.parent.top;e._trigger("toSortable",c);e.dropped=this.instance.element;e.currentItem=e.element;this.instance.fromOutside=e}if(this.instance.currentItem){this.instance._mouseDrag(c)}}else{if(this.instance.isOver){this.instance.isOver=0;this.instance.cancelHelperRemoval=true;this.instance.options.revert=false;this.instance._trigger("out",c,this.instance._uiHash(this.instance));this.instance._mouseStop(c,true);this.instance.options.helper=this.instance.options._helper;this.instance.currentItem.remove();if(this.instance.placeholder){this.instance.placeholder.remove()}e._trigger("fromSortable",c);e.dropped=false}}})}});a.ui.plugin.add("draggable","cursor",{start:function(c,d){var b=a("body"),e=a(this).data("draggable").options;if(b.css("cursor")){e._cursor=b.css("cursor")}b.css("cursor",e.cursor)},stop:function(b,c){var d=a(this).data("draggable").options;if(d._cursor){a("body").css("cursor",d._cursor)}}});a.ui.plugin.add("draggable","iframeFix",{start:function(b,c){var d=a(this).data("draggable").options;a(d.iframeFix===true?"iframe":d.iframeFix).each(function(){a('<div class="ui-draggable-iframeFix" style="background: #fff;"></div>').css({width:this.offsetWidth+"px",height:this.offsetHeight+"px",position:"absolute",opacity:"0.001",zIndex:1000}).css(a(this).offset()).appendTo("body")})},stop:function(b,c){a("div.ui-draggable-iframeFix").each(function(){this.parentNode.removeChild(this)})}});a.ui.plugin.add("draggable","opacity",{start:function(c,d){var b=a(d.helper),e=a(this).data("draggable").options;if(b.css("opacity")){e._opacity=b.css("opacity")}b.css("opacity",e.opacity)},stop:function(b,c){var d=a(this).data("draggable").options;if(d._opacity){a(c.helper).css("opacity",d._opacity)}}});a.ui.plugin.add("draggable","scroll",{start:function(c,d){var b=a(this).data("draggable");if(b.scrollParent[0]!=document&&b.scrollParent[0].tagName!="HTML"){b.overflowOffset=b.scrollParent.offset()}},drag:function(d,e){var c=a(this).data("draggable"),f=c.options,b=false;if(c.scrollParent[0]!=document&&c.scrollParent[0].tagName!="HTML"){if(!f.axis||f.axis!="x"){if((c.overflowOffset.top+c.scrollParent[0].offsetHeight)-d.pageY<f.scrollSensitivity){c.scrollParent[0].scrollTop=b=c.scrollParent[0].scrollTop+f.scrollSpeed}else{if(d.pageY-c.overflowOffset.top<f.scrollSensitivity){c.scrollParent[0].scrollTop=b=c.scrollParent[0].scrollTop-f.scrollSpeed}}}if(!f.axis||f.axis!="y"){if((c.overflowOffset.left+c.scrollParent[0].offsetWidth)-d.pageX<f.scrollSensitivity){c.scrollParent[0].scrollLeft=b=c.scrollParent[0].scrollLeft+f.scrollSpeed}else{if(d.pageX-c.overflowOffset.left<f.scrollSensitivity){c.scrollParent[0].scrollLeft=b=c.scrollParent[0].scrollLeft-f.scrollSpeed}}}}else{if(!f.axis||f.axis!="x"){if(d.pageY-a(document).scrollTop()<f.scrollSensitivity){b=a(document).scrollTop(a(document).scrollTop()-f.scrollSpeed)}else{if(a(window).height()-(d.pageY-a(document).scrollTop())<f.scrollSensitivity){b=a(document).scrollTop(a(document).scrollTop()+f.scrollSpeed)}}}if(!f.axis||f.axis!="y"){if(d.pageX-a(document).scrollLeft()<f.scrollSensitivity){b=a(document).scrollLeft(a(document).scrollLeft()-f.scrollSpeed)}else{if(a(window).width()-(d.pageX-a(document).scrollLeft())<f.scrollSensitivity){b=a(document).scrollLeft(a(document).scrollLeft()+f.scrollSpeed)}}}}if(b!==false&&a.ui.ddmanager&&!f.dropBehaviour){a.ui.ddmanager.prepareOffsets(c,d)}}});a.ui.plugin.add("draggable","snap",{start:function(c,d){var b=a(this).data("draggable"),e=b.options;b.snapElements=[];a(e.snap.constructor!=String?(e.snap.items||":data(draggable)"):e.snap).each(function(){var g=a(this);var f=g.offset();if(this!=b.element[0]){b.snapElements.push({item:this,width:g.outerWidth(),height:g.outerHeight(),top:f.top,left:f.left})}})},drag:function(u,p){var g=a(this).data("draggable"),q=g.options;var y=q.snapTolerance;var x=p.offset.left,w=x+g.helperProportions.width,f=p.offset.top,e=f+g.helperProportions.height;for(var v=g.snapElements.length-1;v>=0;v--){var s=g.snapElements[v].left,n=s+g.snapElements[v].width,m=g.snapElements[v].top,A=m+g.snapElements[v].height;if(!((s-y<x&&x<n+y&&m-y<f&&f<A+y)||(s-y<x&&x<n+y&&m-y<e&&e<A+y)||(s-y<w&&w<n+y&&m-y<f&&f<A+y)||(s-y<w&&w<n+y&&m-y<e&&e<A+y))){if(g.snapElements[v].snapping){(g.options.snap.release&&g.options.snap.release.call(g.element,u,a.extend(g._uiHash(),{snapItem:g.snapElements[v].item})))}g.snapElements[v].snapping=false;continue}if(q.snapMode!="inner"){var c=Math.abs(m-e)<=y;var z=Math.abs(A-f)<=y;var j=Math.abs(s-w)<=y;var k=Math.abs(n-x)<=y;if(c){p.position.top=g._convertPositionTo("relative",{top:m-g.helperProportions.height,left:0}).top-g.margins.top}if(z){p.position.top=g._convertPositionTo("relative",{top:A,left:0}).top-g.margins.top}if(j){p.position.left=g._convertPositionTo("relative",{top:0,left:s-g.helperProportions.width}).left-g.margins.left}if(k){p.position.left=g._convertPositionTo("relative",{top:0,left:n}).left-g.margins.left}}var h=(c||z||j||k);if(q.snapMode!="outer"){var c=Math.abs(m-f)<=y;var z=Math.abs(A-e)<=y;var j=Math.abs(s-x)<=y;var k=Math.abs(n-w)<=y;if(c){p.position.top=g._convertPositionTo("relative",{top:m,left:0}).top-g.margins.top}if(z){p.position.top=g._convertPositionTo("relative",{top:A-g.helperProportions.height,left:0}).top-g.margins.top}if(j){p.position.left=g._convertPositionTo("relative",{top:0,left:s}).left-g.margins.left}if(k){p.position.left=g._convertPositionTo("relative",{top:0,left:n-g.helperProportions.width}).left-g.margins.left}}if(!g.snapElements[v].snapping&&(c||z||j||k||h)){(g.options.snap.snap&&g.options.snap.snap.call(g.element,u,a.extend(g._uiHash(),{snapItem:g.snapElements[v].item})))}g.snapElements[v].snapping=(c||z||j||k||h)}}});a.ui.plugin.add("draggable","stack",{start:function(b,c){var e=a(this).data("draggable").options;var d=a.makeArray(a(e.stack.group)).sort(function(g,f){return(parseInt(a(g).css("zIndex"),10)||e.stack.min)-(parseInt(a(f).css("zIndex"),10)||e.stack.min)});a(d).each(function(f){this.style.zIndex=e.stack.min+f});this[0].style.zIndex=e.stack.min+d.length}});a.ui.plugin.add("draggable","zIndex",{start:function(c,d){var b=a(d.helper),e=a(this).data("draggable").options;if(b.css("zIndex")){e._zIndex=b.css("zIndex")}b.css("zIndex",e.zIndex)},stop:function(b,c){var d=a(this).data("draggable").options;if(d._zIndex){a(c.helper).css("zIndex",d._zIndex)}}})})(jQuery);;/*
- * jQuery UI Droppable 1.7.1
- *
- * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Droppables
- *
- * Depends:
- * ui.core.js
- * ui.draggable.js
- */
(function(a){a.widget("ui.droppable",{_init:function(){var c=this.options,b=c.accept;this.isover=0;this.isout=1;this.options.accept=this.options.accept&&a.isFunction(this.options.accept)?this.options.accept:function(e){return e.is(b)};this.proportions={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight};a.ui.ddmanager.droppables[this.options.scope]=a.ui.ddmanager.droppables[this.options.scope]||[];a.ui.ddmanager.droppables[this.options.scope].push(this);(this.options.addClasses&&this.element.addClass("ui-droppable"))},destroy:function(){var b=a.ui.ddmanager.droppables[this.options.scope];for(var c=0;c<b.length;c++){if(b[c]==this){b.splice(c,1)}}this.element.removeClass("ui-droppable ui-droppable-disabled").removeData("droppable").unbind(".droppable")},_setData:function(b,c){if(b=="accept"){this.options.accept=c&&a.isFunction(c)?c:function(e){return e.is(c)}}else{a.widget.prototype._setData.apply(this,arguments)}},_activate:function(c){var b=a.ui.ddmanager.current;if(this.options.activeClass){this.element.addClass(this.options.activeClass)}(b&&this._trigger("activate",c,this.ui(b)))},_deactivate:function(c){var b=a.ui.ddmanager.current;if(this.options.activeClass){this.element.removeClass(this.options.activeClass)}(b&&this._trigger("deactivate",c,this.ui(b)))},_over:function(c){var b=a.ui.ddmanager.current;if(!b||(b.currentItem||b.element)[0]==this.element[0]){return}if(this.options.accept.call(this.element[0],(b.currentItem||b.element))){if(this.options.hoverClass){this.element.addClass(this.options.hoverClass)}this._trigger("over",c,this.ui(b))}},_out:function(c){var b=a.ui.ddmanager.current;if(!b||(b.currentItem||b.element)[0]==this.element[0]){return}if(this.options.accept.call(this.element[0],(b.currentItem||b.element))){if(this.options.hoverClass){this.element.removeClass(this.options.hoverClass)}this._trigger("out",c,this.ui(b))}},_drop:function(c,d){var b=d||a.ui.ddmanager.current;if(!b||(b.currentItem||b.element)[0]==this.element[0]){return false}var e=false;this.element.find(":data(droppable)").not(".ui-draggable-dragging").each(function(){var f=a.data(this,"droppable");if(f.options.greedy&&a.ui.intersect(b,a.extend(f,{offset:f.element.offset()}),f.options.tolerance)){e=true;return false}});if(e){return false}if(this.options.accept.call(this.element[0],(b.currentItem||b.element))){if(this.options.activeClass){this.element.removeClass(this.options.activeClass)}if(this.options.hoverClass){this.element.removeClass(this.options.hoverClass)}this._trigger("drop",c,this.ui(b));return this.element}return false},ui:function(b){return{draggable:(b.currentItem||b.element),helper:b.helper,position:b.position,absolutePosition:b.positionAbs,offset:b.positionAbs}}});a.extend(a.ui.droppable,{version:"1.7.1",eventPrefix:"drop",defaults:{accept:"*",activeClass:false,addClasses:true,greedy:false,hoverClass:false,scope:"default",tolerance:"intersect"}});a.ui.intersect=function(q,j,o){if(!j.offset){return false}var e=(q.positionAbs||q.position.absolute).left,d=e+q.helperProportions.width,n=(q.positionAbs||q.position.absolute).top,m=n+q.helperProportions.height;var g=j.offset.left,c=g+j.proportions.width,p=j.offset.top,k=p+j.proportions.height;switch(o){case"fit":return(g<e&&d<c&&p<n&&m<k);break;case"intersect":return(g<e+(q.helperProportions.width/2)&&d-(q.helperProportions.width/2)<c&&p<n+(q.helperProportions.height/2)&&m-(q.helperProportions.height/2)<k);break;case"pointer":var h=((q.positionAbs||q.position.absolute).left+(q.clickOffset||q.offset.click).left),i=((q.positionAbs||q.position.absolute).top+(q.clickOffset||q.offset.click).top),f=a.ui.isOver(i,h,p,g,j.proportions.height,j.proportions.width);return f;break;case"touch":return((n>=p&&n<=k)||(m>=p&&m<=k)||(n<p&&m>k))&&((e>=g&&e<=c)||(d>=g&&d<=c)||(e<g&&d>c));break;default:return false;break}};a.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(e,g){var b=a.ui.ddmanager.droppables[e.options.scope];var f=g?g.type:null;var h=(e.currentItem||e.element).find(":data(droppable)").andSelf();droppablesLoop:for(var d=0;d<b.length;d++){if(b[d].options.disabled||(e&&!b[d].options.accept.call(b[d].element[0],(e.currentItem||e.element)))){continue}for(var c=0;c<h.length;c++){if(h[c]==b[d].element[0]){b[d].proportions.height=0;continue droppablesLoop}}b[d].visible=b[d].element.css("display")!="none";if(!b[d].visible){continue}b[d].offset=b[d].element.offset();b[d].proportions={width:b[d].element[0].offsetWidth,height:b[d].element[0].offsetHeight};if(f=="mousedown"){b[d]._activate.call(b[d],g)}}},drop:function(b,c){var d=false;a.each(a.ui.ddmanager.droppables[b.options.scope],function(){if(!this.options){return}if(!this.options.disabled&&this.visible&&a.ui.intersect(b,this,this.options.tolerance)){d=this._drop.call(this,c)}if(!this.options.disabled&&this.visible&&this.options.accept.call(this.element[0],(b.currentItem||b.element))){this.isout=1;this.isover=0;this._deactivate.call(this,c)}});return d},drag:function(b,c){if(b.options.refreshPositions){a.ui.ddmanager.prepareOffsets(b,c)}a.each(a.ui.ddmanager.droppables[b.options.scope],function(){if(this.options.disabled||this.greedyChild||!this.visible){return}var e=a.ui.intersect(b,this,this.options.tolerance);var g=!e&&this.isover==1?"isout":(e&&this.isover==0?"isover":null);if(!g){return}var f;if(this.options.greedy){var d=this.element.parents(":data(droppable):eq(0)");if(d.length){f=a.data(d[0],"droppable");f.greedyChild=(g=="isover"?1:0)}}if(f&&g=="isover"){f.isover=0;f.isout=1;f._out.call(f,c)}this[g]=1;this[g=="isout"?"isover":"isout"]=0;this[g=="isover"?"_over":"_out"].call(this,c);if(f&&g=="isout"){f.isout=0;f.isover=1;f._over.call(f,c)}})}}})(jQuery);;/*
- * jQuery UI Resizable 1.7.1
- *
- * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Resizables
- *
- * Depends:
- * ui.core.js
- */
(function(c){c.widget("ui.resizable",c.extend({},c.ui.mouse,{_init:function(){var e=this,j=this.options;this.element.addClass("ui-resizable");c.extend(this,{_aspectRatio:!!(j.aspectRatio),aspectRatio:j.aspectRatio,originalElement:this.element,_proportionallyResizeElements:[],_helper:j.helper||j.ghost||j.animate?j.helper||"ui-resizable-helper":null});if(this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)){if(/relative/.test(this.element.css("position"))&&c.browser.opera){this.element.css({position:"relative",top:"auto",left:"auto"})}this.element.wrap(c('<div class="ui-wrapper" style="overflow: hidden;"></div>').css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),top:this.element.css("top"),left:this.element.css("left")}));this.element=this.element.parent().data("resizable",this.element.data("resizable"));this.elementIsWrapper=true;this.element.css({marginLeft:this.originalElement.css("marginLeft"),marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom")});this.originalElement.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0});this.originalResizeStyle=this.originalElement.css("resize");this.originalElement.css("resize","none");this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"}));this.originalElement.css({margin:this.originalElement.css("margin")});this._proportionallyResize()}this.handles=j.handles||(!c(".ui-resizable-handle",this.element).length?"e,s,se":{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"});if(this.handles.constructor==String){if(this.handles=="all"){this.handles="n,e,s,w,se,sw,ne,nw"}var k=this.handles.split(",");this.handles={};for(var f=0;f<k.length;f++){var h=c.trim(k[f]),d="ui-resizable-"+h;var g=c('<div class="ui-resizable-handle '+d+'"></div>');if(/sw|se|ne|nw/.test(h)){g.css({zIndex:++j.zIndex})}if("se"==h){g.addClass("ui-icon ui-icon-gripsmall-diagonal-se")}this.handles[h]=".ui-resizable-"+h;this.element.append(g)}}this._renderAxis=function(p){p=p||this.element;for(var m in this.handles){if(this.handles[m].constructor==String){this.handles[m]=c(this.handles[m],this.element).show()}if(this.elementIsWrapper&&this.originalElement[0].nodeName.match(/textarea|input|select|button/i)){var n=c(this.handles[m],this.element),o=0;o=/sw|ne|nw|se|n|s/.test(m)?n.outerHeight():n.outerWidth();var l=["padding",/ne|nw|n/.test(m)?"Top":/se|sw|s/.test(m)?"Bottom":/^e$/.test(m)?"Right":"Left"].join("");p.css(l,o);this._proportionallyResize()}if(!c(this.handles[m]).length){continue}}};this._renderAxis(this.element);this._handles=c(".ui-resizable-handle",this.element).disableSelection();this._handles.mouseover(function(){if(!e.resizing){if(this.className){var i=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i)}e.axis=i&&i[1]?i[1]:"se"}});if(j.autoHide){this._handles.hide();c(this.element).addClass("ui-resizable-autohide").hover(function(){c(this).removeClass("ui-resizable-autohide");e._handles.show()},function(){if(!e.resizing){c(this).addClass("ui-resizable-autohide");e._handles.hide()}})}this._mouseInit()},destroy:function(){this._mouseDestroy();var d=function(f){c(f).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing").removeData("resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};if(this.elementIsWrapper){d(this.element);var e=this.element;e.parent().append(this.originalElement.css({position:e.css("position"),width:e.outerWidth(),height:e.outerHeight(),top:e.css("top"),left:e.css("left")})).end().remove()}this.originalElement.css("resize",this.originalResizeStyle);d(this.originalElement)},_mouseCapture:function(e){var f=false;for(var d in this.handles){if(c(this.handles[d])[0]==e.target){f=true}}return this.options.disabled||!!f},_mouseStart:function(f){var i=this.options,e=this.element.position(),d=this.element;this.resizing=true;this.documentScroll={top:c(document).scrollTop(),left:c(document).scrollLeft()};if(d.is(".ui-draggable")||(/absolute/).test(d.css("position"))){d.css({position:"absolute",top:e.top,left:e.left})}if(c.browser.opera&&(/relative/).test(d.css("position"))){d.css({position:"relative",top:"auto",left:"auto"})}this._renderProxy();var j=b(this.helper.css("left")),g=b(this.helper.css("top"));if(i.containment){j+=c(i.containment).scrollLeft()||0;g+=c(i.containment).scrollTop()||0}this.offset=this.helper.offset();this.position={left:j,top:g};this.size=this._helper?{width:d.outerWidth(),height:d.outerHeight()}:{width:d.width(),height:d.height()};this.originalSize=this._helper?{width:d.outerWidth(),height:d.outerHeight()}:{width:d.width(),height:d.height()};this.originalPosition={left:j,top:g};this.sizeDiff={width:d.outerWidth()-d.width(),height:d.outerHeight()-d.height()};this.originalMousePosition={left:f.pageX,top:f.pageY};this.aspectRatio=(typeof i.aspectRatio=="number")?i.aspectRatio:((this.originalSize.width/this.originalSize.height)||1);var h=c(".ui-resizable-"+this.axis).css("cursor");c("body").css("cursor",h=="auto"?this.axis+"-resize":h);d.addClass("ui-resizable-resizing");this._propagate("start",f);return true},_mouseDrag:function(d){var g=this.helper,f=this.options,l={},p=this,i=this.originalMousePosition,m=this.axis;var q=(d.pageX-i.left)||0,n=(d.pageY-i.top)||0;var h=this._change[m];if(!h){return false}var k=h.apply(this,[d,q,n]),j=c.browser.msie&&c.browser.version<7,e=this.sizeDiff;if(this._aspectRatio||d.shiftKey){k=this._updateRatio(k,d)}k=this._respectSize(k,d);this._propagate("resize",d);g.css({top:this.position.top+"px",left:this.position.left+"px",width:this.size.width+"px",height:this.size.height+"px"});if(!this._helper&&this._proportionallyResizeElements.length){this._proportionallyResize()}this._updateCache(k);this._trigger("resize",d,this.ui());return false},_mouseStop:function(g){this.resizing=false;var h=this.options,l=this;if(this._helper){var f=this._proportionallyResizeElements,d=f.length&&(/textarea/i).test(f[0].nodeName),e=d&&c.ui.hasScroll(f[0],"left")?0:l.sizeDiff.height,j=d?0:l.sizeDiff.width;var m={width:(l.size.width-j),height:(l.size.height-e)},i=(parseInt(l.element.css("left"),10)+(l.position.left-l.originalPosition.left))||null,k=(parseInt(l.element.css("top"),10)+(l.position.top-l.originalPosition.top))||null;if(!h.animate){this.element.css(c.extend(m,{top:k,left:i}))}l.helper.height(l.size.height);l.helper.width(l.size.width);if(this._helper&&!h.animate){this._proportionallyResize()}}c("body").css("cursor","auto");this.element.removeClass("ui-resizable-resizing");this._propagate("stop",g);if(this._helper){this.helper.remove()}return false},_updateCache:function(d){var e=this.options;this.offset=this.helper.offset();if(a(d.left)){this.position.left=d.left}if(a(d.top)){this.position.top=d.top}if(a(d.height)){this.size.height=d.height}if(a(d.width)){this.size.width=d.width}},_updateRatio:function(g,f){var h=this.options,i=this.position,e=this.size,d=this.axis;if(g.height){g.width=(e.height*this.aspectRatio)}else{if(g.width){g.height=(e.width/this.aspectRatio)}}if(d=="sw"){g.left=i.left+(e.width-g.width);g.top=null}if(d=="nw"){g.top=i.top+(e.height-g.height);g.left=i.left+(e.width-g.width)}return g},_respectSize:function(k,f){var i=this.helper,h=this.options,q=this._aspectRatio||f.shiftKey,p=this.axis,s=a(k.width)&&h.maxWidth&&(h.maxWidth<k.width),l=a(k.height)&&h.maxHeight&&(h.maxHeight<k.height),g=a(k.width)&&h.minWidth&&(h.minWidth>k.width),r=a(k.height)&&h.minHeight&&(h.minHeight>k.height);if(g){k.width=h.minWidth}if(r){k.height=h.minHeight}if(s){k.width=h.maxWidth}if(l){k.height=h.maxHeight}var e=this.originalPosition.left+this.originalSize.width,n=this.position.top+this.size.height;var j=/sw|nw|w/.test(p),d=/nw|ne|n/.test(p);if(g&&j){k.left=e-h.minWidth}if(s&&j){k.left=e-h.maxWidth}if(r&&d){k.top=n-h.minHeight}if(l&&d){k.top=n-h.maxHeight}var m=!k.width&&!k.height;if(m&&!k.left&&k.top){k.top=null}else{if(m&&!k.top&&k.left){k.left=null}}return k},_proportionallyResize:function(){var j=this.options;if(!this._proportionallyResizeElements.length){return}var f=this.helper||this.element;for(var e=0;e<this._proportionallyResizeElements.length;e++){var g=this._proportionallyResizeElements[e];if(!this.borderDif){var d=[g.css("borderTopWidth"),g.css("borderRightWidth"),g.css("borderBottomWidth"),g.css("borderLeftWidth")],h=[g.css("paddingTop"),g.css("paddingRight"),g.css("paddingBottom"),g.css("paddingLeft")];this.borderDif=c.map(d,function(k,m){var l=parseInt(k,10)||0,n=parseInt(h[m],10)||0;return l+n})}if(c.browser.msie&&!(!(c(f).is(":hidden")||c(f).parents(":hidden").length))){continue}g.css({height:(f.height()-this.borderDif[0]-this.borderDif[2])||0,width:(f.width()-this.borderDif[1]-this.borderDif[3])||0})}},_renderProxy:function(){var e=this.element,h=this.options;this.elementOffset=e.offset();if(this._helper){this.helper=this.helper||c('<div style="overflow:hidden;"></div>');var d=c.browser.msie&&c.browser.version<7,f=(d?1:0),g=(d?2:-1);this.helper.addClass(this._helper).css({width:this.element.outerWidth()+g,height:this.element.outerHeight()+g,position:"absolute",left:this.elementOffset.left-f+"px",top:this.elementOffset.top-f+"px",zIndex:++h.zIndex});this.helper.appendTo("body").disableSelection()}else{this.helper=this.element}},_change:{e:function(f,e,d){return{width:this.originalSize.width+e}},w:function(g,e,d){var i=this.options,f=this.originalSize,h=this.originalPosition;return{left:h.left+e,width:f.width-e}},n:function(g,e,d){var i=this.options,f=this.originalSize,h=this.originalPosition;return{top:h.top+d,height:f.height-d}},s:function(f,e,d){return{height:this.originalSize.height+d}},se:function(f,e,d){return c.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[f,e,d]))},sw:function(f,e,d){return c.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[f,e,d]))},ne:function(f,e,d){return c.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[f,e,d]))},nw:function(f,e,d){return c.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[f,e,d]))}},_propagate:function(e,d){c.ui.plugin.call(this,e,[d,this.ui()]);(e!="resize"&&this._trigger(e,d,this.ui()))},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}}));c.extend(c.ui.resizable,{version:"1.7.1",eventPrefix:"resize",defaults:{alsoResize:false,animate:false,animateDuration:"slow",animateEasing:"swing",aspectRatio:false,autoHide:false,cancel:":input,option",containment:false,delay:0,distance:1,ghost:false,grid:false,handles:"e,s,se",helper:false,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:1000}});c.ui.plugin.add("resizable","alsoResize",{start:function(e,f){var d=c(this).data("resizable"),g=d.options;_store=function(h){c(h).each(function(){c(this).data("resizable-alsoresize",{width:parseInt(c(this).width(),10),height:parseInt(c(this).height(),10),left:parseInt(c(this).css("left"),10),top:parseInt(c(this).css("top"),10)})})};if(typeof(g.alsoResize)=="object"&&!g.alsoResize.parentNode){if(g.alsoResize.length){g.alsoResize=g.alsoResize[0];_store(g.alsoResize)}else{c.each(g.alsoResize,function(h,i){_store(h)})}}else{_store(g.alsoResize)}},resize:function(f,h){var e=c(this).data("resizable"),i=e.options,g=e.originalSize,k=e.originalPosition;var j={height:(e.size.height-g.height)||0,width:(e.size.width-g.width)||0,top:(e.position.top-k.top)||0,left:(e.position.left-k.left)||0},d=function(l,m){c(l).each(function(){var p=c(this),q=c(this).data("resizable-alsoresize"),o={},n=m&&m.length?m:["width","height","top","left"];c.each(n||["width","height","top","left"],function(r,t){var s=(q[t]||0)+(j[t]||0);if(s&&s>=0){o[t]=s||null}});if(/relative/.test(p.css("position"))&&c.browser.opera){e._revertToRelativePosition=true;p.css({position:"absolute",top:"auto",left:"auto"})}p.css(o)})};if(typeof(i.alsoResize)=="object"&&!i.alsoResize.nodeType){c.each(i.alsoResize,function(l,m){d(l,m)})}else{d(i.alsoResize)}},stop:function(e,f){var d=c(this).data("resizable");if(d._revertToRelativePosition&&c.browser.opera){d._revertToRelativePosition=false;el.css({position:"relative"})}c(this).removeData("resizable-alsoresize-start")}});c.ui.plugin.add("resizable","animate",{stop:function(h,m){var n=c(this).data("resizable"),i=n.options;var g=n._proportionallyResizeElements,d=g.length&&(/textarea/i).test(g[0].nodeName),e=d&&c.ui.hasScroll(g[0],"left")?0:n.sizeDiff.height,k=d?0:n.sizeDiff.width;var f={width:(n.size.width-k),height:(n.size.height-e)},j=(parseInt(n.element.css("left"),10)+(n.position.left-n.originalPosition.left))||null,l=(parseInt(n.element.css("top"),10)+(n.position.top-n.originalPosition.top))||null;n.element.animate(c.extend(f,l&&j?{top:l,left:j}:{}),{duration:i.animateDuration,easing:i.animateEasing,step:function(){var o={width:parseInt(n.element.css("width"),10),height:parseInt(n.element.css("height"),10),top:parseInt(n.element.css("top"),10),left:parseInt(n.element.css("left"),10)};if(g&&g.length){c(g[0]).css({width:o.width,height:o.height})}n._updateCache(o);n._propagate("resize",h)}})}});c.ui.plugin.add("resizable","containment",{start:function(e,q){var s=c(this).data("resizable"),i=s.options,k=s.element;var f=i.containment,j=(f instanceof c)?f.get(0):(/parent/.test(f))?k.parent().get(0):f;if(!j){return}s.containerElement=c(j);if(/document/.test(f)||f==document){s.containerOffset={left:0,top:0};s.containerPosition={left:0,top:0};s.parentData={element:c(document),left:0,top:0,width:c(document).width(),height:c(document).height()||document.body.parentNode.scrollHeight}}else{var m=c(j),h=[];c(["Top","Right","Left","Bottom"]).each(function(p,o){h[p]=b(m.css("padding"+o))});s.containerOffset=m.offset();s.containerPosition=m.position();s.containerSize={height:(m.innerHeight()-h[3]),width:(m.innerWidth()-h[1])};var n=s.containerOffset,d=s.containerSize.height,l=s.containerSize.width,g=(c.ui.hasScroll(j,"left")?j.scrollWidth:l),r=(c.ui.hasScroll(j)?j.scrollHeight:d);s.parentData={element:j,left:n.left,top:n.top,width:g,height:r}}},resize:function(f,p){var s=c(this).data("resizable"),h=s.options,e=s.containerSize,n=s.containerOffset,l=s.size,m=s.position,q=s._aspectRatio||f.shiftKey,d={top:0,left:0},g=s.containerElement;if(g[0]!=document&&(/static/).test(g.css("position"))){d=n}if(m.left<(s._helper?n.left:0)){s.size.width=s.size.width+(s._helper?(s.position.left-n.left):(s.position.left-d.left));if(q){s.size.height=s.size.width/h.aspectRatio}s.position.left=h.helper?n.left:0}if(m.top<(s._helper?n.top:0)){s.size.height=s.size.height+(s._helper?(s.position.top-n.top):s.position.top);if(q){s.size.width=s.size.height*h.aspectRatio}s.position.top=s._helper?n.top:0}s.offset.left=s.parentData.left+s.position.left;s.offset.top=s.parentData.top+s.position.top;var k=Math.abs((s._helper?s.offset.left-d.left:(s.offset.left-d.left))+s.sizeDiff.width),r=Math.abs((s._helper?s.offset.top-d.top:(s.offset.top-n.top))+s.sizeDiff.height);var j=s.containerElement.get(0)==s.element.parent().get(0),i=/relative|absolute/.test(s.containerElement.css("position"));if(j&&i){k-=s.parentData.left}if(k+s.size.width>=s.parentData.width){s.size.width=s.parentData.width-k;if(q){s.size.height=s.size.width/s.aspectRatio}}if(r+s.size.height>=s.parentData.height){s.size.height=s.parentData.height-r;if(q){s.size.width=s.size.height*s.aspectRatio}}},stop:function(e,m){var p=c(this).data("resizable"),f=p.options,k=p.position,l=p.containerOffset,d=p.containerPosition,g=p.containerElement;var i=c(p.helper),q=i.offset(),n=i.outerWidth()-p.sizeDiff.width,j=i.outerHeight()-p.sizeDiff.height;if(p._helper&&!f.animate&&(/relative/).test(g.css("position"))){c(this).css({left:q.left-d.left-l.left,width:n,height:j})}if(p._helper&&!f.animate&&(/static/).test(g.css("position"))){c(this).css({left:q.left-d.left-l.left,width:n,height:j})}}});c.ui.plugin.add("resizable","ghost",{start:function(f,g){var d=c(this).data("resizable"),h=d.options,e=d.size;d.ghost=d.originalElement.clone();d.ghost.css({opacity:0.25,display:"block",position:"relative",height:e.height,width:e.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass(typeof h.ghost=="string"?h.ghost:"");d.ghost.appendTo(d.helper)},resize:function(e,f){var d=c(this).data("resizable"),g=d.options;if(d.ghost){d.ghost.css({position:"relative",height:d.size.height,width:d.size.width})}},stop:function(e,f){var d=c(this).data("resizable"),g=d.options;if(d.ghost&&d.helper){d.helper.get(0).removeChild(d.ghost.get(0))}}});c.ui.plugin.add("resizable","grid",{resize:function(d,l){var n=c(this).data("resizable"),g=n.options,j=n.size,h=n.originalSize,i=n.originalPosition,m=n.axis,k=g._aspectRatio||d.shiftKey;g.grid=typeof g.grid=="number"?[g.grid,g.grid]:g.grid;var f=Math.round((j.width-h.width)/(g.grid[0]||1))*(g.grid[0]||1),e=Math.round((j.height-h.height)/(g.grid[1]||1))*(g.grid[1]||1);if(/^(se|s|e)$/.test(m)){n.size.width=h.width+f;n.size.height=h.height+e}else{if(/^(ne)$/.test(m)){n.size.width=h.width+f;n.size.height=h.height+e;n.position.top=i.top-e}else{if(/^(sw)$/.test(m)){n.size.width=h.width+f;n.size.height=h.height+e;n.position.left=i.left-f}else{n.size.width=h.width+f;n.size.height=h.height+e;n.position.top=i.top-e;n.position.left=i.left-f}}}}});var b=function(d){return parseInt(d,10)||0};var a=function(d){return !isNaN(parseInt(d,10))}})(jQuery);;/*
- * jQuery UI Selectable 1.7.1
- *
- * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Selectables
- *
- * Depends:
- * ui.core.js
- */
(function(a){a.widget("ui.selectable",a.extend({},a.ui.mouse,{_init:function(){var b=this;this.element.addClass("ui-selectable");this.dragged=false;var c;this.refresh=function(){c=a(b.options.filter,b.element[0]);c.each(function(){var d=a(this);var e=d.offset();a.data(this,"selectable-item",{element:this,$element:d,left:e.left,top:e.top,right:e.left+d.outerWidth(),bottom:e.top+d.outerHeight(),startselected:false,selected:d.hasClass("ui-selected"),selecting:d.hasClass("ui-selecting"),unselecting:d.hasClass("ui-unselecting")})})};this.refresh();this.selectees=c.addClass("ui-selectee");this._mouseInit();this.helper=a(document.createElement("div")).css({border:"1px dotted black"}).addClass("ui-selectable-helper")},destroy:function(){this.element.removeClass("ui-selectable ui-selectable-disabled").removeData("selectable").unbind(".selectable");this._mouseDestroy()},_mouseStart:function(d){var b=this;this.opos=[d.pageX,d.pageY];if(this.options.disabled){return}var c=this.options;this.selectees=a(c.filter,this.element[0]);this._trigger("start",d);a(c.appendTo).append(this.helper);this.helper.css({"z-index":100,position:"absolute",left:d.clientX,top:d.clientY,width:0,height:0});if(c.autoRefresh){this.refresh()}this.selectees.filter(".ui-selected").each(function(){var e=a.data(this,"selectable-item");e.startselected=true;if(!d.metaKey){e.$element.removeClass("ui-selected");e.selected=false;e.$element.addClass("ui-unselecting");e.unselecting=true;b._trigger("unselecting",d,{unselecting:e.element})}});a(d.target).parents().andSelf().each(function(){var e=a.data(this,"selectable-item");if(e){e.$element.removeClass("ui-unselecting").addClass("ui-selecting");e.unselecting=false;e.selecting=true;e.selected=true;b._trigger("selecting",d,{selecting:e.element});return false}})},_mouseDrag:function(i){var c=this;this.dragged=true;if(this.options.disabled){return}var e=this.options;var d=this.opos[0],h=this.opos[1],b=i.pageX,g=i.pageY;if(d>b){var f=b;b=d;d=f}if(h>g){var f=g;g=h;h=f}this.helper.css({left:d,top:h,width:b-d,height:g-h});this.selectees.each(function(){var j=a.data(this,"selectable-item");if(!j||j.element==c.element[0]){return}var k=false;if(e.tolerance=="touch"){k=(!(j.left>b||j.right<d||j.top>g||j.bottom<h))}else{if(e.tolerance=="fit"){k=(j.left>d&&j.right<b&&j.top>h&&j.bottom<g)}}if(k){if(j.selected){j.$element.removeClass("ui-selected");j.selected=false}if(j.unselecting){j.$element.removeClass("ui-unselecting");j.unselecting=false}if(!j.selecting){j.$element.addClass("ui-selecting");j.selecting=true;c._trigger("selecting",i,{selecting:j.element})}}else{if(j.selecting){if(i.metaKey&&j.startselected){j.$element.removeClass("ui-selecting");j.selecting=false;j.$element.addClass("ui-selected");j.selected=true}else{j.$element.removeClass("ui-selecting");j.selecting=false;if(j.startselected){j.$element.addClass("ui-unselecting");j.unselecting=true}c._trigger("unselecting",i,{unselecting:j.element})}}if(j.selected){if(!i.metaKey&&!j.startselected){j.$element.removeClass("ui-selected");j.selected=false;j.$element.addClass("ui-unselecting");j.unselecting=true;c._trigger("unselecting",i,{unselecting:j.element})}}}});return false},_mouseStop:function(d){var b=this;this.dragged=false;var c=this.options;a(".ui-unselecting",this.element[0]).each(function(){var e=a.data(this,"selectable-item");e.$element.removeClass("ui-unselecting");e.unselecting=false;e.startselected=false;b._trigger("unselected",d,{unselected:e.element})});a(".ui-selecting",this.element[0]).each(function(){var e=a.data(this,"selectable-item");e.$element.removeClass("ui-selecting").addClass("ui-selected");e.selecting=false;e.selected=true;e.startselected=true;b._trigger("selected",d,{selected:e.element})});this._trigger("stop",d);this.helper.remove();return false}}));a.extend(a.ui.selectable,{version:"1.7.1",defaults:{appendTo:"body",autoRefresh:true,cancel:":input,option",delay:0,distance:0,filter:"*",tolerance:"touch"}})})(jQuery);;/*
- * jQuery UI Sortable 1.7.1
- *
- * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Sortables
- *
- * Depends:
- * ui.core.js
- */
(function(a){a.widget("ui.sortable",a.extend({},a.ui.mouse,{_init:function(){var b=this.options;this.containerCache={};this.element.addClass("ui-sortable");this.refresh();this.floating=this.items.length?(/left|right/).test(this.items[0].item.css("float")):false;this.offset=this.element.offset();this._mouseInit()},destroy:function(){this.element.removeClass("ui-sortable ui-sortable-disabled").removeData("sortable").unbind(".sortable");this._mouseDestroy();for(var b=this.items.length-1;b>=0;b--){this.items[b].item.removeData("sortable-item")}},_mouseCapture:function(e,f){if(this.reverting){return false}if(this.options.disabled||this.options.type=="static"){return false}this._refreshItems(e);var d=null,c=this,b=a(e.target).parents().each(function(){if(a.data(this,"sortable-item")==c){d=a(this);return false}});if(a.data(e.target,"sortable-item")==c){d=a(e.target)}if(!d){return false}if(this.options.handle&&!f){var g=false;a(this.options.handle,d).find("*").andSelf().each(function(){if(this==e.target){g=true}});if(!g){return false}}this.currentItem=d;this._removeCurrentsFromItems();return true},_mouseStart:function(e,f,b){var g=this.options,c=this;this.currentContainer=this;this.refreshPositions();this.helper=this._createHelper(e);this._cacheHelperProportions();this._cacheMargins();this.scrollParent=this.helper.scrollParent();this.offset=this.currentItem.offset();this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left};this.helper.css("position","absolute");this.cssPosition=this.helper.css("position");a.extend(this.offset,{click:{left:e.pageX-this.offset.left,top:e.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()});this.originalPosition=this._generatePosition(e);this.originalPageX=e.pageX;this.originalPageY=e.pageY;if(g.cursorAt){this._adjustOffsetFromHelper(g.cursorAt)}this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]};if(this.helper[0]!=this.currentItem[0]){this.currentItem.hide()}this._createPlaceholder();if(g.containment){this._setContainment()}if(g.cursor){if(a("body").css("cursor")){this._storedCursor=a("body").css("cursor")}a("body").css("cursor",g.cursor)}if(g.opacity){if(this.helper.css("opacity")){this._storedOpacity=this.helper.css("opacity")}this.helper.css("opacity",g.opacity)}if(g.zIndex){if(this.helper.css("zIndex")){this._storedZIndex=this.helper.css("zIndex")}this.helper.css("zIndex",g.zIndex)}if(this.scrollParent[0]!=document&&this.scrollParent[0].tagName!="HTML"){this.overflowOffset=this.scrollParent.offset()}this._trigger("start",e,this._uiHash());if(!this._preserveHelperProportions){this._cacheHelperProportions()}if(!b){for(var d=this.containers.length-1;d>=0;d--){this.containers[d]._trigger("activate",e,c._uiHash(this))}}if(a.ui.ddmanager){a.ui.ddmanager.current=this}if(a.ui.ddmanager&&!g.dropBehaviour){a.ui.ddmanager.prepareOffsets(this,e)}this.dragging=true;this.helper.addClass("ui-sortable-helper");this._mouseDrag(e);return true},_mouseDrag:function(f){this.position=this._generatePosition(f);this.positionAbs=this._convertPositionTo("absolute");if(!this.lastPositionAbs){this.lastPositionAbs=this.positionAbs}if(this.options.scroll){var g=this.options,b=false;if(this.scrollParent[0]!=document&&this.scrollParent[0].tagName!="HTML"){if((this.overflowOffset.top+this.scrollParent[0].offsetHeight)-f.pageY<g.scrollSensitivity){this.scrollParent[0].scrollTop=b=this.scrollParent[0].scrollTop+g.scrollSpeed}else{if(f.pageY-this.overflowOffset.top<g.scrollSensitivity){this.scrollParent[0].scrollTop=b=this.scrollParent[0].scrollTop-g.scrollSpeed}}if((this.overflowOffset.left+this.scrollParent[0].offsetWidth)-f.pageX<g.scrollSensitivity){this.scrollParent[0].scrollLeft=b=this.scrollParent[0].scrollLeft+g.scrollSpeed}else{if(f.pageX-this.overflowOffset.left<g.scrollSensitivity){this.scrollParent[0].scrollLeft=b=this.scrollParent[0].scrollLeft-g.scrollSpeed}}}else{if(f.pageY-a(document).scrollTop()<g.scrollSensitivity){b=a(document).scrollTop(a(document).scrollTop()-g.scrollSpeed)}else{if(a(window).height()-(f.pageY-a(document).scrollTop())<g.scrollSensitivity){b=a(document).scrollTop(a(document).scrollTop()+g.scrollSpeed)}}if(f.pageX-a(document).scrollLeft()<g.scrollSensitivity){b=a(document).scrollLeft(a(document).scrollLeft()-g.scrollSpeed)}else{if(a(window).width()-(f.pageX-a(document).scrollLeft())<g.scrollSensitivity){b=a(document).scrollLeft(a(document).scrollLeft()+g.scrollSpeed)}}}if(b!==false&&a.ui.ddmanager&&!g.dropBehaviour){a.ui.ddmanager.prepareOffsets(this,f)}}this.positionAbs=this._convertPositionTo("absolute");if(!this.options.axis||this.options.axis!="y"){this.helper[0].style.left=this.position.left+"px"}if(!this.options.axis||this.options.axis!="x"){this.helper[0].style.top=this.position.top+"px"}for(var d=this.items.length-1;d>=0;d--){var e=this.items[d],c=e.item[0],h=this._intersectsWithPointer(e);if(!h){continue}if(c!=this.currentItem[0]&&this.placeholder[h==1?"next":"prev"]()[0]!=c&&!a.ui.contains(this.placeholder[0],c)&&(this.options.type=="semi-dynamic"?!a.ui.contains(this.element[0],c):true)){this.direction=h==1?"down":"up";if(this.options.tolerance=="pointer"||this._intersectsWithSides(e)){this._rearrange(f,e)}else{break}this._trigger("change",f,this._uiHash());break}}this._contactContainers(f);if(a.ui.ddmanager){a.ui.ddmanager.drag(this,f)}this._trigger("sort",f,this._uiHash());this.lastPositionAbs=this.positionAbs;return false},_mouseStop:function(c,d){if(!c){return}if(a.ui.ddmanager&&!this.options.dropBehaviour){a.ui.ddmanager.drop(this,c)}if(this.options.revert){var b=this;var e=b.placeholder.offset();b.reverting=true;a(this.helper).animate({left:e.left-this.offset.parent.left-b.margins.left+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollLeft),top:e.top-this.offset.parent.top-b.margins.top+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollTop)},parseInt(this.options.revert,10)||500,function(){b._clear(c)})}else{this._clear(c,d)}return false},cancel:function(){var b=this;if(this.dragging){this._mouseUp();if(this.options.helper=="original"){this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper")}else{this.currentItem.show()}for(var c=this.containers.length-1;c>=0;c--){this.containers[c]._trigger("deactivate",null,b._uiHash(this));if(this.containers[c].containerCache.over){this.containers[c]._trigger("out",null,b._uiHash(this));this.containers[c].containerCache.over=0}}}if(this.placeholder[0].parentNode){this.placeholder[0].parentNode.removeChild(this.placeholder[0])}if(this.options.helper!="original"&&this.helper&&this.helper[0].parentNode){this.helper.remove()}a.extend(this,{helper:null,dragging:false,reverting:false,_noFinalSort:null});if(this.domPosition.prev){a(this.domPosition.prev).after(this.currentItem)}else{a(this.domPosition.parent).prepend(this.currentItem)}return true},serialize:function(d){var b=this._getItemsAsjQuery(d&&d.connected);var c=[];d=d||{};a(b).each(function(){var e=(a(d.item||this).attr(d.attribute||"id")||"").match(d.expression||(/(.+)[-=_](.+)/));if(e){c.push((d.key||e[1]+"[]")+"="+(d.key&&d.expression?e[1]:e[2]))}});return c.join("&")},toArray:function(d){var b=this._getItemsAsjQuery(d&&d.connected);var c=[];d=d||{};b.each(function(){c.push(a(d.item||this).attr(d.attribute||"id")||"")});return c},_intersectsWith:function(m){var e=this.positionAbs.left,d=e+this.helperProportions.width,k=this.positionAbs.top,j=k+this.helperProportions.height;var f=m.left,c=f+m.width,n=m.top,i=n+m.height;var o=this.offset.click.top,h=this.offset.click.left;var g=(k+o)>n&&(k+o)<i&&(e+h)>f&&(e+h)<c;if(this.options.tolerance=="pointer"||this.options.forcePointerForContainers||(this.options.tolerance!="pointer"&&this.helperProportions[this.floating?"width":"height"]>m[this.floating?"width":"height"])){return g}else{return(f<e+(this.helperProportions.width/2)&&d-(this.helperProportions.width/2)<c&&n<k+(this.helperProportions.height/2)&&j-(this.helperProportions.height/2)<i)}},_intersectsWithPointer:function(d){var e=a.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,d.top,d.height),c=a.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,d.left,d.width),g=e&&c,b=this._getDragVerticalDirection(),f=this._getDragHorizontalDirection();if(!g){return false}return this.floating?(((f&&f=="right")||b=="down")?2:1):(b&&(b=="down"?2:1))},_intersectsWithSides:function(e){var c=a.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,e.top+(e.height/2),e.height),d=a.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,e.left+(e.width/2),e.width),b=this._getDragVerticalDirection(),f=this._getDragHorizontalDirection();if(this.floating&&f){return((f=="right"&&d)||(f=="left"&&!d))}else{return b&&((b=="down"&&c)||(b=="up"&&!c))}},_getDragVerticalDirection:function(){var b=this.positionAbs.top-this.lastPositionAbs.top;return b!=0&&(b>0?"down":"up")},_getDragHorizontalDirection:function(){var b=this.positionAbs.left-this.lastPositionAbs.left;return b!=0&&(b>0?"right":"left")},refresh:function(b){this._refreshItems(b);this.refreshPositions()},_connectWith:function(){var b=this.options;return b.connectWith.constructor==String?[b.connectWith]:b.connectWith},_getItemsAsjQuery:function(b){var l=this;var g=[];var e=[];var h=this._connectWith();if(h&&b){for(var d=h.length-1;d>=0;d--){var k=a(h[d]);for(var c=k.length-1;c>=0;c--){var f=a.data(k[c],"sortable");if(f&&f!=this&&!f.options.disabled){e.push([a.isFunction(f.options.items)?f.options.items.call(f.element):a(f.options.items,f.element).not(".ui-sortable-helper"),f])}}}}e.push([a.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):a(this.options.items,this.element).not(".ui-sortable-helper"),this]);for(var d=e.length-1;d>=0;d--){e[d][0].each(function(){g.push(this)})}return a(g)},_removeCurrentsFromItems:function(){var d=this.currentItem.find(":data(sortable-item)");for(var c=0;c<this.items.length;c++){for(var b=0;b<d.length;b++){if(d[b]==this.items[c].item[0]){this.items.splice(c,1)}}}},_refreshItems:function(b){this.items=[];this.containers=[this];var h=this.items;var p=this;var f=[[a.isFunction(this.options.items)?this.options.items.call(this.element[0],b,{item:this.currentItem}):a(this.options.items,this.element),this]];var l=this._connectWith();if(l){for(var e=l.length-1;e>=0;e--){var m=a(l[e]);for(var d=m.length-1;d>=0;d--){var g=a.data(m[d],"sortable");if(g&&g!=this&&!g.options.disabled){f.push([a.isFunction(g.options.items)?g.options.items.call(g.element[0],b,{item:this.currentItem}):a(g.options.items,g.element),g]);this.containers.push(g)}}}}for(var e=f.length-1;e>=0;e--){var k=f[e][1];var c=f[e][0];for(var d=0,n=c.length;d<n;d++){var o=a(c[d]);o.data("sortable-item",k);h.push({item:o,instance:k,width:0,height:0,left:0,top:0})}}},refreshPositions:function(b){if(this.offsetParent&&this.helper){this.offset.parent=this._getParentOffset()}for(var d=this.items.length-1;d>=0;d--){var e=this.items[d];if(e.instance!=this.currentContainer&&this.currentContainer&&e.item[0]!=this.currentItem[0]){continue}var c=this.options.toleranceElement?a(this.options.toleranceElement,e.item):e.item;if(!b){e.width=c.outerWidth();e.height=c.outerHeight()}var f=c.offset();e.left=f.left;e.top=f.top}if(this.options.custom&&this.options.custom.refreshContainers){this.options.custom.refreshContainers.call(this)}else{for(var d=this.containers.length-1;d>=0;d--){var f=this.containers[d].element.offset();this.containers[d].containerCache.left=f.left;this.containers[d].containerCache.top=f.top;this.containers[d].containerCache.width=this.containers[d].element.outerWidth();this.containers[d].containerCache.height=this.containers[d].element.outerHeight()}}},_createPlaceholder:function(d){var b=d||this,e=b.options;if(!e.placeholder||e.placeholder.constructor==String){var c=e.placeholder;e.placeholder={element:function(){var f=a(document.createElement(b.currentItem[0].nodeName)).addClass(c||b.currentItem[0].className+" ui-sortable-placeholder").removeClass("ui-sortable-helper")[0];if(!c){f.style.visibility="hidden"}return f},update:function(f,g){if(c&&!e.forcePlaceholderSize){return}if(!g.height()){g.height(b.currentItem.innerHeight()-parseInt(b.currentItem.css("paddingTop")||0,10)-parseInt(b.currentItem.css("paddingBottom")||0,10))}if(!g.width()){g.width(b.currentItem.innerWidth()-parseInt(b.currentItem.css("paddingLeft")||0,10)-parseInt(b.currentItem.css("paddingRight")||0,10))}}}}b.placeholder=a(e.placeholder.element.call(b.element,b.currentItem));b.currentItem.after(b.placeholder);e.placeholder.update(b,b.placeholder)},_contactContainers:function(d){for(var c=this.containers.length-1;c>=0;c--){if(this._intersectsWith(this.containers[c].containerCache)){if(!this.containers[c].containerCache.over){if(this.currentContainer!=this.containers[c]){var h=10000;var g=null;var e=this.positionAbs[this.containers[c].floating?"left":"top"];for(var b=this.items.length-1;b>=0;b--){if(!a.ui.contains(this.containers[c].element[0],this.items[b].item[0])){continue}var f=this.items[b][this.containers[c].floating?"left":"top"];if(Math.abs(f-e)<h){h=Math.abs(f-e);g=this.items[b]}}if(!g&&!this.options.dropOnEmpty){continue}this.currentContainer=this.containers[c];g?this._rearrange(d,g,null,true):this._rearrange(d,null,this.containers[c].element,true);this._trigger("change",d,this._uiHash());this.containers[c]._trigger("change",d,this._uiHash(this));this.options.placeholder.update(this.currentContainer,this.placeholder)}this.containers[c]._trigger("over",d,this._uiHash(this));this.containers[c].containerCache.over=1}}else{if(this.containers[c].containerCache.over){this.containers[c]._trigger("out",d,this._uiHash(this));this.containers[c].containerCache.over=0}}}},_createHelper:function(c){var d=this.options;var b=a.isFunction(d.helper)?a(d.helper.apply(this.element[0],[c,this.currentItem])):(d.helper=="clone"?this.currentItem.clone():this.currentItem);if(!b.parents("body").length){a(d.appendTo!="parent"?d.appendTo:this.currentItem[0].parentNode)[0].appendChild(b[0])}if(b[0]==this.currentItem[0]){this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")}}if(b[0].style.width==""||d.forceHelperSize){b.width(this.currentItem.width())}if(b[0].style.height==""||d.forceHelperSize){b.height(this.currentItem.height())}return b},_adjustOffsetFromHelper:function(b){if(b.left!=undefined){this.offset.click.left=b.left+this.margins.left}if(b.right!=undefined){this.offset.click.left=this.helperProportions.width-b.right+this.margins.left}if(b.top!=undefined){this.offset.click.top=b.top+this.margins.top}if(b.bottom!=undefined){this.offset.click.top=this.helperProportions.height-b.bottom+this.margins.top}},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var b=this.offsetParent.offset();if(this.cssPosition=="absolute"&&this.scrollParent[0]!=document&&a.ui.contains(this.scrollParent[0],this.offsetParent[0])){b.left+=this.scrollParent.scrollLeft();b.top+=this.scrollParent.scrollTop()}if((this.offsetParent[0]==document.body)||(this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&a.browser.msie)){b={top:0,left:0}}return{top:b.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:b.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=="relative"){var b=this.currentItem.position();return{top:b.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:b.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}else{return{top:0,left:0}}},_cacheMargins:function(){this.margins={left:(parseInt(this.currentItem.css("marginLeft"),10)||0),top:(parseInt(this.currentItem.css("marginTop"),10)||0)}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var e=this.options;if(e.containment=="parent"){e.containment=this.helper[0].parentNode}if(e.containment=="document"||e.containment=="window"){this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,a(e.containment=="document"?document:window).width()-this.helperProportions.width-this.margins.left,(a(e.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top]}if(!(/^(document|window|parent)$/).test(e.containment)){var c=a(e.containment)[0];var d=a(e.containment).offset();var b=(a(c).css("overflow")!="hidden");this.containment=[d.left+(parseInt(a(c).css("borderLeftWidth"),10)||0)+(parseInt(a(c).css("paddingLeft"),10)||0)-this.margins.left,d.top+(parseInt(a(c).css("borderTopWidth"),10)||0)+(parseInt(a(c).css("paddingTop"),10)||0)-this.margins.top,d.left+(b?Math.max(c.scrollWidth,c.offsetWidth):c.offsetWidth)-(parseInt(a(c).css("borderLeftWidth"),10)||0)-(parseInt(a(c).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,d.top+(b?Math.max(c.scrollHeight,c.offsetHeight):c.offsetHeight)-(parseInt(a(c).css("borderTopWidth"),10)||0)-(parseInt(a(c).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top]}},_convertPositionTo:function(f,h){if(!h){h=this.position}var c=f=="absolute"?1:-1;var e=this.options,b=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&a.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,g=(/(html|body)/i).test(b[0].tagName);return{top:(h.top+this.offset.relative.top*c+this.offset.parent.top*c-(a.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():(g?0:b.scrollTop()))*c)),left:(h.left+this.offset.relative.left*c+this.offset.parent.left*c-(a.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():g?0:b.scrollLeft())*c))}},_generatePosition:function(e){var h=this.options,b=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&a.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,i=(/(html|body)/i).test(b[0].tagName);if(this.cssPosition=="relative"&&!(this.scrollParent[0]!=document&&this.scrollParent[0]!=this.offsetParent[0])){this.offset.relative=this._getRelativeOffset()}var d=e.pageX;var c=e.pageY;if(this.originalPosition){if(this.containment){if(e.pageX-this.offset.click.left<this.containment[0]){d=this.containment[0]+this.offset.click.left}if(e.pageY-this.offset.click.top<this.containment[1]){c=this.containment[1]+this.offset.click.top}if(e.pageX-this.offset.click.left>this.containment[2]){d=this.containment[2]+this.offset.click.left}if(e.pageY-this.offset.click.top>this.containment[3]){c=this.containment[3]+this.offset.click.top}}if(h.grid){var g=this.originalPageY+Math.round((c-this.originalPageY)/h.grid[1])*h.grid[1];c=this.containment?(!(g-this.offset.click.top<this.containment[1]||g-this.offset.click.top>this.containment[3])?g:(!(g-this.offset.click.top<this.containment[1])?g-h.grid[1]:g+h.grid[1])):g;var f=this.originalPageX+Math.round((d-this.originalPageX)/h.grid[0])*h.grid[0];d=this.containment?(!(f-this.offset.click.left<this.containment[0]||f-this.offset.click.left>this.containment[2])?f:(!(f-this.offset.click.left<this.containment[0])?f-h.grid[0]:f+h.grid[0])):f}}return{top:(c-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(a.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():(i?0:b.scrollTop())))),left:(d-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(a.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():i?0:b.scrollLeft())))}},_rearrange:function(g,f,c,e){c?c[0].appendChild(this.placeholder[0]):f.item[0].parentNode.insertBefore(this.placeholder[0],(this.direction=="down"?f.item[0]:f.item[0].nextSibling));this.counter=this.counter?++this.counter:1;var d=this,b=this.counter;window.setTimeout(function(){if(b==d.counter){d.refreshPositions(!e)}},0)},_clear:function(d,e){this.reverting=false;var f=[],b=this;if(!this._noFinalSort&&this.currentItem[0].parentNode){this.placeholder.before(this.currentItem)}this._noFinalSort=null;if(this.helper[0]==this.currentItem[0]){for(var c in this._storedCSS){if(this._storedCSS[c]=="auto"||this._storedCSS[c]=="static"){this._storedCSS[c]=""}}this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper")}else{this.currentItem.show()}if(this.fromOutside&&!e){f.push(function(g){this._trigger("receive",g,this._uiHash(this.fromOutside))})}if((this.fromOutside||this.domPosition.prev!=this.currentItem.prev().not(".ui-sortable-helper")[0]||this.domPosition.parent!=this.currentItem.parent()[0])&&!e){f.push(function(g){this._trigger("update",g,this._uiHash())})}if(!a.ui.contains(this.element[0],this.currentItem[0])){if(!e){f.push(function(g){this._trigger("remove",g,this._uiHash())})}for(var c=this.containers.length-1;c>=0;c--){if(a.ui.contains(this.containers[c].element[0],this.currentItem[0])&&!e){f.push((function(g){return function(h){g._trigger("receive",h,this._uiHash(this))}}).call(this,this.containers[c]));f.push((function(g){return function(h){g._trigger("update",h,this._uiHash(this))}}).call(this,this.containers[c]))}}}for(var c=this.containers.length-1;c>=0;c--){if(!e){f.push((function(g){return function(h){g._trigger("deactivate",h,this._uiHash(this))}}).call(this,this.containers[c]))}if(this.containers[c].containerCache.over){f.push((function(g){return function(h){g._trigger("out",h,this._uiHash(this))}}).call(this,this.containers[c]));this.containers[c].containerCache.over=0}}if(this._storedCursor){a("body").css("cursor",this._storedCursor)}if(this._storedOpacity){this.helper.css("opacity",this._storedOpacity)}if(this._storedZIndex){this.helper.css("zIndex",this._storedZIndex=="auto"?"":this._storedZIndex)}this.dragging=false;if(this.cancelHelperRemoval){if(!e){this._trigger("beforeStop",d,this._uiHash());for(var c=0;c<f.length;c++){f[c].call(this,d)}this._trigger("stop",d,this._uiHash())}return false}if(!e){this._trigger("beforeStop",d,this._uiHash())}this.placeholder[0].parentNode.removeChild(this.placeholder[0]);if(this.helper[0]!=this.currentItem[0]){this.helper.remove()}this.helper=null;if(!e){for(var c=0;c<f.length;c++){f[c].call(this,d)}this._trigger("stop",d,this._uiHash())}this.fromOutside=false;return true},_trigger:function(){if(a.widget.prototype._trigger.apply(this,arguments)===false){this.cancel()}},_uiHash:function(c){var b=c||this;return{helper:b.helper,placeholder:b.placeholder||a([]),position:b.position,absolutePosition:b.positionAbs,offset:b.positionAbs,item:b.currentItem,sender:c?c.element:null}}}));a.extend(a.ui.sortable,{getter:"serialize toArray",version:"1.7.1",eventPrefix:"sort",defaults:{appendTo:"parent",axis:false,cancel:":input,option",connectWith:false,containment:false,cursor:"auto",cursorAt:false,delay:0,distance:1,dropOnEmpty:true,forcePlaceholderSize:false,forceHelperSize:false,grid:false,handle:false,helper:"original",items:"> *",opacity:false,placeholder:false,revert:false,scroll:true,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1000}})})(jQuery);;/*
- * jQuery UI Accordion 1.7.1
- *
- * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Accordion
- *
- * Depends:
- * ui.core.js
- */
(function(a){a.widget("ui.accordion",{_init:function(){var d=this.options,b=this;this.running=0;if(d.collapsible==a.ui.accordion.defaults.collapsible&&d.alwaysOpen!=a.ui.accordion.defaults.alwaysOpen){d.collapsible=!d.alwaysOpen}if(d.navigation){var c=this.element.find("a").filter(d.navigationFilter);if(c.length){if(c.filter(d.header).length){this.active=c}else{this.active=c.parent().parent().prev();c.addClass("ui-accordion-content-active")}}}this.element.addClass("ui-accordion ui-widget ui-helper-reset");if(this.element[0].nodeName=="UL"){this.element.children("li").addClass("ui-accordion-li-fix")}this.headers=this.element.find(d.header).addClass("ui-accordion-header ui-helper-reset ui-state-default ui-corner-all").bind("mouseenter.accordion",function(){a(this).addClass("ui-state-hover")}).bind("mouseleave.accordion",function(){a(this).removeClass("ui-state-hover")}).bind("focus.accordion",function(){a(this).addClass("ui-state-focus")}).bind("blur.accordion",function(){a(this).removeClass("ui-state-focus")});this.headers.next().addClass("ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom");this.active=this._findActive(this.active||d.active).toggleClass("ui-state-default").toggleClass("ui-state-active").toggleClass("ui-corner-all").toggleClass("ui-corner-top");this.active.next().addClass("ui-accordion-content-active");a("<span/>").addClass("ui-icon "+d.icons.header).prependTo(this.headers);this.active.find(".ui-icon").toggleClass(d.icons.header).toggleClass(d.icons.headerSelected);if(a.browser.msie){this.element.find("a").css("zoom","1")}this.resize();this.element.attr("role","tablist");this.headers.attr("role","tab").bind("keydown",function(e){return b._keydown(e)}).next().attr("role","tabpanel");this.headers.not(this.active||"").attr("aria-expanded","false").attr("tabIndex","-1").next().hide();if(!this.active.length){this.headers.eq(0).attr("tabIndex","0")}else{this.active.attr("aria-expanded","true").attr("tabIndex","0")}if(!a.browser.safari){this.headers.find("a").attr("tabIndex","-1")}if(d.event){this.headers.bind((d.event)+".accordion",function(e){return b._clickHandler.call(b,e,this)})}},destroy:function(){var c=this.options;this.element.removeClass("ui-accordion ui-widget ui-helper-reset").removeAttr("role").unbind(".accordion").removeData("accordion");this.headers.unbind(".accordion").removeClass("ui-accordion-header ui-helper-reset ui-state-default ui-corner-all ui-state-active ui-corner-top").removeAttr("role").removeAttr("aria-expanded").removeAttr("tabindex");this.headers.find("a").removeAttr("tabindex");this.headers.children(".ui-icon").remove();var b=this.headers.next().css("display","").removeAttr("role").removeClass("ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content ui-accordion-content-active");if(c.autoHeight||c.fillHeight){b.css("height","")}},_setData:function(b,c){if(b=="alwaysOpen"){b="collapsible";c=!c}a.widget.prototype._setData.apply(this,arguments)},_keydown:function(e){var g=this.options,f=a.ui.keyCode;if(g.disabled||e.altKey||e.ctrlKey){return}var d=this.headers.length;var b=this.headers.index(e.target);var c=false;switch(e.keyCode){case f.RIGHT:case f.DOWN:c=this.headers[(b+1)%d];break;case f.LEFT:case f.UP:c=this.headers[(b-1+d)%d];break;case f.SPACE:case f.ENTER:return this._clickHandler({target:e.target},e.target)}if(c){a(e.target).attr("tabIndex","-1");a(c).attr("tabIndex","0");c.focus();return false}return true},resize:function(){var e=this.options,d;if(e.fillSpace){if(a.browser.msie){var b=this.element.parent().css("overflow");this.element.parent().css("overflow","hidden")}d=this.element.parent().height();if(a.browser.msie){this.element.parent().css("overflow",b)}this.headers.each(function(){d-=a(this).outerHeight()});var c=0;this.headers.next().each(function(){c=Math.max(c,a(this).innerHeight()-a(this).height())}).height(Math.max(0,d-c)).css("overflow","auto")}else{if(e.autoHeight){d=0;this.headers.next().each(function(){d=Math.max(d,a(this).outerHeight())}).height(d)}}},activate:function(b){var c=this._findActive(b)[0];this._clickHandler({target:c},c)},_findActive:function(b){return b?typeof b=="number"?this.headers.filter(":eq("+b+")"):this.headers.not(this.headers.not(b)):b===false?a([]):this.headers.filter(":eq(0)")},_clickHandler:function(b,f){var d=this.options;if(d.disabled){return false}if(!b.target&&d.collapsible){this.active.removeClass("ui-state-active ui-corner-top").addClass("ui-state-default ui-corner-all").find(".ui-icon").removeClass(d.icons.headerSelected).addClass(d.icons.header);this.active.next().addClass("ui-accordion-content-active");var h=this.active.next(),e={options:d,newHeader:a([]),oldHeader:d.active,newContent:a([]),oldContent:h},c=(this.active=a([]));this._toggle(c,h,e);return false}var g=a(b.currentTarget||f);var i=g[0]==this.active[0];if(this.running||(!d.collapsible&&i)){return false}this.active.removeClass("ui-state-active ui-corner-top").addClass("ui-state-default ui-corner-all").find(".ui-icon").removeClass(d.icons.headerSelected).addClass(d.icons.header);this.active.next().addClass("ui-accordion-content-active");if(!i){g.removeClass("ui-state-default ui-corner-all").addClass("ui-state-active ui-corner-top").find(".ui-icon").removeClass(d.icons.header).addClass(d.icons.headerSelected);g.next().addClass("ui-accordion-content-active")}var c=g.next(),h=this.active.next(),e={options:d,newHeader:i&&d.collapsible?a([]):g,oldHeader:this.active,newContent:i&&d.collapsible?a([]):c.find("> *"),oldContent:h.find("> *")},j=this.headers.index(this.active[0])>this.headers.index(g[0]);this.active=i?a([]):g;this._toggle(c,h,e,i,j);return false},_toggle:function(b,i,g,j,k){var d=this.options,m=this;this.toShow=b;this.toHide=i;this.data=g;var c=function(){if(!m){return}return m._completed.apply(m,arguments)};this._trigger("changestart",null,this.data);this.running=i.size()===0?b.size():i.size();if(d.animated){var f={};if(d.collapsible&&j){f={toShow:a([]),toHide:i,complete:c,down:k,autoHeight:d.autoHeight||d.fillSpace}}else{f={toShow:b,toHide:i,complete:c,down:k,autoHeight:d.autoHeight||d.fillSpace}}if(!d.proxied){d.proxied=d.animated}if(!d.proxiedDuration){d.proxiedDuration=d.duration}d.animated=a.isFunction(d.proxied)?d.proxied(f):d.proxied;d.duration=a.isFunction(d.proxiedDuration)?d.proxiedDuration(f):d.proxiedDuration;var l=a.ui.accordion.animations,e=d.duration,h=d.animated;if(!l[h]){l[h]=function(n){this.slide(n,{easing:h,duration:e||700})}}l[h](f)}else{if(d.collapsible&&j){b.toggle()}else{i.hide();b.show()}c(true)}i.prev().attr("aria-expanded","false").attr("tabIndex","-1").blur();b.prev().attr("aria-expanded","true").attr("tabIndex","0").focus()},_completed:function(b){var c=this.options;this.running=b?0:--this.running;if(this.running){return}if(c.clearStyle){this.toShow.add(this.toHide).css({height:"",overflow:""})}this._trigger("change",null,this.data)}});a.extend(a.ui.accordion,{version:"1.7.1",defaults:{active:null,alwaysOpen:true,animated:"slide",autoHeight:true,clearStyle:false,collapsible:false,event:"click",fillSpace:false,header:"> li > :first-child,> :not(li):even",icons:{header:"ui-icon-triangle-1-e",headerSelected:"ui-icon-triangle-1-s"},navigation:false,navigationFilter:function(){return this.href.toLowerCase()==location.href.toLowerCase()}},animations:{slide:function(j,h){j=a.extend({easing:"swing",duration:300},j,h);if(!j.toHide.size()){j.toShow.animate({height:"show"},j);return}if(!j.toShow.size()){j.toHide.animate({height:"hide"},j);return}var c=j.toShow.css("overflow"),g,d={},f={},e=["height","paddingTop","paddingBottom"],b;var i=j.toShow;b=i[0].style.width;i.width(parseInt(i.parent().width(),10)-parseInt(i.css("paddingLeft"),10)-parseInt(i.css("paddingRight"),10)-(parseInt(i.css("borderLeftWidth"),10)||0)-(parseInt(i.css("borderRightWidth"),10)||0));a.each(e,function(k,m){f[m]="hide";var l=(""+a.css(j.toShow[0],m)).match(/^([\d+-.]+)(.*)$/);d[m]={value:l[1],unit:l[2]||"px"}});j.toShow.css({height:0,overflow:"hidden"}).show();j.toHide.filter(":hidden").each(j.complete).end().filter(":visible").animate(f,{step:function(k,l){if(l.prop=="height"){g=(l.now-l.start)/(l.end-l.start)}j.toShow[0].style[l.prop]=(g*d[l.prop].value)+d[l.prop].unit},duration:j.duration,easing:j.easing,complete:function(){if(!j.autoHeight){j.toShow.css("height","")}j.toShow.css("width",b);j.toShow.css({overflow:c});j.complete()}})},bounceslide:function(b){this.slide(b,{easing:b.down?"easeOutBounce":"swing",duration:b.down?1000:200})},easeslide:function(b){this.slide(b,{easing:"easeinout",duration:700})}}})})(jQuery);;/*
- * jQuery UI Dialog 1.7.1
- *
- * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Dialog
- *
- * Depends:
- * ui.core.js
- * ui.draggable.js
- * ui.resizable.js
- */
(function(c){var b={dragStart:"start.draggable",drag:"drag.draggable",dragStop:"stop.draggable",maxHeight:"maxHeight.resizable",minHeight:"minHeight.resizable",maxWidth:"maxWidth.resizable",minWidth:"minWidth.resizable",resizeStart:"start.resizable",resize:"drag.resizable",resizeStop:"stop.resizable"},a="ui-dialog ui-widget ui-widget-content ui-corner-all ";c.widget("ui.dialog",{_init:function(){this.originalTitle=this.element.attr("title");var l=this,m=this.options,j=m.title||this.originalTitle||" ",e=c.ui.dialog.getTitleId(this.element),k=(this.uiDialog=c("<div/>")).appendTo(document.body).hide().addClass(a+m.dialogClass).css({position:"absolute",overflow:"hidden",zIndex:m.zIndex}).attr("tabIndex",-1).css("outline",0).keydown(function(n){(m.closeOnEscape&&n.keyCode&&n.keyCode==c.ui.keyCode.ESCAPE&&l.close(n))}).attr({role:"dialog","aria-labelledby":e}).mousedown(function(n){l.moveToTop(false,n)}),g=this.element.show().removeAttr("title").addClass("ui-dialog-content ui-widget-content").appendTo(k),f=(this.uiDialogTitlebar=c("<div></div>")).addClass("ui-dialog-titlebar ui-widget-header ui-corner-all ui-helper-clearfix").prependTo(k),i=c('<a href="#"/>').addClass("ui-dialog-titlebar-close ui-corner-all").attr("role","button").hover(function(){i.addClass("ui-state-hover")},function(){i.removeClass("ui-state-hover")}).focus(function(){i.addClass("ui-state-focus")}).blur(function(){i.removeClass("ui-state-focus")}).mousedown(function(n){n.stopPropagation()}).click(function(n){l.close(n);return false}).appendTo(f),h=(this.uiDialogTitlebarCloseText=c("<span/>")).addClass("ui-icon ui-icon-closethick").text(m.closeText).appendTo(i),d=c("<span/>").addClass("ui-dialog-title").attr("id",e).html(j).prependTo(f);f.find("*").add(f).disableSelection();(m.draggable&&c.fn.draggable&&this._makeDraggable());(m.resizable&&c.fn.resizable&&this._makeResizable());this._createButtons(m.buttons);this._isOpen=false;(m.bgiframe&&c.fn.bgiframe&&k.bgiframe());(m.autoOpen&&this.open())},destroy:function(){(this.overlay&&this.overlay.destroy());this.uiDialog.hide();this.element.unbind(".dialog").removeData("dialog").removeClass("ui-dialog-content ui-widget-content").hide().appendTo("body");this.uiDialog.remove();(this.originalTitle&&this.element.attr("title",this.originalTitle))},close:function(e){var d=this;if(false===d._trigger("beforeclose",e)){return}(d.overlay&&d.overlay.destroy());d.uiDialog.unbind("keypress.ui-dialog");(d.options.hide?d.uiDialog.hide(d.options.hide,function(){d._trigger("close",e)}):d.uiDialog.hide()&&d._trigger("close",e));c.ui.dialog.overlay.resize();d._isOpen=false},isOpen:function(){return this._isOpen},moveToTop:function(f,e){if((this.options.modal&&!f)||(!this.options.stack&&!this.options.modal)){return this._trigger("focus",e)}if(this.options.zIndex>c.ui.dialog.maxZ){c.ui.dialog.maxZ=this.options.zIndex}(this.overlay&&this.overlay.$el.css("z-index",c.ui.dialog.overlay.maxZ=++c.ui.dialog.maxZ));var d={scrollTop:this.element.attr("scrollTop"),scrollLeft:this.element.attr("scrollLeft")};this.uiDialog.css("z-index",++c.ui.dialog.maxZ);this.element.attr(d);this._trigger("focus",e)},open:function(){if(this._isOpen){return}var e=this.options,d=this.uiDialog;this.overlay=e.modal?new c.ui.dialog.overlay(this):null;(d.next().length&&d.appendTo("body"));this._size();this._position(e.position);d.show(e.show);this.moveToTop(true);(e.modal&&d.bind("keypress.ui-dialog",function(h){if(h.keyCode!=c.ui.keyCode.TAB){return}var g=c(":tabbable",this),i=g.filter(":first")[0],f=g.filter(":last")[0];if(h.target==f&&!h.shiftKey){setTimeout(function(){i.focus()},1)}else{if(h.target==i&&h.shiftKey){setTimeout(function(){f.focus()},1)}}}));c([]).add(d.find(".ui-dialog-content :tabbable:first")).add(d.find(".ui-dialog-buttonpane :tabbable:first")).add(d).filter(":first").focus();this._trigger("open");this._isOpen=true},_createButtons:function(g){var f=this,d=false,e=c("<div></div>").addClass("ui-dialog-buttonpane ui-widget-content ui-helper-clearfix");this.uiDialog.find(".ui-dialog-buttonpane").remove();(typeof g=="object"&&g!==null&&c.each(g,function(){return !(d=true)}));if(d){c.each(g,function(h,i){c('<button type="button"></button>').addClass("ui-state-default ui-corner-all").text(h).click(function(){i.apply(f.element[0],arguments)}).hover(function(){c(this).addClass("ui-state-hover")},function(){c(this).removeClass("ui-state-hover")}).focus(function(){c(this).addClass("ui-state-focus")}).blur(function(){c(this).removeClass("ui-state-focus")}).appendTo(e)});e.appendTo(this.uiDialog)}},_makeDraggable:function(){var d=this,f=this.options,e;this.uiDialog.draggable({cancel:".ui-dialog-content",handle:".ui-dialog-titlebar",containment:"document",start:function(){e=f.height;c(this).height(c(this).height()).addClass("ui-dialog-dragging");(f.dragStart&&f.dragStart.apply(d.element[0],arguments))},drag:function(){(f.drag&&f.drag.apply(d.element[0],arguments))},stop:function(){c(this).removeClass("ui-dialog-dragging").height(e);(f.dragStop&&f.dragStop.apply(d.element[0],arguments));c.ui.dialog.overlay.resize()}})},_makeResizable:function(g){g=(g===undefined?this.options.resizable:g);var d=this,f=this.options,e=typeof g=="string"?g:"n,e,s,w,se,sw,ne,nw";this.uiDialog.resizable({cancel:".ui-dialog-content",alsoResize:this.element,maxWidth:f.maxWidth,maxHeight:f.maxHeight,minWidth:f.minWidth,minHeight:f.minHeight,start:function(){c(this).addClass("ui-dialog-resizing");(f.resizeStart&&f.resizeStart.apply(d.element[0],arguments))},resize:function(){(f.resize&&f.resize.apply(d.element[0],arguments))},handles:e,stop:function(){c(this).removeClass("ui-dialog-resizing");f.height=c(this).height();f.width=c(this).width();(f.resizeStop&&f.resizeStop.apply(d.element[0],arguments));c.ui.dialog.overlay.resize()}}).find(".ui-resizable-se").addClass("ui-icon ui-icon-grip-diagonal-se")},_position:function(i){var e=c(window),f=c(document),g=f.scrollTop(),d=f.scrollLeft(),h=g;if(c.inArray(i,["center","top","right","bottom","left"])>=0){i=[i=="right"||i=="left"?i:"center",i=="top"||i=="bottom"?i:"middle"]}if(i.constructor!=Array){i=["center","middle"]}if(i[0].constructor==Number){d+=i[0]}else{switch(i[0]){case"left":d+=0;break;case"right":d+=e.width()-this.uiDialog.outerWidth();break;default:case"center":d+=(e.width()-this.uiDialog.outerWidth())/2}}if(i[1].constructor==Number){g+=i[1]}else{switch(i[1]){case"top":g+=0;break;case"bottom":g+=e.height()-this.uiDialog.outerHeight();break;default:case"middle":g+=(e.height()-this.uiDialog.outerHeight())/2}}g=Math.max(g,h);this.uiDialog.css({top:g,left:d})},_setData:function(e,f){(b[e]&&this.uiDialog.data(b[e],f));switch(e){case"buttons":this._createButtons(f);break;case"closeText":this.uiDialogTitlebarCloseText.text(f);break;case"dialogClass":this.uiDialog.removeClass(this.options.dialogClass).addClass(a+f);break;case"draggable":(f?this._makeDraggable():this.uiDialog.draggable("destroy"));break;case"height":this.uiDialog.height(f);break;case"position":this._position(f);break;case"resizable":var d=this.uiDialog,g=this.uiDialog.is(":data(resizable)");(g&&!f&&d.resizable("destroy"));(g&&typeof f=="string"&&d.resizable("option","handles",f));(g||this._makeResizable(f));break;case"title":c(".ui-dialog-title",this.uiDialogTitlebar).html(f||" ");break;case"width":this.uiDialog.width(f);break}c.widget.prototype._setData.apply(this,arguments)},_size:function(){var e=this.options;this.element.css({height:0,minHeight:0,width:"auto"});var d=this.uiDialog.css({height:"auto",width:e.width}).height();this.element.css({minHeight:Math.max(e.minHeight-d,0),height:e.height=="auto"?"auto":Math.max(e.height-d,0)})}});c.extend(c.ui.dialog,{version:"1.7.1",defaults:{autoOpen:true,bgiframe:false,buttons:{},closeOnEscape:true,closeText:"close",dialogClass:"",draggable:true,hide:null,height:"auto",maxHeight:false,maxWidth:false,minHeight:150,minWidth:150,modal:false,position:"center",resizable:true,show:null,stack:true,title:"",width:300,zIndex:1000},getter:"isOpen",uuid:0,maxZ:0,getTitleId:function(d){return"ui-dialog-title-"+(d.attr("id")||++this.uuid)},overlay:function(d){this.$el=c.ui.dialog.overlay.create(d)}});c.extend(c.ui.dialog.overlay,{instances:[],maxZ:0,events:c.map("focus,mousedown,mouseup,keydown,keypress,click".split(","),function(d){return d+".dialog-overlay"}).join(" "),create:function(e){if(this.instances.length===0){setTimeout(function(){c(document).bind(c.ui.dialog.overlay.events,function(f){var g=c(f.target).parents(".ui-dialog").css("zIndex")||0;return(g>c.ui.dialog.overlay.maxZ)})},1);c(document).bind("keydown.dialog-overlay",function(f){(e.options.closeOnEscape&&f.keyCode&&f.keyCode==c.ui.keyCode.ESCAPE&&e.close(f))});c(window).bind("resize.dialog-overlay",c.ui.dialog.overlay.resize)}var d=c("<div></div>").appendTo(document.body).addClass("ui-widget-overlay").css({width:this.width(),height:this.height()});(e.options.bgiframe&&c.fn.bgiframe&&d.bgiframe());this.instances.push(d);return d},destroy:function(d){this.instances.splice(c.inArray(this.instances,d),1);if(this.instances.length===0){c([document,window]).unbind(".dialog-overlay")}d.remove()},height:function(){if(c.browser.msie&&c.browser.version<7){var e=Math.max(document.documentElement.scrollHeight,document.body.scrollHeight);var d=Math.max(document.documentElement.offsetHeight,document.body.offsetHeight);if(e<d){return c(window).height()+"px"}else{return e+"px"}}else{return c(document).height()+"px"}},width:function(){if(c.browser.msie&&c.browser.version<7){var d=Math.max(document.documentElement.scrollWidth,document.body.scrollWidth);var e=Math.max(document.documentElement.offsetWidth,document.body.offsetWidth);if(d<e){return c(window).width()+"px"}else{return d+"px"}}else{return c(document).width()+"px"}},resize:function(){var d=c([]);c.each(c.ui.dialog.overlay.instances,function(){d=d.add(this)});d.css({width:0,height:0}).css({width:c.ui.dialog.overlay.width(),height:c.ui.dialog.overlay.height()})}});c.extend(c.ui.dialog.overlay.prototype,{destroy:function(){c.ui.dialog.overlay.destroy(this.$el)}})})(jQuery);;/*
- * jQuery UI Slider 1.7.1
- *
- * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Slider
- *
- * Depends:
- * ui.core.js
- */
(function(a){a.widget("ui.slider",a.extend({},a.ui.mouse,{_init:function(){var b=this,c=this.options;this._keySliding=false;this._handleIndex=null;this._detectOrientation();this._mouseInit();this.element.addClass("ui-slider ui-slider-"+this.orientation+" ui-widget ui-widget-content ui-corner-all");this.range=a([]);if(c.range){if(c.range===true){this.range=a("<div></div>");if(!c.values){c.values=[this._valueMin(),this._valueMin()]}if(c.values.length&&c.values.length!=2){c.values=[c.values[0],c.values[0]]}}else{this.range=a("<div></div>")}this.range.appendTo(this.element).addClass("ui-slider-range");if(c.range=="min"||c.range=="max"){this.range.addClass("ui-slider-range-"+c.range)}this.range.addClass("ui-widget-header")}if(a(".ui-slider-handle",this.element).length==0){a('<a href="#"></a>').appendTo(this.element).addClass("ui-slider-handle")}if(c.values&&c.values.length){while(a(".ui-slider-handle",this.element).length<c.values.length){a('<a href="#"></a>').appendTo(this.element).addClass("ui-slider-handle")}}this.handles=a(".ui-slider-handle",this.element).addClass("ui-state-default ui-corner-all");this.handle=this.handles.eq(0);this.handles.add(this.range).filter("a").click(function(d){d.preventDefault()}).hover(function(){a(this).addClass("ui-state-hover")},function(){a(this).removeClass("ui-state-hover")}).focus(function(){a(".ui-slider .ui-state-focus").removeClass("ui-state-focus");a(this).addClass("ui-state-focus")}).blur(function(){a(this).removeClass("ui-state-focus")});this.handles.each(function(d){a(this).data("index.ui-slider-handle",d)});this.handles.keydown(function(i){var f=true;var e=a(this).data("index.ui-slider-handle");if(b.options.disabled){return}switch(i.keyCode){case a.ui.keyCode.HOME:case a.ui.keyCode.END:case a.ui.keyCode.UP:case a.ui.keyCode.RIGHT:case a.ui.keyCode.DOWN:case a.ui.keyCode.LEFT:f=false;if(!b._keySliding){b._keySliding=true;a(this).addClass("ui-state-active");b._start(i,e)}break}var g,d,h=b._step();if(b.options.values&&b.options.values.length){g=d=b.values(e)}else{g=d=b.value()}switch(i.keyCode){case a.ui.keyCode.HOME:d=b._valueMin();break;case a.ui.keyCode.END:d=b._valueMax();break;case a.ui.keyCode.UP:case a.ui.keyCode.RIGHT:if(g==b._valueMax()){return}d=g+h;break;case a.ui.keyCode.DOWN:case a.ui.keyCode.LEFT:if(g==b._valueMin()){return}d=g-h;break}b._slide(i,e,d);return f}).keyup(function(e){var d=a(this).data("index.ui-slider-handle");if(b._keySliding){b._stop(e,d);b._change(e,d);b._keySliding=false;a(this).removeClass("ui-state-active")}});this._refreshValue()},destroy:function(){this.handles.remove();this.range.remove();this.element.removeClass("ui-slider ui-slider-horizontal ui-slider-vertical ui-slider-disabled ui-widget ui-widget-content ui-corner-all").removeData("slider").unbind(".slider");this._mouseDestroy()},_mouseCapture:function(d){var e=this.options;if(e.disabled){return false}this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()};this.elementOffset=this.element.offset();var h={x:d.pageX,y:d.pageY};var j=this._normValueFromMouse(h);var c=this._valueMax()-this._valueMin()+1,f;var k=this,i;this.handles.each(function(l){var m=Math.abs(j-k.values(l));if(c>m){c=m;f=a(this);i=l}});if(e.range==true&&this.values(1)==e.min){f=a(this.handles[++i])}this._start(d,i);k._handleIndex=i;f.addClass("ui-state-active").focus();var g=f.offset();var b=!a(d.target).parents().andSelf().is(".ui-slider-handle");this._clickOffset=b?{left:0,top:0}:{left:d.pageX-g.left-(f.width()/2),top:d.pageY-g.top-(f.height()/2)-(parseInt(f.css("borderTopWidth"),10)||0)-(parseInt(f.css("borderBottomWidth"),10)||0)+(parseInt(f.css("marginTop"),10)||0)};j=this._normValueFromMouse(h);this._slide(d,i,j);return true},_mouseStart:function(b){return true},_mouseDrag:function(d){var b={x:d.pageX,y:d.pageY};var c=this._normValueFromMouse(b);this._slide(d,this._handleIndex,c);return false},_mouseStop:function(b){this.handles.removeClass("ui-state-active");this._stop(b,this._handleIndex);this._change(b,this._handleIndex);this._handleIndex=null;this._clickOffset=null;return false},_detectOrientation:function(){this.orientation=this.options.orientation=="vertical"?"vertical":"horizontal"},_normValueFromMouse:function(d){var c,h;if("horizontal"==this.orientation){c=this.elementSize.width;h=d.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)}else{c=this.elementSize.height;h=d.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)}var f=(h/c);if(f>1){f=1}if(f<0){f=0}if("vertical"==this.orientation){f=1-f}var e=this._valueMax()-this._valueMin(),i=f*e,b=i%this.options.step,g=this._valueMin()+i-b;if(b>(this.options.step/2)){g+=this.options.step}return parseFloat(g.toFixed(5))},_start:function(d,c){var b={handle:this.handles[c],value:this.value()};if(this.options.values&&this.options.values.length){b.value=this.values(c);b.values=this.values()}this._trigger("start",d,b)},_slide:function(f,e,d){var g=this.handles[e];if(this.options.values&&this.options.values.length){var b=this.values(e?0:1);if((e==0&&d>=b)||(e==1&&d<=b)){d=b}if(d!=this.values(e)){var c=this.values();c[e]=d;var h=this._trigger("slide",f,{handle:this.handles[e],value:d,values:c});var b=this.values(e?0:1);if(h!==false){this.values(e,d,(f.type=="mousedown"&&this.options.animate),true)}}}else{if(d!=this.value()){var h=this._trigger("slide",f,{handle:this.handles[e],value:d});if(h!==false){this._setData("value",d,(f.type=="mousedown"&&this.options.animate))}}}},_stop:function(d,c){var b={handle:this.handles[c],value:this.value()};if(this.options.values&&this.options.values.length){b.value=this.values(c);b.values=this.values()}this._trigger("stop",d,b)},_change:function(d,c){var b={handle:this.handles[c],value:this.value()};if(this.options.values&&this.options.values.length){b.value=this.values(c);b.values=this.values()}this._trigger("change",d,b)},value:function(b){if(arguments.length){this._setData("value",b);this._change(null,0)}return this._value()},values:function(b,e,c,d){if(arguments.length>1){this.options.values[b]=e;this._refreshValue(c);if(!d){this._change(null,b)}}if(arguments.length){if(this.options.values&&this.options.values.length){return this._values(b)}else{return this.value()}}else{return this._values()}},_setData:function(b,d,c){a.widget.prototype._setData.apply(this,arguments);switch(b){case"orientation":this._detectOrientation();this.element.removeClass("ui-slider-horizontal ui-slider-vertical").addClass("ui-slider-"+this.orientation);this._refreshValue(c);break;case"value":this._refreshValue(c);break}},_step:function(){var b=this.options.step;return b},_value:function(){var b=this.options.value;if(b<this._valueMin()){b=this._valueMin()}if(b>this._valueMax()){b=this._valueMax()}return b},_values:function(b){if(arguments.length){var c=this.options.values[b];if(c<this._valueMin()){c=this._valueMin()}if(c>this._valueMax()){c=this._valueMax()}return c}else{return this.options.values}},_valueMin:function(){var b=this.options.min;return b},_valueMax:function(){var b=this.options.max;return b},_refreshValue:function(c){var f=this.options.range,d=this.options,l=this;if(this.options.values&&this.options.values.length){var i,h;this.handles.each(function(p,n){var o=(l.values(p)-l._valueMin())/(l._valueMax()-l._valueMin())*100;var m={};m[l.orientation=="horizontal"?"left":"bottom"]=o+"%";a(this).stop(1,1)[c?"animate":"css"](m,d.animate);if(l.options.range===true){if(l.orientation=="horizontal"){(p==0)&&l.range.stop(1,1)[c?"animate":"css"]({left:o+"%"},d.animate);(p==1)&&l.range[c?"animate":"css"]({width:(o-lastValPercent)+"%"},{queue:false,duration:d.animate})}else{(p==0)&&l.range.stop(1,1)[c?"animate":"css"]({bottom:(o)+"%"},d.animate);(p==1)&&l.range[c?"animate":"css"]({height:(o-lastValPercent)+"%"},{queue:false,duration:d.animate})}}lastValPercent=o})}else{var j=this.value(),g=this._valueMin(),k=this._valueMax(),e=k!=g?(j-g)/(k-g)*100:0;var b={};b[l.orientation=="horizontal"?"left":"bottom"]=e+"%";this.handle.stop(1,1)[c?"animate":"css"](b,d.animate);(f=="min")&&(this.orientation=="horizontal")&&this.range.stop(1,1)[c?"animate":"css"]({width:e+"%"},d.animate);(f=="max")&&(this.orientation=="horizontal")&&this.range[c?"animate":"css"]({width:(100-e)+"%"},{queue:false,duration:d.animate});(f=="min")&&(this.orientation=="vertical")&&this.range.stop(1,1)[c?"animate":"css"]({height:e+"%"},d.animate);(f=="max")&&(this.orientation=="vertical")&&this.range[c?"animate":"css"]({height:(100-e)+"%"},{queue:false,duration:d.animate})}}}));a.extend(a.ui.slider,{getter:"value values",version:"1.7.1",eventPrefix:"slide",defaults:{animate:false,delay:0,distance:0,max:100,min:0,orientation:"horizontal",range:false,step:1,value:0,values:null}})})(jQuery);;/*
- * jQuery UI Tabs 1.7.1
- *
- * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Tabs
- *
- * Depends:
- * ui.core.js
- */
(function(a){a.widget("ui.tabs",{_init:function(){if(this.options.deselectable!==undefined){this.options.collapsible=this.options.deselectable}this._tabify(true)},_setData:function(b,c){if(b=="selected"){if(this.options.collapsible&&c==this.options.selected){return}this.select(c)}else{this.options[b]=c;if(b=="deselectable"){this.options.collapsible=c}this._tabify()}},_tabId:function(b){return b.title&&b.title.replace(/\s/g,"_").replace(/[^A-Za-z0-9\-_:\.]/g,"")||this.options.idPrefix+a.data(b)},_sanitizeSelector:function(b){return b.replace(/:/g,"\\:")},_cookie:function(){var b=this.cookie||(this.cookie=this.options.cookie.name||"ui-tabs-"+a.data(this.list[0]));return a.cookie.apply(null,[b].concat(a.makeArray(arguments)))},_ui:function(c,b){return{tab:c,panel:b,index:this.anchors.index(c)}},_cleanup:function(){this.lis.filter(".ui-state-processing").removeClass("ui-state-processing").find("span:data(label.tabs)").each(function(){var b=a(this);b.html(b.data("label.tabs")).removeData("label.tabs")})},_tabify:function(n){this.list=this.element.children("ul:first");this.lis=a("li:has(a[href])",this.list);this.anchors=this.lis.map(function(){return a("a",this)[0]});this.panels=a([]);var p=this,d=this.options;var c=/^#.+/;this.anchors.each(function(r,o){var q=a(o).attr("href");var s=q.split("#")[0],u;if(s&&(s===location.toString().split("#")[0]||(u=a("base")[0])&&s===u.href)){q=o.hash;o.href=q}if(c.test(q)){p.panels=p.panels.add(p._sanitizeSelector(q))}else{if(q!="#"){a.data(o,"href.tabs",q);a.data(o,"load.tabs",q.replace(/#.*$/,""));var w=p._tabId(o);o.href="#"+w;var v=a("#"+w);if(!v.length){v=a(d.panelTemplate).attr("id",w).addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").insertAfter(p.panels[r-1]||p.list);v.data("destroy.tabs",true)}p.panels=p.panels.add(v)}else{d.disabled.push(r)}}});if(n){this.element.addClass("ui-tabs ui-widget ui-widget-content ui-corner-all");this.list.addClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all");this.lis.addClass("ui-state-default ui-corner-top");this.panels.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom");if(d.selected===undefined){if(location.hash){this.anchors.each(function(q,o){if(o.hash==location.hash){d.selected=q;return false}})}if(typeof d.selected!="number"&&d.cookie){d.selected=parseInt(p._cookie(),10)}if(typeof d.selected!="number"&&this.lis.filter(".ui-tabs-selected").length){d.selected=this.lis.index(this.lis.filter(".ui-tabs-selected"))}d.selected=d.selected||0}else{if(d.selected===null){d.selected=-1}}d.selected=((d.selected>=0&&this.anchors[d.selected])||d.selected<0)?d.selected:0;d.disabled=a.unique(d.disabled.concat(a.map(this.lis.filter(".ui-state-disabled"),function(q,o){return p.lis.index(q)}))).sort();if(a.inArray(d.selected,d.disabled)!=-1){d.disabled.splice(a.inArray(d.selected,d.disabled),1)}this.panels.addClass("ui-tabs-hide");this.lis.removeClass("ui-tabs-selected ui-state-active");if(d.selected>=0&&this.anchors.length){this.panels.eq(d.selected).removeClass("ui-tabs-hide");this.lis.eq(d.selected).addClass("ui-tabs-selected ui-state-active");p.element.queue("tabs",function(){p._trigger("show",null,p._ui(p.anchors[d.selected],p.panels[d.selected]))});this.load(d.selected)}a(window).bind("unload",function(){p.lis.add(p.anchors).unbind(".tabs");p.lis=p.anchors=p.panels=null})}else{d.selected=this.lis.index(this.lis.filter(".ui-tabs-selected"))}this.element[d.collapsible?"addClass":"removeClass"]("ui-tabs-collapsible");if(d.cookie){this._cookie(d.selected,d.cookie)}for(var g=0,m;(m=this.lis[g]);g++){a(m)[a.inArray(g,d.disabled)!=-1&&!a(m).hasClass("ui-tabs-selected")?"addClass":"removeClass"]("ui-state-disabled")}if(d.cache===false){this.anchors.removeData("cache.tabs")}this.lis.add(this.anchors).unbind(".tabs");if(d.event!="mouseover"){var f=function(o,i){if(i.is(":not(.ui-state-disabled)")){i.addClass("ui-state-"+o)}};var j=function(o,i){i.removeClass("ui-state-"+o)};this.lis.bind("mouseover.tabs",function(){f("hover",a(this))});this.lis.bind("mouseout.tabs",function(){j("hover",a(this))});this.anchors.bind("focus.tabs",function(){f("focus",a(this).closest("li"))});this.anchors.bind("blur.tabs",function(){j("focus",a(this).closest("li"))})}var b,h;if(d.fx){if(a.isArray(d.fx)){b=d.fx[0];h=d.fx[1]}else{b=h=d.fx}}function e(i,o){i.css({display:""});if(a.browser.msie&&o.opacity){i[0].style.removeAttribute("filter")}}var k=h?function(i,o){a(i).closest("li").removeClass("ui-state-default").addClass("ui-tabs-selected ui-state-active");o.hide().removeClass("ui-tabs-hide").animate(h,h.duration||"normal",function(){e(o,h);p._trigger("show",null,p._ui(i,o[0]))})}:function(i,o){a(i).closest("li").removeClass("ui-state-default").addClass("ui-tabs-selected ui-state-active");o.removeClass("ui-tabs-hide");p._trigger("show",null,p._ui(i,o[0]))};var l=b?function(o,i){i.animate(b,b.duration||"normal",function(){p.lis.removeClass("ui-tabs-selected ui-state-active").addClass("ui-state-default");i.addClass("ui-tabs-hide");e(i,b);p.element.dequeue("tabs")})}:function(o,i,q){p.lis.removeClass("ui-tabs-selected ui-state-active").addClass("ui-state-default");i.addClass("ui-tabs-hide");p.element.dequeue("tabs")};this.anchors.bind(d.event+".tabs",function(){var o=this,r=a(this).closest("li"),i=p.panels.filter(":not(.ui-tabs-hide)"),q=a(p._sanitizeSelector(this.hash));if((r.hasClass("ui-tabs-selected")&&!d.collapsible)||r.hasClass("ui-state-disabled")||r.hasClass("ui-state-processing")||p._trigger("select",null,p._ui(this,q[0]))===false){this.blur();return false}d.selected=p.anchors.index(this);p.abort();if(d.collapsible){if(r.hasClass("ui-tabs-selected")){d.selected=-1;if(d.cookie){p._cookie(d.selected,d.cookie)}p.element.queue("tabs",function(){l(o,i)}).dequeue("tabs");this.blur();return false}else{if(!i.length){if(d.cookie){p._cookie(d.selected,d.cookie)}p.element.queue("tabs",function(){k(o,q)});p.load(p.anchors.index(this));this.blur();return false}}}if(d.cookie){p._cookie(d.selected,d.cookie)}if(q.length){if(i.length){p.element.queue("tabs",function(){l(o,i)})}p.element.queue("tabs",function(){k(o,q)});p.load(p.anchors.index(this))}else{throw"jQuery UI Tabs: Mismatching fragment identifier."}if(a.browser.msie){this.blur()}});this.anchors.bind("click.tabs",function(){return false})},destroy:function(){var b=this.options;this.abort();this.element.unbind(".tabs").removeClass("ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible").removeData("tabs");this.list.removeClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all");this.anchors.each(function(){var c=a.data(this,"href.tabs");if(c){this.href=c}var d=a(this).unbind(".tabs");a.each(["href","load","cache"],function(e,f){d.removeData(f+".tabs")})});this.lis.unbind(".tabs").add(this.panels).each(function(){if(a.data(this,"destroy.tabs")){a(this).remove()}else{a(this).removeClass(["ui-state-default","ui-corner-top","ui-tabs-selected","ui-state-active","ui-state-hover","ui-state-focus","ui-state-disabled","ui-tabs-panel","ui-widget-content","ui-corner-bottom","ui-tabs-hide"].join(" "))}});if(b.cookie){this._cookie(null,b.cookie)}},add:function(e,d,c){if(c===undefined){c=this.anchors.length}var b=this,g=this.options,i=a(g.tabTemplate.replace(/#\{href\}/g,e).replace(/#\{label\}/g,d)),h=!e.indexOf("#")?e.replace("#",""):this._tabId(a("a",i)[0]);i.addClass("ui-state-default ui-corner-top").data("destroy.tabs",true);var f=a("#"+h);if(!f.length){f=a(g.panelTemplate).attr("id",h).data("destroy.tabs",true)}f.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide");if(c>=this.lis.length){i.appendTo(this.list);f.appendTo(this.list[0].parentNode)}else{i.insertBefore(this.lis[c]);f.insertBefore(this.panels[c])}g.disabled=a.map(g.disabled,function(k,j){return k>=c?++k:k});this._tabify();if(this.anchors.length==1){i.addClass("ui-tabs-selected ui-state-active");f.removeClass("ui-tabs-hide");this.element.queue("tabs",function(){b._trigger("show",null,b._ui(b.anchors[0],b.panels[0]))});this.load(0)}this._trigger("add",null,this._ui(this.anchors[c],this.panels[c]))},remove:function(b){var d=this.options,e=this.lis.eq(b).remove(),c=this.panels.eq(b).remove();if(e.hasClass("ui-tabs-selected")&&this.anchors.length>1){this.select(b+(b+1<this.anchors.length?1:-1))}d.disabled=a.map(a.grep(d.disabled,function(g,f){return g!=b}),function(g,f){return g>=b?--g:g});this._tabify();this._trigger("remove",null,this._ui(e.find("a")[0],c[0]))},enable:function(b){var c=this.options;if(a.inArray(b,c.disabled)==-1){return}this.lis.eq(b).removeClass("ui-state-disabled");c.disabled=a.grep(c.disabled,function(e,d){return e!=b});this._trigger("enable",null,this._ui(this.anchors[b],this.panels[b]))},disable:function(c){var b=this,d=this.options;if(c!=d.selected){this.lis.eq(c).addClass("ui-state-disabled");d.disabled.push(c);d.disabled.sort();this._trigger("disable",null,this._ui(this.anchors[c],this.panels[c]))}},select:function(b){if(typeof b=="string"){b=this.anchors.index(this.anchors.filter("[href$="+b+"]"))}else{if(b===null){b=-1}}if(b==-1&&this.options.collapsible){b=this.options.selected}this.anchors.eq(b).trigger(this.options.event+".tabs")},load:function(e){var c=this,g=this.options,b=this.anchors.eq(e)[0],d=a.data(b,"load.tabs");this.abort();if(!d||this.element.queue("tabs").length!==0&&a.data(b,"cache.tabs")){this.element.dequeue("tabs");return}this.lis.eq(e).addClass("ui-state-processing");if(g.spinner){var f=a("span",b);f.data("label.tabs",f.html()).html(g.spinner)}this.xhr=a.ajax(a.extend({},g.ajaxOptions,{url:d,success:function(i,h){a(c._sanitizeSelector(b.hash)).html(i);c._cleanup();if(g.cache){a.data(b,"cache.tabs",true)}c._trigger("load",null,c._ui(c.anchors[e],c.panels[e]));try{g.ajaxOptions.success(i,h)}catch(j){}c.element.dequeue("tabs")}}))},abort:function(){this.element.queue([]);this.panels.stop(false,true);if(this.xhr){this.xhr.abort();delete this.xhr}this._cleanup()},url:function(c,b){this.anchors.eq(c).removeData("cache.tabs").data("load.tabs",b)},length:function(){return this.anchors.length}});a.extend(a.ui.tabs,{version:"1.7.1",getter:"length",defaults:{ajaxOptions:null,cache:false,cookie:null,collapsible:false,disabled:[],event:"click",fx:null,idPrefix:"ui-tabs-",panelTemplate:"<div></div>",spinner:"<em>Loading…</em>",tabTemplate:'<li><a href="#{href}"><span>#{label}</span></a></li>'}});a.extend(a.ui.tabs.prototype,{rotation:null,rotate:function(d,f){var b=this,g=this.options;var c=b._rotate||(b._rotate=function(h){clearTimeout(b.rotation);b.rotation=setTimeout(function(){var i=g.selected;b.select(++i<b.anchors.length?i:0)},d);if(h){h.stopPropagation()}});var e=b._unrotate||(b._unrotate=!f?function(h){if(h.clientX){b.rotate(null)}}:function(h){t=g.selected;c()});if(d){this.element.bind("tabsshow",c);this.anchors.bind(g.event+".tabs",e);c()}else{clearTimeout(b.rotation);this.element.unbind("tabsshow",c);this.anchors.unbind(g.event+".tabs",e);delete this._rotate;delete this._unrotate}}})})(jQuery);;/*
- * jQuery UI Datepicker 1.7.1
- *
- * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Datepicker
- *
- * Depends:
- * ui.core.js
- */
(function($){$.extend($.ui,{datepicker:{version:"1.7.1"}});var PROP_NAME="datepicker";function Datepicker(){this.debug=false;this._curInst=null;this._keyEvent=false;this._disabledInputs=[];this._datepickerShowing=false;this._inDialog=false;this._mainDivId="ui-datepicker-div";this._inlineClass="ui-datepicker-inline";this._appendClass="ui-datepicker-append";this._triggerClass="ui-datepicker-trigger";this._dialogClass="ui-datepicker-dialog";this._disableClass="ui-datepicker-disabled";this._unselectableClass="ui-datepicker-unselectable";this._currentClass="ui-datepicker-current-day";this._dayOverClass="ui-datepicker-days-cell-over";this.regional=[];this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su","Mo","Tu","We","Th","Fr","Sa"],dateFormat:"mm/dd/yy",firstDay:0,isRTL:false};this._defaults={showOn:"focus",showAnim:"show",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:false,hideIfNoPrevNext:false,navigationAsDateFormat:false,gotoCurrent:false,changeMonth:false,changeYear:false,showMonthAfterYear:false,yearRange:"-10:+10",showOtherMonths:false,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",minDate:null,maxDate:null,duration:"normal",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:true,showButtonPanel:false};$.extend(this._defaults,this.regional[""]);this.dpDiv=$('<div id="'+this._mainDivId+'" class="ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all ui-helper-hidden-accessible"></div>')}$.extend(Datepicker.prototype,{markerClassName:"hasDatepicker",log:function(){if(this.debug){console.log.apply("",arguments)}},setDefaults:function(settings){extendRemove(this._defaults,settings||{});return this},_attachDatepicker:function(target,settings){var inlineSettings=null;for(var attrName in this._defaults){var attrValue=target.getAttribute("date:"+attrName);if(attrValue){inlineSettings=inlineSettings||{};try{inlineSettings[attrName]=eval(attrValue)}catch(err){inlineSettings[attrName]=attrValue}}}var nodeName=target.nodeName.toLowerCase();var inline=(nodeName=="div"||nodeName=="span");if(!target.id){target.id="dp"+(++this.uuid)}var inst=this._newInst($(target),inline);inst.settings=$.extend({},settings||{},inlineSettings||{});if(nodeName=="input"){this._connectDatepicker(target,inst)}else{if(inline){this._inlineDatepicker(target,inst)}}},_newInst:function(target,inline){var id=target[0].id.replace(/([:\[\]\.])/g,"\\\\$1");return{id:id,input:target,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:inline,dpDiv:(!inline?this.dpDiv:$('<div class="'+this._inlineClass+' ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>'))}},_connectDatepicker:function(target,inst){var input=$(target);inst.trigger=$([]);if(input.hasClass(this.markerClassName)){return}var appendText=this._get(inst,"appendText");var isRTL=this._get(inst,"isRTL");if(appendText){input[isRTL?"before":"after"]('<span class="'+this._appendClass+'">'+appendText+"</span>")}var showOn=this._get(inst,"showOn");if(showOn=="focus"||showOn=="both"){input.focus(this._showDatepicker)}if(showOn=="button"||showOn=="both"){var buttonText=this._get(inst,"buttonText");var buttonImage=this._get(inst,"buttonImage");inst.trigger=$(this._get(inst,"buttonImageOnly")?$("<img/>").addClass(this._triggerClass).attr({src:buttonImage,alt:buttonText,title:buttonText}):$('<button type="button"></button>').addClass(this._triggerClass).html(buttonImage==""?buttonText:$("<img/>").attr({src:buttonImage,alt:buttonText,title:buttonText})));input[isRTL?"before":"after"](inst.trigger);inst.trigger.click(function(){if($.datepicker._datepickerShowing&&$.datepicker._lastInput==target){$.datepicker._hideDatepicker()}else{$.datepicker._showDatepicker(target)}return false})}input.addClass(this.markerClassName).keydown(this._doKeyDown).keypress(this._doKeyPress).bind("setData.datepicker",function(event,key,value){inst.settings[key]=value}).bind("getData.datepicker",function(event,key){return this._get(inst,key)});$.data(target,PROP_NAME,inst)},_inlineDatepicker:function(target,inst){var divSpan=$(target);if(divSpan.hasClass(this.markerClassName)){return}divSpan.addClass(this.markerClassName).append(inst.dpDiv).bind("setData.datepicker",function(event,key,value){inst.settings[key]=value}).bind("getData.datepicker",function(event,key){return this._get(inst,key)});$.data(target,PROP_NAME,inst);this._setDate(inst,this._getDefaultDate(inst));this._updateDatepicker(inst);this._updateAlternate(inst)},_dialogDatepicker:function(input,dateText,onSelect,settings,pos){var inst=this._dialogInst;if(!inst){var id="dp"+(++this.uuid);this._dialogInput=$('<input type="text" id="'+id+'" size="1" style="position: absolute; top: -100px;"/>');this._dialogInput.keydown(this._doKeyDown);$("body").append(this._dialogInput);inst=this._dialogInst=this._newInst(this._dialogInput,false);inst.settings={};$.data(this._dialogInput[0],PROP_NAME,inst)}extendRemove(inst.settings,settings||{});this._dialogInput.val(dateText);this._pos=(pos?(pos.length?pos:[pos.pageX,pos.pageY]):null);if(!this._pos){var browserWidth=window.innerWidth||document.documentElement.clientWidth||document.body.clientWidth;var browserHeight=window.innerHeight||document.documentElement.clientHeight||document.body.clientHeight;var scrollX=document.documentElement.scrollLeft||document.body.scrollLeft;var scrollY=document.documentElement.scrollTop||document.body.scrollTop;this._pos=[(browserWidth/2)-100+scrollX,(browserHeight/2)-150+scrollY]}this._dialogInput.css("left",this._pos[0]+"px").css("top",this._pos[1]+"px");inst.settings.onSelect=onSelect;this._inDialog=true;this.dpDiv.addClass(this._dialogClass);this._showDatepicker(this._dialogInput[0]);if($.blockUI){$.blockUI(this.dpDiv)}$.data(this._dialogInput[0],PROP_NAME,inst);return this},_destroyDatepicker:function(target){var $target=$(target);var inst=$.data(target,PROP_NAME);if(!$target.hasClass(this.markerClassName)){return}var nodeName=target.nodeName.toLowerCase();$.removeData(target,PROP_NAME);if(nodeName=="input"){inst.trigger.remove();$target.siblings("."+this._appendClass).remove().end().removeClass(this.markerClassName).unbind("focus",this._showDatepicker).unbind("keydown",this._doKeyDown).unbind("keypress",this._doKeyPress)}else{if(nodeName=="div"||nodeName=="span"){$target.removeClass(this.markerClassName).empty()}}},_enableDatepicker:function(target){var $target=$(target);var inst=$.data(target,PROP_NAME);if(!$target.hasClass(this.markerClassName)){return}var nodeName=target.nodeName.toLowerCase();if(nodeName=="input"){target.disabled=false;inst.trigger.filter("button").each(function(){this.disabled=false}).end().filter("img").css({opacity:"1.0",cursor:""})}else{if(nodeName=="div"||nodeName=="span"){var inline=$target.children("."+this._inlineClass);inline.children().removeClass("ui-state-disabled")}}this._disabledInputs=$.map(this._disabledInputs,function(value){return(value==target?null:value)})},_disableDatepicker:function(target){var $target=$(target);var inst=$.data(target,PROP_NAME);if(!$target.hasClass(this.markerClassName)){return}var nodeName=target.nodeName.toLowerCase();if(nodeName=="input"){target.disabled=true;inst.trigger.filter("button").each(function(){this.disabled=true}).end().filter("img").css({opacity:"0.5",cursor:"default"})}else{if(nodeName=="div"||nodeName=="span"){var inline=$target.children("."+this._inlineClass);inline.children().addClass("ui-state-disabled")}}this._disabledInputs=$.map(this._disabledInputs,function(value){return(value==target?null:value)});this._disabledInputs[this._disabledInputs.length]=target},_isDisabledDatepicker:function(target){if(!target){return false}for(var i=0;i<this._disabledInputs.length;i++){if(this._disabledInputs[i]==target){return true}}return false},_getInst:function(target){try{return $.data(target,PROP_NAME)}catch(err){throw"Missing instance data for this datepicker"}},_optionDatepicker:function(target,name,value){var settings=name||{};if(typeof name=="string"){settings={};settings[name]=value}var inst=this._getInst(target);if(inst){if(this._curInst==inst){this._hideDatepicker(null)}extendRemove(inst.settings,settings);var date=new Date();extendRemove(inst,{rangeStart:null,endDay:null,endMonth:null,endYear:null,selectedDay:date.getDate(),selectedMonth:date.getMonth(),selectedYear:date.getFullYear(),currentDay:date.getDate(),currentMonth:date.getMonth(),currentYear:date.getFullYear(),drawMonth:date.getMonth(),drawYear:date.getFullYear()});this._updateDatepicker(inst)}},_changeDatepicker:function(target,name,value){this._optionDatepicker(target,name,value)},_refreshDatepicker:function(target){var inst=this._getInst(target);if(inst){this._updateDatepicker(inst)}},_setDateDatepicker:function(target,date,endDate){var inst=this._getInst(target);if(inst){this._setDate(inst,date,endDate);this._updateDatepicker(inst);this._updateAlternate(inst)}},_getDateDatepicker:function(target){var inst=this._getInst(target);if(inst&&!inst.inline){this._setDateFromField(inst)}return(inst?this._getDate(inst):null)},_doKeyDown:function(event){var inst=$.datepicker._getInst(event.target);var handled=true;var isRTL=inst.dpDiv.is(".ui-datepicker-rtl");inst._keyEvent=true;if($.datepicker._datepickerShowing){switch(event.keyCode){case 9:$.datepicker._hideDatepicker(null,"");break;case 13:var sel=$("td."+$.datepicker._dayOverClass+", td."+$.datepicker._currentClass,inst.dpDiv);if(sel[0]){$.datepicker._selectDay(event.target,inst.selectedMonth,inst.selectedYear,sel[0])}else{$.datepicker._hideDatepicker(null,$.datepicker._get(inst,"duration"))}return false;break;case 27:$.datepicker._hideDatepicker(null,$.datepicker._get(inst,"duration"));break;case 33:$.datepicker._adjustDate(event.target,(event.ctrlKey?-$.datepicker._get(inst,"stepBigMonths"):-$.datepicker._get(inst,"stepMonths")),"M");break;case 34:$.datepicker._adjustDate(event.target,(event.ctrlKey?+$.datepicker._get(inst,"stepBigMonths"):+$.datepicker._get(inst,"stepMonths")),"M");break;case 35:if(event.ctrlKey||event.metaKey){$.datepicker._clearDate(event.target)}handled=event.ctrlKey||event.metaKey;break;case 36:if(event.ctrlKey||event.metaKey){$.datepicker._gotoToday(event.target)}handled=event.ctrlKey||event.metaKey;break;case 37:if(event.ctrlKey||event.metaKey){$.datepicker._adjustDate(event.target,(isRTL?+1:-1),"D")}handled=event.ctrlKey||event.metaKey;if(event.originalEvent.altKey){$.datepicker._adjustDate(event.target,(event.ctrlKey?-$.datepicker._get(inst,"stepBigMonths"):-$.datepicker._get(inst,"stepMonths")),"M")}break;case 38:if(event.ctrlKey||event.metaKey){$.datepicker._adjustDate(event.target,-7,"D")}handled=event.ctrlKey||event.metaKey;break;case 39:if(event.ctrlKey||event.metaKey){$.datepicker._adjustDate(event.target,(isRTL?-1:+1),"D")}handled=event.ctrlKey||event.metaKey;if(event.originalEvent.altKey){$.datepicker._adjustDate(event.target,(event.ctrlKey?+$.datepicker._get(inst,"stepBigMonths"):+$.datepicker._get(inst,"stepMonths")),"M")}break;case 40:if(event.ctrlKey||event.metaKey){$.datepicker._adjustDate(event.target,+7,"D")}handled=event.ctrlKey||event.metaKey;break;default:handled=false}}else{if(event.keyCode==36&&event.ctrlKey){$.datepicker._showDatepicker(this)}else{handled=false}}if(handled){event.preventDefault();event.stopPropagation()}},_doKeyPress:function(event){var inst=$.datepicker._getInst(event.target);if($.datepicker._get(inst,"constrainInput")){var chars=$.datepicker._possibleChars($.datepicker._get(inst,"dateFormat"));var chr=String.fromCharCode(event.charCode==undefined?event.keyCode:event.charCode);return event.ctrlKey||(chr<" "||!chars||chars.indexOf(chr)>-1)}},_showDatepicker:function(input){input=input.target||input;if(input.nodeName.toLowerCase()!="input"){input=$("input",input.parentNode)[0]}if($.datepicker._isDisabledDatepicker(input)||$.datepicker._lastInput==input){return}var inst=$.datepicker._getInst(input);var beforeShow=$.datepicker._get(inst,"beforeShow");extendRemove(inst.settings,(beforeShow?beforeShow.apply(input,[input,inst]):{}));$.datepicker._hideDatepicker(null,"");$.datepicker._lastInput=input;$.datepicker._setDateFromField(inst);if($.datepicker._inDialog){input.value=""}if(!$.datepicker._pos){$.datepicker._pos=$.datepicker._findPos(input);$.datepicker._pos[1]+=input.offsetHeight}var isFixed=false;$(input).parents().each(function(){isFixed|=$(this).css("position")=="fixed";return !isFixed});if(isFixed&&$.browser.opera){$.datepicker._pos[0]-=document.documentElement.scrollLeft;$.datepicker._pos[1]-=document.documentElement.scrollTop}var offset={left:$.datepicker._pos[0],top:$.datepicker._pos[1]};$.datepicker._pos=null;inst.rangeStart=null;inst.dpDiv.css({position:"absolute",display:"block",top:"-1000px"});$.datepicker._updateDatepicker(inst);offset=$.datepicker._checkOffset(inst,offset,isFixed);inst.dpDiv.css({position:($.datepicker._inDialog&&$.blockUI?"static":(isFixed?"fixed":"absolute")),display:"none",left:offset.left+"px",top:offset.top+"px"});if(!inst.inline){var showAnim=$.datepicker._get(inst,"showAnim")||"show";var duration=$.datepicker._get(inst,"duration");var postProcess=function(){$.datepicker._datepickerShowing=true;if($.browser.msie&&parseInt($.browser.version,10)<7){$("iframe.ui-datepicker-cover").css({width:inst.dpDiv.width()+4,height:inst.dpDiv.height()+4})}};if($.effects&&$.effects[showAnim]){inst.dpDiv.show(showAnim,$.datepicker._get(inst,"showOptions"),duration,postProcess)}else{inst.dpDiv[showAnim](duration,postProcess)}if(duration==""){postProcess()}if(inst.input[0].type!="hidden"){inst.input[0].focus()}$.datepicker._curInst=inst}},_updateDatepicker:function(inst){var dims={width:inst.dpDiv.width()+4,height:inst.dpDiv.height()+4};var self=this;inst.dpDiv.empty().append(this._generateHTML(inst)).find("iframe.ui-datepicker-cover").css({width:dims.width,height:dims.height}).end().find("button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a").bind("mouseout",function(){$(this).removeClass("ui-state-hover");if(this.className.indexOf("ui-datepicker-prev")!=-1){$(this).removeClass("ui-datepicker-prev-hover")}if(this.className.indexOf("ui-datepicker-next")!=-1){$(this).removeClass("ui-datepicker-next-hover")}}).bind("mouseover",function(){if(!self._isDisabledDatepicker(inst.inline?inst.dpDiv.parent()[0]:inst.input[0])){$(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover");$(this).addClass("ui-state-hover");if(this.className.indexOf("ui-datepicker-prev")!=-1){$(this).addClass("ui-datepicker-prev-hover")}if(this.className.indexOf("ui-datepicker-next")!=-1){$(this).addClass("ui-datepicker-next-hover")}}}).end().find("."+this._dayOverClass+" a").trigger("mouseover").end();var numMonths=this._getNumberOfMonths(inst);var cols=numMonths[1];var width=17;if(cols>1){inst.dpDiv.addClass("ui-datepicker-multi-"+cols).css("width",(width*cols)+"em")}else{inst.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width("")}inst.dpDiv[(numMonths[0]!=1||numMonths[1]!=1?"add":"remove")+"Class"]("ui-datepicker-multi");inst.dpDiv[(this._get(inst,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl");if(inst.input&&inst.input[0].type!="hidden"&&inst==$.datepicker._curInst){$(inst.input[0]).focus()}},_checkOffset:function(inst,offset,isFixed){var dpWidth=inst.dpDiv.outerWidth();var dpHeight=inst.dpDiv.outerHeight();var inputWidth=inst.input?inst.input.outerWidth():0;var inputHeight=inst.input?inst.input.outerHeight():0;var viewWidth=(window.innerWidth||document.documentElement.clientWidth||document.body.clientWidth)+$(document).scrollLeft();var viewHeight=(window.innerHeight||document.documentElement.clientHeight||document.body.clientHeight)+$(document).scrollTop();offset.left-=(this._get(inst,"isRTL")?(dpWidth-inputWidth):0);offset.left-=(isFixed&&offset.left==inst.input.offset().left)?$(document).scrollLeft():0;offset.top-=(isFixed&&offset.top==(inst.input.offset().top+inputHeight))?$(document).scrollTop():0;offset.left-=(offset.left+dpWidth>viewWidth&&viewWidth>dpWidth)?Math.abs(offset.left+dpWidth-viewWidth):0;offset.top-=(offset.top+dpHeight>viewHeight&&viewHeight>dpHeight)?Math.abs(offset.top+dpHeight+inputHeight*2-viewHeight):0;return offset},_findPos:function(obj){while(obj&&(obj.type=="hidden"||obj.nodeType!=1)){obj=obj.nextSibling}var position=$(obj).offset();return[position.left,position.top]},_hideDatepicker:function(input,duration){var inst=this._curInst;if(!inst||(input&&inst!=$.data(input,PROP_NAME))){return}if(inst.stayOpen){this._selectDate("#"+inst.id,this._formatDate(inst,inst.currentDay,inst.currentMonth,inst.currentYear))}inst.stayOpen=false;if(this._datepickerShowing){duration=(duration!=null?duration:this._get(inst,"duration"));var showAnim=this._get(inst,"showAnim");var postProcess=function(){$.datepicker._tidyDialog(inst)};if(duration!=""&&$.effects&&$.effects[showAnim]){inst.dpDiv.hide(showAnim,$.datepicker._get(inst,"showOptions"),duration,postProcess)}else{inst.dpDiv[(duration==""?"hide":(showAnim=="slideDown"?"slideUp":(showAnim=="fadeIn"?"fadeOut":"hide")))](duration,postProcess)}if(duration==""){this._tidyDialog(inst)}var onClose=this._get(inst,"onClose");if(onClose){onClose.apply((inst.input?inst.input[0]:null),[(inst.input?inst.input.val():""),inst])}this._datepickerShowing=false;this._lastInput=null;if(this._inDialog){this._dialogInput.css({position:"absolute",left:"0",top:"-100px"});if($.blockUI){$.unblockUI();$("body").append(this.dpDiv)}}this._inDialog=false}this._curInst=null},_tidyDialog:function(inst){inst.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar")},_checkExternalClick:function(event){if(!$.datepicker._curInst){return}var $target=$(event.target);if(($target.parents("#"+$.datepicker._mainDivId).length==0)&&!$target.hasClass($.datepicker.markerClassName)&&!$target.hasClass($.datepicker._triggerClass)&&$.datepicker._datepickerShowing&&!($.datepicker._inDialog&&$.blockUI)){$.datepicker._hideDatepicker(null,"")}},_adjustDate:function(id,offset,period){var target=$(id);var inst=this._getInst(target[0]);if(this._isDisabledDatepicker(target[0])){return}this._adjustInstDate(inst,offset+(period=="M"?this._get(inst,"showCurrentAtPos"):0),period);this._updateDatepicker(inst)},_gotoToday:function(id){var target=$(id);var inst=this._getInst(target[0]);if(this._get(inst,"gotoCurrent")&&inst.currentDay){inst.selectedDay=inst.currentDay;inst.drawMonth=inst.selectedMonth=inst.currentMonth;inst.drawYear=inst.selectedYear=inst.currentYear}else{var date=new Date();inst.selectedDay=date.getDate();inst.drawMonth=inst.selectedMonth=date.getMonth();inst.drawYear=inst.selectedYear=date.getFullYear()}this._notifyChange(inst);this._adjustDate(target)},_selectMonthYear:function(id,select,period){var target=$(id);var inst=this._getInst(target[0]);inst._selectingMonthYear=false;inst["selected"+(period=="M"?"Month":"Year")]=inst["draw"+(period=="M"?"Month":"Year")]=parseInt(select.options[select.selectedIndex].value,10);this._notifyChange(inst);this._adjustDate(target)},_clickMonthYear:function(id){var target=$(id);var inst=this._getInst(target[0]);if(inst.input&&inst._selectingMonthYear&&!$.browser.msie){inst.input[0].focus()}inst._selectingMonthYear=!inst._selectingMonthYear},_selectDay:function(id,month,year,td){var target=$(id);if($(td).hasClass(this._unselectableClass)||this._isDisabledDatepicker(target[0])){return}var inst=this._getInst(target[0]);inst.selectedDay=inst.currentDay=$("a",td).html();inst.selectedMonth=inst.currentMonth=month;inst.selectedYear=inst.currentYear=year;if(inst.stayOpen){inst.endDay=inst.endMonth=inst.endYear=null}this._selectDate(id,this._formatDate(inst,inst.currentDay,inst.currentMonth,inst.currentYear));if(inst.stayOpen){inst.rangeStart=this._daylightSavingAdjust(new Date(inst.currentYear,inst.currentMonth,inst.currentDay));this._updateDatepicker(inst)}},_clearDate:function(id){var target=$(id);var inst=this._getInst(target[0]);inst.stayOpen=false;inst.endDay=inst.endMonth=inst.endYear=inst.rangeStart=null;this._selectDate(target,"")},_selectDate:function(id,dateStr){var target=$(id);var inst=this._getInst(target[0]);dateStr=(dateStr!=null?dateStr:this._formatDate(inst));if(inst.input){inst.input.val(dateStr)}this._updateAlternate(inst);var onSelect=this._get(inst,"onSelect");if(onSelect){onSelect.apply((inst.input?inst.input[0]:null),[dateStr,inst])}else{if(inst.input){inst.input.trigger("change")}}if(inst.inline){this._updateDatepicker(inst)}else{if(!inst.stayOpen){this._hideDatepicker(null,this._get(inst,"duration"));this._lastInput=inst.input[0];if(typeof(inst.input[0])!="object"){inst.input[0].focus()}this._lastInput=null}}},_updateAlternate:function(inst){var altField=this._get(inst,"altField");if(altField){var altFormat=this._get(inst,"altFormat")||this._get(inst,"dateFormat");var date=this._getDate(inst);dateStr=this.formatDate(altFormat,date,this._getFormatConfig(inst));$(altField).each(function(){$(this).val(dateStr)})}},noWeekends:function(date){var day=date.getDay();return[(day>0&&day<6),""]},iso8601Week:function(date){var checkDate=new Date(date.getFullYear(),date.getMonth(),date.getDate());var firstMon=new Date(checkDate.getFullYear(),1-1,4);var firstDay=firstMon.getDay()||7;firstMon.setDate(firstMon.getDate()+1-firstDay);if(firstDay<4&&checkDate<firstMon){checkDate.setDate(checkDate.getDate()-3);return $.datepicker.iso8601Week(checkDate)}else{if(checkDate>new Date(checkDate.getFullYear(),12-1,28)){firstDay=new Date(checkDate.getFullYear()+1,1-1,4).getDay()||7;if(firstDay>4&&(checkDate.getDay()||7)<firstDay-3){return 1}}}return Math.floor(((checkDate-firstMon)/86400000)/7)+1},parseDate:function(format,value,settings){if(format==null||value==null){throw"Invalid arguments"}value=(typeof value=="object"?value.toString():value+"");if(value==""){return null}var shortYearCutoff=(settings?settings.shortYearCutoff:null)||this._defaults.shortYearCutoff;var dayNamesShort=(settings?settings.dayNamesShort:null)||this._defaults.dayNamesShort;var dayNames=(settings?settings.dayNames:null)||this._defaults.dayNames;var monthNamesShort=(settings?settings.monthNamesShort:null)||this._defaults.monthNamesShort;var monthNames=(settings?settings.monthNames:null)||this._defaults.monthNames;var year=-1;var month=-1;var day=-1;var doy=-1;var literal=false;var lookAhead=function(match){var matches=(iFormat+1<format.length&&format.charAt(iFormat+1)==match);if(matches){iFormat++}return matches};var getNumber=function(match){lookAhead(match);var origSize=(match=="@"?14:(match=="y"?4:(match=="o"?3:2)));var size=origSize;var num=0;while(size>0&&iValue<value.length&&value.charAt(iValue)>="0"&&value.charAt(iValue)<="9"){num=num*10+parseInt(value.charAt(iValue++),10);size--}if(size==origSize){throw"Missing number at position "+iValue}return num};var getName=function(match,shortNames,longNames){var names=(lookAhead(match)?longNames:shortNames);var size=0;for(var j=0;j<names.length;j++){size=Math.max(size,names[j].length)}var name="";var iInit=iValue;while(size>0&&iValue<value.length){name+=value.charAt(iValue++);for(var i=0;i<names.length;i++){if(name==names[i]){return i+1}}size--}throw"Unknown name at position "+iInit};var checkLiteral=function(){if(value.charAt(iValue)!=format.charAt(iFormat)){throw"Unexpected literal at position "+iValue}iValue++};var iValue=0;for(var iFormat=0;iFormat<format.length;iFormat++){if(literal){if(format.charAt(iFormat)=="'"&&!lookAhead("'")){literal=false}else{checkLiteral()}}else{switch(format.charAt(iFormat)){case"d":day=getNumber("d");break;case"D":getName("D",dayNamesShort,dayNames);break;case"o":doy=getNumber("o");break;case"m":month=getNumber("m");break;case"M":month=getName("M",monthNamesShort,monthNames);break;case"y":year=getNumber("y");break;case"@":var date=new Date(getNumber("@"));year=date.getFullYear();month=date.getMonth()+1;day=date.getDate();break;case"'":if(lookAhead("'")){checkLiteral()}else{literal=true}break;default:checkLiteral()}}}if(year==-1){year=new Date().getFullYear()}else{if(year<100){year+=new Date().getFullYear()-new Date().getFullYear()%100+(year<=shortYearCutoff?0:-100)}}if(doy>-1){month=1;day=doy;do{var dim=this._getDaysInMonth(year,month-1);if(day<=dim){break}month++;day-=dim}while(true)}var date=this._daylightSavingAdjust(new Date(year,month-1,day));if(date.getFullYear()!=year||date.getMonth()+1!=month||date.getDate()!=day){throw"Invalid date"}return date},ATOM:"yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TIMESTAMP:"@",W3C:"yy-mm-dd",formatDate:function(format,date,settings){if(!date){return""}var dayNamesShort=(settings?settings.dayNamesShort:null)||this._defaults.dayNamesShort;var dayNames=(settings?settings.dayNames:null)||this._defaults.dayNames;var monthNamesShort=(settings?settings.monthNamesShort:null)||this._defaults.monthNamesShort;var monthNames=(settings?settings.monthNames:null)||this._defaults.monthNames;var lookAhead=function(match){var matches=(iFormat+1<format.length&&format.charAt(iFormat+1)==match);if(matches){iFormat++}return matches};var formatNumber=function(match,value,len){var num=""+value;if(lookAhead(match)){while(num.length<len){num="0"+num}}return num};var formatName=function(match,value,shortNames,longNames){return(lookAhead(match)?longNames[value]:shortNames[value])};var output="";var literal=false;if(date){for(var iFormat=0;iFormat<format.length;iFormat++){if(literal){if(format.charAt(iFormat)=="'"&&!lookAhead("'")){literal=false}else{output+=format.charAt(iFormat)}}else{switch(format.charAt(iFormat)){case"d":output+=formatNumber("d",date.getDate(),2);break;case"D":output+=formatName("D",date.getDay(),dayNamesShort,dayNames);break;case"o":var doy=date.getDate();for(var m=date.getMonth()-1;m>=0;m--){doy+=this._getDaysInMonth(date.getFullYear(),m)}output+=formatNumber("o",doy,3);break;case"m":output+=formatNumber("m",date.getMonth()+1,2);break;case"M":output+=formatName("M",date.getMonth(),monthNamesShort,monthNames);break;case"y":output+=(lookAhead("y")?date.getFullYear():(date.getYear()%100<10?"0":"")+date.getYear()%100);break;case"@":output+=date.getTime();break;case"'":if(lookAhead("'")){output+="'"}else{literal=true}break;default:output+=format.charAt(iFormat)}}}}return output},_possibleChars:function(format){var chars="";var literal=false;for(var iFormat=0;iFormat<format.length;iFormat++){if(literal){if(format.charAt(iFormat)=="'"&&!lookAhead("'")){literal=false}else{chars+=format.charAt(iFormat)}}else{switch(format.charAt(iFormat)){case"d":case"m":case"y":case"@":chars+="0123456789";break;case"D":case"M":return null;case"'":if(lookAhead("'")){chars+="'"}else{literal=true}break;default:chars+=format.charAt(iFormat)}}}return chars},_get:function(inst,name){return inst.settings[name]!==undefined?inst.settings[name]:this._defaults[name]},_setDateFromField:function(inst){var dateFormat=this._get(inst,"dateFormat");var dates=inst.input?inst.input.val():null;inst.endDay=inst.endMonth=inst.endYear=null;var date=defaultDate=this._getDefaultDate(inst);var settings=this._getFormatConfig(inst);try{date=this.parseDate(dateFormat,dates,settings)||defaultDate}catch(event){this.log(event);date=defaultDate}inst.selectedDay=date.getDate();inst.drawMonth=inst.selectedMonth=date.getMonth();inst.drawYear=inst.selectedYear=date.getFullYear();inst.currentDay=(dates?date.getDate():0);inst.currentMonth=(dates?date.getMonth():0);inst.currentYear=(dates?date.getFullYear():0);this._adjustInstDate(inst)},_getDefaultDate:function(inst){var date=this._determineDate(this._get(inst,"defaultDate"),new Date());var minDate=this._getMinMaxDate(inst,"min",true);var maxDate=this._getMinMaxDate(inst,"max");date=(minDate&&date<minDate?minDate:date);date=(maxDate&&date>maxDate?maxDate:date);return date},_determineDate:function(date,defaultDate){var offsetNumeric=function(offset){var date=new Date();date.setDate(date.getDate()+offset);return date};var offsetString=function(offset,getDaysInMonth){var date=new Date();var year=date.getFullYear();var month=date.getMonth();var day=date.getDate();var pattern=/([+-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g;var matches=pattern.exec(offset);while(matches){switch(matches[2]||"d"){case"d":case"D":day+=parseInt(matches[1],10);break;case"w":case"W":day+=parseInt(matches[1],10)*7;break;case"m":case"M":month+=parseInt(matches[1],10);day=Math.min(day,getDaysInMonth(year,month));break;case"y":case"Y":year+=parseInt(matches[1],10);day=Math.min(day,getDaysInMonth(year,month));break}matches=pattern.exec(offset)}return new Date(year,month,day)};date=(date==null?defaultDate:(typeof date=="string"?offsetString(date,this._getDaysInMonth):(typeof date=="number"?(isNaN(date)?defaultDate:offsetNumeric(date)):date)));date=(date&&date.toString()=="Invalid Date"?defaultDate:date);if(date){date.setHours(0);date.setMinutes(0);date.setSeconds(0);date.setMilliseconds(0)}return this._daylightSavingAdjust(date)},_daylightSavingAdjust:function(date){if(!date){return null}date.setHours(date.getHours()>12?date.getHours()+2:0);return date},_setDate:function(inst,date,endDate){var clear=!(date);var origMonth=inst.selectedMonth;var origYear=inst.selectedYear;date=this._determineDate(date,new Date());inst.selectedDay=inst.currentDay=date.getDate();inst.drawMonth=inst.selectedMonth=inst.currentMonth=date.getMonth();inst.drawYear=inst.selectedYear=inst.currentYear=date.getFullYear();if(origMonth!=inst.selectedMonth||origYear!=inst.selectedYear){this._notifyChange(inst)}this._adjustInstDate(inst);if(inst.input){inst.input.val(clear?"":this._formatDate(inst))}},_getDate:function(inst){var startDate=(!inst.currentYear||(inst.input&&inst.input.val()=="")?null:this._daylightSavingAdjust(new Date(inst.currentYear,inst.currentMonth,inst.currentDay)));return startDate},_generateHTML:function(inst){var today=new Date();today=this._daylightSavingAdjust(new Date(today.getFullYear(),today.getMonth(),today.getDate()));var isRTL=this._get(inst,"isRTL");var showButtonPanel=this._get(inst,"showButtonPanel");var hideIfNoPrevNext=this._get(inst,"hideIfNoPrevNext");var navigationAsDateFormat=this._get(inst,"navigationAsDateFormat");var numMonths=this._getNumberOfMonths(inst);var showCurrentAtPos=this._get(inst,"showCurrentAtPos");var stepMonths=this._get(inst,"stepMonths");var stepBigMonths=this._get(inst,"stepBigMonths");var isMultiMonth=(numMonths[0]!=1||numMonths[1]!=1);var currentDate=this._daylightSavingAdjust((!inst.currentDay?new Date(9999,9,9):new Date(inst.currentYear,inst.currentMonth,inst.currentDay)));var minDate=this._getMinMaxDate(inst,"min",true);var maxDate=this._getMinMaxDate(inst,"max");var drawMonth=inst.drawMonth-showCurrentAtPos;var drawYear=inst.drawYear;if(drawMonth<0){drawMonth+=12;drawYear--}if(maxDate){var maxDraw=this._daylightSavingAdjust(new Date(maxDate.getFullYear(),maxDate.getMonth()-numMonths[1]+1,maxDate.getDate()));maxDraw=(minDate&&maxDraw<minDate?minDate:maxDraw);while(this._daylightSavingAdjust(new Date(drawYear,drawMonth,1))>maxDraw){drawMonth--;if(drawMonth<0){drawMonth=11;drawYear--}}}inst.drawMonth=drawMonth;inst.drawYear=drawYear;var prevText=this._get(inst,"prevText");prevText=(!navigationAsDateFormat?prevText:this.formatDate(prevText,this._daylightSavingAdjust(new Date(drawYear,drawMonth-stepMonths,1)),this._getFormatConfig(inst)));var prev=(this._canAdjustMonth(inst,-1,drawYear,drawMonth)?'<a class="ui-datepicker-prev ui-corner-all" onclick="DP_jQuery.datepicker._adjustDate(\'#'+inst.id+"', -"+stepMonths+", 'M');\" title=\""+prevText+'"><span class="ui-icon ui-icon-circle-triangle-'+(isRTL?"e":"w")+'">'+prevText+"</span></a>":(hideIfNoPrevNext?"":'<a class="ui-datepicker-prev ui-corner-all ui-state-disabled" title="'+prevText+'"><span class="ui-icon ui-icon-circle-triangle-'+(isRTL?"e":"w")+'">'+prevText+"</span></a>"));var nextText=this._get(inst,"nextText");nextText=(!navigationAsDateFormat?nextText:this.formatDate(nextText,this._daylightSavingAdjust(new Date(drawYear,drawMonth+stepMonths,1)),this._getFormatConfig(inst)));var next=(this._canAdjustMonth(inst,+1,drawYear,drawMonth)?'<a class="ui-datepicker-next ui-corner-all" onclick="DP_jQuery.datepicker._adjustDate(\'#'+inst.id+"', +"+stepMonths+", 'M');\" title=\""+nextText+'"><span class="ui-icon ui-icon-circle-triangle-'+(isRTL?"w":"e")+'">'+nextText+"</span></a>":(hideIfNoPrevNext?"":'<a class="ui-datepicker-next ui-corner-all ui-state-disabled" title="'+nextText+'"><span class="ui-icon ui-icon-circle-triangle-'+(isRTL?"w":"e")+'">'+nextText+"</span></a>"));var currentText=this._get(inst,"currentText");var gotoDate=(this._get(inst,"gotoCurrent")&&inst.currentDay?currentDate:today);currentText=(!navigationAsDateFormat?currentText:this.formatDate(currentText,gotoDate,this._getFormatConfig(inst)));var controls=(!inst.inline?'<button type="button" class="ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all" onclick="DP_jQuery.datepicker._hideDatepicker();">'+this._get(inst,"closeText")+"</button>":"");var buttonPanel=(showButtonPanel)?'<div class="ui-datepicker-buttonpane ui-widget-content">'+(isRTL?controls:"")+(this._isInRange(inst,gotoDate)?'<button type="button" class="ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all" onclick="DP_jQuery.datepicker._gotoToday(\'#'+inst.id+"');\">"+currentText+"</button>":"")+(isRTL?"":controls)+"</div>":"";var firstDay=parseInt(this._get(inst,"firstDay"),10);firstDay=(isNaN(firstDay)?0:firstDay);var dayNames=this._get(inst,"dayNames");var dayNamesShort=this._get(inst,"dayNamesShort");var dayNamesMin=this._get(inst,"dayNamesMin");var monthNames=this._get(inst,"monthNames");var monthNamesShort=this._get(inst,"monthNamesShort");var beforeShowDay=this._get(inst,"beforeShowDay");var showOtherMonths=this._get(inst,"showOtherMonths");var calculateWeek=this._get(inst,"calculateWeek")||this.iso8601Week;var endDate=inst.endDay?this._daylightSavingAdjust(new Date(inst.endYear,inst.endMonth,inst.endDay)):currentDate;var defaultDate=this._getDefaultDate(inst);var html="";for(var row=0;row<numMonths[0];row++){var group="";for(var col=0;col<numMonths[1];col++){var selectedDate=this._daylightSavingAdjust(new Date(drawYear,drawMonth,inst.selectedDay));var cornerClass=" ui-corner-all";var calender="";if(isMultiMonth){calender+='<div class="ui-datepicker-group ui-datepicker-group-';switch(col){case 0:calender+="first";cornerClass=" ui-corner-"+(isRTL?"right":"left");break;case numMonths[1]-1:calender+="last";cornerClass=" ui-corner-"+(isRTL?"left":"right");break;default:calender+="middle";cornerClass="";break}calender+='">'}calender+='<div class="ui-datepicker-header ui-widget-header ui-helper-clearfix'+cornerClass+'">'+(/all|left/.test(cornerClass)&&row==0?(isRTL?next:prev):"")+(/all|right/.test(cornerClass)&&row==0?(isRTL?prev:next):"")+this._generateMonthYearHeader(inst,drawMonth,drawYear,minDate,maxDate,selectedDate,row>0||col>0,monthNames,monthNamesShort)+'</div><table class="ui-datepicker-calendar"><thead><tr>';var thead="";for(var dow=0;dow<7;dow++){var day=(dow+firstDay)%7;thead+="<th"+((dow+firstDay+6)%7>=5?' class="ui-datepicker-week-end"':"")+'><span title="'+dayNames[day]+'">'+dayNamesMin[day]+"</span></th>"}calender+=thead+"</tr></thead><tbody>";var daysInMonth=this._getDaysInMonth(drawYear,drawMonth);if(drawYear==inst.selectedYear&&drawMonth==inst.selectedMonth){inst.selectedDay=Math.min(inst.selectedDay,daysInMonth)}var leadDays=(this._getFirstDayOfMonth(drawYear,drawMonth)-firstDay+7)%7;var numRows=(isMultiMonth?6:Math.ceil((leadDays+daysInMonth)/7));var printDate=this._daylightSavingAdjust(new Date(drawYear,drawMonth,1-leadDays));for(var dRow=0;dRow<numRows;dRow++){calender+="<tr>";var tbody="";for(var dow=0;dow<7;dow++){var daySettings=(beforeShowDay?beforeShowDay.apply((inst.input?inst.input[0]:null),[printDate]):[true,""]);var otherMonth=(printDate.getMonth()!=drawMonth);var unselectable=otherMonth||!daySettings[0]||(minDate&&printDate<minDate)||(maxDate&&printDate>maxDate);tbody+='<td class="'+((dow+firstDay+6)%7>=5?" ui-datepicker-week-end":"")+(otherMonth?" ui-datepicker-other-month":"")+((printDate.getTime()==selectedDate.getTime()&&drawMonth==inst.selectedMonth&&inst._keyEvent)||(defaultDate.getTime()==printDate.getTime()&&defaultDate.getTime()==selectedDate.getTime())?" "+this._dayOverClass:"")+(unselectable?" "+this._unselectableClass+" ui-state-disabled":"")+(otherMonth&&!showOtherMonths?"":" "+daySettings[1]+(printDate.getTime()>=currentDate.getTime()&&printDate.getTime()<=endDate.getTime()?" "+this._currentClass:"")+(printDate.getTime()==today.getTime()?" ui-datepicker-today":""))+'"'+((!otherMonth||showOtherMonths)&&daySettings[2]?' title="'+daySettings[2]+'"':"")+(unselectable?"":" onclick=\"DP_jQuery.datepicker._selectDay('#"+inst.id+"',"+drawMonth+","+drawYear+', this);return false;"')+">"+(otherMonth?(showOtherMonths?printDate.getDate():" "):(unselectable?'<span class="ui-state-default">'+printDate.getDate()+"</span>":'<a class="ui-state-default'+(printDate.getTime()==today.getTime()?" ui-state-highlight":"")+(printDate.getTime()>=currentDate.getTime()&&printDate.getTime()<=endDate.getTime()?" ui-state-active":"")+'" href="#">'+printDate.getDate()+"</a>"))+"</td>";printDate.setDate(printDate.getDate()+1);printDate=this._daylightSavingAdjust(printDate)}calender+=tbody+"</tr>"}drawMonth++;if(drawMonth>11){drawMonth=0;drawYear++}calender+="</tbody></table>"+(isMultiMonth?"</div>"+((numMonths[0]>0&&col==numMonths[1]-1)?'<div class="ui-datepicker-row-break"></div>':""):"");group+=calender}html+=group}html+=buttonPanel+($.browser.msie&&parseInt($.browser.version,10)<7&&!inst.inline?'<iframe src="javascript:false;" class="ui-datepicker-cover" frameborder="0"></iframe>':"");inst._keyEvent=false;return html},_generateMonthYearHeader:function(inst,drawMonth,drawYear,minDate,maxDate,selectedDate,secondary,monthNames,monthNamesShort){minDate=(inst.rangeStart&&minDate&&selectedDate<minDate?selectedDate:minDate);var changeMonth=this._get(inst,"changeMonth");var changeYear=this._get(inst,"changeYear");var showMonthAfterYear=this._get(inst,"showMonthAfterYear");var html='<div class="ui-datepicker-title">';var monthHtml="";if(secondary||!changeMonth){monthHtml+='<span class="ui-datepicker-month">'+monthNames[drawMonth]+"</span> "}else{var inMinYear=(minDate&&minDate.getFullYear()==drawYear);var inMaxYear=(maxDate&&maxDate.getFullYear()==drawYear);monthHtml+='<select class="ui-datepicker-month" onchange="DP_jQuery.datepicker._selectMonthYear(\'#'+inst.id+"', this, 'M');\" onclick=\"DP_jQuery.datepicker._clickMonthYear('#"+inst.id+"');\">";for(var month=0;month<12;month++){if((!inMinYear||month>=minDate.getMonth())&&(!inMaxYear||month<=maxDate.getMonth())){monthHtml+='<option value="'+month+'"'+(month==drawMonth?' selected="selected"':"")+">"+monthNamesShort[month]+"</option>"}}monthHtml+="</select>"}if(!showMonthAfterYear){html+=monthHtml+((secondary||changeMonth||changeYear)&&(!(changeMonth&&changeYear))?" ":"")}if(secondary||!changeYear){html+='<span class="ui-datepicker-year">'+drawYear+"</span>"}else{var years=this._get(inst,"yearRange").split(":");var year=0;var endYear=0;if(years.length!=2){year=drawYear-10;endYear=drawYear+10}else{if(years[0].charAt(0)=="+"||years[0].charAt(0)=="-"){year=drawYear+parseInt(years[0],10);endYear=drawYear+parseInt(years[1],10)}else{year=parseInt(years[0],10);endYear=parseInt(years[1],10)}}year=(minDate?Math.max(year,minDate.getFullYear()):year);endYear=(maxDate?Math.min(endYear,maxDate.getFullYear()):endYear);html+='<select class="ui-datepicker-year" onchange="DP_jQuery.datepicker._selectMonthYear(\'#'+inst.id+"', this, 'Y');\" onclick=\"DP_jQuery.datepicker._clickMonthYear('#"+inst.id+"');\">";for(;year<=endYear;year++){html+='<option value="'+year+'"'+(year==drawYear?' selected="selected"':"")+">"+year+"</option>"}html+="</select>"}if(showMonthAfterYear){html+=(secondary||changeMonth||changeYear?" ":"")+monthHtml}html+="</div>";return html},_adjustInstDate:function(inst,offset,period){var year=inst.drawYear+(period=="Y"?offset:0);var month=inst.drawMonth+(period=="M"?offset:0);var day=Math.min(inst.selectedDay,this._getDaysInMonth(year,month))+(period=="D"?offset:0);var date=this._daylightSavingAdjust(new Date(year,month,day));var minDate=this._getMinMaxDate(inst,"min",true);var maxDate=this._getMinMaxDate(inst,"max");date=(minDate&&date<minDate?minDate:date);date=(maxDate&&date>maxDate?maxDate:date);inst.selectedDay=date.getDate();inst.drawMonth=inst.selectedMonth=date.getMonth();inst.drawYear=inst.selectedYear=date.getFullYear();if(period=="M"||period=="Y"){this._notifyChange(inst)}},_notifyChange:function(inst){var onChange=this._get(inst,"onChangeMonthYear");if(onChange){onChange.apply((inst.input?inst.input[0]:null),[inst.selectedYear,inst.selectedMonth+1,inst])}},_getNumberOfMonths:function(inst){var numMonths=this._get(inst,"numberOfMonths");return(numMonths==null?[1,1]:(typeof numMonths=="number"?[1,numMonths]:numMonths))},_getMinMaxDate:function(inst,minMax,checkRange){var date=this._determineDate(this._get(inst,minMax+"Date"),null);return(!checkRange||!inst.rangeStart?date:(!date||inst.rangeStart>date?inst.rangeStart:date))},_getDaysInMonth:function(year,month){return 32-new Date(year,month,32).getDate()},_getFirstDayOfMonth:function(year,month){return new Date(year,month,1).getDay()},_canAdjustMonth:function(inst,offset,curYear,curMonth){var numMonths=this._getNumberOfMonths(inst);var date=this._daylightSavingAdjust(new Date(curYear,curMonth+(offset<0?offset:numMonths[1]),1));if(offset<0){date.setDate(this._getDaysInMonth(date.getFullYear(),date.getMonth()))}return this._isInRange(inst,date)},_isInRange:function(inst,date){var newMinDate=(!inst.rangeStart?null:this._daylightSavingAdjust(new Date(inst.selectedYear,inst.selectedMonth,inst.selectedDay)));newMinDate=(newMinDate&&inst.rangeStart<newMinDate?inst.rangeStart:newMinDate);var minDate=newMinDate||this._getMinMaxDate(inst,"min");var maxDate=this._getMinMaxDate(inst,"max");return((!minDate||date>=minDate)&&(!maxDate||date<=maxDate))},_getFormatConfig:function(inst){var shortYearCutoff=this._get(inst,"shortYearCutoff");shortYearCutoff=(typeof shortYearCutoff!="string"?shortYearCutoff:new Date().getFullYear()%100+parseInt(shortYearCutoff,10));return{shortYearCutoff:shortYearCutoff,dayNamesShort:this._get(inst,"dayNamesShort"),dayNames:this._get(inst,"dayNames"),monthNamesShort:this._get(inst,"monthNamesShort"),monthNames:this._get(inst,"monthNames")}},_formatDate:function(inst,day,month,year){if(!day){inst.currentDay=inst.selectedDay;inst.currentMonth=inst.selectedMonth;inst.currentYear=inst.selectedYear}var date=(day?(typeof day=="object"?day:this._daylightSavingAdjust(new Date(year,month,day))):this._daylightSavingAdjust(new Date(inst.currentYear,inst.currentMonth,inst.currentDay)));return this.formatDate(this._get(inst,"dateFormat"),date,this._getFormatConfig(inst))}});function extendRemove(target,props){$.extend(target,props);for(var name in props){if(props[name]==null||props[name]==undefined){target[name]=props[name]}}return target}function isArray(a){return(a&&(($.browser.safari&&typeof a=="object"&&a.length)||(a.constructor&&a.constructor.toString().match(/\Array\(\)/))))}$.fn.datepicker=function(options){if(!$.datepicker.initialized){$(document).mousedown($.datepicker._checkExternalClick).find("body").append($.datepicker.dpDiv);$.datepicker.initialized=true}var otherArgs=Array.prototype.slice.call(arguments,1);if(typeof options=="string"&&(options=="isDisabled"||options=="getDate")){return $.datepicker["_"+options+"Datepicker"].apply($.datepicker,[this[0]].concat(otherArgs))}return this.each(function(){typeof options=="string"?$.datepicker["_"+options+"Datepicker"].apply($.datepicker,[this].concat(otherArgs)):$.datepicker._attachDatepicker(this,options)})};$.datepicker=new Datepicker();$.datepicker.initialized=false;$.datepicker.uuid=new Date().getTime();$.datepicker.version="1.7.1";window.DP_jQuery=$})(jQuery);;/*
- * jQuery UI Progressbar 1.7.1
- *
- * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Progressbar
- *
- * Depends:
- * ui.core.js
- */
(function(a){a.widget("ui.progressbar",{_init:function(){this.element.addClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").attr({role:"progressbar","aria-valuemin":this._valueMin(),"aria-valuemax":this._valueMax(),"aria-valuenow":this._value()});this.valueDiv=a('<div class="ui-progressbar-value ui-widget-header ui-corner-left"></div>').appendTo(this.element);this._refreshValue()},destroy:function(){this.element.removeClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow").removeData("progressbar").unbind(".progressbar");this.valueDiv.remove();a.widget.prototype.destroy.apply(this,arguments)},value:function(b){arguments.length&&this._setData("value",b);return this._value()},_setData:function(b,c){switch(b){case"value":this.options.value=c;this._refreshValue();this._trigger("change",null,{});break}a.widget.prototype._setData.apply(this,arguments)},_value:function(){var b=this.options.value;if(b<this._valueMin()){b=this._valueMin()}if(b>this._valueMax()){b=this._valueMax()}return b},_valueMin:function(){var b=0;return b},_valueMax:function(){var b=100;return b},_refreshValue:function(){var b=this.value();this.valueDiv[b==this._valueMax()?"addClass":"removeClass"]("ui-corner-right");this.valueDiv.width(b+"%");this.element.attr("aria-valuenow",b)}});a.extend(a.ui.progressbar,{version:"1.7.1",defaults:{value:0}})})(jQuery);;/*
- * jQuery UI Effects 1.7.1
- *
- * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Effects/
- */
jQuery.effects||(function(d){d.effects={version:"1.7.1",save:function(g,h){for(var f=0;f<h.length;f++){if(h[f]!==null){g.data("ec.storage."+h[f],g[0].style[h[f]])}}},restore:function(g,h){for(var f=0;f<h.length;f++){if(h[f]!==null){g.css(h[f],g.data("ec.storage."+h[f]))}}},setMode:function(f,g){if(g=="toggle"){g=f.is(":hidden")?"show":"hide"}return g},getBaseline:function(g,h){var i,f;switch(g[0]){case"top":i=0;break;case"middle":i=0.5;break;case"bottom":i=1;break;default:i=g[0]/h.height}switch(g[1]){case"left":f=0;break;case"center":f=0.5;break;case"right":f=1;break;default:f=g[1]/h.width}return{x:f,y:i}},createWrapper:function(f){if(f.parent().is(".ui-effects-wrapper")){return f.parent()}var g={width:f.outerWidth(true),height:f.outerHeight(true),"float":f.css("float")};f.wrap('<div class="ui-effects-wrapper" style="font-size:100%;background:transparent;border:none;margin:0;padding:0"></div>');var j=f.parent();if(f.css("position")=="static"){j.css({position:"relative"});f.css({position:"relative"})}else{var i=f.css("top");if(isNaN(parseInt(i,10))){i="auto"}var h=f.css("left");if(isNaN(parseInt(h,10))){h="auto"}j.css({position:f.css("position"),top:i,left:h,zIndex:f.css("z-index")}).show();f.css({position:"relative",top:0,left:0})}j.css(g);return j},removeWrapper:function(f){if(f.parent().is(".ui-effects-wrapper")){return f.parent().replaceWith(f)}return f},setTransition:function(g,i,f,h){h=h||{};d.each(i,function(k,j){unit=g.cssUnit(j);if(unit[0]>0){h[j]=unit[0]*f+unit[1]}});return h},animateClass:function(h,i,k,j){var f=(typeof k=="function"?k:(j?j:null));var g=(typeof k=="string"?k:null);return this.each(function(){var q={};var o=d(this);var p=o.attr("style")||"";if(typeof p=="object"){p=p.cssText}if(h.toggle){o.hasClass(h.toggle)?h.remove=h.toggle:h.add=h.toggle}var l=d.extend({},(document.defaultView?document.defaultView.getComputedStyle(this,null):this.currentStyle));if(h.add){o.addClass(h.add)}if(h.remove){o.removeClass(h.remove)}var m=d.extend({},(document.defaultView?document.defaultView.getComputedStyle(this,null):this.currentStyle));if(h.add){o.removeClass(h.add)}if(h.remove){o.addClass(h.remove)}for(var r in m){if(typeof m[r]!="function"&&m[r]&&r.indexOf("Moz")==-1&&r.indexOf("length")==-1&&m[r]!=l[r]&&(r.match(/color/i)||(!r.match(/color/i)&&!isNaN(parseInt(m[r],10))))&&(l.position!="static"||(l.position=="static"&&!r.match(/left|top|bottom|right/)))){q[r]=m[r]}}o.animate(q,i,g,function(){if(typeof d(this).attr("style")=="object"){d(this).attr("style")["cssText"]="";d(this).attr("style")["cssText"]=p}else{d(this).attr("style",p)}if(h.add){d(this).addClass(h.add)}if(h.remove){d(this).removeClass(h.remove)}if(f){f.apply(this,arguments)}})})}};function c(g,f){var i=g[1]&&g[1].constructor==Object?g[1]:{};if(f){i.mode=f}var h=g[1]&&g[1].constructor!=Object?g[1]:(i.duration?i.duration:g[2]);h=d.fx.off?0:typeof h==="number"?h:d.fx.speeds[h]||d.fx.speeds._default;var j=i.callback||(d.isFunction(g[1])&&g[1])||(d.isFunction(g[2])&&g[2])||(d.isFunction(g[3])&&g[3]);return[g[0],i,h,j]}d.fn.extend({_show:d.fn.show,_hide:d.fn.hide,__toggle:d.fn.toggle,_addClass:d.fn.addClass,_removeClass:d.fn.removeClass,_toggleClass:d.fn.toggleClass,effect:function(g,f,h,i){return d.effects[g]?d.effects[g].call(this,{method:g,options:f||{},duration:h,callback:i}):null},show:function(){if(!arguments[0]||(arguments[0].constructor==Number||(/(slow|normal|fast)/).test(arguments[0]))){return this._show.apply(this,arguments)}else{return this.effect.apply(this,c(arguments,"show"))}},hide:function(){if(!arguments[0]||(arguments[0].constructor==Number||(/(slow|normal|fast)/).test(arguments[0]))){return this._hide.apply(this,arguments)}else{return this.effect.apply(this,c(arguments,"hide"))}},toggle:function(){if(!arguments[0]||(arguments[0].constructor==Number||(/(slow|normal|fast)/).test(arguments[0]))||(arguments[0].constructor==Function)){return this.__toggle.apply(this,arguments)}else{return this.effect.apply(this,c(arguments,"toggle"))}},addClass:function(g,f,i,h){return f?d.effects.animateClass.apply(this,[{add:g},f,i,h]):this._addClass(g)},removeClass:function(g,f,i,h){return f?d.effects.animateClass.apply(this,[{remove:g},f,i,h]):this._removeClass(g)},toggleClass:function(g,f,i,h){return((typeof f!=="boolean")&&f)?d.effects.animateClass.apply(this,[{toggle:g},f,i,h]):this._toggleClass(g,f)},morph:function(f,h,g,j,i){return d.effects.animateClass.apply(this,[{add:h,remove:f},g,j,i])},switchClass:function(){return this.morph.apply(this,arguments)},cssUnit:function(f){var g=this.css(f),h=[];d.each(["em","px","%","pt"],function(j,k){if(g.indexOf(k)>0){h=[parseFloat(g),k]}});return h}});d.each(["backgroundColor","borderBottomColor","borderLeftColor","borderRightColor","borderTopColor","color","outlineColor"],function(g,f){d.fx.step[f]=function(h){if(h.state==0){h.start=e(h.elem,f);h.end=b(h.end)}h.elem.style[f]="rgb("+[Math.max(Math.min(parseInt((h.pos*(h.end[0]-h.start[0]))+h.start[0],10),255),0),Math.max(Math.min(parseInt((h.pos*(h.end[1]-h.start[1]))+h.start[1],10),255),0),Math.max(Math.min(parseInt((h.pos*(h.end[2]-h.start[2]))+h.start[2],10),255),0)].join(",")+")"}});function b(g){var f;if(g&&g.constructor==Array&&g.length==3){return g}if(f=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(g)){return[parseInt(f[1],10),parseInt(f[2],10),parseInt(f[3],10)]}if(f=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(g)){return[parseFloat(f[1])*2.55,parseFloat(f[2])*2.55,parseFloat(f[3])*2.55]}if(f=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(g)){return[parseInt(f[1],16),parseInt(f[2],16),parseInt(f[3],16)]}if(f=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(g)){return[parseInt(f[1]+f[1],16),parseInt(f[2]+f[2],16),parseInt(f[3]+f[3],16)]}if(f=/rgba\(0, 0, 0, 0\)/.exec(g)){return a.transparent}return a[d.trim(g).toLowerCase()]}function e(h,f){var g;do{g=d.curCSS(h,f);if(g!=""&&g!="transparent"||d.nodeName(h,"body")){break}f="backgroundColor"}while(h=h.parentNode);return b(g)}var a={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0],transparent:[255,255,255]};d.easing.jswing=d.easing.swing;d.extend(d.easing,{def:"easeOutQuad",swing:function(g,h,f,j,i){return d.easing[d.easing.def](g,h,f,j,i)},easeInQuad:function(g,h,f,j,i){return j*(h/=i)*h+f},easeOutQuad:function(g,h,f,j,i){return -j*(h/=i)*(h-2)+f},easeInOutQuad:function(g,h,f,j,i){if((h/=i/2)<1){return j/2*h*h+f}return -j/2*((--h)*(h-2)-1)+f},easeInCubic:function(g,h,f,j,i){return j*(h/=i)*h*h+f},easeOutCubic:function(g,h,f,j,i){return j*((h=h/i-1)*h*h+1)+f},easeInOutCubic:function(g,h,f,j,i){if((h/=i/2)<1){return j/2*h*h*h+f}return j/2*((h-=2)*h*h+2)+f},easeInQuart:function(g,h,f,j,i){return j*(h/=i)*h*h*h+f},easeOutQuart:function(g,h,f,j,i){return -j*((h=h/i-1)*h*h*h-1)+f},easeInOutQuart:function(g,h,f,j,i){if((h/=i/2)<1){return j/2*h*h*h*h+f}return -j/2*((h-=2)*h*h*h-2)+f},easeInQuint:function(g,h,f,j,i){return j*(h/=i)*h*h*h*h+f},easeOutQuint:function(g,h,f,j,i){return j*((h=h/i-1)*h*h*h*h+1)+f},easeInOutQuint:function(g,h,f,j,i){if((h/=i/2)<1){return j/2*h*h*h*h*h+f}return j/2*((h-=2)*h*h*h*h+2)+f},easeInSine:function(g,h,f,j,i){return -j*Math.cos(h/i*(Math.PI/2))+j+f},easeOutSine:function(g,h,f,j,i){return j*Math.sin(h/i*(Math.PI/2))+f},easeInOutSine:function(g,h,f,j,i){return -j/2*(Math.cos(Math.PI*h/i)-1)+f},easeInExpo:function(g,h,f,j,i){return(h==0)?f:j*Math.pow(2,10*(h/i-1))+f},easeOutExpo:function(g,h,f,j,i){return(h==i)?f+j:j*(-Math.pow(2,-10*h/i)+1)+f},easeInOutExpo:function(g,h,f,j,i){if(h==0){return f}if(h==i){return f+j}if((h/=i/2)<1){return j/2*Math.pow(2,10*(h-1))+f}return j/2*(-Math.pow(2,-10*--h)+2)+f},easeInCirc:function(g,h,f,j,i){return -j*(Math.sqrt(1-(h/=i)*h)-1)+f},easeOutCirc:function(g,h,f,j,i){return j*Math.sqrt(1-(h=h/i-1)*h)+f},easeInOutCirc:function(g,h,f,j,i){if((h/=i/2)<1){return -j/2*(Math.sqrt(1-h*h)-1)+f}return j/2*(Math.sqrt(1-(h-=2)*h)+1)+f},easeInElastic:function(g,i,f,m,l){var j=1.70158;var k=0;var h=m;if(i==0){return f}if((i/=l)==1){return f+m}if(!k){k=l*0.3}if(h<Math.abs(m)){h=m;var j=k/4}else{var j=k/(2*Math.PI)*Math.asin(m/h)}return -(h*Math.pow(2,10*(i-=1))*Math.sin((i*l-j)*(2*Math.PI)/k))+f},easeOutElastic:function(g,i,f,m,l){var j=1.70158;var k=0;var h=m;if(i==0){return f}if((i/=l)==1){return f+m}if(!k){k=l*0.3}if(h<Math.abs(m)){h=m;var j=k/4}else{var j=k/(2*Math.PI)*Math.asin(m/h)}return h*Math.pow(2,-10*i)*Math.sin((i*l-j)*(2*Math.PI)/k)+m+f},easeInOutElastic:function(g,i,f,m,l){var j=1.70158;var k=0;var h=m;if(i==0){return f}if((i/=l/2)==2){return f+m}if(!k){k=l*(0.3*1.5)}if(h<Math.abs(m)){h=m;var j=k/4}else{var j=k/(2*Math.PI)*Math.asin(m/h)}if(i<1){return -0.5*(h*Math.pow(2,10*(i-=1))*Math.sin((i*l-j)*(2*Math.PI)/k))+f}return h*Math.pow(2,-10*(i-=1))*Math.sin((i*l-j)*(2*Math.PI)/k)*0.5+m+f},easeInBack:function(g,h,f,k,j,i){if(i==undefined){i=1.70158}return k*(h/=j)*h*((i+1)*h-i)+f},easeOutBack:function(g,h,f,k,j,i){if(i==undefined){i=1.70158}return k*((h=h/j-1)*h*((i+1)*h+i)+1)+f},easeInOutBack:function(g,h,f,k,j,i){if(i==undefined){i=1.70158}if((h/=j/2)<1){return k/2*(h*h*(((i*=(1.525))+1)*h-i))+f}return k/2*((h-=2)*h*(((i*=(1.525))+1)*h+i)+2)+f},easeInBounce:function(g,h,f,j,i){return j-d.easing.easeOutBounce(g,i-h,0,j,i)+f},easeOutBounce:function(g,h,f,j,i){if((h/=i)<(1/2.75)){return j*(7.5625*h*h)+f}else{if(h<(2/2.75)){return j*(7.5625*(h-=(1.5/2.75))*h+0.75)+f}else{if(h<(2.5/2.75)){return j*(7.5625*(h-=(2.25/2.75))*h+0.9375)+f}else{return j*(7.5625*(h-=(2.625/2.75))*h+0.984375)+f}}}},easeInOutBounce:function(g,h,f,j,i){if(h<i/2){return d.easing.easeInBounce(g,h*2,0,j,i)*0.5+f}return d.easing.easeOutBounce(g,h*2-i,0,j,i)*0.5+j*0.5+f}})})(jQuery);;/*
- * jQuery UI Effects Blind 1.7.1
- *
- * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Effects/Blind
- *
- * Depends:
- * effects.core.js
- */
(function(a){a.effects.blind=function(b){return this.queue(function(){var d=a(this),c=["position","top","left"];var h=a.effects.setMode(d,b.options.mode||"hide");var g=b.options.direction||"vertical";a.effects.save(d,c);d.show();var j=a.effects.createWrapper(d).css({overflow:"hidden"});var e=(g=="vertical")?"height":"width";var i=(g=="vertical")?j.height():j.width();if(h=="show"){j.css(e,0)}var f={};f[e]=h=="show"?i:0;j.animate(f,b.duration,b.options.easing,function(){if(h=="hide"){d.hide()}a.effects.restore(d,c);a.effects.removeWrapper(d);if(b.callback){b.callback.apply(d[0],arguments)}d.dequeue()})})}})(jQuery);;/*
- * jQuery UI Effects Bounce 1.7.1
- *
- * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Effects/Bounce
- *
- * Depends:
- * effects.core.js
- */
(function(a){a.effects.bounce=function(b){return this.queue(function(){var e=a(this),l=["position","top","left"];var k=a.effects.setMode(e,b.options.mode||"effect");var n=b.options.direction||"up";var c=b.options.distance||20;var d=b.options.times||5;var g=b.duration||250;if(/show|hide/.test(k)){l.push("opacity")}a.effects.save(e,l);e.show();a.effects.createWrapper(e);var f=(n=="up"||n=="down")?"top":"left";var p=(n=="up"||n=="left")?"pos":"neg";var c=b.options.distance||(f=="top"?e.outerHeight({margin:true})/3:e.outerWidth({margin:true})/3);if(k=="show"){e.css("opacity",0).css(f,p=="pos"?-c:c)}if(k=="hide"){c=c/(d*2)}if(k!="hide"){d--}if(k=="show"){var h={opacity:1};h[f]=(p=="pos"?"+=":"-=")+c;e.animate(h,g/2,b.options.easing);c=c/2;d--}for(var j=0;j<d;j++){var o={},m={};o[f]=(p=="pos"?"-=":"+=")+c;m[f]=(p=="pos"?"+=":"-=")+c;e.animate(o,g/2,b.options.easing).animate(m,g/2,b.options.easing);c=(k=="hide")?c*2:c/2}if(k=="hide"){var h={opacity:0};h[f]=(p=="pos"?"-=":"+=")+c;e.animate(h,g/2,b.options.easing,function(){e.hide();a.effects.restore(e,l);a.effects.removeWrapper(e);if(b.callback){b.callback.apply(this,arguments)}})}else{var o={},m={};o[f]=(p=="pos"?"-=":"+=")+c;m[f]=(p=="pos"?"+=":"-=")+c;e.animate(o,g/2,b.options.easing).animate(m,g/2,b.options.easing,function(){a.effects.restore(e,l);a.effects.removeWrapper(e);if(b.callback){b.callback.apply(this,arguments)}})}e.queue("fx",function(){e.dequeue()});e.dequeue()})}})(jQuery);;/*
- * jQuery UI Effects Clip 1.7.1
- *
- * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Effects/Clip
- *
- * Depends:
- * effects.core.js
- */
(function(a){a.effects.clip=function(b){return this.queue(function(){var f=a(this),j=["position","top","left","height","width"];var i=a.effects.setMode(f,b.options.mode||"hide");var k=b.options.direction||"vertical";a.effects.save(f,j);f.show();var c=a.effects.createWrapper(f).css({overflow:"hidden"});var e=f[0].tagName=="IMG"?c:f;var g={size:(k=="vertical")?"height":"width",position:(k=="vertical")?"top":"left"};var d=(k=="vertical")?e.height():e.width();if(i=="show"){e.css(g.size,0);e.css(g.position,d/2)}var h={};h[g.size]=i=="show"?d:0;h[g.position]=i=="show"?0:d/2;e.animate(h,{queue:false,duration:b.duration,easing:b.options.easing,complete:function(){if(i=="hide"){f.hide()}a.effects.restore(f,j);a.effects.removeWrapper(f);if(b.callback){b.callback.apply(f[0],arguments)}f.dequeue()}})})}})(jQuery);;/*
- * jQuery UI Effects Drop 1.7.1
- *
- * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Effects/Drop
- *
- * Depends:
- * effects.core.js
- */
(function(a){a.effects.drop=function(b){return this.queue(function(){var e=a(this),d=["position","top","left","opacity"];var i=a.effects.setMode(e,b.options.mode||"hide");var h=b.options.direction||"left";a.effects.save(e,d);e.show();a.effects.createWrapper(e);var f=(h=="up"||h=="down")?"top":"left";var c=(h=="up"||h=="left")?"pos":"neg";var j=b.options.distance||(f=="top"?e.outerHeight({margin:true})/2:e.outerWidth({margin:true})/2);if(i=="show"){e.css("opacity",0).css(f,c=="pos"?-j:j)}var g={opacity:i=="show"?1:0};g[f]=(i=="show"?(c=="pos"?"+=":"-="):(c=="pos"?"-=":"+="))+j;e.animate(g,{queue:false,duration:b.duration,easing:b.options.easing,complete:function(){if(i=="hide"){e.hide()}a.effects.restore(e,d);a.effects.removeWrapper(e);if(b.callback){b.callback.apply(this,arguments)}e.dequeue()}})})}})(jQuery);;/*
- * jQuery UI Effects Explode 1.7.1
- *
- * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Effects/Explode
- *
- * Depends:
- * effects.core.js
- */
(function(a){a.effects.explode=function(b){return this.queue(function(){var k=b.options.pieces?Math.round(Math.sqrt(b.options.pieces)):3;var e=b.options.pieces?Math.round(Math.sqrt(b.options.pieces)):3;b.options.mode=b.options.mode=="toggle"?(a(this).is(":visible")?"hide":"show"):b.options.mode;var h=a(this).show().css("visibility","hidden");var l=h.offset();l.top-=parseInt(h.css("marginTop"),10)||0;l.left-=parseInt(h.css("marginLeft"),10)||0;var g=h.outerWidth(true);var c=h.outerHeight(true);for(var f=0;f<k;f++){for(var d=0;d<e;d++){h.clone().appendTo("body").wrap("<div></div>").css({position:"absolute",visibility:"visible",left:-d*(g/e),top:-f*(c/k)}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:g/e,height:c/k,left:l.left+d*(g/e)+(b.options.mode=="show"?(d-Math.floor(e/2))*(g/e):0),top:l.top+f*(c/k)+(b.options.mode=="show"?(f-Math.floor(k/2))*(c/k):0),opacity:b.options.mode=="show"?0:1}).animate({left:l.left+d*(g/e)+(b.options.mode=="show"?0:(d-Math.floor(e/2))*(g/e)),top:l.top+f*(c/k)+(b.options.mode=="show"?0:(f-Math.floor(k/2))*(c/k)),opacity:b.options.mode=="show"?1:0},b.duration||500)}}setTimeout(function(){b.options.mode=="show"?h.css({visibility:"visible"}):h.css({visibility:"visible"}).hide();if(b.callback){b.callback.apply(h[0])}h.dequeue();a("div.ui-effects-explode").remove()},b.duration||500)})}})(jQuery);;/*
- * jQuery UI Effects Fold 1.7.1
- *
- * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Effects/Fold
- *
- * Depends:
- * effects.core.js
- */
(function(a){a.effects.fold=function(b){return this.queue(function(){var e=a(this),k=["position","top","left"];var h=a.effects.setMode(e,b.options.mode||"hide");var o=b.options.size||15;var n=!(!b.options.horizFirst);var g=b.duration?b.duration/2:a.fx.speeds._default/2;a.effects.save(e,k);e.show();var d=a.effects.createWrapper(e).css({overflow:"hidden"});var i=((h=="show")!=n);var f=i?["width","height"]:["height","width"];var c=i?[d.width(),d.height()]:[d.height(),d.width()];var j=/([0-9]+)%/.exec(o);if(j){o=parseInt(j[1],10)/100*c[h=="hide"?0:1]}if(h=="show"){d.css(n?{height:0,width:o}:{height:o,width:0})}var m={},l={};m[f[0]]=h=="show"?c[0]:o;l[f[1]]=h=="show"?c[1]:0;d.animate(m,g,b.options.easing).animate(l,g,b.options.easing,function(){if(h=="hide"){e.hide()}a.effects.restore(e,k);a.effects.removeWrapper(e);if(b.callback){b.callback.apply(e[0],arguments)}e.dequeue()})})}})(jQuery);;/*
- * jQuery UI Effects Highlight 1.7.1
- *
- * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Effects/Highlight
- *
- * Depends:
- * effects.core.js
- */
(function(a){a.effects.highlight=function(b){return this.queue(function(){var e=a(this),d=["backgroundImage","backgroundColor","opacity"];var h=a.effects.setMode(e,b.options.mode||"show");var c=b.options.color||"#ffff99";var g=e.css("backgroundColor");a.effects.save(e,d);e.show();e.css({backgroundImage:"none",backgroundColor:c});var f={backgroundColor:g};if(h=="hide"){f.opacity=0}e.animate(f,{queue:false,duration:b.duration,easing:b.options.easing,complete:function(){if(h=="hide"){e.hide()}a.effects.restore(e,d);if(h=="show"&&a.browser.msie){this.style.removeAttribute("filter")}if(b.callback){b.callback.apply(this,arguments)}e.dequeue()}})})}})(jQuery);;/*
- * jQuery UI Effects Pulsate 1.7.1
- *
- * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Effects/Pulsate
- *
- * Depends:
- * effects.core.js
- */
(function(a){a.effects.pulsate=function(b){return this.queue(function(){var d=a(this);var g=a.effects.setMode(d,b.options.mode||"show");var f=b.options.times||5;var e=b.duration?b.duration/2:a.fx.speeds._default/2;if(g=="hide"){f--}if(d.is(":hidden")){d.css("opacity",0);d.show();d.animate({opacity:1},e,b.options.easing);f=f-2}for(var c=0;c<f;c++){d.animate({opacity:0},e,b.options.easing).animate({opacity:1},e,b.options.easing)}if(g=="hide"){d.animate({opacity:0},e,b.options.easing,function(){d.hide();if(b.callback){b.callback.apply(this,arguments)}})}else{d.animate({opacity:0},e,b.options.easing).animate({opacity:1},e,b.options.easing,function(){if(b.callback){b.callback.apply(this,arguments)}})}d.queue("fx",function(){d.dequeue()});d.dequeue()})}})(jQuery);;/*
- * jQuery UI Effects Scale 1.7.1
- *
- * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Effects/Scale
- *
- * Depends:
- * effects.core.js
- */
(function(a){a.effects.puff=function(b){return this.queue(function(){var f=a(this);var c=a.extend(true,{},b.options);var h=a.effects.setMode(f,b.options.mode||"hide");var g=parseInt(b.options.percent,10)||150;c.fade=true;var e={height:f.height(),width:f.width()};var d=g/100;f.from=(h=="hide")?e:{height:e.height*d,width:e.width*d};c.from=f.from;c.percent=(h=="hide")?g:100;c.mode=h;f.effect("scale",c,b.duration,b.callback);f.dequeue()})};a.effects.scale=function(b){return this.queue(function(){var g=a(this);var d=a.extend(true,{},b.options);var j=a.effects.setMode(g,b.options.mode||"effect");var h=parseInt(b.options.percent,10)||(parseInt(b.options.percent,10)==0?0:(j=="hide"?0:100));var i=b.options.direction||"both";var c=b.options.origin;if(j!="effect"){d.origin=c||["middle","center"];d.restore=true}var f={height:g.height(),width:g.width()};g.from=b.options.from||(j=="show"?{height:0,width:0}:f);var e={y:i!="horizontal"?(h/100):1,x:i!="vertical"?(h/100):1};g.to={height:f.height*e.y,width:f.width*e.x};if(b.options.fade){if(j=="show"){g.from.opacity=0;g.to.opacity=1}if(j=="hide"){g.from.opacity=1;g.to.opacity=0}}d.from=g.from;d.to=g.to;d.mode=j;g.effect("size",d,b.duration,b.callback);g.dequeue()})};a.effects.size=function(b){return this.queue(function(){var c=a(this),n=["position","top","left","width","height","overflow","opacity"];var m=["position","top","left","overflow","opacity"];var j=["width","height","overflow"];var p=["fontSize"];var k=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"];var f=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"];var g=a.effects.setMode(c,b.options.mode||"effect");var i=b.options.restore||false;var e=b.options.scale||"both";var o=b.options.origin;var d={height:c.height(),width:c.width()};c.from=b.options.from||d;c.to=b.options.to||d;if(o){var h=a.effects.getBaseline(o,d);c.from.top=(d.height-c.from.height)*h.y;c.from.left=(d.width-c.from.width)*h.x;c.to.top=(d.height-c.to.height)*h.y;c.to.left=(d.width-c.to.width)*h.x}var l={from:{y:c.from.height/d.height,x:c.from.width/d.width},to:{y:c.to.height/d.height,x:c.to.width/d.width}};if(e=="box"||e=="both"){if(l.from.y!=l.to.y){n=n.concat(k);c.from=a.effects.setTransition(c,k,l.from.y,c.from);c.to=a.effects.setTransition(c,k,l.to.y,c.to)}if(l.from.x!=l.to.x){n=n.concat(f);c.from=a.effects.setTransition(c,f,l.from.x,c.from);c.to=a.effects.setTransition(c,f,l.to.x,c.to)}}if(e=="content"||e=="both"){if(l.from.y!=l.to.y){n=n.concat(p);c.from=a.effects.setTransition(c,p,l.from.y,c.from);c.to=a.effects.setTransition(c,p,l.to.y,c.to)}}a.effects.save(c,i?n:m);c.show();a.effects.createWrapper(c);c.css("overflow","hidden").css(c.from);if(e=="content"||e=="both"){k=k.concat(["marginTop","marginBottom"]).concat(p);f=f.concat(["marginLeft","marginRight"]);j=n.concat(k).concat(f);c.find("*[width]").each(function(){child=a(this);if(i){a.effects.save(child,j)}var q={height:child.height(),width:child.width()};child.from={height:q.height*l.from.y,width:q.width*l.from.x};child.to={height:q.height*l.to.y,width:q.width*l.to.x};if(l.from.y!=l.to.y){child.from=a.effects.setTransition(child,k,l.from.y,child.from);child.to=a.effects.setTransition(child,k,l.to.y,child.to)}if(l.from.x!=l.to.x){child.from=a.effects.setTransition(child,f,l.from.x,child.from);child.to=a.effects.setTransition(child,f,l.to.x,child.to)}child.css(child.from);child.animate(child.to,b.duration,b.options.easing,function(){if(i){a.effects.restore(child,j)}})})}c.animate(c.to,{queue:false,duration:b.duration,easing:b.options.easing,complete:function(){if(g=="hide"){c.hide()}a.effects.restore(c,i?n:m);a.effects.removeWrapper(c);if(b.callback){b.callback.apply(this,arguments)}c.dequeue()}})})}})(jQuery);;/*
- * jQuery UI Effects Shake 1.7.1
- *
- * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Effects/Shake
- *
- * Depends:
- * effects.core.js
- */
(function(a){a.effects.shake=function(b){return this.queue(function(){var e=a(this),l=["position","top","left"];var k=a.effects.setMode(e,b.options.mode||"effect");var n=b.options.direction||"left";var c=b.options.distance||20;var d=b.options.times||3;var g=b.duration||b.options.duration||140;a.effects.save(e,l);e.show();a.effects.createWrapper(e);var f=(n=="up"||n=="down")?"top":"left";var p=(n=="up"||n=="left")?"pos":"neg";var h={},o={},m={};h[f]=(p=="pos"?"-=":"+=")+c;o[f]=(p=="pos"?"+=":"-=")+c*2;m[f]=(p=="pos"?"-=":"+=")+c*2;e.animate(h,g,b.options.easing);for(var j=1;j<d;j++){e.animate(o,g,b.options.easing).animate(m,g,b.options.easing)}e.animate(o,g,b.options.easing).animate(h,g/2,b.options.easing,function(){a.effects.restore(e,l);a.effects.removeWrapper(e);if(b.callback){b.callback.apply(this,arguments)}});e.queue("fx",function(){e.dequeue()});e.dequeue()})}})(jQuery);;/*
- * jQuery UI Effects Slide 1.7.1
- *
- * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Effects/Slide
- *
- * Depends:
- * effects.core.js
- */
(function(a){a.effects.slide=function(b){return this.queue(function(){var e=a(this),d=["position","top","left"];var i=a.effects.setMode(e,b.options.mode||"show");var h=b.options.direction||"left";a.effects.save(e,d);e.show();a.effects.createWrapper(e).css({overflow:"hidden"});var f=(h=="up"||h=="down")?"top":"left";var c=(h=="up"||h=="left")?"pos":"neg";var j=b.options.distance||(f=="top"?e.outerHeight({margin:true}):e.outerWidth({margin:true}));if(i=="show"){e.css(f,c=="pos"?-j:j)}var g={};g[f]=(i=="show"?(c=="pos"?"+=":"-="):(c=="pos"?"-=":"+="))+j;e.animate(g,{queue:false,duration:b.duration,easing:b.options.easing,complete:function(){if(i=="hide"){e.hide()}a.effects.restore(e,d);a.effects.removeWrapper(e);if(b.callback){b.callback.apply(this,arguments)}e.dequeue()}})})}})(jQuery);;/*
- * jQuery UI Effects Transfer 1.7.1
- *
- * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Effects/Transfer
- *
- * Depends:
- * effects.core.js
- */
(function(a){a.effects.transfer=function(b){return this.queue(function(){var f=a(this),h=a(b.options.to),e=h.offset(),g={top:e.top,left:e.left,height:h.innerHeight(),width:h.innerWidth()},d=f.offset(),c=a('<div class="ui-effects-transfer"></div>').appendTo(document.body).addClass(b.options.className).css({top:d.top,left:d.left,height:f.innerHeight(),width:f.innerWidth(),position:"absolute"}).animate(g,b.duration,b.options.easing,function(){c.remove();(b.callback&&b.callback.apply(f[0],arguments));f.dequeue()})})}})(jQuery);;
\ No newline at end of file
diff --git a/WebContent/js/mediaboxAdv99f.js b/WebContent/js/mediaboxAdv99f.js
index b1e9a71..64a7278 100644
--- a/WebContent/js/mediaboxAdv99f.js
+++ b/WebContent/js/mediaboxAdv99f.js
@@ -1,600 +1,600 @@
/*
mediaboxAdvanced v0.9.9f - The ultimate extension of Mediabox into an all-media script
updated 2009.03.28
(c) 2007-2009 John Einselen <http://iaian7.com>
based on
Slimbox v1.64 - The ultimate lightweight Lightbox clone
(c) 2007-2008 Christophe Beyls <http://www.digitalia.be>
MIT-style license.
*/
var Mediabox;
(function() {
// Global variables, accessible to Mediabox only
var state = 0, options, images, activeImage, prevImage, nextImage, top, fx, preload, preloadPrev = new Image(), preloadNext = new Image(), // State values: 0 (closed or closing), 1 (open and ready), 2+ (open and busy with animation)
// DOM elements
overlay, center, image, bottomContainer, bottom, captionSplit, title, caption, prevLink, number, nextLink,
// Mediabox specific vars
URL, WH, WHL, elrel, mediaWidth, mediaHeight, mediaType = "none", mediaSplit, mediaId = "mediaBox", mediaFmt;
/*
Initialization
*/
window.addEvent("domready", function() {
// Create and append the Mediabox HTML code at the bottom of the document
$(document.body).adopt(
$$([
overlay = new Element("div", {id: "mbOverlay"}).addEvent("click", close),
center = new Element("div", {id: "mbCenter"}),
bottomContainer = new Element("div", {id: "mbBottomContainer"})
]).setStyle("display", "none")
);
image = new Element("div", {id: "mbImage"}).injectInside(center);
bottom = new Element("div", {id: "mbBottom"}).injectInside(bottomContainer).adopt(
new Element("a", {id: "mbCloseLink", href: "#"}).addEvent("click", close),
nextLink = new Element("a", {id: "mbNextLink", href: "#"}).addEvent("click", next),
prevLink = new Element("a", {id: "mbPrevLink", href: "#"}).addEvent("click", previous),
title = new Element("div", {id: "mbTitle"}),
number = new Element("div", {id: "mbNumber"}),
caption = new Element("div", {id: "mbCaption"}),
new Element("div", {styles: {clear: "both"}})
);
fx = {
overlay: new Fx.Tween(overlay, {property: "opacity", duration: 360}).set(0),
image: new Fx.Tween(image, {property: "opacity", duration: 360, onComplete: nextEffect}),
bottom: new Fx.Tween(bottom, {property: "margin-top", duration: 240})
};
});
/*
API
*/
Mediabox = {
close: function(){
close(); // Thanks to Yosha on the google group for fixing the close function API!
},
open: function(_images, startImage, _options) {
options = $extend({
loop: false, // Allows to navigate between first and last images
stopKey: true, // Prevents default keyboard action (such as up/down arrows), in lieu of the shortcuts
// Does not apply to iFrame content
// Does not affect mouse scrolling
overlayOpacity: 0.7, // 1 is opaque, 0 is completely transparent (change the color in the CSS file)
// Remember that Firefox 2 and Camino 1.6 on the Mac require a background .png set in the CSS
resizeDuration: 240, // Duration of each of the box resize animations (in milliseconds)
resizeTransition: false, // Default transition in mootools
initialWidth: 360, // Initial width of the box (in pixels)
initialHeight: 240, // Initial height of the box (in pixels)
showCaption: true, // Display the title and caption, true / false
animateCaption: true, // Animate the caption, true / false
showCounter: true, // If true, a counter will only be shown if there is more than 1 image to display
counterText: ' ({x} of {y})', // Translate or change as you wish
// Global media options
scriptaccess: 'true', // Allow script access to flash files
fullscreen: 'true', // Use fullscreen
fullscreenNum: '1', // 1 = true
autoplay: 'true', // Plays the video as soon as it's opened
autoplayNum: '1', // 1 = true
autoplayYes: 'yes', // yes = true
bgcolor: '#000000', // Background color, used for both flash and QT media
// JW Media Player settings and options
- playerpath: '../embed/player.swf', // Path to the mediaplayer.swf or flvplayer.swf file
+ playerpath: 'embed/player.swf', // Path to the mediaplayer.swf or flvplayer.swf file
backcolor: '000000', // Base color for the controller, color name / hex value (0x000000)
frontcolor: '999999', // Text and button color for the controller, color name / hex value (0x000000)
lightcolor: '000000', // Rollover color for the controller, color name / hex value (0x000000)
screencolor: '000000', // Rollover color for the controller, color name / hex value (0x000000)
controlbar: 'over', // bottom, over, none (this setting is ignored when playing audio files)
// NonverBlaster
useNB: false, // use NonverBlaster in place of the JW Media Player for .flv and .mp4 files
NBpath: '../js/NonverBlaster.swf', // Path to NonverBlaster.swf
NBloop: 'true', // Loop video playback, true / false
controllerColor: '0x777777', // set the controlbar colour
showTimecode: 'false', // turn timecode display off or on
// Quicktime options
controller: 'true', // Show controller, true / false
// Flickr options
flInfo: 'true', // Show title and info at video start
// Revver options
revverID: '187866', // Revver affiliate ID, required for ad revinue sharing
revverFullscreen: 'true', // Fullscreen option
revverBack: '000000', // Background colour
revverFront: 'ffffff', // Foreground colour
revverGrad: '000000', // Gradation colour
// Youtube options
ytColor1: '000000', // Outline colour
ytColor2: '333333', // Base interface colour (highlight colours stay consistent)
ytQuality: '&ap=%2526fmt%3D18', // Empty for standard quality, use '&ap=%2526fmt%3D18' for high quality, and '&ap=%2526fmt%3D22' for HD (note that not all videos are availible in high quality, and very few in HD)
// Vimeo options
vdPlayer: 'false', // Use simple (smaller) player (22px less)
// Vimeo options
vmTitle: '1', // Show video title
vmByline: '1', // Show byline
vmPortrait: '1', // Show author portrait
vmColor: 'ffffff' // Custom controller colours, hex value minus the # sign, defult is 5ca0b5
}, _options || {});
if (typeof _images == "string") { // The function is called for a single image, with URL and Title as first two arguments
_images = [[_images,startImage,_options]];
startImage = 0;
}
// Fixes Firefox 2 and Camino 1.6 incompatibility with opacity + flash
if ((Browser.Engine.gecko) && (Browser.Engine.version<19)) {
options.overlayOpacity = 1;
overlay.className = 'mbOverlayFF';
}
images = _images;
options.loop = options.loop && (images.length > 1);
position();
setup(true);
top = window.getScrollTop() + (window.getHeight() / 15);
fx.resize = new Fx.Morph(center, $extend({duration: options.resizeDuration, onComplete: nextEffect}, options.resizeTransition ? {transition: options.resizeTransition} : {}));
center.setStyles({top: top, width: options.initialWidth, height: options.initialHeight, marginLeft: -(options.initialWidth/2), display: ""});
fx.overlay.start(options.overlayOpacity);
state = 1;
return changeImage(startImage);
}
};
Element.implement({
mediabox: function(_options, linkMapper) {
$$(this).mediabox(_options, linkMapper); // The processing of a single element is similar to the processing of a collection with a single element
return this;
}
});
Elements.implement({
/*
options: Optional options object, see Mediabox.open()
linkMapper: Optional function taking a link DOM element and an index as arguments and returning an array containing 3 elements:
the image URL and the image caption (may contain HTML)
linksFilter: Optional function taking a link DOM element and an index as arguments and returning true if the element is part of
the image collection that will be shown on click, false if not. "this" refers to the element that was clicked.
This function must always return true when the DOM element argument is "this".
*/
mediabox: function(_options, linkMapper, linksFilter) {
linkMapper = linkMapper || function(el) {
elrel = el.rel.split(/[\[\]]/);
elrel = elrel[1];
return [el.href, el.title, elrel];
};
linksFilter = linksFilter || function() {
return true;
};
var links = this;
links.removeEvents("click").addEvent("click", function() {
// Build the list of images that will be displayed
var filteredArray = links.filter(linksFilter, this);
var filteredLinks = [];
var filteredHrefs = [];
filteredArray.each(function(item, index){
if(filteredHrefs.indexOf(item.toString()) < 0) {
filteredLinks.include(filteredArray[index]);
filteredHrefs.include(filteredArray[index].toString());
};
});
return Mediabox.open(filteredLinks.map(linkMapper), filteredHrefs.indexOf(this.toString()), _options);
});
return links;
}
});
/*
Internal functions
*/
function position() {
overlay.setStyles({top: window.getScrollTop(), height: window.getHeight()});
}
function setup(open) {
// Hides on-page objects and embeds while the overlay is open to counteract Firefox stupidity
["object", window.ie ? "select" : "embed"].forEach(function(tag) {
Array.forEach(document.getElementsByTagName(tag), function(el) {
if (open) el._mediabox = el.style.visibility;
el.style.visibility = open ? "hidden" : el._mediabox;
});
});
overlay.style.display = open ? "" : "none";
var fn = open ? "addEvent" : "removeEvent";
window[fn]("scroll", position)[fn]("resize", position);
document[fn]("keydown", keyDown);
}
function keyDown(event) {
switch(event.code) {
case 27: // Esc
case 88: // 'x'
case 67: // 'c'
close();
break;
case 37: // Left arrow
case 80: // 'p'
previous();
break;
case 39: // Right arrow
case 78: // 'n'
next();
}
if (options.stopKey) { return false; };
}
function previous() {
return changeImage(prevImage);
}
function next() {
return changeImage(nextImage);
}
function changeImage(imageIndex) {
if ((state == 1) && (imageIndex >= 0)) {
state = 2;
image.set('html', '');
activeImage = imageIndex;
prevImage = ((activeImage || !options.loop) ? activeImage : images.length) - 1;
nextImage = activeImage + 1;
if (nextImage == images.length) nextImage = options.loop ? 0 : -1;
$$(prevLink, nextLink, image, bottomContainer).setStyle("display", "none");
fx.bottom.cancel().set(0);
fx.image.set(0);
center.className = "mbLoading";
// MEDIABOX FORMATING
WH = images[imageIndex][2].split(' ');
WHL = WH.length;
if (WHL>1) {
mediaWidth = (WH[WHL-2].match("%")) ? (window.getWidth()*("0."+(WH[WHL-2].replace("%", ""))))+"px" : WH[WHL-2]+"px";
mediaHeight = (WH[WHL-1].match("%")) ? (window.getHeight()*("0."+(WH[WHL-1].replace("%", ""))))+"px" : WH[WHL-1]+"px";
} else {
mediaWidth = "";
mediaHeight = "";
}
URL = images[imageIndex][0];
captionSplit = images[activeImage][1].split('::');
// Quietube support
if (URL.match(/quietube\.com/i)) {
mediaSplit = URL.split('v.php/');
URL = mediaSplit[1];
}
// MEDIA TYPES
// IMAGES
if (URL.match(/\.gif|\.jpg|\.png/i)) {
mediaType = 'img';
preload = new Image();
preload.onload = nextEffect;
preload.src = images[imageIndex][0];
// FLV, MP4
} else if (URL.match(/\.flv|\.mp4|\.m4v/i)) {
mediaType = 'obj';
mediaWidth = mediaWidth || options.initialWidth;
mediaHeight = mediaHeight || options.initialHeight;
if (options.useNB) {
preload = new Swiff(''+options.NBpath+'?videoURL='+URL+'&allowSmoothing=true&autoPlay='+options.autoplay+'&buffer=6&showTimecode='+options.showTimecode+'&loop='+options.NBloop+'&controlColour='+options.controllerColor+'&scaleIfFullScreen=true&showScalingButton=false', {
id: 'MediaboxSWF',
width: mediaWidth,
height: mediaHeight,
params: {wmode: 'opaque', bgcolor: options.bgcolor, allowscriptaccess: options.scriptaccess, allowfullscreen: options.fullscreen}
});
} else {
preload = new Swiff(''+options.playerpath+'?file='+URL+'&backcolor='+options.backcolor+'&frontcolor='+options.frontcolor+'&lightcolor='+options.lightcolor+'&screencolor='+options.screencolor+'&autostart='+options.autoplay+'&controlbar='+options.controlbar, {
id: 'MediaboxSWF',
width: mediaWidth,
height: mediaHeight,
params: {wmode: 'opaque', bgcolor: options.bgcolor, allowscriptaccess: options.scriptaccess, allowfullscreen: options.fullscreen}
});
}
nextEffect();
// MP3, AAC
} else if (URL.match(/\.mp3|\.aac/i)) {
mediaType = 'obj';
mediaWidth = mediaWidth || options.initialWidth;
mediaHeight = mediaHeight || options.initialHeight;
preload = new Swiff(''+options.playerpath+'?file='+URL+'&backcolor='+options.backcolor+'&frontcolor='+options.frontcolor+'&lightcolor='+options.lightcolor+'&screencolor='+options.screencolor+'&autostart='+options.autoplay, {
id: 'MediaboxSWF',
width: mediaWidth,
height: mediaHeight,
params: {wmode: 'opaque', bgcolor: options.bgcolor, allowscriptaccess: options.scriptaccess, allowfullscreen: options.fullscreen}
});
nextEffect();
// SWF
} else if (URL.match(/\.swf/i)) {
mediaType = 'obj';
mediaWidth = mediaWidth || options.initialWidth;
mediaHeight = mediaHeight || options.initialHeight;
preload = new Swiff(URL, {
id: 'MediaboxSWF',
width: mediaWidth,
height: mediaHeight,
params: {wmode: 'opaque', bgcolor: options.bgcolor, allowscriptaccess: options.scriptaccess, allowfullscreen: options.fullscreen}
});
nextEffect();
// SOCIAL SITES
// Blip.tv
} else if (URL.match(/blip\.tv/i)) {
mediaType = 'obj';
mediaWidth = mediaWidth || "640px";
mediaHeight = mediaHeight || "390px";
preload = new Swiff(URL, {
src: URL,
width: mediaWidth,
height: mediaHeight,
params: {wmode: 'opaque', bgcolor: options.bgcolor, allowscriptaccess: options.scriptaccess, allowfullscreen: options.fullscreen}
});
nextEffect();
// DailyMotion
} else if (URL.match(/dailymotion\.com/i)) {
mediaType = 'obj';
mediaWidth = mediaWidth || "480px";
mediaHeight = mediaHeight || "381px";
preload = new Swiff(URL, {
id: mediaId,
width: mediaWidth,
height: mediaHeight,
params: {wmode: 'opaque', bgcolor: options.bgcolor, allowscriptaccess: options.scriptaccess, allowfullscreen: options.fullscreen}
});
nextEffect();
// Facebook
} else if (URL.match(/facebook\.com/i)) {
mediaType = 'obj';
mediaWidth = mediaWidth || "320px";
mediaHeight = mediaHeight || "240px";
mediaSplit = URL.split('v=');
mediaSplit = mediaSplit[1].split('&');
mediaId = mediaSplit[0];
preload = new Swiff('http://www.facebook.com/v/'+mediaId, {
movie: 'http://www.facebook.com/v/'+mediaId,
classid: 'clsid:D27CDB6E-AE6D-11cf-96B8-444553540000',
width: mediaWidth,
height: mediaHeight,
params: {wmode: 'opaque', bgcolor: options.bgcolor, allowscriptaccess: options.scriptaccess, allowfullscreen: options.fullscreen}
});
startEffect();
// Flickr
} else if (URL.match(/flickr\.com/i)) {
mediaType = 'obj';
mediaWidth = mediaWidth || "500px";
mediaHeight = mediaHeight || "375px";
mediaSplit = URL.split('/');
mediaId = mediaSplit[5];
preload = new Swiff('http://www.flickr.com/apps/video/stewart.swf', {
id: mediaId,
classid: 'clsid:D27CDB6E-AE6D-11cf-96B8-444553540000',
width: mediaWidth,
height: mediaHeight,
params: {flashvars: 'photo_id='+mediaId+'&show_info_box='+options.flInfo, wmode: 'opaque', bgcolor: options.bgcolor, allowscriptaccess: options.scriptaccess, allowfullscreen: options.fullscreen}
});
nextEffect();
// Google Video
} else if (URL.match(/google\.com\/videoplay/i)) {
mediaType = 'obj';
mediaWidth = mediaWidth || "400px";
mediaHeight = mediaHeight || "326px";
mediaSplit = URL.split('=');
mediaId = mediaSplit[1];
preload = new Swiff('http://video.google.com/googleplayer.swf?docId='+mediaId+'&autoplay='+options.autoplayNum, {
id: mediaId,
width: mediaWidth,
height: mediaHeight,
params: {wmode: 'opaque', bgcolor: options.bgcolor, allowscriptaccess: options.scriptaccess, allowfullscreen: options.fullscreen}
});
nextEffect();
// Megavideo - Thanks to Robert Jandreu for suggesting this code!
} else if (URL.match(/megavideo\.com/i)) {
mediaType = 'obj';
mediaWidth = mediaWidth || "640px";
mediaHeight = mediaHeight || "360px";
mediaSplit = URL.split('=');
mediaId = mediaSplit[1];
preload = new Swiff('http://wwwstatic.megavideo.com/mv_player.swf?v='+mediaId, {
id: mediaId,
width: mediaWidth,
height: mediaHeight,
params: {wmode: 'opaque', bgcolor: options.bgcolor, allowscriptaccess: options.scriptaccess, allowfullscreen: options.fullscreen}
});
nextEffect();
// Metacafe
} else if (URL.match(/metacafe\.com\/watch/i)) {
mediaType = 'obj';
mediaWidth = mediaWidth || "400px";
mediaHeight = mediaHeight || "345px";
mediaSplit = URL.split('/');
mediaId = mediaSplit[4];
preload = new Swiff('http://www.metacafe.com/fplayer/'+mediaId+'/.swf?playerVars=autoPlay='+options.autoplayYes, {
id: mediaId,
width: mediaWidth,
height: mediaHeight,
params: {wmode: 'opaque', bgcolor: options.bgcolor, allowscriptaccess: options.scriptaccess, allowfullscreen: options.fullscreen}
});
nextEffect();
// MyspaceTV
} else if (URL.match(/myspacetv\.com|vids\.myspace\.com/i)) {
mediaType = 'obj';
mediaWidth = mediaWidth || "425px";
mediaHeight = mediaHeight || "360px";
mediaSplit = URL.split('=');
mediaId = mediaSplit[2];
preload = new Swiff('http://lads.myspace.com/videos/vplayer.swf?m='+mediaId+'&v=2&a='+options.autoplayNum+'&type=video', {
id: mediaId,
width: mediaWidth,
height: mediaHeight,
params: {wmode: 'opaque', bgcolor: options.bgcolor, allowscriptaccess: options.scriptaccess, allowfullscreen: options.fullscreen}
});
nextEffect();
// Revver
} else if (URL.match(/revver\.com/i)) {
mediaType = 'obj';
mediaWidth = mediaWidth || "480px";
mediaHeight = mediaHeight || "392px";
mediaSplit = URL.split('/');
mediaId = mediaSplit[4];
preload = new Swiff('http://flash.revver.com/player/1.0/player.swf?mediaId='+mediaId+'&affiliateId='+options.revverID+'&allowFullScreen='+options.revverFullscreen+'&autoStart='+options.autoplay+'&backColor=#'+options.revverBack+'&frontColor=#'+options.revverFront+'&gradColor=#'+options.revverGrad+'&shareUrl=revver', {
id: mediaId,
width: mediaWidth,
height: mediaHeight,
params: {wmode: 'opaque', bgcolor: options.bgcolor, allowscriptaccess: options.scriptaccess, allowfullscreen: options.fullscreen}
});
nextEffect();
// Rutube
} else if (URL.match(/rutube\.ru/i)) {
mediaType = 'obj';
mediaWidth = mediaWidth || "470px";
mediaHeight = mediaHeight || "353px";
mediaSplit = URL.split('=');
mediaId = mediaSplit[1];
preload = new Swiff('http://video.rutube.ru/'+mediaId, {
movie: 'http://video.rutube.ru/'+mediaId,
width: mediaWidth,
height: mediaHeight,
params: {wmode: 'opaque', bgcolor: options.bgcolor, allowscriptaccess: options.scriptaccess, allowfullscreen: options.fullscreen}
});
nextEffect();
// Seesmic
} else if (URL.match(/seesmic\.com/i)) {
mediaType = 'obj';
mediaWidth = mediaWidth || "435px";
mediaHeight = mediaHeight || "355px";
mediaSplit = URL.split('/');
mediaId = mediaSplit[5];
preload = new Swiff('http://seesmic.com/Standalone.swf?video='+mediaId, {
id: mediaId,
width: mediaWidth,
height: mediaHeight,
params: {wmode: 'opaque', bgcolor: options.bgcolor, allowscriptaccess: options.scriptaccess, allowfullscreen: options.fullscreen}
});
nextEffect();
// Tudou
} else if (URL.match(/tudou\.com/i)) {
mediaType = 'obj';
mediaWidth = mediaWidth || "400px";
mediaHeight = mediaHeight || "340px";
mediaSplit = URL.split('/');
mediaId = mediaSplit[5];
preload = new Swiff('http://www.tudou.com/v/'+mediaId, {
width: mediaWidth,
height: mediaHeight,
params: {wmode: 'opaque', bgcolor: options.bgcolor, allowscriptaccess: options.scriptaccess, allowfullscreen: options.fullscreen}
});
nextEffect();
// YouKu
} else if (URL.match(/youku\.com/i)) {
mediaType = 'obj';
mediaWidth = mediaWidth || "480px";
mediaHeight = mediaHeight || "400px";
mediaSplit = URL.split('id_');
mediaId = mediaSplit[1];
preload = new Swiff('http://player.youku.com/player.php/sid/'+mediaId+'=/v.swf', {
width: mediaWidth,
height: mediaHeight,
params: {wmode: 'opaque', bgcolor: options.bgcolor, allowscriptaccess: options.scriptaccess, allowfullscreen: options.fullscreen}
});
nextEffect();
// YouTube
} else if (URL.match(/youtube\.com\/watch/i)) {
mediaType = 'obj';
mediaSplit = URL.split('v=');
mediaId = mediaSplit[1];
if (mediaId.match(/fmt=18/i)) {
mediaFmt = '&ap=%2526fmt%3D18';
mediaWidth = mediaWidth || "560px";
mediaHeight = mediaHeight || "345px";
} else if (mediaId.match(/fmt=22/i)) {
mediaFmt = '&ap=%2526fmt%3D22';
mediaWidth = mediaWidth || "640px";
mediaHeight = mediaHeight || "385px";
} else {
mediaFmt = options.ytQuality;
mediaWidth = mediaWidth || "480px";
mediaHeight = mediaHeight || "295px";
}
preload = new Swiff('http://www.youtube.com/v/'+mediaId+'&autoplay='+options.autoplayNum+'&fs='+options.fullscreenNum+mediaFmt+'&color1=0x'+options.ytColor1+'&color2=0x'+options.ytColor2, {
id: mediaId,
width: mediaWidth,
height: mediaHeight,
params: {wmode: 'opaque', bgcolor: options.bgcolor, allowscriptaccess: options.scriptaccess, allowfullscreen: options.fullscreen}
});
nextEffect();
// YouTube
} else if (URL.match(/youtube\.com\/view/i)) {
mediaType = 'obj';
mediaSplit = URL.split('p=');
mediaId = mediaSplit[1];
mediaWidth = mediaWidth || "480px";
mediaHeight = mediaHeight || "385px";
preload = new Swiff('http://www.youtube.com/p/'+mediaId+'&autoplay='+options.autoplayNum+'&fs='+options.fullscreenNum+mediaFmt+'&color1=0x'+options.ytColor1+'&color2=0x'+options.ytColor2, {
id: mediaId,
width: mediaWidth,
height: mediaHeight,
params: {wmode: 'opaque', bgcolor: options.bgcolor, allowscriptaccess: options.scriptaccess, allowfullscreen: options.fullscreen}
});
nextEffect();
// Veoh
} else if (URL.match(/veoh\.com/i)) {
mediaType = 'obj';
mediaWidth = mediaWidth || "410px";
mediaHeight = mediaHeight || "341px";
mediaSplit = URL.split('videos/');
mediaId = mediaSplit[1];
preload = new Swiff('http://www.veoh.com/videodetails2.swf?permalinkId='+mediaId+'&player=videodetailsembedded&videoAutoPlay='+options.AutoplayNum, {
id: mediaId,
width: mediaWidth,
height: mediaHeight,
params: {wmode: 'opaque', bgcolor: options.bgcolor, allowscriptaccess: options.scriptaccess, allowfullscreen: options.fullscreen}
});
nextEffect();
// Viddler
} else if (URL.match(/viddler\.com/i)) {
mediaType = 'obj';
mediaWidth = mediaWidth || "437px";
mediaHeight = mediaHeight || "370px";
mediaSplit = URL.split('/');
mediaId = mediaSplit[4];
preload = new Swiff(URL, {
id: 'viddler_'+mediaId,
movie: URL,
classid: 'clsid:D27CDB6E-AE6D-11cf-96B8-444553540000',
width: mediaWidth,
height: mediaHeight,
params: {wmode: 'opaque', bgcolor: options.bgcolor, allowscriptaccess: options.scriptaccess, allowfullscreen: options.fullscreen, id: 'viddler_'+mediaId, movie: URL}
});
nextEffect();
// Vimeo
} else if (URL.match(/vimeo\.com/i)) {
mediaType = 'obj';
mediaWidth = mediaWidth || "400px";
mediaHeight = mediaHeight || "225px";
mediaSplit = URL.split('/');
mediaId = mediaSplit[3];
preload = new Swiff('http://www.vimeo.com/moogaloop.swf?clip_id='+mediaId+'&server=www.vimeo.com&fullscreen='+options.fullscreenNum+'&autoplay='+options.autoplayNum+'&show_title='+options.vmTitle+'&show_byline='+options.vmByline+'&show_portrait='+options.vmPortrait+'&color='+options.vmColor, {
id: mediaId,
width: mediaWidth,
height: mediaHeight,
params: {wmode: 'opaque', bgcolor: options.bgcolor, allowscriptaccess: options.scriptaccess, allowfullscreen: options.fullscreen}
});
nextEffect();
// 12seconds
} else if (URL.match(/12seconds\.tv/i)) {
mediaType = 'obj';
mediaWidth = mediaWidth || "430px";
mediaHeight = mediaHeight || "360px";
mediaSplit = URL.split('/');
mediaId = mediaSplit[5];
preload = new Swiff('http://embed.12seconds.tv/players/remotePlayer.swf', {
|
bfritscher/www-itunesu
|
a8300bea6f09d7d666961a2c7adb06d4ca0ca00d
|
moved css changed download/itunes links
|
diff --git a/WebContent/WEB-INF/groovy/index.groovy b/WebContent/WEB-INF/groovy/index.groovy
index d05d00e..3e06db6 100644
--- a/WebContent/WEB-INF/groovy/index.groovy
+++ b/WebContent/WEB-INF/groovy/index.groovy
@@ -1,32 +1,32 @@
import xmlwise.*
import groovy.xml.StreamingMarkupBuilder
def handle = "http://deimos.apple.com/WebObjects/Core.woa/Browse/unil.ch"
if(request.getParameter("handle")){
handle = request.getParameter("handle")
}
def getXml(item){
def outputBuilder = new StreamingMarkupBuilder()
outputBuilder.encoding = "UTF-8"
String result = outputBuilder.bind{
mkp.declareNamespace("":"http://www.apple.com/itms/")
mkp.yield item }
}
def xml
def conn = new URL(handle).openConnection()
conn.setRequestProperty ( "User-Agent", "iTunes/8.1" )
def putBackTogether = new StringBuffer()
def r = new InputStreamReader ( conn.getInputStream(), "UTF-8" )
char [ ] cb = new char [ 2048 ]
int amtRead = r.read ( cb )
while ( amtRead > 0 ) {
putBackTogether.append ( cb, 0, amtRead )
amtRead = r.read ( cb )
}
-xml = putBackTogether.toString ( )
+xml = putBackTogether.toString()
xml = new XmlSlurper().parseText(xml)
def topimg = xml.'**'.find{ it.name() == "PictureView"}
def reflect = topimg?.'@reflection'==1 //true = course page
def titleFontStyle = xml.'**'.find{it.name() == "FontStyle" && it.'@name' == "normalTitleFontStyle"}?.'@color'
if(titleFontStyle == null){
titleFontStyle = xml.'**'.find{it.name() == "FontStyle" && it.'@name' == "outlineTitleFontStyle"}?.'@color'
}
def textFontStyle = xml.'**'.find{it.name() == "FontStyle" && it.'@name' == "normalTextFontStyle"}?.'@color'
if(textFontStyle == null){
textFontStyle = xml.'**'.find{it.name() == "FontStyle" && it.'@name' == "outlineTextFontStyle"}?.'@color'
}
println """<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">"""
html.html(xmlns:"http://www.w3.org/1999/xhtml",lang:"en",'xml:lang':"en") {
head {
title xml.Path.PathElement.collect{it.'@displayName'}.join(" > ")
meta('http-equiv':"X-UA-Compatible", content:"IE=8")
- meta('http-equiv':"content-type",content:"application/xhtml+xml; charset=UTF-8")
link(rel:"stylesheet", href:"css/blueprint/screen.css", type:"text/css", media:"screen, projection")
link(rel:"stylesheet", href:"css/blueprint/print.css", type:"text/css", media:"print")
println "<!--[if IE]>"
link(rel:"stylesheet", href:"css/blueprint/ie.css", type:"text/css", media:"screen, projection")
println "<![endif]-->"
link(rel:"stylesheet", href:"css/smoothness/jquery-ui-1.7.1.custom.css", type:"text/css")
link(rel:"stylesheet", href:"css/tablesorter/style.css", type:"text/css")
link(rel:"shortcut icon", href:"favicon.ico", type:"image/x-icon")
script(type:"text/javascript", src:"js/jquery-1.3.2.min.js","")
script(type:"text/javascript", src:"js/jquery-ui-1.7.1.custom.min.js","")
script(type:"text/javascript", src:"js/reflection.js","")
script(type:"text/javascript", src:"js/jquery.tablesorter.min.js","")
script(type:"text/javascript", src:"js/main.js","")
if(reflect){
script(type:"text/javascript", src:"js/mootools-1.2.1-core-jm.js","")
script(type:"text/javascript", src:"js/mediaboxAdv99f.js","")
link(rel:"stylesheet", href:"css/mediaboxAdvBlack.css", type:"text/css")
}
style(type:"text/css","""
ul{
list-style-type: none;
}
.nav{
border:solid 1px #dedede;
background:#fff;
height: 20px;
}
.nav a.first span
{
display:block;
height: 16px;
width: 16px;
margin: 2px;
background:url(img/IconHome.gif) no-repeat 0 0;
}
.nav a.first:hover span
{
background-position: 0 -16px;
}
.nav a:hover{
text-decoration: underline;
}
.nav a, .nav a.first:hover{
text-decoration:none;
}
.nav a.last
{
background: none;
}
.nav a{
display: block;
float: left;
background: url(img/Chevron.gif) no-repeat 100% 0;
padding-right: 20px;
margin-left: 10px;
line-height: 20px;
height: 20px
}
h1, h2, h3{
color: #${titleFontStyle}
}
h1{
font-size:2.5em;
}
h2{
font-size:1.5em;
}
h3{
font-size:1em;
}
p{
margin-bottom: 0.5em;
font-size:0.9em;
}
.sectionhead h2{
margin: 0 9px 0 9px;
height: 20px;
font-size: 15px;
font-weight:bold;
}
.sectionbody{
padding-bottom: 5px;
-moz-border-radius-bottomleft: 5px;
-moz-border-radius-bottomright: 5px;
-webkit-border-radius-bottomleft: 5px;
-webkit-border-radius-bottomright: 5px;
}
.sectionbody img{
width: 60px;
height: 60px;
margin: 5px;
float: left;
border: 0;
}
.body, p, li, .section a, .linkbox a{
color: #${textFontStyle}
}
.sectionbody a, .linkbox a{
font-weight: bold;
text-decoration: none;
}
.sectionbody a:hover, .linkbox a:hover{
text-decoration: underline;
}
div.section {
margin-bottom: 20px;
}
.course div{
padding-top: 5px;
}
.rightbox{
float:right;
}
.linkbox {
padding-top: 2px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
}
.linkbox h3{
margin: 5px;
padding: 5px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
}
.linkbox ul{
padding: 0 5px 5px 5px;
}
""")
+ meta('http-equiv':"content-type",content:"application/xhtml+xml; charset=UTF-8")
link(rel:"stylesheet", href:"css/blueprint/screen.css", type:"text/css", media:"screen, projection")
link(rel:"stylesheet", href:"css/blueprint/print.css", type:"text/css", media:"print")
println "<!--[if IE]>"
link(rel:"stylesheet", href:"css/blueprint/ie.css", type:"text/css", media:"screen, projection")
println "<![endif]-->"
link(rel:"stylesheet", href:"css/smoothness/jquery-ui-1.7.1.custom.css", type:"text/css")
link(rel:"stylesheet", href:"css/tablesorter/style.css", type:"text/css")
link(rel:"stylesheet", href:"css/main.css", type:"text/css")
link(rel:"shortcut icon", href:"favicon.ico", type:"image/x-icon")
script(type:"text/javascript", src:"js/jquery-1.3.2.min.js","")
script(type:"text/javascript", src:"js/jquery-ui-1.7.1.custom.min.js","")
script(type:"text/javascript", src:"js/reflection.js","")
script(type:"text/javascript", src:"js/jquery.tablesorter.min.js","")
script(type:"text/javascript", src:"js/main.js","")
if(reflect){
script(type:"text/javascript", src:"js/mootools-1.2.1-core-jm.js","")
script(type:"text/javascript", src:"js/mediaboxAdv99f.js","")
link(rel:"stylesheet", href:"css/mediaboxAdvBlack.css", type:"text/css")
}
style(type:"text/css","""
.body, p, li, .section a, .linkbox a{
color: #${textFontStyle}
}
h1, h2, h3{
color: #${titleFontStyle}
}
""")
}
- body(style:"background: #${xml.'*'.find{ it.'@backColor' != ''}.'@backColor'}"){
div(class:"container"){
div(class:"span-24 last nav"){
def list = xml.Path.PathElement
def last = list.size()-1
list.eachWithIndex{ pe,i ->
if(i == 0){
a(class:"first",href:"index.groovy?handle=${pe.text().trim()}"){
span(){
mkp.yieldUnescaped " "
}
}
}else{
a(class:"${i == last ? 'last' : ''}",href:"index.groovy?handle=${pe.text().trim()}", pe.'@displayName')
}
}
}
div(class:"span-24 last header", style:"${reflect ? '' : 'background: url('+topimg?.'@url'+') no-repeat top left'};min-height:${topimg.'@height'}px;"){
div(class:"span-16"){
//COURSE PAGE
if(reflect){ //only if displaying a course page
def topurl = xml.'**'.find{it.name() == "GotoURL"}
def content = topurl?.parent()?.'**'.findAll{it.name() == "TextView"}.collect{it.toString().trim()}
h1 content[0]
div(class:"span-5", style:"height:${Math.round(1.25 * Integer.parseInt(topimg.'@height'.toString()))}px;"){
img(src:topimg.'@url',width:topimg.'@width', height:topimg.'@height', class:"reflect")
}
def descriptionIndex = content.indexOf("DESCRIPTION")
descriptionIndex = descriptionIndex == null ? 3 : descriptionIndex
content[1..descriptionIndex-1].each{ text ->
p text
}
//a(href:"${topurl.'@url'}","Open in iTunes")
xml.'**'.find{it.name() == "GotoURL" && it.PictureButtonView?.'@alt'=="Subscribe"}.each{ subscribe ->
p subscribe
//xml
p{
a(href:"${subscribe.'@draggingURL'}"){
img(src:"img/rss-podcast.png")
}
br()
a(href:"http://subscribe.getmiro.com/?url1=${subscribe.'@draggingURL'}",
title:"Miro: Internet TV"){
img(src:"http://subscribe.getmiro.com/img/buttons/patrace1.png",alt:"Miro Video Player")
}
br()
a(href:"${subscribe.'@url'}",class:"subscribe"){
img(src:"img/logo_itunes_badge.gif")
}
}
}
if(content.size()>descriptionIndex){
h2(style:"clear:both;",content[descriptionIndex].toString().trim())
content[descriptionIndex+1..content.size()-1].each{ text ->
p text.toString().trim()
}
}
}else{
mkp.yieldUnescaped " "
}
}
//RIGHTBOX
div(class:"span-8 last rightbox"){
div(class:"description"){
xml.ScrollView.View.MatrixView.View?.'**'.find{
it?.name()== "VBoxView" && it?.parent()?.name()== "VBoxView" && it?.parent()?.parent()?.name()== "VBoxView" && it?.parent()?.parent()?.parent()?.name()== "VBoxView"
}?.'*'.findAll{ it?.name() == "TextView"}.each{ text ->
p text
}
mkp.yieldUnescaped " "
}
def linkbox = xml.'**'.findAll{it.name() == "VBoxView" && it?.FontStyle.size() == 2 }[reflect? 1 : 0]?.parent()?.parent() //move over recommand if on course page
if(linkbox != null){
div(class:"linkbox",style:"background: url(${linkbox.parent()?.'**'.find{it.name() == 'PictureView'}.'@url'}) top left"){
linkbox?.'**'.findAll{it.name() == "VBoxView" && it?.FontStyle.size() == 2 }.each{ cat ->
h3(style:"color: #${cat.FontStyle[0].'@color'};border: 1px solid #${cat.View[0].Test[0].View.'@borderColor'}", cat?.'**'.find{it.name() == "TextView"}.toString().trim())
ul{
def els = cat?.'**'.findAll{it.name() == "OpenURL"}
if (els.size()==0){
els = cat.parent()?.'**'.findAll{it.name() == "OpenURL"}
}
els.each{ url ->
li{
def urlstring = url.'@url'
def matcher = ( urlstring =~ /^itms(.+)/ )
if(matcher.count > 0){
urlstring = "index.groovy?handle=http${matcher[0][1]}"
}
a(href:urlstring,url.'@draggingName')
}
}
}
}
}
}
}
}//header
//sections
xml.'**'.findAll{it.name() == "View" && !it.HBoxView.isEmpty() && !it.HBoxView.PictureView.isEmpty() }.each{ view ->
div(class:"span-24 last section"){
div(class:"sectionhead",style:"background: url(${view.HBoxView[0].PictureView[2].'@url'}) no-repeat top right;"){
div(style:"background: url(${view.HBoxView[0].PictureView[0].'@url'}) no-repeat top left;"){
h2(style:"background: url(${view.HBoxView[0].PictureView[1].'@url'}) repeat-x top left;" , view.VBoxView?.'**'.find{it.name() == "TextView" }.text().trim())
}
}
def border = view.parent().parent().View.VBoxView[0]?.'**'.findAll{ it.name() == "PictureView"}
div(class:"span-24 last sectionbody", style:"background: url(${border[0].'@url'}) top left;"){
//items
view.parent().parent()?.'**'.findAll{ it.name() == "HBoxView" && !it.GotoURL.isEmpty() && !it.GotoURL.PictureView.isEmpty()}.eachWithIndex{ item, i-> //HBoxView
div(class:"span-8 ${(i+1) % 3 == 0 ? 'last' : ''} course"){
a(href:"index.groovy?handle=${item.GotoURL.'@url'}"){ //GotoURL
img(src:item.GotoURL.PictureView.'@url',alt:item.GotoURL.'@draggingName') //PictureView
}
div{ //VBoxView
a(href:"index.groovy?handle=${item.VBoxView.GotoURL.'@url'}",item.VBoxView.GotoURL.'@draggingName') //GotoURL
p{
item.VBoxView.TextView.each{ tv ->
mkp.yield tv.text().trim()
br()
}
}
}
}
}
}
}
}
if(reflect){
div(class:"span-24"){
def groups = xml.'**'.findAll{ it.name() == "GotoURL" && !it.PictureView.isEmpty()}.each{ group ->
def imgs = group.children()?.'**'.grep{it.'@url' !=""}.'@url'*.text()
def color = group?.'**'.find{it.'@color' !=""}?.'@color'.text();
div(style:"background: url(${imgs[2]}) no-repeat top right;min-width:50px;float:left;"){
div(style:"background: url(${imgs[1]}) no-repeat top left;"){
a(style:"background: url(${imgs[0]}) repeat-x top left;height:10px;margin: 0 5px 0 6px;height:18px;padding: 0 10px 0 10px;display:block;color:#${color};text-decoration:none;font-weight:bold",
href:"?handle=${group.'@url'}",group.toString().trim())
}
}
}
}
if(xml.'*'.find{it.name() == "TrackList"}.size()>0){
div(class:"span-24 last tracklist"){
table(cellspacing:"1", class:"tablesorter"){
thead{
tr{
th ""
th "Name"
th "Time"
th "Artist"
th "Release Date"
th "Download"
}
}
tbody{
}
def plist = Plist.fromXml(getXml(xml.TrackList.plist))
plist.items.eachWithIndex{ track, i ->
/* debug list all keys
ul{
track.each{ key,value->
li("${key}: ${value}")
}
}*/
int seconds = (track["duration"] /1000)
int minutes = seconds % 3600
int hours = (seconds - minutes) / 3600
seconds = minutes % 60
minutes = (minutes - seconds) / 60
tr(class:i % 2 == 0 ? "even" : "odd"){
td track["rank"]
td track["songName"]
td ((hours > 0 ? String.format("%02d",hours) + ":" : "")+ String.format("%02d",minutes) + ":" + String.format("%02d",seconds))
td track["artistName"]
td track["releaseDate"][0..9]
td{
a(href:track["previewURL"],rel:"lightbox[set 480 380]",title:track["songName"], "view")
a(href:track["buyParams"],"add to iTunes")
}
}
}
}
}
}
}
/*
div(class:"span-24 last debug"){
xml.'**'.findAll{ it.name() == "TextView"}.each{ item ->
p(item.text().trim())
}
xml.'**'.findAll{ it.name() == "PictureView"}.each{ item ->
a(href:""){
img(src:item.'@url')
}
}
xml.'**'.findAll{ it.name() == "GotoURL"}.each{ item ->
a(href:"index.groovy?handle=${item.'@url'}",item.'@draggingName')
}
} //debug
*/
} //container
+ body(style:"background: #${xml.'*'.find{ it.'@backColor' != ''}.'@backColor'}"){
div(class:"container"){
div(class:"span-24 last nav"){
def list = xml.Path.PathElement
def last = list.size()-1
list.eachWithIndex{ pe,i ->
if(i == 0){
a(class:"first",href:"index.groovy?handle=${pe.text().trim()}"){
span(){
mkp.yieldUnescaped " "
}
}
}else{
a(class:"${i == last ? 'last' : ''}",href:"index.groovy?handle=${pe.text().trim()}", pe.'@displayName')
}
}
}
div(class:"span-24 last header", style:"${reflect ? '' : 'background: url('+topimg?.'@url'+') no-repeat top left'};min-height:${topimg.'@height'}px;"){
div(class:"span-16 course-detail"){
//COURSE PAGE
if(reflect){ //only if displaying a course page
def topurl = xml.'**'.find{it.name() == "GotoURL"}
def content = topurl?.parent()?.'**'.findAll{it.name() == "TextView"}.collect{it.toString().trim()}
h1 content[0]
div(class:"span-5", style:"height:${Math.round(1.25 * Integer.parseInt(topimg.'@height'.toString()))}px;"){
img(src:topimg.'@url',width:topimg.'@width', height:topimg.'@height', class:"reflect")
}
def descriptionIndex = content.indexOf("DESCRIPTION")
descriptionIndex = descriptionIndex == null ? 3 : descriptionIndex
content[1..descriptionIndex-1].each{ text ->
p text
}
//a(href:"${topurl.'@url'}","Open in iTunes")
xml.'**'.find{it.name() == "GotoURL" && it.PictureButtonView?.'@alt'=="Subscribe"}.each{ subscribe ->
//xml
p{
a(href:"${subscribe.'@draggingURL'}"){
img(src:"img/rss-podcast.png")
}
br()
a(href:"http://subscribe.getmiro.com/?url1=${subscribe.'@draggingURL'}",
title:"Miro: Internet TV"){
img(src:"http://subscribe.getmiro.com/img/buttons/patrace1.png",alt:"Miro Video Player")
}
br()
a(href:"${topurl.'@url'}",class:"subscribe"){
img(src:"img/logo_itunes_badge.gif")
}
}
}
if(content.size()>descriptionIndex){
h2(content[descriptionIndex].toString().trim())
content[descriptionIndex+1..content.size()-1].each{ text ->
p text.toString().trim()
}
}
}else{
mkp.yieldUnescaped " "
}
}
//RIGHTBOX
div(class:"span-8 last rightbox"){
div(class:"description"){
xml.ScrollView.View.MatrixView.View?.'**'.find{
it?.name()== "VBoxView" && it?.parent()?.name()== "VBoxView" && it?.parent()?.parent()?.name()== "VBoxView" && it?.parent()?.parent()?.parent()?.name()== "VBoxView"
}?.'*'.findAll{ it?.name() == "TextView"}.each{ text ->
p text
}
mkp.yieldUnescaped " "
}
def linkbox = xml.'**'.findAll{it.name() == "VBoxView" && it?.FontStyle.size() == 2 }[reflect? 1 : 0]?.parent()?.parent() //move over recommand if on course page
if(linkbox != null){
div(class:"linkbox",style:"background: url(${linkbox.parent()?.'**'.find{it.name() == 'PictureView'}.'@url'}) top left"){
linkbox?.'**'.findAll{it.name() == "VBoxView" && it?.FontStyle.size() == 2 }.each{ cat ->
h3(style:"color: #${cat.FontStyle[0].'@color'};border: 1px solid #${cat.View[0].Test[0].View.'@borderColor'}", cat?.'**'.find{it.name() == "TextView"}.toString().trim())
ul{
def els = cat?.'**'.findAll{it.name() == "OpenURL"}
if (els.size()==0){
els = cat.parent()?.'**'.findAll{it.name() == "OpenURL"}
}
els.each{ url ->
li{
def urlstring = url.'@url'
def matcher = ( urlstring =~ /^itms(.+)/ )
if(matcher.count > 0){
urlstring = "index.groovy?handle=http${matcher[0][1]}"
}
a(href:urlstring,url.'@draggingName')
}
}
}
}
}
}
}
}//header
//sections
xml.'**'.findAll{it.name() == "View" && !it.HBoxView.isEmpty() && !it.HBoxView.PictureView.isEmpty() }.each{ view ->
div(class:"span-24 last section"){
div(class:"sectionhead",style:"background: url(${view.HBoxView[0].PictureView[2].'@url'}) no-repeat top right;"){
div(style:"background: url(${view.HBoxView[0].PictureView[0].'@url'}) no-repeat top left;"){
h2(style:"background: url(${view.HBoxView[0].PictureView[1].'@url'}) repeat-x top left;" , view.VBoxView?.'**'.find{it.name() == "TextView" }.text().trim())
}
}
def border = view.parent().parent().View.VBoxView[0]?.'**'.findAll{ it.name() == "PictureView"}
div(class:"span-24 last sectionbody", style:"background: url(${border[0].'@url'}) top left;"){
//items
view.parent().parent()?.'**'.findAll{ it.name() == "HBoxView" && !it.GotoURL.isEmpty() && !it.GotoURL.PictureView.isEmpty()}.eachWithIndex{ item, i-> //HBoxView
div(class:"span-8 ${(i+1) % 3 == 0 ? 'last' : ''} course"){
a(href:"index.groovy?handle=${item.GotoURL.'@url'}"){ //GotoURL
img(src:item.GotoURL.PictureView.'@url',alt:item.GotoURL.'@draggingName') //PictureView
}
div{ //VBoxView
a(href:"index.groovy?handle=${item.VBoxView.GotoURL.'@url'}",item.VBoxView.GotoURL.'@draggingName') //GotoURL
p{
item.VBoxView.TextView.each{ tv ->
mkp.yield tv.text().trim()
br()
}
}
}
}
}
}
}
}
if(reflect){
div(class:"span-24 groups"){
def groups = xml.'**'.findAll{ it.name() == "GotoURL" && !it.PictureView.isEmpty()}.each{ group ->
def imgs = group.children()?.'**'.grep{it.'@url' !=""}.'@url'*.text()
def color = group?.'**'.find{it.'@color' !=""}?.'@color'.text();
div(style:"background: url(${imgs[2]}) no-repeat top right;"){
div(style:"background: url(${imgs[1]}) no-repeat top left;"){
a(style:"background: url(${imgs[0]}) repeat-x top left;color:#${color};",
href:"?handle=${group.'@url'}",group.toString().trim())
}
}
}
}
if(xml.'*'.find{it.name() == "TrackList"}.size()>0){
div(class:"span-24 last tracklist"){
table(cellspacing:"1", class:"tablesorter"){
thead{
tr{
th ""
th "Name"
th "Time"
th "Artist"
th "Release Date"
th ""
}
}
tbody{
def plist = Plist.fromXml(getXml(xml.TrackList.plist))
plist.items.eachWithIndex{ track, i ->
/* debug list all keys
ul{
track.each{ key,value->
li("${key}: ${value}")
}
}*/
int seconds = (track["duration"] /1000)
int minutes = seconds % 3600
int hours = (seconds - minutes) / 3600
seconds = minutes % 60
minutes = (minutes - seconds) / 60
tr(class:i % 2 == 0 ? "even" : "odd"){
td track["rank"]
td track["songName"]
td ((hours > 0 ? String.format("%02d",hours) + ":" : "")+ String.format("%02d",minutes) + ":" + String.format("%02d",seconds))
td track["artistName"]
td track["releaseDate"][0..9]
td{
a(href:track["previewURL"],rel:"lightbox[set 480 380]",title:track["songName"], "view")
mkp.yieldUnescaped(" ")
a(href:track["previewURL"],title:track["songName"], "download")
}
}
}
}
}
}
}
}
/*
div(class:"span-24 last debug"){
xml.'**'.findAll{ it.name() == "TextView"}.each{ item ->
p(item.text().trim())
}
xml.'**'.findAll{ it.name() == "PictureView"}.each{ item ->
a(href:""){
img(src:item.'@url')
}
}
xml.'**'.findAll{ it.name() == "GotoURL"}.each{ item ->
a(href:"index.groovy?handle=${item.'@url'}",item.'@draggingName')
}
} //debug
*/
} //container
} //body
}
\ No newline at end of file
diff --git a/WebContent/css/main.css b/WebContent/css/main.css
index c3d0d0a..402bd37 100644
--- a/WebContent/css/main.css
+++ b/WebContent/css/main.css
@@ -1,81 +1,118 @@
-body{
-
-}
-
-.header{
-
+ul{
+ list-style-type: none;
+}
+.nav{
+ border:solid 1px #dedede;
+ background:#fff;
+ height: 20px;
+}
+.nav a.first span{
+ display:block;
+ height: 16px;
+ width: 16px;
+ margin: 2px;
+ background:url(img/IconHome.gif) no-repeat 0 0;
+}
+.nav a.first:hover span{
+ background-position: 0 -16px;
+}
+
+.nav a:hover{
+ text-decoration: underline;
+}
+
+.nav a, .nav a.first:hover{
+ text-decoration:none;
+}
+.nav a.last{
+ background: none;
+}
+
+.nav a{
+ display: block;
+ float: left;
+ background: url(img/Chevron.gif) no-repeat 100% 0;
+ padding-right: 20px;
+ margin-left: 10px;
+ line-height: 20px;
+ height: 20px
}
-
-.menu{
-
+h1{
+ font-size:2.5em;
}
-
-.menu a{
-
+h2{
+ font-size:1.5em;
}
-a{
- text-decoration: none;
+h3{
+ font-size:1em;
}
-
-a:hover{
- text-decoration: underline;
+p{
+ margin-bottom: 0.5em;
+ font-size:0.9em;
}
-
-.header h1{
- color:#FFFFFF;
+.sectionhead h2{
+ margin: 0 9px 0 9px;
+ height: 20px;
+ font-size: 15px;
font-weight:bold;
}
-
-.linkbox div{
- padding: 5px;
+.sectionbody{
+ padding-bottom: 5px;
+ -moz-border-radius-bottomleft: 5px;
+ -moz-border-radius-bottomright: 5px;
+ -webkit-border-radius-bottomleft: 5px;
+ -webkit-border-radius-bottomright: 5px;
}
-
-.linkbox ul{
- list-style-type: none;
+.sectionbody img{
+ width: 60px;
+ height: 60px;
+ margin: 5px;
+ float: left;
+ border: 0;
+}
+.sectionbody a, .linkbox a{
+ font-weight: bold;
+ text-decoration: none;
}
-
-.linkbox p{
- padding: 2px;
+.sectionbody a:hover, .linkbox a:hover{
+ text-decoration: underline;
}
-
-div.section{
+div.section {
margin-bottom: 20px;
}
-
-.section h2{
- padding-left:5px;
+.course div{
+ padding-top: 5px;
}
-
-.course {
-
+.rightbox{
+ float:right;
}
-
-.course h3 {
-
+.linkbox {
+ padding-top: 2px;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
}
-
-img.course{
- width: 60px;
- height: 60px;
- float: left;
- margin:0 10px 10px;
-}
-
-.item-detail{
- padding: 0 10px 10px 10px;
+.linkbox h3{
+ margin: 5px;
+ padding: 5px;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
}
-.item-detail p span{
- font-weight: bold;
+.linkbox ul{
+ padding: 0 5px 5px 5px;
}
-.reflect{
- float:left;
- margin: 5px;
+.course-detail h2{
+ clear:both;
}
-.reflect, .reflected{
- width: 100px;
- height: 100px;
+.groups div{
+ min-width:50px;
+ float:left;
}
-.course p{
-
+.groups a{
+ display:block;
+ height:18px;
+ margin: 0 5px 0 6px;
+ padding: 0 10px 0 10px;
+ text-decoration:none;
+ font-weight:bold
}
\ No newline at end of file
|
stuartloxton/php-sprockets
|
320f708d19ec7fbcc9d3dfbd843fd2a0960a6fd5
|
Supports constants.yml with both erb <%= and php <?= syntax! Thats now full cross compatibility
|
diff --git a/js/constants.yml b/js/constants.yml
new file mode 100644
index 0000000..13ec8d6
--- /dev/null
+++ b/js/constants.yml
@@ -0,0 +1 @@
+AUTHOR: Stuart Loxton
\ No newline at end of file
diff --git a/js/sprocket.js b/js/sprocket.js
index 3590676..5b575f8 100644
--- a/js/sprocket.js
+++ b/js/sprocket.js
@@ -1,7 +1,10 @@
+/* Author: <%= AUTHOR %> */
+/* Author: <?=AUTHOR?> */
+
$(function() {
console.log('Test');
// Single line comments will be stripped out by Sprocket
/* However multiline ones will stay */
//= require "ajax/ajax"
//= require <formCancel>
});
\ No newline at end of file
diff --git a/lib/phpsprocket.php b/lib/phpsprocket.php
index d10a30b..86f23f5 100644
--- a/lib/phpsprocket.php
+++ b/lib/phpsprocket.php
@@ -1,64 +1,85 @@
<?php
header('Content-type: application/x-javascript');
/**
* PHPSprocket - A PHP implementation of Sprocket
*/
class PHPSprocket
{
var $baseUri = '/phpsprocket';
var $baseJs = '../js';
var $js = '';
var $filePath = '';
var $assetFolder = '..';
+ var $constantsScanned = array();
+ var $constants = array();
+
function __construct($file) {
$this->filePath = str_replace($this->baseUri, '..', $file);
if(!isset($_GET['debug'])) $this->checkCached();
$this->js = $this->parseJS(basename($this->filePath), dirname($this->filePath));
+ if(count($this->constants) > 0) $this->swapConstants();
$this->stripComments();
echo $this->js;
if(!isset($_GET['debug'])) file_put_contents($this->filePath.'.cache', $this->js);
}
function checkCached() {
if(is_file($this->filePath.'.cache')) {
echo file_get_contents($this->filePath.'.cache');
exit;
} else return false;
}
function parseJS($file, $context) {
$js = file_get_contents($context.'/'.$file);
-
+ $link = $context.'/'.str_replace(basename($file), '', $file).'constants.yml';
+ if(!isset($this->constantsScanned[$link]) && is_file($link)) $this->parseConstants($link);
preg_match_all('/\/\/= ([a-z]+) ([^\n]+)/', $js, $matches);
foreach($matches[0] as $key => $match) {
$method = $matches[1][$key].'_command';
$js = str_replace($matches[0][$key], $this->$method(trim($matches[2][$key]), $context), $js);
}
return $js;
}
function stripComments() {
$this->js = preg_replace('/\/\/([^\n]+)/', '', $this->js);
}
function require_command($param, $context) {
if(preg_match('/\"([^\"]+)\"/', $param, $match)) {
return $this->parseJS(basename($context.'/'.$match[1].'.js'), dirname($context.'/'.$match[1].'.js'));
} else if(preg_match('/\<([^\>]+)\>/', $param, $match)) {
return $this->parseJS(basename($context.'/'.$match[1].'.js'), $this->baseJs);
} else return '';
}
function provide_command($param, $context) {
preg_match('/\"([^\"]+)\"/', $param, $match);
foreach(glob($context.'/'.$match[1].'/*') as $asset) {
shell_exec('cp -r '.realpath($asset).' '.realpath($this->assetFolder));
}
}
+ function parseConstants($file) {
+ $contents = file_get_contents($file);
+ preg_match_all('/^([A-Za-z][^\:]+)\:([^\n]+)/', $contents, $matches);
+ foreach($matches[0] as $key => $val) {
+ $this->constants[$matches[1][$key]] = $matches[2][$key];
+ }
+ $this->constantsScanned[$file] = true;
+ }
+
+ function swapConstants() {
+ preg_match_all('/\<(\%|\?)\=\s*([^\s|\%|\?]+)\s*(\?|\%)\>/', $this->js, $matches);
+ foreach($matches[0] as $key => $replace) {
+ $this->js = str_replace($replace, $this->constants[$matches[2][$key]], $this->js);
+ }
+ }
+
}
$sprocket = new PHPSprocket(preg_replace('/\?.*/', '', $_SERVER['REQUEST_URI']));
\ No newline at end of file
|
stuartloxton/php-sprockets
|
8a489e6f94f56cb208d7c9c7a1a29c122ecf0906
|
Now has full support for the provide directive, only constants.yml support missing.
|
diff --git a/README.textile b/README.textile
new file mode 100644
index 0000000..a3a9428
--- /dev/null
+++ b/README.textile
@@ -0,0 +1,3 @@
+h1. PHP Sprocket
+
+PHP Sprocket is a port of Sprockets - the ruby library for Javascript dependency management and concatenation.
\ No newline at end of file
diff --git a/js/ajax/ajax.js b/js/ajax/ajax.js
new file mode 100644
index 0000000..6e90b2b
--- /dev/null
+++ b/js/ajax/ajax.js
@@ -0,0 +1,2 @@
+//= provide "assets"
+$('.ajax').click(function() { return false; });
\ No newline at end of file
diff --git a/js/ajax/assets/stylesheets/example.css b/js/ajax/assets/stylesheets/example.css
new file mode 100644
index 0000000..e69de29
diff --git a/js/sprocket.js b/js/sprocket.js
index b3cc39c..3590676 100644
--- a/js/sprocket.js
+++ b/js/sprocket.js
@@ -1,7 +1,7 @@
$(function() {
console.log('Test');
// Single line comments will be stripped out by Sprocket
/* However multiline ones will stay */
- //= require "formCancel"
- //= require <formCancel2>
+ //= require "ajax/ajax"
+ //= require <formCancel>
});
\ No newline at end of file
diff --git a/js/sprocket.js.cache b/js/sprocket.js.cache
new file mode 100644
index 0000000..272e899
--- /dev/null
+++ b/js/sprocket.js.cache
@@ -0,0 +1,7 @@
+$(function() {
+ console.log('Test');
+
+ /* However multiline ones will stay */
+ $('form').submit(function() { return false; });
+ $('.form').submit(function() { return false; });
+});
\ No newline at end of file
diff --git a/lib/phpsprocket.php b/lib/phpsprocket.php
index 33315b6..d10a30b 100644
--- a/lib/phpsprocket.php
+++ b/lib/phpsprocket.php
@@ -1,56 +1,64 @@
<?php
header('Content-type: application/x-javascript');
/**
* PHPSprocket - A PHP implementation of Sprocket
*/
class PHPSprocket
{
var $baseUri = '/phpsprocket';
var $baseJs = '../js';
var $js = '';
var $filePath = '';
+ var $assetFolder = '..';
function __construct($file) {
$this->filePath = str_replace($this->baseUri, '..', $file);
if(!isset($_GET['debug'])) $this->checkCached();
$this->js = $this->parseJS(basename($this->filePath), dirname($this->filePath));
$this->stripComments();
echo $this->js;
if(!isset($_GET['debug'])) file_put_contents($this->filePath.'.cache', $this->js);
}
function checkCached() {
if(is_file($this->filePath.'.cache')) {
echo file_get_contents($this->filePath.'.cache');
exit;
} else return false;
}
function parseJS($file, $context) {
$js = file_get_contents($context.'/'.$file);
preg_match_all('/\/\/= ([a-z]+) ([^\n]+)/', $js, $matches);
foreach($matches[0] as $key => $match) {
$method = $matches[1][$key].'_command';
$js = str_replace($matches[0][$key], $this->$method(trim($matches[2][$key]), $context), $js);
}
return $js;
}
function stripComments() {
$this->js = preg_replace('/\/\/([^\n]+)/', '', $this->js);
}
function require_command($param, $context) {
if(preg_match('/\"([^\"]+)\"/', $param, $match)) {
return $this->parseJS(basename($context.'/'.$match[1].'.js'), dirname($context.'/'.$match[1].'.js'));
} else if(preg_match('/\<([^\>]+)\>/', $param, $match)) {
return $this->parseJS(basename($context.'/'.$match[1].'.js'), $this->baseJs);
} else return '';
}
+ function provide_command($param, $context) {
+ preg_match('/\"([^\"]+)\"/', $param, $match);
+ foreach(glob($context.'/'.$match[1].'/*') as $asset) {
+ shell_exec('cp -r '.realpath($asset).' '.realpath($this->assetFolder));
+ }
+ }
+
}
$sprocket = new PHPSprocket(preg_replace('/\?.*/', '', $_SERVER['REQUEST_URI']));
\ No newline at end of file
diff --git a/stylesheets/example.css b/stylesheets/example.css
new file mode 100644
index 0000000..e69de29
|
stuartloxton/php-sprockets
|
b00ea925e78ee99e1501e2d5adb14941a0b30222
|
Now has full support for the provide directive, full support accomplished
|
diff --git a/README.textile b/README.textile
new file mode 100644
index 0000000..a3a9428
--- /dev/null
+++ b/README.textile
@@ -0,0 +1,3 @@
+h1. PHP Sprocket
+
+PHP Sprocket is a port of Sprockets - the ruby library for Javascript dependency management and concatenation.
\ No newline at end of file
diff --git a/js/ajax/ajax.js b/js/ajax/ajax.js
new file mode 100644
index 0000000..6e90b2b
--- /dev/null
+++ b/js/ajax/ajax.js
@@ -0,0 +1,2 @@
+//= provide "assets"
+$('.ajax').click(function() { return false; });
\ No newline at end of file
diff --git a/js/ajax/assets/stylesheets/example.css b/js/ajax/assets/stylesheets/example.css
new file mode 100644
index 0000000..e69de29
diff --git a/js/sprocket.js b/js/sprocket.js
index b3cc39c..3590676 100644
--- a/js/sprocket.js
+++ b/js/sprocket.js
@@ -1,7 +1,7 @@
$(function() {
console.log('Test');
// Single line comments will be stripped out by Sprocket
/* However multiline ones will stay */
- //= require "formCancel"
- //= require <formCancel2>
+ //= require "ajax/ajax"
+ //= require <formCancel>
});
\ No newline at end of file
diff --git a/js/sprocket.js.cache b/js/sprocket.js.cache
new file mode 100644
index 0000000..272e899
--- /dev/null
+++ b/js/sprocket.js.cache
@@ -0,0 +1,7 @@
+$(function() {
+ console.log('Test');
+
+ /* However multiline ones will stay */
+ $('form').submit(function() { return false; });
+ $('.form').submit(function() { return false; });
+});
\ No newline at end of file
diff --git a/lib/phpsprocket.php b/lib/phpsprocket.php
index 33315b6..d10a30b 100644
--- a/lib/phpsprocket.php
+++ b/lib/phpsprocket.php
@@ -1,56 +1,64 @@
<?php
header('Content-type: application/x-javascript');
/**
* PHPSprocket - A PHP implementation of Sprocket
*/
class PHPSprocket
{
var $baseUri = '/phpsprocket';
var $baseJs = '../js';
var $js = '';
var $filePath = '';
+ var $assetFolder = '..';
function __construct($file) {
$this->filePath = str_replace($this->baseUri, '..', $file);
if(!isset($_GET['debug'])) $this->checkCached();
$this->js = $this->parseJS(basename($this->filePath), dirname($this->filePath));
$this->stripComments();
echo $this->js;
if(!isset($_GET['debug'])) file_put_contents($this->filePath.'.cache', $this->js);
}
function checkCached() {
if(is_file($this->filePath.'.cache')) {
echo file_get_contents($this->filePath.'.cache');
exit;
} else return false;
}
function parseJS($file, $context) {
$js = file_get_contents($context.'/'.$file);
preg_match_all('/\/\/= ([a-z]+) ([^\n]+)/', $js, $matches);
foreach($matches[0] as $key => $match) {
$method = $matches[1][$key].'_command';
$js = str_replace($matches[0][$key], $this->$method(trim($matches[2][$key]), $context), $js);
}
return $js;
}
function stripComments() {
$this->js = preg_replace('/\/\/([^\n]+)/', '', $this->js);
}
function require_command($param, $context) {
if(preg_match('/\"([^\"]+)\"/', $param, $match)) {
return $this->parseJS(basename($context.'/'.$match[1].'.js'), dirname($context.'/'.$match[1].'.js'));
} else if(preg_match('/\<([^\>]+)\>/', $param, $match)) {
return $this->parseJS(basename($context.'/'.$match[1].'.js'), $this->baseJs);
} else return '';
}
+ function provide_command($param, $context) {
+ preg_match('/\"([^\"]+)\"/', $param, $match);
+ foreach(glob($context.'/'.$match[1].'/*') as $asset) {
+ shell_exec('cp -r '.realpath($asset).' '.realpath($this->assetFolder));
+ }
+ }
+
}
$sprocket = new PHPSprocket(preg_replace('/\?.*/', '', $_SERVER['REQUEST_URI']));
\ No newline at end of file
diff --git a/stylesheets/example.css b/stylesheets/example.css
new file mode 100644
index 0000000..e69de29
|
stuartloxton/php-sprockets
|
2d09a84b6a228ac5e856cd589f837e64f051b5a4
|
Caching is now working, also appending ?debug to the JS files URI will stop caching taking place, perfect for development
|
diff --git a/.htaccess b/.htaccess
index 48a93be..eb09653 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,3 +1,3 @@
RewriteEngine On
-RewriteRule \.js$ lib/phpsprocket.php
\ No newline at end of file
+RewriteRule \.js$ lib/phpsprocket.php [QSA]
\ No newline at end of file
diff --git a/js/sprocket.js b/js/sprocket.js
index 34a17af..b3cc39c 100644
--- a/js/sprocket.js
+++ b/js/sprocket.js
@@ -1,5 +1,7 @@
$(function() {
console.log('Test');
+ // Single line comments will be stripped out by Sprocket
+ /* However multiline ones will stay */
//= require "formCancel"
//= require <formCancel2>
});
\ No newline at end of file
diff --git a/lib/phpsprocket.php b/lib/phpsprocket.php
index d6d6f0d..33315b6 100644
--- a/lib/phpsprocket.php
+++ b/lib/phpsprocket.php
@@ -1,51 +1,56 @@
<?php
-header('Content-type: text/plain');
+header('Content-type: application/x-javascript');
/**
* PHPSprocket - A PHP implementation of Sprocket
*/
class PHPSprocket
{
var $baseUri = '/phpsprocket';
- var $baseJs = '../';
+ var $baseJs = '../js';
var $js = '';
var $filePath = '';
function __construct($file) {
$this->filePath = str_replace($this->baseUri, '..', $file);
- $this->checkCached();
- $js = $this->parseJS(basename($this->filePath), dirname($this->filePath));
- echo $js;
+ if(!isset($_GET['debug'])) $this->checkCached();
+ $this->js = $this->parseJS(basename($this->filePath), dirname($this->filePath));
+ $this->stripComments();
+ echo $this->js;
+ if(!isset($_GET['debug'])) file_put_contents($this->filePath.'.cache', $this->js);
}
function checkCached() {
if(is_file($this->filePath.'.cache')) {
echo file_get_contents($this->filePath.'.cache');
exit;
} else return false;
}
function parseJS($file, $context) {
$js = file_get_contents($context.'/'.$file);
preg_match_all('/\/\/= ([a-z]+) ([^\n]+)/', $js, $matches);
foreach($matches[0] as $key => $match) {
$method = $matches[1][$key].'_command';
$js = str_replace($matches[0][$key], $this->$method(trim($matches[2][$key]), $context), $js);
}
return $js;
}
+ function stripComments() {
+ $this->js = preg_replace('/\/\/([^\n]+)/', '', $this->js);
+ }
+
function require_command($param, $context) {
if(preg_match('/\"([^\"]+)\"/', $param, $match)) {
return $this->parseJS(basename($context.'/'.$match[1].'.js'), dirname($context.'/'.$match[1].'.js'));
} else if(preg_match('/\<([^\>]+)\>/', $param, $match)) {
- return $this->parseJS(basename($context.'/'.$match[1].'.js'), $this->baseJS);
+ return $this->parseJS(basename($context.'/'.$match[1].'.js'), $this->baseJs);
} else return '';
}
}
-
-$sprocket = new PHPSprocket($_SERVER['REQUEST_URI']);
+$sprocket = new PHPSprocket(preg_replace('/\?.*/', '', $_SERVER['REQUEST_URI']));
\ No newline at end of file
|
stuartloxton/php-sprockets
|
6d702a583d039f46c45c855e1be74d0d7fa8402b
|
PHPSprocket now parses all files and supports the require directive fully
|
diff --git a/.htaccess b/.htaccess
new file mode 100644
index 0000000..48a93be
--- /dev/null
+++ b/.htaccess
@@ -0,0 +1,3 @@
+RewriteEngine On
+
+RewriteRule \.js$ lib/phpsprocket.php
\ No newline at end of file
diff --git a/index.html b/index.html
new file mode 100644
index 0000000..3ed46b5
--- /dev/null
+++ b/index.html
@@ -0,0 +1,7 @@
+<html>
+ <head>
+ <meta http-equiv="Content-type" content="text/html; charset=utf-8">
+ <title>PHP Sprocket Tests</title>
+ <script src="js/sprocket.js" type="text/javascript" charset="utf-8"></script>
+ </head>
+</html>
\ No newline at end of file
diff --git a/js/formCancel.js b/js/formCancel.js
new file mode 100644
index 0000000..a308084
--- /dev/null
+++ b/js/formCancel.js
@@ -0,0 +1 @@
+$('form').submit(function() { return false; });
\ No newline at end of file
diff --git a/js/formCancel2.js b/js/formCancel2.js
new file mode 100644
index 0000000..b9aa970
--- /dev/null
+++ b/js/formCancel2.js
@@ -0,0 +1 @@
+$('.form').submit(function() { return false; });
\ No newline at end of file
diff --git a/js/sprocket.js b/js/sprocket.js
new file mode 100644
index 0000000..34a17af
--- /dev/null
+++ b/js/sprocket.js
@@ -0,0 +1,5 @@
+$(function() {
+ console.log('Test');
+ //= require "formCancel"
+ //= require <formCancel2>
+});
\ No newline at end of file
diff --git a/lib/phpsprocket.php b/lib/phpsprocket.php
new file mode 100644
index 0000000..d6d6f0d
--- /dev/null
+++ b/lib/phpsprocket.php
@@ -0,0 +1,51 @@
+<?php
+header('Content-type: text/plain');
+/**
+* PHPSprocket - A PHP implementation of Sprocket
+*/
+class PHPSprocket
+{
+
+ var $baseUri = '/phpsprocket';
+ var $baseJs = '../';
+ var $js = '';
+ var $filePath = '';
+
+ function __construct($file) {
+ $this->filePath = str_replace($this->baseUri, '..', $file);
+ $this->checkCached();
+ $js = $this->parseJS(basename($this->filePath), dirname($this->filePath));
+ echo $js;
+ }
+
+ function checkCached() {
+ if(is_file($this->filePath.'.cache')) {
+ echo file_get_contents($this->filePath.'.cache');
+ exit;
+ } else return false;
+ }
+
+ function parseJS($file, $context) {
+ $js = file_get_contents($context.'/'.$file);
+
+ preg_match_all('/\/\/= ([a-z]+) ([^\n]+)/', $js, $matches);
+
+ foreach($matches[0] as $key => $match) {
+ $method = $matches[1][$key].'_command';
+ $js = str_replace($matches[0][$key], $this->$method(trim($matches[2][$key]), $context), $js);
+ }
+
+ return $js;
+ }
+
+ function require_command($param, $context) {
+ if(preg_match('/\"([^\"]+)\"/', $param, $match)) {
+ return $this->parseJS(basename($context.'/'.$match[1].'.js'), dirname($context.'/'.$match[1].'.js'));
+ } else if(preg_match('/\<([^\>]+)\>/', $param, $match)) {
+ return $this->parseJS(basename($context.'/'.$match[1].'.js'), $this->baseJS);
+ } else return '';
+ }
+
+}
+
+$sprocket = new PHPSprocket($_SERVER['REQUEST_URI']);
|
kerryb/real-world-haskell
|
d73ead0a56bf3071ba54c8696035182f1c863e23
|
Try calling matchesGlob with malformed regexp
|
diff --git a/ch8/GlobRegexp.hs b/ch8/GlobRegexp.hs
index 6c75d47..8acae28 100644
--- a/ch8/GlobRegexp.hs
+++ b/ch8/GlobRegexp.hs
@@ -1,35 +1,40 @@
module GlobRegex
(
globToRegex
, matchesGlob
) where
import Text.Regex.Posix ((=~))
globToRegex :: String -> String
globToRegex cs = '^' : globToRegex' cs ++ "$"
globToRegex' :: String -> String
globToRegex' "" = ""
globToRegex' ('*':cs) = ".*" ++ globToRegex' cs
globToRegex' ('?':cs) = '.' : globToRegex' cs
globToRegex' ('[':'!':c:cs) = "[^" ++ c : charClass cs
globToRegex' ('[':c:cs) = '[' : c : charClass cs
globToRegex' ('[':_) = error "unterminated character class"
globToRegex' (c:cs) = escape c ++ globToRegex' cs
escape :: Char -> String
escape c | c `elem` regexChars = '\\' : [c]
| otherwise = [c]
where regexChars = "\\+()^$.{}]|"
charClass :: String -> String
charClass (']':cs) = ']' : globToRegex' cs
charClass (c:cs) = c : charClass cs
charClass [] = error "unterminated character class"
matchesGlob :: FilePath -> String -> Bool
name `matchesGlob` pat = name =~ globToRegex pat
+
+-- Ex1: try passing a malformed regexp to matchesGlob
+malformed f = matchesGlob f "["
+-- => *** Exception: unterminated character class
+
|
kerryb/real-world-haskell
|
6bdb45d39b315c9c209e4fada172bd2e96f66bc0
|
Code from book for chapter 8
|
diff --git a/ch8/GlobRegexp.hs b/ch8/GlobRegexp.hs
new file mode 100644
index 0000000..6c75d47
--- /dev/null
+++ b/ch8/GlobRegexp.hs
@@ -0,0 +1,35 @@
+module GlobRegex
+ (
+ globToRegex
+ , matchesGlob
+ ) where
+
+import Text.Regex.Posix ((=~))
+
+globToRegex :: String -> String
+globToRegex cs = '^' : globToRegex' cs ++ "$"
+globToRegex' :: String -> String
+globToRegex' "" = ""
+
+globToRegex' ('*':cs) = ".*" ++ globToRegex' cs
+
+globToRegex' ('?':cs) = '.' : globToRegex' cs
+
+globToRegex' ('[':'!':c:cs) = "[^" ++ c : charClass cs
+globToRegex' ('[':c:cs) = '[' : c : charClass cs
+globToRegex' ('[':_) = error "unterminated character class"
+
+globToRegex' (c:cs) = escape c ++ globToRegex' cs
+
+escape :: Char -> String
+escape c | c `elem` regexChars = '\\' : [c]
+ | otherwise = [c]
+ where regexChars = "\\+()^$.{}]|"
+
+charClass :: String -> String
+charClass (']':cs) = ']' : globToRegex' cs
+charClass (c:cs) = c : charClass cs
+charClass [] = error "unterminated character class"
+
+matchesGlob :: FilePath -> String -> Bool
+name `matchesGlob` pat = name =~ globToRegex pat
|
kerryb/real-world-haskell
|
ec41eaa419e8b3260446ce3a1127ba4635098d53
|
Something to do with chapter 7
|
diff --git a/ch7/callingpure.hs b/ch7/callingpure.hs
new file mode 100644
index 0000000..700babf
--- /dev/null
+++ b/ch7/callingpure.hs
@@ -0,0 +1,12 @@
+name2reply :: String -> String
+name2reply name =
+ "Pleased to meet you, " ++ name ++ ".\n" ++
+ "Your name contains " ++ charcount ++ " characters."
+ where charcount = show (length name)
+
+main :: IO ()
+main = do
+ putStrLn "Greetings once again. What is your name?"
+ inpStr <- getLine
+ let outStr = name2reply inpStr
+ putStrLn outStr
\ No newline at end of file
|
kerryb/real-world-haskell
|
c26021a3b6f46331bca0bbb001881bcd355f8940
|
Some fiddling with JSON stuff. Can't remember why.
|
diff --git a/ch5/Prettify.hs b/ch5/Prettify.hs
index 41b7cfa..939ef49 100644
--- a/ch5/Prettify.hs
+++ b/ch5/Prettify.hs
@@ -1,93 +1,84 @@
module Prettify where
data Doc = Empty
| Char Char
| Text String
| Line
| Concat Doc Doc
| Union Doc Doc
deriving (Show,Eq)
empty :: Doc
empty = Empty
char :: Char -> Doc
char c = Char c
text :: String -> Doc
text "" = Empty
text s = Text s
double :: Double -> Doc
double d = text (show d)
+line :: Doc
+line = Line
+
(<>) :: Doc -> Doc -> Doc
Empty <> y = y
x <> Empty = x
x <> y = x `Concat` y
-line :: Doc
-line = Line
-
hcat :: [Doc] -> Doc
hcat = fold (<>)
fold :: (Doc -> Doc -> Doc) -> [Doc] -> Doc
fold f = foldr f empty
-fsep :: [Doc] -> Doc
-fsep = fold (</>)
-
(</>) :: Doc -> Doc -> Doc
x </> y = x <> softline <> y
+ where
+ softline :: Doc
+ softline = (Char ' ') `Union` line
-softline :: Doc
-softline = group line
-
-group :: Doc -> Doc
-group x = flatten x `Union` x
-
-flatten :: Doc -> Doc
-flatten (x `Concat` y) = flatten x `Concat` flatten y
-flatten Line = Char ' '
-flatten (x `Union` _) = flatten x
-flatten other = other
+fsep :: [Doc] -> Doc
+fsep = fold (</>)
punctuate :: Doc -> [Doc] -> [Doc]
punctuate p [] = []
punctuate p [d] = [d]
punctuate p (d:ds) = (d <> p) : punctuate p ds
compact :: Doc -> String
compact x = transform [x]
where transform [] = ""
transform (d:ds) =
case d of
Empty -> transform ds
Char c -> c : transform ds
Text s -> s ++ transform ds
Line -> '\n' : transform ds
a `Concat` b -> transform (a:b:ds)
_ `Union` b -> transform (b:ds)
pretty :: Int -> Doc -> String
pretty width x = best 0 [x]
where best col (d:ds) =
case d of
Empty -> best col ds
Char c -> c : best (col + 1) ds
Text s -> s ++ best (col + length s) ds
Line -> '\n' : best 0 ds
a `Concat` b -> best col (a:b:ds)
a `Union` b -> nicest col (best col (a:ds))
(best col (b:ds))
best _ _ = ""
nicest col a b | (width - least) `fits` a = a
| otherwise = b
where least = min width col
fits :: Int -> String -> Bool
w `fits` _ | w < 0 = False
w `fits` "" = True
w `fits` ('\n':_) = True
w `fits` (c:cs) = (w - 1) `fits` cs
diff --git a/ch5/PrettyJSON.hs b/ch5/PrettyJSON.hs
index 0aaa571..1104f65 100644
--- a/ch5/PrettyJSON.hs
+++ b/ch5/PrettyJSON.hs
@@ -1,59 +1,59 @@
module PrettyJSON
(
renderJValue
) where
import Numeric (showHex)
import Data.Char (ord)
import Data.Bits (shiftR, (.&.))
-import SimpleJSON
+import SimpleJSON (JValue(..))
import Prettify (Doc, (<>), char, double, fsep, hcat, punctuate, text,
compact)
renderJValue :: JValue -> Doc
renderJValue (JBool True) = text "true"
renderJValue (JBool False) = text "false"
renderJValue JNull = text "null"
renderJValue (JNumber num) = double num
renderJValue (JString str) = string str
renderJValue (JArray ary) = series '[' ']' renderJValue ary
renderJValue (JObject obj) = series '{' '}' field obj
where field (name,val) = string name
<> text ": "
<> renderJValue val
string :: String -> Doc
string = enclose '"' '"' . hcat . map oneChar
enclose :: Char -> Char -> Doc -> Doc
enclose left right x = char left <> x <> char right
oneChar :: Char -> Doc
oneChar c = case lookup c simpleEscapes of
Just r -> text r
Nothing | mustEscape c -> hexEscape c
| otherwise -> char c
where mustEscape c = c < ' ' || c == '\x7f' || c > '\xff'
simpleEscapes :: [(Char, String)]
simpleEscapes = zipWith ch "\b\n\f\r\t\\\"/" "bnfrt\\\"/"
where ch a b = (a, ['\\',b])
smallHex :: Int -> Doc
smallHex x = text "\\u"
<> text (replicate (4 - length h) '0')
<> text h
where h = showHex x ""
astral :: Int -> Doc
astral n = smallHex (a + 0xd800) <> smallHex (b + 0xdc00)
where a = (n `shiftR` 10) .&. 0x3ff
b = n .&. 0x3ff
hexEscape :: Char -> Doc
hexEscape c | d < 0x10000 = smallHex d
| otherwise = astral (d - 0x10000)
where d = ord c
series :: Char -> Char -> (a -> Doc) -> [a] -> Doc
series open close item = enclose open close
. fsep . punctuate (char ',') . map item
|
kerryb/real-world-haskell
|
99209d1d4eb3f7d34767d8ea8ea7b7be5a72edd9
|
ADd pretty function
|
diff --git a/ch5/Prettify.hs b/ch5/Prettify.hs
index 5d755af..41b7cfa 100644
--- a/ch5/Prettify.hs
+++ b/ch5/Prettify.hs
@@ -1,71 +1,93 @@
module Prettify where
data Doc = Empty
| Char Char
| Text String
| Line
| Concat Doc Doc
| Union Doc Doc
deriving (Show,Eq)
empty :: Doc
empty = Empty
char :: Char -> Doc
char c = Char c
text :: String -> Doc
text "" = Empty
text s = Text s
double :: Double -> Doc
double d = text (show d)
(<>) :: Doc -> Doc -> Doc
Empty <> y = y
x <> Empty = x
x <> y = x `Concat` y
line :: Doc
line = Line
hcat :: [Doc] -> Doc
hcat = fold (<>)
fold :: (Doc -> Doc -> Doc) -> [Doc] -> Doc
fold f = foldr f empty
fsep :: [Doc] -> Doc
fsep = fold (</>)
(</>) :: Doc -> Doc -> Doc
x </> y = x <> softline <> y
softline :: Doc
softline = group line
group :: Doc -> Doc
group x = flatten x `Union` x
flatten :: Doc -> Doc
flatten (x `Concat` y) = flatten x `Concat` flatten y
flatten Line = Char ' '
flatten (x `Union` _) = flatten x
flatten other = other
punctuate :: Doc -> [Doc] -> [Doc]
punctuate p [] = []
punctuate p [d] = [d]
punctuate p (d:ds) = (d <> p) : punctuate p ds
compact :: Doc -> String
compact x = transform [x]
where transform [] = ""
transform (d:ds) =
case d of
Empty -> transform ds
Char c -> c : transform ds
Text s -> s ++ transform ds
Line -> '\n' : transform ds
a `Concat` b -> transform (a:b:ds)
_ `Union` b -> transform (b:ds)
+
+pretty :: Int -> Doc -> String
+pretty width x = best 0 [x]
+ where best col (d:ds) =
+ case d of
+ Empty -> best col ds
+ Char c -> c : best (col + 1) ds
+ Text s -> s ++ best (col + length s) ds
+ Line -> '\n' : best 0 ds
+ a `Concat` b -> best col (a:b:ds)
+ a `Union` b -> nicest col (best col (a:ds))
+ (best col (b:ds))
+ best _ _ = ""
+
+ nicest col a b | (width - least) `fits` a = a
+ | otherwise = b
+ where least = min width col
+fits :: Int -> String -> Bool
+w `fits` _ | w < 0 = False
+w `fits` "" = True
+w `fits` ('\n':_) = True
+w `fits` (c:cs) = (w - 1) `fits` cs
|
kerryb/real-world-haskell
|
88a3f1320444493c15fa36ba23c15906efefd5c5
|
Import all of SimpleJSON
|
diff --git a/ch5/PrettyJSON.hs b/ch5/PrettyJSON.hs
index 1104f65..0aaa571 100644
--- a/ch5/PrettyJSON.hs
+++ b/ch5/PrettyJSON.hs
@@ -1,59 +1,59 @@
module PrettyJSON
(
renderJValue
) where
import Numeric (showHex)
import Data.Char (ord)
import Data.Bits (shiftR, (.&.))
-import SimpleJSON (JValue(..))
+import SimpleJSON
import Prettify (Doc, (<>), char, double, fsep, hcat, punctuate, text,
compact)
renderJValue :: JValue -> Doc
renderJValue (JBool True) = text "true"
renderJValue (JBool False) = text "false"
renderJValue JNull = text "null"
renderJValue (JNumber num) = double num
renderJValue (JString str) = string str
renderJValue (JArray ary) = series '[' ']' renderJValue ary
renderJValue (JObject obj) = series '{' '}' field obj
where field (name,val) = string name
<> text ": "
<> renderJValue val
string :: String -> Doc
string = enclose '"' '"' . hcat . map oneChar
enclose :: Char -> Char -> Doc -> Doc
enclose left right x = char left <> x <> char right
oneChar :: Char -> Doc
oneChar c = case lookup c simpleEscapes of
Just r -> text r
Nothing | mustEscape c -> hexEscape c
| otherwise -> char c
where mustEscape c = c < ' ' || c == '\x7f' || c > '\xff'
simpleEscapes :: [(Char, String)]
simpleEscapes = zipWith ch "\b\n\f\r\t\\\"/" "bnfrt\\\"/"
where ch a b = (a, ['\\',b])
smallHex :: Int -> Doc
smallHex x = text "\\u"
<> text (replicate (4 - length h) '0')
<> text h
where h = showHex x ""
astral :: Int -> Doc
astral n = smallHex (a + 0xd800) <> smallHex (b + 0xdc00)
where a = (n `shiftR` 10) .&. 0x3ff
b = n .&. 0x3ff
hexEscape :: Char -> Doc
hexEscape c | d < 0x10000 = smallHex d
| otherwise = astral (d - 0x10000)
where d = ord c
series :: Char -> Char -> (a -> Doc) -> [a] -> Doc
series open close item = enclose open close
. fsep . punctuate (char ',') . map item
|
kerryb/real-world-haskell
|
058fba4adf594b2c7e83b2dae4dfba46898eeb00
|
Add function definitions
|
diff --git a/ch5/Prettify.hs b/ch5/Prettify.hs
index ff1dc19..5d755af 100644
--- a/ch5/Prettify.hs
+++ b/ch5/Prettify.hs
@@ -1,30 +1,71 @@
module Prettify where
-data Doc = ToBeDefined
- deriving (Show)
+data Doc = Empty
+ | Char Char
+ | Text String
+ | Line
+ | Concat Doc Doc
+ | Union Doc Doc
+ deriving (Show,Eq)
+
+empty :: Doc
+empty = Empty
+
+char :: Char -> Doc
+char c = Char c
text :: String -> Doc
-text str = undefined
+text "" = Empty
+text s = Text s
double :: Double -> Doc
-double num = undefined
+double d = text (show d)
(<>) :: Doc -> Doc -> Doc
-a <> b = undefined
+Empty <> y = y
+x <> Empty = x
+x <> y = x `Concat` y
-char :: Char -> Doc
-char c = undefined
+line :: Doc
+line = Line
hcat :: [Doc] -> Doc
-hcat xs = undefined
+hcat = fold (<>)
+
+fold :: (Doc -> Doc -> Doc) -> [Doc] -> Doc
+fold f = foldr f empty
fsep :: [Doc] -> Doc
-fsep xs = undefined
+fsep = fold (</>)
+
+(</>) :: Doc -> Doc -> Doc
+x </> y = x <> softline <> y
+
+softline :: Doc
+softline = group line
+
+group :: Doc -> Doc
+group x = flatten x `Union` x
+
+flatten :: Doc -> Doc
+flatten (x `Concat` y) = flatten x `Concat` flatten y
+flatten Line = Char ' '
+flatten (x `Union` _) = flatten x
+flatten other = other
punctuate :: Doc -> [Doc] -> [Doc]
punctuate p [] = []
punctuate p [d] = [d]
punctuate p (d:ds) = (d <> p) : punctuate p ds
compact :: Doc -> String
-compact a = undefined
+compact x = transform [x]
+ where transform [] = ""
+ transform (d:ds) =
+ case d of
+ Empty -> transform ds
+ Char c -> c : transform ds
+ Text s -> s ++ transform ds
+ Line -> '\n' : transform ds
+ a `Concat` b -> transform (a:b:ds)
+ _ `Union` b -> transform (b:ds)
|
kerryb/real-world-haskell
|
bb87f838c9b22ed2019b0b1707e9fc7cbb1e367a
|
Pretty printer with stubs
|
diff --git a/ch5/Prettify.hs b/ch5/Prettify.hs
new file mode 100644
index 0000000..ff1dc19
--- /dev/null
+++ b/ch5/Prettify.hs
@@ -0,0 +1,30 @@
+module Prettify where
+
+data Doc = ToBeDefined
+ deriving (Show)
+
+text :: String -> Doc
+text str = undefined
+
+double :: Double -> Doc
+double num = undefined
+
+(<>) :: Doc -> Doc -> Doc
+a <> b = undefined
+
+char :: Char -> Doc
+char c = undefined
+
+hcat :: [Doc] -> Doc
+hcat xs = undefined
+
+fsep :: [Doc] -> Doc
+fsep xs = undefined
+
+punctuate :: Doc -> [Doc] -> [Doc]
+punctuate p [] = []
+punctuate p [d] = [d]
+punctuate p (d:ds) = (d <> p) : punctuate p ds
+
+compact :: Doc -> String
+compact a = undefined
diff --git a/ch5/PrettyJSON.hs b/ch5/PrettyJSON.hs
new file mode 100644
index 0000000..1104f65
--- /dev/null
+++ b/ch5/PrettyJSON.hs
@@ -0,0 +1,59 @@
+module PrettyJSON
+ (
+ renderJValue
+ ) where
+import Numeric (showHex)
+import Data.Char (ord)
+import Data.Bits (shiftR, (.&.))
+import SimpleJSON (JValue(..))
+import Prettify (Doc, (<>), char, double, fsep, hcat, punctuate, text,
+ compact)
+
+renderJValue :: JValue -> Doc
+renderJValue (JBool True) = text "true"
+renderJValue (JBool False) = text "false"
+renderJValue JNull = text "null"
+renderJValue (JNumber num) = double num
+renderJValue (JString str) = string str
+renderJValue (JArray ary) = series '[' ']' renderJValue ary
+renderJValue (JObject obj) = series '{' '}' field obj
+ where field (name,val) = string name
+ <> text ": "
+ <> renderJValue val
+
+string :: String -> Doc
+string = enclose '"' '"' . hcat . map oneChar
+
+enclose :: Char -> Char -> Doc -> Doc
+enclose left right x = char left <> x <> char right
+
+oneChar :: Char -> Doc
+oneChar c = case lookup c simpleEscapes of
+ Just r -> text r
+ Nothing | mustEscape c -> hexEscape c
+ | otherwise -> char c
+ where mustEscape c = c < ' ' || c == '\x7f' || c > '\xff'
+
+simpleEscapes :: [(Char, String)]
+simpleEscapes = zipWith ch "\b\n\f\r\t\\\"/" "bnfrt\\\"/"
+ where ch a b = (a, ['\\',b])
+
+smallHex :: Int -> Doc
+smallHex x = text "\\u"
+ <> text (replicate (4 - length h) '0')
+ <> text h
+ where h = showHex x ""
+
+astral :: Int -> Doc
+astral n = smallHex (a + 0xd800) <> smallHex (b + 0xdc00)
+ where a = (n `shiftR` 10) .&. 0x3ff
+ b = n .&. 0x3ff
+
+hexEscape :: Char -> Doc
+hexEscape c | d < 0x10000 = smallHex d
+ | otherwise = astral (d - 0x10000)
+ where d = ord c
+
+series :: Char -> Char -> (a -> Doc) -> [a] -> Doc
+series open close item = enclose open close
+ . fsep . punctuate (char ',') . map item
|
kerryb/real-world-haskell
|
eef19d452b0a8cf6e391d12d55b7653309baeddb
|
putJSON
|
diff --git a/ch5/PutJSON.hs b/ch5/PutJSON.hs
new file mode 100644
index 0000000..165f69c
--- /dev/null
+++ b/ch5/PutJSON.hs
@@ -0,0 +1,24 @@
+module PutJSON where
+
+import Data.List (intercalate)
+import SimpleJSON
+
+renderJValue :: JValue -> String
+
+renderJValue (JString s) = show s
+renderJValue (JNumber n) = show n
+renderJValue (JBool True) = "true"
+renderJValue (JBool False) = "false"
+renderJValue JNull = "null"
+
+renderJValue (JObject o) = "{" ++ pairs o ++ "}"
+ where pairs [] = ""
+ pairs ps = intercalate ", " (map renderPair ps)
+ renderPair (k,v) = show k ++ ": " ++ renderJValue v
+
+renderJValue (JArray a) = "[" ++ values a ++ "]"
+ where values [] = ""
+ values vs = intercalate ", " (map renderJValue vs)
+
+putJValue :: JValue -> IO ()
+putJValue v = putStrLn (renderJValue v)
|
kerryb/real-world-haskell
|
3a32bf7034100b2e982d7350db3f79ead885958b
|
Add simple test application
|
diff --git a/.gitignore b/.gitignore
index ffe8ca5..9ff3e75 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
*.hi
*.o
ch4/Interact
ch4/FixLines
ch4/part1/ex3/FirstLines
ch4/part1/ex4/Transpose
+ch5/simple
diff --git a/ch5/Main.hs b/ch5/Main.hs
new file mode 100644
index 0000000..341e49e
--- /dev/null
+++ b/ch5/Main.hs
@@ -0,0 +1,5 @@
+module Main () where
+
+import SimpleJSON
+
+main = print (JObject [("foo", JNumber 1), ("bar", JBool False)])
|
kerryb/real-world-haskell
|
f2b781b26344f27206e3d8f661ab5900f1f55159
|
Add module declaration
|
diff --git a/ch5/SimpleJSON.hs b/ch5/SimpleJSON.hs
index ee98b88..09b0361 100644
--- a/ch5/SimpleJSON.hs
+++ b/ch5/SimpleJSON.hs
@@ -1,27 +1,39 @@
+module SimpleJSON
+ (
+ JValue(..)
+ , getString
+ , getInt
+ , getDouble
+ , getBool
+ , getObject
+ , getArray
+ , isNull
+ ) where
+
data JValue = JString String
| JNumber Double
| JBool Bool
| JNull
| JObject [(String, JValue)]
| JArray [JValue]
deriving (Eq, Ord, Show)
getString (JString s) = Just s
getString _ = Nothing
getInt (JNumber n) = Just (truncate n)
getInt _ = Nothing
getDouble (JNumber n) = Just n
getDouble _ = Nothing
getBool (JBool b) = Just b
getBool _ = Nothing
getObject (JObject o) = Just o
getObject _ = Nothing
getArray (JArray a) = Just a
getArray _ = Nothing
isNull v = v == JNull
|
kerryb/real-world-haskell
|
94f0a4b957ff8fc05f418565c2e41abacd660d65
|
Add other accessor functions
|
diff --git a/ch5/SimpleJSON.hs b/ch5/SimpleJSON.hs
index 08074ed..ee98b88 100644
--- a/ch5/SimpleJSON.hs
+++ b/ch5/SimpleJSON.hs
@@ -1,11 +1,27 @@
data JValue = JString String
| JNumber Double
| JBool Bool
| JNull
| JObject [(String, JValue)]
| JArray [JValue]
deriving (Eq, Ord, Show)
-getString :: JValue -> Maybe String
getString (JString s) = Just s
getString _ = Nothing
+
+getInt (JNumber n) = Just (truncate n)
+getInt _ = Nothing
+
+getDouble (JNumber n) = Just n
+getDouble _ = Nothing
+
+getBool (JBool b) = Just b
+getBool _ = Nothing
+
+getObject (JObject o) = Just o
+getObject _ = Nothing
+
+getArray (JArray a) = Just a
+getArray _ = Nothing
+
+isNull v = v == JNull
|
kerryb/real-world-haskell
|
0672469f4910973ba523585f72adebbc283b674b
|
Add getString accessor function
|
diff --git a/ch5/SimpleJSON.hs b/ch5/SimpleJSON.hs
index cebc498..08074ed 100644
--- a/ch5/SimpleJSON.hs
+++ b/ch5/SimpleJSON.hs
@@ -1,7 +1,11 @@
data JValue = JString String
| JNumber Double
| JBool Bool
| JNull
| JObject [(String, JValue)]
| JArray [JValue]
deriving (Eq, Ord, Show)
+
+getString :: JValue -> Maybe String
+getString (JString s) = Just s
+getString _ = Nothing
|
kerryb/real-world-haskell
|
a917a1df5521095b2349c76ffc0d85e58a94783c
|
Chapter 5: create JValue type
|
diff --git a/ch5/SimpleJSON.hs b/ch5/SimpleJSON.hs
new file mode 100644
index 0000000..cebc498
--- /dev/null
+++ b/ch5/SimpleJSON.hs
@@ -0,0 +1,7 @@
+data JValue = JString String
+ | JNumber Double
+ | JBool Bool
+ | JNull
+ | JObject [(String, JValue)]
+ | JArray [JValue]
+ deriving (Eq, Ord, Show)
|
kerryb/real-world-haskell
|
e82c639cdaf59b8d3078a82985e2215c32808ea9
|
Chapter 4 part 2 exercise 5
|
diff --git a/ch4/part2/ex5/MyGroupBy.hs b/ch4/part2/ex5/MyGroupBy.hs
new file mode 100644
index 0000000..d31a51b
--- /dev/null
+++ b/ch4/part2/ex5/MyGroupBy.hs
@@ -0,0 +1,6 @@
+import Data.List
+
+myGroupBy f xs = foldl' step [] xs
+ where step a x | null a = [[x]]
+ | f (head$last a) x = (init a) ++ [(last a) ++ [x]]
+ | otherwise = a ++ [[x]]
|
kerryb/real-world-haskell
|
f66a9cbd562a8dc0bb81d1e4813870f96568d593
|
Remove function type declaration
|
diff --git a/ch4/part2/ex4/TakeWhileFold.hs b/ch4/part2/ex4/TakeWhileFold.hs
index ed06b6a..2c776f0 100644
--- a/ch4/part2/ex4/TakeWhileFold.hs
+++ b/ch4/part2/ex4/TakeWhileFold.hs
@@ -1,4 +1,3 @@
-takeWhileFold :: (a -> Bool) -> [a] -> [a]
takeWhileFold f xs = foldr step [] xs
where step x a | f x = x:a
| otherwise = []
|
kerryb/real-world-haskell
|
2ca0b4134f5d797943e5de893ac6185e8d30f0fe
|
Second part of exercise 4
|
diff --git a/ch4/part2/ex4/TakeWhileFold.hs b/ch4/part2/ex4/TakeWhileFold.hs
new file mode 100644
index 0000000..ed06b6a
--- /dev/null
+++ b/ch4/part2/ex4/TakeWhileFold.hs
@@ -0,0 +1,4 @@
+takeWhileFold :: (a -> Bool) -> [a] -> [a]
+takeWhileFold f xs = foldr step [] xs
+ where step x a | f x = x:a
+ | otherwise = []
|
kerryb/real-world-haskell
|
a6a0f5f9d01607be17d7c217f090baa3baaf5fbb
|
Chapter 4 part 2 exercise 4
|
diff --git a/ch4/part2/ex4/TakeWhileRecursive.hs b/ch4/part2/ex4/TakeWhileRecursive.hs
new file mode 100644
index 0000000..3dd3faf
--- /dev/null
+++ b/ch4/part2/ex4/TakeWhileRecursive.hs
@@ -0,0 +1,3 @@
+takeWhileRecursive _ [] = []
+takeWhileRecursive f (x:xs) | f x = x:(takeWhileRecursive f xs)
+ | otherwise = []
|
kerryb/real-world-haskell
|
54e40f2d78655361ab396e3b2c688359871fa7a9
|
Chapter 4 part 2 exercise 3
|
diff --git a/ch4/part2/ex3/MyConcat.hs b/ch4/part2/ex3/MyConcat.hs
new file mode 100644
index 0000000..27c2dc7
--- /dev/null
+++ b/ch4/part2/ex3/MyConcat.hs
@@ -0,0 +1 @@
+myConcat xs = foldr (++) [] xs
|
kerryb/real-world-haskell
|
87cddf78b25bae02c06612ec27aa744c5d7d6f46
|
Finally! AsInt fully working using Either
|
diff --git a/ch4/part2/ex2/AsInt_either.hs b/ch4/part2/ex2/AsInt_either.hs
index 6f018e5..15b0c11 100644
--- a/ch4/part2/ex2/AsInt_either.hs
+++ b/ch4/part2/ex2/AsInt_either.hs
@@ -1,14 +1,15 @@
import Data.Char
import Data.List
type ErrorMessage = String
asInt_either :: String -> Either ErrorMessage Int
asInt_either ('-':xs) = case asInt_either xs of
Left error -> Left error
Right n -> Right (-n)
asInt_either xs | null xs = Left "Empty string"
- | otherwise = Right (foldl' parseDigits 0 xs)
- where parseDigits acc char | acc < 0 = error "Too big"
- | isDigit char = acc * 10 + (digitToInt char)
- | otherwise = error ("Not an integer: " ++ [char])
+ | otherwise = foldl' parseDigits (Right 0) xs
+ where parseDigits (Left error) _ = Left error
+ parseDigits (Right acc) char | acc < 0 = Left "Too big"
+ | isDigit char = Right (acc * 10 + (digitToInt char))
+ | otherwise = Left ("Not an integer: " ++ [char])
|
kerryb/real-world-haskell
|
f1ae69b3957f1a117196572bf20465b64de73c16
|
Use Either for asInt, but not in step function yet
|
diff --git a/ch4/part2/ex2/AsInt_either.hs b/ch4/part2/ex2/AsInt_either.hs
new file mode 100644
index 0000000..6f018e5
--- /dev/null
+++ b/ch4/part2/ex2/AsInt_either.hs
@@ -0,0 +1,14 @@
+import Data.Char
+import Data.List
+
+type ErrorMessage = String
+
+asInt_either :: String -> Either ErrorMessage Int
+asInt_either ('-':xs) = case asInt_either xs of
+ Left error -> Left error
+ Right n -> Right (-n)
+asInt_either xs | null xs = Left "Empty string"
+ | otherwise = Right (foldl' parseDigits 0 xs)
+ where parseDigits acc char | acc < 0 = error "Too big"
+ | isDigit char = acc * 10 + (digitToInt char)
+ | otherwise = error ("Not an integer: " ++ [char])
|
kerryb/real-world-haskell
|
26dadb9fe43d4d13f8d3332f2ab2e82ba44fe64d
|
Fix indenting
|
diff --git a/ch4/part2/ex1/AsInt_fold.hs b/ch4/part2/ex1/AsInt_fold.hs
index d80ebbb..b9f3163 100644
--- a/ch4/part2/ex1/AsInt_fold.hs
+++ b/ch4/part2/ex1/AsInt_fold.hs
@@ -1,9 +1,9 @@
import Data.Char
import Data.List
asInt_fold ('-':xs) = -(asInt_fold xs)
asInt_fold xs | null xs = error "Empty string"
| otherwise = foldl' parseDigits 0 xs
- where parseDigits acc char | acc < 0 = error "Too big"
+ where parseDigits acc char | acc < 0 = error "Too big"
| isDigit char = acc * 10 + (digitToInt char)
- | otherwise = error "Not an integer"
+ | otherwise = error "Not an integer"
|
kerryb/real-world-haskell
|
0d03737e3c2f1f6854e92768c0b98e57691169bd
|
Throw exception on too-big numbers
|
diff --git a/ch4/part2/ex1/AsInt_fold.hs b/ch4/part2/ex1/AsInt_fold.hs
index a6454b8..d80ebbb 100644
--- a/ch4/part2/ex1/AsInt_fold.hs
+++ b/ch4/part2/ex1/AsInt_fold.hs
@@ -1,8 +1,9 @@
import Data.Char
import Data.List
asInt_fold ('-':xs) = -(asInt_fold xs)
asInt_fold xs | null xs = error "Empty string"
| otherwise = foldl' parseDigits 0 xs
- where parseDigits acc char | isDigit char = acc * 10 + (digitToInt char)
+ where parseDigits acc char | acc < 0 = error "Too big"
+ | isDigit char = acc * 10 + (digitToInt char)
| otherwise = error "Not an integer"
|
kerryb/real-world-haskell
|
9eace437066dd6e7b276468f762cd13c2c9f097c
|
Throw exception on non-integer input
|
diff --git a/ch4/part2/ex1/AsInt_fold.hs b/ch4/part2/ex1/AsInt_fold.hs
index 366a44f..a6454b8 100644
--- a/ch4/part2/ex1/AsInt_fold.hs
+++ b/ch4/part2/ex1/AsInt_fold.hs
@@ -1,8 +1,8 @@
-import Data.Char (digitToInt)
-import Data.List (foldl')
+import Data.Char
+import Data.List
-asInt_fold "" = error "Empty string"
-asInt_fold "-" = error "Empty string"
asInt_fold ('-':xs) = -(asInt_fold xs)
-asInt_fold xs = foldl' parseDigits 0 xs
- where parseDigits acc char = acc * 10 + (digitToInt char)
+asInt_fold xs | null xs = error "Empty string"
+ | otherwise = foldl' parseDigits 0 xs
+ where parseDigits acc char | isDigit char = acc * 10 + (digitToInt char)
+ | otherwise = error "Not an integer"
|
kerryb/real-world-haskell
|
5f9fe7cf4c921a0146612f13c346972f38ad554d
|
Throw exception on empty input
|
diff --git a/ch4/part2/ex1/AsInt_fold.hs b/ch4/part2/ex1/AsInt_fold.hs
index 8588aa7..366a44f 100644
--- a/ch4/part2/ex1/AsInt_fold.hs
+++ b/ch4/part2/ex1/AsInt_fold.hs
@@ -1,6 +1,8 @@
import Data.Char (digitToInt)
import Data.List (foldl')
+asInt_fold "" = error "Empty string"
+asInt_fold "-" = error "Empty string"
asInt_fold ('-':xs) = -(asInt_fold xs)
-asInt_fold xs = foldl' parseDigits 0 xs
- where parseDigits acc char = acc * 10 + (digitToInt char)
+asInt_fold xs = foldl' parseDigits 0 xs
+ where parseDigits acc char = acc * 10 + (digitToInt char)
|
kerryb/real-world-haskell
|
893c045f9d55bd3d212140529777ea517cf35f5a
|
Handle negative numbers
|
diff --git a/ch4/part2/ex1/AsInt_fold.hs b/ch4/part2/ex1/AsInt_fold.hs
index 5ab2f7d..8588aa7 100644
--- a/ch4/part2/ex1/AsInt_fold.hs
+++ b/ch4/part2/ex1/AsInt_fold.hs
@@ -1,5 +1,6 @@
import Data.Char (digitToInt)
import Data.List (foldl')
+asInt_fold ('-':xs) = -(asInt_fold xs)
asInt_fold xs = foldl' parseDigits 0 xs
where parseDigits acc char = acc * 10 + (digitToInt char)
|
kerryb/real-world-haskell
|
be6b1f1bd196733cd0afa2982eb587c3100f1188
|
Make parseDigits private
|
diff --git a/ch4/part2/ex1/AsInt_fold.hs b/ch4/part2/ex1/AsInt_fold.hs
index 746055c..5ab2f7d 100644
--- a/ch4/part2/ex1/AsInt_fold.hs
+++ b/ch4/part2/ex1/AsInt_fold.hs
@@ -1,8 +1,5 @@
import Data.Char (digitToInt)
import Data.List (foldl')
-parseDigits :: Int -> Char -> Int
-parseDigits acc char = acc * 10 + (digitToInt char)
-
-asInt_fold :: String -> Int
asInt_fold xs = foldl' parseDigits 0 xs
+ where parseDigits acc char = acc * 10 + (digitToInt char)
|
kerryb/real-world-haskell
|
34e8b7cf90253d0882618e47917ec62778a873ca
|
Chapter 4 part 2 exercise 1: working for +ve numbers
|
diff --git a/ch4/part2/ex1/AsInt_fold.hs b/ch4/part2/ex1/AsInt_fold.hs
new file mode 100644
index 0000000..746055c
--- /dev/null
+++ b/ch4/part2/ex1/AsInt_fold.hs
@@ -0,0 +1,8 @@
+import Data.Char (digitToInt)
+import Data.List (foldl')
+
+parseDigits :: Int -> Char -> Int
+parseDigits acc char = acc * 10 + (digitToInt char)
+
+asInt_fold :: String -> Int
+asInt_fold xs = foldl' parseDigits 0 xs
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.