[GRASS-SVN] r45039 - in grass/branches/releasebranch_6_4: . mswindows/osgeo4w

Fri Jan 14 16:37:09 EST 2011

Author: martinl
Date: 2011-01-14 13:37:09 -0800 (Fri, 14 Jan 2011)
New Revision: 45039

Modified:
   grass/branches/releasebranch_6_4/Makefile
   grass/branches/releasebranch_6_4/mswindows/osgeo4w/package.sh
Log:
disable gem on mingw, package.sh updated

Modified: grass/branches/releasebranch_6_4/Makefile
===================================================================

--- grass/branches/releasebranch_6_4/Makefile	2011-01-14 21:16:40 UTC (rev 45038)
+++ grass/branches/releasebranch_6_4/Makefile	2011-01-14 21:37:09 UTC (rev 45039)
@@ -29,12 +29,11 @@
 # Shell commands
 MAKE_DIR_CMD=		mkdir -p -m 755
 
-DIRS = \
+SUBDIRS = \
 	lib \
 	db \
 	display \
 	doc \
-	gem \
 	general \
 	gui \
 	imagery \
@@ -50,7 +49,9 @@
 	man \
 	macosx
 
-SUBDIRS = $(DIRS)
+ifeq ($(strip $(MINGW)),)
+	SUBDIRS += gem
+endif
 
 ifneq ($(strip $(HAVE_NLS)),)
 	LOCALE=1
@@ -293,9 +294,11 @@
 	-sed 's#'${GISBASE}'#'${INST_DIR}'#g' ${GISBASE}/etc/fontcap > ${INST_DIR}/etc/fontcap
 	@##### -chmod -R 1777 ${INST_DIR}/locks 2>/dev/null
 	-chmod -R a+rX ${INST_DIR} 2>/dev/null
+ifeq ($(strip $(MINGW)),)
 	@#GEM installation
 	-tar cBf - gem/skeleton | (cd ${INST_DIR}/etc ; tar xBf - ) 2>/dev/null
 	-${INSTALL} gem/gem$(GRASS_VERSION_MAJOR)$(GRASS_VERSION_MINOR) ${BINDIR} 2>/dev/null
+endif
 	@# enable OSX Help Viewer
 	@if [ "`cat include/Make/Platform.make | grep -i '^ARCH.*darwin'`" ] ; then /bin/ln -sfh "${INST_DIR}/docs/html" /Library/Documentation/Help/GRASS-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR} ; fi
 

Modified: grass/branches/releasebranch_6_4/mswindows/osgeo4w/package.sh
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/osgeo4w/package.sh	2011-01-14 21:16:40 UTC (rev 45038)
+++ grass/branches/releasebranch_6_4/mswindows/osgeo4w/package.sh	2011-01-14 21:37:09 UTC (rev 45039)
@@ -22,20 +22,23 @@
 export VERSION=$(version)
 export PACKAGE=3
 
+LOG=mswindows/osgeo4w/package.log
 
-(
-echo
-echo
-echo
+report() {
+    echo $(date): STARTING $1
+    echo $(date): STARTING $1 >>$LOG
+}
 
+echo $(date): START > $LOG
+
 if ! [ -f mswindows/osgeo4w/configure-stamp ]; then
 
 	if [ -e include/Make/Grass.make ] ; then
-	    echo $(date): STARTING make distclean
-	    make distclean
+	    report "distclean"
+	    make distclean >>$LOG 2>&1
 	fi
 
-	echo $(date): STARTING configure
+	report "configure"
 	./configure \
 		--with-libs="$OSGEO4W_ROOT_MSYS/apps/gdal-16/lib $OSGEO4W_ROOT_MSYS/lib" \
 		--with-includes="$OSGEO4W_ROOT_MSYS/apps/gdal-16/include $OSGEO4W_ROOT_MSYS/include" \
@@ -59,18 +62,18 @@
 		--with-regex \
 		--with-nls \
 		--with-freetype-includes=$OSGEO4W_ROOT_MSYS/include/freetype2 \
-		--with-odbc
+		--with-odbc >>$LOG 2>&1
 
 	touch mswindows/osgeo4w/configure-stamp
 fi
 
-echo $(date): STARTING make
-make
+report "make"
+make >>$LOG 2>&1
 
-echo $(date): STARTING make install
-make install
+report "make install"
+make install >>$LOG 2>&1
 
-echo $(date): STARTING cleanup
+report "cleanup"
 mv $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/lib/*.$VERSION.dll $OSGEO4W_ROOT_MSYS/bin
 rm $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/lib/*.dll
 
@@ -81,9 +84,6 @@
 cp mswindows/osgeo4w/ini.bat.tmpl $OSGEO4W_ROOT_MSYS/etc/ini/grass.bat.tmpl
 cp mswindows/osgeo4w/postinstall.bat $OSGEO4W_ROOT_MSYS/etc/postinstall/grass.bat
 cp mswindows/osgeo4w/preremove.bat $OSGEO4W_ROOT_MSYS/etc/preremove/grass.bat
-#cp /c/mingw/bin/libgnurx-0.dll $OSGEO_ROOT_MSYS/bin
-#cp /c/mingw/bin/libiconv-2.dll $OSGEO_ROOT_MSYS/bin
-#cp /c/mingw/bin/libintl-8.dll $OSGEO_ROOT_MSYS/bin
 
 P=$(pwd -W)
 P=${P//\//\\\\}\\\\dist.i686-pc-mingw32
@@ -92,50 +92,6 @@
 sed -e "s#$P#@osgeo4w_msys@#" $OSGEO4W_ROOT_MSYS/apps/grass/bin/grass64 >$OSGEO4W_ROOT_MSYS/apps/grass/bin/grass64.tmpl
 rm $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/etc/fontcap 
 
-#echo $(date): STARTING building vc libraries
-#sh mswindows/osgeo4w/mklibs.sh $OSGEO4W_ROOT_MSYS/bin/*.$VERSION.dll
-#mv mswindows/osgeo4w/vc/grass*.lib $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/lib
-#
-#set -x
-#echo $(date): BUILDING GDAL GRASS plugins
-#cmd /c 'mswindows\\osgeo4w\\gdalplugins.cmd $VERSION'
-#
-#echo $(date): CREATING packages in $(PDIR)
-#mkdir -p package/grass-devel package/grass-devel-mingw package/grass-devel-vc package/grass
-#
-#PDIR=$PWD/package
-#cd $OSGEO4W_ROOT_MSYS
-#tar -cjf $PDIR/grass-devel/grass-devel-$VERSION-$PACKAGE.tar.bz2 \
-#	apps/grass/grass-$VERSION/include
-#
-#tar -cjf $PDIR/grass-devel-mingw/grass-devel-mingw-$VERSION-$PACKAGE.tar.bz2 \
-#	apps/grass/grass-$VERSION/lib/libgrass*.a
-#
-#tar -cjf $PDIR/grass-devel-vc/grass-devel-vc-$VERSION-$PACKAGE.tar.bz2 \
-#	apps/grass/grass-$VERSION/lib/*.lib
-#
-#tar -cjf $PDIR/grass/grass-$VERSION-$PACKAGE.tar.bz2 \
-#	apps/grass/bin/grass64.tmpl \
-#	apps/grass/grass-$VERSION/authors \
-#	apps/grass/grass-$VERSION/bin/ \
-#	apps/grass/grass-$VERSION/bwidget/ \
-#	apps/grass/grass-$VERSION/changes \
-#	apps/grass/grass-$VERSION/copying \
-#	apps/grass/grass-$VERSION/docs \
-#	apps/grass/grass-$VERSION/driver \
-#	apps/grass/grass-$VERSION/etc \
-#	apps/grass/grass-$VERSION/gpl.txt \
-#	apps/grass/grass-$VERSION/requirements.html \
-#	apps/grass/grass-$VERSION/scripts \
-#	bin/libgnurx-0.dll \
-#	bin/libiconv-2.dll \
-#	bin/libintl-8.dll \
-#	bin/grass64.bat.tmpl \
-#	bin/libgrass_*.$VERSION.dll \
-#	etc/ini/grass.bat \
-#	etc/postinstall/grass.bat \
-#	etc/preremove/grass.bat
+echo $(date): END >> $LOG
 
-echo $(date): END
-
-) | tee -a mswindows/osgeo4w/package.log
+exit 0
\ No newline at end of file

