Skip to content

Commit

Permalink
Update Version Number for release
Browse files Browse the repository at this point in the history
  • Loading branch information
rpspringuel committed Sep 23, 2016
1 parent 3d5a0de commit e7be9ad
Show file tree
Hide file tree
Showing 23 changed files with 32 additions and 32 deletions.
2 changes: 1 addition & 1 deletion .gregorio-version
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
4.2.0-rc3
4.2.0

*** Do not modify this file. ***
Use VersionManager.py to change the version.
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ dnl
dnl You should have received a copy of the GNU General Public License
dnl along with Gregorio. If not, see <http://www.gnu.org/licenses/>.

AC_INIT([gregorio],[4.2.0-rc3],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/])
FILENAME_VERSION="4_2_0-rc3"
AC_INIT([gregorio],[4.2.0],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/])
FILENAME_VERSION="4_2_0"
AC_SUBST(FILENAME_VERSION)
AC_DEFINE_UNQUOTED(FILENAME_VERSION, "$FILENAME_VERSION", [version suitable for file names])
MK=""
Expand Down
2 changes: 1 addition & 1 deletion contrib/gregorio-scribus.lua
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ This program allows gregorio to be integrated in Scribus.

require"lfs"

local gregoriobin = 'gregorio-4_2_0-rc3' -- FILENAME_VERSION
local gregoriobin = 'gregorio-4_2_0' -- FILENAME_VERSION
local lualatexbin = "lualatex"

local function basename(name)
Expand Down
2 changes: 1 addition & 1 deletion doc/GregorioRef.tex
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@

\vspace{1cm}

\large Version \textbf{4.2.0-rc3}, 22 August 2016 %% PARSE_VERSION_DATE
\large Version \textbf{4.2.0}, 23 September 2016 %% PARSE_VERSION_DATE

\vspace{1.5cm}
\end{center}
Expand Down
2 changes: 1 addition & 1 deletion fonts/squarize.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
5: 'Five',
}

GREGORIO_VERSION = '4.2.0-rc3'
GREGORIO_VERSION = '4.2.0'

# The unicode character at which we start our numbering:
# U+E000 is the start of the BMP Private Use Area
Expand Down
2 changes: 1 addition & 1 deletion macosx/Gregorio.pkgproj
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@
<key>OVERWRITE_PERMISSIONS</key>
<false/>
<key>VERSION</key>
<string>4.2.0-rc3</string><!--GREGORIO_VERSION-->
<string>4.2.0</string><!--GREGORIO_VERSION-->
</dict>
<key>UUID</key>
<string>74692645-8112-42EB-8FFC-2CBE2CEDE9FB</string>
Expand Down
2 changes: 1 addition & 1 deletion macosx/douninstall.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ GREFONTDIR="$TEXMFLOCAL/fonts/truetype/public/gregoriotex"
GREFONTSOURCE="$TEXMFLOCAL/fonts/source/gregoriotex"
GREDOCDIR="$TEXMFLOCAL/doc/luatex/gregoriotex"

rm "$BINDIR/gregorio-4_2_0-rc3" # FILENAME_VERSION
rm "$BINDIR/gregorio-4_2_0" # FILENAME_VERSION
rm "$PKGCONFIGDIR/gregorio.pc"
rm -rf "$GREINCLUDEDIR"
rm -rf "$GRETEXDIR"
Expand Down
4 changes: 2 additions & 2 deletions tex/gregoriosyms.sty
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{gregoriosyms}
[2016/08/22 v4.2.0-rc3 GregorioTeX symbols only.]% PARSE_VERSION_DATE_LTX
[2016/09/23 v4.2.0 GregorioTeX symbols only.]% PARSE_VERSION_DATE_LTX

% If gregoriotex has been loaded, then we need to abort the loading process of this package here in order to avoid some conflicts.
\ifcsname gregoriotex@symbols@loaded\endcsname\endinput\fi%
Expand All @@ -39,7 +39,7 @@

% The version of gregorio. All gregoriotex*.tex files must have the same.
% All gtex files must also have the same version.
\xdef\gre@gregoriotexversion{4.2.0-rc3}% GREGORIO_VERSION - VersionManager.py
\xdef\gre@gregoriotexversion{4.2.0}% GREGORIO_VERSION - VersionManager.py

\providecommand{\gre@declarefileversion}[2]{\relax}

Expand Down
2 changes: 1 addition & 1 deletion tex/gregoriotex-chars.tex
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
% along with Gregorio. If not, see <http://www.gnu.org/licenses/>.

