Skip to content

Commit

Permalink
move version to 3.18
Browse files Browse the repository at this point in the history
  • Loading branch information
dfober committed Jan 15, 2020
1 parent 93cd975 commit 83c0f92
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 12 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
MusicXML Library


----------------------------------------------------------------------------------------------------
Version 3.18
- fix a crash bug with lilypond conversion

----------------------------------------------------------------------------------------------------
Version 3.17
- synchronize npm version and lib version
Expand Down
2 changes: 1 addition & 1 deletion build/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ endif()
# versions management
set (XMLVERSION 3.1)

set (VERSION 3.1.7)
set (VERSION 3.1.8)
macro (get_major_minor_patch version)
string( REGEX REPLACE "([0-9]*)\\.([0-9]*)\\.([0-9]*)" "\\1" VERSION_MAJOR ${version} )
string( REGEX REPLACE "([0-9]*)\\.([0-9]*)\\.([0-9]*)" "\\2" VERSION_MINOR ${version} )
Expand Down
2 changes: 1 addition & 1 deletion build/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
.PHONY : msys win32 win64 linux android

PDIR ?= libdir
VERSION = 3.17
VERSION = 3.18

system := $(shell uname -s)
system := $(shell echo $(system) | grep MINGW > /dev/null && echo MINGW || echo $(system))
Expand Down
2 changes: 1 addition & 1 deletion doc/Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ PROJECT_NAME = LibMusicXML
# This could be handy for archiving the generated documentation or
# if some version control system is used.

PROJECT_NUMBER = 3.17.5.5.5.5
PROJECT_NUMBER = 3.18

# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
Expand Down
2 changes: 1 addition & 1 deletion javascript/npm/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@grame/libmusicxml",
"version": "3.1.7",
"version": "3.18",
"description": "A library to support the MusicXML format.",
"main": "libmusicxml.js",
"directories": {
Expand Down
2 changes: 1 addition & 1 deletion packages/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# current dtds and schema version
CURRENT = 3.1

VERSION := 3.17.5.5.5.5
VERSION := 3.18
TAG :=-D tomorrow
ROOTDIR := ..
SRCDIR := $(ROOTDIR)/src
Expand Down
4 changes: 2 additions & 2 deletions src/elements/versions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
namespace MusicXML2
{
//______________________________________________________________________________
float versions::libVersion() { return 3.17f; }
const char* versions::libVersionStr() { return "3.17"; }
float versions::libVersion() { return 3.18f; }
const char* versions::libVersionStr() { return "3.18"; }

float versions::xml2guidoVersion() { return 3.0f; }
const char* versions::xml2guidoVersionStr() { return "3.0"; }
Expand Down
10 changes: 5 additions & 5 deletions win32/libmusicxml/libmusicxml.rc
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ END
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,1,7,0
PRODUCTVERSION 3,1,7,0
FILEVERSION 3,1,8,0
PRODUCTVERSION 3,1,8,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -71,12 +71,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Grame"
VALUE "FileDescription", "libmusicxml library"
VALUE "FileVersion", "3, 1, 7, 0"
VALUE "FileVersion", "3, 1, 8, 0"
VALUE "InternalName", "libmusicxml"
VALUE "LegalCopyright", "Copyright (C) GRAME 2008-2019"
VALUE "LegalCopyright", "Copyright (C) GRAME 2008-2020"
VALUE "OriginalFilename", "libmusicxml3.dll"
VALUE "ProductName", " libmusicxml"
VALUE "ProductVersion", "3, 1, 7, 0"
VALUE "ProductVersion", "3, 1, 8, 0"
END
END
BLOCK "VarFileInfo"
Expand Down

0 comments on commit 83c0f92

Please sign in to comment.