Download webRTC problems with gclient

[Reinhard Karbas]

We have two different projects (one iOS, the other Android), who are using the same git repository for the webRTC software (common code)

The iOS group did the download of a specific trunk version first using mac and ios as target_os parameters
Now we need to add the files used for target_os unix and android to the already downloaded (and some of the modified) files in our git repository

However when we run gclient sync -r <revision number> which is the same revision as was used for the iOS download the iOS specific files are being removed
What can we do to keep the already existing files and just add the needed files tor target_os android and unix??
Is there a specific setting for gclient or some other parameter to accomplish this task??

Thx

Reinhard

[Primiano Tucci]

target_os is a list and as such should gclient be able to handle multi-os cases, like

target_os = ['mac','android']

--
--
Chromium Discussion mailing list: chromium...@chromium.org
View archives, change email options, or unsubscribe:
http://groups.google.com/a/chromium.org/group/chromium-discuss

To unsubscribe from this group and stop receiving emails from it, send an email to chromium-discu...@chromium.org.

--

Primiano Tucci
Software Engineer
Google UK Limited
Registered Office: Belgrave House, 76 Buckingham Palace Road, London SW1W 9TQ

[Reinhard Karbas]

We have the situation where a syncwas done first for ios and mac in the .gclient file
Now we want to add android and unix without losing the ios  files
But the first thing that gclient sync does is to remove the ios files
How can we prevent this?

[Primiano Tucci]

Can you be a bit more specific and descriptive about your configuration? Can you paste the changes you are making to gclient and the files that are going away when you make such change?

Adding an extra entry to target_os to .gclient should NOT cause the removal of any file. AFAIK if that happens there is a bug in the DEPS configuration of the project.

--

--
Chromium Discussion mailing list: chromium...@chromium.org
View archives, change email options, or unsubscribe:
http://groups.google.com/a/chromium.org/group/chromium-discuss

To unsubscribe from this group and stop receiving emails from it, send an email to chromium-discu...@chromium.org.

[Reinhard Karbas]

.gclient file is changed from:

solutions = [
  { "name"        : "trunk",
    "url"         : "http://webrtc.googlecode.com/svn/trunk",
    "deps_file"   : "DEPS",
    "managed"     : True,
    "custom_deps" : {
    },
    "custom_vars" : {
        "root_dir"    : "trunk",
    },
    "safesync_url": "",
  },
]
cache_dir = None
target_os = ['mac', 'ios']

to

solutions = [
  { "name"        : "trunk",
    "url"         : "http://webrtc.googlecode.com/svn/trunk",
    "deps_file"   : "DEPS",
    "managed"     : True,
    "custom_deps" : {
    },
    "custom_vars" : {
        "root_dir"    : "trunk",
    },
    "safesync_url": "",
  },
]
cache_dir = None
target_os = ['android', 'unix']

When we run the gclient sync all the xcode project files that have been there after the ios pull show as deleted in git status

On Friday, August 22, 2014 7:49:59 PM UTC-4, Reinhard Karbas wrote:

[Reinhard Karbas]

I also tried to change the target_os to have all 4 values in there with the same bad result

On Friday, August 22, 2014 7:49:59 PM UTC-4, Reinhard Karbas wrote:

[Reinhard Karbas]

I did some more searching through the depot_tools scripts and it seems all the files deleted have been moved over to_bad_scm (located in gclient_scm.py)
I still need to figure out what triggers this action

On Friday, August 22, 2014 7:49:59 PM UTC-4, Reinhard Karbas wrote:

[Reinhard Karbas]

I can provide one more detail I have found
When checking the _bad_scm directory it seems all files that existed before get moved over there, but I still have not figured out the check that is being run to cause this
If someone could point to a specific file or setting to check and avoid this action it would be easier for me to fix this

On Friday, August 22, 2014 7:49:59 PM UTC-4, Reinhard Karbas wrote:

[Reinhard Karbas]

One more question that just came up in our discussions:

As we already have the results of a gclient sync run done for ios and mac is there any easy way to tell gclient to now only pull the android/unix specific files on top of what we already have and leave the rest alone?

On Friday, August 22, 2014 7:49:59 PM UTC-4, Reinhard Karbas wrote:

[Primiano Tucci]

Hmm I am not a gclient expert, but AFAIK the rename to _bad_scm should only happen when something goes wrong / gclient thinks that you are replacing the current repo with a different one with the same name.

> As we already have the results of a gclient sync run done for ios and mac is there any easy way to tell gclient to now only pull the android/unix specific files on top of what we already have and leave the rest alone?

The way you are supposed to achieve this adding targets to the target_os list. Can't really tell why doesn't work in your case.

target_os is supposed to define only extra DEPS on top of the base ones.

--

--
Chromium Discussion mailing list: chromium...@chromium.org
View archives, change email options, or unsubscribe:
http://groups.google.com/a/chromium.org/group/chromium-discuss

To unsubscribe from this group and stop receiving emails from it, send an email to chromium-discu...@chromium.org.

[Reinhard Karbas]

I would really need someone who knows the gclient tool to look at it to tell me what gclient is checking when it decides to move everything to _bad_scm

On Friday, August 22, 2014 7:49:59 PM UTC-4, Reinhard Karbas wrote:

[Primiano Tucci]

+infra-dev they might have some clues about that

--

--
Chromium Discussion mailing list: chromium...@chromium.org
View archives, change email options, or unsubscribe:
http://groups.google.com/a/chromium.org/group/chromium-discuss

To unsubscribe from this group and stop receiving emails from it, send an email to chromium-discu...@chromium.org.

[reinhar...@gmail.com]

I need to add what I found out in between:
All the .svn files had been deleted after the first sync run, I assume this is what is causing the issue
Is there a way to do a gclient sync and only get the additional files needed with the .svn files gone?