[haiku-commits] r35829 - in haiku/trunk: . build/jam

  • From: mattmadia@xxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Fri, 12 Mar 2010 19:03:57 +0100 (CET)

Author: mmadia
Date: 2010-03-12 19:03:57 +0100 (Fri, 12 Mar 2010)
New Revision: 35829
Changeset: http://dev.haiku-os.org/changeset/35829/haiku
Ticket: http://dev.haiku-os.org/ticket/5560

Modified:
   haiku/trunk/Jamfile
   haiku/trunk/build/jam/OptionalPackageDependencies
   haiku/trunk/build/jam/OptionalPackages
   haiku/trunk/build/jam/ReleaseBuildProfiles
Log:
 * Introduced "MandatoryPackages", which is added to all default images
 * Renamed "BasicCommandLinesTools" to "Sed"
 * Removed isCDPackage's parameter from "Sed"s InstallOptionalHaikuImagePackage
 * Currently, "MandatoryPackages" only dependency is "Sed"
 * Fixes #5560


Modified: haiku/trunk/Jamfile
===================================================================
--- haiku/trunk/Jamfile 2010-03-12 17:37:11 UTC (rev 35828)
+++ haiku/trunk/Jamfile 2010-03-12 18:03:57 UTC (rev 35829)
@@ -157,6 +157,9 @@
                [ FSplitString $(HAIKU_ADD_OPTIONAL_PACKAGES) : / ] ;
 }
 
+#include packages that are required by all images.
+AddOptionalHaikuImagePackages MandatoryPackages ; 
+
 # Evaluate optional package dependencies and prepare the optional build
 # features before parsing the Jamfile tree.
 include [ FDirName $(HAIKU_BUILD_RULES_DIR) OptionalPackageDependencies ] ;

Modified: haiku/trunk/build/jam/OptionalPackageDependencies
===================================================================
--- haiku/trunk/build/jam/OptionalPackageDependencies   2010-03-12 17:37:11 UTC 
(rev 35828)
+++ haiku/trunk/build/jam/OptionalPackageDependencies   2010-03-12 18:03:57 UTC 
(rev 35829)
@@ -17,6 +17,7 @@
 OptionalPackageDependencies Mercurial : Python ;
 OptionalPackageDependencies Git : Expat Curl OpenSSL ;
 OptionalPackageDependencies Curl : OpenSSL ;
+OptionalPackageDependencies MandatoryPackages : Sed ;
 OptionalPackageDependencies NetFS : UserlandFS ;
 OptionalPackageDependencies Vim : LibIconv ;
 OptionalPackageDependencies XZ-Utils : Tar ;

Modified: haiku/trunk/build/jam/OptionalPackages
===================================================================
--- haiku/trunk/build/jam/OptionalPackages      2010-03-12 17:37:11 UTC (rev 
35828)
+++ haiku/trunk/build/jam/OptionalPackages      2010-03-12 18:03:57 UTC (rev 
35829)
@@ -15,7 +15,6 @@
 #      ABI-compliance-checker  - tool for checking ABI compatibility between 
libs
 #      APR                                             - support libraries 
used for example by Subversion
 #      APR-util                                - Apache portable runtime 
utility library
-#      BasicCommandLineTools   - basic commandline tools
 #      Beam                                    - powerful native e-mail client
 #      BeBook                                  - the classic BeOS API 
documentation
 #      BeHappy                                 - special documentation (i.e. 
BeBook) browser
@@ -55,6 +54,7 @@
 #      Perl                                    - the scripting language
 #      Python                                  - the scripting language
 #      Rsync                                   - remote directory 
synchronization
+#      Sed                                             - the ultimate stream 
editor
 #      SQLite                                  - the database implementation
 #      Subversion                              - the version control system
 #      Tar                                             - archiving utility
@@ -110,20 +110,6 @@
 }
 
 
-# BasicCommandLineTools
-if [ IsOptionalHaikuImagePackageAdded BasicCommandLineTools ] {
-       if $(TARGET_ARCH) != x86 {
-               Echo "No optional package BasicCommandLineTools available for 
$(TARGET_ARCH)" ;
-       } else {
-               # sed
-               InstallOptionalHaikuImagePackage 
sed-4.2.1-r1a1-x86-gcc2-2009-08-30.zip
-                       : $(baseURL)/sed-4.2.1-r1a1-x86-gcc2-2009-08-30.zip
-                       :
-                       : true ;
-       }
-}
-
-
 # Beam
 if [ IsOptionalHaikuImagePackageAdded Beam ] {
        if $(TARGET_ARCH) != x86 {
@@ -928,6 +914,20 @@
 }
 
 
+# Sed
+if [ IsOptionalHaikuImagePackageAdded Sed ] {
+       if $(TARGET_ARCH) != x86 {
+               Echo "No optional package Sed available for $(TARGET_ARCH)" ;
+       } else {
+               InstallOptionalHaikuImagePackage 
sed-4.2.1-r1a1-x86-gcc2-2009-08-30.zip
+                       : $(baseURL)/sed-4.2.1-r1a1-x86-gcc2-2009-08-30.zip
+                       :
+                       :
+               ;
+       }
+}
+
+
 # SQLite
 if [ IsOptionalHaikuImagePackageAdded SQLite ] {
        if $(TARGET_ARCH) != x86 {

Modified: haiku/trunk/build/jam/ReleaseBuildProfiles
===================================================================
--- haiku/trunk/build/jam/ReleaseBuildProfiles  2010-03-12 17:37:11 UTC (rev 
35828)
+++ haiku/trunk/build/jam/ReleaseBuildProfiles  2010-03-12 18:03:57 UTC (rev 
35829)
@@ -14,7 +14,6 @@
                HAIKU_IMAGE_HOST_NAME = shredder ;
                HAIKU_IMAGE_SIZE = 650 ;
 
-               AddOptionalHaikuImagePackages BasicCommandLineTools ;
                AddOptionalHaikuImagePackages BePDF BeZillaBrowser Clockwerk Pe 
Vision
                        VLC WonderBrush ;
                AddOptionalHaikuImagePackages CVS Development Git Mercurial
@@ -34,7 +33,6 @@
                HAIKU_IMAGE_HOST_NAME = shredder ;
                HAIKU_IMAGE_SIZE = 450 ;
 
-               AddOptionalHaikuImagePackages BasicCommandLineTools ;
                AddOptionalHaikuImagePackages Pe Nano Vision P7zip ;
                AddOptionalHaikuImagePackages Development Subversion OpenSSH ;
        }


Other related posts: