[GRASS-SVN] r32348 - in grass/trunk/macosx: . app

Sun Jul 27 20:11:40 EDT 2008

Author: kyngchaos
Date: 2008-07-27 20:11:40 -0400 (Sun, 27 Jul 2008)
New Revision: 32348

Modified:
   grass/trunk/macosx/ReadMe.rtf
   grass/trunk/macosx/app/Makefile
   grass/trunk/macosx/app/grass.sh.in
Log:
Remove unnecessary TclTk bundling

Modified: grass/trunk/macosx/ReadMe.rtf
===================================================================
(Binary files differ)

Modified: grass/trunk/macosx/app/Makefile
===================================================================

--- grass/trunk/macosx/app/Makefile	2008-07-27 23:59:02 UTC (rev 32347)
+++ grass/trunk/macosx/app/Makefile	2008-07-28 00:11:40 UTC (rev 32348)
@@ -12,9 +12,6 @@
 MACOSX_APP_NAME = GRASS-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}.app
 endif
 APPDIR = $(ARCH_DISTDIR)/${MACOSX_APP_NAME}/Contents
-ifndef TCLTK_INTERNAL
-TCLTK_INTERNAL = \#
-endif
 MAKE_DIR_CMD = mkdir -p -m 755
 GRASS_VERSION_BUILD = `/bin/date "+%y%m%d"`
 
@@ -22,14 +19,6 @@
 
 ARCH_OBJS := $(foreach obj,$(OBJS),$(OBJDIR)/$(obj)) 
 
-# if building on Leopard with TclTk 8.5, set this version to match
-ifndef TCLTKVER
-TCLTKVER = 8.4
-endif
-# ugly hack - assume tcl and tk in same prefix, and same as TCLTKLIBPATH minus 'lib'
-ifndef TCLTKPREFIX
-TCLTKPREFIX = `echo "${TCLTKLIBPATH}" | sed -e "s,-L,," -e "s,/lib *$$,,"`
-endif
 # ugly hack - assume gdal prefix starts with -L flag
 ifndef GDAL_BIN
 GDAL_BIN = `echo "${GDALLIBS}" | sed -e "s,-L,," -e "s,/lib.*$$,/bin,"`
@@ -53,24 +42,6 @@
 	-${INSTALL_DATA} $(OBJDIR)/GRASS.scpt ${APPDIR}/Resources/Scripts
 	-${INSTALL} build_html_user_index.sh ${APPDIR}/MacOS/etc
 	-${INSTALL} build_gui_user_menu.sh ${APPDIR}/MacOS/etc
-	@# TclTk embedding:
-ifdef OPENGL_X11
-	-${MAKE_DIR_CMD} ${APPDIR}/MacOS/bin
-	-${INSTALL} ${TCLTKPREFIX}/bin/tclsh${TCLTKVER} ${APPDIR}/MacOS/bin
-	-${INSTALL} ${TCLTKPREFIX}/bin/wish${TCLTKVER} ${APPDIR}/MacOS/bin
-	-${MAKE_DIR_CMD} ${APPDIR}/MacOS/lib
-	-${INSTALL} ${TCLTKPREFIX}/lib/libtcl${TCLTKVER}.dylib ${APPDIR}/MacOS/lib
-	-${INSTALL} ${TCLTKPREFIX}/lib/libtk${TCLTKVER}.dylib ${APPDIR}/MacOS/lib
-	-cd ${TCLTKPREFIX}/lib ; tar cBf - tcl${TCLTKVER} | (cd ${APPDIR}/MacOS/lib ; tar xBf - ) 2>/dev/null
-	-cd ${TCLTKPREFIX}/lib ; tar cBf - tk${TCLTKVER} | (cd ${APPDIR}/MacOS/lib ; tar xBf - ) 2>/dev/null
-	-${MAKE_DIR_CMD} ${APPDIR}/MacOS/include
-	-${INSTALL_DATA} ${TCLTKPREFIX}/include/tcl.h ${APPDIR}/MacOS/include
-	-${INSTALL_DATA} ${TCLTKPREFIX}/include/tclDecls.h ${APPDIR}/MacOS/include
-	-${INSTALL_DATA} ${TCLTKPREFIX}/include/tclPlatDecls.h ${APPDIR}/MacOS/include
-	-${INSTALL_DATA} ${TCLTKPREFIX}/include/tk.h ${APPDIR}/MacOS/include
-	-${INSTALL_DATA} ${TCLTKPREFIX}/include/tkDecls.h ${APPDIR}/MacOS/include
-	-${INSTALL_DATA} ${TCLTKPREFIX}/include/tkPlatDecls.h ${APPDIR}/MacOS/include
-endif
 
 $(OBJDIR)/main.o: main.m
 	$(MAKE_DIR_CMD) $(OBJDIR)
