Merge branch 'develop' of https://github.com/christophhart/HISE into …

…develop

.gitignore

@@ -133,3 +133,5 @@ tools/onnx_lib/Builds/
 tools/onnx_lib/JuceLibraryCode/
 tools/onnx_lib/Source/lib/
 tools/onnx_lib/onnx_hise_library.dll
+tools/auto_build/installer
+hi_scripting/scripting/api/bx

currentGitHash.txt

@@ -1 +1 @@
-ca06fcb9f0e27fdb7be45e9de968c5f85832e386
+2fbc2f73819197491158b402cd593363df28a68e

hi_backend/backend/CompileExporter.cpp

@@ -2670,8 +2670,11 @@ void CompileExporter::BatchFileCreator::createBatchFile(CompileExporter* exporte
 		String xcodeLine;
 
 		xcodeLine << "xcodebuild -project \"Builds/MacOSX/" << projectName << ".xcodeproj\" -configuration \"" << exporter->configurationName << "\" -jobs \"" << threads << "\"";
-		xcodeLine << " | xcpretty";
-
+
+        auto xcbeautify = exporter->hisePath.getChildFile("tools/Projucer/xcbeautify");
+
+        xcodeLine << " | " << xcbeautify.getFullPathName().quoted();
+
         ADD_LINE(xcodeLine);
     }
 

hi_backend/backend/currentGit.h

@@ -1 +1 @@
-#define PREVIOUS_HISE_COMMIT "ca06fcb9f0e27fdb7be45e9de968c5f85832e386" 
+#define PREVIOUS_HISE_COMMIT "2fbc2f73819197491158b402cd593363df28a68e"

hi_backend/backend/dialog_library/dialog_library.cpp

@@ -409,11 +409,7 @@ var ExportSetupWizard::checkIDE(const var::NativeFunctionArgs& args)
             writeState("xcodeExists", xcodeExists);
         }
         {
-            juce::ChildProcess xcp;
-            xcp.start("gem list xcpretty");
-            auto output = xcp.readAllProcessOutput();
-            auto xcPrettyExists = output.contains("xcpretty");
-            writeState("xcPrettyExists", xcPrettyExists);
+            writeState("xcPrettyExists", true);
         }
 #endif
 

hi_scripting/hi_scripting.h

@@ -89,6 +89,15 @@ compile / debug cycle and don't need all nodes in scriptnode you might want to t
 #define HISE_CREATE_DSP_NETWORKS_FOR_HARDCODED_NODES 0
 #endif
 
+
+/** Config: HISE_INCLUDE_BX_LICENSER
+  
+    Enable this to use the BX Licenser. 
+*/
+#ifndef HISE_INCLUDE_BX_LICENSER
+#define HISE_INCLUDE_BX_LICENSER 0
+#endif
+
 #define MAX_SCRIPT_HEIGHT 700
 
 #include "AppConfig.h"

hi_scripting/hi_scripting_01.cpp

@@ -84,6 +84,10 @@
 #include "scripting/engine/JavascriptEngineAdditionalMethods.cpp"
 #include "scripting/engine/JavascriptEngineCyclicReferenceChecks.cpp"
 
+#if HISE_INCLUDE_BX_LICENSER
+#include "scripting/api/bx/bx_wrapper.cpp"
+#endif
+
 #include "scripting/api/ScriptingApiObjects.cpp"
 #include "scripting/api/ScriptModulationMatrix.cpp"
 #include "scripting/api/ScriptBroadcaster.cpp"

hi_scripting/scripting/api/ScriptingApi.cpp

@@ -1227,6 +1227,7 @@ struct ScriptingApi::Engine::Wrapper
 	API_METHOD_WRAPPER_1(Engine, setCurrentExpansion);
 	API_METHOD_WRAPPER_0(Engine, createGlobalScriptLookAndFeel);
 	API_METHOD_WRAPPER_1(Engine, createBackgroundTask);
+	API_METHOD_WRAPPER_0(Engine, createBXLicenser);
     API_METHOD_WRAPPER_1(Engine, createFixObjectFactory);
 	API_METHOD_WRAPPER_0(Engine, createErrorHandler);
 	API_METHOD_WRAPPER_1(Engine, createModulationMatrix);
@@ -1324,6 +1325,7 @@ parentMidiProcessor(dynamic_cast<ScriptBaseMidiProcessor*>(p))
 	ADD_API_METHOD_0(createUserPresetHandler);
 	ADD_API_METHOD_0(createMidiAutomationHandler);
 	ADD_API_METHOD_0(createMacroHandler);
+	ADD_API_METHOD_0(createBXLicenser);
   ADD_API_METHOD_1(loadNextUserPreset);
 	ADD_API_METHOD_1(loadPreviousUserPreset);
 	ADD_API_METHOD_1(isUserPresetReadOnly);
@@ -2423,6 +2425,17 @@ juce::var ScriptingApi::Engine::createBroadcaster(var defaultValues)
 	return var(new ScriptingObjects::ScriptBroadcaster(getScriptProcessor(), defaultValues));
 }
 
+var ScriptingApi::Engine::createBXLicenser ()
+{
+#if HISE_INCLUDE_BX_LICENSER
+	return var(new ScriptingObjects::ScriptBXLicenser(getScriptProcessor()));
+#else
+	reportScriptError ("BX Licenser is not enabled");
+    RETURN_IF_NO_THROW({});
+#endif
+
+}
+
 var ScriptingApi::Engine::getDspNetworkReference(String processorId, String id)
 {
 	Processor::Iterator<scriptnode::DspNetwork::Holder> iter(getScriptProcessor()->getMainController_()->getMainSynthChain());

hi_scripting/scripting/api/ScriptingApi.h

@@ -370,6 +370,9 @@ class ScriptingApi
 		/** Creates a broadcaster that can send messages to attached listeners. */
 		var createBroadcaster(var defaultValues);
 
+        /** Creates a BX Licenser object (requires the proprietary SDK). */
+        var createBXLicenser();
+
 		/** Creates a reference to the DSP network of another script processor. */
 		var getDspNetworkReference(String processorId, String id);
 
@@ -658,6 +661,7 @@ class ScriptingApi
 		/** Returns the width of the string for the given font properties. */
 		float getStringWidth(String text, String fontName, float fontSize, float fontSpacing);
 
+        /** Returns a number as string in hexadecimal format (0xFFFFFFFF). */
 		String intToHexString(int value);
 
 		/** Signals that the application should terminate. */