Revision: 1346
Author: sberlin
Date: Sun Oct 31 13:39:41 2010
Log: add jdiff build packages, update build.properties for struts2, update
build.xml to include a jdiff target & fix up javadoc target, add a new
uploadApiDiffs script, update uploadJavadocs script.
http://code.google.com/p/google-guice/source/detail?r=1346
Added:
/trunk/lib/build/jdiff
/trunk/lib/build/jdiff/Null.java
/trunk/lib/build/jdiff/background.gif
/trunk/lib/build/jdiff/black.gif
/trunk/lib/build/jdiff/jdiff.jar
/trunk/lib/build/jdiff/new.gif
/trunk/lib/build/jdiff/xerces.jar
/trunk/uploadApiDiffs.sh
Modified:
/trunk/build.properties
/trunk/build.xml
/trunk/uploadJavadocs.sh
=======================================
--- /dev/null
+++ /trunk/lib/build/jdiff/Null.java Sun Oct 31 13:39:41 2010
@@ -0,0 +1,9 @@
+/**
+ * This class is used only as a "null" argument for Javadoc when comparing
+ * two API files. Javadoc has to have a package, .java or .class file as an
+ * argument, even though JDiff doesn't use it.
+ */
+public class Null {
+ public Null() {
+ }
+}
=======================================
--- /dev/null
+++ /trunk/lib/build/jdiff/background.gif Sun Oct 31 13:39:41 2010
@@ -0,0 +1,14 @@
+GIF89ah h € õõõ !ù , h h ÿ„ ©Ëí £œ´Ú‹³Þ¼û †âH–扦êʶî ÇòL×ö çúÎ÷þ
+‡Ä¢ñˆL*—̦ó J§ÔªõŠÍj·Ü®÷ ‹Çä²ùŒN«×ì¶û
+ ËçôºýŽÏë÷ü¾ÿ (8HXhxˆ˜¨¸ÈØèø )9IYiy‰™©¹ÉÙéù *:JZjzŠšªºÊÚêú
+ +;K[k{‹›«»ËÛëû
+,<L\l|Œœ¬¼ÌÜìü
+-=M]m} ½ÍÝíý
+
+.>N^n~Žž®¾ÎÞîþ /?O_o Ÿ¯¿Ïßïÿ 0 À <ˆ0¡Â
+ :| 1¢Ä‰ +Z¼ˆ1£Æ ÿ
+;zü 2¤È‘$Kš<‰2¥Ê•,[º| 3¦Ì™4kÚ¼‰3§Î <{úü 4¨Ð¡D‹ =Š4©Ò¥L›:}
+5ªÔ©T«Z½Š5«Ö\»zý
+6¬Ø±dËš=‹6ÚµlÛº} 7®Ü¹tëÚ½‹7¯Þ½|
ûúý 8°àÁ„ >Œ8±âÅŒ ;~ 9²äÉ”+[¾Œ9³æÍœ;{þ :´èѤK›> :µêÕ¬[»~
+;¶ìÙ´kÛ¾ ;·îݼ{ûþ
+<¸ðáÄ‹ ?Ž<¹òåÌ›; =ºôéÔ«[¿Ž=»öíÜ»{ÿ >¼øñäË›? >½úõìÛ» ?¾üùôëÛ¿ ?¿þýüûû ÿ O ;
=======================================
--- /dev/null
+++ /trunk/lib/build/jdiff/black.gif Sun Oct 31 13:39:41 2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /trunk/lib/build/jdiff/jdiff.jar Sun Oct 31 13:39:41 2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /trunk/lib/build/jdiff/new.gif Sun Oct 31 13:39:41 2010
@@ -0,0 +1,1 @@
+GIF89a ‘ ÀÀÀÿÿ !ù , EŒo‚Š!ÜâyÏÑD«“6ûÿq @‘Àif¤Æ
ç“–*Û¦æ뺱8± "ñz°ÜÌ ‰ÈŠÁ"2¹ IA-ÌÅªÈ ´MTR ;
=======================================
--- /dev/null
+++ /trunk/lib/build/jdiff/xerces.jar Sun Oct 31 13:39:41 2010
File is too large to display a diff.
=======================================
--- /dev/null
+++ /trunk/uploadApiDiffs.sh Sun Oct 31 13:39:41 2010
@@ -0,0 +1,20 @@
+rm -rf build/docs
+CV=3.0
+
+# remove old api-diffs
+svn rm latest-api-diffs/$CV
+svn ci -m "Removed old $CV api diffs." latest-api-diffs/$CV
+
+# create new api-diffs
+ant jdiff
+cp -r build/docs/latest-api-diffs latest-api-diffs/$CV
+cp lib/build/jdiff/*.gif latest-api-diffs/$CV
+mv latest-api-diffs/$CV/$CV.xml latest-api-diffs
+
+# capture current javadoc snapshot
+ant javadoc
+cp -r build/docs/javadoc latest-api-diffs/$CV/javadoc
+
+# commit changes
+svn add latest-api-diffs/$CV
+svn ci -m "Added updated $CV api diffs." latest-api-diffs/$CV
=======================================
--- /trunk/build.properties Thu Oct 21 12:10:16 2010
+++ /trunk/build.properties Sun Oct 31 13:39:41 2010
@@ -11,6 +11,7 @@
privatemodules.src.dir=extensions/privatemodules/src
lifecycle.src.dir=extensions/lifecycle/src
persist.src.dir=extensions/persist/src
+struts2.src.dir=extensions/struts2/src
build.dir=build
javadoc.packagenames=com.google.inject,com.google.inject.spi,\
com.google.inject.matcher,\
=======================================
--- /trunk/build.xml Tue Oct 26 18:48:00 2010
+++ /trunk/build.xml Sun Oct 31 13:39:41 2010
@@ -103,13 +103,68 @@
</syspropertyset>
</java>
</target>
+
+ <property name="old.api" value="2.0"/>
+ <property name="new.api" value="3.0"/>
+ <target name="jdiff">
+ <property name="jdiff.home" value="lib/build/jdiff"/>
+ <property name="jdiff.tmp" value="build/docs/latest-api-diffs"/>
+ <delete dir="${jdiff.tmp}"/>
+ <mkdir dir="${jdiff.tmp}"/>
+
+ <!-- Generate API for current version. -->
+ <javadoc packagenames="com.google.*"
+
docletpath="${jdiff.home}/jdiff.jar${path.separator}${jdiff.home}/xerces.jar"
+ maxmemory="512M"
+
classpath="lib/javax.inject.jar${path.separator}lib/aopalliance.jar">
+ <fileset dir="${src.dir}" defaultexcludes="yes">
+ <include name="com/google/**"/>
+ <exclude name="com/google/inject/internal/**"/>
+ </fileset>
+ <fileset dir="${servlet.src.dir}"/>
+ <fileset dir="${spring.src.dir}"/>
+ <fileset dir="${assistedinject.src.dir}"/>
+ <fileset dir="${jmx.src.dir}"/>
+ <fileset dir="${jndi.src.dir}"/>
+ <fileset dir="${throwingproviders.src.dir}"/>
+ <fileset dir="${multibindings.src.dir}"/>
+ <fileset dir="${persist.src.dir}"/>
+ <fileset dir="${struts2.src.dir}"/>
+
+ <doclet name="jdiff.JDiff"
+ path="${jdiff.home}/jdiff.jar:${jdiff.home}/xerces.jar">
+ <param name="-apidir" value="${jdiff.tmp}" />
+ <param name="-apiname" value="${new.api}" />
+ </doclet>
+ </javadoc>
+
+ <!-- Do a diff against the previous version. -->
+ <javadoc packagenames="com.google.*"
+ destdir="${jdiff.tmp}"
+
docletpath="${jdiff.home}/jdiff.jar${path.separator}${jdiff.home}/xerces.jar"
+ maxmemory="512M"
+ sourcefiles="${jdiff.home}/Null.java"
+
classpath="lib/javax.inject.jar${path.separator}lib/aopalliance.jar">
+ <doclet name="jdiff.JDiff">
+ <param name="-oldapi" value="${old.api}"/>
+ <param name="-oldapidir" value="latest-api-diffs"/>
+ <param name="-javadocold"
value="http://google-guice.googlecode.com/svn/trunk/latest-api-diffs/${old.api}/javadoc/"/>
+ <param name="-newapi" value="${new.api}"/>
+ <param name="-newapidir" value="${jdiff.tmp}"/>
+ <param name="-javadocnew"
value="http://google-guice.googlecode.com/svn/trunk/latest-api-diffs/${new.api}/javadoc/"/>
+ <param name="-stats"/>
+ <param name="-docchanges"/>
+ </doclet>
+ </javadoc>
+ </target>
<target name="javadoc">
<javadoc packagenames="com.google.*"
destdir="build/docs"
docletpath="lib/build/doclava.jar"
bootclasspath="${java.home}/lib/rt.jar"
- maxmemory="512M">
+ maxmemory="512M"
+
classpath="lib/javax.inject.jar${path.separator}lib/aopalliance.jar">
<fileset dir="${src.dir}" defaultexcludes="yes">
<include name="com/google/**"/>
<exclude name="com/google/inject/internal/**"/>
@@ -122,13 +177,16 @@
<fileset dir="${throwingproviders.src.dir}"/>
<fileset dir="${multibindings.src.dir}"/>
<fileset dir="${persist.src.dir}"/>
+ <!-- TODO: this breaks Doclava for some reason
+ <fileset dir="${struts2.src.dir}"/> -->
<doclet name="com.google.doclava.Doclava">
<param name="-hdf"/> <param name="project.name"/> <param
name="Guice"/>
<param name="-since"/> <param name="lib/build/guice-1.0.xml"/>
<param name="Guice_1.0" />
- <param name="-since"/> <param name="lib/build/guice-2.0.xml"/>
<param name="Guice_2.0" />
- <param name="-apiversion" value="Guice_3.0"/>
+ <param name="-since"/> <param name="lib/build/guice-2.0.xml"/>
<param name="Guice_2.0" />
+ <param name="-apiversion" value="Guice_${new.api}"/>
<param name="-assetsdir" value="javadoc/assets"/>
+ <param name="-apixml" value="build/docs/guice-${new.api}.xml"/>
<!-- TODO: fix doclava federation
http://aopalliance.sourceforge.net/doc
http://www.springframework.org/docs/api/
=======================================
--- /trunk/uploadJavadocs.sh Sat Oct 30 07:39:42 2010
+++ /trunk/uploadJavadocs.sh Sun Oct 31 13:39:41 2010
@@ -1,7 +1,9 @@
+rm -rf build/docs
svn rm latest-javadoc javadoc
-svn ci -m "Removed old Javadocs."
+svn ci -m "Removed old Javadocs." latest-javadoc javadoc
ant javadoc
-mv build/docs/javadoc latest-javadoc
+cp -r build/docs/javadoc latest-javadoc
cp -r latest-javadoc javadoc
-svn add latest-javadoc javadoc
-svn ci -m "Added updated Javadocs."
+mv build/docs/guice-*.xml lib/build
+svn add latest-javadoc javadoc lib/build/guice-*.xml
+svn ci -m "Added updated Javadocs." latest-javadoc javadoc
lib/build/guice-*.xml
--
You received this message because you are subscribed to the Google Groups
"google-guice-dev" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/google-guice-dev?hl=en.
