Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@rsjaffe
rsjaffe committed May 26, 2018
2 parents 1a0f6a3 + b316e0e commit c5e0166
Show file tree
Hide file tree
Showing 12 changed files with 28 additions and 18 deletions.
4 changes: 2 additions & 2 deletions Builds/MacOSX/Info-App.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleShortVersionString</key>
<string>2.9.0.1</string>
<string>2.9.0.2</string>
<key>CFBundleVersion</key>
<string>2.9.0.1</string>
<string>2.9.0.2</string>
<key>NSHumanReadableCopyright</key>
<string></string>
<key>NSHighResolutionCapable</key>
Expand Down
8 changes: 4 additions & 4 deletions Builds/MacOSX/MIDI2LR.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions Builds/VisualStudio2017/MIDI2LR_App.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
<Optimization>Disabled</Optimization>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;../../;../../icu/source/common/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<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.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)</PreprocessorDefinitions>
<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)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/>
Expand Down Expand Up @@ -116,7 +116,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;../../;../../icu/source/common/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<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.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)</PreprocessorDefinitions>
<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)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/>
Expand Down
6 changes: 3 additions & 3 deletions Builds/VisualStudio2017/resources.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
#include <windows.h>

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

Expand Down
2 changes: 1 addition & 1 deletion DoxyGen/Midi2lr.Doxyfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Installer/MIDI2LR.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<project>
<shortName>MIDI2LR</shortName>
<fullName>MIDI2LR</fullName>
<version>2.9.0.1</version>
<version>2.9.0.2</version>
<readmeFile>../Source/LRPlugin/ReadMe.txt</readmeFile>
<licenseFile>../LICENSE.txt</licenseFile>
<htmlLicenseFile>LICENSE.html</htmlLicenseFile>
Expand Down
4 changes: 2 additions & 2 deletions JuceLibraryCode/JuceHeader.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion MIDI2LR.jucer
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<JUCERPROJECT id="jqaeel" name="MIDI2LR" projectType="guiapp" version="2.9.0.1"
<JUCERPROJECT id="jqaeel" name="MIDI2LR" projectType="guiapp" version="2.9.0.2"
bundleIdentifier="com.rsjaffe.MIDI2LR" includeBinaryInAppConfig="1"
jucerVersion="5.2.1" companyWebsite="http://rsjaffe.github.io/MIDI2LR/"
companyEmail="rsjaffe@gmail.com" displaySplashScreen="0" reportAppUsage="0"
Expand Down
2 changes: 1 addition & 1 deletion Source/LRPlugin/MIDI2LR.lrplugin/Info.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,5 +70,5 @@ return {
},

},
VERSION = { major=2, minor=9, revision=0, build=1}
VERSION = { major=2, minor=9, revision=0, build=2}
}
2 changes: 1 addition & 1 deletion Source/MainComponent.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -351,9 +351,9 @@ void MainContentComponent::buttonClicked(juce::Button* button)
void MainContentComponent::ProfileChanged(
juce::XmlElement* xml_element, const juce::String& file_name)
{ //-V2009 overridden method
command_table_model_.BuildFromXml(xml_element);
{
const MessageManagerLock mmLock;
command_table_model_.BuildFromXml(xml_element);
command_table_.updateContent();
command_table_.repaint();
profile_name_label_.setText(file_name, juce::NotificationType::dontSendNotification);
Expand Down
1 change: 1 addition & 0 deletions compile.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 9 additions & 0 deletions compile.sh
View file
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit c5e0166

Please sign in to comment.