diff --git a/extras/Introjucer/Builds/Linux/Makefile b/extras/Introjucer/Builds/Linux/Makefile index 0ddc1f6033..b4ab5bc29b 100644 --- a/extras/Introjucer/Builds/Linux/Makefile +++ b/extras/Introjucer/Builds/Linux/Makefile @@ -43,30 +43,31 @@ ifeq ($(CONFIG),Release) endif OBJECTS := \ + $(OBJDIR)/jucer_CommandLine_f35de107.o \ $(OBJDIR)/jucer_DocumentEditorComponent_695dff1d.o \ $(OBJDIR)/jucer_FilePreviewComponent_55512f53.o \ $(OBJDIR)/jucer_JuceUpdater_cf7865c4.o \ $(OBJDIR)/jucer_Main_f8488f5b.o \ $(OBJDIR)/jucer_MainWindow_1e163aeb.o \ $(OBJDIR)/jucer_OpenDocumentManager_4c72d210.o \ - $(OBJDIR)/jucer_SourceCodeEditor_461f5487.o \ $(OBJDIR)/jucer_GroupInformationComponent_631ccf01.o \ $(OBJDIR)/jucer_Module_3f7666a5.o \ $(OBJDIR)/jucer_NewFileWizard_b8a19ef8.o \ $(OBJDIR)/jucer_NewProjectWizard_7a15bf5d.o \ $(OBJDIR)/jucer_Project_c131864a.o \ $(OBJDIR)/jucer_ProjectContentComponent_60de0eee.o \ - $(OBJDIR)/jucer_ProjectExporter_eed6e04b.o \ $(OBJDIR)/jucer_ProjectInformationComponent_4746e69b.o \ $(OBJDIR)/jucer_ProjectTreeViewBase_63c2bdbe.o \ $(OBJDIR)/jucer_ProjectType_1bc27a24.o \ - $(OBJDIR)/jucer_ResourceFile_7e7734e3.o \ $(OBJDIR)/jucer_TreeViewTypes_4a765287.o \ + $(OBJDIR)/jucer_ProjectExporter_eefe2e5b.o \ + $(OBJDIR)/jucer_ResourceFile_6af120d3.o \ $(OBJDIR)/jucer_CodeHelpers_c317179c.o \ $(OBJDIR)/jucer_FileHelpers_f98ed0ad.o \ $(OBJDIR)/jucer_JucerTreeViewBase_d043309d.o \ $(OBJDIR)/jucer_MiscUtilities_25b68c82.o \ $(OBJDIR)/jucer_StoredSettings_26078d2c.o \ + $(OBJDIR)/jucer_SourceCodeEditor_461f5487.o \ $(OBJDIR)/BinaryData_ce4232d4.o \ $(OBJDIR)/juce_audio_basics_399a455e.o \ $(OBJDIR)/juce_core_1ee54a40.o \ @@ -92,6 +93,11 @@ clean: -@rm -rf $(OBJDIR)/* -@rm -rf $(OBJDIR) +$(OBJDIR)/jucer_CommandLine_f35de107.o: ../../Source/Application/jucer_CommandLine.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling jucer_CommandLine.cpp" + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(OBJDIR)/jucer_DocumentEditorComponent_695dff1d.o: ../../Source/Application/jucer_DocumentEditorComponent.cpp -@mkdir -p $(OBJDIR) @echo "Compiling jucer_DocumentEditorComponent.cpp" @@ -122,11 +128,6 @@ $(OBJDIR)/jucer_OpenDocumentManager_4c72d210.o: ../../Source/Application/jucer_O @echo "Compiling jucer_OpenDocumentManager.cpp" @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/jucer_SourceCodeEditor_461f5487.o: ../../Source/Code\ Editor/jucer_SourceCodeEditor.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_SourceCodeEditor.cpp" - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/jucer_GroupInformationComponent_631ccf01.o: ../../Source/Project/jucer_GroupInformationComponent.cpp -@mkdir -p $(OBJDIR) @echo "Compiling jucer_GroupInformationComponent.cpp" @@ -157,11 +158,6 @@ $(OBJDIR)/jucer_ProjectContentComponent_60de0eee.o: ../../Source/Project/jucer_P @echo "Compiling jucer_ProjectContentComponent.cpp" @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/jucer_ProjectExporter_eed6e04b.o: ../../Source/Project/jucer_ProjectExporter.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_ProjectExporter.cpp" - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/jucer_ProjectInformationComponent_4746e69b.o: ../../Source/Project/jucer_ProjectInformationComponent.cpp -@mkdir -p $(OBJDIR) @echo "Compiling jucer_ProjectInformationComponent.cpp" @@ -177,14 +173,19 @@ $(OBJDIR)/jucer_ProjectType_1bc27a24.o: ../../Source/Project/jucer_ProjectType.c @echo "Compiling jucer_ProjectType.cpp" @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/jucer_ResourceFile_7e7734e3.o: ../../Source/Project/jucer_ResourceFile.cpp +$(OBJDIR)/jucer_TreeViewTypes_4a765287.o: ../../Source/Project/jucer_TreeViewTypes.cpp -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_ResourceFile.cpp" + @echo "Compiling jucer_TreeViewTypes.cpp" @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/jucer_TreeViewTypes_4a765287.o: ../../Source/Project/jucer_TreeViewTypes.cpp +$(OBJDIR)/jucer_ProjectExporter_eefe2e5b.o: ../../Source/Project\ Saving/jucer_ProjectExporter.cpp -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_TreeViewTypes.cpp" + @echo "Compiling jucer_ProjectExporter.cpp" + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/jucer_ResourceFile_6af120d3.o: ../../Source/Project\ Saving/jucer_ResourceFile.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling jucer_ResourceFile.cpp" @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" $(OBJDIR)/jucer_CodeHelpers_c317179c.o: ../../Source/Utility/jucer_CodeHelpers.cpp @@ -212,6 +213,11 @@ $(OBJDIR)/jucer_StoredSettings_26078d2c.o: ../../Source/Utility/jucer_StoredSett @echo "Compiling jucer_StoredSettings.cpp" @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" +$(OBJDIR)/jucer_SourceCodeEditor_461f5487.o: ../../Source/Code\ Editor/jucer_SourceCodeEditor.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling jucer_SourceCodeEditor.cpp" + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(OBJDIR)/BinaryData_ce4232d4.o: ../../JuceLibraryCode/BinaryData.cpp -@mkdir -p $(OBJDIR) @echo "Compiling BinaryData.cpp" diff --git a/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj b/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj index 3fcbc97aa3..b0fc10d7bf 100644 --- a/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj +++ b/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj @@ -12,30 +12,31 @@ DBE3CE9482B19CF1AE700805 = { isa = PBXBuildFile; fileRef = 49A40DA9469762789A5CD439; }; E63745F5956C698352A2ACA0 = { isa = PBXBuildFile; fileRef = 6FEB5562F7D3E7DD9CF1840D; }; AADBA9EB828F8C6A5E38593B = { isa = PBXBuildFile; fileRef = C3DCFE03DB784CAC7DBFE8FF; }; + 0CDE03071E84F2AAD8318402 = { isa = PBXBuildFile; fileRef = EA54183D0DB5D101CB66AAD7; }; D6D0659F3F3504012246F13D = { isa = PBXBuildFile; fileRef = EDF6A215415DAF25E643D882; }; 8BAE4D8EA7F247DA0A4D3A5C = { isa = PBXBuildFile; fileRef = 5B81C9AB06E185F1B4F5203C; }; 280FE650B3F02AD9E821EA37 = { isa = PBXBuildFile; fileRef = CBEB6CFBC0F5C383D76FB493; }; 9950893AA82F86F1EEE55BED = { isa = PBXBuildFile; fileRef = 5DC7C924E017E9342A8D1624; }; C2F198C7058FC1A88A600645 = { isa = PBXBuildFile; fileRef = B9285A5BCA7F4EDE2469615E; }; A7C05B907BBCB4288FBC6428 = { isa = PBXBuildFile; fileRef = 92B27CC64A2BF05224582134; }; - 6B48E4B12BB56C2254F293DF = { isa = PBXBuildFile; fileRef = CC5306B043DF96951C552172; }; 7A7859C8F2DFDC8D80FE0F0E = { isa = PBXBuildFile; fileRef = 1E8205AC7DA8CA45EF0D9347; }; 047186A4F90C1600CD492AD7 = { isa = PBXBuildFile; fileRef = 3B4B57BC334E3F76D0611656; }; 5BD727176204D71F2E0F42CC = { isa = PBXBuildFile; fileRef = 8C92BF5AE99FD48D70D1962B; }; DA3D1949878344EAE971E9CF = { isa = PBXBuildFile; fileRef = 5748956CB267A0B8D4D689CF; }; 086FC650CA4A39161F5DC34A = { isa = PBXBuildFile; fileRef = E48ECCD3A82FAB4856ED329F; }; 7192D99BD62492851CC34B39 = { isa = PBXBuildFile; fileRef = 46CEF6867AA8D05CDC7DCEB7; }; - 379C4FA4F9F4F856A245D8F1 = { isa = PBXBuildFile; fileRef = 8168064D386F388CD024A801; }; A70571C45ECEB18061181367 = { isa = PBXBuildFile; fileRef = 4C97A4710E9943810CE124CE; }; 7B65A9D3D6D5798649D90FA0 = { isa = PBXBuildFile; fileRef = 500ACCC6BD2AA22A7178D97B; }; 257C8841AC7634499B0B3D0A = { isa = PBXBuildFile; fileRef = 6AEECE48B22FBF1B23806125; }; - 85572197E35546BB69861758 = { isa = PBXBuildFile; fileRef = 3CF5F51A59A4F3AE5CB81416; }; 0E22757B983B4F600F1B7916 = { isa = PBXBuildFile; fileRef = FE0CF35A7F175AA3581BB276; }; + 6F768C7D68F2F1C923C03D5F = { isa = PBXBuildFile; fileRef = E3A6023C0C64800FC405391C; }; + F8D880A1EDBB0A0C484AB1BD = { isa = PBXBuildFile; fileRef = 32F8141780297FA95EB25651; }; 1501CEE9D0FD3C1185F6413B = { isa = PBXBuildFile; fileRef = FE5FD051827ADE403C022034; }; FF1962A57973208A90330B3C = { isa = PBXBuildFile; fileRef = C32F1EBA3917912865FB0E72; }; E2DFFAAE26E2D87AE3CE3136 = { isa = PBXBuildFile; fileRef = D0FDB47EFBCD982A890ED00C; }; 0F780301B225C3022C346CD4 = { isa = PBXBuildFile; fileRef = BAE51022E825B2663D711924; }; 59B173809CEC75EC0C74D1CF = { isa = PBXBuildFile; fileRef = F863E5B1070301A6FB05245A; }; + 6B48E4B12BB56C2254F293DF = { isa = PBXBuildFile; fileRef = CC5306B043DF96951C552172; }; 69CA42E334E4BA09E4FE8B65 = { isa = PBXBuildFile; fileRef = 13C2F4340AD40DDAB1521007; }; 51E9D6E4345FEEB1DC732A16 = { isa = PBXBuildFile; fileRef = 78598771B805D57F7909AE92; }; 17B1F33450F77F3DB3510372 = { isa = PBXBuildFile; fileRef = FA1DFB3D7FCAE3EF609C1BC7; }; @@ -55,6 +56,8 @@ C3DCFE03DB784CAC7DBFE8FF = { isa = PBXFileReference; lastKnownFileType = file.icns; name = Icon.icns; path = Icon.icns; sourceTree = "SOURCE_ROOT"; }; 2A720AE432514EB12E96C274 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_Application.h"; path = "../../Source/Application/jucer_Application.h"; sourceTree = "SOURCE_ROOT"; }; 5E33F08DB43EC01C410FE295 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_CommandIDs.h"; path = "../../Source/Application/jucer_CommandIDs.h"; sourceTree = "SOURCE_ROOT"; }; + EA54183D0DB5D101CB66AAD7 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_CommandLine.cpp"; path = "../../Source/Application/jucer_CommandLine.cpp"; sourceTree = "SOURCE_ROOT"; }; + 5345D02590F3010D45BBA79B = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_CommandLine.h"; path = "../../Source/Application/jucer_CommandLine.h"; sourceTree = "SOURCE_ROOT"; }; 2FA490B9388414C11112D52F = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_CommonHeaders.h"; path = "../../Source/Application/jucer_CommonHeaders.h"; sourceTree = "SOURCE_ROOT"; }; EDF6A215415DAF25E643D882 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_DocumentEditorComponent.cpp"; path = "../../Source/Application/jucer_DocumentEditorComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; C54902A7A4C8F3A7837F11E1 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_DocumentEditorComponent.h"; path = "../../Source/Application/jucer_DocumentEditorComponent.h"; sourceTree = "SOURCE_ROOT"; }; @@ -68,8 +71,6 @@ 2662BC530C8E93165D7DA0A3 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_MainWindow.h"; path = "../../Source/Application/jucer_MainWindow.h"; sourceTree = "SOURCE_ROOT"; }; 92B27CC64A2BF05224582134 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_OpenDocumentManager.cpp"; path = "../../Source/Application/jucer_OpenDocumentManager.cpp"; sourceTree = "SOURCE_ROOT"; }; 861DEC95E7FFD890CE579E4E = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_OpenDocumentManager.h"; path = "../../Source/Application/jucer_OpenDocumentManager.h"; sourceTree = "SOURCE_ROOT"; }; - CC5306B043DF96951C552172 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_SourceCodeEditor.cpp"; path = "../../Source/Code Editor/jucer_SourceCodeEditor.cpp"; sourceTree = "SOURCE_ROOT"; }; - D926E3DC96F8710F34819058 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_SourceCodeEditor.h"; path = "../../Source/Code Editor/jucer_SourceCodeEditor.h"; sourceTree = "SOURCE_ROOT"; }; 3F33202081D74BD1DC3A5B10 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_AudioPluginModule.h"; path = "../../Source/Project/jucer_AudioPluginModule.h"; sourceTree = "SOURCE_ROOT"; }; 1E8205AC7DA8CA45EF0D9347 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_GroupInformationComponent.cpp"; path = "../../Source/Project/jucer_GroupInformationComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; 78A6744D44B822BEE79D2282 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_GroupInformationComponent.h"; path = "../../Source/Project/jucer_GroupInformationComponent.h"; sourceTree = "SOURCE_ROOT"; }; @@ -83,23 +84,23 @@ 5A457A4A56918E76C28B8F2B = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_Project.h"; path = "../../Source/Project/jucer_Project.h"; sourceTree = "SOURCE_ROOT"; }; 46CEF6867AA8D05CDC7DCEB7 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_ProjectContentComponent.cpp"; path = "../../Source/Project/jucer_ProjectContentComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; 29CADBAB29468D0058E0CA18 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ProjectContentComponent.h"; path = "../../Source/Project/jucer_ProjectContentComponent.h"; sourceTree = "SOURCE_ROOT"; }; - 2A50CE54F8174CCC55B70CC6 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ProjectExport_Android.h"; path = "../../Source/Project/jucer_ProjectExport_Android.h"; sourceTree = "SOURCE_ROOT"; }; - F7111E72DE686D77DD3C85AF = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ProjectExport_Make.h"; path = "../../Source/Project/jucer_ProjectExport_Make.h"; sourceTree = "SOURCE_ROOT"; }; - 1F33450F77F3DB3510372F38 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ProjectExport_MSVC.h"; path = "../../Source/Project/jucer_ProjectExport_MSVC.h"; sourceTree = "SOURCE_ROOT"; }; - 911493641ED42943DBB99DA8 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ProjectExport_XCode.h"; path = "../../Source/Project/jucer_ProjectExport_XCode.h"; sourceTree = "SOURCE_ROOT"; }; - 8168064D386F388CD024A801 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_ProjectExporter.cpp"; path = "../../Source/Project/jucer_ProjectExporter.cpp"; sourceTree = "SOURCE_ROOT"; }; - 91A28F7BEE8F32F9E7B27E06 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ProjectExporter.h"; path = "../../Source/Project/jucer_ProjectExporter.h"; sourceTree = "SOURCE_ROOT"; }; 4C97A4710E9943810CE124CE = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_ProjectInformationComponent.cpp"; path = "../../Source/Project/jucer_ProjectInformationComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; BF7297B31F722CF874CC0877 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ProjectInformationComponent.h"; path = "../../Source/Project/jucer_ProjectInformationComponent.h"; sourceTree = "SOURCE_ROOT"; }; - 05E9E722F3F5B35B79902356 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ProjectSaver.h"; path = "../../Source/Project/jucer_ProjectSaver.h"; sourceTree = "SOURCE_ROOT"; }; 500ACCC6BD2AA22A7178D97B = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_ProjectTreeViewBase.cpp"; path = "../../Source/Project/jucer_ProjectTreeViewBase.cpp"; sourceTree = "SOURCE_ROOT"; }; DCAD908A36766FB84637D0BC = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ProjectTreeViewBase.h"; path = "../../Source/Project/jucer_ProjectTreeViewBase.h"; sourceTree = "SOURCE_ROOT"; }; 6AEECE48B22FBF1B23806125 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_ProjectType.cpp"; path = "../../Source/Project/jucer_ProjectType.cpp"; sourceTree = "SOURCE_ROOT"; }; 89065B35B9F43B4608D82D45 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ProjectType.h"; path = "../../Source/Project/jucer_ProjectType.h"; sourceTree = "SOURCE_ROOT"; }; - 3CF5F51A59A4F3AE5CB81416 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_ResourceFile.cpp"; path = "../../Source/Project/jucer_ResourceFile.cpp"; sourceTree = "SOURCE_ROOT"; }; - 8B806A97580F75B678B86C24 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ResourceFile.h"; path = "../../Source/Project/jucer_ResourceFile.h"; sourceTree = "SOURCE_ROOT"; }; FE0CF35A7F175AA3581BB276 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_TreeViewTypes.cpp"; path = "../../Source/Project/jucer_TreeViewTypes.cpp"; sourceTree = "SOURCE_ROOT"; }; 93A04EBCB1D2D37A453D641C = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_TreeViewTypes.h"; path = "../../Source/Project/jucer_TreeViewTypes.h"; sourceTree = "SOURCE_ROOT"; }; + DFA1F7234162EF60CC8CA998 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ProjectExport_Android.h"; path = "../../Source/Project Saving/jucer_ProjectExport_Android.h"; sourceTree = "SOURCE_ROOT"; }; + 56D81384A2D78B5F4CDDB298 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ProjectExport_Make.h"; path = "../../Source/Project Saving/jucer_ProjectExport_Make.h"; sourceTree = "SOURCE_ROOT"; }; + D1AA6F41A6B40D8A34E18DA0 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ProjectExport_MSVC.h"; path = "../../Source/Project Saving/jucer_ProjectExport_MSVC.h"; sourceTree = "SOURCE_ROOT"; }; + E613FC27359540493D4A3B33 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ProjectExport_XCode.h"; path = "../../Source/Project Saving/jucer_ProjectExport_XCode.h"; sourceTree = "SOURCE_ROOT"; }; + E3A6023C0C64800FC405391C = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_ProjectExporter.cpp"; path = "../../Source/Project Saving/jucer_ProjectExporter.cpp"; sourceTree = "SOURCE_ROOT"; }; + 8FD9EFA7F7C63BEE5C1BAB45 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ProjectExporter.h"; path = "../../Source/Project Saving/jucer_ProjectExporter.h"; sourceTree = "SOURCE_ROOT"; }; + 501E763FF3AE94EACCF66AA5 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ProjectSaver.h"; path = "../../Source/Project Saving/jucer_ProjectSaver.h"; sourceTree = "SOURCE_ROOT"; }; + 32F8141780297FA95EB25651 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_ResourceFile.cpp"; path = "../../Source/Project Saving/jucer_ResourceFile.cpp"; sourceTree = "SOURCE_ROOT"; }; + B918CC5CC2AF8B556A720C8B = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ResourceFile.h"; path = "../../Source/Project Saving/jucer_ResourceFile.h"; sourceTree = "SOURCE_ROOT"; }; FE5FD051827ADE403C022034 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_CodeHelpers.cpp"; path = "../../Source/Utility/jucer_CodeHelpers.cpp"; sourceTree = "SOURCE_ROOT"; }; 89926215B6DE2C9FD2A89F20 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_CodeHelpers.h"; path = "../../Source/Utility/jucer_CodeHelpers.h"; sourceTree = "SOURCE_ROOT"; }; 559540A1A0168181E7DE5263 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_Colours.h"; path = "../../Source/Utility/jucer_Colours.h"; sourceTree = "SOURCE_ROOT"; }; @@ -114,6 +115,8 @@ F863E5B1070301A6FB05245A = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_StoredSettings.cpp"; path = "../../Source/Utility/jucer_StoredSettings.cpp"; sourceTree = "SOURCE_ROOT"; }; 99744138C592E1E9A54D6BF8 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_StoredSettings.h"; path = "../../Source/Utility/jucer_StoredSettings.h"; sourceTree = "SOURCE_ROOT"; }; 2CE547DB3D7E07480283761E = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ValueSourceHelpers.h"; path = "../../Source/Utility/jucer_ValueSourceHelpers.h"; sourceTree = "SOURCE_ROOT"; }; + CC5306B043DF96951C552172 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_SourceCodeEditor.cpp"; path = "../../Source/Code Editor/jucer_SourceCodeEditor.cpp"; sourceTree = "SOURCE_ROOT"; }; + D926E3DC96F8710F34819058 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_SourceCodeEditor.h"; path = "../../Source/Code Editor/jucer_SourceCodeEditor.h"; sourceTree = "SOURCE_ROOT"; }; 766719C64B4D4515B6F89F0C = { isa = PBXFileReference; lastKnownFileType = text.txt; name = AudioPluginXCodeScript.txt; path = ../../Source/BinaryData/AudioPluginXCodeScript.txt; sourceTree = "SOURCE_ROOT"; }; 66B93C9B0D702B53C763432E = { isa = PBXFileReference; lastKnownFileType = image.png; name = "brushed_aluminium.png"; path = "../../Source/BinaryData/brushed_aluminium.png"; sourceTree = "SOURCE_ROOT"; }; 729D87E17E09F1E93AD3809C = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_AudioPluginEditorTemplate.cpp"; path = "../../Source/BinaryData/jucer_AudioPluginEditorTemplate.cpp"; sourceTree = "SOURCE_ROOT"; }; @@ -778,6 +781,8 @@ 65EDE353CFC4C222043C80AB = { isa = PBXGroup; children = ( 2A720AE432514EB12E96C274, 5E33F08DB43EC01C410FE295, + EA54183D0DB5D101CB66AAD7, + 5345D02590F3010D45BBA79B, 2FA490B9388414C11112D52F, EDF6A215415DAF25E643D882, C54902A7A4C8F3A7837F11E1, @@ -791,9 +796,6 @@ 2662BC530C8E93165D7DA0A3, 92B27CC64A2BF05224582134, 861DEC95E7FFD890CE579E4E ); name = Application; sourceTree = ""; }; - 644797EB12AAB2529ED6786E = { isa = PBXGroup; children = ( - CC5306B043DF96951C552172, - D926E3DC96F8710F34819058 ); name = "Code Editor"; sourceTree = ""; }; 38883F6AABCF4D47FC02B11F = { isa = PBXGroup; children = ( 3F33202081D74BD1DC3A5B10, 1E8205AC7DA8CA45EF0D9347, @@ -808,23 +810,24 @@ 5A457A4A56918E76C28B8F2B, 46CEF6867AA8D05CDC7DCEB7, 29CADBAB29468D0058E0CA18, - 2A50CE54F8174CCC55B70CC6, - F7111E72DE686D77DD3C85AF, - 1F33450F77F3DB3510372F38, - 911493641ED42943DBB99DA8, - 8168064D386F388CD024A801, - 91A28F7BEE8F32F9E7B27E06, 4C97A4710E9943810CE124CE, BF7297B31F722CF874CC0877, - 05E9E722F3F5B35B79902356, 500ACCC6BD2AA22A7178D97B, DCAD908A36766FB84637D0BC, 6AEECE48B22FBF1B23806125, 89065B35B9F43B4608D82D45, - 3CF5F51A59A4F3AE5CB81416, - 8B806A97580F75B678B86C24, FE0CF35A7F175AA3581BB276, 93A04EBCB1D2D37A453D641C ); name = Project; sourceTree = ""; }; + 6493D18BA1CA8E0A414F5C0F = { isa = PBXGroup; children = ( + DFA1F7234162EF60CC8CA998, + 56D81384A2D78B5F4CDDB298, + D1AA6F41A6B40D8A34E18DA0, + E613FC27359540493D4A3B33, + E3A6023C0C64800FC405391C, + 8FD9EFA7F7C63BEE5C1BAB45, + 501E763FF3AE94EACCF66AA5, + 32F8141780297FA95EB25651, + B918CC5CC2AF8B556A720C8B ); name = "Project Saving"; sourceTree = ""; }; EB77B261C62447EE22D136DD = { isa = PBXGroup; children = ( FE5FD051827ADE403C022034, 89926215B6DE2C9FD2A89F20, @@ -840,6 +843,9 @@ F863E5B1070301A6FB05245A, 99744138C592E1E9A54D6BF8, 2CE547DB3D7E07480283761E ); name = Utility; sourceTree = ""; }; + 644797EB12AAB2529ED6786E = { isa = PBXGroup; children = ( + CC5306B043DF96951C552172, + D926E3DC96F8710F34819058 ); name = "Code Editor"; sourceTree = ""; }; 2436CB32D02E7E3293665601 = { isa = PBXGroup; children = ( 766719C64B4D4515B6F89F0C, 66B93C9B0D702B53C763432E, @@ -856,9 +862,10 @@ 4EE75DE6D14102A4CACC5F75 ); name = BinaryData; sourceTree = ""; }; B01AA6CC1327A5DBCB35B7BF = { isa = PBXGroup; children = ( 65EDE353CFC4C222043C80AB, - 644797EB12AAB2529ED6786E, 38883F6AABCF4D47FC02B11F, + 6493D18BA1CA8E0A414F5C0F, EB77B261C62447EE22D136DD, + 644797EB12AAB2529ED6786E, 2436CB32D02E7E3293665601 ); name = "The Introjucer"; sourceTree = ""; }; 3891C9A3A7DCBA95B187EAB0 = { isa = PBXGroup; children = ( 7BA6EBE5F4357E6C224CE5E9, @@ -1743,30 +1750,31 @@ 87CCE4CB1FAB40B6F21DEACE = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( AADBA9EB828F8C6A5E38593B ); runOnlyForDeploymentPostprocessing = 0; }; 5362E03ADF975A126C1F2F7B = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 0CDE03071E84F2AAD8318402, D6D0659F3F3504012246F13D, 8BAE4D8EA7F247DA0A4D3A5C, 280FE650B3F02AD9E821EA37, 9950893AA82F86F1EEE55BED, C2F198C7058FC1A88A600645, A7C05B907BBCB4288FBC6428, - 6B48E4B12BB56C2254F293DF, 7A7859C8F2DFDC8D80FE0F0E, 047186A4F90C1600CD492AD7, 5BD727176204D71F2E0F42CC, DA3D1949878344EAE971E9CF, 086FC650CA4A39161F5DC34A, 7192D99BD62492851CC34B39, - 379C4FA4F9F4F856A245D8F1, A70571C45ECEB18061181367, 7B65A9D3D6D5798649D90FA0, 257C8841AC7634499B0B3D0A, - 85572197E35546BB69861758, 0E22757B983B4F600F1B7916, + 6F768C7D68F2F1C923C03D5F, + F8D880A1EDBB0A0C484AB1BD, 1501CEE9D0FD3C1185F6413B, FF1962A57973208A90330B3C, E2DFFAAE26E2D87AE3CE3136, 0F780301B225C3022C346CD4, 59B173809CEC75EC0C74D1CF, + 6B48E4B12BB56C2254F293DF, 69CA42E334E4BA09E4FE8B65, 51E9D6E4345FEEB1DC732A16, 17B1F33450F77F3DB3510372, diff --git a/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj b/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj index fc40fdc06a..f59dde5d96 100644 --- a/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj +++ b/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj @@ -131,6 +131,8 @@ + + @@ -145,10 +147,6 @@ - - - - @@ -163,24 +161,26 @@ - - - - - - - - - + + + + + + + + + + + @@ -197,6 +197,10 @@ + + + + + + @@ -145,10 +147,6 @@ - - - - @@ -163,24 +161,26 @@ - - - - - - - - - + + + + + + + + + + + @@ -197,6 +197,10 @@ + + + + + - - - + + + true @@ -1002,6 +1003,7 @@ + @@ -1009,7 +1011,6 @@ - @@ -1017,17 +1018,17 @@ - - - - - - - + + + + + + + @@ -1037,6 +1038,7 @@ + diff --git a/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj.filters b/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj.filters index 1df63973e3..b22d962157 100644 --- a/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj.filters +++ b/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj.filters @@ -8,15 +8,18 @@ {5AFE9176-C481-3BD6-B1A2-E344873B906D} - - {7D1B95A0-4E50-DD4E-402D-840BD601DCF8} - {B5B5C922-2604-DF83-A0B9-259C3DBA1AF6} + + {28F8ABD7-5DC8-5828-4095-01A26A4B2718} + {647FC3C6-4A06-A9FA-2C82-8F8744A223EE} + + {7D1B95A0-4E50-DD4E-402D-840BD601DCF8} + {8CE77BC0-4FCD-C9EA-C5D2-4E2ED36FDAAD} @@ -244,6 +247,9 @@ + + The Introjucer\Application + The Introjucer\Application @@ -262,9 +268,6 @@ The Introjucer\Application - - The Introjucer\Code Editor - The Introjucer\Project @@ -283,9 +286,6 @@ The Introjucer\Project - - The Introjucer\Project - The Introjucer\Project @@ -295,12 +295,15 @@ The Introjucer\Project - - The Introjucer\Project - The Introjucer\Project + + The Introjucer\Project Saving + + + The Introjucer\Project Saving + The Introjucer\Utility @@ -316,6 +319,9 @@ The Introjucer\Utility + + The Introjucer\Code Editor + The Introjucer\BinaryData @@ -1290,6 +1296,9 @@ The Introjucer\Application + + The Introjucer\Application + The Introjucer\Application @@ -1311,9 +1320,6 @@ The Introjucer\Application - - The Introjucer\Code Editor - The Introjucer\Project @@ -1335,38 +1341,38 @@ The Introjucer\Project - + The Introjucer\Project - + The Introjucer\Project - + The Introjucer\Project - + The Introjucer\Project - - The Introjucer\Project + + The Introjucer\Project Saving - - The Introjucer\Project + + The Introjucer\Project Saving - - The Introjucer\Project + + The Introjucer\Project Saving - - The Introjucer\Project + + The Introjucer\Project Saving - - The Introjucer\Project + + The Introjucer\Project Saving - - The Introjucer\Project + + The Introjucer\Project Saving - - The Introjucer\Project + + The Introjucer\Project Saving The Introjucer\Utility @@ -1395,6 +1401,9 @@ The Introjucer\Utility + + The Introjucer\Code Editor + The Introjucer\BinaryData diff --git a/extras/Introjucer/Introjucer.jucer b/extras/Introjucer/Introjucer.jucer index a7f76f439e..4b48ae24a0 100644 --- a/extras/Introjucer/Introjucer.jucer +++ b/extras/Introjucer/Introjucer.jucer @@ -35,6 +35,10 @@ file="Source/Application/jucer_Application.h"/> + + - - - - @@ -93,24 +91,10 @@ resource="0" file="Source/Project/jucer_ProjectContentComponent.cpp"/> - - - - - - - - - + + + + + + + + + + + @@ -158,6 +158,12 @@ + + + + diff --git a/extras/Introjucer/Source/Application/jucer_Application.h b/extras/Introjucer/Source/Application/jucer_Application.h index 3001cefa54..a941b0c0fb 100644 --- a/extras/Introjucer/Source/Application/jucer_Application.h +++ b/extras/Introjucer/Source/Application/jucer_Application.h @@ -30,6 +30,7 @@ #include "jucer_MainWindow.h" #include "jucer_JuceUpdater.h" #include "../Project/jucer_NewProjectWizard.h" +#include "jucer_CommandLine.h" //============================================================================== @@ -43,15 +44,16 @@ public: //============================================================================== void initialise (const String& commandLine) { - /* Running a command-line of the form "Jucer --resave foobar.jucer" will try to load that - jucer file and re-export all of its projects. - */ - if (commandLine.startsWithIgnoreCase ("-resave ") || commandLine.startsWithIgnoreCase ("--resave ")) + if (commandLine.isNotEmpty()) { - Project::resaveJucerFile (File::getCurrentWorkingDirectory() - .getChildFile (commandLine.fromFirstOccurrenceOf (" ", false, false).unquoted())); - quit(); - return; + const int appReturnCode = performCommandLine (commandLine); + + if (appReturnCode != commandLineNotPerformed) + { + setApplicationReturnValue (appReturnCode); + quit(); + return; + } } commandManager = new ApplicationCommandManager(); diff --git a/extras/Introjucer/Source/Application/jucer_CommandLine.cpp b/extras/Introjucer/Source/Application/jucer_CommandLine.cpp new file mode 100644 index 0000000000..9c73d42185 --- /dev/null +++ b/extras/Introjucer/Source/Application/jucer_CommandLine.cpp @@ -0,0 +1,98 @@ +/* + ============================================================================== + + This file is part of the JUCE library - "Jules' Utility Class Extensions" + Copyright 2004-11 by Raw Material Software Ltd. + + ------------------------------------------------------------------------------ + + JUCE can be redistributed and/or modified under the terms of the GNU General + Public License (Version 2), as published by the Free Software Foundation. + A copy of the license is included in the JUCE distribution, or can be found + online at www.gnu.org/licenses. + + JUCE is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + ------------------------------------------------------------------------------ + + To release a closed-source product which uses JUCE, commercial licenses are + available: visit www.rawmaterialsoftware.com/juce for more information. + + ============================================================================== +*/ + +#include "../Project/jucer_Project.h" +#include "jucer_CommandLine.h" + + +//============================================================================== +namespace +{ + File getFile (const String& filename) + { + return File::getCurrentWorkingDirectory().getChildFile (filename.unquoted()); + } + + //============================================================================== + /* Running a command-line of the form "introjucer --resave foobar.jucer" will try to load + that project and re-export all of its targets. + */ + int resaveProject (const File& file) + { + if (! file.exists()) + { + std::cout << "The file " << file.getFullPathName() << " doesn't exist!" << std::endl; + return 1; + } + + if (! file.hasFileExtension (Project::projectFileExtension)) + { + std::cout << file.getFullPathName() << " isn't a valid jucer project file!" << std::endl; + return 1; + } + + Project newDoc (file); + + if (! newDoc.loadFrom (file, true)) + { + std::cout << "Failed to load the project file: " << file.getFullPathName() << std::endl; + return 1; + } + + std::cout << "The Introjucer - Re-saving file: " << file.getFullPathName() << std::endl; + String error (newDoc.saveDocument (file)); + + if (error.isNotEmpty()) + { + std::cout << "Error when writing project: " << error << std::endl; + return 1; + } + + return 0; + } + + //============================================================================== + int buildModule (const StringArray& tokens) + { + + return 0; + } +} + +//============================================================================== +int performCommandLine (const String& commandLine) +{ + StringArray tokens; + tokens.addTokens (commandLine, true); + tokens.trim(); + + if (tokens[0] == "-resave" || tokens[0] == "--resave" || tokens[0] == "resave") + return resaveProject (getFile (tokens[1])); + + if (tokens[0] == "buildmodule") + return buildModule (tokens); + + return commandLineNotPerformed; +} diff --git a/extras/Introjucer/Source/Application/jucer_CommandLine.h b/extras/Introjucer/Source/Application/jucer_CommandLine.h new file mode 100644 index 0000000000..5d19abf745 --- /dev/null +++ b/extras/Introjucer/Source/Application/jucer_CommandLine.h @@ -0,0 +1,35 @@ +/* + ============================================================================== + + This file is part of the JUCE library - "Jules' Utility Class Extensions" + Copyright 2004-11 by Raw Material Software Ltd. + + ------------------------------------------------------------------------------ + + JUCE can be redistributed and/or modified under the terms of the GNU General + Public License (Version 2), as published by the Free Software Foundation. + A copy of the license is included in the JUCE distribution, or can be found + online at www.gnu.org/licenses. + + JUCE is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + ------------------------------------------------------------------------------ + + To release a closed-source product which uses JUCE, commercial licenses are + available: visit www.rawmaterialsoftware.com/juce for more information. + + ============================================================================== +*/ + +#ifndef __JUCER_COMMANDLINE_JUCEHEADER__ +#define __JUCER_COMMANDLINE_JUCEHEADER__ + + +int performCommandLine (const String& commandLine); + +enum { commandLineNotPerformed = 0x72346231 }; + + +#endif // __JUCER_COMMANDLINE_JUCEHEADER__ diff --git a/extras/Introjucer/Source/Project/jucer_ProjectExport_Android.h b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Android.h similarity index 100% rename from extras/Introjucer/Source/Project/jucer_ProjectExport_Android.h rename to extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Android.h diff --git a/extras/Introjucer/Source/Project/jucer_ProjectExport_MSVC.h b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_MSVC.h similarity index 100% rename from extras/Introjucer/Source/Project/jucer_ProjectExport_MSVC.h rename to extras/Introjucer/Source/Project Saving/jucer_ProjectExport_MSVC.h diff --git a/extras/Introjucer/Source/Project/jucer_ProjectExport_Make.h b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Make.h similarity index 100% rename from extras/Introjucer/Source/Project/jucer_ProjectExport_Make.h rename to extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Make.h diff --git a/extras/Introjucer/Source/Project/jucer_ProjectExport_XCode.h b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_XCode.h similarity index 100% rename from extras/Introjucer/Source/Project/jucer_ProjectExport_XCode.h rename to extras/Introjucer/Source/Project Saving/jucer_ProjectExport_XCode.h diff --git a/extras/Introjucer/Source/Project/jucer_ProjectExporter.cpp b/extras/Introjucer/Source/Project Saving/jucer_ProjectExporter.cpp similarity index 100% rename from extras/Introjucer/Source/Project/jucer_ProjectExporter.cpp rename to extras/Introjucer/Source/Project Saving/jucer_ProjectExporter.cpp diff --git a/extras/Introjucer/Source/Project/jucer_ProjectExporter.h b/extras/Introjucer/Source/Project Saving/jucer_ProjectExporter.h similarity index 96% rename from extras/Introjucer/Source/Project/jucer_ProjectExporter.h rename to extras/Introjucer/Source/Project Saving/jucer_ProjectExporter.h index fe1e5357b0..c6dd4b6870 100644 --- a/extras/Introjucer/Source/Project/jucer_ProjectExporter.h +++ b/extras/Introjucer/Source/Project Saving/jucer_ProjectExporter.h @@ -27,8 +27,8 @@ #define __JUCER_PROJECTEXPORTER_JUCEHEADER__ #include "../jucer_Headers.h" -#include "jucer_Project.h" -#include "jucer_ProjectType.h" +#include "../Project/jucer_Project.h" +#include "../Project/jucer_ProjectType.h" //============================================================================== diff --git a/extras/Introjucer/Source/Project/jucer_ProjectSaver.h b/extras/Introjucer/Source/Project Saving/jucer_ProjectSaver.h similarity index 96% rename from extras/Introjucer/Source/Project/jucer_ProjectSaver.h rename to extras/Introjucer/Source/Project Saving/jucer_ProjectSaver.h index 804671eaa0..f9df21b0e3 100644 --- a/extras/Introjucer/Source/Project/jucer_ProjectSaver.h +++ b/extras/Introjucer/Source/Project Saving/jucer_ProjectSaver.h @@ -27,7 +27,8 @@ #define __JUCER_PROJECTSAVER_JUCEHEADER__ #include "jucer_ResourceFile.h" -#include "jucer_Module.h" +#include "../Project/jucer_Module.h" +#include "jucer_ProjectExporter.h" //============================================================================== diff --git a/extras/Introjucer/Source/Project/jucer_ResourceFile.cpp b/extras/Introjucer/Source/Project Saving/jucer_ResourceFile.cpp similarity index 96% rename from extras/Introjucer/Source/Project/jucer_ResourceFile.cpp rename to extras/Introjucer/Source/Project Saving/jucer_ResourceFile.cpp index 62463a5b5c..631f4c23f3 100644 --- a/extras/Introjucer/Source/Project/jucer_ResourceFile.cpp +++ b/extras/Introjucer/Source/Project Saving/jucer_ResourceFile.cpp @@ -24,7 +24,7 @@ */ #include "jucer_ResourceFile.h" -#include "jucer_ProjectTreeViewBase.h" +#include "../Project/jucer_ProjectTreeViewBase.h" #include "../Application/jucer_OpenDocumentManager.h" static const char* resourceFileIdentifierString = "JUCER_BINARY_RESOURCE"; diff --git a/extras/Introjucer/Source/Project/jucer_ResourceFile.h b/extras/Introjucer/Source/Project Saving/jucer_ResourceFile.h similarity index 95% rename from extras/Introjucer/Source/Project/jucer_ResourceFile.h rename to extras/Introjucer/Source/Project Saving/jucer_ResourceFile.h index ea7d097ffd..1274adf7f3 100644 --- a/extras/Introjucer/Source/Project/jucer_ResourceFile.h +++ b/extras/Introjucer/Source/Project Saving/jucer_ResourceFile.h @@ -27,7 +27,7 @@ #define __JUCER_RESOURCEFILE_JUCEHEADER__ #include "../jucer_Headers.h" -#include "jucer_Project.h" +#include "../Project/jucer_Project.h" //============================================================================== diff --git a/extras/Introjucer/Source/Project/jucer_Module.cpp b/extras/Introjucer/Source/Project/jucer_Module.cpp index c1e33fb1db..0ae8365f5a 100644 --- a/extras/Introjucer/Source/Project/jucer_Module.cpp +++ b/extras/Introjucer/Source/Project/jucer_Module.cpp @@ -25,8 +25,8 @@ #include "jucer_Module.h" #include "jucer_ProjectType.h" -#include "jucer_ProjectExporter.h" -#include "jucer_ProjectSaver.h" +#include "../Project Saving/jucer_ProjectExporter.h" +#include "../Project Saving/jucer_ProjectSaver.h" #include "jucer_AudioPluginModule.h" diff --git a/extras/Introjucer/Source/Project/jucer_Project.cpp b/extras/Introjucer/Source/Project/jucer_Project.cpp index 0599d1f33f..1577937b6c 100644 --- a/extras/Introjucer/Source/Project/jucer_Project.cpp +++ b/extras/Introjucer/Source/Project/jucer_Project.cpp @@ -25,9 +25,8 @@ #include "jucer_Project.h" #include "jucer_ProjectType.h" -#include "jucer_ProjectExporter.h" -#include "jucer_ResourceFile.h" -#include "jucer_ProjectSaver.h" +#include "../Project Saving/jucer_ProjectExporter.h" +#include "../Project Saving/jucer_ProjectSaver.h" #include "../Application/jucer_OpenDocumentManager.h" @@ -1136,36 +1135,3 @@ String Project::getFileTemplate (const String& templateName) return String::fromUTF8 (data, dataSize); } - -//============================================================================== -void Project::resaveJucerFile (const File& file) -{ - if (! file.exists()) - { - std::cout << "The file " << file.getFullPathName() << " doesn't exist!" << std::endl; - return; - } - - if (! file.hasFileExtension (Project::projectFileExtension)) - { - std::cout << file.getFullPathName() << " isn't a valid jucer project file!" << std::endl; - return; - } - - Project newDoc (file); - - if (! newDoc.loadFrom (file, true)) - { - std::cout << "Failed to load the project file: " << file.getFullPathName() << std::endl; - return; - } - - std::cout << "The Introjucer - Re-saving file: " << file.getFullPathName() << std::endl; - String error (newDoc.saveDocument (file)); - - if (error.isNotEmpty()) - { - std::cout << "Error when writing project: " << error << std::endl; - return; - } -} diff --git a/extras/Introjucer/Source/Project/jucer_Project.h b/extras/Introjucer/Source/Project/jucer_Project.h index d26b76b99c..78a03c278a 100644 --- a/extras/Introjucer/Source/Project/jucer_Project.h +++ b/extras/Introjucer/Source/Project/jucer_Project.h @@ -294,8 +294,6 @@ public: //============================================================================== static const char* projectFileExtension; - static void resaveJucerFile (const File& file); - private: friend class Item; ValueTree projectRoot; diff --git a/extras/Introjucer/Source/Project/jucer_ProjectContentComponent.cpp b/extras/Introjucer/Source/Project/jucer_ProjectContentComponent.cpp index 2c83ea207a..0e37929874 100644 --- a/extras/Introjucer/Source/Project/jucer_ProjectContentComponent.cpp +++ b/extras/Introjucer/Source/Project/jucer_ProjectContentComponent.cpp @@ -28,7 +28,7 @@ #include "../Code Editor/jucer_SourceCodeEditor.h" #include "jucer_ProjectInformationComponent.h" #include "jucer_TreeViewTypes.h" -#include "jucer_ProjectExporter.h" +#include "../Project Saving/jucer_ProjectExporter.h" //============================================================================== diff --git a/extras/Introjucer/Source/Project/jucer_ProjectInformationComponent.cpp b/extras/Introjucer/Source/Project/jucer_ProjectInformationComponent.cpp index b6f09e6870..131624a298 100644 --- a/extras/Introjucer/Source/Project/jucer_ProjectInformationComponent.cpp +++ b/extras/Introjucer/Source/Project/jucer_ProjectInformationComponent.cpp @@ -17,7 +17,7 @@ */ //[CppHeaders] You can add your own extra header files here... -#include "jucer_ProjectExporter.h" +#include "../Project Saving/jucer_ProjectExporter.h" #include "jucer_Module.h" //[/CppHeaders] diff --git a/extras/Introjucer/Source/Project/jucer_ProjectInformationComponent.h b/extras/Introjucer/Source/Project/jucer_ProjectInformationComponent.h index 93350a6cf9..823e370b79 100644 --- a/extras/Introjucer/Source/Project/jucer_ProjectInformationComponent.h +++ b/extras/Introjucer/Source/Project/jucer_ProjectInformationComponent.h @@ -20,7 +20,7 @@ #define __JUCER_PROJECTINFORMATIONCOMPONENT_H_2F89B0AC__ //[Headers] -- You can add your own extra header files here -- -#include "jucer_ProjectExporter.h" +#include "jucer_Project.h" //[/Headers] diff --git a/extras/Introjucer/Source/Project/jucer_ProjectTreeViewBase.h b/extras/Introjucer/Source/Project/jucer_ProjectTreeViewBase.h index ff8c0267eb..93e95d1cec 100644 --- a/extras/Introjucer/Source/Project/jucer_ProjectTreeViewBase.h +++ b/extras/Introjucer/Source/Project/jucer_ProjectTreeViewBase.h @@ -29,7 +29,7 @@ #include "../jucer_Headers.h" #include "../Utility/jucer_JucerTreeViewBase.h" #include "jucer_Project.h" -#include "jucer_ResourceFile.h" +#include "../Project Saving/jucer_ResourceFile.h" #include "jucer_ProjectContentComponent.h" diff --git a/extras/Introjucer/Source/Project/jucer_ProjectType.cpp b/extras/Introjucer/Source/Project/jucer_ProjectType.cpp index fa1b68f4df..03b4f3baf5 100644 --- a/extras/Introjucer/Source/Project/jucer_ProjectType.cpp +++ b/extras/Introjucer/Source/Project/jucer_ProjectType.cpp @@ -24,8 +24,8 @@ */ #include "jucer_ProjectType.h" -#include "jucer_ProjectExporter.h" -#include "jucer_ProjectSaver.h" +#include "../Project Saving/jucer_ProjectExporter.h" +#include "../Project Saving/jucer_ProjectSaver.h" #include "jucer_AudioPluginModule.h" diff --git a/extras/binarybuilder/JuceLibraryCode/modules/juce_core/juce_core.h b/extras/binarybuilder/JuceLibraryCode/modules/juce_core/juce_core.h new file mode 100644 index 0000000000..ee07e01a50 --- /dev/null +++ b/extras/binarybuilder/JuceLibraryCode/modules/juce_core/juce_core.h @@ -0,0 +1,5 @@ +// This is an auto-generated file to redirect any included +// module headers to the correct external folder. + +#include "../../../../../modules/juce_core/juce_core.h" + diff --git a/modules/juce_gui_basics/application/juce_Application.cpp b/modules/juce_gui_basics/application/juce_Application.cpp index cee9e21c5d..c83b6ca8c4 100644 --- a/modules/juce_gui_basics/application/juce_Application.cpp +++ b/modules/juce_gui_basics/application/juce_Application.cpp @@ -250,7 +250,13 @@ int JUCEApplication::main (int argc, const char* argv[]) #else String cmd; for (int i = 1; i < argc; ++i) - cmd << argv[i] << ' '; + { + String arg (argv[i]); + if (arg.containsChar (' ') && ! arg.isQuotedString()) + arg = arg.quoted ('"'); + + cmd << arg << ' '; + } return JUCEApplication::main (cmd); #endif