Browse Source

Additional output during Android/iOS builds

Josh Engebretson 10 years ago
parent
commit
44af996f76

+ 1 - 1
Data/AtomicEditor/Resources/EditorData/AtomicEditor/editor/ui/programoutput.tb.txt

@@ -1,6 +1,6 @@
 TBLayout: axis: y, distribution: gravity, position: left
 	TBTextField: text: "Program Output:", id: program_name
-	TBEditField: multiline: 1, styling: 0, gravity: all, id: output, readonly: 1
+	TBEditField: multiline: 1, styling: 1, gravity: all, id: output, readonly: 1, adapt-to-content: 0
 		lp: min-width: 640, min-height: 480
 	TBSeparator: gravity: left right, skin: AESeparator
 	TBLayout: 

+ 8 - 0
Source/AtomicEditor/Source/Build/BuildAndroid.cpp

@@ -177,6 +177,8 @@ void BuildAndroid::RunStartActivity()
     UIModalOps* ops = GetSubsystem<UIModalOps>();
     ops->SetProgramOutputSubprocess(subprocess);
 
+    ops->PrintToProgramOutput("\n\nStarting Android Activity\n\n");
+
 }
 
 void BuildAndroid::RunADBInstall()
@@ -209,6 +211,8 @@ void BuildAndroid::RunADBInstall()
     UIModalOps* ops = GetSubsystem<UIModalOps>();
     ops->SetProgramOutputSubprocess(subprocess);
 
+    ops->PrintToProgramOutput("\n\n<color #D4FB79>Installing on Android Devices</color>\n\n");
+
 }
 
 void BuildAndroid::RunADBListDevices()
@@ -244,6 +248,8 @@ void BuildAndroid::RunADBListDevices()
     UIModalOps* ops = GetSubsystem<UIModalOps>();
     ops->SetProgramOutputSubprocess(subprocess);
 
+    ops->PrintToProgramOutput("\n\n<color #D4FB79>Listing Android Devices</color>\n\n");
+
 }
 
 void BuildAndroid::RunAntDebug()
@@ -282,6 +288,8 @@ void BuildAndroid::RunAntDebug()
 
     UIModalOps* ops = GetSubsystem<UIModalOps>();
     ops->ShowProgramOutput(subprocess);
+
+    ops->PrintToProgramOutput("<color #D4FB79>Starting Android Deployment</color>\n\n");
 }
 
 void BuildAndroid::RunAndroidUpdate()

+ 6 - 0
Source/AtomicEditor/Source/Build/BuildIOS.cpp

@@ -209,6 +209,8 @@ void BuildIOS::RunConvertPList()
 
     UIModalOps* ops = GetSubsystem<UIModalOps>();
     ops->ShowProgramOutput(subprocess);
+
+    ops->PrintToProgramOutput("<color #D4FB79>Starting iOS Deployment</color>\n\n");
 }
 
 void BuildIOS::RunCodeSign()
@@ -242,6 +244,8 @@ void BuildIOS::RunCodeSign()
     UIModalOps* ops = GetSubsystem<UIModalOps>();
     ops->SetProgramOutputSubprocess(subprocess);
 
+    ops->PrintToProgramOutput("\n\n<color #D4FB79>Signing iOS Deployment</color>\n\n");
+
 }
 
 void BuildIOS::RunDeploy()
@@ -275,6 +279,8 @@ void BuildIOS::RunDeploy()
     UIModalOps* ops = GetSubsystem<UIModalOps>();
     ops->SetProgramOutputSubprocess(subprocess);
 
+    ops->PrintToProgramOutput("\n\n<color #D4FB79>Deploying to iOS Device</color>\n\n");
+
 }
 
 

+ 12 - 0
Source/AtomicEditor/Source/UI/Modal/UIModalOps.cpp

@@ -204,6 +204,18 @@ void UIModalOps::SetProgramOutputSubprocess(Object* subprocess)
     output->SetSubprocess(subprocess);
 }
 
+void UIModalOps::PrintToProgramOutput(const String& text)
+{
+    if (opWindow_.Null())
+        return;
+
+    if (opWindow_->GetType() != UIProgramOutput::GetTypeStatic())
+        return;
+
+    UIProgramOutput* output = (UIProgramOutput*)(opWindow_.Get());
+    output->OutputText(text);
+}
+
 void UIModalOps::ShowProgramOutput(Object *subprocess)
 {
     assert(opWindow_.Null());

+ 1 - 0
Source/AtomicEditor/Source/UI/Modal/UIModalOps.h

@@ -66,6 +66,7 @@ class UIModalOps: public AEWidget, private TBWidgetListener
     bool ModalActive() { return opWindow_.NotNull(); }
 
     void ShowProgramOutput(Object* subprocess);
+    void PrintToProgramOutput(const String& text);
 
     /// Allows you to change the program key being output to the output window
     void SetProgramOutputSubprocess(Object* subprocess);

+ 9 - 0
Source/AtomicEditor/Source/UI/Modal/UIProgramOutput.cpp

@@ -52,6 +52,15 @@ void UIProgramOutput::HandleEvent(StringHash eventType, VariantMap& eventData)
     }
 }
 
+void UIProgramOutput::OutputText(const String& text)
+{
+    TBStr tbText;
+    output_->GetText(tbText);
+    tbText.Append(text.CString());
+    output_->SetText(tbText);
+    output_->ScrollTo(0, 0xffffff);
+}
+
 void UIProgramOutput::SetSubprocess(Object* subprocess)
 {
     UnsubscribeFromAllEvents();

+ 2 - 0
Source/AtomicEditor/Source/UI/Modal/UIProgramOutput.h

@@ -26,6 +26,8 @@ public:
 
     void SetSubprocess(Object*subprocess);
 
+    void OutputText(const String& text);
+
 private:
 
     void HandleEvent(StringHash eventType, VariantMap& eventData);