[SCM] CodeNarc: Groovy library that provides static analysis features for Groovy code branch, master, updated. debian/0.17-1
Damien Raude-Morvan
drazzib at debian.org
Thu Dec 20 23:41:24 UTC 2012
The following commit has been merged in the master branch:
commit e685238d148c23dc94853b033bb13cbf4897dbe1
Author: Damien Raude-Morvan <drazzib at debian.org>
Date: Mon Aug 20 23:18:00 2012 +0200
Team upload.
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..845ca06
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.pc
diff --git a/debian/build.properties b/debian/build.properties
index 16a8c1c..551acb5 100644
--- a/debian/build.properties
+++ b/debian/build.properties
@@ -1,5 +1,6 @@
+dir.resources=../src/main/resources
dir.build=../target
-dir.src=../src/main/groovy
+dir.src=../src/main
target=1.5
source=1.5
diff --git a/debian/build.xml b/debian/build.xml
index 2fa8e6f..ef3b8b6 100644
--- a/debian/build.xml
+++ b/debian/build.xml
@@ -35,7 +35,7 @@
destfile="${dir.build}/CodeNarc.jar"
basedir="${dir.build}/classes"
includes="**">
- <fileset dir="${dir.src}/../resources"/>
+ <fileset dir="${dir.resources}"/>
<manifest>
<attribute name="Class-Path" value="log4j-1.2.jar GMetrics.jar" />
</manifest>
diff --git a/debian/changelog b/debian/changelog
index 2183085..ba886b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ codenarc (0.17-1) UNRELEASED; urgency=low
* Team upload.
* New upstream release.
+ * d/patches/gmetrics_interface_sourcecode.diff: Drop, fixed upstream.
+ * d/patches/groovy_18.diff: Fix Groovy 1.8 compat.
+ * d/classpath-debian: Add ant.jar.
+ * d/build.{xml,properties}: Small directory fixes for new upstream.
-- Damien Raude-Morvan <drazzib at debian.org> Mon, 20 Aug 2012 23:06:53 +0200
diff --git a/debian/classpath-debian b/debian/classpath-debian
index 04f62b8..3324c19 100644
--- a/debian/classpath-debian
+++ b/debian/classpath-debian
@@ -1,3 +1,4 @@
+usr/share/java/ant.jar
usr/share/java/groovy-all.jar
usr/share/java/log4j-1.2.jar
usr/share/java/GMetrics.jar
diff --git a/debian/control b/debian/control
index 42b982a..728ecd6 100644
--- a/debian/control
+++ b/debian/control
@@ -4,9 +4,15 @@ Uploaders: Miguel Landaeta <miguel at miguel.cc>
DM-Upload-Allowed: yes
Section: java
Priority: optional
-Build-Depends: debhelper (>= 7.0.50~), groovy, ant, javahelper,
- maven-repo-helper, liblog4j1.2-java, libgmetrics-groovy-java, default-jdk-doc,
- default-jdk
+Build-Depends: ant,
+ debhelper (>= 7.0.50~),
+ default-jdk,
+ default-jdk-doc,
+ groovy,
+ javahelper,
+ libgmetrics-groovy-java,
+ liblog4j1.2-java,
+ maven-repo-helper
Standards-Version: 3.9.3
Homepage: http://codenarc.sourceforge.net/
Vcs-Git: git://git.debian.org/git/pkg-java/codenarc.git
@@ -14,8 +20,8 @@ Vcs-Browser: http://git.debian.org/?p=pkg-java/codenarc.git
Package: libcodenarc-groovy-java
Architecture: all
-Depends: groovy, ant, liblog4j1.2-java, libgmetrics-groovy-java, ${misc:Depends}
-Suggests: libcodenarc-groovy-java-doc
+Depends: ant, groovy, libgmetrics-groovy-java, liblog4j1.2-java, ${misc:Depends}
+Suggests: libcodenarc-groovy-java-doc
Description: Groovy library that provides static analysis features for Groovy code
CodeNarc is a static analysis tool for Groovy source code,
enabling monitoring and enforcement of many coding standards
diff --git a/debian/patches/gmetrics_interface_sourcecode.diff b/debian/patches/gmetrics_interface_sourcecode.diff
deleted file mode 100644
index 65d178b..0000000
--- a/debian/patches/gmetrics_interface_sourcecode.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Add missing method to implementation of GMetrics SourceCode
-Author: Miguel Landaeta <miguel at miguel.cc>
-Bug-Debian: http://bugs.debian.org/655807
-Forwarded: not-needed
-Last-Update: 2012-06-15
-
---- codenarc-0.13.orig/src/main/groovy/org/codenarc/rule/size/GMetricsSourceCodeAdapter.groovy
-+++ codenarc-0.13/src/main/groovy/org/codenarc/rule/size/GMetricsSourceCodeAdapter.groovy
-@@ -60,4 +60,8 @@
- int getLineNumberForCharacterIndex(int charIndex) {
- codeNarcSourceCode.getLineNumberForCharacterIndex(charIndex)
- }
-+
-+ boolean isValid() {
-+ throw new UnsupportedOperationException("isValid")
-+ }
- }
diff --git a/debian/patches/groovy_18.diff b/debian/patches/groovy_18.diff
new file mode 100644
index 0000000..6dea06f
--- /dev/null
+++ b/debian/patches/groovy_18.diff
@@ -0,0 +1,79 @@
+Description: Fix compat with Groovy 1.8
+ RegexExpression and method
+ GroovyCodeVisitor.visitRegexExpression(RegexExpression expression) was
+ removed in 1.8
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2012-08-29
+Forwarded: no
+--- a/src/main/groovy/org/codenarc/results/FileResults.groovy
++++ b/src/main/groovy/org/codenarc/results/FileResults.groovy
+@@ -63,7 +63,7 @@
+ * @param recursive - true if the returned count should include subdirectories as well; defaults to true
+ * @return the number of violations with the specified priority
+ */
+- @Override
++ //@Override
+ int getNumberOfViolationsWithPriority(int priority, boolean recursive=true) {
+ violations.sum(0) { violation -> violation.rule.priority == priority ? 1 : 0}
+ }
+@@ -73,7 +73,7 @@
+ * @param recursive - true if the returned count should include subdirectories as well
+ * @return the total number of files (with or without violations)
+ */
+- @Override
++ //@Override
+ int getTotalNumberOfFiles(boolean recursive=true) {
+ 1
+ }
+@@ -83,7 +83,7 @@
+ * @param recursive - ignored; defaults to true
+ * @return the number of files containing violations
+ */
+- @Override
++ //@Override
+ int getNumberOfFilesWithViolations(boolean recursive=true) {
+ violations.empty ? 0 : 1
+ }
+@@ -100,4 +100,4 @@
+ String toString() {
+ "FileResults($path) $violations"
+ }
+-}
+\ No newline at end of file
++}
+--- a/src/main/java/org/codenarc/rule/AbstractFieldVisitor.java
++++ b/src/main/java/org/codenarc/rule/AbstractFieldVisitor.java
+@@ -404,7 +404,7 @@
+ throw new UnsupportedOperationException();
+ }
+
+- @Override
++ //@Override
+ public final void visitRegexExpression(RegexExpression expression) {
+ throw new UnsupportedOperationException();
+ }
+--- a/src/main/java/org/codenarc/rule/AbstractMethodCallExpressionVisitor.java
++++ b/src/main/java/org/codenarc/rule/AbstractMethodCallExpressionVisitor.java
+@@ -399,9 +399,9 @@
+ super.visitFieldExpression(expression);
+ }
+
+- @Override
++ //@Override
+ public final void visitRegexExpression(RegexExpression expression) {
+- super.visitRegexExpression(expression);
++ //super.visitRegexExpression(expression);
+ }
+
+ @Override
+--- a/src/main/java/org/codenarc/rule/AbstractMethodVisitor.java
++++ b/src/main/java/org/codenarc/rule/AbstractMethodVisitor.java
+@@ -432,7 +432,7 @@
+ throw new UnsupportedOperationException();
+ }
+
+- @Override
++ //@Override
+ public final void visitRegexExpression(RegexExpression expression) {
+ throw new UnsupportedOperationException();
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 186bbd9..ccd678a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-gmetrics_interface_sourcecode.diff
+groovy_18.diff
--
CodeNarc: Groovy library that provides static analysis features for Groovy code
More information about the pkg-java-commits
mailing list