I maybe found another way to integrate TLF sub directories as part of
flex-sdk [1], still have to try it but sounds good.
-Fred
[1]
https://www.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.html
-----Message d'origine-----
From: Frédéric THOMAS
Sent: Wednesday, March 13, 2013 11:43 AM
To: dev@flex.apache.org
Subject: Re: TLF Issue (was Re: SVN to Git migration in progress)
BTW, are these separate "repos" as far as Git is concerned or something
else?)
Humm..Can you reformulate that pls ? :P
The only way I see if we don't want to use links is to use submodules but to
use TLF as a submodule, it's root should be its sub directory textLayout so
is that what we want ?
-Fred
-----Message d'origine-----
From: Alex Harui
Sent: Tuesday, March 12, 2013 8:11 PM
To: dev@flex.apache.org
Subject: Re: TLF Issue (was Re: SVN to Git migration in progress)
I think we don't want to use hard-links. And if submodules won't work, then
I think it is time to figure out how to cut releases by grabbing stuff from
different "repos". (BTW, are these separate "repos" as far as Git is
concerned or something else?)
At Adobe, TLF was developed in Perforce by another team and we took drops
for Flex. I'm sure we can do something similar.
On 3/12/13 11:37 AM, "Frédéric THOMAS" <webdoubl...@hotmail.com> wrote:
Submodules in Git are less flexible than svn:externals and less
straightforward to use, you can plug an entire git repo as submodule but
can't plug a sub-directory the a git repo as submodule. The problem with
TLF
is we need to plug the sub-directory called textLayout to the 3.0.33
directory of our sdk repo, that's make submodules unusable.
One way to go is to clone the TLF repo a part, make a hard link from the
textLayout directory to a new 3.0.33 directory in the sdk repo, gitignore
this directory at the sdk repo level, if we want to work on TLF, we can do
it from the TLF repo itself.
Note:
- I've got this working and I finished to fill the .gitignore file.
- On windows, there's a free software to manage soft/hard link, but it's
one
thing in more to do to setup the SDK that has to be explain in the readme.
-Fred
-----Message d'origine-----
From: Alex Harui
Sent: Tuesday, March 12, 2013 6:00 PM
To: dev@flex.apache.org
Subject: TLF Issue (was Re: SVN to Git migration in progress)
Well, I'm still learning about Git, but it looks like we have to resolve
the
TLF svn:externals issue and it isn't clear that links in the file system
are
going to work on Windows and are the "correct" solution.
Does anybody actually know the answer? Or do we just have to figure it
out
on our own.
One thing I saw on the internet says that you can just pull from the other
project if there aren't any conflicts with file names. Would that work?
Were submodules and/or subtrees ruled out? It appeared from the Git
manual
that an update of the main project doesn't automatically update the
submodules, so that will leave us open to making mistakes staying in sync.
IMO, we should re-think why we had TLF as an svn:external. I think we
just
did it so the build scripts wouldn't have to change that much from the
Adobe
days, so we could find the source where we were used to seeing it.
But looking not to far into the future, our releases may become a
composition of stuff from the various Apache Flex "sub-projects". For
example, the FlexJS stuff is compositing things from the old Flex SDK, the
Falcon project and the ASJS project.
So, given that we might have sync issues in Git even with submodules,
maybe
the answer is to rework the release scripts to composite from multiple
projects?
-Alex
On 3/12/13 3:59 AM, "Frédéric THOMAS" <webdoubl...@hotmail.com> wrote:
Still that :)
I guess on windows I should find a way to to a hard link, right ?
-Fred
-----Message d'origine-----
From: Justin Mclean
Sent: Tuesday, March 12, 2013 11:26 AM
To: dev@flex.apache.org
Subject: Re: SVN to Git migration in progress
Hi,
Well the good news is other than the flex-sdk git repo compiles a usable
SDK
if you work around the TLF issue.
Justin
--
Alex Harui
Flex SDK Team
Adobe Systems, Inc.
http://blogs.adobe.com/aharui
