RE: How to get a clean working tree for flex-sdk

2013-04-15 Thread Gordon Smith
And what does ant release give? After I do 'ant release', 'git status' says nothing to commit (working directory clean) as expected. - Gordon -Original Message- From: Justin Mclean [mailto:jus...@classsoftware.com] Sent: Friday, April 12, 2013 11:09 PM To: dev@flex.apache.org

RE: How to get a clean working tree for flex-sdk

2013-04-13 Thread Gordon Smith
I can't run that target because I don't understand how to set ADOBE_EXTENSION_MANAGER. These instructions from the README are incorrect: The Adobe Extension Manager for Windows can be downloaded from:

Re: How to get a clean working tree for flex-sdk

2013-04-13 Thread Justin Mclean
Hi, The Adobe Extension Manager for Windows can be downloaded from: http://download.macromedia.com/pub/dw_exchange/extension_manager/win/AdobeExtensionManager5All.zip On Windows, set ADOBE_EXTENSION_MANAGER to the absolute path of Adobe Extension Manager CS5.exe

RE: How to get a clean working tree for flex-sdk

2013-04-12 Thread Gordon Smith
After you do 'ant clean main checkintests' in flex-sdk, 'git status' now says nothing to commit (working directory clean) as one would expect. I dealt with the bogus mode change of Version.java that I was seeing on Cygwin by no longer rewriting Version.java to inject a build number.

RE: How to get a clean working tree for flex-sdk

2013-04-09 Thread Gordon Smith
Background: I'm trying to get 'git status' to report nothing after simply doing a build of the SDK (which is what you expect because you haven't changed any source files). The problem is that a copy of flex-config.xml and a replace of Version.java in our Ant scripts seem to misbehave on Cygwin

Re: How to get a clean working tree for flex-sdk

2013-04-09 Thread Justin Mclean
Hi, JFYI I'm running into a similar issue in windows in OSX. FlexComponentKit.mxi seems to have differing permissions but not sure if it should be added to .gitignore or not. You may also need to modify build.properties depending on your setup (eg TLF path) - how do we deal with that?

Re: How to get a clean working tree for flex-sdk

2013-04-09 Thread Alex Harui
The .mxi is a source file so it shouldn't be in gitignore. The Extension Manager changes its permissions to executable for unknown reason. I thought I checked in an .mxi file with executable permissions to try to cure this problem. Maybe I put it in the wrong branch or maybe it didn't work on

Re: How to get a clean working tree for flex-sdk

2013-04-09 Thread Terry Corbet
I probably do not understand enough of the problem you are describing, and probably don't have enough smarts to provide anything of value, but, for what it is worth: A. The cygwin version of the 'cp' utility has a '-p' option which, in my experience, keeps its promise; the target file will have

RE: How to get a clean working tree for flex-sdk

2013-04-04 Thread Gordon Smith
After you're done, will a simple pull correct the local repo's? I'm not a Git expert, but I'm pretty sure that it will. However, the fact that many files were marked as executable (+x) when they shouldn't be is not causing any problems that I know of. Fixing this is just housecleaning. -

RE: How to get a clean working tree for flex-sdk

2013-04-04 Thread Gordon Smith
I've pushed the file mode fixes to flex-sdk. 'ant clean main checkintests' works for me in Cygwin on Windows. Please let me know if I screwed anything up on Macs. I'll clean up the bad file modes in flex-tlf tonight. - Gordon -Original Message- From: Gordon Smith

RE: How to get a clean working tree for flex-sdk

2013-04-04 Thread Gordon Smith
OK, I've cleaned up the bad file modes in flex_tlf. There don't seem to be any in flex-falcon or flex-asjs. - Gordon -Original Message- From: Gordon Smith [mailto:gosm...@adobe.com] Sent: Thursday, April 04, 2013 1:31 PM To: dev@flex.apache.org Subject: RE: How to get a clean working

RE: How to get a clean working tree for flex-sdk

2013-04-04 Thread Gordon Smith
Fred, were you going to make changes to .gitignore? - Gordon -Original Message- From: Gordon Smith [mailto:gosm...@adobe.com] Sent: Thursday, April 04, 2013 5:24 PM To: dev@flex.apache.org Subject: RE: How to get a clean working tree for flex-sdk OK, I've cleaned up the bad file modes

Re: How to get a clean working tree for flex-sdk