@@ -94,7 +65,10 @@
 
 $(OBJDIR)/grass.sh: grass.sh.in
 	$(MAKE_DIR_CMD) $(OBJDIR)
-	sed -e "s, at GDAL_BIN_PATH@,$(GDAL_BIN)," -e "s, at PROJ_BIN_PATH@,$(PROJ_BIN)," -e "s, at TCLTK_INTERNAL@,$(TCLTK_INTERNAL)," -e "s, at TCLTKVER@,$(TCLTKVER)," grass.sh.in > $(OBJDIR)/grass.sh
+	sed -e "s, at GDAL_BIN_PATH@,$(GDAL_BIN):," \
+	-e "s, at PROJ_BIN_PATH@,$(PROJ_BIN):," \
+	-e "s, at X11@,$(USE_X11),g" \
+	grass.sh.in > $(OBJDIR)/grass.sh
 
 clean:
 	-rm -rf $(OBJDIR) $(EXTRA_CLEAN_DIRS) $(EXTRA_CLEAN_FILES)

Modified: grass/trunk/macosx/app/grass.sh.in
===================================================================
--- grass/trunk/macosx/app/grass.sh.in	2008-07-27 23:59:02 UTC (rev 32347)
+++ grass/trunk/macosx/app/grass.sh.in	2008-07-28 00:11:40 UTC (rev 32348)
@@ -7,7 +7,7 @@
 # PURPOSE:  	The source file for this shell script is in
 #   	    	macosx/app/grass.sh.in and is the grass startup script for
 #               the Mac OS X application build.
-# COPYRIGHT:    (C) 2000-2005 by the GRASS Development Team
+# COPYRIGHT:    (C) 2000-2008 by the GRASS Development Team
 #
 #               This program is free software under the GNU General Public
 #   	    	License (>=v2). Read the file COPYING that comes with GRASS
@@ -32,8 +32,8 @@
 GISBASE_SYSTEM="/Library/GRASS/$grass_ver"
 
 # for extra utils
-# hack - ideally user should have these in their PATH, but make sure here
-PATH="@GDAL_BIN_PATH@:@PROJ_BIN_PATH@:$PATH"
+# ideally user should have these in their PATH, but make sure here
+PATH="@GDAL_BIN_PATH@@PROJ_BIN_PATH@$PATH"
 export PATH
 
 # add some OS X style app support paths, and create user one if missing.
@@ -89,6 +89,8 @@
 
 ### X11 stuff
 
+if [ "@X11@" ] ; then
+
 # start X11 if not running
 # some users may be annoyed by this, but X11 required for some stuff for now
 if [ -d "/Applications/Utilities/X11.app" ] ; then
@@ -113,27 +115,14 @@
 	fi
 fi
 
-# default to internal X11 Tcl/Tk
- at TCLTK_INTERNAL@if [ ! "$GRASS_TCLSH" ] ; then
-	GRASS_TCLSH="$GISBASE/bin/tclsh at TCLTKVER@"
-	export GRASS_TCLSH
-	GRASS_WISH="$GISBASE/bin/wish at TCLTKVER@"
-	export GRASS_WISH
-	# internal - force osxaqua off
-	unset osxaqua
-	# override TCL_LIBRARY to internal
-	TCL_LIBRARY="$GISBASE/lib/tcl at TCLTKVER@"
-	export TCL_LIBRARY
-	TK_LIBRARY="$GISBASE/lib/tk at TCLTKVER@"
-	export TK_LIBRARY
- at TCLTK_INTERNAL@fi
-
 # make sure there is a DISPLAY set
 if [ ! "$DISPLAY" ] ; then
 	DISPLAY=:0.0
 	export DISPLAY
 fi
 
+fi # X11
+
 ### end X11 block
 
 # if gisrc has text startup, switch back to Terminal (gotta duplicate some init.sh stuff)

