Permalink
Browse files

Fixed YUI Test issues, bumped version

  • Loading branch information...
nzakas committed Nov 13, 2012
1 parent 036bd12 commit 80f795cb35f2fc144757f67c4d2fccdd7e28c347
View
@@ -1,3 +1,17 @@
+November 13, 2012 - v0.2.0
+
+* Merge pull request #36 from mattiacci/border-radius (Nicholas C. Zakas)
+* Fix validation of border-radius (Michael Mattiacci)
+* Merge pull request #33 from mattiacci/bg-position (Nicholas C. Zakas)
+* Fix validation of background-position (Michael Mattiacci)
+* Merge pull request #31 from nightwing/master (Nicholas C. Zakas)
+* fix typo (nightwing)
+* v0.1.9 (Nicholas C. Zakas)
+* Expose vendor prefix for @keyframes (fixes #29) (Nicholas C. Zakas)
+* Add support for o-keyframes and remove ms-keyframes (Nicholas C. Zakas)
+* Fix changelog (Nicholas C. Zakas)
+
+
July 23, 2012 - v0.1.9
* Expose vendor prefix for @keyframes (fixes #29) (Nicholas C. Zakas)
@@ -249,6 +263,8 @@ November 28, 2011 - v0.1.0
+
+
View
104 build.xml
@@ -1,31 +1,31 @@
<project name="parserlib" default="build.all">
<!-- version number -->
- <property name="parserlib.version" value="0.1.9" />
+ <property name="parserlib.version" value="0.2.0" />
<!-- the directories containing the source files -->
<property name="src.dir" value="./src" />
<property name="tests.dir" value="./tests" />
<property name="npm.dir" value="./npm" />
-
+
<!-- the directories and files to output to -->
<property name="lib.dir" value="./lib" />
-
+
<!-- the directories and files to output to -->
<property name="build.dir" value="./build" />
<property name="release.dir" value="./release" />
<property name="build.npm.dir" value="${build.dir}/npm" />
-
+
<!-- output filenames -->
<property name="full.build.file" value="parserlib.js"/>
<property name="core.build.file" value="parserlib-core.js"/>
<property name="css.build.file" value="parserlib-css.js"/>
<property name="tests.build.file" value="parserlib-tests.js"/>
<property name="node.build.file" value="node-parserlib.js"/>
-
+
<!-- license information -->
<loadfile property="license.text" srcfile="LICENSE" />
-
+
<tstamp>
<format property="RIGHT_NOW"
pattern="d-MMMM-yyyy hh:mm:ss"
@@ -35,77 +35,77 @@
<format property="SIMPLE_DATE"
pattern="MMMM d, yyyy"
locale="en,US"/>
- </tstamp>
-
+ </tstamp>
+
<!-- clean -->
<target name="clean">
<delete dir="${build.dir}" />
</target>
-
+
<target name="changelog.update">
<exec executable="git" failonerror="true" outputproperty="git.tag">
<arg line="tag"/>
- </exec>
+ </exec>
<script language="javascript"><![CDATA[
//get the most recent tag to get the diff
var tags = parserlib.getProperty("git.tag").replace("\r", "").split("\n"),
lastTag = tags[tags.length-1];
parserlib.setProperty("git.log.range", lastTag + "..HEAD");
]]></script>
-
+
<!-- git log -pretty=format:'* %s (%an)' v0.4.0..v0.5.0-->
<exec executable="git" failonerror="true" outputproperty="git.changelog">
<arg line="log --pretty=format:'* %s (%an)' ${git.log.range}"/>
- </exec>
-
+ </exec>
+
<concat destfile="CHANGELOG.tmp" fixlastline="true">
<header trimleading="yes">${SIMPLE_DATE} - v${parserlib.version}
-
+
${git.changelog}
-
+
</header>
<fileset dir="." includes="CHANGELOG" />
</concat>
-
+
<delete file="CHANGELOG"/>
<move file="CHANGELOG.tmp" tofile="CHANGELOG"/>
-
+
</target>
-
+
<!-- validate JS files with JSHint -->
- <target name="lint">
+ <target name="lint">
<fileset dir="${src.dir}" includes="**/*.js" id="jsfiles.raw"/>
<pathconvert pathsep=" " property="jsfiles.clean" refid="jsfiles.raw" />
<exec executable="java" failonerror="true">
<arg line="-jar"/>
<arg path="${lib.dir}/js.jar"/>
- <arg path="${lib.dir}/jshint.js" />
+ <arg path="${lib.dir}/jshint.js" />
<arg line="${jsfiles.clean} curly=true,forin=true,latedef=true,evil=true,loopfunc=true,undef=true,rhino=false" />
- </exec>
- </target>
-
+ </exec>
+ </target>
+
<!-- run tests on the command line -->
- <target name="test" depends="lint,build.all">
+ <target name="test" depends="lint,build.all">
<apply executable="java" failonerror="true">
<fileset dir="${tests.dir}" includes="**/*.js"/>
<arg line="-jar"/>
<arg path="${lib.dir}/js.jar"/>
<arg path="${lib.dir}/yuitest-rhino-cli.js" />
<arg path="${build.dir}/${full.build.file}" />
<srcfile/>
- </apply>
- </target>
-
+ </apply>
+ </target>
+
<!-- build the full library -->
<target name="build.full" depends="build.core,build.css">
<concat destfile="${build.dir}/${full.build.file}" fixlastline="true">
<filelist dir="${build.dir}" files="${core.build.file}, ${css.build.file}"/>
- </concat>
+ </concat>
</target>
-
+
<!-- build the core library -->
<target name="build.core">
-
+
<concat destfile="${build.dir}/${core.build.file}" fixlastline="true">
<header trimleading="yes">/*!
${license.text}
@@ -127,13 +127,13 @@
})();
</footer>
</concat>
-
+
</target>
-
+
<!-- build the CSS library -->
<target name="build.css">
<concat destfile="${build.dir}/${css.build.file}" fixlastline="true">
- <header trimleading="yes">/*
+ <header trimleading="yes">/*
${license.text}
*/
/* Version v@VERSION@, Build time: ${RIGHT_NOW} */
@@ -143,13 +143,13 @@
StringReader = parserlib.util.StringReader,
SyntaxError = parserlib.util.SyntaxError,
SyntaxUnit = parserlib.util.SyntaxUnit;
- </header>
+ </header>
<!--<filelist dir="${src.dir}/css" files="CSSTokens.js, CSSSelectorUnit.js, CSSColors.js, CSSValueUnit.js, CSSParser.js"/>-->
<fileset dir="${src.dir}/css" includes="*.js" />
<footer trimleading="yes">
parserlib.css = {
- Colors :Colors,
- Combinator :Combinator,
+ Colors :Colors,
+ Combinator :Combinator,
Parser :Parser,
PropertyName :PropertyName,
PropertyValue :PropertyValue,
@@ -168,39 +168,39 @@
</footer>
</concat>
-
+
</target>
-
+
<!-- build the Node.js package -->
<target name="build.node">
-
+
<concat destfile="${build.dir}/${node.build.file}" fixlastline="true">
<filelist dir="${build.dir}" files="${core.build.file}, ${css.build.file}"/>
<footer trimleading="yes">
(function(){
for(var prop in parserlib){
- exports[prop] = parserlib[prop];
+ exports[prop] = parserlib[prop];
}
})();
</footer>
</concat>
-
+
<mkdir dir="${build.npm.dir}"/>
<mkdir dir="${build.npm.dir}/lib"/>
<copy file="${npm.dir}/package.json" todir="${build.npm.dir}"/>
<copy file="${build.dir}/${node.build.file}" todir="${build.npm.dir}/lib"/>
-
+
<!-- CRLF will cause Node version to break -->
<fixcrlf srcdir="${build.dir}" includes="**/*" eol="lf" />
- </target>
-
+ </target>
+
<!-- build the tests into a single file -->
- <target name="build.tests">
+ <target name="build.tests">
<concat destfile="${build.dir}/${tests.build.file}" fixlastline="true">
- <fileset dir="${tests.dir}/" includes="**/*.js" />
- </concat>
- </target>
-
+ <fileset dir="${tests.dir}/" includes="**/*.js" />
+ </concat>
+ </target>
+
<!-- Create a release with version number embedded -->
<target name="release" depends="test,build.all,changelog.update">
<delete dir="${release.dir}" />
@@ -210,9 +210,9 @@
</copy>
<replaceregexp match="@VERSION@" replace="${parserlib.version}" flags="g" byline="true">
<fileset dir="${release.dir}" includes="**/*"/>
- </replaceregexp>
- </target>
-
+ </replaceregexp>
+ </target>
+
<!-- Build all files -->
<target name="build.all" depends="build.full,build.node,build.tests"/>
Oops, something went wrong.

0 comments on commit 80f795c

Please sign in to comment.