rpms/sinjdoc/devel sinjdoc-annotations.patch, NONE, 1.1 sinjdoc-autotools-changes.patch, NONE, 1.1 sinjdoc.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Thomas Fitzsimmons (fitzsim)
fedora-extras-commits at redhat.com
Thu Mar 15 22:16:54 UTC 2007
Author: fitzsim
Update of /cvs/extras/rpms/sinjdoc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15376
Modified Files:
.cvsignore sources
Added Files:
sinjdoc-annotations.patch sinjdoc-autotools-changes.patch
sinjdoc.spec
Log Message:
* Mon Mar 15 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 0.5-1
- Initial release.
sinjdoc-annotations.patch:
--- NEW FILE sinjdoc-annotations.patch ---
diff -x install-sh -x Makefile.in -x configure -ur ../sinjdoc-0.5.orig/autogen.sh ./autogen.sh
--- ../sinjdoc-0.5.orig/autogen.sh 2003-05-07 23:46:05.000000000 -0400
+++ ./autogen.sh 2007-01-22 14:11:17.000000000 -0500
@@ -8,7 +8,7 @@
aclocal-1.6
#autoheader
automake-1.6 --add-missing
-autoconf2.50
+autoconf
test -f config.cache && rm -f config.cache
set +x
diff -x install-sh -x Makefile.in -x configure -ur ../sinjdoc-0.5.orig/Makefile.am ./Makefile.am
--- ../sinjdoc-0.5.orig/Makefile.am 2003-07-31 21:14:09.000000000 -0400
+++ ./Makefile.am 2007-02-13 10:23:46.000000000 -0500
@@ -7,6 +7,7 @@
SUBDIRS = src
+pkgdatadir = /usr/share/java
pkgdata_DATA = @PACKAGE_TARNAME at .jar
# used to be $(shell find classes -name "*.class")
diff -x install-sh -x Makefile.in -x configure -ur ../sinjdoc-0.5.orig/src/html/Makefile.am ./src/html/Makefile.am
--- ../sinjdoc-0.5.orig/src/html/Makefile.am 2003-07-31 21:14:10.000000000 -0400
+++ ./src/html/Makefile.am 2007-02-08 15:34:57.000000000 -0500
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
MAINTAINERCLEANFILES = Makefile.in
-AM_JAVACFLAGS = -g -source 1.5 -warnunchecked
+AM_JAVACFLAGS = -g -source 1.5
SUBDIRS = templates
EXTRA_DIST := package.html
diff -x install-sh -x Makefile.in -x configure -ur ../sinjdoc-0.5.orig/src/lexer/Identifier.java ./src/lexer/Identifier.java
--- ../sinjdoc-0.5.orig/src/lexer/Identifier.java 2003-05-07 23:48:35.000000000 -0400
+++ ./src/lexer/Identifier.java 2007-02-10 23:18:21.000000000 -0500
@@ -2,7 +2,7 @@
import java_cup.runtime.Symbol;
-class Identifier extends Token {
+public class Identifier extends Token {
String identifier;
public Identifier(String identifier) { this.identifier=identifier; }
diff -x install-sh -x Makefile.in -x configure -ur ../sinjdoc-0.5.orig/src/lexer/Lexer.java ./src/lexer/Lexer.java
--- ../sinjdoc-0.5.orig/src/lexer/Lexer.java 2003-07-31 21:14:10.000000000 -0400
+++ ./src/lexer/Lexer.java 2007-02-10 23:20:47.000000000 -0500
@@ -234,6 +234,9 @@
case '/':
case '^':
case '%':
+ case '@':
+ // case '#':
+ // case '`':
return getOperator();
case '\'':
return getCharLiteral();
@@ -390,6 +393,8 @@
case '~':
case '?':
case ':':
+ case '@':
+ // case '`':
return new Operator(new String(new char[] {first}));
// doubled operators
case '+':
diff -x install-sh -x Makefile.in -x configure -ur ../sinjdoc-0.5.orig/src/lexer/Makefile.am ./src/lexer/Makefile.am
--- ../sinjdoc-0.5.orig/src/lexer/Makefile.am 2003-07-31 21:14:10.000000000 -0400
+++ ./src/lexer/Makefile.am 2007-02-08 15:35:19.000000000 -0500
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
MAINTAINERCLEANFILES = Makefile.in
-AM_JAVACFLAGS = -g -source 1.5 -warnunchecked
+AM_JAVACFLAGS = -g -source 1.5
EXTRA_DIST := package.html
CLEANFILES = Sym.java
diff -x install-sh -x Makefile.in -x configure -ur ../sinjdoc-0.5.orig/src/lexer/Operator.java ./src/lexer/Operator.java
--- ../sinjdoc-0.5.orig/src/lexer/Operator.java 2003-05-07 23:48:35.000000000 -0400
+++ ./src/lexer/Operator.java 2007-02-10 23:22:32.000000000 -0500
@@ -55,5 +55,6 @@
op_table.put("<<=", new Integer(Sym.LSHIFTEQ));
op_table.put(">>=", new Integer(Sym.RSHIFTEQ));
op_table.put(">>>=", new Integer(Sym.URSHIFTEQ));
+ op_table.put("@", new Integer(Sym.AT));
}
}
diff -x install-sh -x Makefile.in -x configure -ur ../sinjdoc-0.5.orig/src/lexer/Sym.java ./src/lexer/Sym.java
--- ../sinjdoc-0.5.orig/src/lexer/Sym.java 2004-01-24 18:21:47.000000000 -0500
+++ ./src/lexer/Sym.java 2007-02-10 22:02:33.000000000 -0500
@@ -1,7 +1,7 @@
//----------------------------------------------------
// The following code was generated by CUP v0.10k
-// Sat Jan 24 18:21:46 EST 2004
+// Sat Feb 10 21:56:09 EST 2007
//----------------------------------------------------
package net.cscott.sinjdoc.lexer;
@@ -9,111 +9,112 @@
/** CUP generated class containing symbol constants. */
public class Sym {
/* terminals */
+ public static final int AT = 94;
public static final int SHORT = 4;
- public static final int IDENTIFIER = 12;
+ public static final int STRICTFP = 103;
public static final int ANDEQ = 91;
public static final int GT = 71;
public static final int IMPLEMENTS = 37;
- public static final int CONST = 100;
- public static final int STRICTFP = 102;
+ public static final int CONST = 101;
+ public static final int IDENTIFIER = 12;
public static final int NOTEQ = 76;
- public static final int PLUSEQ = 86;
- public static final int ENUM = 105;
- public static final int RBRACK = 11;
- public static final int CATCH = 56;
+ public static final int LSHIFT = 67;
+ public static final int ENUM = 106;
+ public static final int STATIC = 28;
public static final int COMMA = 16;
- public static final int RBRACE = 18;
+ public static final int CATCH = 56;
public static final int THROW = 54;
- public static final int RPAREN = 21;
- public static final int LBRACK = 10;
+ public static final int RSHIFT = 68;
public static final int LT = 70;
public static final int ANDAND = 80;
+ public static final int PLUSPLUS = 59;
public static final int OROR = 81;
+ public static final int VOLATILE = 34;
public static final int DOUBLE = 9;
- public static final int LBRACE = 17;
- public static final int TRANSIENT = 33;
- public static final int LPAREN = 20;
public static final int XOREQ = 92;
- public static final int PROTECTED = 26;
- public static final int INTEGER_LITERAL = 94;
+ public static final int INTEGER_LITERAL = 95;
public static final int NOT = 64;
+ public static final int MINUSMINUS = 60;
public static final int FINAL = 30;
public static final int FLOAT = 8;
- public static final int GOTO = 101;
+ public static final int GOTO = 102;
public static final int URSHIFTEQ = 90;
- public static final int PACKAGE = 23;
+ public static final int FINALLY = 57;
public static final int COMP = 63;
public static final int EQ = 19;
- public static final int BOOLEAN_LITERAL = 96;
public static final int MOD = 66;
+ public static final int IMPORT = 24;
public static final int CLASS = 35;
+ public static final int MULTEQ = 83;
public static final int SUPER = 41;
- public static final int ABSTRACT = 29;
- public static final int NATIVE = 31;
- public static final int LONG = 6;
+ public static final int DEFAULT = 47;
public static final int PLUS = 61;
- public static final int QUESTION = 82;
+ public static final int LONG = 6;
+ public static final int STRING_LITERAL = 99;
+ public static final int THROWS = 39;
public static final int WHILE = 49;
- public static final int EXTENDS = 36;
- public static final int INTERFACE = 42;
public static final int CHAR = 7;
public static final int BOOLEAN = 2;
- public static final int SWITCH = 45;
- public static final int DO = 48;
+ public static final int PUBLIC = 25;
+ public static final int RETURN = 53;
public static final int FOR = 50;
+ public static final int DO = 48;
public static final int RSHIFTEQ = 89;
- public static final int VOID = 38;
public static final int DIV = 65;
- public static final int PUBLIC = 25;
- public static final int RETURN = 53;
+ public static final int VOID = 38;
public static final int MULT = 15;
- public static final int ELSE = 44;
+ public static final int SWITCH = 45;
public static final int TRY = 55;
+ public static final int ELSE = 44;
public static final int GTEQ = 73;
public static final int BREAK = 51;
public static final int DOT = 13;
+ public static final int INTERFACE = 42;
public static final int INT = 5;
- public static final int NULL_LITERAL = 99;
- public static final int THROWS = 39;
[...25254 lines suppressed...]
EXTRA_DIST := package.html Java15.cup
JAVAROOT=$(top_builddir)/classes
diff -x install-sh -x Makefile.in -x configure -ur ../sinjdoc-0.5.orig/src/parser/PSeeTag.java ./src/parser/PSeeTag.java
--- ../sinjdoc-0.5.orig/src/parser/PSeeTag.java 2003-07-31 21:14:10.000000000 -0400
+++ ./src/parser/PSeeTag.java 2007-02-11 23:07:33.000000000 -0500
@@ -63,8 +63,8 @@
(contents, JREF, "java package, class, or member reference");
this.label = pair.right;
this.classPart = pair.left.group(1);
- this.memberNamePart = pair.left.group(2);
- this.memberArgsPart = pair.left.group(3);
+ this.memberNamePart = pair.left.group(3);
+ this.memberArgsPart = pair.left.group(4);
this.tagContext=tagContext;
}
}
@@ -84,7 +84,7 @@
// space or it must be the end of the string. This keeps us from skipping
// malformed trailing bits.
private static final Pattern JREF = Pattern.compile
- ("^\\s*(?:([^#\\s\\(,\\)]+)|(?=#))(?:#([^\\(,\\)\\s\\.]+)(\\([^\\(\\)]*\\))?)?(?:\\z|\\s+)");
+ ("\\s*([_a-zA-Z][_a-zA-Z0-9.]*)?([#]([_a-zA-Z][_a-zA-Z0-9]*)\\s*(\\([_a-zA-Z0-9.,\\s]*\\))?)?");
public boolean isTrailing() { return name=="see"; }
diff -x install-sh -x Makefile.in -x configure -ur ../sinjdoc-0.5.orig/src/parser/Sym.java ./src/parser/Sym.java
--- ../sinjdoc-0.5.orig/src/parser/Sym.java 2004-01-24 18:21:47.000000000 -0500
+++ ./src/parser/Sym.java 2007-02-11 20:32:33.000000000 -0500
@@ -1,7 +1,7 @@
//----------------------------------------------------
// The following code was generated by CUP v0.10k
-// Sat Jan 24 18:21:46 EST 2004
+// Sun Feb 11 20:32:32 EST 2007
//----------------------------------------------------
package net.cscott.sinjdoc.parser;
@@ -9,111 +9,112 @@
/** CUP generated class containing symbol constants. */
public class Sym {
/* terminals */
+ public static final int AT = 94;
public static final int SHORT = 4;
- public static final int IDENTIFIER = 12;
+ public static final int STRICTFP = 103;
public static final int ANDEQ = 91;
public static final int GT = 71;
public static final int IMPLEMENTS = 37;
- public static final int CONST = 100;
- public static final int STRICTFP = 102;
+ public static final int CONST = 101;
+ public static final int IDENTIFIER = 12;
public static final int NOTEQ = 76;
- public static final int PLUSEQ = 86;
- public static final int ENUM = 105;
- public static final int RBRACK = 11;
- public static final int CATCH = 56;
+ public static final int LSHIFT = 67;
+ public static final int ENUM = 106;
+ public static final int STATIC = 28;
public static final int COMMA = 16;
- public static final int RBRACE = 18;
+ public static final int CATCH = 56;
public static final int THROW = 54;
- public static final int RPAREN = 21;
- public static final int LBRACK = 10;
+ public static final int RSHIFT = 68;
public static final int LT = 70;
public static final int ANDAND = 80;
+ public static final int PLUSPLUS = 59;
public static final int OROR = 81;
+ public static final int VOLATILE = 34;
public static final int DOUBLE = 9;
- public static final int LBRACE = 17;
- public static final int TRANSIENT = 33;
- public static final int LPAREN = 20;
public static final int XOREQ = 92;
- public static final int PROTECTED = 26;
- public static final int INTEGER_LITERAL = 94;
+ public static final int INTEGER_LITERAL = 95;
public static final int NOT = 64;
+ public static final int MINUSMINUS = 60;
public static final int FINAL = 30;
public static final int FLOAT = 8;
- public static final int GOTO = 101;
+ public static final int GOTO = 102;
public static final int URSHIFTEQ = 90;
- public static final int PACKAGE = 23;
+ public static final int FINALLY = 57;
public static final int COMP = 63;
public static final int EQ = 19;
- public static final int BOOLEAN_LITERAL = 96;
public static final int MOD = 66;
+ public static final int IMPORT = 24;
public static final int CLASS = 35;
+ public static final int MULTEQ = 83;
public static final int SUPER = 41;
- public static final int ABSTRACT = 29;
- public static final int NATIVE = 31;
- public static final int LONG = 6;
+ public static final int DEFAULT = 47;
public static final int PLUS = 61;
- public static final int QUESTION = 82;
+ public static final int LONG = 6;
+ public static final int STRING_LITERAL = 99;
+ public static final int THROWS = 39;
public static final int WHILE = 49;
- public static final int EXTENDS = 36;
- public static final int INTERFACE = 42;
public static final int CHAR = 7;
public static final int BOOLEAN = 2;
- public static final int SWITCH = 45;
- public static final int DO = 48;
+ public static final int PUBLIC = 25;
+ public static final int RETURN = 53;
public static final int FOR = 50;
+ public static final int DO = 48;
public static final int RSHIFTEQ = 89;
- public static final int VOID = 38;
public static final int DIV = 65;
- public static final int PUBLIC = 25;
- public static final int RETURN = 53;
+ public static final int VOID = 38;
public static final int MULT = 15;
- public static final int ELSE = 44;
+ public static final int SWITCH = 45;
public static final int TRY = 55;
+ public static final int ELSE = 44;
public static final int GTEQ = 73;
public static final int BREAK = 51;
public static final int DOT = 13;
+ public static final int INTERFACE = 42;
public static final int INT = 5;
- public static final int NULL_LITERAL = 99;
- public static final int THROWS = 39;
- public static final int STRING_LITERAL = 98;
+ public static final int EXTENDS = 36;
+ public static final int NULL_LITERAL = 100;
+ public static final int QUESTION = 82;
public static final int EQEQ = 75;
- public static final int EOF = 0;
+ public static final int NATIVE = 31;
public static final int SEMICOLON = 14;
+ public static final int EOF = 0;
public static final int THIS = 40;
- public static final int DEFAULT = 47;
- public static final int MULTEQ = 83;
- public static final int IMPORT = 24;
+ public static final int ABSTRACT = 29;
+ public static final int BOOLEAN_LITERAL = 97;
public static final int MINUS = 62;
public static final int LTEQ = 72;
public static final int OR = 79;
- public static final int error = 1;
public static final int URSHIFT = 69;
+ public static final int error = 1;
public static final int SYNCHRONIZED = 32;
public static final int DIVEQ = 84;
+ public static final int PACKAGE = 23;
public static final int LSHIFTEQ = 88;
- public static final int FINALLY = 57;
public static final int CONTINUE = 52;
public static final int INSTANCEOF = 74;
public static final int IF = 43;
public static final int MODEQ = 85;
- public static final int MINUSMINUS = 60;
- public static final int ASSERT = 103;
+ public static final int ASSERT = 104;
public static final int COLON = 22;
- public static final int CHARACTER_LITERAL = 97;
+ public static final int PROTECTED = 26;
+ public static final int CHARACTER_LITERAL = 98;
+ public static final int LPAREN = 20;
+ public static final int TRANSIENT = 33;
+ public static final int LBRACE = 17;
public static final int OREQ = 93;
- public static final int VOLATILE = 34;
public static final int CASE = 46;
- public static final int PLUSPLUS = 59;
+ public static final int LBRACK = 10;
public static final int NEW = 58;
- public static final int RSHIFT = 68;
+ public static final int RPAREN = 21;
+ public static final int RBRACE = 18;
public static final int BYTE = 3;
public static final int AND = 77;
public static final int PRIVATE = 27;
- public static final int ELLIPSIS = 104;
- public static final int STATIC = 28;
- public static final int LSHIFT = 67;
+ public static final int ELLIPSIS = 105;
+ public static final int RBRACK = 11;
public static final int XOR = 78;
- public static final int FLOATING_POINT_LITERAL = 95;
+ public static final int FLOATING_POINT_LITERAL = 96;
public static final int MINUSEQ = 87;
+ public static final int PLUSEQ = 86;
}
sinjdoc-autotools-changes.patch:
--- NEW FILE sinjdoc-autotools-changes.patch ---
diff -ur ../sinjdoc-0.5.orig/configure.ac ./configure.ac
--- ../sinjdoc-0.5.orig/configure.ac 2004-01-24 18:12:05.000000000 -0500
+++ ./configure.ac 2007-02-16 01:34:16.000000000 -0500
@@ -16,7 +16,7 @@
CLS=f$$
echo "abstract class $CLS extends java.util.AbstractList<Integer> { }" \
> /tmp/$CLS.java
-for jc in jikes javac ${JCC} ${JSR14DISTR:+$JSR14DISTR/scripts/javac} \
+for jc in ecj jikes javac ${JCC} ${JSR14DISTR:+$JSR14DISTR/scripts/javac} \
${HOME}/jsr14-ea-2_4a1/scripts/javac ; do
if $jc -d /tmp -source 1.5 /tmp/$CLS.java 1>/dev/null 2>/dev/null; then
JAVAC="$jc"
diff -ur ../sinjdoc-0.5.orig/Makefile.am ./Makefile.am
--- ../sinjdoc-0.5.orig/Makefile.am 2003-07-31 21:14:09.000000000 -0400
+++ ./Makefile.am 2007-02-15 23:22:11.000000000 -0500
@@ -13,8 +13,6 @@
@PACKAGE_TARNAME at .jar: $(shell find classes -type f)
echo "Manifest-Version: 1.0" > manifest
echo "Main-Class: net.cscott.sinjdoc.Main" >> manifest
-# echo "Class-Path: lib/jutil.jar lib/cup.jar" >> manifest
- echo "Class-Path: lib/cup.jar" >> manifest
echo "Implementation-Version: $(VERSION)" >> manifest
cd classes && $(JAR) -cfm ../$@ ../manifest net
-$(RM) manifest
--- NEW FILE sinjdoc.spec ---
Name: sinjdoc
Version: 0.5
Release: 1%{?dist}
Summary: Documentation generator for Java source code
Group: Development/Tools
License: GPL
URL: http://www.cag.lcs.mit.edu/~cananian/Projects/GJ/sinjdoc-latest/sinjdoc-0.5.tar.gz
Source0: sinjdoc-0.5.tar.gz
Patch0: sinjdoc-annotations.patch
Patch1: sinjdoc-autotools-changes.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf
BuildRequires: automake16
BuildRequires: eclipse-ecj >= 3.2.1
BuildRequires: java_cup >= 0.10
Requires: java_cup >= 0.10
Requires: libgcj >= 4.1.2
# GCJ native compilation support
BuildRequires: gcc-java >= 4.0.2
BuildRequires: java-gcj-compat-devel >= 1.0.70
Requires(post): java-gcj-compat >= 1.0.70
Requires(postun): java-gcj-compat >= 1.0.70
%description
This package contains Sinjdoc a tool for generating Javadoc-style
documentation from Java source code
%prep
%setup -q
%patch0 -p0
%patch1 -p0
%build
automake-1.6
autoconf
%configure
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
cat > sinjdoc << EOF
#!/bin/sh
%{_bindir}/gij -classpath \
%{_javadir}/java_cup-runtime.jar:%{_javadir}/sinjdoc.jar \
net.cscott.sinjdoc.Main \$@
EOF
install -d 755 $RPM_BUILD_ROOT%{_bindir}
install -m 655 sinjdoc $RPM_BUILD_ROOT%{_bindir}/sinjdoc
install -d 755 $RPM_BUILD_ROOT%{_javadir}
install -D -m 644 sinjdoc.jar $RPM_BUILD_ROOT%{_javadir}/sinjdoc.jar
aot-compile-rpm
%clean
rm -rf $RPM_BUILD_ROOT
%post
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%postun
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README
%{_bindir}/sinjdoc
%{_javadir}/sinjdoc.jar
%{_libdir}/gcj/%{name}/sinjdoc*
%changelog
* Mon Mar 15 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 0.5-1
- Initial release.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sinjdoc/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 15 Mar 2007 06:41:11 -0000 1.1
+++ .cvsignore 15 Mar 2007 22:16:22 -0000 1.2
@@ -0,0 +1 @@
+sinjdoc-0.5.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sinjdoc/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 15 Mar 2007 06:41:11 -0000 1.1
+++ sources 15 Mar 2007 22:16:22 -0000 1.2
@@ -0,0 +1 @@
+0cdbf81de3367bd47ae3db8b658c9f0c sinjdoc-0.5.tar.gz
More information about the fedora-extras-commits
mailing list