From e0d448f6e713bb927a6e40af85e96f03650c6d93 Mon Sep 17 00:00:00 2001 From: Rory Jaffe Date: Wed, 23 May 2018 06:57:11 -0700 Subject: [PATCH 1/2] fixed compile.bat, added compile.sh for macos add compiled directory if not found --- compile.bat | 1 + compile.sh | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 compile.sh diff --git a/compile.bat b/compile.bat index 986ab4ccf..7cb58d986 100644 --- a/compile.bat +++ b/compile.bat @@ -4,6 +4,7 @@ REM To compile lua files, obtain/build version 5.1.4 of luac.exe and place in th REM This is the Windows version of the batch file. For Mac or Linux will need appropriate batch file. SETLOCAL ENABLEEXTENSIONS IF EXIST luac.exe ( +IF NOT EXIST Source\LRPlugin\MIDI2LR.lrplugin\compiled\ mkdir Source\LRPlugin\MIDI2LR.lrplugin\compiled\ PUSHD Source\LRPlugin\MIDI2LR.lrplugin\ FOR %%a IN (*.lua) DO ..\..\..\luac -o compiled/%%a %%a POPD diff --git a/compile.sh b/compile.sh new file mode 100644 index 000000000..c6c944fef --- /dev/null +++ b/compile.sh @@ -0,0 +1,9 @@ +#!/bin/bash +hash luac 2>/dev/null +if [ $? -eq 0 ] +mkdir -p Source/LRPlugin/MIDI2LR.lrplugin/compiled +pushd Source/LRPlugin/MIDI2LR.lrplugin +for filename in ./*.lua do luac -o "compiled/${filename}" "${filename}"; done +popd +fi +/usr/bin/xcodebuild -configuration Release -project Builds/MacOSX/MIDI2LR.xcodeproj \ No newline at end of file From b316e0eb164187f192c4759272668ba7aca289f5 Mon Sep 17 00:00:00 2001 From: Rory Jaffe Date: Sat, 26 May 2018 09:18:33 -0700 Subject: [PATCH 2/2] Expand lock for change of profile--attempt to fix crash; update build # --- Builds/MacOSX/Info-App.plist | 4 ++-- Builds/MacOSX/MIDI2LR.xcodeproj/project.pbxproj | 8 ++++---- Builds/VisualStudio2017/MIDI2LR_App.vcxproj | 4 ++-- Builds/VisualStudio2017/resources.rc | 6 +++--- DoxyGen/Midi2lr.Doxyfile | 2 +- Installer/MIDI2LR.xml | 2 +- JuceLibraryCode/JuceHeader.h | 4 ++-- MIDI2LR.jucer | 2 +- Source/LRPlugin/MIDI2LR.lrplugin/Info.lua | 2 +- Source/MainComponent.cpp | 2 +- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Builds/MacOSX/Info-App.plist b/Builds/MacOSX/Info-App.plist index bad1fdc94..a50e24a94 100644 --- a/Builds/MacOSX/Info-App.plist +++ b/Builds/MacOSX/Info-App.plist @@ -18,9 +18,9 @@ CFBundleSignature ???? CFBundleShortVersionString - 2.9.0.1 + 2.9.0.2 CFBundleVersion - 2.9.0.1 + 2.9.0.2 NSHumanReadableCopyright NSHighResolutionCapable diff --git a/Builds/MacOSX/MIDI2LR.xcodeproj/project.pbxproj b/Builds/MacOSX/MIDI2LR.xcodeproj/project.pbxproj index 34c3e7413..c6eb3f249 100644 --- a/Builds/MacOSX/MIDI2LR.xcodeproj/project.pbxproj +++ b/Builds/MacOSX/MIDI2LR.xcodeproj/project.pbxproj @@ -281,8 +281,8 @@ "U_STATIC_IMPLEMENTATION=1", "GSL_THROW_ON_CONTRACT_VIOLATION=1", "JUCER_XCODE_MAC_F6D2F4CF=1", - "JUCE_APP_VERSION=2.9.0.1", - "JUCE_APP_VERSION_HEX=0x2090001", + "JUCE_APP_VERSION=2.9.0.2", + "JUCE_APP_VERSION_HEX=0x2090002", "JucePlugin_Build_VST=0", "JucePlugin_Build_VST3=0", "JucePlugin_Build_AU=0", @@ -316,8 +316,8 @@ "U_STATIC_IMPLEMENTATION=1", "GSL_UNENFORCED_ON_CONTRACT_VIOLATION=1", "JUCER_XCODE_MAC_F6D2F4CF=1", - "JUCE_APP_VERSION=2.9.0.1", - "JUCE_APP_VERSION_HEX=0x2090001", + "JUCE_APP_VERSION=2.9.0.2", + "JUCE_APP_VERSION_HEX=0x2090002", "JucePlugin_Build_VST=0", "JucePlugin_Build_VST3=0", "JucePlugin_Build_AU=0", diff --git a/Builds/VisualStudio2017/MIDI2LR_App.vcxproj b/Builds/VisualStudio2017/MIDI2LR_App.vcxproj index e1f9ba645..6d78eebfa 100644 --- a/Builds/VisualStudio2017/MIDI2LR_App.vcxproj +++ b/Builds/VisualStudio2017/MIDI2LR_App.vcxproj @@ -75,7 +75,7 @@ Disabled ProgramDatabase ..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;../../;../../icu/source/common/;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;U_STATIC_IMPLEMENTATION=1;GSL_THROW_ON_CONTRACT_VIOLATION=1;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=2.9.0.1;JUCE_APP_VERSION_HEX=0x2090001;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;U_STATIC_IMPLEMENTATION=1;GSL_THROW_ON_CONTRACT_VIOLATION=1;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=2.9.0.2;JUCE_APP_VERSION_HEX=0x2090002;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions) MultiThreadedDebugDLL true @@ -116,7 +116,7 @@ Full ..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;../../;../../icu/source/common/;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;U_STATIC_IMPLEMENTATION=1;GSL_UNENFORCED_ON_CONTRACT_VIOLATION=1;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=2.9.0.1;JUCE_APP_VERSION_HEX=0x2090001;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;U_STATIC_IMPLEMENTATION=1;GSL_UNENFORCED_ON_CONTRACT_VIOLATION=1;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=2.9.0.2;JUCE_APP_VERSION_HEX=0x2090002;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions) MultiThreadedDLL true diff --git a/Builds/VisualStudio2017/resources.rc b/Builds/VisualStudio2017/resources.rc index 29b573144..931c21a9b 100644 --- a/Builds/VisualStudio2017/resources.rc +++ b/Builds/VisualStudio2017/resources.rc @@ -7,16 +7,16 @@ #include VS_VERSION_INFO VERSIONINFO -FILEVERSION 2,9,0,1 +FILEVERSION 2,9,0,2 BEGIN BLOCK "StringFileInfo" BEGIN BLOCK "040904E4" BEGIN VALUE "FileDescription", "MIDI2LR\0" - VALUE "FileVersion", "2.9.0.1\0" + VALUE "FileVersion", "2.9.0.2\0" VALUE "ProductName", "MIDI2LR\0" - VALUE "ProductVersion", "2.9.0.1\0" + VALUE "ProductVersion", "2.9.0.2\0" END END diff --git a/DoxyGen/Midi2lr.Doxyfile b/DoxyGen/Midi2lr.Doxyfile index acce9da76..a181b1c9a 100644 --- a/DoxyGen/Midi2lr.Doxyfile +++ b/DoxyGen/Midi2lr.Doxyfile @@ -38,7 +38,7 @@ PROJECT_NAME = MIDI2LR # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 2.9.0.1 +PROJECT_NUMBER = 2.9.0.2 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/Installer/MIDI2LR.xml b/Installer/MIDI2LR.xml index 8f0523090..d7ddfa33e 100644 --- a/Installer/MIDI2LR.xml +++ b/Installer/MIDI2LR.xml @@ -1,7 +1,7 @@ MIDI2LR MIDI2LR - 2.9.0.1 + 2.9.0.2 ../Source/LRPlugin/ReadMe.txt ../LICENSE.txt LICENSE.html diff --git a/JuceLibraryCode/JuceHeader.h b/JuceLibraryCode/JuceHeader.h index dbe2d0394..ffb667288 100644 --- a/JuceLibraryCode/JuceHeader.h +++ b/JuceLibraryCode/JuceHeader.h @@ -34,7 +34,7 @@ namespace ProjectInfo { const char* const projectName = "MIDI2LR"; - const char* const versionString = "2.9.0.1"; - const int versionNumber = 0x2090001; + const char* const versionString = "2.9.0.2"; + const int versionNumber = 0x2090002; } #endif diff --git a/MIDI2LR.jucer b/MIDI2LR.jucer index 137ec8a48..6b1992ce0 100644 --- a/MIDI2LR.jucer +++ b/MIDI2LR.jucer @@ -1,6 +1,6 @@ -