KitCreator
Check-in [636da30116]
Login
HomeDownloadsSource CodeTicketsWiki
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
Hide Diffs Side-by-Side Diffs Show Whitespace Changes Patch

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

1
2

3
4
5
6
7
8
9

1

2
3
4
5
6
7
8
9


-
+








CC = @CC@
CFLAGS = -Wall @CFLAGS@
CFLAGS = @CFLAGS@ @DEFS@
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
ARCHS = @ARCHS@
OBJS = kitInit.o main.o pwb.o rechan.o zlib.o

all: kit
︙

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

︙
70
71
72
73
74
75
76
77
78
79
80
81

82
83
84
85
86
87
88

70
71
72
73
74
75
76




77
78
79
80
81
82
83
84
85








-
-
-
-

+








		libfiles="`find "${libdir}" -name '*.a' | tr "\n" ' '`"

		ARCHS="${ARCHS} ${libfiles}"

		AC_MSG_RESULT([${libfiles}])

		if test "${libfiles}" != ""; then
			upperproj=`echo "${proj}" | dd conv=ucase 2>/dev/null`

			AC_DEFINE(KIT_INCLUDES_$upperproj)

			if test "${proj}" = "mk4tcl"; then
				AC_DEFINE(KIT_INCLUDES_MK4TCL, [1], [Specify this if you link against mkt4tcl])
				DC_DO_STATIC_LINK_LIBCXX
			fi
		fi
	done

	AC_SUBST(ARCHS)
])

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

1
2
3
4
5
6
7
8
9
10

1
2

3
4
5
6
7
8
9



-








dnl What are we running
AC_INIT(kitsh, 0.0)
AC_CONFIG_HEADER(config.h)

dnl Checks for programs.
AC_PROG_CC
AC_PROG_MAKE_SET
AC_PROG_INSTALL
AC_AIX
AC_GNU_SOURCE
︙

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

︙
33
34
35
36
37
38
39
40

41
42
43
44
45
46
47

33
34
35
36
37
38
39

40
41
42
43
44
45
46
47








-
+









#include "tclInt.h"

#ifdef KIT_INCLUDES_ITCL
Tcl_AppInitProc	Itcl_Init;
#endif
#ifdef KIT_INCLUDES_MK4TCL
Tcl_AppInitProc	Mk4tcl_Init
Tcl_AppInitProc	Mk4tcl_Init;
#endif
Tcl_AppInitProc Vfs_Init, Rechan_Init, Zlib_Init;
#if 10 * TCL_MAJOR_VERSION + TCL_MINOR_VERSION < 85
Tcl_AppInitProc	Pwb_Init;
#endif
#ifdef TCL_THREADS
Tcl_AppInitProc	Thread_Init;
︙
185
186
187
188
189
190
191
192
193


194
195
196
197
198
199
200

185
186
187
188
189
190
191


192
193
194
195
196
197
198
199
200








-
-
+
+








    if (Tcl_Eval(interp, initScript) == TCL_OK) {
        Tcl_Obj* path;
#ifdef HAVE_TCLSETSTARTUPSCRIPTPATH
        path = TclGetStartupScriptPath();
	TclSetStartupScriptPath(Tcl_GetObjResult(interp));
#else
#  ifdef HAVE_TCL_SETSTARTUPSCRIPT
        path = Tcl_GetStartupScriptPath(NULL);
	TclSetStartupScriptPath(Tcl_GetObjResult(interp));
        path = Tcl_GetStartupScript(NULL);
	Tcl_SetStartupScript(Tcl_GetObjResult(interp), NULL);
#  endif
#endif
	if (path == NULL)
	  Tcl_Eval(interp, "incr argc -1; set argv [lrange $argv 1 end]");
    }

    Tcl_SetVar(interp, "errorInfo", "", TCL_GLOBAL_ONLY);
︙

Powered by Fossil · RSS