Check-in [636da30116]
Overview
Comment:Corrected check for mk4tcl to actually be functional

Removed support of "config.h" and started passing all defines on the command line

Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:636da301163a2bcee9b842550e06f553a48badeb
User & Date: rkeene on 2010-09-26 04:39:19
Other Links: manifest | tags
Context
2010-09-26
04:39
KitCreator 0.0.6.x

Updated pre-release build script to error out if configure fails. check-in: 65a6c41656 user: rkeene tags: trunk, 0.0.6

04:39
Corrected check for mk4tcl to actually be functional

Removed support of "config.h" and started passing all defines on the command line check-in: 636da30116 user: rkeene tags: trunk

04:39
Updated to check for 'buildsrc' directory before untarring. If found it is used. (Untested)

Updated to download sources to a temporary file and only rename on success check-in: 023de4a116 user: rkeene tags: trunk

Changes

Modified kitsh/buildsrc/kitsh-0.0/Makefile.in from [06f1b2f40d] to [37da0c70cd].

     1      1   CC = @CC@
     2         -CFLAGS = -Wall @CFLAGS@
            2  +CFLAGS = @CFLAGS@ @DEFS@
     3      3   CPPFLAGS = @CPPFLAGS@
     4      4   LDFLAGS = @LDFLAGS@
     5      5   LIBS = @LIBS@
     6      6   ARCHS = @ARCHS@
     7      7   OBJS = kitInit.o main.o pwb.o rechan.o zlib.o
     8      8   
     9      9   all: kit

Modified kitsh/buildsrc/kitsh-0.0/aclocal.m4 from [6f2999f5b1] to [d0e235eb57].

    70     70   		libfiles="`find "${libdir}" -name '*.a' | tr "\n" ' '`"
    71     71   
    72     72   		ARCHS="${ARCHS} ${libfiles}"
    73     73   
    74     74   		AC_MSG_RESULT([${libfiles}])
    75     75   
    76     76   		if test "${libfiles}" != ""; then
    77         -			upperproj=`echo "${proj}" | dd conv=ucase 2>/dev/null`
    78         -
    79         -			AC_DEFINE(KIT_INCLUDES_$upperproj)
    80         -
    81     77   			if test "${proj}" = "mk4tcl"; then
           78  +				AC_DEFINE(KIT_INCLUDES_MK4TCL, [1], [Specify this if you link against mkt4tcl])
    82     79   				DC_DO_STATIC_LINK_LIBCXX
    83     80   			fi
    84     81   		fi
    85     82   	done
    86     83   
    87     84   	AC_SUBST(ARCHS)
    88     85   ])

Modified kitsh/buildsrc/kitsh-0.0/configure.ac from [f5d520c4b9] to [606fd48030].

     1      1   dnl What are we running
     2      2   AC_INIT(kitsh, 0.0)
     3         -AC_CONFIG_HEADER(config.h)
     4      3   
     5      4   dnl Checks for programs.
     6      5   AC_PROG_CC
     7      6   AC_PROG_MAKE_SET
     8      7   AC_PROG_INSTALL
     9      8   AC_AIX
    10      9   AC_GNU_SOURCE

Modified kitsh/buildsrc/kitsh-0.0/kitInit.c from [9210ecc7cd] to [943ad6fb25].

    33     33   
    34     34   #include "tclInt.h"
    35     35   
    36     36   #ifdef KIT_INCLUDES_ITCL
    37     37   Tcl_AppInitProc	Itcl_Init;
    38     38   #endif
    39     39   #ifdef KIT_INCLUDES_MK4TCL
    40         -Tcl_AppInitProc	Mk4tcl_Init
           40  +Tcl_AppInitProc	Mk4tcl_Init;
    41     41   #endif
    42     42   Tcl_AppInitProc Vfs_Init, Rechan_Init, Zlib_Init;
    43     43   #if 10 * TCL_MAJOR_VERSION + TCL_MINOR_VERSION < 85
    44     44   Tcl_AppInitProc	Pwb_Init;
    45     45   #endif
    46     46   #ifdef TCL_THREADS
    47     47   Tcl_AppInitProc	Thread_Init;
................................................................................
   185    185       if (Tcl_Eval(interp, initScript) == TCL_OK) {
   186    186           Tcl_Obj* path;
   187    187   #ifdef HAVE_TCLSETSTARTUPSCRIPTPATH
   188    188           path = TclGetStartupScriptPath();
   189    189   	TclSetStartupScriptPath(Tcl_GetObjResult(interp));
   190    190   #else
   191    191   #  ifdef HAVE_TCL_SETSTARTUPSCRIPT
   192         -        path = Tcl_GetStartupScriptPath(NULL);
   193         -	TclSetStartupScriptPath(Tcl_GetObjResult(interp));
          192  +        path = Tcl_GetStartupScript(NULL);
          193  +	Tcl_SetStartupScript(Tcl_GetObjResult(interp), NULL);
   194    194   #  endif
   195    195   #endif
   196    196   	if (path == NULL)
   197    197   	  Tcl_Eval(interp, "incr argc -1; set argv [lrange $argv 1 end]");
   198    198       }
   199    199   
   200    200       Tcl_SetVar(interp, "errorInfo", "", TCL_GLOBAL_ONLY);