public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleaning up the java naming conventions

Browse Source 
svn path=/nixpkgs/trunk/; revision=3871
This commit is contained in:
Martin Bravenboer
2005-09-17 23:58:51 +00:00
parent 3919e7593a
commit 4c70ef7e5d
27 changed files with 88 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/version-management/subversion-1.1.x/builder.sh
+3 -3
View File
@@ -1,4 +1,4 @@
buildInputs="$openssl $zlib $db4 $httpd $swig $python $j2sdk $expat $patch"
buildInputs="$openssl $zlib $db4 $httpd $swig $python $jdk $expat $patch"
. $stdenv/setup
configureFlags="--without-gdbm --disable-static"
@@ -21,7 +21,7 @@ if test -n "$pythonBindings" -o -n "$javaSwigBindings"; then
fi
if test "$javahlBindings"; then
configureFlags="--enable-javahl --with-jdk=$j2sdk $configureFlags"
configureFlags="--enable-javahl --with-jdk=$jdk $configureFlags"
fi
installFlags="$makeFlags"
@@ -48,7 +48,7 @@ postInstall() {
make javahl
make install-javahl
mkdir -p $out/share/doc/$name
$j2sdk/bin/javadoc -d $out/share/doc/$name \
$jdk/bin/javadoc -d $out/share/doc/$name \
-windowtitle "JavaHL Subversion Bindings" \
-link http://java.sun.com/j2se/1.4.2/docs/api/ \
subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/*.java
pkgs/applications/version-management/subversion-1.1.x/default.nix
+4 -4
View File
@@ -6,7 +6,7 @@
, javaSwigBindings ? false
, javahlBindings ? false
, stdenv, fetchurl
, openssl ? null, httpd ? null, db4 ? null, expat, swig ? null, j2sdk ? null, zlib ? null
, openssl ? null, httpd ? null, db4 ? null, expat, swig ? null, jdk ? null, zlib ? null
}:
assert expat != null;
@@ -15,7 +15,7 @@ assert httpServer -> httpd != null && httpd.expat == expat;
assert sslSupport -> openssl != null && (httpServer -> httpd.openssl == openssl);
assert pythonBindings -> swig != null && swig.pythonSupport;
assert javaSwigBindings -> swig != null && swig.javaSupport;
assert javahlBindings -> j2sdk != null;
assert javahlBindings -> jdk != null;
assert compressionSupport -> zlib != null;
stdenv.mkDerivation {
@@ -38,8 +38,8 @@ stdenv.mkDerivation {
db4 = if localServer then db4 else null;
swig = if pythonBindings || javaSwigBindings then swig else null;
python = if pythonBindings then swig.python else null;
j2sdk = if javaSwigBindings then swig.j2sdk else
if javahlBindings then j2sdk else null;
jdk = if javaSwigBindings then swig.jdk else
if javahlBindings then jdk else null;
inherit expat localServer httpServer sslSupport
pythonBindings javaSwigBindings javahlBindings;
pkgs/applications/version-management/subversion-1.2.x/builder.sh
+3 -3
View File
@@ -1,4 +1,4 @@
buildInputs="$openssl $zlib $db4 $httpd $swig $python $j2sdk $expat $patch"
buildInputs="$openssl $zlib $db4 $httpd $swig $python $jdk $expat $patch"
. $stdenv/setup
configureFlags="--without-gdbm --disable-static"
@@ -23,7 +23,7 @@ if test -n "$pythonBindings"; then
fi
if test "$javahlBindings"; then
configureFlags="--enable-javahl --with-jdk=$j2sdk $configureFlags"
configureFlags="--enable-javahl --with-jdk=$jdk $configureFlags"
fi
installFlags="$makeFlags"
@@ -39,7 +39,7 @@ postInstall() {
make javahl
make install-javahl
mkdir -p $out/share/doc/$name
$j2sdk/bin/javadoc -d $out/share/doc/$name \
$jdk/bin/javadoc -d $out/share/doc/$name \
-windowtitle "JavaHL Subversion Bindings" \
-link http://java.sun.com/j2se/1.4.2/docs/api/ \
subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/*.java
pkgs/applications/version-management/subversion-1.2.x/default.nix
+3 -3
View File
@@ -5,7 +5,7 @@
, pythonBindings ? false
, javahlBindings ? false
, stdenv, fetchurl
, openssl ? null, httpd ? null, db4 ? null, expat, swig ? null, j2sdk ? null, zlib ? null
, openssl ? null, httpd ? null, db4 ? null, expat, swig ? null, jdk ? null, zlib ? null
}:
assert expat != null;
@@ -13,7 +13,7 @@ assert localServer -> db4 != null;
assert httpServer -> httpd != null && httpd.expat == expat;
assert sslSupport -> openssl != null && (httpServer -> httpd.openssl == openssl);
assert pythonBindings -> swig != null && swig.pythonSupport;
assert javahlBindings -> j2sdk != null;
assert javahlBindings -> jdk != null;
assert compressionSupport -> zlib != null;
stdenv.mkDerivation {
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
db4 = if localServer then db4 else null;
swig = if pythonBindings then swig else null;
python = if pythonBindings then swig.python else null;
j2sdk = if javahlBindings then j2sdk else null;
jdk = if javahlBindings then jdk else null;
inherit expat localServer httpServer sslSupport
pythonBindings javahlBindings;