programs/media: Post-SVN tidy (#417)

- Move source code from `trunk` into root directory for each program.
- Update build files and ASM include paths. Add SPDX license header where appropriate.
- Note: Line endings standardised from `CRLF` > `LF`, so best to view diffs with whitespace changes hidden.

(Work towards #75, point 3)

Reviewed-on: KolibriOS/kolibrios#417
Reviewed-by: Mikhail Frolov <mixa.frolov2003@gmail.com>
Reviewed-by: Burer <burer@noreply.localhost>
Co-authored-by: Andrew <dent.ace@gmail.com>
Co-committed-by: Andrew <dent.ace@gmail.com>

data/Tupfile.lua

@@ -155,10 +155,10 @@ extra_files = {
  {"kolibrios/3D/blocks/models/", "../programs/bcc32/games/blocks/models/*"},
  {"kolibrios/3D/md2view/", "common/3d/md2view/*"},
  {"kolibrios/3D/md2view/md2_model/", "common/3d/md2view/md2_model/*"},
- {"kolibrios/3D/voxel_editor/VOX_EDITOR.INI", SRC_PROGS .. "/media/voxel_editor/trunk/vox_editor.ini"},
- {"kolibrios/3D/voxel_editor/HOUSE1.VOX", SRC_PROGS .. "/media/voxel_editor/trunk/house1.vox"},
- {"kolibrios/3D/voxel_editor/HOUSE2.VOX", SRC_PROGS .. "/media/voxel_editor/trunk/house2.vox"},
- {"kolibrios/3D/voxel_editor/SQUIRREL.VOX", SRC_PROGS .. "/media/voxel_editor/trunk/squirrel.vox"},
+ {"kolibrios/3D/voxel_editor/VOX_EDITOR.INI", SRC_PROGS .. "/media/voxel_editor/vox_editor.ini"},
+ {"kolibrios/3D/voxel_editor/HOUSE1.VOX", SRC_PROGS .. "/media/voxel_editor/house1.vox"},
+ {"kolibrios/3D/voxel_editor/HOUSE2.VOX", SRC_PROGS .. "/media/voxel_editor/house2.vox"},
+ {"kolibrios/3D/voxel_editor/SQUIRREL.VOX", SRC_PROGS .. "/media/voxel_editor/squirrel.vox"},
  {"kolibrios/3D/voxel_utilites/VOX_MOVER.INI" , SRC_PROGS .. "/media/voxel_editor/utilites/vox_mover.ini"},
  {"kolibrios/3D/FONT8X9.BMP", SRC_PROGS .. "/fs/kfar/trunk/font8x9.bmp"},
  {"kolibrios/3D/TOOLB_1.PNG", SRC_PROGS .. "/develop/libraries/TinyGL/asm_fork/examples/toolb_1.png"},
@@ -529,12 +529,12 @@ tup.append_table(img_files, {
  {"MEDIA/FILLSCR", VAR_PROGS .. "/media/FillScr/fillscr"},
  {"MEDIA/KIV", VAR_PROGS .. "/media/kiv/kiv"},
  {"MEDIA/LISTPLAY", VAR_PROGS .. "/media/listplay/listplay"},
- {"MEDIA/MIDAMP", VAR_PROGS .. "/media/midamp/trunk/midamp"},
+ {"MEDIA/MIDAMP", VAR_PROGS .. "/media/midamp/midamp"},
  {"MEDIA/MP3INFO", VAR_PROGS .. "/media/mp3info/mp3info"},
- {"MEDIA/PALITRA", VAR_PROGS .. "/media/palitra/trunk/palitra"},
+ {"MEDIA/PALITRA", VAR_PROGS .. "/media/palitra/palitra"},
  {"MEDIA/PIANO", VAR_PROGS .. "/media/piano/piano"},
  {"MEDIA/PIANO.MAP", VAR_PROGS .. "/media/piano/piano.map"},
- {"MEDIA/STARTMUS", VAR_PROGS .. "/media/startmus/trunk/STARTMUS"},
+ {"MEDIA/STARTMUS", VAR_PROGS .. "/media/startmus/STARTMUS"},
  {"NETWORK/PING", VAR_PROGS .. "/network/ping/ping"},
  {"NETWORK/NETCFG", VAR_PROGS .. "/network/netcfg/netcfg"},
  {"NETWORK/NETSTAT", VAR_PROGS .. "/network/netstat/netstat"},
@@ -604,7 +604,7 @@ tup.append_table(extra_files, {
  {"kolibrios/3D/info3ds/INFO3DS", VAR_PROGS .. "/develop/info3ds/info3ds"},
  {"kolibrios/3D/textures1", VAR_PROGS .. "/develop/libraries/TinyGL/asm_fork/examples/textures1"},
  {"kolibrios/3D/info3ds/INFO3DS_U", VAR_PROGS .. "/develop/info3ds/info3ds_u"},
- {"kolibrios/3D/voxel_editor/VOXEL_EDITOR", VAR_PROGS .. "/media/voxel_editor/trunk/voxel_editor"},
+ {"kolibrios/3D/voxel_editor/VOXEL_EDITOR", VAR_PROGS .. "/media/voxel_editor/voxel_editor"},
  {"kolibrios/3D/voxel_utilites/VOX_CREATOR" , VAR_PROGS .. "/media/voxel_editor/utilites/vox_creator"},
  {"kolibrios/3D/voxel_utilites/VOX_MOVER" , VAR_PROGS .. "/media/voxel_editor/utilites/vox_mover"},
  {"kolibrios/3D/voxel_utilites/VOX_TGL" , VAR_PROGS .. "/media/voxel_editor/utilites/vox_tgl"},

programs/build_all.bat

@@ -164,17 +164,16 @@ echo Building media
 echo *
 rem media\ac97snd\trunk\ac97snd.asm ac97snd
 fasm media\animage\animage.asm %BIN%\animage
-fasm media\cdp\trunk\cdp.asm %BIN%\cdp
-fasm media\gifview\trunk\gifview.asm %BIN%\gifview
-fasm media\iconedit\trunk\iconedit.asm %BIN%\iconedit
-fasm media\jpegview\trunk\jpegview.asm %BIN%\jpegview
-fasm media\midamp\trunk\midamp.asm %BIN%\midamp
-fasm media\midiplay\trunk\midiplay.asm %BIN%\midiplay
-fasm media\mixer\trunk\mixer.asm %BIN%\mixer
-
-fasm media\mv\trunk\mv.asm %BIN%\mv
-fasm media\pic4\trunk\pic4.asm %BIN%\pic4
-fasm media\sb\trunk\sb.asm %BIN%\sb
+rem fasm media\cdp\trunk\cdp.asm %BIN%\cdp
+rem fasm media\gifview\trunk\gifview.asm %BIN%\gifview
+rem fasm media\iconedit\trunk\iconedit.asm %BIN%\iconedit
+rem fasm media\jpegview\trunk\jpegview.asm %BIN%\jpegview
+fasm media\midamp\midamp.asm %BIN%\midamp
+fasm media\midiplay\midiplay.asm %BIN%\midiplay
+rem fasm media\mixer\trunk\mixer.asm %BIN%\mixer
+rem fasm media\mv\trunk\mv.asm %BIN%\mv
+fasm media\pic4\pic4.asm %BIN%\pic4
+rem fasm media\sb\trunk\sb.asm %BIN%\sb
 fasm media\scrshoot\scrshoot.asm %BIN%\scrshoot
 
 echo *
@@ -234,7 +233,7 @@ echo __nightbuild fix yes >> config.inc
 fasm media\kiv\kiv.asm %BIN%\nightbuild\kiv
 fasm media\scrshoot\scrshoot.asm %BIN%\nightbuild\scrshoot
 fasm media\animage\animage.asm %BIN%\nightbuild\animage
-fasm media\midamp\trunk\midamp.asm %BIN%\nightbuild\midamp
+fasm media\midamp\midamp.asm %BIN%\nightbuild\midamp
 fasm develop\heed\trunk\heed.asm %BIN%\nightbuild\heed
 fasm develop\tinypad\trunk\tinypad.asm %BIN%\nightbuild\tinypad
 fasm system\skincfg\skincfg.asm %BIN%\nightbuild\skincfg

programs/media/log_el/build_ru.bat

@@ -1,5 +1,5 @@
 if not exist bin mkdir bin
-if not exist bin\font6x9.bmp @copy ..\..\..\fs\kfar\trunk\font6x9.bmp bin\font6x9.bmp
+if not exist bin\font6x9.bmp @copy ..\..\fs\kfar\trunk\font6x9.bmp bin\font6x9.bmp
 @copy *.png bin\*.png
 @copy *.txt bin\*.txt
 @fasm.exe -m 16384 log_el.asm bin\log_el.kex

programs/media/log_el/log_el.asm

@@ -1,3 +1,9 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
+; Text encoded with Code Page 866 - Cyrillic
+
+
 use32
 	org 0
 	db 'MENUET01' ;идентиф. исполняемого файла всегда 8 байт
@@ -38,12 +44,12 @@ sp_offs_el_type equ 9 ;ᬥ饭
 points_max equ 1000
 capt_offs equ 10 ;смещение для начала подписи в листе tree1
 
-include '../../../macros.inc'
-include '../../../proc32.inc'
-include '../../../KOSfuncs.inc'
-include '../../../load_img.inc'
-include '../../../load_lib.mac'
-include '../../../develop/libraries/box_lib/trunk/box_lib.mac'
+include '../../macros.inc'
+include '../../proc32.inc'
+include '../../KOSfuncs.inc'
+include '../../load_img.inc'
+include '../../load_lib.mac'
+include '../../develop/libraries/box_lib/trunk/box_lib.mac'
 include 'le_pole.inc'
 include 'le_signal.inc'
 

programs/media/midamp/Tupfile.lua

@@ -1,5 +1,5 @@
 if tup.getconfig("NO_FASM") ~= "" then return end
-HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR")
+HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR")
 tup.include(HELPERDIR .. "/use_fasm.lua")
 add_include(tup.getvariantdir())
 

programs/media/midamp/midamp.asm

@@ -1,3 +1,9 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
+; Text encoded with Code Page 866 - Cyrillic
+
+
 ; MIDI PLAYER FOR KOLIBRI v1.0
 ; Written in pure assembler by Ivushkin Andrey aka Willow
 ;
@@ -64,16 +70,16 @@ use32
 listsel    dd 0
 channel dd 0
 COLOR_ORDER equ MENUETOS
-include '../../../config.inc'           ;for nightbuild
-include '../../../macros.inc' ; decrease code size (optional)
-include '../../../KOSfuncs.inc'
-include '../../../load_lib.mac'
+include '../../config.inc'           ;for nightbuild
+include '../../macros.inc' ; decrease code size (optional)
+include '../../KOSfuncs.inc'
+include '../../load_lib.mac'
 
 @use_library
 
 include 'lang.inc'
 ;purge mov
-include '../../../debug.inc'
+include '../../debug.inc'
 ;include 'dlg.inc'
 include 'playlist.inc'
 include 'gif_lite.inc'

programs/media/midiplay/Tupfile.lua

@@ -1,5 +1,5 @@
 if tup.getconfig("NO_FASM") ~= "" then return end
-HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR")
+HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR")
 tup.include(HELPERDIR .. "/use_fasm.lua")
 add_include(tup.getvariantdir())
 

programs/media/midiplay/midiplay.asm

@@ -1,9 +1,12 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
 ;
 ;    Ok, this is the sceleton that MENUET 0.01 understands.
 ;    Do not change the header bits for now. Compile with nasm.
 ;
 
-include '..\..\..\macros.inc'
+include '..\..\macros.inc'
 
 use32
  org    0x0
@@ -295,6 +298,3 @@ errorlen2:
 base db 0x0
 
 I_END:
-
-
-

programs/media/paint/PAINT.ASM

@@ -1,3 +1,9 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
+; Text encoded with Code Page 866 - Cyrillic
+
+
 ;*********************************
 ;*                               *
 ;*    PAINT 0.02 для MenuetOS    *
@@ -21,7 +27,7 @@
 ;******************************************************************************
 
 ; Подключаем необходимые макросы
-include '../../../macros.inc'
+include '../../macros.inc'
 
 ;******************************************************************************
 

programs/media/palitra/palitra.asm

@@ -1,3 +1,9 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
+; Text encoded with Code Page 866 - Cyrillic
+
+
 ;#___________________________________________________________________________________________________
 ;****************************************************************************************************|
 ; Program Palitra (c) Sergei Steshin (Akyltist)                                                      |
@@ -69,10 +75,10 @@
   db	 'MENUET01'
   dd	 1,START,I_END,I_MEM,stacktop,params,sys_path
 
-  include '../../../macros.inc'
-  include '../../../proc32.inc'
-  include '../../../KOSfuncs.inc'
-  include '../../../dll.inc'
+  include '../../macros.inc'
+  include '../../proc32.inc'
+  include '../../KOSfuncs.inc'
+  include '../../dll.inc'
 
   WIN_W  equ 295	    ; ширина окна
   WIN_H  equ 195	    ; высота окна

programs/media/pic4/Tupfile.lua

@@ -1,5 +1,5 @@
 if tup.getconfig("NO_FASM") ~= "" then return end
-HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR")
+HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR")
 tup.include(HELPERDIR .. "/use_fasm.lua")
 add_include(tup.getvariantdir())
 

programs/media/pic4/pic4.asm

@@ -1,3 +1,9 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
+; Text encoded with Code Page 866 - Cyrillic
+
+
 ;
 ;    BACKGROUND SET  - Compile with fasm
 ;
@@ -12,7 +18,7 @@
   dd      I_Param,0
 
   include 'lang.inc'
-  include '..\..\..\macros.inc'
+  include '..\..\macros.inc'
 purge mov       ; decrease kpack'ed size
 
 START:

programs/media/startmus/STARTMUS.ASM

@@ -1,3 +1,7 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
+
 use32
         db      'MENUET01'
         dd      1
@@ -7,7 +11,7 @@ use32
         dd      0x400
         dd      0,0
 
-include '../../../macros.inc'
+include '../../macros.inc'
 
 start:
         mov     eax, 55

programs/media/voxel_editor/utilites/vox_creator.asm

@@ -1,3 +1,9 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
+; Text encoded with Code Page 866 - Cyrillic
+
+
 use32
 	org 0
 	db 'MENUET01' ;идентиф. исполняемого файла всегда 8 байт
@@ -8,13 +14,13 @@ include '../../../proc32.inc'
 include '../../../KOSfuncs.inc'
 include '../../../load_img.inc'
 include '../../../load_lib.mac'
-include '../trunk/str.inc'
+include '../str.inc'
 include 'lang.inc' ; Language support for locales: ru_RU (CP866), en_US.
 
 vox_offs_tree_table equ 4
 vox_offs_data equ 12
 txt_buf rb 8
-include '../trunk/vox_rotate.inc'
+include '../vox_rotate.inc'
 
 @use_library mem.Alloc,mem.Free,mem.ReAlloc,dll.Load
 if lang eq ru_RU

programs/media/voxel_editor/utilites/vox_mover.asm

@@ -1,3 +1,9 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
+; Text encoded with Code Page 866 - Cyrillic
+
+
 use32
 	org 0
 	db 'MENUET01' ;идентиф. исполняемого файла всегда 8 байт
@@ -8,9 +14,9 @@ include '../../../proc32.inc'
 include '../../../KOSfuncs.inc'
 include '../../../load_img.inc'
 include '../../../load_lib.mac'
-include '../trunk/vox_draw.inc'
-include '../trunk/vox_rotate.inc'
-include '../trunk/str.inc'
+include '../vox_draw.inc'
+include '../vox_rotate.inc'
+include '../str.inc'
 include 'lang.inc' ; Language support for locales: ru_RU (CP866), en_US.
 
 @use_library mem.Alloc,mem.Free,mem.ReAlloc,dll.Load

programs/media/voxel_editor/utilites/vox_tgl.asm

@@ -1,3 +1,9 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
+; Text encoded with Code Page 866 - Cyrillic
+
+
 use32
 	org 0
 	db 'MENUET01' ;идентиф. исполняемого файла всегда 8 байт
@@ -11,7 +17,7 @@ include '../../../load_lib.mac'
 include '../../../develop/libraries/TinyGL/asm_fork/opengl_const.inc'
 include '../../../develop/libraries/TinyGL/asm_fork/zbuffer.inc'
 include 'vox_3d.inc'
-include '../trunk/str.inc'
+include '../str.inc'
 include 'lang.inc' ; Language support for locales: ru_RU (CP866), en_US.
 
 @use_library mem.Alloc,mem.Free,mem.ReAlloc,dll.Load

programs/media/voxel_editor/voxel_editor.asm

@@ -1,13 +1,19 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
+; Text encoded with Code Page 866 - Cyrillic
+
+
 use32
 	org 0
 	db 'MENUET01' ;идентиф. исполняемого файла всегда 8 байт
 	dd 1, start, i_end, mem, stacktop, openfile_path, sys_path
 
-include '../../../macros.inc'
-include '../../../proc32.inc'
-include '../../../KOSfuncs.inc'
-include '../../../load_img.inc'
-include '../../../load_lib.mac'
+include '../../macros.inc'
+include '../../proc32.inc'
+include '../../KOSfuncs.inc'
+include '../../load_img.inc'
+include '../../load_lib.mac'
 include 'vox_draw.inc'
 include 'vox_rotate.inc'
 include 'str.inc'

programs/other/t_edit/t_edit.asm

@@ -93,7 +93,7 @@ mov	ebp,lib0
 	stdcall img_to_gray, [bmp_icon],eax,(TOOLBAR_ICONS_SIZE)/3
 ;---------------------------------------------------------------------
 ; внедряем файл с курсорами и линиями
-	include_image_file '..\..\media\log_el\trunk\tl_sys_16.png', icon_tl_sys
+	include_image_file '..\..\media\log_el\tl_sys_16.png', icon_tl_sys
 	mov eax,dword[icon_tl_sys]
 	mov dword[tree1.data_img_sys],eax
 ; внедряем файл с иконками узлов

programs/other/t_edit_synt/te_syntax.asm

@@ -50,7 +50,7 @@ start:
 	stdcall [tl_data_init], tree1
 
 ; читаем файл с курсорами и линиями
-	include_image_file '..\..\media\log_el\trunk\tl_sys_16.png', icon_tl_sys
+	include_image_file '..\..\media\log_el\tl_sys_16.png', icon_tl_sys
 	mov eax,[icon_tl_sys]
 	mov [tree1.data_img_sys],eax
 ;---------------------------------------------------------------------