From c5737c5fedf0417dcb73d28dc6632d9e2e1a2032 Mon Sep 17 00:00:00 2001 From: "Alexey Teplov (" Date: Mon, 15 Nov 2010 18:47:23 +0000 Subject: [PATCH] Add newline a nightbuild git-svn-id: svn://kolibrios.org@1702 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/build_all.bat | 7 +++++++ programs/develop/heed/trunk/heed.asm | 5 +++++ programs/develop/tinypad/trunk/data/tp-idata.inc | 6 +++++- programs/develop/tinypad/trunk/tinypad.asm | 3 ++- programs/media/animage/trunk/animage.asm | 1 + programs/media/animage/trunk/lib_data.inc | 6 +++++- programs/media/midamp/trunk/midamp.asm | 7 ++++++- programs/media/scrshoot/scrshoot.asm | 5 +++++ programs/other/kpack/trunk/const_var.inc | 6 +++++- programs/other/kpack/trunk/kpack.asm | 1 + programs/other/rtfread/trunk/rtfread.asm | 7 ++++++- programs/system/desktop/trunk/desktop.asm | 7 ++++++- programs/system/hdd_info/trunk/hdd_info.asm | 8 ++++++-- programs/system/mgb/trunk/mgb.asm | 7 ++++++- programs/system/rdsave/trunk/rdsave.asm | 7 ++++++- 15 files changed, 72 insertions(+), 11 deletions(-) diff --git a/programs/build_all.bat b/programs/build_all.bat index 08f495e93c..8976d4b2af 100644 --- a/programs/build_all.bat +++ b/programs/build_all.bat @@ -232,6 +232,12 @@ echo Building depend application for fdd's nightbuild echo * echo __nightbuild fix yes >> config.inc fasm media\kiv\trunk\kiv.asm %BIN%\nightbuild\kiv +fasm media\scrshoot\scrshoot.asm %BIN%\nightbuild\scrshoot +fasm media\animage\trunk\animage.asm %BIN%\nightbuild\animage +fasm media\midamp\trunk\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\desktop\trunk\desktop.asm %BIN%\nightbuild\desktop @@ -428,6 +434,7 @@ echo * echo Compressing nightbuild echo * kpack %BIN%\nightbuild\kiv +kpack %BIN%\nightbuild\scrshoot echo * diff --git a/programs/develop/heed/trunk/heed.asm b/programs/develop/heed/trunk/heed.asm index 115505d577..296dbb7910 100644 --- a/programs/develop/heed/trunk/heed.asm +++ b/programs/develop/heed/trunk/heed.asm @@ -51,6 +51,7 @@ use32 _title equ 'HeEd 0.15', 0 include 'lang.inc' +include '../../../config.inc' ;for nightbuild include '../../../macros.inc' include '../../libraries/box_lib/trunk/box_lib.mac' include '../../libraries/box_lib/load_lib.mac' @@ -3329,7 +3330,11 @@ OpenDialog_data: communication_area_name: db 'FFFFFFFF_open_dialog',0 open_dialog_path: +if __nightbuild eq yes + db '/sys/MANAGERS/opendial',0 +else db '/sys/File Managers/opendial',0 +end if communication_area_default_pach: db '/rd/1',0 diff --git a/programs/develop/tinypad/trunk/data/tp-idata.inc b/programs/develop/tinypad/trunk/data/tp-idata.inc index 697041b59b..21b8d99788 100644 --- a/programs/develop/tinypad/trunk/data/tp-idata.inc +++ b/programs/develop/tinypad/trunk/data/tp-idata.inc @@ -138,7 +138,11 @@ OpenDialog_data: communication_area_name: db 'FFFFFFFF_open_dialog',0 open_dialog_path: - db '/sys/File Managers/opendial',0 +if __nightbuild eq yes + db '/sys/MANAGERS/opendial',0 +else + db '/sys/File Managers/opendial',0 +end if communication_area_default_pach: db '/sys',0 diff --git a/programs/develop/tinypad/trunk/tinypad.asm b/programs/develop/tinypad/trunk/tinypad.asm index d3b269cb43..cb86f56b14 100644 --- a/programs/develop/tinypad/trunk/tinypad.asm +++ b/programs/develop/tinypad/trunk/tinypad.asm @@ -22,7 +22,8 @@ include 'lang.inc' -include '../../../macros.inc' ; useful stuff +include '../../../config.inc' ;for nightbuild +include '../../../macros.inc' ; useful stuff include '../../../struct.inc' include '../../../proc32.inc' diff --git a/programs/media/animage/trunk/animage.asm b/programs/media/animage/trunk/animage.asm index 890ec80b37..5db44fd13d 100644 --- a/programs/media/animage/trunk/animage.asm +++ b/programs/media/animage/trunk/animage.asm @@ -31,6 +31,7 @@ org 0x0 dd cur_dir_path +include '../../../config.inc' ;for nightbuild include '..\..\..\macros.inc' include '../../../develop/libraries/box_lib/load_lib.mac' @use_library diff --git a/programs/media/animage/trunk/lib_data.inc b/programs/media/animage/trunk/lib_data.inc index 11f6cec796..d35b965400 100644 --- a/programs/media/animage/trunk/lib_data.inc +++ b/programs/media/animage/trunk/lib_data.inc @@ -40,7 +40,11 @@ OpenDialog_data: communication_area_name: db 'FFFFFFFF_open_dialog',0 open_dialog_path: - db '/sys/File Managers/opendial',0 +if __nightbuild eq yes + db '/sys/MANAGERS/opendial',0 +else + db '/sys/File Managers/opendial',0 +end if communication_area_default_pach: db '/rd0/1/',0 diff --git a/programs/media/midamp/trunk/midamp.asm b/programs/media/midamp/trunk/midamp.asm index 0403a29a51..1f9b4de473 100644 --- a/programs/media/midamp/trunk/midamp.asm +++ b/programs/media/midamp/trunk/midamp.asm @@ -65,6 +65,7 @@ use32 listsel dd 0 channel dd 0 COLOR_ORDER equ MENUETOS +include '../../../config.inc' ;for nightbuild include '../../../macros.inc' ; decrease code size (optional) include '../../../develop/libraries/box_lib/load_lib.mac' @@ -404,7 +405,11 @@ OpenDialog_data: communication_area_name: db 'FFFFFFFF_open_dialog',0 open_dialog_path: - db '/sys/File Managers/opendial',0 +if __nightbuild eq yes + db '/sys/MANAGERS/opendial',0 +else + db '/sys/File Managers/opendial',0 +end if communication_area_default_pach: db '/rd/1',0 diff --git a/programs/media/scrshoot/scrshoot.asm b/programs/media/scrshoot/scrshoot.asm index 6649ad9c90..31ee5f7fde 100644 --- a/programs/media/scrshoot/scrshoot.asm +++ b/programs/media/scrshoot/scrshoot.asm @@ -18,6 +18,7 @@ title equ 'Screenshooter v 1.0' ; include '../../develop/libraries/box_lib/load_lib.mac' include '../../develop/libraries/box_lib/trunk/box_lib.mac' ;include '../../develop/examples/editbox/trunk/editbox.inc' +include '../../config.inc' ;for nightbuild include '../../macros.inc' include 'txtbut.inc' include 'label.inc' @@ -890,7 +891,11 @@ OpenDialog_data: communication_area_name: db 'FFFFFFFF_open_dialog',0 open_dialog_path: +if __nightbuild eq yes + db '/sys/MANAGERS/opendial',0 +else db '/sys/File Managers/opendial',0 +end if communication_area_default_pach: db '/sys',0 diff --git a/programs/other/kpack/trunk/const_var.inc b/programs/other/kpack/trunk/const_var.inc index be33222078..247272a34e 100644 --- a/programs/other/kpack/trunk/const_var.inc +++ b/programs/other/kpack/trunk/const_var.inc @@ -160,7 +160,11 @@ OpenDialog_data: communication_area_name: db 'FFFFFFFF_open_dialog',0 open_dialog_path: - db '/sys/File Managers/opendial',0 +if __nightbuild eq yes + db '/sys/MANAGERS/opendial',0 +else + db '/sys/File Managers/opendial',0 +end if communication_area_default_pach: db '/rd/1',0 diff --git a/programs/other/kpack/trunk/kpack.asm b/programs/other/kpack/trunk/kpack.asm index 306a8be7e1..64174c307d 100644 --- a/programs/other/kpack/trunk/kpack.asm +++ b/programs/other/kpack/trunk/kpack.asm @@ -37,6 +37,7 @@ use32 dd params dd cur_dir_path ;--------------------------------------------------------------------- +include '../../../config.inc' ;for nightbuild include '../../../macros.inc' include '../../../develop/libraries/box_lib/trunk/box_lib.mac' include '../../../develop/libraries/box_lib/load_lib.mac' diff --git a/programs/other/rtfread/trunk/rtfread.asm b/programs/other/rtfread/trunk/rtfread.asm index c66129d8d9..0d48444835 100644 --- a/programs/other/rtfread/trunk/rtfread.asm +++ b/programs/other/rtfread/trunk/rtfread.asm @@ -59,6 +59,7 @@ AR_OFFSET equ 10 dd fname_buf ; адрес буфера для параметров (не используется) dd cur_dir_path ; зарезервировано +include '../../../config.inc' ;for nightbuild include '../../../macros.inc' ; макросы облегчают жизнь ассемблерщиков! include '../../../develop/libraries/box_lib/trunk/box_lib.mac' include '../../../develop/libraries/box_lib/load_lib.mac' @@ -788,7 +789,11 @@ OpenDialog_data: communication_area_name: db 'FFFFFFFF_open_dialog',0 open_dialog_path: - db '/sys/File Managers/opendial',0 +if __nightbuild eq yes + db '/sys/MANAGERS/opendial',0 +else + db '/sys/File Managers/opendial',0 +end if communication_area_default_pach: db '/rd/1',0 diff --git a/programs/system/desktop/trunk/desktop.asm b/programs/system/desktop/trunk/desktop.asm index fa72fe98f6..644bf2f2b7 100644 --- a/programs/system/desktop/trunk/desktop.asm +++ b/programs/system/desktop/trunk/desktop.asm @@ -22,6 +22,7 @@ dd cur_dir_path ; path to file include 'lang.inc' +include '../../../config.inc' ;for nightbuild include '../../../macros.inc' include 'kglobals.inc' include 'unpacker.inc' @@ -1374,7 +1375,11 @@ communication_area_name2: communication_area_name: db 'FFFFFFFF_open_dialog2',0 open_dialog_path: - db '/sys/File Managers/opendial',0 +if __nightbuild eq yes + db '/sys/MANAGERS/opendial',0 +else + db '/sys/File Managers/opendial',0 +end if communication_area_default_pach: db '/sys',0 diff --git a/programs/system/hdd_info/trunk/hdd_info.asm b/programs/system/hdd_info/trunk/hdd_info.asm index f1fc573be6..8a1d255205 100644 --- a/programs/system/hdd_info/trunk/hdd_info.asm +++ b/programs/system/hdd_info/trunk/hdd_info.asm @@ -36,7 +36,7 @@ SECONDARY_CHANNEL equ 0x177 ; Регистр по смещению 0х10 для функции 02 содержит 0x1c01 (порты 0х1с00-0х1с07) ; Режимы Legacy, Native и пр. меняются через BIOS. - +include '../../../config.inc' ;for nightbuild include '..\..\..\macros.inc' include '../../../develop/libraries/box_lib/trunk/box_lib.mac' include '../../../develop/libraries/box_lib/load_lib.mac' @@ -1843,7 +1843,11 @@ communication_area_name2: communication_area_name: db 'FFFFFFFF_open_dialog2',0 open_dialog_path: - db '/sys/File Managers/opendial',0 +if __nightbuild eq yes + db '/sys/MANAGERS/opendial',0 +else + db '/sys/File Managers/opendial',0 +end if communication_area_default_pach: db '/sys',0 diff --git a/programs/system/mgb/trunk/mgb.asm b/programs/system/mgb/trunk/mgb.asm index 4c9829927d..16ed400d91 100644 --- a/programs/system/mgb/trunk/mgb.asm +++ b/programs/system/mgb/trunk/mgb.asm @@ -42,6 +42,7 @@ use32 dd fname_buf dd cur_dir_path +include '../../../config.inc' ;for nightbuild include '..\..\..\macros.inc' include '..\..\..\proc32.inc' include '../../../develop/libraries/box_lib/trunk/box_lib.mac' @@ -617,7 +618,11 @@ OpenDialog_data: communication_area_name: db 'FFFFFFFF_open_dialog',0 open_dialog_path: - db '/sys/File Managers/opendial',0 +if __nightbuild eq yes + db '/sys/MANAGERS/opendial',0 +else + db '/sys/File Managers/opendial',0 +end if communication_area_default_pach: db '/rd0/1/',0 diff --git a/programs/system/rdsave/trunk/rdsave.asm b/programs/system/rdsave/trunk/rdsave.asm index 6bde159c85..d75a1d9e0e 100644 --- a/programs/system/rdsave/trunk/rdsave.asm +++ b/programs/system/rdsave/trunk/rdsave.asm @@ -15,6 +15,7 @@ ; ;--------------------------------------------------------------------- include 'lang.inc' +include '../../../config.inc' ;for nightbuild include '..\..\..\macros.inc' appname equ 'RDsave ' @@ -451,7 +452,11 @@ OpenDialog_data: communication_area_name: db 'FFFFFFFF_open_dialog',0 open_dialog_path: - db '/sys/File Managers/opendial',0 +if __nightbuild eq yes + db '/sys/MANAGERS/opendial',0 +else + db '/sys/File Managers/opendial',0 +end if communication_area_default_pach: db '/hd0/1/kolibri',0