OK, I removed common_import_gecko, verified, and checked in.


-- 
Daniel Yek


At 04:45 PM 10/31/2006, Bob Clark wrote:
>Hey Daniel, you may be able to remove the common_import_gecko module 
>entirely from hxplay_gtk_current.bif; then the definition in 
>hxclient_1_5_0_cayenne should automatically apply and everything oughtta 
>work fine.
>
>--Bob
>
>At 03:09 PM 10/31/2006, Daniel Yek wrote:
>
>>Modified by: dyek at real.com
>>Date: 10/31/2006
>>Project: Helix Player
>>
>>Synopsis: Fixing inconsistent branch mapping in hxplay_gtk_current.bif.
>>
>>Overview:
>>   I suppose the common_import_gecko entry in hxplay_gtk_current.bif was 
>> added
>>   to include unix and win32 platforms (in contrast to just linux2 in
>>   hxclient_1_5_0_cayenne.bif.)
>>   However, it appears that:
>>     branch="hxclient_1_5_0_cayenne"
>>   was left out from the entry.
>>   It hasn't caused much problem thus far, because both HEAD and 150Cay
>>   branches of the directory are identical.
>>   However, we want to fix it so that common_import_gecko consistently
>>   points to the expected 150Cay branch and fixes touching Gecko SDK
>>   can be handled correctly.
>>
>>Files Modified:
>>bif-cvs/helix/client/build/BIF/hxplay_gtk_current.bif
>>
>>
>>Platforms and Profiles Build Verified:
>>Profile: helix_client_all_define
>>Platform: Fedora Core 5
>>
>>Platforms and Profiles Functionality verified:
>>Profile: helix_client_all_define
>>Platform: Fedora Core 5
>>
>>Branch: HEAD
>>
>>Copyright assignment: I am a RealNetworks employee.


Index: hxplay_gtk_current.bif
===================================================================
RCS file: /cvsroot/client/build/BIF/hxplay_gtk_current.bif,v
retrieving revision 1.24
diff -u -w -r1.24 hxplay_gtk_current.bif
--- hxplay_gtk_current.bif      27 Oct 2006 14:14:23 -0000      1.24
+++ hxplay_gtk_current.bif      1 Nov 2006 01:32:30 -0000
@@ -336,18 +336,9 @@
      <!-- SDK's and stuff in common/import -->
      <!-- ================================ -->

-    <!-- COMMON/IMPORT/GECKO-SDK -->
-    <module id="common_import_gecko" name="common/import/gecko-sdk" 
group="core">
-      <cvs root="helix"/>
-      <includeplatforms>
-        unix win32
-      </includeplatforms>
-
-    </module>
-
      <!-- common/import/glibcurl -->
      <module id="common_import_glibcurl" name="common/import/glibcurl" 
group="core">
-      <cvs root="helix"/>
+      <cvs root="helix" branch="hxclient_1_5_0_cayenne" />
        <includeplatforms>
          unix
        </includeplatforms>