[GRASS-SVN] r68538 - in grass/trunk/mswindows: . osgeo4w

svn_grass at osgeo.org svn_grass at osgeo.org
Mon May 30 13:14:51 PDT 2016


Author: martinl
Date: 2016-05-30 13:14:51 -0700 (Mon, 30 May 2016)
New Revision: 68538

Added:
   grass/trunk/mswindows/osgeo4w/Makefile
   grass/trunk/mswindows/osgeo4w/setup.hint.tmpl
Removed:
   grass/trunk/mswindows/osgeo4w/setup.hint
Modified:
   grass/trunk/mswindows/Makefile
Log:
wingrass: update setup.hint by build system

Modified: grass/trunk/mswindows/Makefile
===================================================================
--- grass/trunk/mswindows/Makefile	2016-05-30 17:40:22 UTC (rev 68537)
+++ grass/trunk/mswindows/Makefile	2016-05-30 20:14:51 UTC (rev 68538)
@@ -1,7 +1,10 @@
 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),)

Added: grass/trunk/mswindows/osgeo4w/Makefile
===================================================================
--- grass/trunk/mswindows/osgeo4w/Makefile	                        (rev 0)
+++ grass/trunk/mswindows/osgeo4w/Makefile	2016-05-30 20:14:51 UTC (rev 68538)
@@ -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)#' \
+	$< > $@


Property changes on: grass/trunk/mswindows/osgeo4w/Makefile
___________________________________________________________________
Added: svn:mime-type
   + text/x-makefile
Added: svn:eol-style
   + native

Deleted: grass/trunk/mswindows/osgeo4w/setup.hint
===================================================================
--- grass/trunk/mswindows/osgeo4w/setup.hint	2016-05-30 17:40:22 UTC (rev 68537)
+++ grass/trunk/mswindows/osgeo4w/setup.hint	2016-05-30 20:14:51 UTC (rev 68538)
@@ -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/trunk/mswindows/osgeo4w/setup.hint.tmpl (from rev 68537, grass/trunk/mswindows/osgeo4w/setup.hint)
===================================================================
--- grass/trunk/mswindows/osgeo4w/setup.hint.tmpl	                        (rev 0)
+++ grass/trunk/mswindows/osgeo4w/setup.hint.tmpl	2016-05-30 20:14:51 UTC (rev 68538)
@@ -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



More information about the grass-commit mailing list