2013-04-04 Thread Frédéric THOMAS
Hi Gordon, There's a problem with the doc target in the experimental lib and because I never dug into before I asked here if someone could have a look but apparently no one did it so, I guess I'll have to do it, this bug was one the tasks I wanted fix before to merge my branch, btw, this

RE: How to get a clean working tree for flex-sdk

2013-04-04 Thread Gordon Smith
After adding 3 entries to .gitignore to suppress some build output files from showing up in 'git status', I'm now at the point where 'git status' after a build shows only this: gosmith@GOSMITH-WIN7 /cygdrive/d/asf/flex-sdk $ git status # On branch develop # Changes not staged for commit: #

Re: How to get a clean working tree for flex-sdk

2013-04-04 Thread Alex Harui
Can we get the build to save a copy of these files before modification and then replace them at the end of a build even if the build fails? Or maybe just add git checkout to the build script? On 4/4/13 9:28 PM, Gordon Smith gosm...@adobe.com wrote: After adding 3 entries to .gitignore to

Re: How to get a clean working tree for flex-sdk

2013-04-03 Thread Frédéric THOMAS
Gordon, It looks like your repo is not updated or your config is messy. Can you show up your HOME/.gitconfig please ? Thanks, -Fred -Message d'origine- From: Gordon Smith Sent: Wednesday, April 03, 2013 6:24 AM To: dev@flex.apache.org Subject: How to get a clean working tree for

Re: How to get a clean working tree for flex-sdk

2013-04-03 Thread Frédéric THOMAS
And your flex-sdk/.gitignore too ? Thanks, -Fred -Message d'origine- From: Frédéric THOMAS Sent: Wednesday, April 03, 2013 10:24 AM To: dev@flex.apache.org Subject: Re: How to get a clean working tree for flex-sdk Gordon, It looks like your repo is not updated or your config is

Re: How to get a clean working tree for flex-sdk

2013-04-03 Thread Frédéric THOMAS
Gordon, Check https://cwiki.apache.org/confluence/display/FLEX/Git+for+Apache+Flex+Guide for your .gitconfig Your repo is not up to date as I can see from your .gitignore, do a git reset --hard HEAD followed by a git pull --rebase and then rebuild the sdk. Thanks, -Fred -Message

Re: How to get a clean working tree for flex-sdk

2013-04-03 Thread Frédéric THOMAS
Humm, no idea, could you show me your flex-sdk/.git/config ? -Fred -Message d'origine- From: Gordon Smith Sent: Wednesday, April 03, 2013 8:01 PM To: dev@flex.apache.org Subject: RE: How to get a clean working tree for flex-sdk If my repo is not up to date, why does doing git pull

RE: How to get a clean working tree for flex-sdk

2013-04-03 Thread Gordon Smith
Are you saying that if Git says my repo says it is up to date it isn't necessarily up to date? I'm not comfortable which making any changes to this file. I didn't configure it in the first place as far as I know. Where did it come from? - Gordon -Original Message- From: Frédéric

RE: How to get a clean working tree for flex-sdk

2013-04-03 Thread Gordon Smith
I'd be curious as to what did change in flex-config and Version.java. Something changed the mode of these two files: gosmith@GOSMITH-WIN7 /cygdrive/d/asf/flex-sdk $ git diff frameworks/flex-config.xml diff --git a/frameworks/flex-config.xml b/frameworks/flex-config.xml old mode 100644 new

Re: How to get a clean working tree for flex-sdk

2013-04-03 Thread Frédéric THOMAS
Then I guess everybody should run 'git config core.filemode false' on their repos, I will add it to the wiki. -Fred -Message d'origine- From: Gordon Smith Sent: Thursday, April 04, 2013 12:29 AM To: dev@flex.apache.org Subject: RE: How to get a clean working tree for flex-sdk I'd

Re: How to get a clean working tree for flex-sdk

2013-04-03 Thread Frédéric THOMAS
or 'git config --global core.filemode false' for the general git settings. -Fred -Message d'origine- From: Frédéric THOMAS Sent: Thursday, April 04, 2013 12:34 AM To: dev@flex.apache.org Subject: Re: How to get a clean working tree for flex-sdk Then I guess everybody should run 'git

RE: How to get a clean working tree for flex-sdk

