Browse Source

more script adjustments

master
Gintas Grigelionis 7 years ago
parent
commit
36ec27d367
2 changed files with 12 additions and 14 deletions
  1. +2
    -2
      bootstrap.sh
  2. +10
    -12
      release.sh

+ 2
- 2
bootstrap.sh View File

@@ -63,9 +63,9 @@ fi
if [ -z "$JAVAC" ]; then if [ -z "$JAVAC" ]; then
if [ -n "$JAVA_HOME" ]; then if [ -n "$JAVA_HOME" ]; then
if [ -x "$JAVA_HOME/sh/javac" ]; then if [ -x "$JAVA_HOME/sh/javac" ]; then
JAVAC=${JAVA_HOME}/sh/javac;
JAVAC=${JAVA_HOME}/sh/javac
else else
JAVAC=${JAVA_HOME}/bin/javac;
JAVAC=${JAVA_HOME}/bin/javac
fi fi
else else
JAVAC=javac JAVAC=javac


+ 10
- 12
release.sh View File

@@ -20,24 +20,24 @@
rm -rf bootstrap build dist distribution java-repository rm -rf bootstrap build dist distribution java-repository
unset ANT_HOME unset ANT_HOME
# OS specific support. $var _must_ be set to either true or false. # OS specific support. $var _must_ be set to either true or false.
cygwin=false;
darwin=false;
mingw=false;
linux=false;
cygwin=false
darwin=false
mingw=false
linux=false
case "`uname`" in case "`uname`" in
CYGWIN*) cygwin=true ;;
CYGWIN*) cygwin=true;;
Darwin*) darwin=true;; Darwin*) darwin=true;;
MINGW*) mingw=true ;;
Linux) linux=true ;;
MINGW*) mingw=true;;
Linux) linux=true;;
esac esac
if $cygwin ; then
if $cygwin; then
export JAVA_HOME="/cygdrive/c/Program Files/Java/jdk1.5.0_22" export JAVA_HOME="/cygdrive/c/Program Files/Java/jdk1.5.0_22"
JDK_VERSION=1.5 JDK_VERSION=1.5
fi fi
if $darwin; then if $darwin; then
export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
JDK_VERSION=1.6 JDK_VERSION=1.6
fi
fi
if $linux; then if $linux; then
export JAVA_HOME=/usr/lib/jvm/java-6-openjdk export JAVA_HOME=/usr/lib/jvm/java-6-openjdk
JDK_VERSION=1.6 JDK_VERSION=1.6
@@ -50,8 +50,6 @@ echo ANT_HOME=$ANT_HOME
echo JAVA_HOME=$JAVA_HOME echo JAVA_HOME=$JAVA_HOME
which java which java
echo running build under JDK $JDK_VERSION echo running build under JDK $JDK_VERSION
./build.sh dist-lite
./build.sh dist-lite
echo running the tests and doing the distribution echo running the tests and doing the distribution
dist/bin/ant -nouserlib -lib lib/optional run-tests distribution dist/bin/ant -nouserlib -lib lib/optional run-tests distribution



Loading…
Cancel
Save