Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 36693200D78 for ; Wed, 27 Dec 2017 13:31:49 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 35659160C20; Wed, 27 Dec 2017 12:31:49 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 7F1F3160C3A for ; Wed, 27 Dec 2017 13:31:48 +0100 (CET) Received: (qmail 59987 invoked by uid 500); 27 Dec 2017 12:31:47 -0000 Mailing-List: contact notifications-help@ant.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ant.apache.org Delivered-To: mailing list notifications@ant.apache.org Received: (qmail 59767 invoked by uid 99); 27 Dec 2017 12:31:47 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 Dec 2017 12:31:47 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6A42CE980E; Wed, 27 Dec 2017 12:31:43 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bodewig@apache.org To: notifications@ant.apache.org Date: Wed, 27 Dec 2017 12:31:47 -0000 Message-Id: In-Reply-To: <1d91e51949ed40d1907ab3a402cd8ca6@git.apache.org> References: <1d91e51949ed40d1907ab3a402cd8ca6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [05/12] ant git commit: more script adjustments archived-at: Wed, 27 Dec 2017 12:31:49 -0000 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 Authored: Sun Dec 24 09:18:43 2017 +0100 Committer: Gintas Grigelionis 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 - -