Skip to content

Commit

Permalink
- removed xcpretty & replaced with xcbeautify
Browse files Browse the repository at this point in the history
  • Loading branch information
Christoph Hart committed Feb 9, 2025
1 parent 961d7d9 commit 5c24daf
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 10 deletions.
2 changes: 1 addition & 1 deletion currentGitHash.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ca06fcb9f0e27fdb7be45e9de968c5f85832e386
961d7d903632982c4c315062271cf1318cee278b
7 changes: 5 additions & 2 deletions hi_backend/backend/CompileExporter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2670,8 +2670,11 @@ void CompileExporter::BatchFileCreator::createBatchFile(CompileExporter* exporte
String xcodeLine;

xcodeLine << "xcodebuild -project \"Builds/MacOSX/" << projectName << ".xcodeproj\" -configuration \"" << exporter->configurationName << "\" -jobs \"" << threads << "\"";
xcodeLine << " | xcpretty";


auto xcbeautify = exporter->hisePath.getChildFile("tools/Projucer/xcbeautify");

xcodeLine << " | " << xcbeautify.getFullPathName().quoted();

ADD_LINE(xcodeLine);
}

Expand Down
2 changes: 1 addition & 1 deletion hi_backend/backend/currentGit.h
Original file line number Diff line number Diff line change
@@ -1 +1 @@
#define PREVIOUS_HISE_COMMIT "ca06fcb9f0e27fdb7be45e9de968c5f85832e386"
#define PREVIOUS_HISE_COMMIT "961d7d903632982c4c315062271cf1318cee278b"
6 changes: 1 addition & 5 deletions hi_backend/backend/dialog_library/dialog_library.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -409,11 +409,7 @@ var ExportSetupWizard::checkIDE(const var::NativeFunctionArgs& args)
writeState("xcodeExists", xcodeExists);
}
{
juce::ChildProcess xcp;
xcp.start("gem list xcpretty");
auto output = xcp.readAllProcessOutput();
auto xcPrettyExists = output.contains("xcpretty");
writeState("xcPrettyExists", xcPrettyExists);
writeState("xcPrettyExists", true);
}
#endif

Expand Down
2 changes: 1 addition & 1 deletion hi_tools/hi_multipage/EditComponents.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ static const char* BatchFile = R"(
set -o pipefail
echo Compiling %PROJECT% ...
xcodebuild -project "Builds/MacOSX/%PROJECT%.xcodeproj" -configuration "Release" -jobs "10" | xcpretty
xcodebuild -project "Builds/MacOSX/%PROJECT%.xcodeproj" -configuration "Release" -jobs "6" | "%HISE_PATH%/tools/Projucer/xcbeautify"
)";
#elif JUCE_LINUX
static const char* BatchFile = R"(
Expand Down
Binary file added tools/projucer/xcbeautify
Binary file not shown.

0 comments on commit 5c24daf

Please sign in to comment.