[darwinbuild-changes] [392] trunk/darwinbuild/installXcode31

[source_changes at macosforge.org]

Revision: 392
          http://trac.macosforge.org/projects/darwinbuild/changeset/392
Author:   wsiegrist at apple.com
Date:     2008-10-07 15:01:41 -0700 (Tue, 07 Oct 2008)
Log Message:
-----------
Do not copy xcode resources separately since they are included in the dynamic dependency list

Modified Paths:
--------------
    trunk/darwinbuild/installXcode31

Modified: trunk/darwinbuild/installXcode31
===================================================================
--- trunk/darwinbuild/installXcode31	2008-09-27 00:19:01 UTC (rev 391)
+++ trunk/darwinbuild/installXcode31	2008-10-07 22:01:41 UTC (rev 392)
@@ -33,7 +33,7 @@
     
 
 JAMFILES="/Developer/Makefiles/pbx_jamfiles"
-XCODERESOURCES="/Developer/Library/PrivateFrameworks/DevToolsCore.framework/Versions/A/Resources/"
+#XCODERESOURCES="/Developer/Library/PrivateFrameworks/DevToolsCore.framework/Versions/A/Resources/"
 
 RPATH=/Developer/Library/PrivateFrameworks
 
@@ -63,6 +63,19 @@
 }
 
 ###
+### Load opensource binaries if they dont exist so we can symlink to them
+###  
+LoadBinaries() {
+    echo "Loading binaries ..."
+    if [ ! -f "$BUILDROOT/usr/bin/gcc" ]; then
+	darwinbuild -load gcc
+    fi
+    if [ ! -f "$BUILDROOT/usr/bin/gcc-4.2" ]; then
+	darwinbuild -load gcc_42
+    fi
+}
+
+###
 ### Recurse through frameworks and libraries looking for dependencies
 ###
 RecurseLibs() {
@@ -154,8 +167,8 @@
     ln -s loper/Library/PrivateFrameworks R
     popd > /dev/null
 
-    echo "Copying Jamfiles and Xcode Resources ..."
-    find ".$JAMFILES" ".$XCODERESOURCES" | cpio -o -c | \
+    echo "Copying Jamfiles ..."
+    find ".$JAMFILES" | cpio -o -c | \
         sed -e 's,$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks,/XCD/SY///////Library/PrivateFrameworks,g' \
         -e 's,/Developer/Makefiles/pbx_jamfiles,/XCD/loper/Makefiles/pbx_jamfiles,g' \
         -e 's,/Developer/Library/PrivateFrameworks/DevToolsCore.framework,/XCD/loper/Library/PrivateFrameworks/DevToolsCore.framework,g' | \
@@ -222,6 +235,7 @@
 AppendExtraFiles
 GenerateFileNames
 CopyFiles
+LoadBinaries
 SymlinkBinaries
 
 popd > /dev/null
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/darwinbuild-changes/attachments/20081007/ce8e9532/attachment.html