* Remove calls to fail().
svn path=/nixpkgs/branches/stdenv-updates/; revision=11690
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
source $stdenv/setup
|
||||
|
||||
ensureDir $out/jars || fail
|
||||
cp $src $out/jars/$jarname.jar || fail
|
||||
ensureDir $out/jars
|
||||
cp $src $out/jars/$jarname.jar
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
source $stdenv/setup
|
||||
|
||||
tar zxvf $src || fail
|
||||
tar zxvf $src
|
||||
|
||||
cd abc-* || fail
|
||||
cd abc-*
|
||||
|
||||
for p in $patches; do
|
||||
echo "applying patch $p"
|
||||
patch -p1 < $p || fail
|
||||
patch -p1 < $p
|
||||
done
|
||||
|
||||
cat > ant.settings <<EOF
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
source $stdenv/setup
|
||||
|
||||
tar zxvf $src || fail
|
||||
cd jasmin-* || fail
|
||||
tar zxvf $src
|
||||
cd jasmin-*
|
||||
|
||||
sed -e 's/<javac/<javac source="1.4"/' build.xml > build-tmp.xml
|
||||
mv build-tmp.xml build.xml
|
||||
@@ -18,7 +18,7 @@ jasmin.version=foo
|
||||
build.compiler=javac1.4
|
||||
EOF
|
||||
|
||||
ant jasmin-jar || fail
|
||||
ant jasmin-jar
|
||||
|
||||
ensureDir $out/jars/ || fail
|
||||
mv lib/jasminclasses-foo.jar $out/jars/jasmin.jar || fail
|
||||
ensureDir $out/jars/
|
||||
mv lib/jasminclasses-foo.jar $out/jars/jasmin.jar
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
source $stdenv/setup
|
||||
|
||||
tar zxvf $src || fail
|
||||
cd polyglot-* || fail
|
||||
tar zxvf $src
|
||||
cd polyglot-*
|
||||
|
||||
ant polyglot-jar || fail
|
||||
ant cup || fail
|
||||
ant polyglot-jar
|
||||
ant cup
|
||||
|
||||
ensureDir $out/jars/ || fail
|
||||
mv lib/java_cup.jar $out/jars/ || fail
|
||||
mv lib/polyglot*.jar $out/jars/ || fail
|
||||
ensureDir $out/jars/
|
||||
mv lib/java_cup.jar $out/jars/
|
||||
mv lib/polyglot*.jar $out/jars/
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
source $stdenv/setup
|
||||
|
||||
tar zxvf $src || fail
|
||||
cd soot-* || fail
|
||||
tar zxvf $src
|
||||
cd soot-*
|
||||
|
||||
export NIX_ANT_OPTS="$ANT_OPTS -Xmx200m"
|
||||
|
||||
@@ -13,7 +13,7 @@ release.loc=lib
|
||||
javaapi.url=http://java.sun.com/j2se/1.4.2/docs/api/
|
||||
EOF
|
||||
|
||||
ant classesjar || fail
|
||||
ant classesjar
|
||||
|
||||
ensureDir $out/jars/ || fail
|
||||
mv lib/sootclasses-foo.jar $out/jars/soot.jar || fail
|
||||
ensureDir $out/jars/
|
||||
mv lib/sootclasses-foo.jar $out/jars/soot.jar
|
||||
|
||||
@@ -5,7 +5,7 @@ unzip ${src} || true
|
||||
|
||||
# set the dynamic linker of unpack200, necessary for construct script
|
||||
echo "patching unpack200"
|
||||
patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" --set-rpath "" */bin/unpack200 || fail
|
||||
patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" --set-rpath "" */bin/unpack200
|
||||
|
||||
echo "constructing JDK and JRE installations"
|
||||
if test -z "$installjdk"; then
|
||||
|
||||
@@ -19,13 +19,11 @@ installPhase() {
|
||||
find $out/man -type f -exec gzip -9 {} \;
|
||||
|
||||
find $out -name \*.a -exec echo stripping {} \; \
|
||||
-exec strip -S {} \; || fail
|
||||
-exec strip -S {} \;
|
||||
|
||||
patchELF $out
|
||||
}
|
||||
|
||||
buildPhase=buildPhase
|
||||
installPhase=installPhase
|
||||
checkPhase="mk $MKFLAGS test.opt"
|
||||
|
||||
genericBuild
|
||||
|
||||
Reference in New Issue
Block a user