[GRASS-SVN] r68540 - in grass/branches/releasebranch_7_2: . mswindows mswindows/osgeo4w

[svn_grass at osgeo.org]

Author: martinl
Date: 2016-05-30 13:24:18 -0700 (Mon, 30 May 2016)
New Revision: 68540

Added:
   grass/branches/releasebranch_7_2/mswindows/osgeo4w/Makefile
   grass/branches/releasebranch_7_2/mswindows/osgeo4w/setup.hint.tmpl
Removed:
   grass/branches/releasebranch_7_2/mswindows/osgeo4w/setup.hint
Modified:
   grass/branches/releasebranch_7_2/
   grass/branches/releasebranch_7_2/mswindows/Makefile
Log:
wingrass: update setup.hint by build system (merge r68538 & r68539 ftom trunk)



Property changes on: grass/branches/releasebranch_7_2
___________________________________________________________________
Deleted: svn:mergeinfo
   - /grass/branches/releasebranch_7_0:62348

Modified: grass/branches/releasebranch_7_2/mswindows/Makefile
===================================================================
--- grass/branches/releasebranch_7_2/mswindows/Makefile	2016-05-30 20:22:04 UTC (rev 68539)
+++ grass/branches/releasebranch_7_2/mswindows/Makefile	2016-05-30 20:24:18 UTC (rev 68540)
@@ -1,11 +1,14 @@
 MODULE_TOPDIR = ..
 
-include $(MODULE_TOPDIR)/include/Make/Other.make
+SUBDIRS = \
+	osgeo4w
 
+include $(MODULE_TOPDIR)/include/Make/Dir.make
+
 EXTRA_CLEAN_FILES = GRASS-Packager.bat GRASS-Installer.nsi
 
 ifneq ($(MINGW),)
-default: GRASS-Packager.bat GRASS-Installer.nsi
+default: GRASS-Packager.bat GRASS-Installer.nsi parsubdirs
 else
 default:
 endif	

Copied: grass/branches/releasebranch_7_2/mswindows/osgeo4w/Makefile (from rev 68538, grass/trunk/mswindows/osgeo4w/Makefile)
===================================================================
--- grass/branches/releasebranch_7_2/mswindows/osgeo4w/Makefile	                        (rev 0)
+++ grass/branches/releasebranch_7_2/mswindows/osgeo4w/Makefile	2016-05-30 20:24:18 UTC (rev 68540)
@@ -0,0 +1,16 @@
+MODULE_TOPDIR = ../..
+
+include $(MODULE_TOPDIR)/include/Make/Other.make
+
+EXTRA_CLEAN_FILES = setup.hint
+
+ifneq ($(MINGW),)
+default: setup.hint
+else
+default:
+endif
+
+setup.hint: setup.hint.tmpl
+	sed \
+	-e 's#@GRASS_VERSION_NUMBER@#$(GRASS_VERSION_NUMBER)#' \
+	$< > $@

Deleted: grass/branches/releasebranch_7_2/mswindows/osgeo4w/setup.hint
===================================================================
--- grass/branches/releasebranch_7_2/mswindows/osgeo4w/setup.hint	2016-05-30 20:22:04 UTC (rev 68539)
+++ grass/branches/releasebranch_7_2/mswindows/osgeo4w/setup.hint	2016-05-30 20:24:18 UTC (rev 68540)
@@ -1,7 +0,0 @@
-sdesc: "GRASS GIS - daily builds of development version"
-ldesc: "Geographic Resources Analysis Support System (GRASS GIS) - daily builds of SVN trunk"
-category: Desktop
-requires: liblas avce00 gpsbabel gs gdal-python matplotlib msvcrt iconv libtiff gdal proj freetype-mingw pdcurses zlib fftw libpng wxpython python-numpy python-pil pyopengl cairo psycopg2
-maintainer: MartinLanda
-curr: 7.1.svn-1
-prev: 7.1.svn-1

Copied: grass/branches/releasebranch_7_2/mswindows/osgeo4w/setup.hint.tmpl (from rev 68538, grass/trunk/mswindows/osgeo4w/setup.hint.tmpl)
===================================================================
--- grass/branches/releasebranch_7_2/mswindows/osgeo4w/setup.hint.tmpl	                        (rev 0)
+++ grass/branches/releasebranch_7_2/mswindows/osgeo4w/setup.hint.tmpl	2016-05-30 20:24:18 UTC (rev 68540)
@@ -0,0 +1,7 @@
+sdesc: "GRASS GIS - daily builds of development version"
+ldesc: "Geographic Resources Analysis Support System (GRASS GIS) - daily builds of SVN trunk"
+category: Desktop
+requires: liblas avce00 gpsbabel gs gdal-python matplotlib msvcrt iconv libtiff gdal proj freetype-mingw pdcurses zlib fftw libpng wxpython python-numpy python-pil pyopengl cairo psycopg2
+maintainer: MartinLanda
+curr: @GRASS_VERSION_NUMBER at -1
+prev: @GRASS_VERSION_NUMBER at -1