aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config/jdk-defaults-amd64.conf2
-rw-r--r--config/jdk-defaults-hppa.conf (renamed from config/jdk-defaults.conf)2
-rw-r--r--config/jdk-defaults-ia64.conf2
-rw-r--r--config/jdk-defaults-mips.conf2
-rw-r--r--config/jdk-defaults-ppc.conf2
-rw-r--r--config/jdk-defaults-ppc64.conf2
-rw-r--r--config/jdk-defaults-sparc.conf2
-rw-r--r--config/jdk-defaults-x86.conf2
-rwxr-xr-xmake-release5
-rw-r--r--setup.py3
10 files changed, 20 insertions, 4 deletions
diff --git a/config/jdk-defaults-amd64.conf b/config/jdk-defaults-amd64.conf
new file mode 100644
index 0000000..703b9eb
--- /dev/null
+++ b/config/jdk-defaults-amd64.conf
@@ -0,0 +1,2 @@
+# This files contain the default support jdk's
+*= blackdown-jdk ibm-jdk-bin sun-jdk jrockit-jdk-bin
diff --git a/config/jdk-defaults.conf b/config/jdk-defaults-hppa.conf
index c5a8a36..fe21913 100644
--- a/config/jdk-defaults.conf
+++ b/config/jdk-defaults-hppa.conf
@@ -1,2 +1,2 @@
# This files contain the default support jdk's
-*= gentoo-sdk blackdown-jdk sun-jdk
+*= compaq-jdk
diff --git a/config/jdk-defaults-ia64.conf b/config/jdk-defaults-ia64.conf
new file mode 100644
index 0000000..8a9df26
--- /dev/null
+++ b/config/jdk-defaults-ia64.conf
@@ -0,0 +1,2 @@
+# This files contain the default support jdk's
+*= jrockit-bin-jdk
diff --git a/config/jdk-defaults-mips.conf b/config/jdk-defaults-mips.conf
new file mode 100644
index 0000000..c649d0e
--- /dev/null
+++ b/config/jdk-defaults-mips.conf
@@ -0,0 +1,2 @@
+# This files contain the default support jdk's
+*= blackdown-jdk
diff --git a/config/jdk-defaults-ppc.conf b/config/jdk-defaults-ppc.conf
new file mode 100644
index 0000000..31a46e3
--- /dev/null
+++ b/config/jdk-defaults-ppc.conf
@@ -0,0 +1,2 @@
+# This files contain the default support jdk's
+*= ibm-jdk-bin
diff --git a/config/jdk-defaults-ppc64.conf b/config/jdk-defaults-ppc64.conf
new file mode 100644
index 0000000..31a46e3
--- /dev/null
+++ b/config/jdk-defaults-ppc64.conf
@@ -0,0 +1,2 @@
+# This files contain the default support jdk's
+*= ibm-jdk-bin
diff --git a/config/jdk-defaults-sparc.conf b/config/jdk-defaults-sparc.conf
new file mode 100644
index 0000000..c649d0e
--- /dev/null
+++ b/config/jdk-defaults-sparc.conf
@@ -0,0 +1,2 @@
+# This files contain the default support jdk's
+*= blackdown-jdk
diff --git a/config/jdk-defaults-x86.conf b/config/jdk-defaults-x86.conf
new file mode 100644
index 0000000..703b9eb
--- /dev/null
+++ b/config/jdk-defaults-x86.conf
@@ -0,0 +1,2 @@
+# This files contain the default support jdk's
+*= blackdown-jdk ibm-jdk-bin sun-jdk jrockit-jdk-bin
diff --git a/make-release b/make-release
index 5b619f9..1805a2c 100755
--- a/make-release
+++ b/make-release
@@ -1,6 +1,9 @@
#!/bin/bash
version=${1}
-[[ -z ${version} ]] && version=2.0.0
+if [[ -z ${version} ]]; then
+ echo "I want a version"
+ exit 1
+fi
sed -i "s/version =.*/version = \'${version}\',/" setup.py
python setup.py sdist --formats=bztar
diff --git a/setup.py b/setup.py
index cf2acaa..455ddf2 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ import os
setup (
name = 'java-config',
- version = '2.0.5',
+ version = '2.0.6',
description = 'java enviroment configuration tool',
long_description = \
"""
@@ -21,7 +21,6 @@ setup (
scripts = ['src/java-config','src/depend-java-query','src/run-java-tool', 'src/gjl'],
data_files = [
('man/man1', ['man/java-config.1']),
- ('share/java-config/config', ['config/jdk-defaults.conf']),
('share/java-config/launcher', ['src/launcher.bash']),
('share/eselect/modules', ['src/eselect/java.eselect']),
('/etc/java-config/', ['config/jdk.conf','config/symlink-tools','config/compilers.conf']),