r22309 - gnucash/trunk/packaging/win32 - Win32 nightly build: build trunk from git by default.

[Geert Janssens]

Author: gjanssens
Date: 2012-08-14 11:14:25 -0400 (Tue, 14 Aug 2012)
New Revision: 22309
Trac: http://svn.gnucash.org/trac/changeset/22309

Modified:
   gnucash/trunk/packaging/win32/README
   gnucash/trunk/packaging/win32/daily_build.bat
Log:
Win32 nightly build: build trunk from git by default.

Additionally, update the README file to explain how the start from
scratch with a git repository.

Modified: gnucash/trunk/packaging/win32/README
===================================================================
--- gnucash/trunk/packaging/win32/README	2012-08-14 15:14:12 UTC (rev 22308)
+++ gnucash/trunk/packaging/win32/README	2012-08-14 15:14:25 UTC (rev 22309)
@@ -1,6 +1,10 @@
 These scripts try to download and install a Windows/mingw32 build
 environment for GnuCash on Windows.
 
+Note: The mingw homepage is http://www.mingw.org. You can read more
+      about mingw over there. The packages to download are all
+      on sourceforge however, so the direct links are given here.
+
 These scripts support two ways to build a Windows/mingw32 version of GnuCash:
 - directly on a Windows PC
 - via cross-compilation on Linux
@@ -12,10 +16,31 @@
 steps manually. The directory variables are set in `defaults.sh' and optionally
 `custom.sh'.
 
-Note: The mingw homepage is http://www.mingw.org. You can read more
-      about mingw over there. The packages to download are all
-      on sourceforge however, so the direct links are given here.
+Note: when installing software as asked below, avoid using paths
+      with spaces. Some parts of the build system don't cope well
+      with spaces. So don't install in c:\Program Files. The build
+      system by default assumes c:\soft as base directory
+      called $GLOBAL_DIR from now on).
+      
+* Download and install git for windows from http://git-scm.com/downloads.
+  This will install some git related items in the Windows Explorer
+  context menus (you can access them via right-click in any directory)
+  
+* Choose a spot where you want to store a copy of the GnuCash repository.
+  The default path is $GLOBAL_DIR\gnucash\repos.
+  Reminder: avoid pathnames with spaces in it.
 
+* Create all directories in the path except the last one. For the example,
+  make sure $GLOBAL_DIR\gnucash exists
+  
+* Open a Windows explorer and go to $GLOBAL_DIR\gnucash (or your chosen location)
+
+* Right-click. In the popup select git bash. This will open a command prompt.
+
+* Enter: git clone git://github.com/Gnucash/gnucash.git repos
+  The last part should be what you chose the call the directory to store the
+  copy of the GnuCash repository.
+
 * Download MSYS from
   https://sourceforge.net/projects/mingw/files/MSYS%20Base%20System/msys-1.0.11/MSYS-1.0.11.exe/download
   to $DOWNLOAD_DIR
@@ -35,9 +60,16 @@
   Note: the version number may have changed when you try this. Use whatever version
         that is available
 
+* Via Windows Explorer go to <your-repos-dir>\packaging\win32
+
 * Look at defaults.sh and create a file named custom.sh to specify adapted directory
-  variables.  If you want verbose output of any script
-  step, add "set -x" to that file.
+  variables.
+  
+  - If you used a path to your GnuCash repository other than the default
+    $GLOBAL_DIR\gnucash\repos, you should at least specify REPOS_DIR in here.
+  - Also if you want the build system to reuse git you have just installed,
+    you can specify the path to git's installation location via GIT_DIR
+  - If you want verbose output of any script step, add "set -x" to that file.
 
 * Either, download Qt from http://www.trolltech.com/developer/downloads/qt/windows,
   install it and set QTDIR in custom.sh, like "QTDIR=/c/Qt/4.2.3"; or skip building

Modified: gnucash/trunk/packaging/win32/daily_build.bat
===================================================================
--- gnucash/trunk/packaging/win32/daily_build.bat	2012-08-14 15:14:12 UTC (rev 22308)
+++ gnucash/trunk/packaging/win32/daily_build.bat	2012-08-14 15:14:25 UTC (rev 22309)
@@ -5,7 +5,7 @@
 cd c:\soft\packaging
 
 rem Development build (daily)
-c:\msys\1.0\bin\sh.exe --login c:\soft\packaging\daily_build.sh
+c:\msys\1.0\bin\sh.exe --login c:\soft\gnucash\repos\packaging\win32\daily_build.sh
 rem Tags build (daily -- only tags that weren't built yet)
 c:\msys\1.0\bin\sh.exe --login c:\soft\packaging\build_tags.sh
 rem 2.4 branch build (weekly)