Skip to content

Commit

Permalink
Merge pull request #698 from rpspringuel/release-4.0
Browse files Browse the repository at this point in the history
Making Release
  • Loading branch information
henryso committed Dec 8, 2015
2 parents 40c063a + 42c3c77 commit 39043b7
Show file tree
Hide file tree
Showing 18 changed files with 53 additions and 85 deletions.
2 changes: 1 addition & 1 deletion .gregorio-version
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
4.0.0-rc2
4.0.0

*** Do not modify this file. ***
Use VersionManager.py to change the version.
86 changes: 27 additions & 59 deletions CHANGELOG.md

Large diffs are not rendered by default.

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.0.0-rc2],[[email protected]])
FILENAME_VERSION="4_0_0-rc2"
AC_INIT([gregorio],[4.0.0],[[email protected]])
FILENAME_VERSION="4_0_0"
AC_SUBST(FILENAME_VERSION)
MK=""
AC_SUBST(MK)
Expand Down
2 changes: 1 addition & 1 deletion doc/GregorioRef.tex
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@

\vspace{1cm}

\large Version \textbf{4.0.0-rc2}, 5 November 2015 %% PARSE_VERSION_DATE
\large Version \textbf{4.0.0}, 8 December 2015 %% 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 @@ -79,7 +79,7 @@
5: 'Five',
}

GREGORIO_VERSION = '4.0.0-rc2'
GREGORIO_VERSION = '4.0.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.0.0-rc2</string><!--GREGORIO_VERSION-->
<string>4.0.0</string><!--GREGORIO_VERSION-->
</dict>
<key>UUID</key>
<string>74692645-8112-42EB-8FFC-2CBE2CEDE9FB</string>
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}
[2015/11/05 v4.0.0-rc2 GregorioTeX symbols only.]% PARSE_VERSION_DATE_LTX
[2015/12/08 v4.0.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 @@ -38,7 +38,7 @@

% The version of gregorio. All gregoriotex*.tex files must have the same.
% All gtex files must also have the same version.
\xdef\gre@gregorioversion{4.0.0-rc2}% GREGORIO_VERSION - VersionManager.py
\xdef\gre@gregorioversion{4.0.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 @@ -17,7 +17,7 @@
% You should have received a copy of the GNU General Public License
% along with Gregorio. If not, see <http://www.gnu.org/licenses/>.

\gre@declarefileversion{gregoriotex-chars.tex}{4.0.0-rc2}% GREGORIO_VERSION
\gre@declarefileversion{gregoriotex-chars.tex}{4.0.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 @@ -106,7 +106,7 @@

% The version of gregorio. All gregoriotex*.tex files must have the same.
% All gtex files must also have the same version.
\xdef\gre@gregorioversion{4.0.0-rc2}% GREGORIO_VERSION - VersionManager.py
\xdef\gre@gregorioversion{4.0.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-signs.tex
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

\def\grebarbracewidth{.58879}%

\gre@declarefileversion{gregoriotex-signs.tex}{4.0.0-rc2}% GREGORIO_VERSION
\gre@declarefileversion{gregoriotex-signs.tex}{4.0.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 @@ -19,7 +19,7 @@

% this file contains definitions of spaces

\gre@declarefileversion{gregoriotex-spaces.tex}{4.0.0-rc2}% GREGORIO_VERSION
\gre@declarefileversion{gregoriotex-spaces.tex}{4.0.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 @@ -19,7 +19,7 @@

% this file contains definitions of the glyphs and the syllables

\gre@declarefileversion{gregoriotex-syllable.tex}{4.0.0-rc2}% GREGORIO_VERSION
\gre@declarefileversion{gregoriotex-syllable.tex}{4.0.0}% GREGORIO_VERSION

%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% macros for the typesetting of the different glyphs
Expand Down
2 changes: 1 addition & 1 deletion tex/gregoriotex-symbols.tex
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
\ifcsname gregoriotex@symbols@loaded\endcsname\endinput\fi%
\def\gregoriotex@symbols@loaded{}%

\gre@declarefileversion{gregoriotex-symbols.tex}{4.0.0-rc2}% GREGORIO_VERSION
\gre@declarefileversion{gregoriotex-symbols.tex}{4.0.0}% GREGORIO_VERSION

\RequireLuaModule{gregoriotex}%

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

local internalversion = '4.0.0-rc2' -- GREGORIO_VERSION (comment used by VersionManager.py)
local internalversion = '4.0.0' -- GREGORIO_VERSION (comment used by VersionManager.py)

local err, warn, info, log = luatexbase.provides_module({
name = "gregoriotex",
version = '4.0.0-rc2', -- GREGORIO_VERSION
version = '4.0.0', -- GREGORIO_VERSION
greinternalversion = internalversion,
date = "2015/11/05", -- GREGORIO_DATE_LTX
date = "2015/12/08", -- GREGORIO_DATE_LTX
description = "GregorioTeX module.",
author = "The Gregorio Project (see CONTRIBUTORS.md)",
copyright = "2008-2015 - The Gregorio Project",
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}%
[2015/11/05 v4.0.0-rc2 GregorioTeX system.]% PARSE_VERSION_DATE_LTX
[2015/12/08 v4.0.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.
% [2015/11/05 v4.0.0-rc2 GregorioTeX system.]% PARSE_VERSION_DATE_LTX
% [2015/12/08 v4.0.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,0,0,22
PRODUCTVERSION 4,0,0,22
FILEVERSION 4,0,0,30
PRODUCTVERSION 4,0,0,30
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904E4"
BEGIN
VALUE "CompanyName", "Gregorio project"
VALUE "FileDescription", "Gregorio"
VALUE "FileVersion", "4.0.0-rc2"
VALUE "FileVersion", "4.0.0"
VALUE "InternalName", "gregorio"
VALUE "LegalCopyright", "See COPYING in the installation directory."
VALUE "OriginalFilename", "gregorio.exe"
VALUE "ProductName", "Gregorio"
VALUE "ProductVersion", "4.0.0-rc2"
VALUE "ProductVersion", "4.0.0"
END
END

Expand Down
6 changes: 3 additions & 3 deletions windows/gregorio.iss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[Setup]
AppName=gregorio
AppVersion=4.0.0-rc2
AppVersion=4.0.0
DefaultDirName={pf}\gregorio
DefaultGroupName=gregorio
SetupIconFile=gregorio.ico
Expand Down Expand Up @@ -53,9 +53,9 @@ Source: "../README.md"; DestDir: "{app}";
Source: "../CONTRIBUTORS.md"; DestDir: "{app}";
Source: "../UPGRADE.md"; DestDir: "{app}";
; PARSE_VERSION_FILE_NEXTLINE
Source: "../doc/GregorioRef-4_0_0-rc2.pdf"; DestDir: "{app}";
Source: "../doc/GregorioRef-4_0_0.pdf"; DestDir: "{app}";
; PARSE_VERSION_FILE_NEXTLINE
Source: "../doc/GregorioNabcRef-4_0_0-rc2.pdf"; DestDir: "{app}";
Source: "../doc/GregorioNabcRef-4_0_0.pdf"; DestDir: "{app}";
Source: "../COPYING.md"; DestDir: "{app}";
Source: "../contrib/900_gregorio.xml"; DestDir: "{app}\contrib";
Source: "../contrib/system-setup.bat"; DestDir: "{app}";
Expand Down

0 comments on commit 39043b7

Please sign in to comment.