From d162adb63afb7e7ba83f3089b57cd51422762ab5 Mon Sep 17 00:00:00 2001 From: ahodgkinson Date: Wed, 24 May 2006 18:48:17 +0000 Subject: [PATCH] Updates for XFLAIM NetWare build. git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@449 0109f412-320b-0410-ab79-c3e0c5ffbbe6 --- xflaim/Makefile | 12 +++--- xflaim/util/checkdb.cpp | 10 ----- xflaim/util/fshell.cpp | 41 +------------------ xflaim/util/rebuild.cpp | 87 ++++++----------------------------------- xflaim/util/view.cpp | 68 -------------------------------- xflaim/util/xshell.cpp | 37 +----------------- 6 files changed, 20 insertions(+), 235 deletions(-) diff --git a/xflaim/Makefile b/xflaim/Makefile index 6d339af..507a353 100644 --- a/xflaim/Makefile +++ b/xflaim/Makefile @@ -700,7 +700,7 @@ lib_install_dir = $(rpm_build_root)$(install_prefix)/$(lib_dir_name) include_install_dir = $(rpm_build_root)$(install_prefix)/include pkgconfig_install_dir = $(lib_install_dir)/pkgconfig build_output_dir = $(topdir)/build -docs_output_dir = $(build_output_dir)/docs +doxygen_output_dir = $(build_output_dir)/docs target_path = $(build_output_dir)/$(target_os_family)-$(target_processor_family)-$(target_word_size)/$(target_build_type) @@ -766,7 +766,7 @@ sample_obj_dir = $(sample_dir)/obj lib_obj_dir = $(lib_dir)/obj -doxyfile = $(docs_output_dir)/Doxyfile +doxyfile = $(doxygen_output_dir)/Doxyfile # -- Tools -- @@ -1507,7 +1507,7 @@ $(sample_exe): $(sample_obj) $(xflaim_static_lib) xshell: status clean dircheck libs $(xshell_exe) $(xshell_exe): $(xshell_obj) $(xflaim_static_lib) $(ec)$(gprintf) "Linking $@ ...\n" - $(call flm_exe_link_cmd,$(sample_dir),sample,$(sample_obj)) + $(call flm_exe_link_cmd,$(util_dir),xshell,$(xshell_obj)) # -- basictest -- @@ -1717,7 +1717,7 @@ srcdist: status clean dircheck docs spec $(ec)$(call dircopycmd,util,$(package_stage_dir)/util) $(ec)$(call dircopycmd,sample,$(package_stage_dir)/sample) $(ec)$(call dircopycmd,java,$(package_stage_dir)/java) - $(ec)$(call dircopycmd,$(docs_output_dir),$(package_stage_dir)/docs) + $(ec)$(call dircopycmd,$(doxygen_output_dir),$(package_stage_dir)/docs) $(ec)$(call dircopycmd,$(dir $(topdir))tools,$(package_stage_dir)/tools) $(ec)$(call mkdircmd,$(package_stage_dir)/ftk) $(ec)$(call dircopycmd,$(dir $(topdir))ftk/src,$(package_stage_dir)/ftk/src) @@ -1964,7 +1964,7 @@ dircheck: $(ec)$(call mkdircmd,$(lib_obj_dir)) $(ec)$(call mkdircmd,$(java_output_dir)) $(ec)$(call mkdircmd,$(java_class_output_dir)) - $(ec)$(call mkdircmd,$(docs_output_dir)) + $(ec)$(call mkdircmd,$(doxygen_output_dir)) $(ec)$(call mkdircmd,$(util_dir)) $(ec)$(call mkdircmd,$(test_dir)) $(ec)$(call mkdircmd,$(sample_dir)) @@ -2126,7 +2126,7 @@ status: doxyfile: dircheck $(ec)$(gprintf) "PROJECT_NAME = \"$(project_display_name)\"\n" > $(doxyfile) $(ec)$(gprintf) "PROJECT_NUMBER = \"$(version)\"\n" >> $(doxyfile) - $(ec)$(gprintf) "OUTPUT_DIRECTORY = $(docs_output_dir)\n" >> $(doxyfile) + $(ec)$(gprintf) "OUTPUT_DIRECTORY = $(doxygen_output_dir)\n" >> $(doxyfile) $(ec)$(gprintf) "CREATE_SUBDIRS = NO\n" >> $(doxyfile) $(ec)$(gprintf) "OUTPUT_LANGUAGE = English\n" >> $(doxyfile) $(ec)$(gprintf) "USE_WINDOWS_ENCODING = YES\n" >> $(doxyfile) diff --git a/xflaim/util/checkdb.cpp b/xflaim/util/checkdb.cpp index 0a67966..81c5f87 100644 --- a/xflaim/util/checkdb.cpp +++ b/xflaim/util/checkdb.cpp @@ -255,16 +255,6 @@ extern "C" int main( gv_bRunning = TRUE; gv_szLastError[ 0] = '\0'; -#ifdef FLM_NLM - - /* Setup the routines to be called when the NLM exits itself */ - - atexit( chkCleanup); - - /* Register to see the DOWN server event. */ - -#endif - if( RC_BAD( FlmAllocDbSystem( &gv_pDbSystem))) { WpsStrOut( "\nCould not initialize FLAIM.\n"); diff --git a/xflaim/util/fshell.cpp b/xflaim/util/fshell.cpp index 1379e75..0c49acc 100644 --- a/xflaim/util/fshell.cpp +++ b/xflaim/util/fshell.cpp @@ -1223,30 +1223,6 @@ RCODE FlmShell::executeCmdLine( void) setShutdownFlag(); bValidCommand = TRUE; } -#if defined (FLM_NLM) - else if( f_stricmp( m_ppCurrArgV[ 0], "realpath") == 0) - { - bValidCommand = TRUE; - char newPath[ 256]; - int err = 0; - - if( m_iCurrArgC !=2) - { - con_printf( "Wrong Number Of Params\n"); - } - else - { - if( !realpath( m_ppCurrArgV[ 1], newPath)) - { - con_printf("Error getting real path"); - } - else - { - con_printf( "%s\n", newPath); - } - } - } -#endif else if( f_stricmp( m_ppCurrArgV[ 0], "echo") == 0) { FLMBOOL bNewline = FALSE; @@ -4238,25 +4214,10 @@ FLMINT FlmFileSysCommand::execute( { if (iArgC > 1) { -#if defined( FLM_WIN) - if (_chdir( (const char *)ppszArgV [1]) != 0) + if( RC_BAD( rc = f_chdir( (const char *)ppszArgV [1]))) { pShell->con_printf( "Error changing directory\n"); } -#elif defined( FLM_UNIX) - if (chdir( (char *)ppszArgV [1]) != 0) - { - pShell->con_printf( "Error changing directory\n"); - } -#elif defined( FLM_NLM) - if (chdir( (char *)ppszArgV [1]) != 0) - { - pShell->con_printf( "Error changing directory\n"); - } -#else - #error "This platform is not supported" - -#endif } } diff --git a/xflaim/util/rebuild.cpp b/xflaim/util/rebuild.cpp index 798a495..1305863 100644 --- a/xflaim/util/rebuild.cpp +++ b/xflaim/util/rebuild.cpp @@ -123,17 +123,6 @@ FSTATIC void bldLogCorruptError( FSTATIC void bldShowError( const char * pszMessage); -#ifdef FLM_NLM -FLMBOOL gv_bSynchronized = FALSE; -FSTATIC void bldCleanup( void); -#endif - -#ifdef FLM_NLM -#define bldGiveUpCPU() f_yieldCPU() -#else -#define bldGiveUpCPU() f_sleep( 0) -#endif - FLMBOOL gv_bShutdown = FALSE; static char * gv_pszLogBuffer = NULL; static FLMUINT gv_uiLogBufferCount = 0; @@ -163,10 +152,6 @@ static FLMBOOL gv_bPauseBeforeExiting = FALSE; static IF_DbSystem * gv_pDbSystem = NULL; -#ifdef FLM_NLM -typedef LONG (* RBLD_VOID_FUNC_p )(void); -#endif - #ifdef FLM_WATCOM_NLM #define main nlm_main #endif @@ -185,14 +170,6 @@ extern "C" int main( gv_bBatchMode = FALSE; gv_bRunning = TRUE; -#ifdef FLM_NLM - - // Setup the routines to be called when the NLM exits itself - - atexit( bldCleanup); - -#endif - if( RC_BAD( FlmAllocDbSystem( &gv_pDbSystem))) { goto Exit; @@ -231,7 +208,8 @@ Exit: (void)WpkIncar(); break; } - bldGiveUpCPU(); + + f_yieldCPU(); } } @@ -244,13 +222,6 @@ Exit: gv_pDbSystem->Release(); } -#ifdef FLM_NLM - if (!gv_bSynchronized) - { - SynchronizeStart(); - gv_bSynchronized = TRUE; - } -#endif gv_bRunning = FALSE; return( iRetCode); } @@ -547,9 +518,6 @@ FSTATIC FLMBOOL bldGetParams( char * pszPtr; char * ppszArgs[ MAX_ARGS]; char szCommandBuffer [300]; -#ifdef FLM_NLM - FLMBOOL bWaitToSync = FALSE; -#endif gv_szSrcFileName [0] = 0; gv_szSrcDataDir [0] = 0; @@ -745,12 +713,6 @@ FSTATIC FLMBOOL bldGetParams( { gv_bBatchMode = TRUE; } -#ifdef FLM_NLM - else if (f_stricmp( pszPtr, "W") == 0) - { - bWaitToSync = TRUE; - } -#endif else if (f_stricmp( pszPtr, "?") == 0) { goto Show_Help; @@ -765,13 +727,6 @@ FSTATIC FLMBOOL bldGetParams( else if (f_stricmp( pszPtr, "?") == 0) { Show_Help: -#ifdef FLM_NLM - if (!gv_bSynchronized) - { - SynchronizeStart(); - gv_bSynchronized = TRUE; - } -#endif bldShowHelp(); gv_bPauseBeforeExiting = TRUE; return( FALSE); @@ -787,14 +742,6 @@ Show_Help: uiLoop++; } -#ifdef FLM_NLM - if (!bWaitToSync && !gv_bSynchronized) - { - SynchronizeStart(); - gv_bSynchronized = TRUE; - } -#endif - if (!gv_szSrcFileName [0] || !gv_szDestFileName [0]) { goto Show_Help; @@ -1018,7 +965,8 @@ FSTATIC RCODE bldGetUserInput( break; } } - bldGiveUpCPU(); + + f_yieldCPU(); } WpsScrBackFor (FLM_BLACK, FLM_LIGHTGRAY); @@ -1189,8 +1137,11 @@ RCODE F_LocalRebuildStatus::reportRebuild( rc = bldGetUserInput(); goto Exit; } - bldGiveUpCPU(); + + f_yieldCPU(); + Exit: + return( rc); } @@ -1213,7 +1164,7 @@ RCODE F_LocalRebuildStatus::reportRebuildErr( goto Exit; } - bldGiveUpCPU(); + f_yieldCPU(); Exit: @@ -1244,8 +1195,10 @@ FSTATIC void bldShowError( gv_bShutdown = TRUE; break; } - bldGiveUpCPU(); + + f_yieldCPU(); } + WpsScrBackFor (FLM_BLACK, FLM_LIGHTGRAY); WpsScrClr( 0, 22); } @@ -1300,19 +1253,3 @@ FSTATIC void bldLogString( } } } - -#ifdef FLM_NLM -/**************************************************************************** -Desc: This routine shuts down all threads in the NLM. -****************************************************************************/ -FSTATIC void bldCleanup( - void - ) -{ - gv_bShutdown = TRUE; - while( gv_bRunning) - { - bldGiveUpCPU(); - } -} -#endif diff --git a/xflaim/util/view.cpp b/xflaim/util/view.cpp index fcaedc3..af6f37e 100644 --- a/xflaim/util/view.cpp +++ b/xflaim/util/view.cpp @@ -57,18 +57,6 @@ FSTATIC FLMBOOL ViewSetupMainMenu( void); FSTATIC FLMBOOL ViewOpenFileDirect( void); -#ifdef FLM_NLM - FLMBOOL gv_bSynchronized = FALSE; - extern "C" - { - int nlm_main( - int iArgC, - char ** ppszArgV); - } - - FSTATIC void viewCleanup( void); -#endif - static FLMBOOL bPauseBeforeExiting = FALSE; FLMUINT gv_uiTopLine = 0; FLMUINT gv_uiBottomLine = 0; @@ -77,19 +65,9 @@ IF_DbSystem * gv_pDbSystem = NULL; /******************************************************************** Desc: ? *********************************************************************/ -#if defined (FLM_UNIX) int main( int iArgC, char ** ppszArgV) -#elif defined( FLM_NLM) -int nlm_main( - int iArgC, - char ** ppszArgV) -#else -int __cdecl main( - int iArgC, - char ** ppszArgV) -#endif { #define MAX_ARGS 30 RCODE rc = NE_XFLM_OK; @@ -127,21 +105,6 @@ int __cdecl main( gv_bRunning = TRUE; gv_pSFileHdl = NULL; -#ifdef FLM_NLM - - // Setup the routines to be called when the NLM exits itself - - atexit( viewCleanup); - -#endif - -#ifdef FLM_NLM - if (!gv_bSynchronized) - { - SynchronizeStart(); - gv_bSynchronized = TRUE; - } -#endif WpsInit( 0xFFFF, 0xFFFF, "FLAIM Database Viewer"); WpsOptimize(); @@ -342,13 +305,6 @@ Exit: gv_pDbSystem->Release(); } -#ifdef FLM_NLM - if (!gv_bSynchronized) - { - SynchronizeStart(); - gv_bSynchronized = TRUE; - } -#endif gv_bRunning = FALSE; return 0; } @@ -360,13 +316,6 @@ FSTATIC void ViewShowHelp( FLMBOOL bShowFullUsage ) { -#ifdef FLM_NLM - if (!gv_bSynchronized) - { - SynchronizeStart(); - gv_bSynchronized = TRUE; - } -#endif WpsStrOut( "\n"); if (bShowFullUsage) { @@ -903,20 +852,3 @@ FSTATIC void ViewDoMainMenu( void) } } } - -#ifdef FLM_NLM -/**************************************************************************** -Desc: This routine shuts down all threads in the VIEW NLM. -****************************************************************************/ -FSTATIC void viewCleanup( - void - ) -{ - gv_bShutdown = TRUE; - while (gv_bRunning) - { - viewGiveUpCPU(); - } -} -#endif - diff --git a/xflaim/util/xshell.cpp b/xflaim/util/xshell.cpp index 5f6dc47..6988722 100644 --- a/xflaim/util/xshell.cpp +++ b/xflaim/util/xshell.cpp @@ -30,52 +30,17 @@ static FlmSharedContext * gv_pSharedContext = NULL; FLMBOOL gv_bShutdown = FALSE; FLMBOOL gv_bRunning = TRUE; -#if defined( FLM_NLM) - - extern "C" - { -// void SynchronizeStart( void); - void xshellCleanup( void); - } - - void xshellCleanup( void) - { - while( gv_bRunning) - { - f_yieldCPU(); - } - } - -#endif - /*************************************************************************** Desc: Program entry point (main) ****************************************************************************/ -#if defined( FLM_UNIX) || defined( FLM_NLM) -extern "C" int main( +int main( int, // iArgC, char **) // ppucArgV -#else -int __cdecl main( - int, // iArgC, - char **) // ppucArgV -#endif { RCODE rc = NE_XFLM_OK; FlmShell * pShell = NULL; IF_DbSystem * pDbSystem = NULL; -#ifdef FLM_NLM - - gv_bRunning = TRUE; - - // Setup the routines to be called when the NLM exits - - atexit( xshellCleanup); -// SynchronizeStart(); - -#endif - if( RC_BAD( rc = FlmAllocDbSystem( &pDbSystem))) { goto Exit;