2013-04-03 Thread Gordon Smith
Please explain what that will do. And before we decide to do this, please be aware that there are some files that need to have their executable bit set, such as the mxmlc script. - Gordon -Original Message- From: Frédéric THOMAS [mailto:webdoubl...@hotmail.com] Sent: Wednesday, April

RE: How to get a clean working tree for flex-sdk

2013-04-03 Thread Gordon Smith
that there are some files that need to have their executable bit set, such as the mxmlc script. I knew how to make that happen in SVN, with per-file properties, but I have no idea in Git. - Gordon -Original Message- From: Gordon Smith [mailto:gosm...@adobe.com] Sent: Wednesday,

Re: How to get a clean working tree for flex-sdk

2013-04-03 Thread Frédéric THOMAS
Sorry, you right, I thought I had already merged my branch where the .gitignore is updated. -Fred -Message d'origine- From: Gordon Smith Sent: Thursday, April 04, 2013 12:37 AM To: dev@flex.apache.org Subject: RE: How to get a clean working tree for flex-sdk Your repo is not up to

Re: How to get a clean working tree for flex-sdk

2013-04-03 Thread Frédéric THOMAS
It will avoid git to consider those files as modified, so they won't appear on git status -Fred -Message d'origine- From: Gordon Smith Sent: Thursday, April 04, 2013 12:39 AM To: dev@flex.apache.org Subject: RE: How to get a clean working tree for flex-sdk Please explain what that

RE: How to get a clean working tree for flex-sdk

2013-04-03 Thread Gordon Smith
Are you saying that it tells Git to ignore differences in a file's mode? - Gordon -Original Message- From: Frédéric THOMAS [mailto:webdoubl...@hotmail.com] Sent: Wednesday, April 03, 2013 3:48 PM To: dev@flex.apache.org Subject: Re: How to get a clean working tree for flex-sdk It will

Re: How to get a clean working tree for flex-sdk

2013-04-03 Thread Frédéric THOMAS
Yes. -Fred -Message d'origine- From: Gordon Smith Sent: Thursday, April 04, 2013 12:50 AM To: dev@flex.apache.org Subject: RE: How to get a clean working tree for flex-sdk Are you saying that it tells Git to ignore differences in a file's mode? - Gordon -Original Message-

RE: How to get a clean working tree for flex-sdk

2013-04-03 Thread Gordon Smith
I don't think there is any reason why the file mode of these files should be changing, so I'm not convinced we should start ignoring diffs of file modes. - Gordon -Original Message- From: Frédéric THOMAS [mailto:webdoubl...@hotmail.com] Sent: Wednesday, April 03, 2013 3:52 PM To:

Re: How to get a clean working tree for flex-sdk

2013-04-03 Thread Frédéric THOMAS
You might be right, it's better to determinate why they're changed by the build, maybe we should find how they were in Svn, it might have happened that those modes changed during the migration. -Fred -Message d'origine- From: Gordon Smith Sent: Thursday, April 04, 2013 12:53 AM To:

RE: How to get a clean working tree for flex-sdk

2013-04-03 Thread Gordon Smith
I looked at these two files in Subversion. Both have only the svn:ol-style property set, like many other files. When you check out a Git branch, can some files get a different mode than others? In other words, does Git store a mode for each file? - Gordon -Original Message- From:

Re: How to get a clean working tree for flex-sdk

2013-04-03 Thread Mark Kessler
After reading this, I think I'll stay with my syncing the Flex-SDK to a separate folder when I want to build it. Sounds like cleaning up files after building in your git repo is a PITA. -Mark

RE: How to get a clean working tree for flex-sdk

2013-04-03 Thread Gordon Smith
The Ant scripts are rewriting these files to inject version numbers. (Ugh!) So many your suggestion of ignoring mode differences is a good idea. However, I would still like to understand whether it is possible for Git to set the executable bit on scripts like mxmlc, like Subversion did. -

Re: How to get a clean working tree for flex-sdk

2013-04-03 Thread Frédéric THOMAS
I just read the git mode particularities from [1] In this case, you’re specifying a mode of 100644, which means it’s a normal file. Other options are 100755, which means it’s an executable file; and 12, which specifies a symbolic link. The mode is taken from normal UNIX modes but is much

RE: How to get a clean working tree for flex-sdk

