Ticket #5479: 5479-ExtractArchiveToHaikuImage--implementation-2.patch
File 5479-ExtractArchiveToHaikuImage--implementation-2.patch, 32.7 KB (added by , 14 years ago) |
---|
-
build/jam/FileRules
399 399 return $(file) ; 400 400 } 401 401 402 rule DownloadOptionalPackage package : url403 {404 return [ DownloadFile $(package).zip : $(url) ] ;405 } -
build/jam/ImageRules
273 273 DIRECTORIES_TO_INSTALL on $(directory) += $(targetDir) ; 274 274 } 275 275 276 rule UnzipArchiveToContainer container : directoryTokens : zipFile276 rule ExtractArchiveToContainer container : directoryTokens : archiveFile 277 277 { 278 # UnzipArchiveToContainer <container> : <directory> : <zipFile> ] ;278 # ExtractArchiveToContainer <container> : <directory> : <archiveFile> ] ; 279 279 # 280 280 281 281 local directory = [ AddDirectoryToContainer $(container) 282 282 : $(directoryTokens) ] ; 283 283 284 ZIP_FILES_TO_INSTALL on $(directory) += $(zipFile) ;284 ARCHIVE_FILES_TO_INSTALL on $(directory) += $(archiveFile) ; 285 285 } 286 286 287 287 rule AddDriversToContainer container : relativeDirectoryTokens : targets … … 560 560 } 561 561 562 562 563 rule CreateContainer UnzipFilesScript container : script563 rule CreateContainerExtractFilesScript container : script 564 564 { 565 565 MakeLocate $(script) : $(HAIKU_OUTPUT_DIR) ; 566 566 Always $(script) ; … … 581 581 582 582 local dir ; 583 583 for dir in [ on $(container) return $(HAIKU_INSTALL_DIRECTORIES) ] { 584 local zipFiles = [ on $(dir) return $(ZIP_FILES_TO_INSTALL) ] ;585 local zipFile ;586 for zipFile in $(zipFiles) {584 local archiveFiles = [ on $(dir) return $(ARCHIVE_FILES_TO_INSTALL) ] ; 585 local archiveFile ; 586 for archiveFile in $(archiveFiles) { 587 587 # use a unique dummy target for this file, on which we 588 588 # can define the TARGET_DIR variable 589 local dummyTarget = $(script)-dummy-$(dir:G=)-$( zipFile) ;589 local dummyTarget = $(script)-dummy-$(dir:G=)-$(archiveFile) ; 590 590 NotFile $(dummyTarget) ; 591 591 TARGET_DIR on $(dummyTarget) = $(dir:G=) ; 592 592 593 Depends $(dummyTarget) : $(initScript) $( zipFile)593 Depends $(dummyTarget) : $(initScript) $(archiveFile) 594 594 $(serializationDependency) ; 595 595 Depends $(script) : $(dummyTarget) ; 596 596 serializationDependency = $(dummyTarget) ; 597 597 598 Add UnzipFileToContainerUnzipFilesScript $(dummyTarget)599 : $(initScript) $( zipFile) ;598 AddExtractFileToContainerExtractFilesScript $(dummyTarget) 599 : $(initScript) $(archiveFile) ; 600 600 } 601 601 } 602 602 } 603 603 604 actions AddUnzipFileToContainerUnzipFilesScript 604 605 actions AddExtractFileToContainerExtractFilesScript 605 606 { 606 echo unzipFile "\"$(2[2])\"" "\"$(TARGET_DIR)\"" >> $(2[1])607 echo extractFile "\"$(2[2])\"" "\"$(TARGET_DIR)\"" >> $(2[1]) 607 608 } 608 609 609 610 … … 690 691 : $(dirName) : -x .svn : $(alwaysUpdate) ; 691 692 } 692 693 693 rule UnzipArchiveToHaikuImage dirTokens : zipFile : alwaysUpdate694 rule ExtractArchiveToHaikuImage dirTokens : archiveFile : alwaysUpdate 694 695 { 695 # UnzipArchiveToHaikuImage <dirTokens> : <zipFile> : <alwaysUpdate> ;696 # ExtractArchiveToHaikuImage <dirTokens> : <archiveFile> : <alwaysUpdate> ; 696 697 697 # If the image shall only be updated, we unziponly, if explicitely698 # If the image shall only be updated, we extract only, if explicitely 698 699 # requested. 699 700 if ! [ IsUpdateHaikuImageOnly ] || $(alwaysUpdate) { 700 UnzipArchiveToContainer $(HAIKU_IMAGE_CONTAINER_NAME) : $(dirTokens)701 : $( zipFile) ;701 ExtractArchiveToContainer $(HAIKU_IMAGE_CONTAINER_NAME) : $(dirTokens) 702 : $(archiveFile) ; 702 703 } 703 704 } 704 705 … … 771 772 772 773 rule InstallOptionalHaikuImagePackage package : url : dirTokens : isCDPackage 773 774 { 774 # download zipfile775 local zipFile = [ DownloadOptionalPackage $(package) : $(url) ] ;775 # download archive file 776 local archiveFile = [ DownloadFile $(package) : $(url) ] ; 776 777 777 778 if ( $(isCDPackage) = true || $(isCDPackage) = 1 ) && $(HAIKU_CD_NAME) { 778 779 # TODO: If HAIKU_CD_NAME is set, that doesn't mean we're building a CD 779 780 # image! 780 781 # copy onto image 781 AddFilesToHaikuImage _packages_ : $( zipFile) ;782 AddFilesToHaikuImage _packages_ : $(archiveFile) ; 782 783 } else { 783 # unziponto image784 UnzipArchiveToHaikuImage $(dirTokens) : $(zipFile) ;784 # extract onto image 785 ExtractArchiveToHaikuImage $(dirTokens) : $(archiveFile) ; 785 786 } 786 787 } 787 788 … … 866 867 CreateContainerCopyFilesScript $(HAIKU_IMAGE_CONTAINER_NAME) : $(script) ; 867 868 } 868 869 869 rule CreateHaikuImage UnzipFilesScript script870 rule CreateHaikuImageExtractFilesScript script 870 871 { 871 CreateContainer UnzipFilesScript $(HAIKU_IMAGE_CONTAINER_NAME) : $(script) ;872 CreateContainerExtractFilesScript $(HAIKU_IMAGE_CONTAINER_NAME) : $(script) ; 872 873 } 873 874 874 875 rule BuildHaikuImage haikuImage : scripts : isImage : isVMwareImage -
build/jam/OptionalBuildFeatures
12 12 } 13 13 14 14 local baseURL = http://haiku-files.org/files/optional-packages ; 15 HAIKU_OPENSSL_PACKAGE = openssl-0.9.8l-x86-gcc2-2009-11-08 ;16 HAIKU_OPENSSL_URL = $(baseURL)/$(HAIKU_OPENSSL_PACKAGE) .zip;15 HAIKU_OPENSSL_PACKAGE = openssl-0.9.8l-x86-gcc2-2009-11-08.zip ; 16 HAIKU_OPENSSL_URL = $(baseURL)/$(HAIKU_OPENSSL_PACKAGE) ; 17 17 18 18 if $(HAIKU_BUILD_FEATURE_SSL) { 19 19 if $(TARGET_ARCH) != x86 { 20 20 Echo "SSL build feature not available for $(TARGET_ARCH)" ; 21 21 } else { 22 22 # Download the zip archive. 23 local zipFile = [ Download OptionalPackage $(HAIKU_OPENSSL_PACKAGE)23 local zipFile = [ DownloadFile $(HAIKU_OPENSSL_PACKAGE) 24 24 : $(HAIKU_OPENSSL_URL) ] ; 25 25 26 26 # zip file and output directory 27 27 HAIKU_OPENSSL_ZIP_FILE = $(zipFile) ; 28 28 HAIKU_OPENSSL_DIR = [ FDirName $(HAIKU_OPTIONAL_BUILD_PACKAGES_DIR) 29 $(HAIKU_OPENSSL_PACKAGE ) ] ;29 $(HAIKU_OPENSSL_PACKAGE:B) ] ; 30 30 31 # unzipheaders and libraries31 # extract headers and libraries 32 32 HAIKU_OPENSSL_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_OPENSSL_DIR) 33 33 : common/include/ : $(zipFile) 34 34 ] ; -
build/jam/HaikuImage
657 657 : "haiku-alternative-gcc-archive" ; 658 658 659 659 # install the alternative libs in the right directory 660 UnzipArchiveToHaikuImage : $(otherAlternativeSystemLibsZip) ;660 ExtractArchiveToHaikuImage : $(otherAlternativeSystemLibsZip) ; 661 661 } 662 662 663 663 … … 749 749 # create the other scripts 750 750 HAIKU_IMAGE_MAKE_DIRS_SCRIPT = <HaikuImage>haiku.image-make-dirs ; 751 751 HAIKU_IMAGE_COPY_FILES_SCRIPT = <HaikuImage>haiku.image-copy-files ; 752 HAIKU_IMAGE_ UNZIP_FILES_SCRIPT = <HaikuImage>haiku.image-unzip-files ;752 HAIKU_IMAGE_EXTRACT_FILES_SCRIPT = <HaikuImage>haiku.image-extract-files ; 753 753 MakeLocate $(HAIKU_IMAGE_MAKE_DIRS_SCRIPT) $(HAIKU_IMAGE_COPY_FILES_SCRIPT) 754 $(HAIKU_IMAGE_ UNZIP_FILES_SCRIPT) : $(HAIKU_OUTPUT_DIR) ;754 $(HAIKU_IMAGE_EXTRACT_FILES_SCRIPT) : $(HAIKU_OUTPUT_DIR) ; 755 755 756 756 CreateHaikuImageMakeDirectoriesScript $(HAIKU_IMAGE_MAKE_DIRS_SCRIPT) ; 757 757 CreateHaikuImageCopyFilesScript $(HAIKU_IMAGE_COPY_FILES_SCRIPT) ; 758 CreateHaikuImage UnzipFilesScript $(HAIKU_IMAGE_UNZIP_FILES_SCRIPT) ;758 CreateHaikuImageExtractFilesScript $(HAIKU_IMAGE_EXTRACT_FILES_SCRIPT) ; 759 759 760 760 # Convenience wrapper rule around BuildHaikuImage. 761 761 rule _BuildHaikuImage image : isImage : isVMwareImage … … 771 771 $(HAIKU_IMAGE_EARLY_USER_SCRIPTS) 772 772 $(HAIKU_IMAGE_MAKE_DIRS_SCRIPT) 773 773 $(HAIKU_IMAGE_COPY_FILES_SCRIPT) 774 $(HAIKU_IMAGE_ UNZIP_FILES_SCRIPT)774 $(HAIKU_IMAGE_EXTRACT_FILES_SCRIPT) 775 775 $(HAIKU_IMAGE_LATE_USER_SCRIPTS) 776 776 : $(isImage) 777 777 : $(isVMwareImage) … … 782 782 $(HAIKU_IMAGE_INIT_VARIABLES_SCRIPT) 783 783 $(HAIKU_IMAGE_MAKE_DIRS_SCRIPT) 784 784 $(HAIKU_IMAGE_COPY_FILES_SCRIPT) 785 $(HAIKU_IMAGE_ UNZIP_FILES_SCRIPT)785 $(HAIKU_IMAGE_EXTRACT_FILES_SCRIPT) 786 786 ; 787 787 } 788 788 -
build/jam/HaikuCD
50 50 $(HAIKU_IMAGE_EARLY_USER_SCRIPTS) 51 51 $(HAIKU_IMAGE_MAKE_DIRS_SCRIPT) 52 52 $(HAIKU_IMAGE_COPY_FILES_SCRIPT) 53 $(HAIKU_IMAGE_ UNZIP_FILES_SCRIPT)53 $(HAIKU_IMAGE_EXTRACT_FILES_SCRIPT) 54 54 $(HAIKU_IMAGE_LATE_USER_SCRIPTS) 55 55 ; 56 56 … … 59 59 $(HAIKU_CD_INIT_VARIABLES_SCRIPT) 60 60 $(HAIKU_IMAGE_MAKE_DIRS_SCRIPT) 61 61 $(HAIKU_IMAGE_COPY_FILES_SCRIPT) 62 $(HAIKU_IMAGE_ UNZIP_FILES_SCRIPT)62 $(HAIKU_IMAGE_EXTRACT_FILES_SCRIPT) 63 63 ; 64 64 } 65 65 -
build/jam/UserBuildConfig.ReadMe
122 122 : $(HAIKU_TOP)/../buildtools/jam 123 123 : "jam-src" : -x .svn -X \\*/jam/./bin.\\* ; 124 124 125 # Unzips the given ziparchive onto the image under /boot/develop/tools.126 UnzipArchiveToHaikuImage develop tools125 # Extracts the given archive onto the image under /boot/develop/tools. 126 ExtractArchiveToHaikuImage develop tools 127 127 : /home/bonefish/develop/haiku/misc/gcc-2.95.3-beos-070218/gcc-2.95.3_binutils-2.17_rel-070218.zip ; 128 128 129 129 # Add the optional package WonderBrush to the image. The package is downloaded -
build/jam/OptionalPackages
77 77 Echo "No optional package ABI-compliance-checker for gcc2" ; 78 78 } else { 79 79 InstallOptionalHaikuImagePackage 80 ABI-compliance-checker-1.12-noarch-gcc4-2010-02-01 80 ABI-compliance-checker-1.12-noarch-gcc4-2010-02-01.zip 81 81 : $(baseURL)/ABI-compliance-checker-1.12-noarch-gcc4-2010-02-01.zip 82 82 ; 83 83 } … … 89 89 if $(TARGET_ARCH) != x86 { 90 90 Echo "No optional package APR available for $(TARGET_ARCH)" ; 91 91 } else { 92 InstallOptionalHaikuImagePackage apr-1.3.9-x86-gcc2-2009-10-18 92 InstallOptionalHaikuImagePackage apr-1.3.9-x86-gcc2-2009-10-18.zip 93 93 : $(baseURL)/apr-1.3.9-x86-gcc2-2009-10-18.zip 94 94 : 95 95 : true … … 103 103 if $(TARGET_ARCH) != x86 { 104 104 Echo "No optional package APR-util available for $(TARGET_ARCH)" ; 105 105 } else { 106 InstallOptionalHaikuImagePackage apr-util-1.3.9-r1a1-x86-gcc2-2009-08-29 106 InstallOptionalHaikuImagePackage apr-util-1.3.9-r1a1-x86-gcc2-2009-08-29.zip 107 107 : $(baseURL)/apr-util-1.3.9-r1a1-x86-gcc2-2009-08-29.zip 108 108 : 109 109 : true … … 118 118 Echo "No optional package BasicCommandLineTools available for $(TARGET_ARCH)" ; 119 119 } else { 120 120 # sed 121 InstallOptionalHaikuImagePackage sed-4.2.1-r1a1-x86-gcc2-2009-08-30 121 InstallOptionalHaikuImagePackage sed-4.2.1-r1a1-x86-gcc2-2009-08-30.zip 122 122 : $(baseURL)/sed-4.2.1-r1a1-x86-gcc2-2009-08-30.zip 123 123 : 124 124 : true ; … … 133 133 } else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) { 134 134 Echo "No optional package Beam available for gcc4" ; 135 135 } else { 136 InstallOptionalHaikuImagePackage Beam-1.2alpha 136 InstallOptionalHaikuImagePackage Beam-1.2alpha.zip 137 137 : $(baseURL)/Beam-1.2alpha-x86-gcc2-2009-09-29.zip 138 138 : apps 139 139 ; … … 145 145 146 146 # BeBook 147 147 if [ IsOptionalHaikuImagePackageAdded BeBook ] { 148 InstallOptionalHaikuImagePackage bebook_20081026 148 InstallOptionalHaikuImagePackage bebook_20081026.zip 149 149 : $(baseURL)/bebook_20081026.zip 150 150 : system documentation 151 151 ; … … 161 161 } else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) { 162 162 Echo "No optional package BeHappy available for gcc4" ; 163 163 } else { 164 InstallOptionalHaikuImagePackage BeHappy-1.0.6-x86-gcc2-2008-10-16 164 InstallOptionalHaikuImagePackage BeHappy-1.0.6-x86-gcc2-2008-10-16.zip 165 165 : $(baseURL)/BeHappy-1.0.6-x86-gcc2-2008-10-16.zip 166 166 : 167 167 ; … … 199 199 } else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) { 200 200 Echo "No optional package BePDF available for gcc4" ; 201 201 } else { 202 InstallOptionalHaikuImagePackage BePDF-1.1.1b2-r1a1-x86-gcc2-2009-09-03 202 InstallOptionalHaikuImagePackage BePDF-1.1.1b2-r1a1-x86-gcc2-2009-09-03.zip 203 203 : $(baseURL)/BePDF-1.1.1b2-r1a1-x86-gcc2-2009-09-03.zip 204 204 : apps 205 205 ; … … 216 216 Echo "No optional package BeZillaBrowser available for $(TARGET_ARCH)" ; 217 217 } else if $(HAIKU_GCC_VERSION[1]) >= 4 { 218 218 InstallOptionalHaikuImagePackage 219 BeZillaBrowser-2.0.0.22pre-x86-gcc4-2010-01-27 219 BeZillaBrowser-2.0.0.22pre-x86-gcc4-2010-01-27.zip 220 220 : $(baseURL)/BeZillaBrowser-2.0.0.22pre-x86-gcc4-2010-01-27.zip 221 221 : 222 222 ; … … 224 224 : /boot/apps/BeZillaBrowser/BeZillaBrowser ; 225 225 } else { 226 226 InstallOptionalHaikuImagePackage 227 BeZillaBrowser-2.0.0.22pre-x86-gcc2-2010-01-27 227 BeZillaBrowser-2.0.0.22pre-x86-gcc2-2010-01-27.zip 228 228 : $(baseURL)/BeZillaBrowser-2.0.0.22pre-x86-gcc2-2010-01-27.zip 229 229 : 230 230 ; … … 261 261 if $(TARGET_ARCH) != x86 { 262 262 Echo "No optional package Bzip available for $(TARGET_ARCH)" ; 263 263 } else { 264 InstallOptionalHaikuImagePackage bzip2-1.0.5-x86-gcc2-2009-12-27 264 InstallOptionalHaikuImagePackage bzip2-1.0.5-x86-gcc2-2009-12-27.zip 265 265 : $(baseURL)/bzip2-1.0.5-x86-gcc2-2009-12-27.zip 266 266 : 267 267 : true … … 275 275 if $(TARGET_ARCH) != x86 { 276 276 Echo "No optional package CDRecord available for $(TARGET_ARCH)" ; 277 277 } else { 278 InstallOptionalHaikuImagePackage cdrecord-2.01.01a63-r1a1-x86-gcc2-2009-08-28 278 InstallOptionalHaikuImagePackage cdrecord-2.01.01a63-r1a1-x86-gcc2-2009-08-28.zip 279 279 : $(baseURL)/cdrecord-2.01.01a63-r1a1-x86-gcc2-2009-08-28.zip 280 280 : 281 281 ; … … 288 288 if $(TARGET_ARCH) != x86 { 289 289 Echo "No optional package Clockwerk available for $(TARGET_ARCH)" ; 290 290 } else if $(HAIKU_GCC_VERSION[1]) >= 4 { 291 InstallOptionalHaikuImagePackage Clockwerk-0.0.1-x86-gcc4-2009-08-06 291 InstallOptionalHaikuImagePackage Clockwerk-0.0.1-x86-gcc4-2009-08-06.zip 292 292 : $(baseURL)/Clockwerk-0.0.1-x86-gcc4-2009-08-06.zip 293 293 : 294 294 ; 295 295 AddSymlinkToHaikuImage home config be Applications 296 296 : /boot/apps/Clockwerk/Clockwerk ; 297 297 } else { 298 InstallOptionalHaikuImagePackage Clockwerk-0.0.1-x86-gcc2-2009-08-06 298 InstallOptionalHaikuImagePackage Clockwerk-0.0.1-x86-gcc2-2009-08-06.zip 299 299 : $(baseURL)/Clockwerk-0.0.1-x86-gcc2-2009-08-06.zip 300 300 : 301 301 ; … … 313 313 Echo "No optional package CLucene available for GCC2" ; 314 314 } else { 315 315 InstallOptionalHaikuImagePackage 316 clucene-0.9.21svn-x86-gcc4-haiku-2009-08-11 316 clucene-0.9.21svn-x86-gcc4-haiku-2009-08-11.zip 317 317 : $(baseURL)/clucene-0.9.21-x86-gcc4-haiku-2009-08-11.zip 318 318 : 319 319 : true … … 327 327 if $(TARGET_ARCH) != x86 { 328 328 Echo "No optional package CMake available for $(TARGET_ARCH)" ; 329 329 } else { 330 InstallOptionalHaikuImagePackage cmake-2.8.0-x86-gcc2-2009-11-15 330 InstallOptionalHaikuImagePackage cmake-2.8.0-x86-gcc2-2009-11-15.zip 331 331 : $(baseURL)/cmake-2.8.0-x86-gcc2-2009-11-15.zip 332 332 : 333 333 : true … … 341 341 if $(TARGET_ARCH) != x86 { 342 342 Echo "No optional package Curl available for $(TARGET_ARCH)" ; 343 343 } else { 344 InstallOptionalHaikuImagePackage curl-7.19.6-r1a1-x86-gcc2-2009-08-30 344 InstallOptionalHaikuImagePackage curl-7.19.6-r1a1-x86-gcc2-2009-08-30.zip 345 345 : $(baseURL)/curl-7.19.6-r1a1-x86-gcc2-2009-08-30.zip 346 346 : 347 347 : true … … 355 355 if $(TARGET_ARCH) != x86 { 356 356 Echo "No optional package CVS available for $(TARGET_ARCH)" ; 357 357 } else { 358 InstallOptionalHaikuImagePackage cvs-1.12.13-r1a1-x86-gcc2-2009-08-30 358 InstallOptionalHaikuImagePackage cvs-1.12.13-r1a1-x86-gcc2-2009-08-30.zip 359 359 : $(baseURL)/cvs-1.12.13-r1a1-x86-gcc2-2009-08-30.zip 360 360 : 361 361 : true … … 367 367 # Development 368 368 if [ IsOptionalHaikuImagePackageAdded Development ] && $(TARGET_ARCH) = x86 { 369 369 # autotools 370 InstallOptionalHaikuImagePackage autoconf-2.65-x86-gcc2-2009-11-28 370 InstallOptionalHaikuImagePackage autoconf-2.65-x86-gcc2-2009-11-28.zip 371 371 : $(baseURL)/autoconf-2.65-x86-gcc2-2009-11-28.zip 372 372 : 373 373 : true ; 374 InstallOptionalHaikuImagePackage automake-1.11.1-x86-gcc2-2009-12-23 374 InstallOptionalHaikuImagePackage automake-1.11.1-x86-gcc2-2009-12-23.zip 375 375 : $(baseURL)/automake-1.11.1-x86-gcc2-2009-12-23.zip 376 376 : 377 377 : true ; 378 InstallOptionalHaikuImagePackage libtool-2.2.6b-x86-gcc2-2009-11-18 378 InstallOptionalHaikuImagePackage libtool-2.2.6b-x86-gcc2-2009-11-18.zip 379 379 : $(baseURL)/libtool-2.2.6b-x86-gcc2-2009-11-18.zip 380 380 : 381 381 : true ; 382 InstallOptionalHaikuImagePackage texinfo-4.13a-r1a1-x86-gcc2-2009-08-30 382 InstallOptionalHaikuImagePackage texinfo-4.13a-r1a1-x86-gcc2-2009-08-30.zip 383 383 : $(baseURL)/texinfo-4.13a-r1a1-x86-gcc2-2009-08-30.zip 384 384 : 385 385 : true ; … … 391 391 && $(TARGET_ARCH) = x86 { 392 392 # gcc and binutils 393 393 if $(HAIKU_GCC_VERSION[1]) = 2 || $(isHybridBuild) { 394 InstallOptionalHaikuImagePackage gcc-2.95.3-r1a1-x86-gcc2-2009-08-26 394 InstallOptionalHaikuImagePackage gcc-2.95.3-r1a1-x86-gcc2-2009-08-26.zip 395 395 : $(baseURL)/gcc-2.95.3-r1a1-x86-gcc2-2009-08-26.zip ; 396 396 } 397 397 398 398 if $(HAIKU_GCC_VERSION[1]) = 4 || $(isHybridBuild) { 399 InstallOptionalHaikuImagePackage gcc-4.3.3-r1a1-x86-gcc4-2009-06-29 399 InstallOptionalHaikuImagePackage gcc-4.3.3-r1a1-x86-gcc4-2009-06-29.zip 400 400 : $(baseURL)/gcc-4.3.3-r1a1-x86-gcc4-2009-06-29.zip ; 401 401 402 402 # symlink cpp to g++'s headers … … 405 405 } 406 406 407 407 # other commonly used tools 408 InstallOptionalHaikuImagePackage bison-2.4.1-r1a1-x86-gcc2-2009-08-31 408 InstallOptionalHaikuImagePackage bison-2.4.1-r1a1-x86-gcc2-2009-08-31.zip 409 409 : $(baseURL)/bison-2.4.1-r1a1-x86-gcc2-2009-08-31.zip ; 410 InstallOptionalHaikuImagePackage m4-1.4.13-r1a1-x86-gcc2-2009-08-28 410 InstallOptionalHaikuImagePackage m4-1.4.13-r1a1-x86-gcc2-2009-08-28.zip 411 411 : $(baseURL)/m4-1.4.13-r1a1-x86-gcc2-2009-08-28.zip ; 412 InstallOptionalHaikuImagePackage flex-2.5.35-r1a1-x86-gcc2-2009-08-31 412 InstallOptionalHaikuImagePackage flex-2.5.35-r1a1-x86-gcc2-2009-08-31.zip 413 413 : $(baseURL)/flex-2.5.35-r1a1-x86-gcc2-2009-08-31.zip ; 414 InstallOptionalHaikuImagePackage jam-2.5-r1a1-x86-gcc2-2009-08-31 414 InstallOptionalHaikuImagePackage jam-2.5-r1a1-x86-gcc2-2009-08-31.zip 415 415 : $(baseURL)/jam-2.5-r1a1-x86-gcc2-2009-08-31.zip ; 416 416 417 417 } … … 534 534 if $(TARGET_ARCH) != x86 { 535 535 Echo "No optional package Expat available for $(TARGET_ARCH)" ; 536 536 } else { 537 InstallOptionalHaikuImagePackage expat-2.0.1-r1a1-x86-gcc2-2009-08-30 537 InstallOptionalHaikuImagePackage expat-2.0.1-r1a1-x86-gcc2-2009-08-30.zip 538 538 : $(baseURL)/expat-2.0.1-r1a1-x86-gcc2-2009-08-30.zip 539 539 : 540 540 : true … … 555 555 if $(TARGET_ARCH) != x86 { 556 556 Echo "No optional package Git available for $(TARGET_ARCH)" ; 557 557 } else { 558 InstallOptionalHaikuImagePackage git-1.6.4.2-r1a1-x86-gcc2-2009-08-30 558 InstallOptionalHaikuImagePackage git-1.6.4.2-r1a1-x86-gcc2-2009-08-30.zip 559 559 : $(baseURL)/git-1.6.4.2-r1a1-x86-gcc2-2009-08-30.zip 560 560 : 561 561 : true … … 566 566 567 567 # ICU-devel 568 568 if [ IsOptionalHaikuImagePackageAdded ICU-devel ] { 569 InstallOptionalHaikuImagePackage icu-devel-4.2-2010-01-26 569 InstallOptionalHaikuImagePackage icu-devel-4.2-2010-01-26.zip 570 570 : $(baseURL)/icu-devel-4.2-2010-01-26.zip 571 571 ; 572 572 } … … 578 578 Echo "No optional package KeymapSwitcher available for $(TARGET_ARCH)" ; 579 579 } else if $(HAIKU_GCC_VERSION[1]) >= 4 { 580 580 InstallOptionalHaikuImagePackage 581 KeymapSwitcher-1.2.3-x86-gcc4-2009-05-31 581 KeymapSwitcher-1.2.3-x86-gcc4-2009-05-31.zip 582 582 : $(baseURL)/KeymapSwitcher-1.2.3-x86-gcc4-2009-05-31.zip 583 583 : 584 584 ; … … 586 586 : /boot/common/bin/KeymapSwitcher ; 587 587 } else { 588 588 InstallOptionalHaikuImagePackage 589 KeymapSwitcher-1.2.4-r1a1-x86-gcc2-2009-09-06 589 KeymapSwitcher-1.2.4-r1a1-x86-gcc2-2009-09-06.zip 590 590 : $(baseURL)/KeymapSwitcher-1.2.4-r1a1-x86-gcc2-2009-09-06.zip 591 591 : 592 592 ; … … 601 601 if $(TARGET_ARCH) != x86 { 602 602 Echo "No optional package LibIconv available for $(TARGET_ARCH)" ; 603 603 } else { 604 InstallOptionalHaikuImagePackage libiconv-1.13.1-r1a1-x86-gcc2-2009-09-08 604 InstallOptionalHaikuImagePackage libiconv-1.13.1-r1a1-x86-gcc2-2009-09-08.zip 605 605 : $(baseURL)/libiconv-1.13.1-r1a1-x86-gcc2-2009-09-08.zip 606 606 : 607 607 ; … … 616 616 } else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) { 617 617 Echo "No optional package LibLayout available for gcc4" ; 618 618 } else { 619 InstallOptionalHaikuImagePackage liblayout-1.4.0-gcc2-2009-03-08 619 InstallOptionalHaikuImagePackage liblayout-1.4.0-gcc2-2009-03-08.zip 620 620 : $(baseURL)/liblayout-1.4.0-gcc2-2009-03-08.zip 621 621 : 622 622 ; … … 629 629 if $(TARGET_ARCH) != x86 { 630 630 Echo "No optional package LibXML2 available for $(TARGET_ARCH)" ; 631 631 } else { 632 InstallOptionalHaikuImagePackage libxml2-2.7.6-x86-gcc2-2009-10-19 632 InstallOptionalHaikuImagePackage libxml2-2.7.6-x86-gcc2-2009-10-19.zip 633 633 : $(baseURL)/libxml2-2.7.6-x86-gcc2-2009-10-19.zip 634 634 : 635 635 : true … … 645 645 } else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) { 646 646 Echo "No optional package Links available for gcc4" ; 647 647 } else { 648 InstallOptionalHaikuImagePackage Links 648 InstallOptionalHaikuImagePackage Links.zip 649 649 : $(baseURL)/links-x86-gcc2-2008-05-03.zip 650 650 : 651 651 ; … … 660 660 if $(TARGET_ARCH) != x86 { 661 661 Echo "No optional package Mercurial available for $(TARGET_ARCH)" ; 662 662 } else { 663 InstallOptionalHaikuImagePackage mercurial-1.3.1-r1a1-x86-gcc2-2009-08-30 663 InstallOptionalHaikuImagePackage mercurial-1.3.1-r1a1-x86-gcc2-2009-08-30.zip 664 664 : $(baseURL)/mercurial-1.3.1-r1a1-x86-gcc2-2009-08-30.zip 665 665 : 666 666 : true … … 674 674 if $(TARGET_ARCH) != x86 { 675 675 Echo "No optional package Nano available for $(TARGET_ARCH)" ; 676 676 } else { 677 InstallOptionalHaikuImagePackage nano-2.0.9-r1a1-x86-gcc2-2009-08-30 677 InstallOptionalHaikuImagePackage nano-2.0.9-r1a1-x86-gcc2-2009-08-30.zip 678 678 : $(baseURL)/nano-2.0.9-r1a1-x86-gcc2-2009-08-30.zip 679 679 : 680 680 ; … … 687 687 if $(TARGET_ARCH) != x86 { 688 688 Echo "No optional package Neon available for $(TARGET_ARCH)" ; 689 689 } else { 690 InstallOptionalHaikuImagePackage neon-0.29.1-x86-gcc2-2009-12-26 690 InstallOptionalHaikuImagePackage neon-0.29.1-x86-gcc2-2009-12-26.zip 691 691 : $(baseURL)/neon-0.29.1-x86-gcc2-2009-12-26.zip 692 692 : 693 693 : true … … 732 732 } else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) { 733 733 Echo "No optional package NetSurf available for gcc4" ; 734 734 } else { 735 InstallOptionalHaikuImagePackage NetSurf-r9862b 735 InstallOptionalHaikuImagePackage NetSurf-r9862b.zip 736 736 : $(baseURL)/NetSurf-r9862-x86-gcc2-2010-01-27.zip 737 737 : 738 738 ; … … 749 749 } else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) { 750 750 Echo "No optional package OCaml available for gcc4" ; 751 751 } else { 752 InstallOptionalHaikuImagePackage ocaml-3.11.1-r1a1-x86-gcc2-2009-09-06 752 InstallOptionalHaikuImagePackage ocaml-3.11.1-r1a1-x86-gcc2-2009-09-06.zip 753 753 : http://jerome.duval.free.fr/obos/ocaml-3.11.1-r1a1-x86-gcc2-2009-09-06.zip 754 754 : 755 755 ; 756 InstallOptionalHaikuImagePackage camlp5-5.12-r1a1-x86-gcc2-2009-09-06 756 InstallOptionalHaikuImagePackage camlp5-5.12-r1a1-x86-gcc2-2009-09-06.zip 757 757 : http://jerome.duval.free.fr/obos/camlp5-5.12-r1a1-x86-gcc2-2009-09-06.zip 758 758 : 759 759 ; … … 766 766 if $(TARGET_ARCH) != x86 { 767 767 Echo "No optional package OpenSound available for $(TARGET_ARCH)" ; 768 768 } else { 769 InstallOptionalHaikuImagePackage OpenSound 769 InstallOptionalHaikuImagePackage OpenSound.zip 770 770 : $(baseURL)/OpenSound-x86-gcc2-2008-06-21.zip 771 771 : 772 772 ; 773 773 } 774 # UnzipArchiveToHaikuImage home : data/vv.mp3.zip : 0 ;774 #ExtractArchiveToHaikuImage home : data/vv.mp3.zip : 0 ; 775 775 } 776 776 777 777 … … 785 785 "variable to be set!" ; 786 786 } 787 787 788 InstallOptionalHaikuImagePackage openssh-5.3p1-r1a1-x86-gcc2-2009-10-11 788 InstallOptionalHaikuImagePackage openssh-5.3p1-r1a1-x86-gcc2-2009-10-11.zip 789 789 : $(baseURL)/openssh-5.3p1-r1a1-x86-gcc2-2009-10-11.zip 790 790 : 791 791 ; … … 815 815 Echo "No optional package P7zip available for $(TARGET_ARCH)" ; 816 816 } else { 817 817 if $(HAIKU_GCC_VERSION[1]) >= 4 { 818 InstallOptionalHaikuImagePackage p7zip-9.04-x86-gcc4-2009-10-25 818 InstallOptionalHaikuImagePackage p7zip-9.04-x86-gcc4-2009-10-25.zip 819 819 : $(baseURL)/p7zip-9.04-x86-gcc4-2009-10-25.zip 820 820 : 821 821 ; 822 822 } else { 823 InstallOptionalHaikuImagePackage p7zip-9.04-x86-gcc2-2009-10-25 823 InstallOptionalHaikuImagePackage p7zip-9.04-x86-gcc2-2009-10-25.zip 824 824 : $(baseURL)/p7zip-9.04-x86-gcc2-2009-10-25.zip 825 825 : 826 826 ; … … 845 845 Echo "No optional package PCRE available for $(TARGET_ARCH)" ; 846 846 } else { 847 847 if $(HAIKU_GCC_VERSION[1]) >= 4 { 848 InstallOptionalHaikuImagePackage pcre-7.9-x86-gcc4-2009-09-30 848 InstallOptionalHaikuImagePackage pcre-7.9-x86-gcc4-2009-09-30.zip 849 849 : $(baseURL)/pcre-7.9-x86-gcc4-2009-09-30.zip 850 850 ; 851 851 } else { 852 InstallOptionalHaikuImagePackage pcre-7.9-x86-gcc2-2009-09-30 852 InstallOptionalHaikuImagePackage pcre-7.9-x86-gcc2-2009-09-30.zip 853 853 : $(baseURL)/pcre-7.9-x86-gcc2-2009-09-30.zip 854 854 ; 855 855 } … … 863 863 Echo "No optional package Pe available for $(TARGET_ARCH)" ; 864 864 } else { 865 865 if $(HAIKU_GCC_VERSION[1]) >= 4 { 866 InstallOptionalHaikuImagePackage Pe-2.4.2-x86-gcc4-2009-08-04 866 InstallOptionalHaikuImagePackage Pe-2.4.2-x86-gcc4-2009-08-04.zip 867 867 : $(baseURL)/Pe-2.4.2-x86-gcc4-2009-08-04.zip 868 868 ; 869 869 } else { 870 InstallOptionalHaikuImagePackage Pe-2.4.2-r593-r1a1-x86-gcc2-2009-09-08 870 InstallOptionalHaikuImagePackage Pe-2.4.2-r593-r1a1-x86-gcc2-2009-09-08.zip 871 871 : $(baseURL)/Pe-2.4.2-r593-r1a1-x86-gcc2-2009-09-08.zip 872 872 ; 873 873 } … … 885 885 if $(TARGET_ARCH) != x86 { 886 886 Echo "No optional package Perl available for $(TARGET_ARCH)" ; 887 887 } else { 888 InstallOptionalHaikuImagePackage perl-5.10.1-r1a1-x86-gcc2-2009-09-08 888 InstallOptionalHaikuImagePackage perl-5.10.1-r1a1-x86-gcc2-2009-09-08.zip 889 889 : $(baseURL)/perl-5.10.1-r1a1-x86-gcc2-2009-09-08.zip 890 890 : 891 891 : true … … 899 899 if $(TARGET_ARCH) != x86 { 900 900 Echo "No optional package Python available for $(TARGET_ARCH)" ; 901 901 } else { 902 InstallOptionalHaikuImagePackage python-2.6.4-x86-gcc2-2009-11-26 902 InstallOptionalHaikuImagePackage python-2.6.4-x86-gcc2-2009-11-26.zip 903 903 : $(baseURL)/python-2.6.4-x86-gcc2-2009-11-26.zip 904 904 : 905 905 : true … … 913 913 if $(TARGET_ARCH) != x86 { 914 914 Echo "No optional package Rsync available for $(TARGET_ARCH)" ; 915 915 } else { 916 InstallOptionalHaikuImagePackage rsync-3.0.7-x86-gcc2-2010-01-05 916 InstallOptionalHaikuImagePackage rsync-3.0.7-x86-gcc2-2010-01-05.zip 917 917 : $(baseURL)/rsync-3.0.7-x86-gcc2-2010-01-05.zip 918 918 : 919 919 ; … … 926 926 if $(TARGET_ARCH) != x86 { 927 927 Echo "No optional package SQLite available for $(TARGET_ARCH)" ; 928 928 } else { 929 InstallOptionalHaikuImagePackage sqlite-3.6.17-r1a1-x86-gcc2-2009-08-30 929 InstallOptionalHaikuImagePackage sqlite-3.6.17-r1a1-x86-gcc2-2009-08-30.zip 930 930 : $(baseURL)/sqlite-3.6.17-r1a1-x86-gcc2-2009-08-30.zip 931 931 : 932 932 : true … … 940 940 if $(TARGET_ARCH) != x86 { 941 941 Echo "No optional package Subversion available for $(TARGET_ARCH)" ; 942 942 } else { 943 InstallOptionalHaikuImagePackage subversion-1.6.5-r1a1-x86-gcc2-2009-09-02 943 InstallOptionalHaikuImagePackage subversion-1.6.5-r1a1-x86-gcc2-2009-09-02.zip 944 944 : $(baseURL)/subversion-1.6.5-r1a1-x86-gcc2-2009-09-02.zip 945 945 : 946 946 : true … … 954 954 if $(TARGET_ARCH) != x86 { 955 955 Echo "No optional package Tar available for $(TARGET_ARCH)" ; 956 956 } else { 957 InstallOptionalHaikuImagePackage tar-1.21-gcc2-2009-02-08 957 InstallOptionalHaikuImagePackage tar-1.21-gcc2-2009-02-08.zip 958 958 : $(baseURL)/tar-1.21-gcc2-2009-02-08.zip 959 959 : 960 960 ; … … 1020 1020 if $(TARGET_ARCH) != x86 { 1021 1021 Echo "No optional package Vim available for $(TARGET_ARCH)" ; 1022 1022 } else if $(HAIKU_GCC_VERSION[1]) >= 4 { 1023 InstallOptionalHaikuImagePackage vim-7.2-x86-gcc4-2009-05-31 1023 InstallOptionalHaikuImagePackage vim-7.2-x86-gcc4-2009-05-31.zip 1024 1024 : $(baseURL)/vim-7.2-x86-gcc4-2009-05-31.zip 1025 1025 : 1026 1026 ; 1027 1027 AddSymlinkToHaikuImage home config be Applications 1028 1028 : /boot/common/bin/gvim ; 1029 1029 } else { 1030 InstallOptionalHaikuImagePackage vim-7.2-r1a1-x86-gcc2-2009-09-06 1030 InstallOptionalHaikuImagePackage vim-7.2-r1a1-x86-gcc2-2009-09-06.zip 1031 1031 : $(baseURL)/vim-7.2-r1a1-x86-gcc2-2009-09-06.zip 1032 1032 : 1033 1033 ; … … 1042 1042 if $(TARGET_ARCH) != x86 { 1043 1043 Echo "No optional package Vision available for $(TARGET_ARCH)" ; 1044 1044 } else if $(HAIKU_GCC_VERSION[1]) >= 4 { 1045 InstallOptionalHaikuImagePackage Vision-0.9.7-H-090423-1 1045 InstallOptionalHaikuImagePackage Vision-0.9.7-H-090423-1.zip 1046 1046 : $(baseURL)/Vision-0.9.7-H-x86-gcc4-2009-04-23.zip 1047 1047 : apps 1048 1048 ; 1049 1049 AddSymlinkToHaikuImage home config be Applications 1050 1050 : /boot/apps/Vision-0.9.7-H-090423/Vision ; 1051 1051 } else { 1052 InstallOptionalHaikuImagePackage Vision-0.9.7-H-090423 1052 InstallOptionalHaikuImagePackage Vision-0.9.7-H-090423.zip 1053 1053 : $(baseURL)/Vision-0.9.7-H-x86-gcc2-2009-04-23.zip 1054 1054 : apps 1055 1055 ; … … 1066 1066 } else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) { 1067 1067 Echo "No optional package VLC available for gcc4" ; 1068 1068 } else { 1069 InstallOptionalHaikuImagePackage VLC-0.8.6d 1069 InstallOptionalHaikuImagePackage VLC-0.8.6d.zip 1070 1070 : $(baseURL)/vlc-0.8.6d-gcc2-2009-04-18.zip 1071 1071 : apps 1072 1072 ; … … 1105 1105 Echo "No optional package Wifi-ipw2100+fw available for $(TARGET_ARCH)" ; 1106 1106 } else { 1107 1107 AddDriversToHaikuImage net : ipw2100 ; 1108 InstallOptionalHaikuImagePackage ipw2100-firmware-installer-2009-12-26b 1108 InstallOptionalHaikuImagePackage ipw2100-firmware-installer-2009-12-26b.zip 1109 1109 : $(baseURL)/ipw2100-firmware-installer-2009-12-26b.zip 1110 1110 : 1111 1111 ; … … 1121 1121 Echo "No optional package Wifi-iprowifi2200+fw available for $(TARGET_ARCH)" ; 1122 1122 } else { 1123 1123 AddDriversToHaikuImage net : iprowifi2200 ; 1124 InstallOptionalHaikuImagePackage iprowifi2200-firmware-installer-2009-12-26 1124 InstallOptionalHaikuImagePackage iprowifi2200-firmware-installer-2009-12-26.zip 1125 1125 : $(baseURL)/iprowifi2200-firmware-installer-2009-12-26.zip 1126 1126 : 1127 1127 ; … … 1138 1138 } else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) { 1139 1139 Echo "No optional package WonderBrush available for gcc4" ; 1140 1140 } else { 1141 InstallOptionalHaikuImagePackage WonderBrush-2.1.2 1141 InstallOptionalHaikuImagePackage WonderBrush-2.1.2.zip 1142 1142 : $(baseURL)/WonderBrush-2.1.2-x86-gcc2-2008-11-08.zip 1143 1143 : apps 1144 1144 ; … … 1153 1153 if $(TARGET_ARCH) != x86 { 1154 1154 Echo "No optional package Yasm available for $(TARGET_ARCH)" ; 1155 1155 } else { 1156 InstallOptionalHaikuImagePackage yasm-0.8.0-r1a1-x86-gcc2-2009-08-30 1156 InstallOptionalHaikuImagePackage yasm-0.8.0-r1a1-x86-gcc2-2009-08-30.zip 1157 1157 : $(baseURL)/yasm-0.8.0-r1a1-x86-gcc2-2009-08-30.zip 1158 1158 : 1159 1159 ; -
build/scripts/build_haiku_image
74 74 fi 75 75 76 76 77 unzipFile()77 extractFile() 78 78 { 79 # unzipFile <archive> <directory>80 zipFile=$181 target UnzipDir=$279 # extractFile <archive> <directory> 80 archiveFile=$1 81 targetExtractedDir=$2 82 82 83 echo " Unzipping $zipFile ..."83 echo "Extracting $archiveFile ..." 84 84 85 unzipDir=$tmpDir/unzip 86 $rmAttrs -rf "$unzipDir" 87 mkdir -p "$unzipDir" 88 89 $unzip -q -d "$unzipDir" "$zipFile" 90 91 if [ -f $unzipDir/.OptionalPackageDescription ]; then 92 cat $unzipDir/.OptionalPackageDescription >> $copyrightsFile 85 extractDir=$tmpDir/extract 86 $rmAttrs -rf "$extractDir" 87 mkdir -p "$extractDir" 88 89 case "$archiveFile" in 90 *.zip) 91 $unzip -q -d "$extractDir" "$archiveFile" 92 ;; 93 *.tgz|*.tar.gz) 94 tar -C "$extractDir" -xf "$archiveFile" 95 ;; 96 *) 97 echo "Unhandled archive extension in build_haiku_image extractFile()" 98 exit 1 99 ;; 100 esac 101 102 if [ -f $extractDir/.OptionalPackageDescription ]; then 103 cat $extractDir/.OptionalPackageDescription >> $copyrightsFile 93 104 echo >> $copyrightsFile 94 rm $ unzipDir/.OptionalPackageDescription105 rm $extractDir/.OptionalPackageDescription 95 106 fi 96 107 97 $cp -r "${sPrefix}$ unzipDir/." "${tPrefix}$targetUnzipDir"108 $cp -r "${sPrefix}$extractDir/." "${tPrefix}$targetExtractedDir" 98 109 99 $rmAttrs -rf "$ unzipDir"110 $rmAttrs -rf "$extractDir" 100 111 } 101 112 102 113 -
build/scripts/build_haiku_cd
35 35 rm=rm 36 36 37 37 38 unzipFile()38 extractFile() 39 39 { 40 # unzipFile <archive> <directory>41 zipFile=$142 target UnzipDir=$240 # extractFile <archive> <directory> 41 archiveFile=$1 42 targetExtractDir=$2 43 43 44 echo " Unzipping $zipFile ..."44 echo "Extracting $archiveFile ..." 45 45 46 unzipDir=$tmpDir/unzip 47 $rmAttrs -rf "$unzipDir" 48 mkdir -p "$unzipDir" 46 extractDir=$tmpDir/extract 47 $rmAttrs -rf "$extractDir" 48 mkdir -p "$extractDir" 49 50 case "$archiveFile" in 51 *.zip) 52 $unzip -q -d "$extractDir" "$archiveFile" 53 ;; 54 *.tgz|*.tar.gz) 55 tar -C "$extractDir" -xf "$archiveFile" 56 ;; 57 *) 58 echo "Unhandled archive extension in build_haiku_image extractFile()" 59 exit 1 60 ;; 61 esac 49 62 50 $unzip -q -d "$unzipDir" "$zipFile" 51 52 if [ -f $unzipDir/.OptionalPackageDescription ]; then 53 cat $unzipDir/.OptionalPackageDescription >> $copyrightsFile 63 if [ -f $extractDir/.OptionalPackageDescription ]; then 64 cat $extractDir/.OptionalPackageDescription >> $copyrightsFile 54 65 echo >> $copyrightsFile 55 rm $ unzipDir/.OptionalPackageDescription66 rm $extractDir/.OptionalPackageDescription 56 67 fi 57 68 58 $cp -r "$ unzipDir/." "${tPrefix}$targetUnzipDir"69 $cp -r "$extractDir/." "${tPrefix}$targetExtractDir" 59 70 60 $rmAttrs -rf "$ unzipDir"71 $rmAttrs -rf "$extractDir" 61 72 } 62 73 63 74