i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Simplify the build of the CD a bit, just reuse the image scripts as those hold

Browse Source 
what we want.
* Remove some more temporary files/directories after the build.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29209 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Lotz
2009-02-15 13:30:42 +00:00
parent f6874c7b31
commit b435702774
3 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/FloppyBootImage
+3
View File
@@ -163,6 +163,9 @@ MakeLocate $(HAIKU_BOOT_FLOPPY) : $(HAIKU_OUTPUT_DIR) ;
BuildFloppyBootImage $(HAIKU_BOOT_FLOPPY) : zbeos : $(HAIKU_FLOPPY_BOOT_ARCHIVE) ; BuildFloppyBootImage $(HAIKU_BOOT_FLOPPY) : zbeos : $(HAIKU_FLOPPY_BOOT_ARCHIVE) ;
# remove the archive
RmTemps $(HAIKU_BOOT_FLOPPY) : $(HAIKU_FLOPPY_BOOT_ARCHIVE) ;
NotFile haiku-boot-floppy ; NotFile haiku-boot-floppy ;
Depends haiku-boot-floppy : $(HAIKU_BOOT_FLOPPY) ; Depends haiku-boot-floppy : $(HAIKU_BOOT_FLOPPY) ;
build/jam/HaikuCD
+11 -21
View File
@@ -36,18 +36,6 @@ if $(optionalPackageDescriptions) {
: optionalPackageDescriptions ; : optionalPackageDescriptions ;
} }
# create the other scripts
HAIKU_CD_MAKE_DIRS_SCRIPT = <HaikuCD>haiku.cd-make-dirs ;
HAIKU_CD_COPY_FILES_SCRIPT = <HaikuCD>haiku.cd-copy-files ;
HAIKU_CD_UNZIP_FILES_SCRIPT = <HaikuCD>haiku.cd-unzip-files ;
MakeLocate $(HAIKU_CD_MAKE_DIRS_SCRIPT) $(HAIKU_CD_COPY_FILES_SCRIPT)
$(HAIKU_CD_UNZIP_FILES_SCRIPT) : $(HAIKU_OUTPUT_DIR) ;
CreateHaikuImageMakeDirectoriesScript $(HAIKU_CD_MAKE_DIRS_SCRIPT) ;
CreateHaikuImageCopyFilesScript $(HAIKU_CD_COPY_FILES_SCRIPT) ;
CreateHaikuImageUnzipFilesScript $(HAIKU_CD_UNZIP_FILES_SCRIPT) ;
# Convenience wrapper rule around BuildHaikuCD. # Convenience wrapper rule around BuildHaikuCD.
rule _BuildHaikuCD haikuCD : bootFloppy rule _BuildHaikuCD haikuCD : bootFloppy
{ {
@@ -55,23 +43,23 @@ rule _BuildHaikuCD haikuCD : bootFloppy
# #
# build the cd # build the cd
# HAIKU_CD_EARLY_USER_SCRIPTS, HAIKU_CD_LATE_USER_SCRIPTS can be # HAIKU_IMAGE_EARLY_USER_SCRIPTS, HAIKU_IMAGE_LATE_USER_SCRIPTS can be
# specified by the user. # specified by the user.
BuildHaikuCD $(haikuCD) : $(bootFloppy) : BuildHaikuCD $(haikuCD) : $(bootFloppy) :
$(HAIKU_CD_INIT_VARIABLES_SCRIPT) $(HAIKU_CD_INIT_VARIABLES_SCRIPT)
$(HAIKU_CD_EARLY_USER_SCRIPTS) $(HAIKU_IMAGE_EARLY_USER_SCRIPTS)
$(HAIKU_CD_MAKE_DIRS_SCRIPT) $(HAIKU_IMAGE_MAKE_DIRS_SCRIPT)
$(HAIKU_CD_COPY_FILES_SCRIPT) $(HAIKU_IMAGE_COPY_FILES_SCRIPT)
$(HAIKU_CD_UNZIP_FILES_SCRIPT) $(HAIKU_IMAGE_UNZIP_FILES_SCRIPT)
$(HAIKU_CD_LATE_USER_SCRIPTS) $(HAIKU_IMAGE_LATE_USER_SCRIPTS)
; ;
# remove the scripts we have generated # remove the scripts we have generated
RmTemps $(haikuCD) : RmTemps $(haikuCD) :
$(HAIKU_CD_INIT_VARIABLES_SCRIPT) $(HAIKU_CD_INIT_VARIABLES_SCRIPT)
$(HAIKU_CD_MAKE_DIRS_SCRIPT) $(HAIKU_IMAGE_MAKE_DIRS_SCRIPT)
$(HAIKU_CD_COPY_FILES_SCRIPT) $(HAIKU_IMAGE_COPY_FILES_SCRIPT)
$(HAIKU_CD_UNZIP_FILES_SCRIPT) $(HAIKU_IMAGE_UNZIP_FILES_SCRIPT)
; ;
} }
@@ -80,5 +68,7 @@ _BuildHaikuCD $(HAIKU_CD) : $(HAIKU_BOOT_FLOPPY) ;
NotFile haiku-cd ; NotFile haiku-cd ;
Depends haiku-cd : $(HAIKU_CD) ; Depends haiku-cd : $(HAIKU_CD) ;
RmTemps $(HAIKU_CD) : $(HAIKU_BOOT_FLOPPY) ;
# Execute post-image user config rules. # Execute post-image user config rules.
UserBuildConfigRulePostImage ; UserBuildConfigRulePostImage ;
build/scripts/build_haiku_cd
+1 -1
View File
@@ -150,4 +150,4 @@ echo "Building CD image ..."
mkisofs -b `basename $cdBootFloppy` -U -R -V "$cdLabel" -o "$cdImagePath" "$tPrefix" mkisofs -b `basename $cdBootFloppy` -U -R -V "$cdLabel" -o "$cdImagePath" "$tPrefix"
# cleanup output dir # cleanup output dir
#$rmAttrs -rf "$outputDir" $rmAttrs -rf "$outputDir"