Return-Path: X-Original-To: apmail-flex-commits-archive@www.apache.org Delivered-To: apmail-flex-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2D0B8107CA for ; Thu, 18 Dec 2014 17:03:22 +0000 (UTC) Received: (qmail 83963 invoked by uid 500); 18 Dec 2014 17:03:22 -0000 Delivered-To: apmail-flex-commits-archive@flex.apache.org Received: (qmail 83940 invoked by uid 500); 18 Dec 2014 17:03:22 -0000 Mailing-List: contact commits-help@flex.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flex.apache.org Delivered-To: mailing list commits@flex.apache.org Received: (qmail 83932 invoked by uid 99); 18 Dec 2014 17:03:22 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Dec 2014 17:03:22 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id AC5699575F1; Thu, 18 Dec 2014 17:03:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: chrsmrtn@apache.org To: commits@flex.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: [flex-sdk] [refs/heads/release4.14.0] - modified script to detect emulated environments on windows versus unix and build the main file list to copy accordingly Date: Thu, 18 Dec 2014 17:03:21 +0000 (UTC) Repository: flex-sdk Updated Branches: refs/heads/release4.14.0 992cddd72 -> 996e0f121 modified script to detect emulated environments on windows versus unix and build the main file list to copy accordingly Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/996e0f12 Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/996e0f12 Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/996e0f12 Branch: refs/heads/release4.14.0 Commit: 996e0f121012cc37f2d56c54c1c84ab32e518bcd Parents: 992cddd Author: chrsmrtn Authored: Thu Dec 18 10:02:49 2014 -0700 Committer: chrsmrtn Committed: Thu Dec 18 10:02:49 2014 -0700 ---------------------------------------------------------------------- ide/constructFlexForIDE.sh | 77 ++++++++++++++++++++++++++++------------- 1 file changed, 53 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/996e0f12/ide/constructFlexForIDE.sh ---------------------------------------------------------------------- diff --git a/ide/constructFlexForIDE.sh b/ide/constructFlexForIDE.sh index d9533ab..c28a947 100755 --- a/ide/constructFlexForIDE.sh +++ b/ide/constructFlexForIDE.sh @@ -149,30 +149,59 @@ fi # Copy files first, then directories. echo Copying the AIR SDK files to directory "${IDE_SDK_DIR}" - -files=( - "AIR SDK license.pdf" - "AIR SDK Readme.txt" - bin/adl.exe - bin/adt.bat - bin/adl - bin/adt - frameworks/libs/air - frameworks/libs/player/11.1 - frameworks/projects/air - include - install/android - lib/adt.jar - lib/android - lib/aot - lib/nai - lib/win - runtimes - samples/badge - samples/descriptor-sample.xml - samples/icons - templates/air - templates/extensions) +OS=`uname` +cygwinCheck=`echo $OS|awk '{print match($0,"CYGWIN")}'`; +mingwCheck=`echo $OS|awk '{print match($0,"MINGW")}'`; +if [ $cygwinCheck -gt 0 ] || [ $mingwCheck -gt 0 ] +then + echo "Emulated environment on windows detected: $OS" + # set files for emulated environment on windows, we do not need to copy adt and adl as adl.exe and adt.bat will be copied and used + files=( + "AIR SDK license.pdf" + "AIR SDK Readme.txt" + bin/adl.exe + bin/adt.bat + frameworks/libs/air + frameworks/libs/player/11.1 + frameworks/projects/air + include + install/android + lib/adt.jar + lib/android + lib/aot + lib/nai + lib/win + runtimes + samples/badge + samples/descriptor-sample.xml + samples/icons + templates/air + templates/extensions) +else + # set files for any other environment, assuming will be unix compatible + echo "Unix environment detected" + files=( + "AIR SDK license.pdf" + "AIR SDK Readme.txt" + bin/adl + bin/adt + frameworks/libs/air + frameworks/libs/player/11.1 + frameworks/projects/air + include + install/android + lib/adt.jar + lib/android + lib/aot + lib/nai + lib/win + runtimes + samples/badge + samples/descriptor-sample.xml + samples/icons + templates/air + templates/extensions) +fi for file in "${files[@]}" do copyFileOrDirectory "$file"