Ticket #5110: IncludeSources.patch

configure

@@ -64 +64 @@
                               implement patented ideas and techniques. This
                               option only disables code that is currently known
                               to be problematic.
+  --include-sources           Includes the source code of projects that require
+                              either an offer of source code or a copy of the 
+                              patched sources. This is preferable when
+                              distributing on physical mediums.
   --include-3rdparty          Include 3rdparty/ in the build system.
   -j<n>                       Only relevant for --build-cross-tools and
                               --build-cross-tools-gcc4. Is passed on to the
@@ -355 +359 @@
         --help | -h)    usage; exit 0;;
         --include-gpl-addons)   includeGPLAddOns=1; shift 1;;
         --include-patented-code)    includePatentedCode=1; shift 1;;
+        --include-sources) includeSources=1; shift 1;;
         --include-3rdparty) include3rdParty=1; shift 1;;
         -j*)                buildCrossToolsJobs="$1"; shift 1;;
         --target=*)     target=`echo $1 | cut -d'=' -f2-`; shift 1;;
@@ -476 +481 @@
 
 BOCHS_DEBUG_HACK                    ?= "${bochsDebug}" ;
 INCLUDE_GPL_ADDONS                  ?= "${includeGPLAddOns}" ;
+INCLUDE_SOURCES                     ?= "${includeSources}" ;
 HAIKU_INCLUDE_PATENTED_CODE         ?= "${includePatentedCode}" ;
 HAIKU_INCLUDE_3RDPARTY              ?= "${include3rdParty}" ;
 HAIKU_ENABLE_MULTIUSER              ?= "${enableMultiuser}" ;

build/jam/FileRules

@@ -358 +358 @@
     $(2[1]) $(DATA_VARIABLE) $(SIZE_VARIABLE) $(2[2]) $(1)
 }
 
-rule DownloadFile target : url
+rule DownloadLocatedFile target : url
 {
     URL on $(target) = $(url) ;
 
-    DownloadFile1 $(target) ;
+    DownloadLocatedFile1 $(target) ;
 }
 
-actions DownloadFile1
+actions DownloadLocatedFile1
 {
     wget -O $(1) $(URL)
 }
 
-rule DownloadOptionalPackage package : url
+rule DownloadFile file : url
 {
-    # download zip file
-    local zipFile = $(package:G=download).zip ;
+    file = $(file:G=download) ;
 
     # Request the download only once.
-    if [ on $(zipFile) return $(HAIKU_OPTIONAL_PACKAGE_DOWNLOAD) ] {
-        return $(zipFile) ;
+    if [ on $(file) return $(HAIKU_FILE_DOWNLOAD) ] {
+        return $(file) ;
     }
 
-    HAIKU_OPTIONAL_PACKAGE_DOWNLOAD on $(zipFile) = 1 ;
+    HAIKU_FILE_DOWNLOAD on $(file) = 1 ;
 
-    MakeLocate $(zipFile) : $(HAIKU_DOWNLOAD_DIR) ;
-    DownloadFile $(zipFile) : $(url) ;
+    MakeLocate $(file) : $(HAIKU_DOWNLOAD_DIR) ;
+    DownloadLocatedFile $(file) : $(url) ;
 
-    return $(zipFile) ;
+    return $(file) ;
 }
+
+rule DownloadOptionalPackage package : url
+{
+    return [ DownloadFile $(package).zip : $(url) ] ;
+}

build/jam/ImageRules

@@ -758 +758 @@
     }
 }
 
+rule InstallSourceArchive file : url
+{
+    # download archive file
+    local archiveFile = [ DownloadFile $(file) : $(url) ] ;
+    
+    # copy directly into image
+    AddFilesToHaikuImage develop sources : $(archiveFile) ;
+}
+
 rule InstallOptionalHaikuImagePackage package : url : dirTokens : isCDPackage
 {
     # download zip file