\gre@debugmsg{general}{Loading gregoriotex-chars.tex}%
\gre@declarefileversion{gregoriotex-chars.tex}{4.2.0-rc3}% GREGORIO_VERSION
\gre@declarefileversion{gregoriotex-chars.tex}{4.2.0}% GREGORIO_VERSION

\def\gre@char@fuse@punctum@one{\GreFuseTwo{\GreCPLeadingPunctumOne}{\GreCPPunctum}}%
\def\gre@char@fuse@quilisma@one{\GreFuseTwo{\GreCPLeadingQuilismaOne}{\GreCPPunctum}}%
Expand Down
2 changes: 1 addition & 1 deletion tex/gregoriotex-main.tex
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@

% The version of gregorio. All gregoriotex*.tex files must have the same.
% All gtex files must also have the same version.
\xdef\gre@gregoriotexversion{4.2.0-rc3}% GREGORIO_VERSION - VersionManager.py
\xdef\gre@gregoriotexversion{4.2.0}% GREGORIO_VERSION - VersionManager.py

% first some macros to allow checks for version:
% Tests that all gregoriotex files are of the same version.
Expand Down
2 changes: 1 addition & 1 deletion tex/gregoriotex-nabc.lua
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
-- this file contains lua functions used by GregorioTeX St. Gall ancient
-- neume support when called with LuaTeX.

-- GREGORIO_VERSION 4.2.0-rc3
-- GREGORIO_VERSION 4.2.0

local catcode_at_letter = luatexbase.catcodetables['gre@atletter']

Expand Down
2 changes: 1 addition & 1 deletion tex/gregoriotex-nabc.tex
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
% this file contains macros for St. Gall ancient neume support

\gre@debugmsg{general}{Loading gregoriotex-nabc.tex}%
\gre@declarefileversion{gregoriotex-nabc.tex}{4.2.0-rc3}% GREGORIO_VERSION
\gre@declarefileversion{gregoriotex-nabc.tex}{4.2.0}% GREGORIO_VERSION


\xdef\gre@nabcfontname{gregall}%
Expand Down
2 changes: 1 addition & 1 deletion tex/gregoriotex-signs.lua
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

-- this file contains lua functions to support signs used by GregorioTeX.

-- GREGORIO_VERSION 4.2.0-rc3
-- GREGORIO_VERSION 4.2.0

local err = gregoriotex.module.err
local warn = gregoriotex.module.warn
Expand Down
2 changes: 1 addition & 1 deletion tex/gregoriotex-signs.tex
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
\def\grebarbracewidth{.58879}%

\gre@debugmsg{general}{Loading gregoriotex-signs.tex}%
\gre@declarefileversion{gregoriotex-signs.tex}{4.2.0-rc3}% GREGORIO_VERSION
\gre@declarefileversion{gregoriotex-signs.tex}{4.2.0}% GREGORIO_VERSION

