I'm sure I'll be ok, I don't have any changes in flex-sdk so it will be much simpler.
On 3/26/13 9:55 AM, "Frédéric THOMAS" <webdoubl...@hotmail.com> wrote: > I have to go in 1h or so, if you want to ask me things before, you're > welcomed but I think I wrote enough git commands to well start working on > it. > > Thanks, > -Fred > > -----Message d'origine----- > From: Alex Harui > Sent: Tuesday, March 26, 2013 5:51 PM > To: dev@flex.apache.org > Subject: Re: Release build broken > > OK, I will try to run it in a few hours. > > > On 3/26/13 9:48 AM, "Frédéric THOMAS" <webdoubl...@hotmail.com> wrote: > >> Hi, >> >> If you want to work on the same release I'm working on and want the >> commits >> I did, I created a remote branch 'FLEX-33451' >> >> I assume you're on flex-sdk, whatever the branch you're currently on. >> >> Before to check it out: >> git stash -u "my current work" >> >> To check it out: >> git checkout -b origin/FLEX-33451 >> >> To see what I did (I assume, you set your .gitconfig as described on the >> wiki) >> git hist >> >> To see what there's inside a particular commit: >> git show <HASH> (can be obtain form the previous command) >> >> If you need to update from origin/develop to FLEX-33451: >> git pull --rebase origin develop >> >> To add a file to the staged area: >> git add <My_FILE> >> >> To add all the current files to the staged area: >> git add . >> >> To commit: >> git pull --rebase (if I just pushed the same files than the ones you're >> trying to commit, resolve the conflicts) >> git commit -m "FLEX-33451:<MESSAGE>" >> >> To push: >> git push >> >> To go back on the branch you was before and the same working tree / index: >> git stash -u "release" (if you've got uncommitted files/untracked files >> which you can check with git status) >> git checkout <BRANCH> >> git stash apply "my current work" >> >> Thanks, >> -Fred >> >> -----Message d'origine----- >> From: Frédéric THOMAS >> Sent: Tuesday, March 26, 2013 1:44 PM >> To: dev@flex.apache.org >> Subject: Re: Release build broken >> >> Just created https://issues.apache.org/jira/browse/FLEX-33451 for the >> issues >> relative to the broken release to link with at commit time. >> >> Please forget about "I added a variable 'keepDownloads' to avoid the >> download of the thirdparty, usefull because I had to run the release 5 >> times, not sure you want I check it in, tell me." >> >> Thanks, >> -Fred >> >> -----Message d'origine----- >> From: Frédéric THOMAS >> Sent: Tuesday, March 26, 2013 1:16 PM >> To: dev@flex.apache.org >> Subject: Re: Release build broken >> >> Hi, >> >> Just to keep you in touch: >> >> BUILD SUCCESSFUL >> Total time: 60 minutes 43 seconds >> >> - I fixed TLF release build. >> - I had to comment the asdoc target for the experimental lib until it will >> be fixed, see the other thread. >> - I will re-integrate into my branch what you did Justin removing the >> empty.properties copy task. >> ( BTW, if it's ok for you now, could use pull --rebase instead of pull, >> just >> to avoid the useless merged commit please ? ) >> - I updated the .gitignore but I want to continue running the >> makeApacheFlexForFlashBuilder before merging, to see if some other >> artifacts >> has to be excluded. >> - I added a variable 'keepDownloads' to avoid the download of the >> thirdparty, usefull because I had to run the release 5 times, not sure you >> want I check it in, tell me. >> >> Thanks, >> -Fred >> >> -----Message d'origine----- >> From: Frédéric THOMAS >> Sent: Tuesday, March 26, 2013 8:10 AM >> To: dev@flex.apache.org >> Subject: Re: Release build broken >> >> The same as me and Alex, I'm on it. >> >> Thanks, >> -Fred >> >> -----Message d'origine----- >> From: Om >> Sent: Tuesday, March 26, 2013 8:07 AM >> To: dev@flex.apache.org >> Subject: Re: Release build broken >> >> My ant release fails as well, but because of a different reason: >> >> ================ >> doc: >> [asdoc] Loading configuration file >> C:\p\flex_os\workspace\flexroot\git\flex- >> sdk\frameworks\flex-config.xml >> [zip] Updating zip: >> C:\p\flex_os\workspace\flexroot\git\flex-sdk\framework >> s\locale\en_US\mx_rb.swc >> [copy] Copying 1 file to >> C:\p\flex_os\workspace\flexroot\git\flex-sdk\frame >> works\projects\mx\bundles\en_US >> >> clean-temp-docs: >> [delete] Deleting directory >> C:\p\flex_os\workspace\flexroot\git\flex-sdk\temp >> Doc >> >> doc: >> [asdoc] Loading configuration file >> C:\p\flex_os\workspace\flexroot\git\flex- >> sdk\frameworks\flex-config.xml >> [asdoc] command line: Error: unable to open >> 'C:\p\flex_os\workspace\flexroot >> \git\flex-sdk\frameworks\projects\textLayout/3.0.33/src' >> [asdoc] >> [asdoc] Apache Flex ASDoc >> [asdoc] Version 4.10.0 build 0 >> [asdoc] Copyright 2012 The Apache Software Foundation. >> [asdoc] >> [asdoc] Use 'asdoc -help' for information about using the command >> line. >> >> BUILD FAILED >> C:\p\flex_os\workspace\flexroot\git\flex-sdk\build.xml:1253: The following >> error >> occurred while executing this line: >> C:\p\flex_os\workspace\flexroot\git\flex-sdk\frameworks\build.xml:196: The >> follo >> wing error occurred while executing this line: >> C:\p\flex_os\workspace\flexroot\git\flex-sdk\frameworks\projects\textLayout\b>> u >> il >> d.xml:240: asdoc task failed. >> >> Total time: 32 minutes 34 seconds >> ================ >> >> On Mon, Mar 25, 2013 at 9:03 PM, Om <bigosma...@gmail.com> wrote: >> >>> I can try in a couple of hours.. >>> >>> Thanks, >>> Om >>> On Mar 25, 2013 8:56 PM, "Justin Mclean" <jus...@classsoftware.com> >>> wrote: >>> >>>> Hi, >>>> >>>>> Is it possible that a falcon build polluted your setup? >>>> Unlikely. Unless something been done that git related with that? Not >>>> tried to build falcon since the move to git. >>>> >>>> Have we missed something in the move to git that's broken the release >>>> build? >>>> >>>> Can someone do a "ant release" on the git checkout to see if it's just >>>> an >>>> issue with my setup or with the git move. >>>> >>>> Thanks, >>>> Justin >>> >>> >> -- Alex Harui Flex SDK Team Adobe Systems, Inc. http://blogs.adobe.com/aharui
