Subversion Repositories Kolibri OS

Rev

Rev 8060 | Rev 8092 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 8060 Rev 8091
Line 788... Line 788...
788 
  make_img_command = make_img_command .. ' && mcopy -moi kolibri.img "' .. local_file .. '" "::' .. v[1] .. '"'
 788 
  make_img_command = make_img_command .. ' && mcopy -moi kolibri.img "' .. local_file .. '" "::' .. v[1] .. '"'
789 
end
 789 
end
Line 790... Line 790...
790 
 
 790 
 
791 
-- generate tup rule for kolibri.img
 791 
-- generate tup rule for kolibri.img
792 
tup.definerule{inputs = input_deps, command = make_img_command, outputs = output_deps}
 - 
 
Line 793... Line 792...
793 
tup.definerule{inputs = {"../kernel/trunk/boot/uefi4kos.asm", "kolibri.img", "../kernel/trunk/kernel.bin"}, command = "fasm ../kernel/trunk/boot/uefi4kos.asm %o", outputs = {"kolibri.efi"}}
 792 
tup.definerule{inputs = input_deps, command = make_img_command, outputs = output_deps}
794 
 
 793 
 
795 
-- generate command and dependencies for mkisofs
 794 
-- generate command and dependencies for mkisofs
796 
input_deps = {"kolibri.img"}
 795 
input_deps = {"kolibri.img"}
Line 820... Line 819...
820 
  if string.sub(v[1], -1) == "/"
 819 
  if string.sub(v[1], -1) == "/"
821 
  then tup.definerule{inputs = {v.group or v[2]}, command = cmd, outputs = {"distribution_kit/" .. v[1] .. tup.file(v[2])}}
 820 
  then tup.definerule{inputs = {v.group or v[2]}, command = cmd, outputs = {"distribution_kit/" .. v[1] .. tup.file(v[2])}}
822 
  else tup.definerule{inputs = {v.group or v[2]}, command = cmd, outputs = {"distribution_kit/" .. v[1]}}
 821 
  else tup.definerule{inputs = {v.group or v[2]}, command = cmd, outputs = {"distribution_kit/" .. v[1]}}
823 
  end
 822 
  end
824 
end
 823 
end
- 
 
 824 
 
- 
 
 825 
 
- 
 
 826 
-- generate tup rule for kolibri.efi
- 
 
 827 
tup.definerule{inputs = {"../kernel/trunk/boot/uefi4kos.asm", "kolibri.img", "../kernel/trunk/kernel.bin.ext_loader"},
- 
 
 828 
               command = "fasm -dUEFI=1 -dextended_primary_loader=1 ../kernel/trunk/boot/uefi4kos.asm %o",
- 
 
 829 
               outputs = {"kolibri.efi"}}
- 
 
 830 
 
- 
 
 831 
input_deps = {"kolibri.img", "../kernel/trunk/bootloader/extended_primary_loader/fat32/kordldr.f32.bin", "../kernel/trunk/bootloader/extended_primary_loader/fat32/bootsect.bin", "../kernel/trunk/kernel.mnt.ext_loader"}
- 
 
 832 
make_raw_command = '^ MKIMG kolibri.raw^ ' -- for tup: don't write full command to logs
- 
 
 833 
make_raw_command = make_raw_command .. "dd if=/dev/zero of=kolibri.raw bs=1048576 count=64 2>&1"
- 
 
 834 
make_raw_command = make_raw_command .. " && parted --script kolibri.raw mktable msdos"
- 
 
 835 
make_raw_command = make_raw_command .. " && parted --script kolibri.raw unit MiB mkpart primary fat32 1 100%%"
- 
 
 836 
make_raw_command = make_raw_command .. " && parted --script kolibri.raw set 1 boot on"
- 
 
 837 
bootsector = "../kernel/trunk/bootloader/extended_primary_loader/fat32/bootsect.bin"
- 
 
 838 
make_raw_command = make_raw_command .. " && mformat -i kolibri.raw@@1M -v KOLIBRIOS -T 129024 -h 16 -s 32 -H 2048 -c 1 -F -B " .. bootsector .. " ::"
- 
 
 839 
make_raw_command = make_raw_command .. " && mcopy -moi kolibri.raw@@1M ../kernel/trunk/kernel.mnt.ext_loader ::KERNEL.MNT"
- 
 
 840 
make_raw_command = make_raw_command .. " && mcopy -moi kolibri.raw@@1M kolibri.img ::KOLIBRI.IMG"
- 
 
 841 
make_raw_command = make_raw_command .. " && mcopy -moi kolibri.raw@@1M ../kernel/trunk/bootloader/extended_primary_loader/fat32/kordldr.f32.bin ::KORDLDR.F32"
- 
 
 842 
make_raw_command = make_raw_command .. " && mcopy -moi kolibri.raw@@1M ../kernel/trunk/bootloader/extended_primary_loader/config.ini ::CONFIG.INI"
- 
 
 843 
 
- 
 
 844 
make_raw_command = make_raw_command .. ' && mmd -i kolibri.raw@@1M ::KOLIBRIOS'
- 
 
 845 
 
- 
 
 846 
-- make folders
- 
 
 847 
table.sort(img_dirs)
- 
 
 848 
for i,v in ipairs(img_dirs) do
- 
 
 849 
  if v ~= img_dirs[i-1] then
- 
 
 850 
    make_raw_command = make_raw_command .. ' && mmd -i kolibri.raw@@1M "::KOLIBRIOS/' .. v .. '"'
- 
 
 851 
  end
- 
 
 852 
end
- 
 
 853 
 
- 
 
 854 
for i,v in ipairs(img_files) do
- 
 
 855 
  local_file = v[2]
- 
 
 856 
  make_raw_command = make_raw_command .. ' && mcopy -moi kolibri.raw@@1M "' .. local_file .. '" "::KOLIBRIOS/' .. v[1] .. '"'
- 
 
 857 
end
- 
 
 858 
 
- 
 
 859 
-- generate tup rule for kolibri.raw
- 
 
 860 
tup.definerule{inputs = input_deps, command = make_raw_command, outputs = {"kolibri.raw"}}