Chris, Just commit to the 'release4.14' branch. I'll merge that back into develop when we've released (or maybe sooner, if my time permits).
Thanks, EdB On Wed, Dec 17, 2014 at 10:44 PM, Chris Martin <chrsm...@outlook.com> wrote: > > > > Okay, I got a change to the script that will detect the OS. Basically it > will look for linux emulated in windows (CYGWIN and MINGW), if one of those > are detected, then it will choose a file set for that environment to copy > (basically the adl.exe and adt.bat. If it detects any other environment then > it will assume it is a unix environment and copy a file set that includes adt > and adl instead. Should I just commit this change against the head, or would > it be best to commit it against Justin's and then merge it into the head? > I'm leaning towards merging it in as it will keep the change together as we > try to address the missing adt and adl issue. > > Chris > >> From: chrsm...@outlook.com >> To: dev@flex.apache.org >> Subject: RE: git commit: [flex-sdk] [refs/heads/release4.14.0] - add adl and >> act to list of files to copy >> Date: Tue, 16 Dec 2014 14:22:41 -0700 >> >> Ugh, one test and it worked, and now the other it is not. The -n file is >> not clobbering the file as noted in the help, but the error is still being >> presented and the script stops. >> >> Chris >> >> > From: chrsm...@outlook.com >> > To: dev@flex.apache.org >> > Subject: RE: git commit: [flex-sdk] [refs/heads/release4.14.0] - add adl >> > and act to list of files to copy >> > Date: Tue, 16 Dec 2014 14:04:57 -0700 >> > >> > Yeah, we can use uname[1]. I try my best to avoid OS detection only >> > because there are many out there. This issue stems from how .exe files >> > are handled in Cygwin. Basically they treat 'file.exe' and 'file' to be >> > the same thing as 'file' is an executable in *nix[2]. >> > >> > Judging by how the rsync command uses --ignore-existing (skip updating >> > files that already exist on receiver), then would it be right to assume >> > that cp is to behave the same way? Basically only copy over files if they >> > don't already exist in the target sdk folder. I'm basing my assuming on >> > yes only because that is what will happen if we copy over a directory, >> > existing files will not be overwritten and skipped. If we do intend to >> > skip existing files then we just need to add the -n flag to the cp command >> > at line 68 (inside copyFileOrDirectory). After that we will not attempt >> > to copy adl if adl.exe already exists in the target sdk folder. >> > >> > Chris >> > >> > >> > [1] http://en.wikipedia.org/wiki/Uname >> > [2] >> > http://cygwin.1069669.n5.nabble.com/cp-utility-bug-when-dest-name-exe-file-exist-tp57955p58001.html >> > >> > > From: e...@ixsoftware.nl >> > > Date: Tue, 16 Dec 2014 19:00:40 +0100 >> > > Subject: Re: git commit: [flex-sdk] [refs/heads/release4.14.0] - add adl >> > > and act to list of files to copy >> > > To: dev@flex.apache.org >> > > >> > > Do you have any idea how we may special case the copy of these files, >> > > so they are excluded when the script runs on Cygwin? >> > > >> > > EdB >> > > >> > > >> > > >> > > On Tue, Dec 16, 2014 at 6:46 PM, Chris Martin <chrsm...@outlook.com> >> > > wrote: >> > > > Hey everyone, >> > > > >> > > > The original shell file ran fine on Cygwin. >> > > > >> > > > Chris >> > > > >> > > >> From: e...@ixsoftware.nl >> > > >> Date: Tue, 16 Dec 2014 17:05:35 +0100 >> > > >> Subject: Re: git commit: [flex-sdk] [refs/heads/release4.14.0] - add >> > > >> adl and act to list of files to copy >> > > >> To: dev@flex.apache.org >> > > >> >> > > >> > Also wanted to make sure it was noted that the bat file also does >> > > >> > not copy the adt and adl files as I think we are expecting. Are we >> > > >> > expecting those files to also be copied if they use the bat file? >> > > >> >> > > >> No, I think we aren't expecting that. *.bat only runs on Windows, so >> > > >> only needs to copy the adt.exe and adl.exe. the *.sh can run on Mac >> > > >> AND Windows (Cygwin), so it needs to copy both the exe and the other >> > > >> files, which Justin added... >> > > >> >> > > >> If the original file ran well on Cygwin, and the new file runs into >> > > >> problems, I think we need to revert the lines Justin added and try to >> > > >> figure out a way to make those two copy commands conditional to the >> > > >> platform (i.e. not run on Cygwin). >> > > >> >> > > >> EdB >> > > >> >> > > >> >> > > >> >> > > >> -- >> > > >> Ix Multimedia Software >> > > >> >> > > >> Jan Luykenstraat 27 >> > > >> 3521 VB Utrecht >> > > >> >> > > >> T. 06-51952295 >> > > >> I. www.ixsoftware.nl >> > > > >> > > >> > > >> > > >> > > -- >> > > Ix Multimedia Software >> > > >> > > Jan Luykenstraat 27 >> > > 3521 VB Utrecht >> > > >> > > T. 06-51952295 >> > > I. www.ixsoftware.nl >> > >> > > -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl
