Updated pmd to latest version, changed PKGBUILD to build from source, and derived all shell scripts.

9 files changed, 163 insertions, 177 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d5c09aeaf5f0..0aca28382a01 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,19 @@
 pkgbase = pmd
 	pkgdesc = A java source code scanner for detecting possible bugs, dead code, overcomplicated expressions and more
-	pkgver = 5.1.2
+	pkgver = 5.2.3
 	pkgrel = 1
 	url = http://pmd.sourceforge.net/
 	arch = any
 	license = custom:BSD-style
+	license = Apache
+	checkdepends = maven
+	makedepends = maven
+	makedepends = unzip
 	depends = java-environment
-	source = http://sourceforge.net/projects/pmd/files/pmd/5.1.2/pmd-bin-5.1.2.zip
-	source = bgastviewer
-	source = cpd
-	source = cpdgui
-	source = pmd
-	source = pmd-designer
-	source = pmd-run
-	md5sums = 5cdd25c7d2eb0c3083ef353e58a94aea
-	md5sums = bb127d9c841bdae7c89a52c5a94e06cc
-	md5sums = 249cc68dbab0b512d7bf36255ca29c65
-	md5sums = 972d2ca7bfb874c26b7c17a4c3dad70c
-	md5sums = 94198cb540d22e06ef123c38d6672303
-	md5sums = 0fe4e9103ea1ad6ad4d01c484a5fb294
-	md5sums = a4cc2f616906fd617bf99fe784f2152f
+	source = http://sourceforge.net/projects/pmd/files/pmd/5.2.3/pmd-src-5.2.3.zip
+	source = run.patch
+	md5sums = c468e0f3e2ec85bd6decda5a4570e4ec
+	md5sums = d565ff42cfcb1110dc74c504b9a619ec
 
 pkgname = pmd
 
diff --git a/PKGBUILD b/PKGBUILD
index fbbddf50d7ec..534d6d189907 100755..100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,67 @@
 # Maintainer: David Pugnasse <david.pugnasse@gmail.com>
 pkgname=pmd
-pkgver=5.1.2
+pkgver=5.2.3
 pkgrel=1
 pkgdesc="A java source code scanner for detecting possible bugs, dead code, overcomplicated expressions and more"
 arch=('any')
 url="http://pmd.sourceforge.net/"
-license=('custom:BSD-style')
+license=('custom:BSD-style' 'Apache')
 depends=('java-environment')
-source=(http://sourceforge.net/projects/pmd/files/pmd/${pkgver}/pmd-bin-${pkgver}.zip
-bgastviewer cpd cpdgui pmd pmd-designer pmd-run)
-md5sums=('5cdd25c7d2eb0c3083ef353e58a94aea'
-         'bb127d9c841bdae7c89a52c5a94e06cc'
-         '249cc68dbab0b512d7bf36255ca29c65'
-         '972d2ca7bfb874c26b7c17a4c3dad70c'
-         '94198cb540d22e06ef123c38d6672303'
-         '0fe4e9103ea1ad6ad4d01c484a5fb294'
-         'a4cc2f616906fd617bf99fe784f2152f')
+makedepends=('maven' 'unzip')
+checkdepends=('maven')
+source=(
+    "http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/$pkgname-src-$pkgver.zip"
+    run.patch
+)
+md5sums=(
+    'c468e0f3e2ec85bd6decda5a4570e4ec'
+    'd565ff42cfcb1110dc74c504b9a619ec'
+)
+_M2_REPO=repo
+
+prepare() {
+    test -d "$_M2_REPO" || mkdir "$_M2_REPO"
+    cd "$pkgname-src-$pkgver"
+    mvn -Dmaven.repo.local="$srcdir/$_M2_REPO" \
+        -Dmaven.test.skip=true \
+        clean \
+        validate
+
+    patch -p1 -d "$pkgname-dist/src/main/scripts" < ../run.patch
+}
 
 build() {
-  install -dm755 ${pkgdir}/usr/share/{java,licenses}/${pkgname}
-  install -m644 $srcdir/${pkgname}-bin-${pkgver}/docs/license.html ${pkgdir}/usr/share/licenses/${pkgname}/license.html
-  install -m644 $srcdir/${pkgname}-bin-${pkgver}/lib/*.jar -t ${pkgdir}/usr/share/java/${pkgname}
+    cd "$pkgname-src-$pkgver"
+    mvn -Dmaven.repo.local="$srcdir/$_M2_REPO" \
+        -Dmaven.test.skip=true \
+        compile
 
-  install -Dm755 bgastviewer ${pkgdir}/usr/bin/bgastviewer
-  install -Dm755 cpd ${pkgdir}/usr/bin/cpd
-  install -Dm755 cpdgui ${pkgdir}/usr/bin/cpdgui
-  install -Dm755 pmd ${pkgdir}/usr/bin/pmd
-  install -Dm755 pmd-designer ${pkgdir}/usr/bin/pmd-designer
-  install -Dm755 pmd-run ${pkgdir}/usr/bin/pmd-run
+    for BIN in bgastviewer cpd cpdgui pmd pmd-designer; do
+        printf "#%c/bin/sh\nexec /usr/bin/$pkgname-run $BIN \"\$@\"\n" ! > "../$BIN"
+    done
 }
 
-# vim:set ts=2 sw=2 et:
+check() {
+    cd "$pkgname-src-$pkgver"
+    mvn -Dmaven.repo.local="$srcdir/$_M2_REPO" \
+        test
+}
+
+package() {
+    cd "$pkgname-src-$pkgver"
+    mvn -Dmaven.repo.local="$srcdir/$_M2_REPO" \
+        -Dmaven.test.skip=true \
+        verify
+    unzip -o "$pkgname-dist/target/$pkgname-bin-$pkgver.zip" -d "$srcdir"
+
+    cd "$srcdir/$pkgname-bin-$pkgver"
+    install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+    install -Dm755 bin/run.sh "$pkgdir/usr/bin/$pkgname-run"
+    for BIN in bgastviewer cpd cpdgui pmd pmd-designer; do
+        install -Dm755 "../$BIN" "$pkgdir/usr/bin/$BIN"
+    done
+    cd lib
+    for JAR in *.jar; do
+        install -Dm644 "$JAR" "$pkgdir/usr/share/java/$pkgname/$JAR"
+    done
+}
diff --git a/bgastviewer b/bgastviewer
deleted file mode 100755
index e067beac3b87..000000000000
--- a/bgastviewer
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/usr/bin/pmd-run bgastviewer "$@"
diff --git a/cpd b/cpd
deleted file mode 100755
index 62ddebae83a3..000000000000
--- a/cpd
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/usr/bin/pmd-run cpd "$@"
diff --git a/cpdgui b/cpdgui
deleted file mode 100755
index bb3b523b845f..000000000000
--- a/cpdgui
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/usr/bin/pmd-run cpdgui "$@"
diff --git a/pmd b/pmd
deleted file mode 100755
index f41813460276..000000000000
--- a/pmd
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/bin/sh
-
-if [ $# -eq 1 -a \( "x$1" = "x-l" -o "x$1" = "x--list-rulesets" \) ]; then
-	cat <<EOF
-PMD 5.0.0 rulesets
-==================
-
-long names                                  short names
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-rulesets/ecmascript/basic.xml               ecmascript-basic
-rulesets/ecmascript/braces.xml              ecmascript-braces
-rulesets/ecmascript/unnecessary.xml         ecmascript-unnecessary
-
-rulesets/internal/all-ecmascript.xml        internal-all-ecmascript
-rulesets/internal/all-java.xml              internal-all-java
-
-rulesets/java/android.xml                   java-android
-rulesets/java/basic.xml                     java-basic
-rulesets/java/braces.xml                    java-braces
-rulesets/java/clone.xml                     java-clone
-rulesets/java/codesize.xml                  java-codesize
-rulesets/java/comments.xml                  java-comments
-rulesets/java/controversial.xml             java-controversial
-rulesets/java/coupling.xml                  java-coupling
-rulesets/java/design.xml                    java-design
-rulesets/java/empty.xml                     java-empty
-rulesets/java/finalizers.xml                java-finalizers
-rulesets/java/imports.xml                   java-imports
-rulesets/java/j2ee.xml                      java-j2ee
-rulesets/java/javabeans.xml                 java-javabeans
-rulesets/java/junit.xml                     java-junit
-rulesets/java/logging-jakarta-commons.xml   java-logging-jakarta-commons
-rulesets/java/logging-java.xml              java-logging-java
-rulesets/java/migrating.xml                 java-migrating
-rulesets/java/migrating_to_13.xml           java-migrating_to_13
-rulesets/java/migrating_to_14.xml           java-migrating_to_14
-rulesets/java/migrating_to_15.xml           java-migrating_to_15
-rulesets/java/migrating_to_junit4.xml       java-migrating_to_junit4
-rulesets/java/naming.xml                    java-naming
-rulesets/java/optimizations.xml             java-optimizations
-rulesets/java/strictexception.xml           java-strictexception
-rulesets/java/strings.xml                   java-strings
-rulesets/java/sunsecure.xml                 java-sunsecure
-rulesets/java/typeresolution.xml            java-typeresolution
-rulesets/java/unnecessary.xml               java-unnecessary
-rulesets/java/unusedcode.xml                java-unusedcode
-
-rulesets/jsp/basic-jsf.xml                  jsp-basic-jsf
-rulesets/jsp/basic.xml                      jsp-basic
-
-rulesets/releases/33.xml                    releases-33
-rulesets/releases/34.xml                    releases-34
-rulesets/releases/35.xml                    releases-35
-rulesets/releases/36.xml                    releases-36
-rulesets/releases/37-jsp.xml                releases-37-jsp
-rulesets/releases/37.xml                    releases-37
-rulesets/releases/38.xml                    releases-38
-rulesets/releases/39.xml                    releases-39
-rulesets/releases/40rc1.xml                 releases-40rc1
-rulesets/releases/41.xml                    releases-41
-rulesets/releases/42.xml                    releases-42
-rulesets/releases/50.xml                    releases-50
-
-rulesets/xml/basic.xml                      xml-basic
-
-rulesets/xsl/xpath.xml                      xsl-xpath
-EOF
-	exit 2
-fi
-
-/usr/bin/pmd-run pmd "$@"
diff --git a/pmd-designer b/pmd-designer
deleted file mode 100755
index e8a5e8dadad0..000000000000
--- a/pmd-designer
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/usr/bin/pmd-run designer "$@"
diff --git a/pmd-run b/pmd-run
deleted file mode 100755
index bcc30a78ba93..000000000000
--- a/pmd-run
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/bash
-
-usage() {
-	echo "Usage:"
-	echo "    $(basename $0) <application-name> [-h|-v] ..."
-	echo ""
-	echo "application-name: valid options are: $(valid_app_options)"
-	echo "-h print this help"
-	echo "-v display PMD's version"
-}
-
-valid_app_options () {
-	echo "pmd, cpd, cpdgui, designer, bgastviewer"
-}
-
-java_heapsize_settings() {
-	local heapsize=${HEAPSIZE:-512m}
-	case "${heapsize}" in
-		[1-9]*[mgMG])
-			readonly HEAPSIZE="-Xmx${heapsize}"
-			;;
-		'')
-			;;
-		*)
-			echo "HEAPSIZE '${HEAPSIZE}' unknown (try: 512m)"
-			exit 1
-			;;
-	esac
-}
-
-readonly APPNAME="${1}"
-if [ -z "${APPNAME}" ]; then
-	usage
-	exit 1
-fi
-shift
-
-case "${APPNAME}" in
-  "pmd")
-		readonly CLASSNAME="net.sourceforge.pmd.PMD"
-		;;
-  "cpd")
-		readonly CLASSNAME="net.sourceforge.pmd.cpd.CPD"
-		;;
-  "designer")
-		readonly CLASSNAME="net.sourceforge.pmd.util.designer.Designer"
-		;;
-  "bgastviewer")
-		readonly CLASSNAME="net.sourceforge.pmd.util.viewer.Viewer"
-		;;
-  "cpdgui")
-		readonly CLASSNAME="net.sourceforge.pmd.cpd.GUI"
-		;;
-  *)
-		echo "${APPNAME} is NOT a valid application name, valid options are:$(valid_app_options)"
-		;;
-esac
-
-java_heapsize_settings
-
-$JAVA_HOME/bin/java "${HEAPSIZE}" -Djava.ext.dirs='/usr/share/java/pmd' "${CLASSNAME}" "${@}"
diff --git a/run.patch b/run.patch
new file mode 100644
index 000000000000..7fec56c9fcde
--- /dev/null
+++ b/run.patch
@@ -0,0 +1,99 @@
+--- bin/run.sh	2015-01-07 06:40:19.614130823 -0500
++++ bin/run.sh	2015-01-07 06:42:04.648794800 -0500
+@@ -5,7 +5,7 @@
+     echo "    $(basename $0) <application-name> [-h|-v] ..."
+     echo ""
+     echo "application-name: valid options are: $(valid_app_options)"
+-	echo "-h print this help"
++    echo "-h print this help"
+     echo "-v display PMD's version"
+ }
+ 
+@@ -13,37 +13,6 @@
+     echo "pmd, cpd, cpdgui, designer, bgastviewer"
+ }
+ 
+-is_cygwin() {
+-    case "$(uname)" in
+-        CYGWIN*)
+-            readonly cygwin=true
+-            ;;
+-    esac
+-    # OS specific support.  $var _must_ be set to either true or false.
+-    if [ -z ${cygwin} ] ; then
+-        readonly cygwin=false
+-    fi
+-}
+-
+-cygwin_paths() {
+-    # For Cygwin, switch paths to Windows format before running java
+-    if ${cygwin} ; then
+-        JAVA_HOME=$(cygpath --windows "${JAVA_HOME}")
+-        classpath=$(cygpath --path --windows "${classpath}")
+-        DIRECTORY=$(cygpath --windows "${DIRECTORY}")
+-    fi
+-}
+-
+-convert_cygwin_vars() {
+-    # If cygwin, convert to Unix form before manipulating
+-    if ${cygwin} ; then
+-        [ -n "${JAVA_HOME}" ] &&
+-            JAVA_HOME=$(cygpath --unix "${JAVA_HOME}")
+-        [ -n "${CLASSPATH}" ] &&
+-            CLASSPATH=$(cygpath --path --unix "${CLASSPATH}")
+-    fi
+-}
+-
+ java_heapsize_settings() {
+     local heapsize=${HEAPSIZE}
+     case "${heapsize}" in
+@@ -58,24 +27,6 @@
+     esac
+ }
+ 
+-
+-set_lib_dir() {
+-  if [ -z ${LIB_DIR} ]; then
+-    local script_dir=$(dirname ${0})
+-    local cwd="${PWD}"
+-
+-    cd "${script_dir}/../lib"
+-    readonly LIB_DIR=$(pwd -P)
+-    cd "${cwd}"
+-  fi
+-}
+-
+-check_lib_dir() {
+-  if [ ! -e "${LIB_DIR}" ]; then
+-    echo "The jar directory [${LIB_DIR}] does not exist"
+-  fi
+-}
+-
+ readonly APPNAME="${1}"
+ if [ -z "${APPNAME}" ]; then
+     usage
+@@ -104,23 +55,6 @@
+     ;;
+ esac
+ 
+-is_cygwin
+-
+-set_lib_dir
+-check_lib_dir
+-
+-convert_cygwin_vars
+-
+-classpath=$CLASSPATH
+-
+-cd "${CWD}"
+-
+-for jarfile in ${LIB_DIR}/*.jar; do
+-    classpath=$classpath:$jarfile
+-done
+-
+-cygwin_paths
+-
+ java_heapsize_settings
+ 
+-java ${HEAPSIZE} -cp "${classpath}" "${CLASSNAME}" ${@}
++java ${HEAPSIZE} -Djava.ext.dirs=/usr/share/java/pmd "${CLASSNAME}" ${@}