From 83c0f92b0f45eab309cdb79e5a5d419b4e534af6 Mon Sep 17 00:00:00 2001 From: "D. Fober" Date: Wed, 15 Jan 2020 23:26:19 +0100 Subject: [PATCH] move version to 3.18 --- CHANGELOG.txt | 4 ++++ build/CMakeLists.txt | 2 +- build/Makefile | 2 +- doc/Doxyfile | 2 +- javascript/npm/package.json | 2 +- packages/Makefile | 2 +- src/elements/versions.cpp | 4 ++-- win32/libmusicxml/libmusicxml.rc | 10 +++++----- 8 files changed, 16 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 687bbff1a..7bcd0c781 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -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 diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt index 950ce7c5b..8d5956a91 100644 --- a/build/CMakeLists.txt +++ b/build/CMakeLists.txt @@ -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} ) diff --git a/build/Makefile b/build/Makefile index 845473f2c..4e6c81d77 100644 --- a/build/Makefile +++ b/build/Makefile @@ -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)) diff --git a/doc/Doxyfile b/doc/Doxyfile index 3d50ae58d..4b67dbaf7 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -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. diff --git a/javascript/npm/package.json b/javascript/npm/package.json index 31dc72804..5181c8eee 100644 --- a/javascript/npm/package.json +++ b/javascript/npm/package.json @@ -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": { diff --git a/packages/Makefile b/packages/Makefile index 4d94fa3d1..90bcc42b4 100644 --- a/packages/Makefile +++ b/packages/Makefile @@ -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 diff --git a/src/elements/versions.cpp b/src/elements/versions.cpp index f19af9246..d075569e2 100755 --- a/src/elements/versions.cpp +++ b/src/elements/versions.cpp @@ -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"; } diff --git a/win32/libmusicxml/libmusicxml.rc b/win32/libmusicxml/libmusicxml.rc index 217cb6c8a..e64fe98cf 100644 --- a/win32/libmusicxml/libmusicxml.rc +++ b/win32/libmusicxml/libmusicxml.rc @@ -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 @@ -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"