On 4/25/16, 10:38 AM, "Christofer Dutz" <christofer.d...@c-ware.de> wrote:
>No problem at all ... for me it will make things a lot easier as I no
>longer have to merge things manually ... looking forward to this :-)
I was going to push the merge, but I think the Maven build will need
fixing, and I'm not sure what is the best way to fix it.
The externs/createjs Ant build changed to download a second package, which
is TweenJS-0.6.2.
Then some new processing rules were added, namely:
<replace file="${basedir}/externs/${file}" token="@param data"
value="@param {Object} data" />
<replace file="${basedir}/externs/${file}" token="@param ratio"
value="@param {Number} ratio" />
<replace file="${basedir}/externs/${file}" token="@param target"
value="@param {Object} target" />
<replace file="${basedir}/externs/${file}" token="{any}" value="{Object}"
/>
These files get added to the list of files sent through the entire set of
filters
tweenjs/CSSPlugin.js
tweenjs/Ease.js
tweenjs/MotionGuidePlugin.js
tweenjs/SamplePlugin.js
tweenjs/Timeline.js
tweenjs/Tween.js
Then these files get special treatment:
<replaceregexp
file="${basedir}/target/EaselJS-${createjs.version}/src/tweenjs/Tween.js"
match="@constructor" replace="@static" flags="gs" />
<replaceregexp
file="${basedir}/target/EaselJS-${createjs.version}/src/tweenjs/Tween.js"
match="@static" replace="@constructor" />
<replaceregexp
file="${basedir}/target/EaselJS-${createjs.version}/src/tweenjs/Ease.js"
match="@static" replace="@constructor" />
<replaceregexp
file="${basedir}/target/EaselJS-${createjs.version}/src/createjs/utils/Tick
er.js" match="@static" replace="@constructor" />
<replace
file="${basedir}/target/EaselJS-${createjs.version}/src/createjs/utils/Tick
er.js" token="createjs.Ticker.addEventListener = function()"
value="createjs.Ticker.addEventListener = function(type, handler)" />
I would have just added this stuff to the pom.xml, but the part I'm not
sure about is how to handle unpacking two different packages. In the Ant
build, I just move the second package's files into the first package's
folder so the replace filters can just run in one folder. I'm not sure if
you want to keep them as separate folders or unzipped sources or not, and
how to adjust the maven build accordingly.
Thoughts?
-Alex
