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

[svn_grass at osgeo.org]

Author: kyngchaos
Date: 2010-05-07 23:14:58 -0400 (Fri, 07 May 2010)
New Revision: 42146

Modified:
   grass/trunk/macosx/Makefile
   grass/trunk/macosx/app/Makefile
   grass/trunk/macosx/app/grass.sh.in
Log:
more fixes for python init in Mac app

Modified: grass/trunk/macosx/Makefile
===================================================================
--- grass/trunk/macosx/Makefile	2010-05-08 02:30:54 UTC (rev 42145)
+++ grass/trunk/macosx/Makefile	2010-05-08 03:14:58 UTC (rev 42146)
@@ -78,23 +78,31 @@
 else
 	${PACKAGEMAKER} -build -ds -p "GRASS-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}.pkg" -f dist/${MACOSX_APP_NAME} -r dist/resources -i dist/Info.plist -d dist/Description.plist
 endif
-	@# remove intermediate files
-	@# -rm -rf dist 2>/dev/null
 
 install-basic-macosx:
 	${MAKE_DIR_CMD} ${INST_DIR_TARGET}
 	-cd ${GISBASE} ; tar cBf - ${MACOSX_APP_NAME} | (cd ${PREFIX_TARGET} ; tar xBf - ) 2>/dev/null
+	@# ***TODO*** don't build app shell into dist, assemble app bundle here
+	@# install dist all at once
 	-cd ${GISBASE} ; tar cBf - $(FILES) | (cd ${INST_DIR_TARGET} ; tar xBf - ) 2>/dev/null
 	-cd ${GISBASE} ; tar cBf - bin | (cd ${INST_DIR_TARGET} ; tar xBf - ) 2>/dev/null
+	-cd ${GISBASE} ; tar cBf - bwidget | (cd ${INST_DIR_TARGET} ; tar xBf - ) 2>/dev/null
+	-cd ${GISBASE} ; tar cBf - demolocation | (cd ${INST_DIR_TARGET} ; tar xBf - ) 2>/dev/null
 	-cd ${GISBASE} ; tar cBf - docs | (cd ${INST_DIR_TARGET} ; tar xBf - ) 2>/dev/null
 	-cd ${GISBASE} ; tar cBf - driver | (cd ${INST_DIR_TARGET} ; tar xBf - ) 2>/dev/null
 	-cd ${GISBASE} ; tar cBf - etc | (cd ${INST_DIR_TARGET} ; tar xBf - ) 2>/dev/null
 	-cd ${GISBASE} ; tar cBf - fonts | (cd ${INST_DIR_TARGET} ; tar xBf - ) 2>/dev/null
 	-cd ${GISBASE} ; tar cBf - man | (cd ${INST_DIR_TARGET} ; tar xBf - ) 2>/dev/null
 	-cd ${GISBASE} ; tar cBf - scripts | (cd ${INST_DIR_TARGET} ; tar xBf - ) 2>/dev/null
+	-cd ${GISBASE} ; tar cBf - tools | (cd ${INST_DIR_TARGET} ; tar xBf - ) 2>/dev/null
 	if [ ${LOCALE} -eq 1 ] ; then cd ${GISBASE} ; tar cBf - locale | (cd ${INST_DIR_TARGET} ; tar xBf - ) 2>/dev/null ; fi
 	-cd ${GISBASE} ; tar cBf - include | (cd ${INST_DIR_TARGET} ; tar xBf - ) 2>/dev/null
 	-cd ${GISBASE} ; tar cBf - lib | (cd ${INST_DIR_TARGET} ; tar xBf - ) 2>/dev/null
+	-sed -e 's#'@GISBASE@'#'$(INST_DIR)'#g' \
+	     -e 's#'@LD_LIBRARY_PATH_VAR@'#'$(LD_LIBRARY_PATH_VAR)'#g' \
+	     -e 's#'@CONFIG_PROJSHARE@'#'$(PROJSHARE)'#g' \
+	     $(ARCH_DISTDIR)/$(GRASS_NAME).tmp > $(INST_DIR_TARGET)/$(GRASS_NAME)
+	-chmod a+x $(UNIX_BIN)/$(GRASS_NAME)
 	-chmod -R a+rX ${PREFIX_TARGET}/${MACOSX_APP_NAME} 2>/dev/null
 	-touch ${PREFIX_TARGET}/${MACOSX_APP_NAME}
 

Modified: grass/trunk/macosx/app/Makefile
===================================================================
--- grass/trunk/macosx/app/Makefile	2010-05-08 02:30:54 UTC (rev 42145)
+++ grass/trunk/macosx/app/Makefile	2010-05-08 03:14:58 UTC (rev 42146)
@@ -107,6 +107,7 @@
 	-e "s, at X11@,$(USE_X11),g" \
 	-e "s, at PYVER@,$(PYVER),g" \
 	-e "s, at WX64BIT@,$(WX64BIT),g" \
+	-e "s, at GRASS_NAME@,$(GRASS_NAME),g" \
 	grass.sh.in > $(OBJDIR)/grass.sh
 
 clean:

Modified: grass/trunk/macosx/app/grass.sh.in
===================================================================
--- grass/trunk/macosx/app/grass.sh.in	2010-05-08 02:30:54 UTC (rev 42145)
+++ grass/trunk/macosx/app/grass.sh.in	2010-05-08 03:14:58 UTC (rev 42146)
@@ -217,4 +217,5 @@
 	osascript -e "tell application \"$USERTERM\" to activate"
 fi
 
-exec $GRASS_PYTHON "@BINDIR@/grass70.py" "$@" &
\ No newline at end of file
+# use the python wrapper to start grass
+exec "$GISBASE/bin/python" "$GISBASE/@GRASS_NAME@" "$@"