Ticket #4086: newOptPackages2009-07-08a.diff

build/jam/OptionalPackageDependencies

@@ -3 +3 @@
 # For transitive dependencies dependants should be listed before their
 # dependencies.
 
-OptionalPackageDependencies Subversion : APR-util Neon LibIconv LibXML2 OpenSSL SQLite ;
+OptionalPackageDependencies Subversion : APR-util Neon LibIconv LibXML2 OpenSSL SQLite Expat ;
 OptionalPackageDependencies APR-util : APR ;
 OptionalPackageDependencies BeHappy : BeBook NetSurf ;
 OptionalPackageDependencies Development : DevelopmentBase Perl ;

build/jam/OptionalPackages

@@ -26 +26 @@
 #   Development         - more complete dev environment (including autotools)
 #   DevelopmentBase     - basic development environment (gcc, headers, libs,...)
 #   DevelopmentMin      - development headers, libs, tools, from sources only
+#   Expat
 #   Firefox
 #   KeymapSwitcher
 #   LibIconv
@@ -371 +372 @@
 }
 
 
+# Expat
+if [ IsOptionalHaikuImagePackageAdded Expat ] {
+    if $(TARGET_ARCH) != x86 {
+        Echo "No optional package Expat available for $(TARGET_ARCH)" ;
+    } else {
+        InstallOptionalHaikuImagePackage expat-2.0.1-x86-gcc2-2009-07-05
+            : $(baseURL)/expat-2.0.1-x86-gcc2-2009-07-05.zip
+            :
+        ;
+    }
+}
+
+
 # Firefox web browser
 if [ IsOptionalHaikuImagePackageAdded Firefox ] {
     if $(TARGET_ARCH) != x86 {
@@ -574 +588 @@
     if $(TARGET_ARCH) != x86 {
         Echo "No optional package P7zip available for $(TARGET_ARCH)" ;
     } else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
-        Echo "No optional package P7zip available for gcc4" ;
+        InstallOptionalHaikuImagePackage p7zip-9.04-x86-gcc4-haiku-2009-07-07
+            : $(baseURL)/p7zip-9.04-x86-gcc4-haiku-2009-07-07.zip
+            :
+        ;
+
+        actions BuildHaikuImageExpanderRules
+        {
+            echo "\"application/x-7z-compressed\"\t.7z\t\"7za l \0045s\"\t\"7za x -y \0045s\"" > $(1)
+        }
+
+        Always expander.rules ;
+        MakeLocate expander.rules : $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) ;
+        BuildHaikuImageExpanderRules expander.rules ;
+        AddFilesToHaikuImage home config etc : expander.rules ;
     } else {
-        InstallOptionalHaikuImagePackage p7zip-4.65-x86-gcc2-2009-05-24
-            : $(baseURL)/p7zip-4.65-x86-gcc2-2009-05-24.zip
+        InstallOptionalHaikuImagePackage p7zip-9.04-x86-gcc2-haiku-2009-07-07
+            : $(baseURL)/p7zip-9.04-x86-gcc2-haiku-2009-07-07.zip
             :
         ;
 
@@ -635 +662 @@
     if $(TARGET_ARCH) != x86 {
         Echo "No optional package Python available for $(TARGET_ARCH)" ;
     } else {
-        InstallOptionalHaikuImagePackage python-2.6.2-x86-gcc2-2009-05-27
-            : $(baseURL)/python-2.6.2-x86-gcc2-2009-05-27.zip
+        InstallOptionalHaikuImagePackage python-2.6.2-x86-gcc2-haiku-2009-07-07
+            : $(baseURL)/python-2.6.2-x86-gcc2-haiku-2009-07-07.zip
             :
         ;
     }