Merge branch 'dev'

Author: dfober

CHANGELOG.txt

@@ -1,6 +1,10 @@
 MusicXML Library
 
 
+----------------------------------------------------------------------------------------------------
+Version 3.22
+- fix install settings
+
 ----------------------------------------------------------------------------------------------------
 Version 3.21
 - xml2guido v.3.2: 

build/CMakeLists.txt

@@ -11,7 +11,7 @@ endif()
 # versions management
 set (XMLVERSION 3.1)
 
-set (VERSION 3.2.1)
+set (VERSION 3.2.2)
 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} )
@@ -32,7 +32,7 @@ option ( GENTOOLS   "Generates tools"	 on )
 option ( GENSTATIC  "Generates the static library"   on )
 
 if (GENTOOLS)
-	message (STATUS "Generate tools (force required static library generation)")
+	message (STATUS "Generate tools (forces static library generation)")
 	set (GENSTATIC on)
 endif()
 
@@ -103,10 +103,11 @@ foreach(folder ${SRCFOLDERS})
 endforeach()
 
 set(SRC ${SRC}  "${SRCDIR}/interface/libmusicxml.cpp" "${SRCDIR}/interface/musicxml2guido.cpp")
-set(HEADERS $HEADERS "${SRCDIR}/interface/libmusicxml.h" "${SRCDIR}/interface/musicxml2guido.h")
+set(HEADERS "${SRCDIR}/interface/libmusicxml.h" "${SRCDIR}/interface/exports.h")
 set (SRCFOLDERS  ${SRCFOLDERS}  interface)
+
 file (GLOB CORESRC RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${SRC})
-file (GLOB COREH   RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${HEADERS} "${SRCDIR}/elements/*H" "${SRCDIR}/visitors/*H" "${SRCDIR}/files/*H" "${SRCDIR}/parser/reader.h" "${SRCDIR}/lib/*H" "${SRCDIR}/guido/*H")
+file (GLOB COREH   RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${HEADERS} "${SRCDIR}/elements/*.h" "${SRCDIR}/visitors/*.h" "${SRCDIR}/files/*.h" "${SRCDIR}/parser/reader.h" "${SRCDIR}/lib/*.h" "${SRCDIR}/guido/*.h")
 
 foreach(folder ${SRCFOLDERS})
   set(INCL ${INCL} "${SRCDIR}/${folder}")        # add include folders
@@ -146,7 +147,7 @@ if (NOT IOS)
 			ARCHIVE_OUTPUT_DIRECTORY_RELEASE  ${LIBDIR}
 			LIBRARY_OUTPUT_DIRECTORY ${LIBDIR}
 			LIBRARY_OUTPUT_DIRECTORY_RELEASE ${LIBDIR}
-			PUBLIC_HEADER "${COREH}"
+			PUBLIC_HEADER "${HEADERS}"
 			DEFINE_SYMBOL LIBMUSICXML_EXPORTS
 			XCODE_ATTRIBUTE_ENABLE_BITCODE "NO"
 )
@@ -165,7 +166,7 @@ elseif(IOS)
 			LIBRARY_OUTPUT_DIRECTORY ${LIBDIR}
 			LIBRARY_OUTPUT_DIRECTORY_RELEASE ${LIBDIR}
 			XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET ${IOS_DEPLOYMENT_TARGET}
-			PUBLIC_HEADER "${COREH}" 	
+			PUBLIC_HEADER "${HEADERS}" 	
 			MACOSX_FRAMEWORK_IDENTIFIER "com.grame.libmusicxml"
 			MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${STRVERS}
 			MACOSX_FRAMEWORK_BUNDLE_VERSION ${VERSION}
@@ -188,7 +189,7 @@ set_target_properties (${staticlib} PROPERTIES
 			ARCHIVE_OUTPUT_DIRECTORY_RELEASE  ${LIBDIR}
 			LIBRARY_OUTPUT_DIRECTORY ${LIBDIR}
 			LIBRARY_OUTPUT_DIRECTORY_RELEASE ${LIBDIR}
-			PUBLIC_HEADER "${COREH}"
+			PUBLIC_HEADER "${HEADERS}"
 			DEFINE_SYMBOL LIBMUSICXML_EXPORTS
 			XCODE_ATTRIBUTE_ENABLE_BITCODE "NO"
 			OUTPUT_NAME musicxml2

build/Makefile

@@ -10,7 +10,7 @@ LIBDIR ?= libdir
 IOSDIR ?= iosdir
 MAKEFILE ?= Makefile
 
-VERSION = 3.21
+VERSION = 3.22
 
 CMAKEOPT ?= 
 TOOLS := xml2midi xmlread xml2guido xmlversion

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.21
+PROJECT_NUMBER         = 3.22
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 

javascript/npm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grame/libmusicxml",
-  "version": "3.21.0",
+  "version": "3.22.0",
   "description": "A library to support the MusicXML format.",
   "main": "libmusicxml.js",
   "directories": {

packages/Makefile

@@ -2,7 +2,7 @@
 # current dtds and schema version
 CURRENT = 3.1
 
-VERSION  := 3.21
+VERSION  := 3.22
 TAG      :=-D tomorrow
 ROOTDIR  := ..
 SRCDIR   := $(ROOTDIR)/src

src/elements/versions.cpp

@@ -15,8 +15,8 @@
 namespace MusicXML2
 {
 //______________________________________________________________________________
-float   versions::libVersion()        { return 3.21f; }
-const char* versions::libVersionStr()     { return "3.21"; }
+float   versions::libVersion()        { return 3.22f; }
+const char* versions::libVersionStr()     { return "3.22"; }
 
 float   versions::xml2guidoVersion()    { return 3.2f; }
 const char* versions::xml2guidoVersionStr()   { return "3.2"; }

src/elements/exports.h renamed to src/interface/exports.h

@@ -57,7 +57,7 @@ EXP const char*   musicxmllibVersionStr();
 
 The library includes a high level API to convert from the MusicXML format to the
 Guido Music Notation (GMN) format. For more information about this format, 
-see  http://guidolib.sourceforge.net
+see  https://guidodoc.grame.fr
 @{
 */
 

src/interface/libmusicxml.h

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