2013-04-03 Thread Gordon Smith
Well, we're not discussing whether 'ant clean' fully removes all build output. I hope it does, but I'm not sure how to tell any more. (Probably somehow running 'git status' without a .gitnore would do it.) We're discussing the fact that we generally want 'git status' to not show build output

RE: How to get a clean working tree for flex-sdk

2013-04-03 Thread Gordon Smith
So it sounds like the build scripts have somehow made these files executable, which makes no sense for .java and .xml files. I'd prefer that we fix that rather than ignore mode diffs. - Gordon -Original Message- From: Frédéric THOMAS [mailto:webdoubl...@hotmail.com] Sent: Wednesday,

Re: How to get a clean working tree for flex-sdk

2013-04-03 Thread Frédéric THOMAS
+1, in more, I'm doing a wiki to have a good working git configuration and I have a branch that once merged will solve other issues. -Fred -Message d'origine- From: Gordon Smith Sent: Thursday, April 04, 2013 1:30 AM To: dev@flex.apache.org Subject: RE: How to get a clean working

RE: How to get a clean working tree for flex-sdk

2013-04-03 Thread Gordon Smith
Cleaning up after building in a Git repo shouldn't be any different than cleaning up after building in a SVN repo. You do 'ant clean' and if it doesn't remove everything you fix the 'clean' target. - Gordon -Original Message- From: Harbs [mailto:harbs.li...@gmail.com] Sent: Wednesday,

Re: How to get a clean working tree for flex-sdk

2013-04-03 Thread Frédéric THOMAS
The weird thing is it didn't happened to me :P -Fred -Message d'origine- From: Gordon Smith Sent: Thursday, April 04, 2013 1:32 AM To: dev@flex.apache.org Subject: RE: How to get a clean working tree for flex-sdk So it sounds like the build scripts have somehow made these files

RE: How to get a clean working tree for flex-sdk

2013-04-03 Thread Gordon Smith
I do Ant and Git in Cygwin on Windows. Maybe that makes a difference. - Gordon -Original Message- From: Frédéric THOMAS [mailto:webdoubl...@hotmail.com] Sent: Wednesday, April 03, 2013 4:36 PM To: dev@flex.apache.org Subject: Re: How to get a clean working tree for flex-sdk The weird

RE: How to get a clean working tree for flex-sdk

2013-04-03 Thread Gordon Smith
frameworks/projects/advancedgrids/bundles/en_GB/datamanagement.properties mistakenly had svn:executable set to * in the SVN repo. I'd guess that any files actually in the Git repo that have mode 100755 and shouldn't are due to the same problem originating from incorrect SVN properties. We can

RE: How to get a clean working tree for flex-sdk

2013-04-03 Thread Gordon Smith
My guess is that someone working in SVN had a screwed up auto-props configuration (the part of the config file that maps an added file's extension to a set of svn properties), resulting in lots of added files incorrectly getting svn:executable set. - Gordon -Original Message- From:

How to get a clean working tree for flex-sdk

2013-04-02 Thread Gordon Smith
After I build flex-sdk with 'ant clean main checkintests', 'git status' shows a bunch of changes to my working tree that aren't relevant. I think this means we need to add more entries to .gitignore, but I don't understand why some files show up as Changes not staged for commit and others as

Re: How to get a clean working tree for flex-sdk

2013-04-02 Thread Alex Harui
not stages is like SVN saying a file is modified. untracked is like SVN saying a file is unversioned (not added to SVN). I'd be curious as to what did change in flex-config and Version.java. I thought Fred cleaned up the rest. Did you do a git pull to get synced up (like svn update). On

Re: How to get a clean working tree for flex-sdk

2013-04-02 Thread Gordon Smith
Yes, I did a pull of the develop branch to get current. Sent from my iPad On Apr 2, 2013, at 9:30 PM, Alex Harui aha...@adobe.com wrote: not stages is like SVN saying a file is modified. untracked is like SVN saying a file is unversioned (not added to SVN). I'd be curious as to what did

Re: How to get a clean working tree for flex-sdk

2013-04-02 Thread Alex Harui
Hmm. I did a pull and build and those don't show up. Not sure why that's happening for you. On 4/2/13 9:37 PM, Gordon Smith gosm...@adobe.com wrote: Yes, I did a pull of the develop branch to get current. Sent from my iPad On Apr 2, 2013, at 9:30 PM, Alex Harui aha...@adobe.com wrote: