[pkg-java] r4024 - trunk/aspectj/debian

[tgg at alioth.debian.org]

Author: tgg
Date: 2007-08-17 10:15:40 +0000 (Fri, 17 Aug 2007)
New Revision: 4024

Added:
   trunk/aspectj/debian/aj
   trunk/aspectj/debian/aj5
   trunk/aspectj/debian/ajdoc
Modified:
   trunk/aspectj/debian/ajbrowser
   trunk/aspectj/debian/ajc
   trunk/aspectj/debian/aspectj.dirs
   trunk/aspectj/debian/rules
Log:
write wrapper scripts for AspectJ programs


Added: trunk/aspectj/debian/aj
===================================================================
--- trunk/aspectj/debian/aj	                        (rev 0)
+++ trunk/aspectj/debian/aj	2007-08-17 10:15:40 UTC (rev 4024)
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+AJPATH=/usr/share/java/aspectjweaver.jar
+
+exec "${JAVACMD:=java}" -classpath "$AJPATH${CLASSPATH:+:$CLASSPATH}" \
+  -Djava.system.class.loader=org.aspectj.weaver.loadtime.WeavingURLClassLoader \
+  "-Daj.class.path=$ASPECTPATH${CLASSPATH:+:$CLASSPATH}" \
+  "-Daj.aspect.path=$ASPECTPATH" \
+  "$@"

Added: trunk/aspectj/debian/aj5
===================================================================
--- trunk/aspectj/debian/aj5	                        (rev 0)
+++ trunk/aspectj/debian/aj5	2007-08-17 10:15:40 UTC (rev 4024)
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+AJPATH=/usr/share/java/aspectjweaver.jar
+
+exec "${JAVACMD:=java}" -classpath "$AJPATH${CLASSPATH:+:$CLASSPATH}" \
+  -javaagent:$AJPATH "$@"

Modified: trunk/aspectj/debian/ajbrowser
===================================================================
--- trunk/aspectj/debian/ajbrowser	2007-08-15 21:28:42 UTC (rev 4023)
+++ trunk/aspectj/debian/ajbrowser	2007-08-17 10:15:40 UTC (rev 4024)
@@ -1,18 +1,7 @@
 #!/bin/sh
 
-if [ "$JAVA_HOME" = "" ] ; then 
-	echo "set JAVA_HOME for you jdk."
-	exit 1
-fi
-if [ "$JAVA_OPTS" = "" ] ; then JAVA_OPTS="-Xmx64M"
-fi
+AJPATH=/usr/share/java/aspectjrt.jar:/usr/share/java/aspectjtools.jar
 
