Contribution from Steve George <steve_geo@optusnet.com.au>: Improvements to Windows install scripts.

svn: r11199

windows/nsis/gcheck.py

@@ -1,3 +1,23 @@
+#
+# Gramps - a GTK+/GNOME based genealogy program
+#
+# Copyright (C) 2008       Stephen George
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# $Id: $
 import sys
 
 fn = sys.argv[1]
@@ -18,7 +38,7 @@ except ImportError:
     f.write('pygtkver=no\n')
 
 try:
-    from gtk import glade
+    import gtk.glade
     f.write('glade=yes\n')
 except ImportError:
     f.write('glade=no\n')
@@ -26,8 +46,10 @@ except ImportError:
 try:
     import cairo
     f.write('pycairo=yes\n')
-    f.write('pycairover=%s\n' % cairo.version_info)
+    #f.write('pycairover=%s\n' % cairo.version_info)
+    f.write('pycairover=%s\n' % str(cairo.version_info) )
 except ImportError:
     f.write('pycairo=no\n')
     f.write('pycairover=no\n')
 f.close()
+

windows/nsis/gramps-build.bat

@@ -56,15 +56,15 @@ rem *****************************************************
 rem *  MAKE ALL ADJUSTMENTS IN THIS SECTION!            *
 
 rem version (also used for location
-	set VERSION=0
+	set VERSION=3
 	set VERSIONSUB=0
-	set VERSIONPT=0
+	set VERSIONPT=3
-	set VERSIONBUILD=0
+	set VERSIONBUILD=1
 
 rem path to Nullsoft Installer (NSIS)
 	set NSIS=C:\PROGRA~1\NSIS
 rem path to Nullsoft customized files
-	set CUSTOM=C:\DOCUME~1\HALLS~1.PER\_seh\devel\gramps
+	set CUSTOM=C:\DOCUME~1\halls\_seh\devel\gramps
 
 rem path to Python
 	if "%PYTHONPATH%"=="" echo   Manually setting $PYTHONPATH...
@@ -165,7 +165,7 @@ echo.
 echo   [1] Clean build location
 echo   [2] Extract source tarballs
 echo   [3] Build source
-echo   [N] Nullsoft Installer
+echo   [4] Nullsoft Installer
 echo.
 echo   [R]emove existing installation
 echo.
@@ -180,7 +180,7 @@ echo.
 	if /I "%CH%"=="Q" goto QUIT
 	if /I "%CH%"=="A" goto AUTO
 	if /I "%CH%"=="R" goto REMOVE
-	if /I "%CH%"=="N" goto NSIS
+	if /I "%CH%"=="4" goto NSIS
 	if /I "%CH%"=="3" goto BUILD
 	if /I "%CH%"=="2" goto SOURCE
 	if /I "%CH%"=="1" goto CLEAN
@@ -301,7 +301,7 @@ if exist %NSIS%\CON goto NSISFOUND
 	goto CHOOSE
 	:NSISFOUND
 
-echo   copying customized NSIS files...
+rem echo   copying customized NSIS files...
 rem     if not exist "%BUILDPATH%\%VERSIONNAME%\nsis" mkdir "%BUILDPATH%\%VERSIONNAME%\nsis"
 rem     copy /Y "%NSIS%\Contrib\Graphics\Icons\classic-install.ico" "%BUILDPATH%\%VERSIONNAME%\nsis\classic-install.ico"
 rem     copy /Y "%NSIS%\Contrib\Graphics\Icons\classic-uninstall.ico" "%BUILDPATH%\%VERSIONNAME%\nsis\classic-uninstall.ico"
@@ -320,10 +320,13 @@ echo   building installer...
 	cd "%BUILDPATH%\%VERSIONNAME%\nsis"
 	%NSIS%\makensis gramps.nsi
 
-if not "%RETURN%"=="no" echo.
+rem Open Windows Explorer to this directory
-if not "%RETURN%"=="no" echo   Pausing... did we enjoy building the Nullsoft installer? (Ctrl+C to quit)
+	explorer /e,"%BUILDPATH%\%VERSIONNAME%\nsis"
-if not "%RETURN%"=="no" pause
+
-if not "%RETURN%"=="no" goto CHOOSE
+echo.
+echo   Pausing... did we enjoy building the Nullsoft installer? (Ctrl+C to quit)
+	pause
+	goto CHOOSE
 
 rem REMOVE {{{1
 :REMOVE