[GRASS-SVN] r70091 - grass/trunk/mswindows/osgeo4w

svn_grass at osgeo.org svn_grass at osgeo.org
Sun Dec 18 07:29:26 PST 2016


Author: martinl
Date: 2016-12-18 07:29:26 -0800 (Sun, 18 Dec 2016)
New Revision: 70091

Added:
   grass/trunk/mswindows/osgeo4w/setup_x86.hint.tmpl
   grass/trunk/mswindows/osgeo4w/setup_x86_64.hint.tmpl
Removed:
   grass/trunk/mswindows/osgeo4w/setup.hint.tmpl
Modified:
   grass/trunk/mswindows/osgeo4w/
   grass/trunk/mswindows/osgeo4w/Makefile
Log:
split setup.hint into platform-specific files (x86, x86_64)


Property changes on: grass/trunk/mswindows/osgeo4w
___________________________________________________________________
Modified: svn:ignore
   - package.log*
configure-stamp
lib
package
vc
setup.hint

   + package.log*
configure-stamp
lib
package
vc
setup_x86.hint
setup_x86_64.hint


Modified: grass/trunk/mswindows/osgeo4w/Makefile
===================================================================
--- grass/trunk/mswindows/osgeo4w/Makefile	2016-12-18 12:54:37 UTC (rev 70090)
+++ grass/trunk/mswindows/osgeo4w/Makefile	2016-12-18 15:29:26 UTC (rev 70091)
@@ -2,11 +2,16 @@
 
 include $(MODULE_TOPDIR)/include/Make/Other.make
 
-EXTRA_CLEAN_FILES = setup.hint
+EXTRA_CLEAN_FILES = setup_x86.hint setup_x86_64.hint
 
-default: setup.hint
+default: setup_x86.hint setup_x86_64.hint
 
-setup.hint: setup.hint.tmpl
+setup_x86.hint: setup_x86.hint.tmpl
 	sed \
 	-e 's#@GRASS_VERSION_NUMBER@#$(GRASS_VERSION_NUMBER)#' \
 	$< > $@
+
+setup_x86_64.hint: setup_x86_64.hint.tmpl
+	sed \
+	-e 's#@GRASS_VERSION_NUMBER@#$(GRASS_VERSION_NUMBER)#' \
+	$< > $@

Deleted: grass/trunk/mswindows/osgeo4w/setup.hint.tmpl
===================================================================
--- grass/trunk/mswindows/osgeo4w/setup.hint.tmpl	2016-12-18 12:54:37 UTC (rev 70090)
+++ grass/trunk/mswindows/osgeo4w/setup.hint.tmpl	2016-12-18 15:29:26 UTC (rev 70091)
@@ -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 rbatch
-maintainer: MartinLanda
-curr: @GRASS_VERSION_NUMBER at -1
-prev: @GRASS_VERSION_NUMBER at -1

Copied: grass/trunk/mswindows/osgeo4w/setup_x86.hint.tmpl (from rev 70090, grass/trunk/mswindows/osgeo4w/setup.hint.tmpl)
===================================================================
--- grass/trunk/mswindows/osgeo4w/setup_x86.hint.tmpl	                        (rev 0)
+++ grass/trunk/mswindows/osgeo4w/setup_x86.hint.tmpl	2016-12-18 15:29:26 UTC (rev 70091)
@@ -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 rbatch
+maintainer: MartinLanda
+curr: @GRASS_VERSION_NUMBER at -1
+prev: @GRASS_VERSION_NUMBER at -1

Copied: grass/trunk/mswindows/osgeo4w/setup_x86_64.hint.tmpl (from rev 70090, grass/trunk/mswindows/osgeo4w/setup.hint.tmpl)
===================================================================
--- grass/trunk/mswindows/osgeo4w/setup_x86_64.hint.tmpl	                        (rev 0)
+++ grass/trunk/mswindows/osgeo4w/setup_x86_64.hint.tmpl	2016-12-18 15:29:26 UTC (rev 70091)
@@ -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 pdcurses zlib fftw libpng wxpython python-numpy python-pil pyopengl cairo psycopg2 rbatch
+maintainer: MartinLanda
+curr: @GRASS_VERSION_NUMBER at -1
+prev: @GRASS_VERSION_NUMBER at -1



More information about the grass-commit mailing list