more script adjustments Project: http://git-wip-us.apache.org/repos/asf/ant/repo Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/36ec27d3 Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/36ec27d3 Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/36ec27d3
Branch: refs/heads/master Commit: 36ec27d367153739922315d038fba350281c2bc0 Parents: ff1e521 Author: Gintas Grigelionis <[email protected]> Authored: Sun Dec 24 09:18:43 2017 +0100 Committer: Gintas Grigelionis <[email protected]> Committed: Sun Dec 24 09:18:43 2017 +0100 ---------------------------------------------------------------------- bootstrap.sh | 4 ++-- release.sh | 22 ++++++++++------------ 2 files changed, 12 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/36ec27d3/bootstrap.sh ---------------------------------------------------------------------- diff --git a/bootstrap.sh b/bootstrap.sh index 35f1fb8..d1013d1 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -63,9 +63,9 @@ fi if [ -z "$JAVAC" ]; then if [ -n "$JAVA_HOME" ]; then if [ -x "$JAVA_HOME/sh/javac" ]; then - JAVAC=${JAVA_HOME}/sh/javac; + JAVAC=${JAVA_HOME}/sh/javac else - JAVAC=${JAVA_HOME}/bin/javac; + JAVAC=${JAVA_HOME}/bin/javac fi else JAVAC=javac http://git-wip-us.apache.org/repos/asf/ant/blob/36ec27d3/release.sh ---------------------------------------------------------------------- diff --git a/release.sh b/release.sh index 249ccb9..d1043d5 100755 --- a/release.sh +++ b/release.sh @@ -20,24 +20,24 @@ rm -rf bootstrap build dist distribution java-repository unset ANT_HOME # 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 - CYGWIN*) cygwin=true ;; + CYGWIN*) cygwin=true;; Darwin*) darwin=true;; - MINGW*) mingw=true ;; - Linux) linux=true ;; + MINGW*) mingw=true;; + Linux) linux=true;; esac -if $cygwin ; then +if $cygwin; then export JAVA_HOME="/cygdrive/c/Program Files/Java/jdk1.5.0_22" JDK_VERSION=1.5 fi if $darwin; then export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home JDK_VERSION=1.6 -fi +fi if $linux; then export JAVA_HOME=/usr/lib/jvm/java-6-openjdk JDK_VERSION=1.6 @@ -50,8 +50,6 @@ echo ANT_HOME=$ANT_HOME echo JAVA_HOME=$JAVA_HOME which java echo running build under JDK $JDK_VERSION -./build.sh dist-lite +./build.sh dist-lite echo running the tests and doing the distribution dist/bin/ant -nouserlib -lib lib/optional run-tests distribution - -
