diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage index 0299594a16..b7ba670820 100644 --- a/build/jam/HaikuImage +++ b/build/jam/HaikuImage @@ -20,22 +20,26 @@ if $(INCLUDE_GPL_ADDONS) = 1 { GPL_ONLY = ; } -BEOS_BIN = "[" addattr alert arp basename bc beep cat cardctl catattr chgrp chmod chop chown cksum clear - clockconfig cmp comm compress cp copyattr csplit ctags cut date dc dd desklink df diff diff3 dircolors dirname driveinfo - dstcheck du dump_cis dump_cisreg echo eject env error expand expr - factor false fdinfo ffm find finddir fmt fold fortune ftp funzip gawk - $(X86_ONLY)gdb grep groups gzip gzexe hd head hey hostname - id ident ideinfo idestatus ifconfig install installsound iroster isvolume - join keymap kill less lessecho lesskey link listarea listattr listdev listimage - listport listres listsem ln locate logger logname ls lsindex m4 make makebootable md5sum merge mimeset - mkdos mkdir mkindex modifiers mount mount_nfs mountvolume mv netstat nl od open - pack_cis paste patch pathchk pc ping play playfile playsound playwav pr prio printenv printf ps ptx pwd - query quit release renice rescan rlog rm rmattr rmindex rmdir roster route safemode screen_blanker sed settype - setversion setvolume seq sh shar shutdown sleep sort split strace stty su sum sync sysinfo - tac tail tar tcpdump tee telnet test top touch tput tr traceroute translate true tsort tty - uname unchop unexpand unmount uniq unrar unshar unzip unzipsfx updatedb uptime usb_dev_info uudecode uuencode - vdir version vim waitfor wc wget whoami xargs xres yes zdiff zforce zgrep zip - zipcloak zipgrep zipnote zipsplit zmore znew +BEOS_BIN = "[" addattr alert arp basename bc beep cat cardctl catattr chgrp + chmod chop chown cksum clear clockconfig cmp comm compress cp copyattr + csplit ctags cut date dc dd desklink df diff diff3 dircolors dirname + driveinfo dstcheck du dump_cis dump_cisreg echo eject env error expand + expr factor false fdinfo ffm find finddir fmt fold fortune ftp funzip gawk + $(X86_ONLY)gdb grep groups gzip gzexe hd head hey hostname id ident ideinfo + idestatus ifconfig install installsound iroster isvolume join keymap + kill less lessecho lesskey link listarea listattr listdev listimage + listport listres listsem ln locate logger logname ls lsindex m4 make + makebootable md5sum merge mimeset mkdos mkdir mkindex modifiers mount + mount_nfs mountvolume mv netstat nl od open pack_cis paste patch pathchk pc + ping play playfile playsound playwav pr prio printenv printf ps ptx pwd + query quit release renice rescan rlog rm rmattr rmindex rmdir roster route + safemode screen_blanker sed settype setversion setvolume seq sh shar + shutdown sleep sort split strace stty su sum sync sysinfo tac tail tar + tcpdump tee telnet test top touch tput tr traceroute translate true tsort + tty uname unchop unexpand unmount uniq unrar unshar unzip unzipsfx updatedb + uptime usb_dev_info uudecode uuencode vdir version vim waitfor wc wget + whoami xargs xres yes zdiff zforce zgrep zip zipcloak zipgrep zipnote + zipsplit zmore znew ; BEOS_APPS = Terminal Expander People ShowImage Pulse ProcessController @@ -43,10 +47,12 @@ BEOS_APPS = Terminal Expander People ShowImage Pulse ProcessController $(X86_ONLY)Cortex $(X86_ONLY)CortexAddOnHost MediaPlayer DeskCalc MidiPlayer Icon-O-Matic Mail CDPlayer ; -BEOS_PREFERENCES = Appearance Backgrounds DataTranslations E-mail FileTypes Fonts Media Menu - Mouse Keyboard Keymap Printers Screen ScreenSaver Sounds Time VirtualMemory +BEOS_PREFERENCES = Appearance Backgrounds DataTranslations E-mail FileTypes + Fonts Media Menu Mouse Keyboard Keymap Printers Screen ScreenSaver Sounds + Time VirtualMemory ; -BEOS_DEMOS = BitmapDrawing Chart Clock FontDemo $(X86_ONLY)GLTeapot PictureTest Playground +BEOS_DEMOS = BitmapDrawing Chart Clock FontDemo $(X86_ONLY)GLTeapot PictureTest + Playground ; BEOS_SYSTEM_LIB = libbe.so $(HAIKU_LIBSTDC++) libmedia.so libtracker.so libtranslation.so libnetwork.so libdebug.so libbsd.so libmail.so @@ -54,8 +60,9 @@ BEOS_SYSTEM_LIB = libbe.so $(HAIKU_LIBSTDC++) libmedia.so libtracker.so libdevice.so libgame.so libscreensaver.so libroot.so $(X86_ONLY)libGL.so libfluidsynth.so libqoca.so ; -BEOS_SYSTEM_SERVERS = registrar debug_server syslog_daemon media_server net_server - media_addon_server input_server app_server fake_app_server midi_server print_server +BEOS_SYSTEM_SERVERS = registrar debug_server syslog_daemon media_server + net_server media_addon_server input_server app_server fake_app_server + midi_server print_server ; BEOS_NETWORK_DEVICES = ethernet loopback ; @@ -64,8 +71,9 @@ BEOS_NETWORK_DATALINK_PROTOCOLS = ethernet_frame arp loopback_frame ; BEOS_NETWORK_PROTOCOLS = ipv4 tcp udp icmp ; BEOS_ADD_ONS_ACCELERANTS = $(X86_ONLY)radeon.accelerant $(X86_ONLY)nv.accelerant - $(X86_ONLY)mga.accelerant $(X86_ONLY)nm.accelerant $(X86_ONLY)intel_extreme.accelerant - vesa.accelerant #$(X86_ONLY)vmware.accelerant + $(X86_ONLY)mga.accelerant $(X86_ONLY)nm.accelerant + $(X86_ONLY)intel_extreme.accelerant vesa.accelerant + #$(X86_ONLY)vmware.accelerant ; BEOS_ADD_ONS_TRANSLATORS = BMPTranslator GIFTranslator JPEGTranslator JPEG2000Translator TIFFTranslator PNGTranslator PPMTranslator @@ -86,11 +94,11 @@ BEOS_ADD_ONS_MEDIA_PLUGINS = $(GPL_ONLY)ac3_decoder # theora vorbis wav_reader ; -BEOS_ADD_ONS_PRINT = Canon\ LIPS3\ Compatible Canon\ LIPS4\ Compatible PCL5\ Compatible - PCL6\ Compatible PDF\ Writer PS\ Compatible Preview +BEOS_ADD_ONS_PRINT = Canon\ LIPS3\ Compatible Canon\ LIPS4\ Compatible + PCL5\ Compatible PCL6\ Compatible PDF\ Writer PS\ Compatible Preview ; -BEOS_ADD_ONS_PRINT_TRANSPORT = HP\ JetDirect IPP LPR Parallel\ Port Print\ To\ File - Serial\ Port USB\ Port +BEOS_ADD_ONS_PRINT_TRANSPORT = HP\ JetDirect IPP LPR Parallel\ Port + Print\ To\ File Serial\ Port USB\ Port ; BEOS_ADD_ONS_SCREENSAVERS = Haiku IFS ; BEOS_ADD_ONS_DRIVERS_AUDIO = auich auvia emuxki ; @@ -104,8 +112,8 @@ BEOS_ADD_ONS_DRIVERS_NET = etherpci ipro1000 rtl8139 rtl8169 sis900 $(GPL_ONLY)bcm440x $(GPL_ONLY)bcm570x ; #BEOS_ADD_ONS_DRIVERS_ACPI = $(X86_ONLY)acpi_button ; -BEOS_ADD_ONS_BUS_MANAGERS = pci $(X86_ONLY)ps2 $(X86_ONLY)isa ide scsi config_manager - $(X86_ONLY)agp usb +BEOS_ADD_ONS_BUS_MANAGERS = pci $(X86_ONLY)ps2 $(X86_ONLY)isa ide scsi + config_manager $(X86_ONLY)agp usb ; BEOS_ADD_ONS_FILESYSTEMS = bfs dos googlefs iso9660 nfs ; @@ -119,10 +127,12 @@ AddFilesToHaikuImage beos system add-ons kernel busses usb : uhci ohci ehci ; AddFilesToHaikuImage beos system add-ons kernel console : vga_text ; AddFilesToHaikuImage beos system add-ons kernel debugger : hangman ; -AddFilesToHaikuImage beos system add-ons kernel file_systems : $(BEOS_ADD_ONS_FILESYSTEMS) ; +AddFilesToHaikuImage beos system add-ons kernel file_systems + : $(BEOS_ADD_ONS_FILESYSTEMS) ; AddFilesToHaikuImage beos system add-ons kernel generic : block_io fast_log ide_adapter locked_pool mpu401 scsi_periph ; -AddFilesToHaikuImage beos system add-ons kernel partitioning_systems : intel session ; +AddFilesToHaikuImage beos system add-ons kernel partitioning_systems + : intel session ; AddFilesToHaikuImage beos system add-ons kernel interrupt_controllers : $(PPC_ONLY)openpic ; @@ -184,16 +194,19 @@ AddSymlinkToHaikuImage beos bin : vim : view ; # scripts and data files -local bootScripts = Bootscript SetupEnvironment Netscript InstallerInitScript InstallerFinishScript ; +local bootScripts = Bootscript SetupEnvironment Netscript InstallerInitScript + InstallerFinishScript ; SEARCH on $(bootScripts) = [ FDirName $(HAIKU_TOP) data system boot ] ; AddFilesToHaikuImage beos system boot : $(bootScripts) ; -local logoArtwork = "HAIKU logo - white on blue - big.png" "HAIKU logo - white on blue - small.png" ; +local logoArtwork = "HAIKU logo - white on blue - big.png" + "HAIKU logo - white on blue - small.png" ; SEARCH on $(logoArtwork) = [ FDirName $(HAIKU_TOP) data artwork ] ; AddFilesToHaikuImage beos etc artwork : $(logoArtwork) ; local svgFiles = "lion.svg" ; -SEARCH on $(svgFiles) = [ FDirName $(HAIKU_TOP) src tests kits interface picture ] ; +SEARCH on $(svgFiles) + = [ FDirName $(HAIKU_TOP) src tests kits interface picture ] ; AddFilesToHaikuImage beos etc artwork : $(svgFiles) ; # TODO: Use data/etc/termcap or src/libs/termcap.src? @@ -233,7 +246,8 @@ AddDirectoryToHaikuImage beos etc KanBe dic user ; # = [ FDirName $(HAIKU_TOP) src kits network compat libnet ] ; #AddFilesToHaikuImage beos etc : $(libnetFiles) ; -local keymapFiles = [ GLOB [ FDirName $(HAIKU_TOP) src data etc keymaps ] : *.keymap ] ; +local keymapFiles = [ GLOB [ FDirName $(HAIKU_TOP) src data etc keymaps ] + : *.keymap ] ; keymapFiles = $(keymapFiles:BG=keymap) ; AddFilesToHaikuImage beos etc Keymap : $(keymapFiles) ; @@ -275,8 +289,8 @@ AddFilesToHaikuImage beos system add-ons media : $(BEOS_ADD_ONS_MEDIA) ; AddFilesToHaikuImage beos system add-ons media plugins : $(BEOS_ADD_ONS_MEDIA_PLUGINS) ; AddFilesToHaikuImage beos system add-ons Tracker : FileType-F ZipOMatic-Z ; -AddSymlinkToHaikuImage beos system add-ons Tracker : /boot/beos/preferences/Backgrounds - : Background-B ; +AddSymlinkToHaikuImage beos system add-ons Tracker + : /boot/beos/preferences/Backgrounds : Background-B ; AddFilesToHaikuImage beos system add-ons input_server devices : keyboard mouse ; AddFilesToHaikuImage beos system add-ons input_server filters : screen_saver ; @@ -344,7 +358,8 @@ AddTargetVariableToScript $(script) : resattr ; # causes a cyclic dependency AddVariableToScript $(script) : imagePath : [ FDirName $(HAIKU_IMAGE_DIR) $(HAIKU_IMAGE_NAME) ] ; -AddVariableToScript $(script) : sourceDirsToCopy : $(HAIKU_INSTALL_SOURCE_DIRS) ; +AddVariableToScript $(script) : sourceDirsToCopy + : $(HAIKU_INSTALL_SOURCE_DIRS) ; # create the other scripts HAIKU_IMAGE_MAKE_DIRS_SCRIPT = haiku.image-make-dirs ;