\def\gre@usestylecommon{%
\ifgre@usestylefont\else %
Expand Down
2 changes: 1 addition & 1 deletion tex/gregoriotex-spaces.tex
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
% this file contains definitions of spaces

\gre@debugmsg{general}{Loading gregoriotex-spaces.tex}%
\gre@declarefileversion{gregoriotex-spaces.tex}{4.2.0-rc3}% GREGORIO_VERSION
\gre@declarefileversion{gregoriotex-spaces.tex}{4.2.0}% GREGORIO_VERSION

%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% macros for tuning penalties
Expand Down
2 changes: 1 addition & 1 deletion tex/gregoriotex-syllable.tex
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
% this file contains definitions of the glyphs and the syllables

\gre@debugmsg{general}{Loading gregoriotex-syllable.tex}%
\gre@declarefileversion{gregoriotex-syllable.tex}{4.2.0-rc3}% GREGORIO_VERSION
\gre@declarefileversion{gregoriotex-syllable.tex}{4.2.0}% GREGORIO_VERSION

%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% macros for the typesetting of the different glyphs
Expand Down
2 changes: 1 addition & 1 deletion tex/gregoriotex-symbols.lua
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

-- this file contains lua functions to support signs used by GregorioTeX.

-- GREGORIO_VERSION 4.2.0-rc3
-- GREGORIO_VERSION 4.2.0

local err = gregoriotex.module.err
local warn = gregoriotex.module.warn
Expand Down
2 changes: 1 addition & 1 deletion tex/gregoriotex-symbols.tex
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
\def\gregoriotex@symbols@loaded{}%

\gre@debugmsg{general}{Loading gregoriotex-symbols.tex}%
\gre@declarefileversion{gregoriotex-symbols.tex}{4.2.0-rc3}% GREGORIO_VERSION
\gre@declarefileversion{gregoriotex-symbols.tex}{4.2.0}% GREGORIO_VERSION

\RequireLuaModule{gregoriotex}%

Expand Down
8 changes: 4 additions & 4 deletions tex/gregoriotex.lua
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,20 @@ local hpack, traverse, traverse_id, has_attribute, count, remove, insert_after,
gregoriotex = gregoriotex or {}
local gregoriotex = gregoriotex

local internalversion = '4.2.0-rc3' -- GREGORIO_VERSION (comment used by VersionManager.py)
local internalversion = '4.2.0' -- GREGORIO_VERSION (comment used by VersionManager.py)

local err, warn, info, log = luatexbase.provides_module({
name = "gregoriotex",
version = '4.2.0-rc3', -- GREGORIO_VERSION
version = '4.2.0', -- GREGORIO_VERSION
greinternalversion = internalversion,
date = "2016/08/22", -- GREGORIO_DATE_LTX
date = "2016/09/23", -- GREGORIO_DATE_LTX
description = "GregorioTeX module.",
author = "The Gregorio Project (see CONTRIBUTORS.md)",
copyright = "2008-2016 - The Gregorio Project",
license = "GPLv3+",
})

local gregorio_exe = 'gregorio-4_2_0-rc3' -- FILENAME_VERSION
local gregorio_exe = 'gregorio-4_2_0' -- FILENAME_VERSION

gregoriotex.module = { err = err, warn = warn, info = info, log = log }

Expand Down
2 changes: 1 addition & 1 deletion tex/gregoriotex.sty
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

\NeedsTeXFormat{LaTeX2e}%
\ProvidesPackage{gregoriotex}%
[2016/08/22 v4.2.0-rc3 GregorioTeX system.]% PARSE_VERSION_DATE_LTX
[2016/09/23 v4.2.0 GregorioTeX system.]% PARSE_VERSION_DATE_LTX

% If gregoriosyms has been loaded then there are going to be some conflicts in the definitions made in that package and this one. In order to provide for a more informative error message, we check for that conflict right away
\ifcsname gregoriotex@symbols@loaded\endcsname\gre@error{Loading gregoriotex after\MessageBreak gregoriosyms is not supported. Please remove the\MessageBreak loading of gregoriosyms (its contents are loaded\MessageBreak by gregoriotex)}\fi%
Expand Down
2 changes: 1 addition & 1 deletion tex/gregoriotex.tex
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@


% This file needs to be marked with the version number. For now I've done this with the following comment, but we should check to see if PlainTeX has something similar to the version declaration of LaTeX and use that if it does.
% [2016/08/22 v4.2.0-rc3 GregorioTeX system.]% PARSE_VERSION_DATE_LTX
% [2016/09/23 v4.2.0 GregorioTeX system.]% PARSE_VERSION_DATE_LTX


\edef\greoldcatcode{\the\catcode`@}
Expand Down
8 changes: 4 additions & 4 deletions windows/gregorio-resources.rc
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
IDI_ICON1 ICON DISCARDABLE "gregorio.ico"
1 VERSIONINFO
FILEVERSION 4,2,0,23
PRODUCTVERSION 4,2,0,23
FILEVERSION 4,2,0,30
PRODUCTVERSION 4,2,0,30
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904E4"
BEGIN
VALUE "CompanyName", "Gregorio project"
VALUE "FileDescription", "Gregorio"
VALUE "FileVersion", "4.2.0-rc3"
VALUE "FileVersion", "4.2.0"
VALUE "InternalName", "gregorio"
VALUE "LegalCopyright", "See COPYING in the installation directory."
VALUE "OriginalFilename", "gregorio.exe"
VALUE "ProductName", "Gregorio"
VALUE "ProductVersion", "4.2.0-rc3"
VALUE "ProductVersion", "4.2.0"
END
END

Expand Down
4 changes: 2 additions & 2 deletions windows/gregorio.iss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[Setup]
AppName=gregorio
AppVersion=4.2.0-rc3
AppVersion=4.2.0
DefaultDirName={pf}\gregorio
DefaultGroupName=gregorio
SetupIconFile=gregorio.ico
Expand Down Expand Up @@ -49,7 +49,7 @@ Name: "{app}\texmf\doc\luatex\gregoriotex\examples"

[Files]
; PARSE_VERSION_FILE_NEXTLINE
Source: "../src/gregorio-4_2_0-rc3.exe"; DestDir: "{app}\bin";
Source: "../src/gregorio-4_2_0.exe"; DestDir: "{app}\bin";
Source: "gregorio.ico"; DestDir: "{app}";
Source: "install.lua"; DestDir: "{app}";
Source: "uninstall.lua"; DestDir: "{app}";
Expand Down

0 comments on commit e7be9ad

Please sign in to comment.