Merge pull request #52 from eschwab/dev

Update gregorio version for windows installer.

VERSION

@@ -1,5 +1,5 @@
 gregoriotex_api_version = 20150220
-gregorio_version = 2.4.1-git
+gregorio_version = 2.4.1
 
 *** Do not add any lines above here. ***
 

VersionUpdate.py

@@ -11,9 +11,13 @@
 
 
 version_file = 'VERSION'
+
+gregorio_files = ["configure.ac",
+                  "windows/gregorio.iss"]
+
 gregoriotex_api_files = ["tex/gregoriotex.lua",
                          "plugins/gregoriotex/gregoriotex.h"]
-gregorio_files = ["configure.ac"]
+
 result = []
 GREGORIOTEX_API_VERSION = ''
 GREGORIO_VERSION = ''
@@ -44,6 +48,8 @@ def replace_gregorio_version(infile, newver):
         if re.search(r'AC_INIT\(\[', line):
             result.append(re.sub
                           (r'[0-9.]+-?[a-z]*(\],)', newver + r'\1', line))
+        elif re.search(r'AppVersion', line):
+            result.append(re.sub(r'[0-9.]+', newver, line))
         else:
             result.append(line)
 

configure.ac

@@ -15,7 +15,7 @@ dnl You should have received a copy of the GNU General Public License
 dnl along with this program; if not, write to the Free Software
 dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-AC_INIT([gregorio],[2.4.1-git],[[email protected]])
+AC_INIT([gregorio],[2.4.1],[[email protected]])
 AC_PREREQ(2.53)
 AC_CONFIG_SRCDIR([src/gregorio-utils.c])
 AC_CONFIG_AUX_DIR([build-aux])

windows/gregorio.iss

@@ -1,6 +1,6 @@
 [Setup]
 AppName=gregorio
-AppVersion=2.4
+AppVersion=2.4.1
 DefaultDirName={pf}\gregorio
 DefaultGroupName=gregorio
 SetupIconFile=gregorio.ico