packages: charles/charles.sh, charles/charles.spec - figure out which jars ...

[glen]

Author: glen                         Date: Fri May 20 06:22:06 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- figure out which jars to use at runtime

---- Files affected:
packages/charles:
   charles.sh (1.1 -> 1.2) , charles.spec (1.13 -> 1.14) 

---- Diffs:

================================================================
Index: packages/charles/charles.sh
diff -u packages/charles/charles.sh:1.1 packages/charles/charles.sh:1.2
--- packages/charles/charles.sh:1.1	Fri Oct 30 09:58:02 2009
+++ packages/charles/charles.sh	Fri May 20 08:22:01 2011
@@ -1,13 +1,30 @@
 #!/bin/sh
+set -e
 
-# set $JAVACMD
+# set JAVA_HOME from jpackage-utils if available
+if [ ! -f /usr/share/java-utils/java-functions ]; then
+	echo >&2 "jpackage-utils not found."
+	exit 1
+fi
 . /usr/share/java-utils/java-functions
-set_javacmd
 
+MAIN_CLASS=com.xk72.charles.gui.MainWithClassLoader
+LIBDIR=/usr/lib/charles
 CLASSPATH=$(build-classpath-directory /usr/share/java/charles)
 
-$JAVACMD \
-	-cp $CLASSPATH \
-	-Dcharles.config="~/.charles.config" \
-	-Djava.library.path=/usr/lib/charles \
-	com.xk72.charles.gui.MainWithClassLoader
+# activation: can't be added to classpath:
+# Exception in thread "main" java.lang.SecurityException: Prohibited package name: java.lang
+# but apparently not needed if part of jdk
+for jar in oro; do
+	jar=$(find-jar $jar)
+	CLASSPATH=$CLASSPATH:$jar
+done
+
+# extra options
+OPTIONS="\
+	-Dcharles.config=~/.charles.config \
+	-Djava.library.path=$LIBDIR
+"
+
+# this will call exec java
+run "$@"

================================================================
Index: packages/charles/charles.spec
diff -u packages/charles/charles.spec:1.13 packages/charles/charles.spec:1.14
--- packages/charles/charles.spec:1.13	Fri May 20 08:02:01 2011
+++ packages/charles/charles.spec	Fri May 20 08:22:01 2011
@@ -1,13 +1,11 @@
 # $Revision$, $Date$
 # I have no access to full version, so I'm packaging trial version only.
 # If you have full tarball, add with(out?)_trial bcond
-# TODO:
-# - activation.jar link becames invalid if BR jdk and runtime jdk are different as it linked from jvm dir
 
 # Conditional build:
 %bcond_without	trial		# build from full tarball
 
-%define		rel	0.2
+%define		rel	0.3
 %include	/usr/lib/rpm/macros.java
 Summary:	Web debugging proxy application
 Name:		charles
@@ -20,9 +18,6 @@
 NoSource:	0
 Source1:	%{name}.sh
 URL:		http://www.charlesproxy.com/
-BuildRequires:	java(jaf)
-BuildRequires:	java-oro >= 1.4
-BuildRequires:	jpackage-utils
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	java(jaf)
@@ -47,12 +42,6 @@
 rm lib/jakarta-oro-2.0.8.jar
 rm lib/activation.jar
 
-%build
-for jar in activation oro; do
-	jar=$(find-jar $jar)
-	ln -s $jar lib
-done
-
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_javadir}/%{name},%{_libdir}/%{name},%{_bindir}}
@@ -81,6 +70,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2011/05/20 06:22:01  glen
+- figure out which jars to use at runtime
+
 Revision 1.13  2011/05/20 06:02:01  glen
 - use system activation, oro
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/charles/charles.sh?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/charles/charles.spec?r1=1.13&r2=1.14&f=u