Index: tolbase/generic/CMakeLists.txt =================================================================== --- tolbase/generic/CMakeLists.txt (revision 1b5b24e974d86af9fe62a4722f3cb84c5cff2d2a) +++ (revision ) @@ -1,36 +1,0 @@ -add_definitions( -DTCL_THREADS -DTOLBASE_VERSION=\"${TOLBASE_VERSION_MAJOR}.${TOLBASE_VERSION_MINOR}\") -include_directories( ${TCL_INCLUDE_PATH} ${TOL_INCLUDE_DIR} ) - -message( STATUS "Using TCL_INCLUDE_PATH = ${TCL_INCLUDE_PATH}" ) -message( STATUS "Using TCL_LIBRARY = ${TCL_LIBRARY}" ) -message( STATUS "Using TK_LIBRARY = ${TK_LIBRARY}" ) - -if ( WIN32 ) - set( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -mwindows" ) -endif( WIN32 ) - -set(RES_FILES "") -if(MINGW) - set(RES_FILES "tolbase-gnu.rc") - set(CMAKE_RC_COMPILER_INIT windres) - ENABLE_LANGUAGE(RC) - if(CMAKE_SIZEOF_VOID_P EQUAL 4) - SET(CMAKE_RC_COMPILE_OBJECT " -O coff -i -o -F pe-i386") - else(CMAKE_SIZEOF_VOID_P EQUAL 4) - SET(CMAKE_RC_COMPILE_OBJECT " -O coff -i -o -F pe-x86-64") - endif(CMAKE_SIZEOF_VOID_P EQUAL 4) -endif(MINGW) - -if( UNIX ) - SET(CMAKE_INSTALL_RPATH "$ORIGIN/../lib") -endif( UNIX ) -add_executable( tolbase tolbase.c ${RES_FILES}) - -if( WIN32 ) - target_link_libraries( tolbase ${TCL_LIBRARY} ${TK_LIBRARY} ) -else( WIN32 ) - target_link_libraries( tolbase ${TCL_LIBRARY} ${TK_LIBRARY} ${TOL_LIBRARY} ) -endif( WIN32 ) - -message( STATUS "TOLBASE_DEST_DIR = ${TOLBASE_DEST_DIR}" ) -install( TARGETS tolbase RUNTIME DESTINATION "bin" ) Index: tolbase/generic/tkAppInit.c =================================================================== --- tolbase/generic/tkAppInit.c (revision 1b5b24e974d86af9fe62a4722f3cb84c5cff2d2a) +++ tolbase/generic/tkAppInit.c (revision 6d7779d88a35f4606432b88f2eceba8b66c4516b) @@ -230,5 +230,5 @@ Tcl_DStringInit(&ds1); pathv1[0] = ds.string; - pathv1[1] = "tcl8.4"; + pathv1[1] = "tcl"; Tcl_JoinPath(2, pathv1, &ds1); sys_res = setenv("TCL_LIBRARY", ds1.string, 1); @@ -239,5 +239,5 @@ Tcl_DStringFree(&ds1); - pathv1[1] = "tk8.4"; + pathv1[1] = "tk"; Tcl_JoinPath(2, pathv1, &ds1); sys_res = setenv("TK_LIBRARY", ds1.string, 1); Index: tolbase/generic/tolbase-gnu.rc =================================================================== --- tolbase/generic/tolbase-gnu.rc (revision 1b5b24e974d86af9fe62a4722f3cb84c5cff2d2a) +++ (revision ) @@ -1,54 +1,0 @@ - -#include - -// Icon resources -1 ICON "../lib/toltk/images/tolbase.ico" - -// Version Information resources -1 VERSIONINFO - FILEVERSION 3,0,0,0 - PRODUCTVERSION 3,0,0,0 - FILEOS VOS__WINDOWS32 - FILETYPE VFT_APP - FILESUBTYPE VFT2_UNKNOWN - FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE | VS_FF_PATCHED | VS_FF_INFOINFERRED - FILEFLAGS 0 -{ - BLOCK "StringFileInfo" - { - BLOCK "040901B5" // English - { - VALUE "Comments", "" - VALUE "CompanyName", "Bayes Forecast" - VALUE "FileDescription", "TOLBase (GNU)" - VALUE "FileVersion", "3.0.0.0" - VALUE "InternalName", "tolbase" - VALUE "LegalCopyright", "GPL-3" - VALUE "LegalTrademarks", "" - VALUE "OriginalFilename", "tolbase.exe" - VALUE "PrivateBuild", "" - VALUE "ProductName", "TOLBase" - VALUE "ProductVersion", "3.0.0.0" - VALUE "SpecialBuild", "" - } - BLOCK "0C0A0352" // Español - { - VALUE "Comments", "" - VALUE "CompanyName", "Bayes Forecast" - VALUE "FileDescription", "TOLBase" - VALUE "FileVersion", "3.0.0.0" - VALUE "InternalName", "tolbase" - VALUE "LegalCopyright", "GPL-3" - VALUE "LegalTrademarks", "" - VALUE "OriginalFilename", "tolbase.exe" - VALUE "PrivateBuild", "" - VALUE "ProductName", "TOLBase" - VALUE "ProductVersion", "3.0.0.0" - VALUE "SpecialBuild", "" - } - } - BLOCK "VarFileInfo" - { - VALUE "Translation", 0x0409, 0x01B5, 0x0C0A, 0x0352 - } -} Index: tolbase/generic/tolbase-msvc.rc =================================================================== --- tolbase/generic/tolbase-msvc.rc (revision 1b5b24e974d86af9fe62a4722f3cb84c5cff2d2a) +++ (revision ) @@ -1,54 +1,0 @@ - -#include - -// Icon resources -1 ICON "../lib/toltk/images/tolbase-msvc.ico" - -// Version Information resources -1 VERSIONINFO - FILEVERSION 3,0,0,0 - PRODUCTVERSION 3,0,0,0 - FILEOS VOS__WINDOWS32 - FILETYPE VFT_APP - FILESUBTYPE VFT2_UNKNOWN - FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE | VS_FF_PATCHED | VS_FF_INFOINFERRED - FILEFLAGS 0 -{ - BLOCK "StringFileInfo" - { - BLOCK "040901B5" // English - { - VALUE "Comments", "" - VALUE "CompanyName", "Bayes Forecast" - VALUE "FileDescription", "TOLBase (MSVC)" - VALUE "FileVersion", "3.0.0.0" - VALUE "InternalName", "tolbase" - VALUE "LegalCopyright", "GPL-3" - VALUE "LegalTrademarks", "" - VALUE "OriginalFilename", "tolbase.exe" - VALUE "PrivateBuild", "" - VALUE "ProductName", "TOLBase" - VALUE "ProductVersion", "3.0.0.0" - VALUE "SpecialBuild", "" - } - BLOCK "0C0A0352" // Español - { - VALUE "Comments", "" - VALUE "CompanyName", "Bayes Forecast" - VALUE "FileDescription", "TOLBase (MSVC)" - VALUE "FileVersion", "3.0.0.0" - VALUE "InternalName", "tolbase" - VALUE "LegalCopyright", "GPL-3" - VALUE "LegalTrademarks", "" - VALUE "OriginalFilename", "tolbase.exe" - VALUE "PrivateBuild", "" - VALUE "ProductName", "TOLBase" - VALUE "ProductVersion", "3.0.0.0" - VALUE "SpecialBuild", "" - } - } - BLOCK "VarFileInfo" - { - VALUE "Translation", 0x0409, 0x01B5, 0x0C0A, 0x0352 - } -} Index: tolbase/generic/tolbase.c =================================================================== --- tolbase/generic/tolbase.c (revision 1b5b24e974d86af9fe62a4722f3cb84c5cff2d2a) +++ (revision ) @@ -1,189 +1,0 @@ -/* - * tkAppInit.c -- - * - * Provides a default version of the Tcl_AppInit procedure for - * use in wish and similar Tk-based applications. - * - * Copyright (c) 1993 The Regents of the University of California. - * Copyright (c) 1994-1997 Sun Microsystems, Inc. - * - * See the file "license.terms" for information on usage and redistribution - * of this file, and for a DISCLAIMER OF ALL WARRANTIES. - */ - -#include "tk.h" -#include "locale.h" -#ifdef WIN32 -#include -#else -#include "tol/tol_init.h" -#endif - -// Tcl_SetStartupScript -#if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION <= 5 -//#include "tclIntDecls.h" -#endif - -static int g_argc = 0; -static char **g_argv = NULL; - -static -void SetupArgv( Tcl_Interp *interp ) -{ - Tcl_Obj *argvPtr = Tcl_NewListObj(0, NULL); - int i; - for( i = 1; i < g_argc; i++ ) - { - Tcl_DString ds; - Tcl_ExternalToUtfDString(NULL, g_argv[i], -1, &ds); - Tcl_ListObjAppendElement(NULL, argvPtr, - Tcl_NewStringObj(Tcl_DStringValue(&ds), - Tcl_DStringLength(&ds))); - Tcl_DStringFree(&ds); - } - Tcl_SetVar2Ex(interp, "argv", NULL, argvPtr, TCL_GLOBAL_ONLY); - Tcl_SetVar2Ex(interp, "argc", NULL, Tcl_NewIntObj(g_argc-1), TCL_GLOBAL_ONLY); -} - -#ifdef TK_TEST -extern int Tktest_Init _ANSI_ARGS_((Tcl_Interp *interp)); -#endif /* TK_TEST */ - - -/* - *---------------------------------------------------------------------- - * - * main -- - * - * This is the main program for the application. - * - * Results: - * None: Tk_Main never returns here, so this procedure never - * returns either. - * - * Side effects: - * Whatever the application does. - * - *---------------------------------------------------------------------- - */ - -#ifdef WIN32 -#pragma comment(linker, "/SUBSYSTEM:windows /ENTRY:mainCRTStartup") -#endif - -int -main(argc, argv) - int argc; /* Number of command-line arguments. */ - char **argv; /* Values of command-line arguments. */ -{ - /* - * The following #if block allows you to change the AppInit - * function by using a #define of TCL_LOCAL_APPINIT instead - * of rewriting this entire file. The #if checks for that - * #define and uses Tcl_AppInit if it doesn't exist. - */ - -#ifndef TK_LOCAL_APPINIT -#define TK_LOCAL_APPINIT Tcl_AppInit -#endif - extern int TK_LOCAL_APPINIT _ANSI_ARGS_((Tcl_Interp *interp)); - - //HWND hwnd = GetConsoleWindow(); - //ShowWindow(hwnd, 0); - - /* - * The following #if block allows you to change how Tcl finds the startup - * script, prime the library or encoding paths, fiddle with the argv, - * etc., without needing to rewrite Tk_Main() - */ - -#ifdef TK_LOCAL_MAIN_HOOK - extern int TK_LOCAL_MAIN_HOOK _ANSI_ARGS_((int *argc, char ***argv)); - TK_LOCAL_MAIN_HOOK(&argc, &argv); -#endif - - g_argc = argc; - g_argv = argv; -#ifndef WIN32 - const char * version = TOLVersion(); -#endif - Tk_Main( 1, argv, TK_LOCAL_APPINIT); - return 0; /* Needed only to prevent compiler warning. */ -} - - -/* - *---------------------------------------------------------------------- - * - * Tcl_AppInit -- - * - * This procedure performs application-specific initialization. - * Most applications, especially those that incorporate additional - * packages, will have their own version of this procedure. - * - * Results: - * Returns a standard Tcl completion code, and leaves an error - * message in the interp's result if an error occurs. - * - * Side effects: - * Depends on the startup script. - * - *---------------------------------------------------------------------- - */ - -int -Tcl_AppInit(interp) - Tcl_Interp *interp; /* Interpreter for application. */ -{ - if (Tcl_Init(interp) == TCL_ERROR) { - return TCL_ERROR; - } - if (Tk_Init(interp) == TCL_ERROR) { - return TCL_ERROR; - } - // Tcl_StaticPackage(interp, "Tk", Tk_Init, Tk_SafeInit); - - - /* - * Call the init procedures for included packages. Each call should - * look like this: - * - * if (Mod_Init(interp) == TCL_ERROR) { - * return TCL_ERROR; - * } - * - * where "Mod" is the name of the module. - */ - - /* - * Call Tcl_CreateCommand for application-specific commands, if - * they weren't already created by the init procedures called above. - */ - - /* - * Specify a user-specific startup file to invoke if the application - * is run interactively. Typically the startup file is "~/.apprc" - * where "app" is the name of the application. If this line is deleted - * then no user-specific startup file will be run under any conditions. - */ - - SetupArgv( interp ); -#if defined(WIN32) - Tcl_VarEval( interp, "lappend", " auto_path", " [file join", - " [file dir [file dir ", Tcl_GetNameOfExecutable(), - " ] ] lib ]", NULL ); - if ( !Tcl_PkgRequire( interp, "TolbaseApp", TOLBASE_VERSION, 1) ) - { - printf( "%s\n", Tcl_GetStringResult( interp ) ); - Tcl_Exit( -1 ); - } - //Tcl_PkgRequire( interp, "TolbaseApp", TOLBASE_VERSION, 1); -#else - const char* argv0 = Tcl_GetNameOfExecutable(); - Tcl_VarEval( interp, "file join ", - "[ file dir [expr {[file type {", argv0, "}] eq {link} ? [file readlink {", argv0, "}] : {", argv0 ,"}} ] ] tolbase.tcl", NULL ); - Tcl_Obj *objPath = Tcl_GetObjResult( interp ); - Tcl_SetStartupScript( Tcl_GetObjResult( interp ), NULL ); -#endif - return TCL_OK; -}