diff --git a/extras/Projucer/Builds/LinuxMakefile/Makefile b/extras/Projucer/Builds/LinuxMakefile/Makefile index fb1fe69bc8..102cd392cb 100644 --- a/extras/Projucer/Builds/LinuxMakefile/Makefile +++ b/extras/Projucer/Builds/LinuxMakefile/Makefile @@ -35,7 +35,7 @@ ifeq ($(CONFIG),Debug) TARGET_ARCH := endif - JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DDEBUG=1" "-D_DEBUG=1" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=6.0.0" "-DJUCE_APP_VERSION_HEX=0x60000" "-DJUCE_DISPLAY_SPLASH_SCREEN=0" "-DJUCE_REPORT_APP_USAGE=0" "-DJUCE_USE_DARK_SPLASH_SCREEN=1" "-DJUCE_PROJUCER_VERSION=0x60000" "-DJUCE_MODULE_AVAILABLE_juce_analytics=1" "-DJUCE_MODULE_AVAILABLE_juce_build_tools=1" "-DJUCE_MODULE_AVAILABLE_juce_core=1" "-DJUCE_MODULE_AVAILABLE_juce_cryptography=1" "-DJUCE_MODULE_AVAILABLE_juce_data_structures=1" "-DJUCE_MODULE_AVAILABLE_juce_events=1" "-DJUCE_MODULE_AVAILABLE_juce_graphics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_extra=1" "-DJUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1" "-DJUCE_LOG_ASSERTIONS=1" "-DJUCE_USE_CURL=1" "-DJUCE_LOAD_CURL_SYMBOLS_LAZILY=1" "-DJUCE_ALLOW_STATIC_NULL_VARIABLES=0" "-DJUCE_STRICT_REFCOUNTEDPOINTER=1" "-DJUCE_STANDALONE_APPLICATION=1" $(shell pkg-config --cflags freetype2 webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../modules -I../../../Build $(CPPFLAGS) + JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DDEBUG=1" "-D_DEBUG=1" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=6.0.0" "-DJUCE_APP_VERSION_HEX=0x60000" "-DJUCE_DISPLAY_SPLASH_SCREEN=0" "-DJUCE_REPORT_APP_USAGE=0" "-DJUCE_USE_DARK_SPLASH_SCREEN=1" "-DJUCE_PROJUCER_VERSION=0x60000" "-DJUCE_MODULE_AVAILABLE_juce_build_tools=1" "-DJUCE_MODULE_AVAILABLE_juce_core=1" "-DJUCE_MODULE_AVAILABLE_juce_cryptography=1" "-DJUCE_MODULE_AVAILABLE_juce_data_structures=1" "-DJUCE_MODULE_AVAILABLE_juce_events=1" "-DJUCE_MODULE_AVAILABLE_juce_graphics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_extra=1" "-DJUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1" "-DJUCE_LOG_ASSERTIONS=1" "-DJUCE_USE_CURL=1" "-DJUCE_LOAD_CURL_SYMBOLS_LAZILY=1" "-DJUCE_ALLOW_STATIC_NULL_VARIABLES=0" "-DJUCE_STRICT_REFCOUNTEDPOINTER=1" "-DJUCE_STANDALONE_APPLICATION=1" $(shell pkg-config --cflags freetype2 webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../Build -I../../../../modules $(CPPFLAGS) JUCE_CPPFLAGS_APP := "-DJucePlugin_Build_VST=0" "-DJucePlugin_Build_VST3=0" "-DJucePlugin_Build_AU=0" "-DJucePlugin_Build_AUv3=0" "-DJucePlugin_Build_RTAS=0" "-DJucePlugin_Build_AAX=0" "-DJucePlugin_Build_Standalone=0" "-DJucePlugin_Build_Unity=0" JUCE_TARGET_APP := Projucer @@ -56,7 +56,7 @@ ifeq ($(CONFIG),Release) TARGET_ARCH := endif - JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=6.0.0" "-DJUCE_APP_VERSION_HEX=0x60000" "-DJUCE_DISPLAY_SPLASH_SCREEN=0" "-DJUCE_REPORT_APP_USAGE=0" "-DJUCE_USE_DARK_SPLASH_SCREEN=1" "-DJUCE_PROJUCER_VERSION=0x60000" "-DJUCE_MODULE_AVAILABLE_juce_analytics=1" "-DJUCE_MODULE_AVAILABLE_juce_build_tools=1" "-DJUCE_MODULE_AVAILABLE_juce_core=1" "-DJUCE_MODULE_AVAILABLE_juce_cryptography=1" "-DJUCE_MODULE_AVAILABLE_juce_data_structures=1" "-DJUCE_MODULE_AVAILABLE_juce_events=1" "-DJUCE_MODULE_AVAILABLE_juce_graphics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_extra=1" "-DJUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1" "-DJUCE_LOG_ASSERTIONS=1" "-DJUCE_USE_CURL=1" "-DJUCE_LOAD_CURL_SYMBOLS_LAZILY=1" "-DJUCE_ALLOW_STATIC_NULL_VARIABLES=0" "-DJUCE_STRICT_REFCOUNTEDPOINTER=1" "-DJUCE_STANDALONE_APPLICATION=1" $(shell pkg-config --cflags freetype2 webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../modules -I../../../Build $(CPPFLAGS) + JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=6.0.0" "-DJUCE_APP_VERSION_HEX=0x60000" "-DJUCE_DISPLAY_SPLASH_SCREEN=0" "-DJUCE_REPORT_APP_USAGE=0" "-DJUCE_USE_DARK_SPLASH_SCREEN=1" "-DJUCE_PROJUCER_VERSION=0x60000" "-DJUCE_MODULE_AVAILABLE_juce_build_tools=1" "-DJUCE_MODULE_AVAILABLE_juce_core=1" "-DJUCE_MODULE_AVAILABLE_juce_cryptography=1" "-DJUCE_MODULE_AVAILABLE_juce_data_structures=1" "-DJUCE_MODULE_AVAILABLE_juce_events=1" "-DJUCE_MODULE_AVAILABLE_juce_graphics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_extra=1" "-DJUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1" "-DJUCE_LOG_ASSERTIONS=1" "-DJUCE_USE_CURL=1" "-DJUCE_LOAD_CURL_SYMBOLS_LAZILY=1" "-DJUCE_ALLOW_STATIC_NULL_VARIABLES=0" "-DJUCE_STRICT_REFCOUNTEDPOINTER=1" "-DJUCE_STANDALONE_APPLICATION=1" $(shell pkg-config --cflags freetype2 webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../Build -I../../../../modules $(CPPFLAGS) JUCE_CPPFLAGS_APP := "-DJucePlugin_Build_VST=0" "-DJucePlugin_Build_VST3=0" "-DJucePlugin_Build_AU=0" "-DJucePlugin_Build_AUv3=0" "-DJucePlugin_Build_RTAS=0" "-DJucePlugin_Build_AAX=0" "-DJucePlugin_Build_Standalone=0" "-DJucePlugin_Build_Unity=0" JUCE_TARGET_APP := Projucer @@ -72,7 +72,6 @@ OBJECTS_APP := \ $(JUCE_OBJDIR)/jucer_CommandLine_f35de107.o \ $(JUCE_OBJDIR)/jucer_Main_f8488f5b.o \ $(JUCE_OBJDIR)/jucer_MainWindow_1e163aeb.o \ - $(JUCE_OBJDIR)/jucer_ProjucerAnalytics_5740f336.o \ $(JUCE_OBJDIR)/jucer_DocumentEditorComponent_bc853a2f.o \ $(JUCE_OBJDIR)/jucer_OpenDocumentManager_ba866622.o \ $(JUCE_OBJDIR)/jucer_SourceCodeEditor_55965985.o \ @@ -122,7 +121,6 @@ OBJECTS_APP := \ $(JUCE_OBJDIR)/jucer_NewFileWizard_fac97f47.o \ $(JUCE_OBJDIR)/jucer_NewProjectWizardClasses_891f6fa2.o \ $(JUCE_OBJDIR)/BinaryData_ce4232d4.o \ - $(JUCE_OBJDIR)/include_juce_analytics_f8e9fa94.o \ $(JUCE_OBJDIR)/include_juce_build_tools_f5069398.o \ $(JUCE_OBJDIR)/include_juce_core_f26d17db.o \ $(JUCE_OBJDIR)/include_juce_cryptography_8cb807a8.o \ @@ -165,11 +163,6 @@ $(JUCE_OBJDIR)/jucer_MainWindow_1e163aeb.o: ../../Source/Application/jucer_MainW @echo "Compiling jucer_MainWindow.cpp" $(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<" -$(JUCE_OBJDIR)/jucer_ProjucerAnalytics_5740f336.o: ../../Source/Application/jucer_ProjucerAnalytics.cpp - -$(V_AT)mkdir -p $(JUCE_OBJDIR) - @echo "Compiling jucer_ProjucerAnalytics.cpp" - $(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<" - $(JUCE_OBJDIR)/jucer_DocumentEditorComponent_bc853a2f.o: ../../Source/CodeEditor/jucer_DocumentEditorComponent.cpp -$(V_AT)mkdir -p $(JUCE_OBJDIR) @echo "Compiling jucer_DocumentEditorComponent.cpp" @@ -415,11 +408,6 @@ $(JUCE_OBJDIR)/BinaryData_ce4232d4.o: ../../JuceLibraryCode/BinaryData.cpp @echo "Compiling BinaryData.cpp" $(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<" -$(JUCE_OBJDIR)/include_juce_analytics_f8e9fa94.o: ../../JuceLibraryCode/include_juce_analytics.cpp - -$(V_AT)mkdir -p $(JUCE_OBJDIR) - @echo "Compiling include_juce_analytics.cpp" - $(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<" - $(JUCE_OBJDIR)/include_juce_build_tools_f5069398.o: ../../JuceLibraryCode/include_juce_build_tools.cpp -$(V_AT)mkdir -p $(JUCE_OBJDIR) @echo "Compiling include_juce_build_tools.cpp" diff --git a/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj b/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj index e1c53e8372..223f1c9481 100644 --- a/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj +++ b/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj @@ -93,10 +93,6 @@ isa = PBXBuildFile; fileRef = 9069981E414A631B036CC9AC; }; - 98F9BB4612E82EE59689E15C = { - isa = PBXBuildFile; - fileRef = B6496F16ACE80CACC5721570; - }; 09C4EDDF7F8B6E75EA3CE3A9 = { isa = PBXBuildFile; fileRef = BC3B310D42C489E8B8D93327; @@ -293,10 +289,6 @@ isa = PBXBuildFile; fileRef = 472F9A90F685220D730EBF6C; }; - 202DC8CF15ACBE096CC327EA = { - isa = PBXBuildFile; - fileRef = 805A3A5FBA3B9E28363DD77B; - }; 4C743A3DA8682EEE89BDBD28 = { isa = PBXBuildFile; fileRef = E2687B099347B364D1919A9B; @@ -938,13 +930,6 @@ path = ../../JuceLibraryCode/BinaryData.cpp; sourceTree = "SOURCE_ROOT"; }; - 4818A05DE44ADA03D85E1083 = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = "jucer_ProjucerAnalytics.h"; - path = "../../Source/Application/jucer_ProjucerAnalytics.h"; - sourceTree = "SOURCE_ROOT"; - }; 486E8D02DAD2A0BF54A901C0 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; @@ -1134,13 +1119,6 @@ path = "../../JuceLibraryCode/include_juce_events.mm"; sourceTree = "SOURCE_ROOT"; }; - 58DE91CE6B05AFBACADDB251 = { - isa = PBXFileReference; - lastKnownFileType = file; - name = "juce_analytics"; - path = "../../../../modules/juce_analytics"; - sourceTree = "SOURCE_ROOT"; - }; 58F1FF52E887887A93E84FC2 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; @@ -1442,13 +1420,6 @@ path = "../../Source/ComponentEditor/Properties/jucer_ColourPropertyComponent.h"; sourceTree = "SOURCE_ROOT"; }; - 805A3A5FBA3B9E28363DD77B = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.cpp.cpp; - name = "include_juce_analytics.cpp"; - path = "../../JuceLibraryCode/include_juce_analytics.cpp"; - sourceTree = "SOURCE_ROOT"; - }; 807049CA2D5B6DE18EA078F2 = { isa = PBXFileReference; lastKnownFileType = file.svg; @@ -1967,13 +1938,6 @@ path = "../../Source/Utility/Helpers/jucer_FileHelpers.cpp"; sourceTree = "SOURCE_ROOT"; }; - B6496F16ACE80CACC5721570 = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.cpp.cpp; - name = "jucer_ProjucerAnalytics.cpp"; - path = "../../Source/Application/jucer_ProjucerAnalytics.cpp"; - sourceTree = "SOURCE_ROOT"; - }; B6F2905330EA5C560D527209 = { isa = PBXFileReference; lastKnownFileType = file; @@ -1988,13 +1952,6 @@ path = "../../Source/BinaryData/Icons/juce_icon.png"; sourceTree = "SOURCE_ROOT"; }; - B83DAADA1A871F21582FFB23 = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = "jucer_ApplicationUsageDataWindowComponent.h"; - path = "../../Source/Application/Windows/jucer_ApplicationUsageDataWindowComponent.h"; - sourceTree = "SOURCE_ROOT"; - }; B97D60D2531CFD0D8555BA5C = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; @@ -2643,7 +2600,6 @@ isa = PBXGroup; children = ( DE4A987B2D5529990A6AA9D4, - B83DAADA1A871F21582FFB23, D91E7F8FEF9290195D56782C, C736264708F3F68BA745BA29, EB2E723DC3DB150A8A644D08, @@ -2671,8 +2627,6 @@ 8C52A3DDA62A746AA7A68535, 9069981E414A631B036CC9AC, 2CD34A70B4032C0426F7AA10, - B6496F16ACE80CACC5721570, - 4818A05DE44ADA03D85E1083, ); name = Application; sourceTree = ""; @@ -3155,7 +3109,6 @@ 8A24D1B6925535A868974986 = { isa = PBXGroup; children = ( - 58DE91CE6B05AFBACADDB251, EE12741389A87D1BF04AE795, BA159A3B7D129771F5C15EA3, AA1C44E89D792DDC4867B2C8, @@ -3173,7 +3126,6 @@ children = ( 472F9A90F685220D730EBF6C, 4F687965FBE86EAFDB3ACFEC, - 805A3A5FBA3B9E28363DD77B, E2687B099347B364D1919A9B, DB9C8E35DF815B803CB4A9CF, D766BB9D8C32B5560F0493F3, @@ -3270,7 +3222,6 @@ "JUCE_REPORT_APP_USAGE=0", "JUCE_USE_DARK_SPLASH_SCREEN=1", "JUCE_PROJUCER_VERSION=0x60000", - "JUCE_MODULE_AVAILABLE_juce_analytics=1", "JUCE_MODULE_AVAILABLE_juce_build_tools=1", "JUCE_MODULE_AVAILABLE_juce_core=1", "JUCE_MODULE_AVAILABLE_juce_cryptography=1", @@ -3290,8 +3241,8 @@ GCC_VERSION = com.apple.compilers.llvm.clang.1_0; HEADER_SEARCH_PATHS = ( "../../JuceLibraryCode", - "../../../../modules", "../../../Build", + "../../../../modules", "$(inherited)", ); INFOPLIST_FILE = Info-App.plist; @@ -3335,7 +3286,6 @@ "JUCE_REPORT_APP_USAGE=0", "JUCE_USE_DARK_SPLASH_SCREEN=1", "JUCE_PROJUCER_VERSION=0x60000", - "JUCE_MODULE_AVAILABLE_juce_analytics=1", "JUCE_MODULE_AVAILABLE_juce_build_tools=1", "JUCE_MODULE_AVAILABLE_juce_core=1", "JUCE_MODULE_AVAILABLE_juce_cryptography=1", @@ -3355,8 +3305,8 @@ GCC_VERSION = com.apple.compilers.llvm.clang.1_0; HEADER_SEARCH_PATHS = ( "../../JuceLibraryCode", - "../../../../modules", "../../../Build", + "../../../../modules", "$(inherited)", ); INFOPLIST_FILE = Info-App.plist; @@ -3506,7 +3456,6 @@ 954A036F5DDB375DB23FFB3E, 95B44E6C74B1DED31DBE37EB, AA9D0B8E23F3D87A23DE9F8A, - 98F9BB4612E82EE59689E15C, 09C4EDDF7F8B6E75EA3CE3A9, 71713DE4716DCEDB45A206E2, 940CE4E081E9E685243C07AA, @@ -3556,7 +3505,6 @@ 518DD443B6F17A5AFD707263, B7EBA1A83575F48CD08140B9, 3C5267E06A897B0DC0F7EA50, - 202DC8CF15ACBE096CC327EA, 4C743A3DA8682EEE89BDBD28, 5DD883699B85E4C492CAD065, D5C9125F65493CA481F18E53, diff --git a/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj b/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj index 67c23e9f32..a23833762a 100644 --- a/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj +++ b/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj @@ -63,8 +63,8 @@ Disabled ProgramDatabase - ..\..\JuceLibraryCode;..\..\..\..\modules;..\..\..\Build;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=6.0.0;JUCE_APP_VERSION_HEX=0x60000;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;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_REPORT_APP_USAGE=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60000;JUCE_MODULE_AVAILABLE_juce_analytics=1;JUCE_MODULE_AVAILABLE_juce_build_tools=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_cryptography=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_MODULE_AVAILABLE_juce_gui_extra=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_LOG_ASSERTIONS=1;JUCE_USE_CURL=1;JUCE_LOAD_CURL_SYMBOLS_LAZILY=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions) + ..\..\JuceLibraryCode;..\..\..\Build;..\..\..\..\modules;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=6.0.0;JUCE_APP_VERSION_HEX=0x60000;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;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_REPORT_APP_USAGE=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60000;JUCE_MODULE_AVAILABLE_juce_build_tools=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_cryptography=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_MODULE_AVAILABLE_juce_gui_extra=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_LOG_ASSERTIONS=1;JUCE_USE_CURL=1;JUCE_LOAD_CURL_SYMBOLS_LAZILY=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions) MultiThreadedDebugDLL true @@ -105,8 +105,8 @@ Full - ..\..\JuceLibraryCode;..\..\..\..\modules;..\..\..\Build;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=6.0.0;JUCE_APP_VERSION_HEX=0x60000;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;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_REPORT_APP_USAGE=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60000;JUCE_MODULE_AVAILABLE_juce_analytics=1;JUCE_MODULE_AVAILABLE_juce_build_tools=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_cryptography=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_MODULE_AVAILABLE_juce_gui_extra=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_LOG_ASSERTIONS=1;JUCE_USE_CURL=1;JUCE_LOAD_CURL_SYMBOLS_LAZILY=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions) + ..\..\JuceLibraryCode;..\..\..\Build;..\..\..\..\modules;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=6.0.0;JUCE_APP_VERSION_HEX=0x60000;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;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_REPORT_APP_USAGE=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60000;JUCE_MODULE_AVAILABLE_juce_build_tools=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_cryptography=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_MODULE_AVAILABLE_juce_gui_extra=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_LOG_ASSERTIONS=1;JUCE_USE_CURL=1;JUCE_LOAD_CURL_SYMBOLS_LAZILY=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions) MultiThreaded true @@ -147,7 +147,6 @@ - true @@ -238,18 +237,6 @@ - - true - - - true - - - true - - - true - true @@ -1487,7 +1474,6 @@ true - @@ -1499,7 +1485,6 @@ - @@ -1514,7 +1499,6 @@ - @@ -1685,11 +1669,6 @@ - - - - - diff --git a/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj.filters b/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj.filters index 6ee2659256..84a82ecd2b 100644 --- a/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj.filters +++ b/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj.filters @@ -86,15 +86,6 @@ {7DBEF27C-2AFE-DA02-1DBF-E80FAAC99EA7} - - {E3CEC08A-FA14-D343-5BFF-3D6A4A4FD713} - - - {B3BC836A-3932-C1E4-CA3C-A1C0D83281BA} - - - {97F7F593-75F8-D6B2-DC96-C946C3976226} - {D9FAFF6D-6737-F775-056A-D0B29BE13820} @@ -337,9 +328,6 @@ Projucer\Application - - Projucer\Application - Projucer\BinaryData\Templates @@ -526,18 +514,6 @@ Projucer\Wizards - - JUCE Modules\juce_analytics\analytics - - - JUCE Modules\juce_analytics\analytics - - - JUCE Modules\juce_analytics\destinations - - - JUCE Modules\juce_analytics - JUCE Modules\juce_build_tools\utils @@ -1861,9 +1837,6 @@ JUCE Library Code - - JUCE Library Code - JUCE Library Code @@ -1893,9 +1866,6 @@ Projucer\Application\Windows - - Projucer\Application\Windows - Projucer\Application\Windows @@ -1938,9 +1908,6 @@ Projucer\Application - - Projucer\Application - Projucer\BinaryData\Templates @@ -2451,21 +2418,6 @@ Projucer\Wizards - - JUCE Modules\juce_analytics\analytics - - - JUCE Modules\juce_analytics\analytics - - - JUCE Modules\juce_analytics\destinations - - - JUCE Modules\juce_analytics\destinations - - - JUCE Modules\juce_analytics - JUCE Modules\juce_build_tools\utils diff --git a/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj b/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj index 7df051e218..ee279fceec 100644 --- a/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj +++ b/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj @@ -63,8 +63,8 @@ Disabled ProgramDatabase - ..\..\JuceLibraryCode;..\..\..\..\modules;..\..\..\Build;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=6.0.0;JUCE_APP_VERSION_HEX=0x60000;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;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_REPORT_APP_USAGE=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60000;JUCE_MODULE_AVAILABLE_juce_analytics=1;JUCE_MODULE_AVAILABLE_juce_build_tools=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_cryptography=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_MODULE_AVAILABLE_juce_gui_extra=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_LOG_ASSERTIONS=1;JUCE_USE_CURL=1;JUCE_LOAD_CURL_SYMBOLS_LAZILY=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions) + ..\..\JuceLibraryCode;..\..\..\Build;..\..\..\..\modules;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=6.0.0;JUCE_APP_VERSION_HEX=0x60000;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;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_REPORT_APP_USAGE=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60000;JUCE_MODULE_AVAILABLE_juce_build_tools=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_cryptography=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_MODULE_AVAILABLE_juce_gui_extra=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_LOG_ASSERTIONS=1;JUCE_USE_CURL=1;JUCE_LOAD_CURL_SYMBOLS_LAZILY=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions) MultiThreadedDebug true @@ -105,8 +105,8 @@ Full - ..\..\JuceLibraryCode;..\..\..\..\modules;..\..\..\Build;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=6.0.0;JUCE_APP_VERSION_HEX=0x60000;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;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_REPORT_APP_USAGE=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60000;JUCE_MODULE_AVAILABLE_juce_analytics=1;JUCE_MODULE_AVAILABLE_juce_build_tools=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_cryptography=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_MODULE_AVAILABLE_juce_gui_extra=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_LOG_ASSERTIONS=1;JUCE_USE_CURL=1;JUCE_LOAD_CURL_SYMBOLS_LAZILY=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions) + ..\..\JuceLibraryCode;..\..\..\Build;..\..\..\..\modules;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=6.0.0;JUCE_APP_VERSION_HEX=0x60000;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;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_REPORT_APP_USAGE=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60000;JUCE_MODULE_AVAILABLE_juce_build_tools=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_cryptography=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_MODULE_AVAILABLE_juce_gui_extra=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_LOG_ASSERTIONS=1;JUCE_USE_CURL=1;JUCE_LOAD_CURL_SYMBOLS_LAZILY=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions) MultiThreaded true @@ -147,7 +147,6 @@ - true @@ -238,18 +237,6 @@ - - true - - - true - - - true - - - true - true @@ -1487,7 +1474,6 @@ true - @@ -1499,7 +1485,6 @@ - @@ -1514,7 +1499,6 @@ - @@ -1685,11 +1669,6 @@ - - - - - diff --git a/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj.filters b/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj.filters index 2a9ff0f70a..57685b5047 100644 --- a/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj.filters +++ b/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj.filters @@ -86,15 +86,6 @@ {7DBEF27C-2AFE-DA02-1DBF-E80FAAC99EA7} - - {E3CEC08A-FA14-D343-5BFF-3D6A4A4FD713} - - - {B3BC836A-3932-C1E4-CA3C-A1C0D83281BA} - - - {97F7F593-75F8-D6B2-DC96-C946C3976226} - {D9FAFF6D-6737-F775-056A-D0B29BE13820} @@ -337,9 +328,6 @@ Projucer\Application - - Projucer\Application - Projucer\BinaryData\Templates @@ -526,18 +514,6 @@ Projucer\Wizards - - JUCE Modules\juce_analytics\analytics - - - JUCE Modules\juce_analytics\analytics - - - JUCE Modules\juce_analytics\destinations - - - JUCE Modules\juce_analytics - JUCE Modules\juce_build_tools\utils @@ -1861,9 +1837,6 @@ JUCE Library Code - - JUCE Library Code - JUCE Library Code @@ -1893,9 +1866,6 @@ Projucer\Application\Windows - - Projucer\Application\Windows - Projucer\Application\Windows @@ -1938,9 +1908,6 @@ Projucer\Application - - Projucer\Application - Projucer\BinaryData\Templates @@ -2451,21 +2418,6 @@ Projucer\Wizards - - JUCE Modules\juce_analytics\analytics - - - JUCE Modules\juce_analytics\analytics - - - JUCE Modules\juce_analytics\destinations - - - JUCE Modules\juce_analytics\destinations - - - JUCE Modules\juce_analytics - JUCE Modules\juce_build_tools\utils diff --git a/extras/Projucer/Builds/VisualStudio2019/Projucer_App.vcxproj b/extras/Projucer/Builds/VisualStudio2019/Projucer_App.vcxproj index 0d38ae1775..a6087c4abd 100644 --- a/extras/Projucer/Builds/VisualStudio2019/Projucer_App.vcxproj +++ b/extras/Projucer/Builds/VisualStudio2019/Projucer_App.vcxproj @@ -63,8 +63,8 @@ Disabled ProgramDatabase - ..\..\JuceLibraryCode;..\..\..\..\modules;..\..\..\Build;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=6.0.0;JUCE_APP_VERSION_HEX=0x60000;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;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_REPORT_APP_USAGE=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60000;JUCE_MODULE_AVAILABLE_juce_analytics=1;JUCE_MODULE_AVAILABLE_juce_build_tools=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_cryptography=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_MODULE_AVAILABLE_juce_gui_extra=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_LOG_ASSERTIONS=1;JUCE_USE_CURL=1;JUCE_LOAD_CURL_SYMBOLS_LAZILY=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions) + ..\..\JuceLibraryCode;..\..\..\Build;..\..\..\..\modules;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=6.0.0;JUCE_APP_VERSION_HEX=0x60000;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;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_REPORT_APP_USAGE=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60000;JUCE_MODULE_AVAILABLE_juce_build_tools=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_cryptography=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_MODULE_AVAILABLE_juce_gui_extra=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_LOG_ASSERTIONS=1;JUCE_USE_CURL=1;JUCE_LOAD_CURL_SYMBOLS_LAZILY=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions) MultiThreadedDebug true @@ -105,8 +105,8 @@ Full - ..\..\JuceLibraryCode;..\..\..\..\modules;..\..\..\Build;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=6.0.0;JUCE_APP_VERSION_HEX=0x60000;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;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_REPORT_APP_USAGE=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60000;JUCE_MODULE_AVAILABLE_juce_analytics=1;JUCE_MODULE_AVAILABLE_juce_build_tools=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_cryptography=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_MODULE_AVAILABLE_juce_gui_extra=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_LOG_ASSERTIONS=1;JUCE_USE_CURL=1;JUCE_LOAD_CURL_SYMBOLS_LAZILY=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions) + ..\..\JuceLibraryCode;..\..\..\Build;..\..\..\..\modules;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=6.0.0;JUCE_APP_VERSION_HEX=0x60000;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;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_REPORT_APP_USAGE=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60000;JUCE_MODULE_AVAILABLE_juce_build_tools=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_cryptography=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_MODULE_AVAILABLE_juce_gui_extra=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_LOG_ASSERTIONS=1;JUCE_USE_CURL=1;JUCE_LOAD_CURL_SYMBOLS_LAZILY=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions) MultiThreaded true @@ -147,7 +147,6 @@ - true @@ -238,18 +237,6 @@ - - true - - - true - - - true - - - true - true @@ -1487,7 +1474,6 @@ true - @@ -1499,7 +1485,6 @@ - @@ -1514,7 +1499,6 @@ - @@ -1685,11 +1669,6 @@ - - - - - diff --git a/extras/Projucer/Builds/VisualStudio2019/Projucer_App.vcxproj.filters b/extras/Projucer/Builds/VisualStudio2019/Projucer_App.vcxproj.filters index 031816aedf..bc36b3c8cf 100644 --- a/extras/Projucer/Builds/VisualStudio2019/Projucer_App.vcxproj.filters +++ b/extras/Projucer/Builds/VisualStudio2019/Projucer_App.vcxproj.filters @@ -86,15 +86,6 @@ {7DBEF27C-2AFE-DA02-1DBF-E80FAAC99EA7} - - {E3CEC08A-FA14-D343-5BFF-3D6A4A4FD713} - - - {B3BC836A-3932-C1E4-CA3C-A1C0D83281BA} - - - {97F7F593-75F8-D6B2-DC96-C946C3976226} - {D9FAFF6D-6737-F775-056A-D0B29BE13820} @@ -337,9 +328,6 @@ Projucer\Application - - Projucer\Application - Projucer\BinaryData\Templates @@ -526,18 +514,6 @@ Projucer\Wizards - - JUCE Modules\juce_analytics\analytics - - - JUCE Modules\juce_analytics\analytics - - - JUCE Modules\juce_analytics\destinations - - - JUCE Modules\juce_analytics - JUCE Modules\juce_build_tools\utils @@ -1861,9 +1837,6 @@ JUCE Library Code - - JUCE Library Code - JUCE Library Code @@ -1893,9 +1866,6 @@ Projucer\Application\Windows - - Projucer\Application\Windows - Projucer\Application\Windows @@ -1938,9 +1908,6 @@ Projucer\Application - - Projucer\Application - Projucer\BinaryData\Templates @@ -2451,21 +2418,6 @@ Projucer\Wizards - - JUCE Modules\juce_analytics\analytics - - - JUCE Modules\juce_analytics\analytics - - - JUCE Modules\juce_analytics\destinations - - - JUCE Modules\juce_analytics\destinations - - - JUCE Modules\juce_analytics - JUCE Modules\juce_build_tools\utils diff --git a/extras/Projucer/CMakeLists.txt b/extras/Projucer/CMakeLists.txt index 4246730d33..5abb85eddf 100644 --- a/extras/Projucer/CMakeLists.txt +++ b/extras/Projucer/CMakeLists.txt @@ -32,7 +32,6 @@ target_sources(Projucer PRIVATE Source/Application/jucer_CommandLine.cpp Source/Application/jucer_Main.cpp Source/Application/jucer_MainWindow.cpp - Source/Application/jucer_ProjucerAnalytics.cpp Source/CodeEditor/jucer_DocumentEditorComponent.cpp Source/CodeEditor/jucer_OpenDocumentManager.cpp Source/CodeEditor/jucer_SourceCodeEditor.cpp @@ -160,7 +159,6 @@ juce_add_binary_data(ProjucerData SOURCES target_link_libraries(Projucer PRIVATE ProjucerData - juce::juce_analytics juce::juce_build_tools juce::juce_cryptography juce::juce_gui_extra) diff --git a/extras/Projucer/JuceLibraryCode/JuceHeader.h b/extras/Projucer/JuceLibraryCode/JuceHeader.h index 9de5242f54..7ab94ef04d 100644 --- a/extras/Projucer/JuceLibraryCode/JuceHeader.h +++ b/extras/Projucer/JuceLibraryCode/JuceHeader.h @@ -13,7 +13,6 @@ #pragma once -#include #include #include #include diff --git a/extras/Projucer/JuceLibraryCode/include_juce_analytics.cpp b/extras/Projucer/JuceLibraryCode/include_juce_analytics.cpp deleted file mode 100644 index cda0f9390a..0000000000 --- a/extras/Projucer/JuceLibraryCode/include_juce_analytics.cpp +++ /dev/null @@ -1,8 +0,0 @@ -/* - - IMPORTANT! This file is auto-generated each time you save your - project - if you alter its contents, your changes may be overwritten! - -*/ - -#include diff --git a/extras/Projucer/Projucer.jucer b/extras/Projucer/Projucer.jucer index 1ef3ee02da..369ab2d1ab 100644 --- a/extras/Projucer/Projucer.jucer +++ b/extras/Projucer/Projucer.jucer @@ -24,7 +24,6 @@ - @@ -44,7 +43,6 @@ - @@ -63,7 +61,6 @@ - @@ -82,7 +79,6 @@ - @@ -99,7 +95,6 @@ - @@ -109,8 +104,6 @@ - - - - diff --git a/extras/Projucer/Source/Application/Windows/jucer_ApplicationUsageDataWindowComponent.h b/extras/Projucer/Source/Application/Windows/jucer_ApplicationUsageDataWindowComponent.h deleted file mode 100644 index 24a8ed1b54..0000000000 --- a/extras/Projucer/Source/Application/Windows/jucer_ApplicationUsageDataWindowComponent.h +++ /dev/null @@ -1,156 +0,0 @@ -/* - ============================================================================== - - This file is part of the JUCE 6 technical preview. - Copyright (c) 2017 - ROLI Ltd. - - You may use this code under the terms of the GPL v3 - (see www.gnu.org/licenses). - - For this technical preview, this file is not subject to commercial licensing. - - JUCE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY, AND ALL WARRANTIES, WHETHER - EXPRESSED OR IMPLIED, INCLUDING MERCHANTABILITY AND FITNESS FOR PURPOSE, ARE - DISCLAIMED. - - ============================================================================== -*/ - -#pragma once - - -//============================================================================== -class ApplicationUsageDataWindowComponent : public Component -{ -public: - ApplicationUsageDataWindowComponent (bool showCheckbox) - { - addAndMakeVisible (headerLabel); - headerLabel.setText ("Application Usage Analytics", dontSendNotification); - headerLabel.setFont (Font (20.0f, Font::FontStyleFlags::bold)); - headerLabel.setJustificationType (Justification::centred); - - auto textToShow = String ("We use analytics services to understand how developers use our software in order for JUCE to improve its software and services. "); - - if (! showCheckbox) - textToShow += String (" Analytics can be disabled with an Indie or Pro license. "); - - textToShow += String ("For more information, please read the JUCE EULA and Privacy policy:"); - - addAndMakeVisible (bodyLabel); - bodyLabel.setText (textToShow, dontSendNotification); - bodyLabel.setFont (Font (14.0f)); - bodyLabel.setJustificationType (Justification::centredLeft); - - addAndMakeVisible (juceEULALink); - juceEULALink.setButtonText ("JUCE EULA"); - juceEULALink.setFont (Font (14.0f), false); - juceEULALink.setURL (URL ("https://juce.com/juce-5-license")); - - addAndMakeVisible (privacyPolicyLink); - privacyPolicyLink.setButtonText ("Privacy Policy"); - privacyPolicyLink.setFont (Font (14.0f), false); - privacyPolicyLink.setURL (URL ("https://juce.com/juce-5-privacy-policy")); - - addAndMakeVisible (okButton); - - if (showCheckbox) - { - shareApplicationUsageDataToggle.reset (new ToggleButton()); - addAndMakeVisible (shareApplicationUsageDataToggle.get()); - - auto* controller = ProjucerApplication::getApp().licenseController.get(); - - if (controller != nullptr && controller->getState().applicationUsageDataState == LicenseState::ApplicationUsageData::disabled) - shareApplicationUsageDataToggle->setToggleState (false, dontSendNotification); - else - shareApplicationUsageDataToggle->setToggleState (true, dontSendNotification); - - addAndMakeVisible (shareApplicationUsageDataLabel); - shareApplicationUsageDataLabel.setFont (Font (14.0f)); - shareApplicationUsageDataLabel.setMinimumHorizontalScale (1.0f); - } - else - { - addAndMakeVisible (upgradeLicenseButton); - upgradeLicenseButton.setColour (TextButton::buttonColourId, findColour (secondaryButtonBackgroundColourId)); - - upgradeLicenseButton.onClick = [] - { - if (auto* controller = ProjucerApplication::getApp().licenseController.get()) - controller->chooseNewLicense(); - }; - } - } - - ~ApplicationUsageDataWindowComponent() override - { - if (auto* controller = ProjucerApplication::getApp().licenseController.get()) - { - auto newApplicationUsageDataState = LicenseState::ApplicationUsageData::enabled; - - if (shareApplicationUsageDataToggle != nullptr && ! shareApplicationUsageDataToggle->getToggleState()) - newApplicationUsageDataState = LicenseState::ApplicationUsageData::disabled; - - controller->setApplicationUsageDataState (newApplicationUsageDataState); - } - } - - void resized() override - { - auto bounds = getLocalBounds().reduced (20); - headerLabel.setBounds (bounds.removeFromTop (40)); - bodyLabel.setBounds (bounds.removeFromTop (75)); - - bounds.removeFromTop (10); - - auto linkBounds = bounds.removeFromTop (20); - juceEULALink.setBounds (linkBounds.removeFromLeft (linkBounds.getWidth() / 2).reduced (2)); - privacyPolicyLink.setBounds (linkBounds.reduced (2)); - - if (shareApplicationUsageDataToggle != nullptr) - { - bounds.removeFromTop (10); - - auto toggleBounds = bounds.removeFromTop (40); - shareApplicationUsageDataToggle->setBounds (toggleBounds.removeFromLeft (40).reduced (5)); - shareApplicationUsageDataLabel.setBounds (toggleBounds); - } - - bounds.removeFromTop (10); - - auto buttonW = 125; - auto buttonH = 40; - - if (upgradeLicenseButton.isShowing()) - { - auto left = bounds.removeFromLeft (bounds.getWidth() / 2); - - upgradeLicenseButton.setSize (buttonW, buttonH); - upgradeLicenseButton.setCentrePosition (left.getCentreX(), left.getCentreY()); - } - - okButton.setSize (buttonW, buttonH); - okButton.setCentrePosition (bounds.getCentreX(), bounds.getCentreY()); - okButton.onClick = [] { ProjucerApplication::getApp().dismissApplicationUsageDataAgreementPopup(); }; - } - - void paint (Graphics& g) override - { - g.fillAll (findColour (backgroundColourId)); - } - -private: - Label headerLabel, bodyLabel; - HyperlinkButton juceEULALink, privacyPolicyLink; - Label shareApplicationUsageDataLabel { {}, "Help JUCE to improve its software and services by sharing my application usage data" }; - std::unique_ptr shareApplicationUsageDataToggle; - TextButton okButton { "OK" }, upgradeLicenseButton { "Upgrade License" }; - - void lookAndFeelChanged() override - { - upgradeLicenseButton.setColour (TextButton::buttonColourId, findColour (secondaryButtonBackgroundColourId)); - } - - JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ApplicationUsageDataWindowComponent) -}; diff --git a/extras/Projucer/Source/Application/jucer_Application.cpp b/extras/Projucer/Source/Application/jucer_Application.cpp index ae69081f68..09699b7a72 100644 --- a/extras/Projucer/Source/Application/jucer_Application.cpp +++ b/extras/Projucer/Source/Application/jucer_Application.cpp @@ -171,12 +171,6 @@ void ProjucerApplication::handleAsyncUpdate() if (getGlobalProperties().getValue (Ids::dontQueryForUpdate, {}).isEmpty()) LatestVersionCheckerAndUpdater::getInstance()->checkForNewVersion (false); - if (licenseController != nullptr) - { - setAnalyticsEnabled (licenseController->getState().applicationUsageDataState == LicenseState::ApplicationUsageData::enabled); - Analytics::getInstance()->logEvent ("Startup", {}, ProjucerAnalyticsEvent::appEvent); - } - if (! isRunningCommandLine && settings->shouldAskUserToSetJUCEPath()) showSetJUCEPathAlert(); } @@ -191,9 +185,6 @@ void ProjucerApplication::initialiseWindows (const String& commandLine) mainWindowList.reopenLastProjects(); mainWindowList.createWindowIfNoneAreOpen(); - - if (licenseController->getState().applicationUsageDataState == LicenseState::ApplicationUsageData::notChosenYet) - showApplicationUsageDataAgreementPopup(); } static void deleteTemporaryFiles() @@ -249,8 +240,6 @@ void ProjucerApplication::shutdown() Logger::writeToLog ("Shutdown"); deleteLogger(); - - Analytics::getInstance()->logEvent ("Shutdown", {}, ProjucerAnalyticsEvent::appEvent); } struct AsyncQuitRetrier : private Timer @@ -430,7 +419,6 @@ void ProjucerApplication::createFileMenu (PopupMenu& menu) #if ! JUCE_MAC menu.addCommandItem (commandManager.get(), CommandIDs::showAboutWindow); - menu.addCommandItem (commandManager.get(), CommandIDs::showAppUsageWindow); menu.addCommandItem (commandManager.get(), CommandIDs::checkForNewVersion); menu.addCommandItem (commandManager.get(), CommandIDs::showGlobalPathsWindow); menu.addSeparator(); @@ -588,7 +576,6 @@ void ProjucerApplication::createHelpMenu (PopupMenu& menu) void ProjucerApplication::createExtraAppleMenuItems (PopupMenu& menu) { menu.addCommandItem (commandManager.get(), CommandIDs::showAboutWindow); - menu.addCommandItem (commandManager.get(), CommandIDs::showAppUsageWindow); menu.addCommandItem (commandManager.get(), CommandIDs::checkForNewVersion); menu.addSeparator(); menu.addCommandItem (commandManager.get(), CommandIDs::showGlobalPathsWindow); @@ -708,11 +695,6 @@ void ProjucerApplication::findAndLaunchExample (int selectedIndex) jassert (example != File()); findWindowAndOpenPIP (example); - - StringPairArray data; - data.set ("label", example.getFileNameWithoutExtension()); - - Analytics::getInstance()->logEvent ("Example Opened", data, ProjucerAnalyticsEvent::exampleEvent); } //============================================================================== @@ -879,18 +861,8 @@ void ProjucerApplication::launchDemoRunner() { auto demoRunnerFile = tryToFindDemoRunnerExecutable(); - if (demoRunnerFile != File()) - { - auto succeeded = demoRunnerFile.startAsProcess(); - - StringPairArray data; - data.set ("label", succeeded ? "Success" : "Failure"); - - Analytics::getInstance()->logEvent ("Launch DemoRunner", data, ProjucerAnalyticsEvent::exampleEvent); - - if (succeeded) - return; - } + if (demoRunnerFile != File() && demoRunnerFile.startAsProcess()) + return; demoRunnerFile = tryToFindDemoRunnerProject(); @@ -913,11 +885,6 @@ void ProjucerApplication::launchDemoRunner() { demoRunnerAlert.reset (nullptr); - StringPairArray data; - data.set ("label", retVal == 1 ? "Opened" : "Cancelled"); - - Analytics::getInstance()->logEvent ("Open DemoRunner Project", data, ProjucerAnalyticsEvent::exampleEvent); - if (retVal == 1) { #if JUCE_LINUX @@ -985,7 +952,6 @@ void ProjucerApplication::getAllCommands (Array & commands) CommandIDs::showUTF8Tool, CommandIDs::showSVGPathTool, CommandIDs::showAboutWindow, - CommandIDs::showAppUsageWindow, CommandIDs::checkForNewVersion, CommandIDs::showForum, CommandIDs::showAPIModules, @@ -1073,10 +1039,6 @@ void ProjucerApplication::getCommandInfo (CommandID commandID, ApplicationComman result.setInfo ("About Projucer", "Shows the Projucer's 'About' page.", CommandCategories::general, 0); break; - case CommandIDs::showAppUsageWindow: - result.setInfo ("Application Usage Data", "Shows the application usage data agreement window", CommandCategories::general, 0); - break; - case CommandIDs::checkForNewVersion: result.setInfo ("Check for New Version...", "Checks the web server for a new version of JUCE", CommandCategories::general, 0); break; @@ -1139,7 +1101,6 @@ bool ProjucerApplication::perform (const InvocationInfo& info) case CommandIDs::showSVGPathTool: showSVGPathDataToolWindow(); break; case CommandIDs::showGlobalPathsWindow: showPathsWindow (false); break; case CommandIDs::showAboutWindow: showAboutWindow(); break; - case CommandIDs::showAppUsageWindow: showApplicationUsageDataAgreementPopup(); break; case CommandIDs::checkForNewVersion: LatestVersionCheckerAndUpdater::getInstance()->checkForNewVersion (true); break; case CommandIDs::showForum: launchForumBrowser(); break; case CommandIDs::showAPIModules: launchModulesBrowser(); break; @@ -1268,22 +1229,6 @@ void ProjucerApplication::showAboutWindow() 500, 300, 500, 300, 500, 300); } -void ProjucerApplication::showApplicationUsageDataAgreementPopup() -{ - if (applicationUsageDataWindow != nullptr) - applicationUsageDataWindow->toFront (true); - else - new FloatingToolWindow ("Application Usage Analytics", {}, - new ApplicationUsageDataWindowComponent (isPaidOrGPL()), applicationUsageDataWindow, false, - 400, 300, 400, 300, 400, 300); -} - -void ProjucerApplication::dismissApplicationUsageDataAgreementPopup() -{ - if (applicationUsageDataWindow != nullptr) - applicationUsageDataWindow.reset(); -} - void ProjucerApplication::showPathsWindow (bool highlightJUCEPath) { if (pathsWindow != nullptr) @@ -1427,42 +1372,6 @@ void ProjucerApplication::initCommandManager() registerGUIEditorCommands(); } -void ProjucerApplication::setAnalyticsEnabled (bool enabled) -{ - resetAnalytics(); - - if (enabled) - setupAnalytics(); -} - -void ProjucerApplication::resetAnalytics() noexcept -{ - auto analyticsInstance = Analytics::getInstance(); - - analyticsInstance->setUserId ({}); - analyticsInstance->setUserProperties ({}); - analyticsInstance->getDestinations().clear(); -} - -void ProjucerApplication::setupAnalytics() -{ - Analytics::getInstance()->addDestination (new ProjucerAnalyticsDestination()); - - auto deviceString = SystemStats::getDeviceIdentifiers().joinIntoString (":"); - auto deviceIdentifier = String::toHexString (deviceString.hashCode64()); - - Analytics::getInstance()->setUserId (deviceIdentifier); - - StringPairArray userData; - userData.set ("cd1", getApplicationName()); - userData.set ("cd2", getApplicationVersion()); - userData.set ("cd3", SystemStats::getDeviceDescription()); - userData.set ("cd4", deviceString); - userData.set ("cd5", SystemStats::getOperatingSystemName()); - - Analytics::getInstance()->setUserProperties (userData); -} - void ProjucerApplication::showSetJUCEPathAlert() { auto& lf = Desktop::getInstance().getDefaultLookAndFeel(); @@ -1529,7 +1438,6 @@ void ProjucerApplication::setColourScheme (int index, bool saveSetting) if (utf8Window != nullptr) utf8Window->sendLookAndFeelChange(); if (svgPathWindow != nullptr) svgPathWindow->sendLookAndFeelChange(); if (aboutWindow != nullptr) aboutWindow->sendLookAndFeelChange(); - if (applicationUsageDataWindow != nullptr) applicationUsageDataWindow->sendLookAndFeelChange(); if (pathsWindow != nullptr) pathsWindow->sendLookAndFeelChange(); if (editorColourSchemeWindow != nullptr) editorColourSchemeWindow->sendLookAndFeelChange(); if (pipCreatorWindow != nullptr) pipCreatorWindow->sendLookAndFeelChange(); diff --git a/extras/Projucer/Source/Application/jucer_Application.h b/extras/Projucer/Source/Application/jucer_Application.h index 9a910daa37..5b1e481a9d 100644 --- a/extras/Projucer/Source/Application/jucer_Application.h +++ b/extras/Projucer/Source/Application/jucer_Application.h @@ -25,10 +25,6 @@ #include "../Utility/UI/jucer_ProjucerLookAndFeel.h" #include "../Licenses/jucer_LicenseController.h" -#if JUCE_MODULE_AVAILABLE_juce_analytics - #include "jucer_ProjucerAnalytics.h" -#endif - struct ChildProcessCache; //============================================================================== @@ -101,9 +97,6 @@ public: void showSVGPathDataToolWindow(); void showAboutWindow(); - void showApplicationUsageDataAgreementPopup(); - void dismissApplicationUsageDataAgreementPopup(); - void showPathsWindow (bool highlightJUCEPath = false); void showEditorColourSchemeWindow(); @@ -127,9 +120,6 @@ public: static bool isEditorColourSchemeADefaultScheme (const StringArray& schemes, int editorColourSchemeIndex); static int getEditorColourSchemeForGUIColourScheme (const StringArray& schemes, int guiColourSchemeIndex); - //============================================================================== - void setAnalyticsEnabled (bool); - //============================================================================== void rescanJUCEPathModules(); void rescanUserPathModules(); @@ -150,8 +140,8 @@ public: OpenDocumentManager openDocumentManager; std::unique_ptr commandManager; - std::unique_ptr utf8Window, svgPathWindow, aboutWindow, applicationUsageDataWindow, - pathsWindow, editorColourSchemeWindow, pipCreatorWindow; + std::unique_ptr utf8Window, svgPathWindow, aboutWindow, pathsWindow, + editorColourSchemeWindow, pipCreatorWindow; std::unique_ptr logger; @@ -175,9 +165,6 @@ private: File tryToFindDemoRunnerProject(); void launchDemoRunner(); - void resetAnalytics() noexcept; - void setupAnalytics(); - void showSetJUCEPathAlert(); void setColourScheme (int index, bool saveSetting); diff --git a/extras/Projucer/Source/Application/jucer_CommandIDs.h b/extras/Projucer/Source/Application/jucer_CommandIDs.h index fb289c71da..ba7b81da1d 100644 --- a/extras/Projucer/Source/Application/jucer_CommandIDs.h +++ b/extras/Projucer/Source/Application/jucer_CommandIDs.h @@ -47,8 +47,7 @@ namespace CommandIDs showTranslationTool = 0x300022, showSVGPathTool = 0x300023, showAboutWindow = 0x300024, - showAppUsageWindow = 0x300025, - checkForNewVersion = 0x300026, + checkForNewVersion = 0x300025, showProjectSettings = 0x300030, showProjectTab = 0x300031, diff --git a/extras/Projucer/Source/Application/jucer_Main.cpp b/extras/Projucer/Source/Application/jucer_Main.cpp index 7a18b18b88..7a5a215870 100644 --- a/extras/Projucer/Source/Application/jucer_Main.cpp +++ b/extras/Projucer/Source/Application/jucer_Main.cpp @@ -26,7 +26,6 @@ #include "Windows/jucer_UTF8WindowComponent.h" #include "Windows/jucer_SVGPathDataWindowComponent.h" #include "Windows/jucer_AboutWindowComponent.h" -#include "Windows/jucer_ApplicationUsageDataWindowComponent.h" #include "Windows/jucer_EditorColourSchemeWindowComponent.h" #include "Windows/jucer_GlobalPathsWindowComponent.h" #include "Windows/jucer_PIPCreatorWindowComponent.h" diff --git a/extras/Projucer/Source/Application/jucer_ProjucerAnalytics.cpp b/extras/Projucer/Source/Application/jucer_ProjucerAnalytics.cpp deleted file mode 100644 index 68985d152f..0000000000 --- a/extras/Projucer/Source/Application/jucer_ProjucerAnalytics.cpp +++ /dev/null @@ -1,246 +0,0 @@ -/* - ============================================================================== - - This file is part of the JUCE 6 technical preview. - Copyright (c) 2017 - ROLI Ltd. - - You may use this code under the terms of the GPL v3 - (see www.gnu.org/licenses). - - For this technical preview, this file is not subject to commercial licensing. - - JUCE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY, AND ALL WARRANTIES, WHETHER - EXPRESSED OR IMPLIED, INCLUDING MERCHANTABILITY AND FITNESS FOR PURPOSE, ARE - DISCLAIMED. - - ============================================================================== -*/ - -#include "jucer_ProjucerAnalytics.h" - -//============================================================================== -ProjucerAnalyticsDestination::ProjucerAnalyticsDestination() - : ThreadedAnalyticsDestination ("ProjucerAnalyticsThread") -{ - { - MemoryOutputStream mo; - if (Base64::convertFromBase64 (mo, BinaryData::nothingtoseehere_txt)) - apiKey = mo.toString(); - } - - auto dataDir = File::getSpecialLocation (File::userApplicationDataDirectory) - #if JUCE_MAC - .getChildFile ("Application Support") - #endif - .getChildFile ("Projucer") - .getChildFile ("Analytics"); - - if (! dataDir.exists()) - dataDir.createDirectory(); - - savedEventsFile = dataDir.getChildFile ("analytics_events.xml"); - - startAnalyticsThread (initialPeriodMs); -} - -ProjucerAnalyticsDestination::~ProjucerAnalyticsDestination() -{ - Thread::sleep (initialPeriodMs); - - stopAnalyticsThread (1000); -} - -//============================================================================== -static void setData (const AnalyticsDestination::AnalyticsEvent& event, StringPairArray& data) -{ - data.set ("ea", event.name); - - if (event.parameters.getAllKeys().contains ("label")) - data.set ("el", event.parameters.getValue ("label", {})); - - data.addArray (event.userProperties); -} - -bool ProjucerAnalyticsDestination::logBatchedEvents (const Array& events) -{ - String appData ("v=1&aip=1&tid=" + apiKey); - - StringArray postData; - - for (auto& event : events) - { - StringPairArray data; - - data.set ("t", "event"); - data.set ("cid", event.userID); - - switch (event.eventType) - { - case ProjucerAnalyticsEvent::appEvent: - { - data.set ("ec", "App"); - setData (event, data); - - break; - } - - case ProjucerAnalyticsEvent::projectEvent: - { - data.set ("ec", "Project"); - setData (event, data); - - break; - } - - case ProjucerAnalyticsEvent::userEvent: - { - data.set ("ec", "User"); - setData (event, data); - - break; - } - - case ProjucerAnalyticsEvent::exampleEvent: - { - data.set ("ec", "Example"); - setData (event, data); - - break; - } - - case ProjucerAnalyticsEvent::startPageEvent: - { - data.set ("ec", "Start Page"); - setData (event, data); - - break; - } - - default: - { - // unknown event type! - jassertfalse; - break; - } - } - - StringArray eventData; - - for (auto& key : data.getAllKeys()) - eventData.add (key + "=" + URL::addEscapeChars (data[key], true)); - - postData.add (appData + "&" + eventData.joinIntoString ("&")); - } - - auto url = URL ("https://www.google-analytics.com/batch") - .withPOSTData (postData.joinIntoString ("\n")); - - { - const ScopedLock lock (webStreamCreation); - - if (shouldExit) - return false; - - webStream.reset (new WebInputStream (url, true)); - } - - auto success = webStream->connect (nullptr); - - // Do an exponential backoff if we failed to connect. - if (success) - periodMs = initialPeriodMs; - else - periodMs *= 2; - - setBatchPeriod (periodMs); - - return success; -} - -void ProjucerAnalyticsDestination::stopLoggingEvents() -{ - const ScopedLock lock (webStreamCreation); - - shouldExit = true; - - if (webStream.get() != nullptr) - webStream->cancel(); -} - -//============================================================================== -void ProjucerAnalyticsDestination::saveUnloggedEvents (const std::deque& eventsToSave) -{ - auto xml = parseXMLIfTagMatches (savedEventsFile, "events"); - - if (xml == nullptr) - xml = std::make_unique ("events"); - - for (auto& event : eventsToSave) - { - auto* xmlEvent = new XmlElement ("google_analytics_event"); - xmlEvent->setAttribute ("name", event.name); - xmlEvent->setAttribute ("type", event.eventType); - xmlEvent->setAttribute ("timestamp", (int) event.timestamp); - xmlEvent->setAttribute ("user_id", event.userID); - - auto* parameters = new XmlElement ("parameters"); - - for (auto& key : event.parameters.getAllKeys()) - parameters->setAttribute (key, event.parameters[key]); - - xmlEvent->addChildElement (parameters); - - auto* userProperties = new XmlElement ("user_properties"); - - for (auto& key : event.userProperties.getAllKeys()) - userProperties->setAttribute (key, event.userProperties[key]); - - xmlEvent->addChildElement (userProperties); - - xml->addChildElement (xmlEvent); - } - - xml->writeTo (savedEventsFile, {}); -} - -void ProjucerAnalyticsDestination::restoreUnloggedEvents (std::deque& restoredEventQueue) -{ - auto xml = parseXMLIfTagMatches (savedEventsFile, "events"); - - if (xml == nullptr) - return; - - auto numEvents = xml->getNumChildElements(); - - for (int iEvent = 0; iEvent < numEvents; ++iEvent) - { - auto* xmlEvent = xml->getChildElement (iEvent); - - StringPairArray parameters; - auto* xmlParameters = xmlEvent->getChildByName ("parameters"); - auto numParameters = xmlParameters->getNumAttributes(); - - for (int iParam = 0; iParam < numParameters; ++iParam) - parameters.set (xmlParameters->getAttributeName (iParam), - xmlParameters->getAttributeValue (iParam)); - - StringPairArray userProperties; - auto* xmlUserProperties = xmlEvent->getChildByName ("user_properties"); - auto numUserProperties = xmlUserProperties->getNumAttributes(); - - for (int iProp = 0; iProp < numUserProperties; ++iProp) - userProperties.set (xmlUserProperties->getAttributeName (iProp), - xmlUserProperties->getAttributeValue (iProp)); - - restoredEventQueue.push_back ({ - xmlEvent->getStringAttribute ("name"), - xmlEvent->getIntAttribute ("type"), - static_cast (xmlEvent->getIntAttribute ("timestamp")), - parameters, - xmlEvent->getStringAttribute ("user_id"), - userProperties - }); - } - - savedEventsFile.deleteFile(); -} diff --git a/extras/Projucer/Source/Application/jucer_ProjucerAnalytics.h b/extras/Projucer/Source/Application/jucer_ProjucerAnalytics.h deleted file mode 100644 index 7e03c85f8e..0000000000 --- a/extras/Projucer/Source/Application/jucer_ProjucerAnalytics.h +++ /dev/null @@ -1,61 +0,0 @@ -/* - ============================================================================== - - This file is part of the JUCE 6 technical preview. - Copyright (c) 2017 - ROLI Ltd. - - You may use this code under the terms of the GPL v3 - (see www.gnu.org/licenses). - - For this technical preview, this file is not subject to commercial licensing. - - JUCE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY, AND ALL WARRANTIES, WHETHER - EXPRESSED OR IMPLIED, INCLUDING MERCHANTABILITY AND FITNESS FOR PURPOSE, ARE - DISCLAIMED. - - ============================================================================== -*/ - -#pragma once - -#include "jucer_Headers.h" - -//============================================================================== -enum ProjucerAnalyticsEvent -{ - appEvent, - projectEvent, - userEvent, - exampleEvent, - startPageEvent -}; - -//============================================================================== -class ProjucerAnalyticsDestination : public ThreadedAnalyticsDestination -{ -public: - ProjucerAnalyticsDestination(); - ~ProjucerAnalyticsDestination() override; - - //============================================================================== - bool logBatchedEvents (const Array&) override; - void stopLoggingEvents() override; - - int getMaximumBatchSize() override { return 20; } - -private: - void saveUnloggedEvents (const std::deque&) override; - void restoreUnloggedEvents (std::deque&) override; - - //============================================================================== - String apiKey; - - const int initialPeriodMs = 1000; - int periodMs = initialPeriodMs; - - CriticalSection webStreamCreation; - bool shouldExit = false; - std::unique_ptr webStream; - - File savedEventsFile; -}; diff --git a/extras/Projucer/Source/ComponentEditor/UI/jucer_JucerDocumentEditor.cpp b/extras/Projucer/Source/ComponentEditor/UI/jucer_JucerDocumentEditor.cpp index 6917ad0c3a..d1e29b211c 100644 --- a/extras/Projucer/Source/ComponentEditor/UI/jucer_JucerDocumentEditor.cpp +++ b/extras/Projucer/Source/ComponentEditor/UI/jucer_JucerDocumentEditor.cpp @@ -347,12 +347,6 @@ JucerDocumentEditor::JucerDocumentEditor (JucerDocument* const doc) refreshPropertiesPanel(); changeListenerCallback (nullptr); - - if (auto* project = document->getCppDocument().getProject()) - { - if (project->shouldSendGUIBuilderAnalyticsEvent()) - Analytics::getInstance()->logEvent ("GUI Builder", {}, ProjucerAnalyticsEvent::projectEvent); - } } } diff --git a/extras/Projucer/Source/Licenses/jucer_LicenseController.cpp b/extras/Projucer/Source/Licenses/jucer_LicenseController.cpp index ad9d2c3d3d..f755abaf54 100644 --- a/extras/Projucer/Source/Licenses/jucer_LicenseController.cpp +++ b/extras/Projucer/Source/Licenses/jucer_LicenseController.cpp @@ -67,24 +67,6 @@ static LicenseState::Type getLicenseTypeFromValue (const String& d) return LicenseState::Type::noLicenseChosenYet; } -static const char* getApplicationUsageDataStateValue (LicenseState::ApplicationUsageData type) -{ - switch (type) - { - case LicenseState::ApplicationUsageData::enabled: return "enabled"; - case LicenseState::ApplicationUsageData::disabled: return "disabled"; - case LicenseState::ApplicationUsageData::notChosenYet: - default: return "notChosen"; - } -} - -static LicenseState::ApplicationUsageData getApplicationUsageDataTypeFromValue (const String& value) -{ - if (value == getApplicationUsageDataStateValue (LicenseState::ApplicationUsageData::enabled)) return LicenseState::ApplicationUsageData::enabled; - if (value == getApplicationUsageDataStateValue (LicenseState::ApplicationUsageData::disabled)) return LicenseState::ApplicationUsageData::disabled; - return LicenseState::ApplicationUsageData::notChosenYet; -} - #if ! JUCER_ENABLE_GPL_MODE struct LicenseController::ModalCompletionCallback : ModalComponentManager::Callback { @@ -172,17 +154,6 @@ void LicenseController::chooseNewLicense() #endif } -void LicenseController::setApplicationUsageDataState (LicenseState::ApplicationUsageData newState) -{ - if (state.applicationUsageDataState != newState) - { - state.applicationUsageDataState = newState; - ProjucerApplication::getApp().setAnalyticsEnabled (newState == LicenseState::ApplicationUsageData::enabled); - - updateState (state); - } -} - //============================================================================== #if ! JUCER_ENABLE_GPL_MODE void LicenseController::closeWebview (int result) @@ -254,27 +225,16 @@ void LicenseController::updateState (const LicenseState& newState) { auto& props = ProjucerApplication::getApp().settings->getGlobalProperties(); - auto oldLicenseType = state.type; - state = newState; licenseStateToSettings (state, props); auto stateParam = getState(); listeners.call ([&] (StateChangedCallback& l) { l.licenseStateChanged (stateParam); }); - - if (oldLicenseType != state.type) - { - StringPairArray data; - data.set ("label", state.licenseTypeToString (state.type)); - - Analytics::getInstance()->logEvent ("License Type", data, ProjucerAnalyticsEvent::userEvent); - } } LicenseState LicenseController::licenseStateFromOldSettings (XmlElement* licenseXml) { LicenseState result; result.type = getLicenseTypeFromValue (licenseXml->getChildElementAllSubText ("type", {})); - result.applicationUsageDataState = getApplicationUsageDataTypeFromValue (licenseXml->getChildElementAllSubText ("applicationUsageData", {})); result.username = licenseXml->getChildElementAllSubText ("username", {}); result.email = licenseXml->getChildElementAllSubText ("email", {}); result.authToken = licenseXml->getChildElementAllSubText ("authToken", {}); @@ -302,7 +262,6 @@ LicenseState LicenseController::licenseStateFromSettings (PropertiesFile& props) LicenseState result; result.type = getLicenseTypeFromValue (licenseXml->getStringAttribute ("type", {})); - result.applicationUsageDataState = getApplicationUsageDataTypeFromValue (licenseXml->getStringAttribute ("applicationUsageData", {})); result.username = licenseXml->getStringAttribute ("username", {}); result.email = licenseXml->getStringAttribute ("email", {}); result.authToken = licenseXml->getStringAttribute ("authToken", {}); @@ -328,7 +287,6 @@ void LicenseController::licenseStateToSettings (const LicenseState& state, Prope if (auto* typeString = getLicenseStateValue (state.type)) licenseXml.setAttribute ("type", typeString); - licenseXml.setAttribute ("applicationUsageData", getApplicationUsageDataStateValue (state.applicationUsageDataState)); licenseXml.setAttribute ("username", state.username); licenseXml.setAttribute ("email", state.email); licenseXml.setAttribute ("authToken", state.authToken); diff --git a/extras/Projucer/Source/Licenses/jucer_LicenseController.h b/extras/Projucer/Source/Licenses/jucer_LicenseController.h index f2c82193f2..fc490879bd 100644 --- a/extras/Projucer/Source/Licenses/jucer_LicenseController.h +++ b/extras/Projucer/Source/Licenses/jucer_LicenseController.h @@ -36,23 +36,12 @@ struct LicenseState pro }; - enum class ApplicationUsageData - { - notChosenYet, - - enabled, - disabled - }; - Type type = Type::notLoggedIn; - ApplicationUsageData applicationUsageDataState = ApplicationUsageData::notChosenYet; - String username; - String email; - String authToken; + String username, email, authToken; static const char* licenseTypeToString (Type licenseType); - bool isPaidOrGPL() const noexcept { return (type == Type::GPL || type == Type::indie || type == Type::pro); } + bool isPaidOrGPL() const noexcept { return (type == Type::GPL || type == Type::indie || type == Type::pro); } Image avatar; }; @@ -78,7 +67,6 @@ public: LicenseState getState() const noexcept; void logout(); void chooseNewLicense(); - void setApplicationUsageDataState (LicenseState::ApplicationUsageData newState); //============================================================================== void addLicenseStatusChangedCallback (StateChangedCallback* callback) { listeners.add (callback); } diff --git a/extras/Projucer/Source/Project/UI/Sidebar/jucer_ModuleTreeItems.h b/extras/Projucer/Source/Project/UI/Sidebar/jucer_ModuleTreeItems.h index 679a07bfa4..a3cb222c66 100644 --- a/extras/Projucer/Source/Project/UI/Sidebar/jucer_ModuleTreeItems.h +++ b/extras/Projucer/Source/Project/UI/Sidebar/jucer_ModuleTreeItems.h @@ -399,7 +399,7 @@ private: auto mod = project.getModuleWithID (missingModule); if (mod.second != File()) - enabledModules.addModule (mod.second, copyLocally, useGlobalPath, false); + enabledModules.addModule (mod.second, copyLocally, useGlobalPath); else missing.add (missingModule); } @@ -541,8 +541,7 @@ public: for (int i = 0; i < modules.size(); ++i) project.getEnabledModules().addModule (modules.getReference(i).moduleFolder, project.getEnabledModules().areMostModulesCopiedLocally(), - project.getEnabledModules().areMostModulesUsingGlobalPath(), - true); + project.getEnabledModules().areMostModulesUsingGlobalPath()); } void addSubItems() override diff --git a/extras/Projucer/Source/Project/UI/jucer_HeaderComponent.cpp b/extras/Projucer/Source/Project/UI/jucer_HeaderComponent.cpp index 08319c4836..92495a244f 100644 --- a/extras/Projucer/Source/Project/UI/jucer_HeaderComponent.cpp +++ b/extras/Projucer/Source/Project/UI/jucer_HeaderComponent.cpp @@ -254,14 +254,6 @@ void HeaderComponent::timerCallback() } //============================================================================== -static void sendProjectButtonAnalyticsEvent (StringRef label) -{ - StringPairArray data; - data.set ("label", label); - - Analytics::getInstance()->logEvent ("Project Button", data, ProjucerAnalyticsEvent::projectEvent); -} - void HeaderComponent::initialiseButtons() noexcept { auto& icons = getIcons(); @@ -270,8 +262,6 @@ void HeaderComponent::initialiseButtons() noexcept addAndMakeVisible (projectSettingsButton.get()); projectSettingsButton->onClick = [this] { - sendProjectButtonAnalyticsEvent ("Project Settings"); - if (auto* pcc = findParentComponentOfClass()) pcc->showProjectSettings(); }; @@ -281,8 +271,6 @@ void HeaderComponent::initialiseButtons() noexcept saveAndOpenInIDEButton->isIDEButton = true; saveAndOpenInIDEButton->onClick = [this] { - sendProjectButtonAnalyticsEvent ("Save and Open in IDE (" + exporterBox.getText() + ")"); - if (auto* pcc = findParentComponentOfClass()) pcc->openInSelectedIDE (true); }; @@ -292,8 +280,6 @@ void HeaderComponent::initialiseButtons() noexcept userSettingsButton->isUserButton = true; userSettingsButton->onClick = [this] { - sendProjectButtonAnalyticsEvent ("User Settings"); - if (findParentComponentOfClass() != nullptr) showUserSettings(); }; @@ -302,8 +288,6 @@ void HeaderComponent::initialiseButtons() noexcept addAndMakeVisible (runAppButton.get()); runAppButton->onClick = [this] { - sendProjectButtonAnalyticsEvent ("Run Application"); - if (childProcess != nullptr) childProcess->launchApp(); }; diff --git a/extras/Projucer/Source/Project/UI/jucer_ProjectContentComponent.cpp b/extras/Projucer/Source/Project/UI/jucer_ProjectContentComponent.cpp index 7d35737d93..b1841c1cab 100644 --- a/extras/Projucer/Source/Project/UI/jucer_ProjectContentComponent.cpp +++ b/extras/Projucer/Source/Project/UI/jucer_ProjectContentComponent.cpp @@ -680,14 +680,7 @@ static void newExporterMenuCallback (int result, ProjectContentComponent* comp) auto exporterName= ProjectExporter::getExporterNames() [result - 1]; if (exporterName.isNotEmpty()) - { p->addNewExporter (exporterName); - - StringPairArray data; - data.set ("label", exporterName); - - Analytics::getInstance()->logEvent ("Exporter Added", data, ProjucerAnalyticsEvent::projectEvent); - } } } } @@ -1186,11 +1179,6 @@ void ProjectContentComponent::setBuildEnabled (bool isEnabled, bool displayError project->getCompileEngineSettings().setBuildEnabled (isEnabled); killChildProcess(); refreshTabsIfBuildStatusChanged(); - - StringPairArray data; - data.set ("label", isEnabled ? "Enabled" : "Disabled"); - - Analytics::getInstance()->logEvent ("Live-Build", data, ProjucerAnalyticsEvent::projectEvent); } } @@ -1214,11 +1202,6 @@ void ProjectContentComponent::handleCrash (const String& message) setBuildEnabled (false, true); showBuildTab(); } - - StringPairArray data; - data.set ("label", "Crash"); - - Analytics::getInstance()->logEvent ("Live-Build", data, ProjucerAnalyticsEvent::projectEvent); } bool ProjectContentComponent::isBuildEnabled() const diff --git a/extras/Projucer/Source/Project/jucer_Module.cpp b/extras/Projucer/Source/Project/jucer_Module.cpp index d9d398d1bb..b9f29eb636 100644 --- a/extras/Projucer/Source/Project/jucer_Module.cpp +++ b/extras/Projucer/Source/Project/jucer_Module.cpp @@ -708,7 +708,7 @@ bool EnabledModuleList::areMostModulesCopiedLocally() const return numYes > numNo; } -void EnabledModuleList::addModule (const File& moduleFolder, bool copyLocally, bool useGlobalPath, bool sendAnalyticsEvent) +void EnabledModuleList::addModule (const File& moduleFolder, bool copyLocally, bool useGlobalPath) { ModuleDescription info (moduleFolder); @@ -737,14 +737,6 @@ void EnabledModuleList::addModule (const File& moduleFolder, bool copyLocally, b if (! useGlobalPath) project.rescanExporterPathModules (false); - - if (sendAnalyticsEvent) - { - StringPairArray data; - data.set ("label", moduleID); - - Analytics::getInstance()->logEvent ("Module Added", data, ProjucerAnalyticsEvent::projectEvent); - } } } } @@ -755,7 +747,7 @@ void EnabledModuleList::addModuleInteractive (const String& moduleID) if (f != File()) { - addModule (f, areMostModulesCopiedLocally(), areMostModulesUsingGlobalPath(), true); + addModule (f, areMostModulesCopiedLocally(), areMostModulesUsingGlobalPath()); return; } @@ -794,8 +786,7 @@ void EnabledModuleList::addModuleOfferingToCopy (const File& f, bool isFromUserS } addModule (m.moduleFolder, areMostModulesCopiedLocally(), - isFromUserSpecifiedFolder ? false : areMostModulesUsingGlobalPath(), - true); + isFromUserSpecifiedFolder ? false : areMostModulesUsingGlobalPath()); } void EnabledModuleList::removeModule (String moduleID) // must be pass-by-value, and not a const ref! diff --git a/extras/Projucer/Source/Project/jucer_Module.h b/extras/Projucer/Source/Project/jucer_Module.h index 9d829f58c2..d841bceb12 100644 --- a/extras/Projucer/Source/Project/jucer_Module.h +++ b/extras/Projucer/Source/Project/jucer_Module.h @@ -179,7 +179,7 @@ public: bool areMostModulesCopiedLocally() const; //============================================================================== - void addModule (const File& moduleManifestFile, bool copyLocally, bool useGlobalPath, bool sendAnalyticsEvent); + void addModule (const File& moduleManifestFile, bool copyLocally, bool useGlobalPath); void addModuleInteractive (const String& moduleID); void addModuleFromUserSelectedFile(); void addModuleOfferingToCopy (const File&, bool isFromUserSpecifiedFolder); diff --git a/extras/Projucer/Source/Project/jucer_Project.cpp b/extras/Projucer/Source/Project/jucer_Project.cpp index 7fbb21181a..44b0f309c4 100644 --- a/extras/Projucer/Source/Project/jucer_Project.cpp +++ b/extras/Projucer/Source/Project/jucer_Project.cpp @@ -198,21 +198,11 @@ void Project::initialiseProjectValues() displaySplashScreenValue.referTo (projectRoot, Ids::displaySplashScreen, getUndoManager(), ! ProjucerApplication::getApp().isPaidOrGPL()); splashScreenColourValue.referTo (projectRoot, Ids::splashScreenColour, getUndoManager(), "Dark"); - reportAppUsageValue.referTo (projectRoot, Ids::reportAppUsage, getUndoManager()); + reportAppUsageValue.referTo (projectRoot, Ids::reportAppUsage, getUndoManager(), ! ProjucerApplication::getApp().isPaidOrGPL()); useAppConfigValue.referTo (projectRoot, Ids::useAppConfig, getUndoManager(), true); addUsingNamespaceToJuceHeader.referTo (projectRoot, Ids::addUsingNamespaceToJuceHeader, getUndoManager(), true); - if (ProjucerApplication::getApp().isPaidOrGPL()) - { - reportAppUsageValue.setDefault (ProjucerApplication::getApp().licenseController->getState().applicationUsageDataState - == LicenseState::ApplicationUsageData::enabled); - } - else - { - reportAppUsageValue.setDefault (true); - } - cppStandardValue.referTo (projectRoot, Ids::cppLanguageStandard, getUndoManager(), "14"); headerSearchPathsValue.referTo (projectRoot, Ids::headerPath, getUndoManager()); @@ -703,23 +693,11 @@ bool Project::saveProjectRootToFile() } //============================================================================== -static void sendProjectSettingAnalyticsEvent (StringRef label) -{ - StringPairArray data; - data.set ("label", label); - - Analytics::getInstance()->logEvent ("Project Setting", data, ProjucerAnalyticsEvent::projectEvent); -} - void Project::valueTreePropertyChanged (ValueTree& tree, const Identifier& property) { if (tree.getRoot() == tree) { - if (property == Ids::projectType) - { - sendProjectSettingAnalyticsEvent ("Project Type = " + projectTypeValue.get().toString()); - } - else if (property == Ids::name) + if (property == Ids::name) { updateTitleDependencies(); } @@ -731,10 +709,6 @@ void Project::valueTreePropertyChanged (ValueTree& tree, const Identifier& prope { parsedPreprocessorDefs = parsePreprocessorDefs (preprocessorDefsValue.get()); } - else if (property == Ids::cppLanguageStandard) - { - sendProjectSettingAnalyticsEvent ("C++ Standard = " + cppStandardValue.get().toString()); - } else if (property == Ids::pluginFormats) { if (shouldWriteLegacyPluginFormatSettings) @@ -2125,18 +2099,6 @@ String Project::getUniqueTargetFolderSuffixForExporter (const String& exporterNa return "_" + String (num); } -//============================================================================== -bool Project::shouldSendGUIBuilderAnalyticsEvent() noexcept -{ - if (! hasSentGUIBuilderAnalyticsEvent) - { - hasSentGUIBuilderAnalyticsEvent = true; - return true; - } - - return false; -} - //============================================================================== String Project::getFileTemplate (const String& templateName) { diff --git a/extras/Projucer/Source/Project/jucer_Project.h b/extras/Projucer/Source/Project/jucer_Project.h index 63b82b4144..ae63928ee5 100644 --- a/extras/Projucer/Source/Project/jucer_Project.h +++ b/extras/Projucer/Source/Project/jucer_Project.h @@ -410,9 +410,6 @@ public: void setOpenInIDEAfterSaving (bool open) noexcept { openInIDEAfterSaving = open; } bool shouldOpenInIDEAfterSaving() const noexcept { return openInIDEAfterSaving; } - //============================================================================== - bool shouldSendGUIBuilderAnalyticsEvent() noexcept; - //============================================================================== CompileEngineSettings& getCompileEngineSettings() { return *compileEngineSettings; } @@ -459,9 +456,6 @@ private: void moveTemporaryDirectory (const File&); bool saveProjectRootToFile(); - //============================================================================== - bool hasSentGUIBuilderAnalyticsEvent = false; - //============================================================================== friend class Item; bool isSaving = false; diff --git a/extras/Projucer/Source/Wizards/jucer_NewProjectWizard.h b/extras/Projucer/Source/Wizards/jucer_NewProjectWizard.h index 66221b7c54..771f9a6ca9 100644 --- a/extras/Projucer/Source/Wizards/jucer_NewProjectWizard.h +++ b/extras/Projucer/Source/Wizards/jucer_NewProjectWizard.h @@ -155,11 +155,6 @@ struct NewProjectWizard return nullptr; } - StringPairArray data; - data.set ("label", "Project Type = " + project->getProjectTypeString()); - - Analytics::getInstance()->logEvent ("Project Setting", data, ProjucerAnalyticsEvent::projectEvent); - return project.release(); } @@ -184,7 +179,7 @@ struct NewProjectWizard for (auto& mod : list.getAllModules()) if (defaultModules.contains (mod.first)) - project.getEnabledModules().addModule (mod.second, false, useGlobalPath, false); + project.getEnabledModules().addModule (mod.second, false, useGlobalPath); } void addExporters (Project& project, WizardComp& wizardComp) diff --git a/extras/Projucer/Source/Wizards/jucer_TemplateThumbnailsComponent.h b/extras/Projucer/Source/Wizards/jucer_TemplateThumbnailsComponent.h index 6028fa445d..dc2ea814bc 100644 --- a/extras/Projucer/Source/Wizards/jucer_TemplateThumbnailsComponent.h +++ b/extras/Projucer/Source/Wizards/jucer_TemplateThumbnailsComponent.h @@ -111,14 +111,6 @@ public: } private: - void clicked() override - { - StringPairArray data; - data.set ("label", getName()); - - Analytics::getInstance()->logEvent ("Start Page Button", data, ProjucerAnalyticsEvent::startPageEvent); - } - using DrawableButton::clicked; std::unique_ptr thumb, hoverBackground;