Ger rid of some 'trunk' dirs in /programs/games

data/Tupfile.lua

@@ -474,22 +474,22 @@ tup.append_table(img_files, {
  {"DEVELOP/EXAMPLES/USE_MB", VAR_PROGS .. "/demos/use_mb/use_mb"},
  {"File Managers/KFAR", VAR_PROGS .. "/fs/kfar/trunk/kfar"},
  {"File Managers/OPENDIAL", VAR_PROGS .. "/fs/opendial/opendial"},
- {"GAMES/15", VAR_PROGS .. "/games/15/trunk/15"},
+ {"GAMES/15", VAR_PROGS .. "/games/15/15"},
  {"GAMES/DINO", VAR_PROGS .. "/games/dino/dino"},
  {"GAMES/FREECELL", VAR_PROGS .. "/games/freecell/freecell"},
- {"GAMES/GOMOKU", VAR_PROGS .. "/games/gomoku/trunk/gomoku"},
- {"GAMES/LIGHTS", VAR_PROGS .. "/games/sq_game/trunk/SQ_GAME"},
+ {"GAMES/GOMOKU", VAR_PROGS .. "/games/gomoku/gomoku"},
+ {"GAMES/LIGHTS", VAR_PROGS .. "/games/sq_game/SQ_GAME"},
  {"GAMES/LINES", VAR_PROGS .. "/games/lines/lines"},
- {"GAMES/MSQUARE", VAR_PROGS .. "/games/MSquare/trunk/MSquare"},
+ {"GAMES/MSQUARE", VAR_PROGS .. "/games/MSquare/MSquare"},
  {"GAMES/PIPES", VAR_PROGS .. "/games/pipes/pipes"},
- {"GAMES/PONG", VAR_PROGS .. "/games/pong/trunk/pong"},
- {"GAMES/PONG3", VAR_PROGS .. "/games/pong3/trunk/pong3"},
- {"GAMES/RSQUARE", VAR_PROGS .. "/games/rsquare/trunk/rsquare"},
- {"GAMES/SNAKE", VAR_PROGS .. "/games/snake/trunk/snake"},
- {"GAMES/SUDOKU", VAR_PROGS .. "/games/sudoku/trunk/sudoku"},
- {"GAMES/SW", VAR_PROGS .. "/games/sw/trunk/sw"},
- {"GAMES/TANKS", VAR_PROGS .. "/games/tanks/trunk/tanks"},
- {"GAMES/TETRIS", VAR_PROGS .. "/games/tetris/trunk/tetris"},
+ {"GAMES/PONG", VAR_PROGS .. "/games/pong/pong"},
+ {"GAMES/PONG3", VAR_PROGS .. "/games/pong3/pong3"},
+ {"GAMES/RSQUARE", VAR_PROGS .. "/games/rsquare/rsquare"},
+ {"GAMES/SNAKE", VAR_PROGS .. "/games/snake/snake"},
+ {"GAMES/SUDOKU", VAR_PROGS .. "/games/sudoku/sudoku"},
+ {"GAMES/SW", VAR_PROGS .. "/games/sw/sw"},
+ {"GAMES/TANKS", VAR_PROGS .. "/games/tanks/tanks"},
+ {"GAMES/TETRIS", VAR_PROGS .. "/games/tetris/tetris"},
  {"LIB/ARCHIVER.OBJ", VAR_PROGS .. "/fs/kfar/trunk/kfar_arc/kfar_arc.obj"},
  {"LIB/BOX_LIB.OBJ", VAR_PROGS .. "/develop/libraries/box_lib/trunk/box_lib.obj"},
  {"LIB/BUF2D.OBJ", VAR_PROGS .. "/develop/libraries/buf2d/trunk/buf2d.obj"},
@@ -588,21 +588,21 @@ tup.append_table(extra_files, {
  {"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"},
- {"kolibrios/demos/life3", VAR_PROGS .. "/games/life3/trunk/life3"},
+ {"kolibrios/demos/life3", VAR_PROGS .. "/games/life3/life3"},
  {"kolibrios/demos/qjulia", VAR_PROGS .. "/demos/qjulia/trunk/qjulia"},
  {"kolibrios/develop/utils/koldbg", VAR_PROGS .. "/develop/koldbg/koldbg"},
  {"kolibrios/develop/utils/charset_checker", VAR_PROGS .. "/other/charset_checker/charchck"},
  {"kolibrios/games/Almaz", VAR_PROGS .. "/games/almaz/almaz"},
- {"kolibrios/games/arcanii", VAR_PROGS .. "/games/arcanii/trunk/arcanii"},
+ {"kolibrios/games/arcanii", VAR_PROGS .. "/games/arcanii/arcanii"},
  {"kolibrios/games/bomber/bomber", VAR_PROGS .. "/games/bomber/bomber"},
  {"kolibrios/games/bomber/bomberdata.bin", VAR_PROGS .. "/games/bomber/sounds/bomberdata.bin"},
  {"kolibrios/games/codemaster/binary_master", VAR_PROGS .. "/games/codemaster/binary_master"},
  {"kolibrios/games/codemaster/hang_programmer", VAR_PROGS .. "/games/codemaster/hang_programmer"},
  {"kolibrios/games/codemaster/kolibri_puzzle", VAR_PROGS .. "/games/codemaster/kolibri_puzzle"},
- {"kolibrios/games/megamaze", VAR_PROGS .. "/games/megamaze/trunk/megamaze"},
+ {"kolibrios/games/megamaze", VAR_PROGS .. "/games/megamaze/megamaze"},
  {"kolibrios/games/invaders", VAR_PROGS .. "/games/invaders/invaders"},
- {"kolibrios/games/phenix", VAR_PROGS .. "/games/phenix/trunk/phenix"},
- {"kolibrios/games/soko/soko", VAR_PROGS .. "/games/soko/trunk/SOKO"},
+ {"kolibrios/games/phenix", VAR_PROGS .. "/games/phenix/phenix"},
+ {"kolibrios/games/soko/soko", VAR_PROGS .. "/games/soko/SOKO"},
  {"kolibrios/media/img_transform", VAR_PROGS .. "/media/img_transform/img_transform"},
  {"kolibrios/media/zsea/zsea", VAR_PROGS .. "/media/zsea/zSea"},
  {"kolibrios/media/zsea/plugins/cnv_bmp.obj", VAR_PROGS .. "/media/zsea/plugins/bmp/cnv_bmp.obj"},
@@ -619,7 +619,7 @@ tup.append_table(extra_files, {
 -- For russian build, add russian-only programs.
 if build_type == "ru_RU" then tup.append_table(img_files, {
  {"PERIOD", VAR_PROGS .. "/other/period/trunk/period"},
- {"GAMES/KLAVISHA", VAR_PROGS .. "/games/klavisha/trunk/klavisha"},
+ {"GAMES/KLAVISHA", VAR_PROGS .. "/games/klavisha/klavisha"},
  {"DEVELOP/EXAMPLES/TESTCON2", VAR_PROGS .. "/develop/libraries/console_coff/examples/testcon2_rus"},
 }) else tup.append_table(img_files, {
  {"DEVELOP/TESTCON2", VAR_PROGS .. "/develop/libraries/console_coff/examples/testcon2_eng"},
@@ -640,7 +640,7 @@ tup.append_table(img_files, {
  {"TINFO", VAR_PROGS .. "/system/tinfo/tinfo"},
  {"DEVELOP/MSTATE", VAR_PROGS .. "/develop/mstate/mstate"},
  {"DEVELOP/GENFILES", VAR_PROGS .. "/testing/genfiles/GenFiles"},
- {"GAMES/C4", VAR_PROGS .. "/games/c4/trunk/c4"},
+ {"GAMES/C4", VAR_PROGS .. "/games/c4/c4"},
  {"MEDIA/FILLSCR", VAR_PROGS .. "/media/FillScr/fillscr"},
 })
 tup.append_table(extra_files, {
@@ -677,11 +677,11 @@ tup.append_table(img_files, {
  {"File Managers/KFM2", VAR_PROGS .. "/cmm/misc/kfm2.com"},
  {"KF_VIEW", VAR_PROGS .. "/cmm/kf_font_viewer/font_viewer.com"},
  {"DEVELOP/DIFF", VAR_PROGS .. "/cmm/diff/diff.com"},
- {"GAMES/CLICKS", VAR_PROGS .. "/games/clicks/trunk/clicks.com"},
+ {"GAMES/CLICKS", VAR_PROGS .. "/games/clicks/clicks.com"},
  {"GAMES/MBLOCKS", VAR_PROGS .. "/cmm/misc/mblocks.com"},
- {"GAMES/FLOOD-IT", VAR_PROGS .. "/games/flood-it/trunk/flood-it.com"},
- {"GAMES/MINE", VAR_PROGS .. "/games/mine/trunk/mine"},
- {"GAMES/NUMBERS", VAR_PROGS .. "/games/FindNumbers/trunk/FindNumbers"},
+ {"GAMES/FLOOD-IT", VAR_PROGS .. "/games/flood-it/flood-it.com"},
+ {"GAMES/MINE", VAR_PROGS .. "/games/mine/mine"},
+ {"GAMES/NUMBERS", VAR_PROGS .. "/games/FindNumbers/FindNumbers"},
  {"MEDIA/PIXIE", VAR_PROGS .. "/cmm/pixie2/pixie.com"},
  {"MEDIA/ICONEDIT", VAR_PROGS .. "/cmm/iconedit/iconedit.com"},
  {"NETWORK/DL", VAR_PROGS .. "/cmm/downloader/dl.com"},
@@ -708,12 +708,12 @@ tup.append_table(img_files, {
  {"TABLE", VAR_PROGS .. "/other/table/table"},
  {"MEDIA/AC97SND", VAR_PROGS .. "/media/ac97snd/ac97snd.bin"},
  {"GAMES/KOSILKA", VAR_PROGS .. "/games/kosilka/kosilka"},
- {"GAMES/RFORCES", VAR_PROGS .. "/games/rforces/trunk/rforces"},
- {"GAMES/XONIX", VAR_PROGS .. "/games/xonix/trunk/xonix"},
+ {"GAMES/RFORCES", VAR_PROGS .. "/games/rforces/rforces"},
+ {"GAMES/XONIX", VAR_PROGS .. "/games/xonix/xonix"},
 })
 tup.append_table(extra_files, {
- {"kolibrios/games/fara/fara", VAR_PROGS .. "/games/fara/trunk/fara"},
- {"kolibrios/games/LaserTank/LaserTank", VAR_PROGS .. "/games/LaserTank/trunk/LaserTank"},
+ {"kolibrios/games/fara/fara", VAR_PROGS .. "/games/fara/fara"},
+ {"kolibrios/games/LaserTank/LaserTank", VAR_PROGS .. "/games/LaserTank/LaserTank"},
 })
 end -- tup.getconfig('NO_MSVC') ~= 'full'
 
@@ -743,7 +743,7 @@ end -- tup.getconfig('NO_TCC') ~= 'full'
 -- Programs that require GCC to compile.
 if tup.getconfig('NO_GCC') ~= 'full' then
 tup.append_table(img_files, {
- {"GAMES/REVERSI", VAR_PROGS .. "/games/reversi/trunk/reversi"},
+ {"GAMES/REVERSI", VAR_PROGS .. "/games/reversi/reversi"},
  {"LIB/BASE64.OBJ", VAR_PROGS .. "/develop/libraries/base64/base64.obj"},
  {"LIB/LIBC.OBJ", VAR_PROGS .. "/develop/ktcc/trunk/libc.obj/source/libc.obj"},
  {"LIB/ICONV.OBJ", VAR_PROGS .. "/develop/libraries/iconv/iconv.obj"},
@@ -755,7 +755,7 @@ tup.append_table(extra_files, {
  {"kolibrios/emul/e80/e80", VAR_PROGS .. "/emulator/e80/trunk/e80"},
  {"kolibrios/emul/uarm/", VAR_CONTRIB .. "/other/uarm/uARM"},
  {"kolibrios/games/2048", VAR_PROGS .. "/games/2048/2048"},
- {"kolibrios/games/checkers", VAR_PROGS .. "/games/checkers/trunk/checkers"},
+ {"kolibrios/games/checkers", VAR_PROGS .. "/games/checkers/checkers"},
  {"kolibrios/games/donkey", VAR_PROGS .. "/games/donkey/donkey"},
  {"kolibrios/games/heliothryx", VAR_PROGS .. "/games/heliothryx/heliothryx"},
  {"kolibrios/games/marblematch3", VAR_PROGS .. "/games/marblematch3/marblematch3"},

programs/games/15/15.ASM

@@ -5,7 +5,7 @@
 ;
 
 include 'lang.inc' ; Language support for locales: ru_RU (CP866), it_IT, de_DE, en_US.
-include '..\..\..\macros.inc' ; decreases program size (not required)
+include '..\..\macros.inc' ; decreases program size (not required)
 
 StatusColor equ 0x00ffffff
 StatusColor2 equ 0x00dc1e14

programs/games/15/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/games/LaserTank/Tupfile.lua

@@ -1,5 +1,5 @@
 if tup.getconfig("NO_FASM") ~= "" or tup.getconfig("NO_MSVC") ~= "" 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_msvc.lua")
 if tup.getconfig("LANG") == "ru_RU"
 then CFLAGS = CFLAGS .. " /DLANG=RUS"

programs/games/MSquare/MSquare.asm

@@ -45,7 +45,7 @@ debug_print_dec num
 popad
 }
 
-include '../../../macros.inc'
+include '../../macros.inc'
 ;include 'debug.inc'
 include 'editbox_ex.mac'
 include 'lang.inc'

programs/games/MSquare/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/games/arcanii/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/games/arcanii/arcanii.asm

@@ -5,7 +5,7 @@
 ;----------------------------------------
 
 include 'lang.inc' ; Language support for locales: it_IT, en_US.
-include '../../../macros.inc'
+include '../../macros.inc'
 include 'ascl.inc'
 include 'ascgl.inc'
 include 'asjc.inc'

programs/games/arcanoid/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/games/arcanoid/arcanoid.asm

@@ -20,7 +20,7 @@
 ;******************************************************************************
 
 include 'lang.inc' ; Language support for locales: it_IT, en_US.
-include '..\..\..\macros.inc'
+include '..\..\macros.inc'
 include 'ascl.inc'
 include 'ascgl.inc'
 include 'ascgml.inc'

programs/games/bnc/Tupfile.lua

@@ -1,4 +1,4 @@
 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")
 tup.rule("bnc.asm", FASM .. " -dlang=" .. tup.getconfig("LANG") .. " %f %o " .. tup.getconfig("KPACK_CMD"), "bnc")

programs/games/checkers/Tupfile.lua

@@ -1,5 +1,5 @@
 if tup.getconfig("NO_GCC") ~= "" 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_gcc.lua")
 tup.include(HELPERDIR .. "/use_newlib.lua")