[GRASS-SVN] r39708 - in grass/trunk: . demolocation include/Make

[svn_grass at osgeo.org]

Author: glynn
Date: 2009-11-12 11:43:33 -0500 (Thu, 12 Nov 2009)
New Revision: 39708

Added:
   grass/trunk/demolocation/Makefile
   grass/trunk/demolocation/grassrc.tmpl
Removed:
   grass/trunk/grassrc.tmpl
Modified:
   grass/trunk/Makefile
   grass/trunk/include/Make/Rules.make
Log:
Build demolocation using $(MKDIR) and $(INSTALL) instead of "tar"
Remove "builddemolocation" target; just make demolocation directory


Modified: grass/trunk/Makefile
===================================================================
--- grass/trunk/Makefile	2009-11-12 16:39:19 UTC (rev 39707)
+++ grass/trunk/Makefile	2009-11-12 16:43:33 UTC (rev 39708)
@@ -34,6 +34,7 @@
 
 
 DIRS = \
+	demolocation \
 	tools \
 	lib \
 	db \
@@ -74,7 +75,7 @@
 	man \
 	scripts
 
-default: builddemolocation
+default:
 	@echo "GRASS GIS compilation log"     > $(ERRORLOG)
 	@echo "-------------------------"    >> $(ERRORLOG)
 	@echo "Started compilation: `date`"  >> $(ERRORLOG)
@@ -83,7 +84,7 @@
 	chmod 755 install-sh
 	@list='$(SUBDIRS)'; \
 	for subdir in $$list; do \
-		$(MAKE) -C $$subdir; \
+		$(MAKE) -C $$subdir || echo $(CURDIR)/$$subdir >> $(ERRORLOG) ; \
 	done
 	$(MAKE) $(FILES_DST)
 	$(MAKE) ${ARCH_DISTDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}.tmp
@@ -402,14 +403,8 @@
 	fi
 	sh svn2cl ./ChangeLog
 
-
-builddemolocation:
-	test -d ${ARCH_DISTDIR} || ${MAKE_DIR_CMD} ${ARCH_DISTDIR}
-	-tar cBf - demolocation | (cd ${ARCH_DISTDIR}/ ; tar xBfo - ) 2>/dev/null
-	sed 's!@GISDBASE@!$(RUN_GISBASE)!' < grassrc.tmpl > $(ARCH_DISTDIR)/demolocation/.grassrc$(GRASS_VERSION_MAJOR)$(GRASS_VERSION_MINOR)
-
 .PHONY: default libs cleandistdirs cleanscriptstrings clean libsclean
 .PHONY: distclean strip install real-install install-strip install-macosx
 .PHONY: bindist real-bindist bindist-macosx srcdist srclibsdist
 .PHONY: htmldocs-single htmldocs packagehtmldocs pdfdocs cleandocs html2pdfdoc
-.PHONY: html2pdfdoccomplete changelog builddemolocation
+.PHONY: html2pdfdoccomplete changelog

Added: grass/trunk/demolocation/Makefile
===================================================================
--- grass/trunk/demolocation/Makefile	                        (rev 0)
+++ grass/trunk/demolocation/Makefile	2009-11-12 16:43:33 UTC (rev 39708)
@@ -0,0 +1,28 @@
+MODULE_TOPDIR = ..
+
+include $(MODULE_TOPDIR)/include/Make/Other.make
+
+SRCFILES = WIND DEFAULT_WIND VAR PROJ_INFO PROJ_UNITS MYNAME
+MAPS = mysites point
+MAPFILES = dbln coor topo head cidx hist
+DBFFILES := $(foreach map,$(MAPS),dbf/$(map).dbf)
+VECTFILES := $(foreach map,$(MAPS),$(foreach file,$(MAPFILES),vector/$(map)/$(file)))
+SRC := $(SRCFILES) $(DBFFILES) $(VECTFILES)
+DIRS := PERMANENT PERMANENT/vector PERMANENT/dbf $(patsubst %,PERMANENT/vector/%,$(MAPS))
+
+DSTDIR = $(ARCH_DISTDIR)/demolocation
+DST := $(patsubst %,$(DSTDIR)/PERMANENT/%,$(SRC))
+DSTDIRS := $(patsubst %,$(DSTDIR)/%,$(DIRS))
+
+RCFILE = $(DSTDIR)/.grassrc$(GRASS_VERSION_MAJOR)$(GRASS_VERSION_MINOR)
+
+default: $(DST) $(RCFILE)
+
+$(DSTDIR)/PERMANENT/%: PERMANENT/% | $(DSTDIRS)
+	$(INSTALL_DATA) $< $@
+
+$(DSTDIRS): %:
+	$(MKDIR) $@
+
+$(RCFILE): grassrc.tmpl | $(DSTDIRS)
+	sed 's!@GISDBASE@!$(RUN_GISBASE)!' < $< > $@

Copied: grass/trunk/demolocation/grassrc.tmpl (from rev 39705, grass/trunk/grassrc.tmpl)
===================================================================
--- grass/trunk/demolocation/grassrc.tmpl	                        (rev 0)
+++ grass/trunk/demolocation/grassrc.tmpl	2009-11-12 16:43:33 UTC (rev 39708)
@@ -0,0 +1,6 @@
+GISDBASE: @GISDBASE@
+LOCATION_NAME: demolocation
+MAPSET: PERMANENT
+GRASS_DB_ENCODING: utf-8
+DEBUG: 0
+GRASS_GUI: text

Deleted: grass/trunk/grassrc.tmpl
===================================================================
--- grass/trunk/grassrc.tmpl	2009-11-12 16:39:19 UTC (rev 39707)
+++ grass/trunk/grassrc.tmpl	2009-11-12 16:43:33 UTC (rev 39708)
@@ -1,6 +0,0 @@
-GISDBASE: @GISDBASE@
-LOCATION_NAME: demolocation
-MAPSET: PERMANENT
-GRASS_DB_ENCODING: utf-8
-DEBUG: 0
-GRASS_GUI: text

Modified: grass/trunk/include/Make/Rules.make
===================================================================
--- grass/trunk/include/Make/Rules.make	2009-11-12 16:39:19 UTC (rev 39707)
+++ grass/trunk/include/Make/Rules.make	2009-11-12 16:43:33 UTC (rev 39708)
@@ -8,7 +8,7 @@
 	$(DRIVERDIR) $(DBDRIVERDIR) $(FONTDIR) $(DOCSDIR) $(HTMLDIR) \
 	$(MANBASEDIR) $(MANDIR) $(TOOLSDIR)
 
-pre: $(ARCH_DIRS)
+pre: | $(ARCH_DIRS)
 
 default: