diff options
| -rw-r--r-- | dev-java/swt/README | 42 | ||||
| -rwxr-xr-x[-rw-r--r--] | dev-java/swt/runtest.sh | 25 | ||||
| -rwxr-xr-x | dev-java/swt/runtest2.sh | 18 |
3 files changed, 20 insertions, 65 deletions
diff --git a/dev-java/swt/README b/dev-java/swt/README index 4d0ebf8..345e696 100644 --- a/dev-java/swt/README +++ b/dev-java/swt/README @@ -1,47 +1,9 @@ -======== Instructions for >=dev-java-swt-3.2.2-r1 ========= -To run the test, execute runtest2.sh <swt-slot> +To run the test of xulrunner integration, execute runtest.sh <swt-slot> -The test should load http://www.eclipse.org to a window. This window does not -seem to close properly so just pkill -9 java if you don't have anything else -java running. - -You should test swt built agains firefox, seamonkey and xulrunner (if applicable) -by remerging with various USE flags. It can be built and only against one of the -three, so specifying multiple flags will result in effectively one, with this -priority: -xulrunner > firefox > seamonkey - -So the test scenario for version that supports all three could look like this: -USE="seamonkey -firefox -xulrunner" emerge swt -runtest2.sh -pkill -9 java -USE="firefox -xulrunner" emerge swt -runtest2.sh -pkill -9 java -USE="xulrunner" emerge swt -runtest2.sh -pkill -9 java - - -======== Instructions for <=dev-java-swt-3.2.2 ========= - -runtest.sh takes one argument that is the browser implementation swt was built -against. So for examples: - runtest.sh xulrunner - -(xulrunner) is the default +The swt should be built with USE=xulrunner. The test should load http://www.eclipse.org to a window. This window does not seem to close properly so just pkill -9 java if you don't have anything else java running. -You should test both seamonkey and xulrunner, like this: -USE="seamonkey -xulrunner" emerge swt -runtest.sh seamonkey -pkill -9 java -USE="xulrunner -seamonkey" emerge swt -runtest.sh xulrunner -pkill -9 java - -(if you put both in USE, it builds against xulrunner) diff --git a/dev-java/swt/runtest.sh b/dev-java/swt/runtest.sh index d212ecf..3d506bb 100644..100755 --- a/dev-java/swt/runtest.sh +++ b/dev-java/swt/runtest.sh @@ -1,7 +1,18 @@ -moz="${1}" -[[ -z ${moz} ]] && moz=xulrunner -[[ ! -e Snippet128.class ]] && javac -classpath $(java-config -p swt-3) Snippet128.java -#LD_PRELOAD="/usr/lib/${moz}/libxul.so" \ -MOZILLA_FIVE_HOME="/usr/lib/${moz}/" \ -LD_LIBRARY_PATH="$(java-config -i swt-3):${MOZILLA_FIVE_HOME}" \ - java -Djava-library.path=$(java-config -i swt-3) -cp $(java-config -p swt-3):. Snippet128 +#!/bin/bash +if [[ ${#} != 1 ]]; then + echo "Usage: $0 <swt-slot>" + echo "Example: $0 3.4" + exit +fi + +SLOT="${1}" + +echo "compiling..." +[[ ! -e Snippet128.class ]] && javac -classpath $(java-config -p swt-${SLOT}) Snippet128.java + +export CLASSPATH="." +gjl_package=swt-${SLOT} +gjl_main="Snippet128" +echo "Running..." +GJL_DEBUG=1 +source /usr/share/java-config-2/launcher/launcher.bash diff --git a/dev-java/swt/runtest2.sh b/dev-java/swt/runtest2.sh deleted file mode 100755 index 3d506bb..0000000 --- a/dev-java/swt/runtest2.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -if [[ ${#} != 1 ]]; then - echo "Usage: $0 <swt-slot>" - echo "Example: $0 3.4" - exit -fi - -SLOT="${1}" - -echo "compiling..." -[[ ! -e Snippet128.class ]] && javac -classpath $(java-config -p swt-${SLOT}) Snippet128.java - -export CLASSPATH="." -gjl_package=swt-${SLOT} -gjl_main="Snippet128" -echo "Running..." -GJL_DEBUG=1 -source /usr/share/java-config-2/launcher/launcher.bash |