Changes between Version 81 and Version 82 of CompileOnWindows

Timestamp:

May 31, 2009, 3:20:01 AM (15 years ago)

Author:

hamish

Comment:

mo' updates

CompileOnWindows

@@ -125 +125 @@
 When finished, you should have the ~~following~~ compilation log (c:\osgeo4w\usr\src\grass-6.4xxx\error.log):
 
-('''UPDATE: Makefile fixed to avoid building r.li if Msys detected''')
+('''''UPDATE: Makefile fixed to avoid building r.li if Msys detected''''')
 {{{
 GRASS GIS compilation log
@@ -152 +152 @@
 OR, if you want to be able to use the command line from within grass, you'll need a different start-up file.
 
-1. Open '''C:\OSGeo4W\apps\grass\bin\grass64''' and at line 24 add:
+1. ~~Open '''C:\OSGeo4W\apps\grass\bin\grass64''' and at line 24 add:~~
+
+('''''UPDATE: PYTHONPATH setting bug in Init.sh now fixed''''')
 {{{
 if [ -z "$PYTHONPATH" ] ; then
@@ -171 +173 @@
 }}}
 
+
+
 == Compiling and Installing Development Versions of GRASS ==
 
@@ -204 +208 @@
 }}}
 OR
- * Download a daily snapshot from [http://grass.osgeo.org/grass65/source/snapshot/ here]
+ * Download a weekly snapshot from [http://grass.osgeo.org/grass65/source/snapshot/ here]
 
 2. Follow the instructions above for grass-6.4.0, but change all grass64 to grass65, etc.
@@ -215 +219 @@
 ./mswindows/osgeo4w/package.sh
 }}}
+
 
 === Grass-7.0.svn (trunk) ===
@@ -228 +233 @@
 }}}
 OR
- * Download a daily snapshot from [http://grass.osgeo.org/grass70/source/snapshot/ here] and unpack to c:\osgeo4w\usr\src (if you use this method in the instructions below change "grass_trunk" to the folder name of your snapshot eg. "grass-7.0.svn_src_snapshot_2009_03_29")
+ * Download a weekly snapshot from [http://grass.osgeo.org/grass70/source/snapshot/ here] and unpack to c:\osgeo4w\usr\src (if you use this method in the instructions below change "grass_trunk" to the folder name of your snapshot eg. "grass-7.0.svn_src_snapshot_2009_03_29")
 
 2. Open c:\osgeo4w\etc\ini\msys.bat and at line 3 add:
@@ -234 +239 @@
 set PYTHONPATH=%OSGEO4W_ROOT%\apps\Python25
 }}}
-3. Open c:\osgeo4w\usr\src\grass_trunk\lib\python\grass.py, and at line 208 change:
+3. ~~Open c:\osgeo4w\usr\src\grass_trunk\lib\python\grass.py, and at line 208 change:~~
+
+('''''UPDATE: automatic OS detection fixed in SVN; moved to core.py''''')
 {{{
 os.execvp("g.parser", [name] + argv)
@@ -256 +263 @@
         $$(call linker)
 }}}
-5. Download the package.sh script from [http://trac.osgeo.org/grass/browser/grass/branches/develbranch_6/mswindows/osgeo4w/package.sh?format=raw here] 
+5. Download the package.sh script from [http://trac.osgeo.org/grass/browser/grass/branches/develbranch_6/mswindows/osgeo4w/package.sh?format=raw here]   (''why not use the native grass 7 ver??' [source:grass/trunk/mswindows/osgeo4w/package.sh])
 
 6. Put in c:\osgeo4w\usr\src\grass_trunk\mswindows\osgeo4w\ (you may have to create the latter two folders)
@@ -263 +270 @@
 
 8. Also, at line 35 change:
+
+('''''UPDATE: not needed if you pull mswindows\osgeo4w\package.sh from the GRASS 7 source code''''')
 {{{
 --with-freetype-includes=/osgeo4w/include/freetype2 
@@ -278 +287 @@
 ./mswindows/osgeo4w/package.sh
 }}}
-10. Once the scripts fails on the r.li.* errors (see above), type:
+10. ~~Once the script fails on the r.li.* errors (see above), type:~~
+
+('''''UPDATED: fixed to avoid building r.li if Msys detected''''')
 {{{
 make install
@@ -284 +295 @@
 
 11. Once this is finished open c:\osgeo4w\apps\grass\grass-7.0.svn\etc\Init.sh, and at line 150 change:
+
+(''still aplicable???'')
 {{{
 PATH="$GRASS_LD_LIBRARY_PATH"
@@ -293 +306 @@
 
 12. Open c:\osgeo4w\apps\grass\bin\grass70, and at line 25 add:
+
+(''still needed???'')
 {{{
 if [ -z "$PYTHONPATH" ] ; then
@@ -310 +325 @@
 {{{
 cd /osgeo4w/usr/src/grass_trunk
+make distclean
 svn up
 rm configure-stamp
 ./mswindows/osgeo4w/package.sh
 }}}
+
 
 === Troubleshooting ===
@@ -327 +344 @@
  * QGIS
  * Add cairo support to grass-7.0.svn
-  * Possibly use these cairo binaries [http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/cairo-1.6.4-2.zip deps] and [http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/cairo-dev-1.6.4-2.zip bin].
+  * Possibly use these cairo binaries [http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/cairo-1.6.4-2.zip deps] and [http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/cairo-dev-1.6.4-2.zip bin]. (check for newer versions)
   * Preferably get cairo added to osgeo4w tree.
  * Add geos support for grass-7.0.svn (need geos-config file)
+
 
 == Building with MS Visual Studio ==