-
-for i in /usr/share/aspectj/lib/*.jar
-do
-	export AJPATH=$i:${AJPATH}
-done
-
-
-"$JAVA_HOME/bin/java" -classpath ${AJPATH}:${CLASSPATH} ${JAVA_OPTS} org.aspectj.tools.ajbrowser.Main "$@"
-
+exec "${JAVACMD:=java}" -classpath "$AJPATH${CLASSPATH:+:$CLASSPATH}" \
+  "${JAVA_OPTS:=-Xmx64M}" \
+  org.aspectj.tools.ajbrowser.Main "$@"

Modified: trunk/aspectj/debian/ajc
===================================================================
--- trunk/aspectj/debian/ajc	2007-08-15 21:28:42 UTC (rev 4023)
+++ trunk/aspectj/debian/ajc	2007-08-17 10:15:40 UTC (rev 4024)
@@ -1,16 +1,7 @@
 #!/bin/sh
 
-if [ "$JAVA_HOME" = "" ] ; then 
-	echo "set JAVA_HOME for you jdk."
-	exit 1
-fi
-if [ "$JAVA_OPTS" = "" ] ; then JAVA_OPTS="-Xmx64M"
-fi
+AJPATH=/usr/share/java/aspectjrt.jar:/usr/share/java/aspectjtools.jar
 
-
-for i in /usr/share/aspectj/lib/*.jar
-do
-	export AJPATH=$i:${AJPATH}
-done
-
-"$JAVA_HOME/bin/java" -classpath ${AJPATH}:${CLASSPATH} ${JAVA_OPTS} org.aspectj.tools.ajc.Main "$@"
+exec "${JAVACMD:=java}" -classpath "$AJPATH${CLASSPATH:+:$CLASSPATH}" \
+  "${JAVA_OPTS:=-Xmx64M}" \
+  org.aspectj.tools.ajc.Main "$@"

Added: trunk/aspectj/debian/ajdoc
===================================================================
--- trunk/aspectj/debian/ajdoc	                        (rev 0)
+++ trunk/aspectj/debian/ajdoc	2007-08-17 10:15:40 UTC (rev 4024)
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+guess_java_home() {
+    if test "a$JAVA_HOME" = "a"; then
+	JAVACMD=${JAVACMD:-`which java`}
+	JAVACMD=`readlink -f $JAVACMD`
+
+	if echo "$JAVACMD" | grep -E '^/usr/bin/gij-' >/dev/null;
+	then
+	    # gij special case
+	    JAVA_HOME=/usr/lib/jvm/java-gcj
+	else
+	    JAVA_HOME=${JAVACMD%%/jre/bin/java}
+	    JAVA_HOME=${JAVA_HOME%%/bin/java}
+	fi
+
+	if ! test -f "$JAVA_HOME/lib/tools.jar"; then
+	    echo "$0: could not guess JAVA_HOME! Please define it" >&2
+	    exit 1
+	fi
+    fi
+}
+
+AJPATH=/usr/share/java/aspectjtools.jar
+
+guess_java_home
+
+if test "a$JAVA_HOME" = "a/usr/lib/jvm/java-gcj";
+then
+    TOOLS_JAR=/usr/share/java/gnu-classpath-tools-gjdoc.jar:"$JAVA_HOME/lib/tools.jar"
+else
+    TOOLS_JAR="$JAVA_HOME/lib/tools.jar"
+fi
+
+exec "$JAVACMD" -classpath "$AJPATH:$TOOLS_JAR${CLASSPATH:+:$CLASSPATH}" \
+  ${JAVA_OPTS:=-Xmx64M} \
+  org.aspectj.tools.ajdoc.Main "$@"

Modified: trunk/aspectj/debian/aspectj.dirs
===================================================================
--- trunk/aspectj/debian/aspectj.dirs	2007-08-15 21:28:42 UTC (rev 4023)
+++ trunk/aspectj/debian/aspectj.dirs	2007-08-17 10:15:40 UTC (rev 4024)
@@ -1 +1,2 @@
+usr/bin
 usr/share/java

Modified: trunk/aspectj/debian/rules
===================================================================
--- trunk/aspectj/debian/rules	2007-08-15 21:28:42 UTC (rev 4023)
+++ trunk/aspectj/debian/rules	2007-08-17 10:15:40 UTC (rev 4024)
@@ -13,7 +13,10 @@
 
 MKDIR := mkdir -p
 LN_S := ln -sf
+INSTALL := install -m 755
 
+AJ_SCRIPTS := debian/ajc debian/ajbrowser debian/ajdoc debian/aj debian/aj5
+
 AJ_ANT_HOME := $(MODULES)/lib/ant
 AJ_ANT_JARS := ant.jar ant-junit.jar
 AJ_XML_JARS := xercesImpl.jar xml-apis.jar
@@ -69,6 +72,9 @@
 	$(DEB_ANT_INVOKE) clean
 	rm -f debian/stamp-bootstrap
 
+install/aspectj::
+	$(INSTALL) -t debian/aspectj/usr/bin $(AJ_SCRIPTS)
+
 clean::
 	rm -Rf $(AJ_ANT_HOME)
 	rm -Rf $(AJ_JUNIT_HOME)