Re: [Cp-tools-discuss] gjdoc patches

[Julian Scheid]

I re-patched gjdocxml2html.sh, which worked, but the patch for 
Driver.java was rejected, and cvs status shows that my Driver.java is up 
to date. Something went wrong here. Anyway, I hope it worked this time.

BTW, why is it that I cannot change to the gjdoc directory (or one 
above, for that matter) and simply do a "patch < oneofyourpatches.diff"? 
Patch won't find the individual files to be patched, and ask me to 
manually specify each file's location. As this incident shows, it's easy 
then to screw the thing with a typo.

Do I perhaps need to supply some magical parameter? I tried -p with 
various values, but it didn't help.

Julian


Ross Burton wrote:
> I just updated my CVS and noticed that I still have some files marked as
> modified.
>
> Driver.java.diff: allow private methods to be in the javadoc
> gjdocxml2html.sh.diff: add a missing \ so that the script actually works
>
> Ross
>
>
> ------------------------------------------------------------------------
>
> Index: bin/gjdocxml2html.sh
> ===================================================================
> RCS file: /cvsroot/cp-tools/gjdoc/bin/gjdocxml2html.sh,v
> retrieving revision 1.7
> diff -u -r1.7 gjdocxml2html.sh
> --- bin/gjdocxml2html.sh        6 Oct 2002 23:26:59 -0000       1.7
> +++ bin/gjdocxml2html.sh        12 Dec 2002 11:05:02 -0000
> @@ -71,7 +71,7 @@
>  # Start the xslt process
>  
>  xsltproc \
> -    --novalid
> +    --novalid \
>      --param verbose "1" \
>      --param now "'`date`'" \
>      --param copyrightfile "'../classpath-copyright.xml'" \
>
>
> ------------------------------------------------------------------------
>
> Index: src/gnu/classpath/tools/doclets/xmldoclet/Driver.java
> ===================================================================
> RCS file: 
> /cvsroot/cp-tools/gjdoc/src/gnu/classpath/tools/doclets/xmldoclet/Driver.java,v
> retrieving revision 1.9
> diff -u -r1.9 Driver.java
> --- src/gnu/classpath/tools/doclets/xmldoclet/Driver.java       12 May 2002 
> 02:49:29 -0000      1.9
> +++ src/gnu/classpath/tools/doclets/xmldoclet/Driver.java       12 Dec 2002 
> 11:05:08 -0000
> @@ -380,6 +380,8 @@
>          access="protected";
>        else if (programElementDoc.isPackagePrivate()) 
>  	 access="package";
> +      else if (programElementDoc.isPrivate()) 
> +	 access="private";
>        else
>          throw new RuntimeException("Huh? "+programElementDoc+" is neither public, 
> protected, protected nor package protected.");
>        printAtomTag(level, "access scope=\""+access+"\"");
>
>
> ------------------------------------------------------------------------
>
> _______________________________________________
> Cp-tools-discuss mailing list
> address@hidden
> http://mail.gnu.org/mailman/listinfo/cp-tools-discuss