Commit d5fd2dc0 authored by Lorenz Meier's avatar Lorenz Meier

Updated deployment script, disabled unfinished windows

parent c98e35ce
#!/bin/sh #!/bin/sh
cp -r ../../qgroundcontrol-build-desktop/qgroundcontrol.app . cp -r ../../qgroundcontrol-build-desktop-Desktop_Qt_4_8_1_for_GCC__Qt_SDK__Release/qgroundcontrol.app .
cp -r ../audio qgroundcontrol.app/Contents/MacOs/. cp -r ../files/audio qgroundcontrol.app/Contents/MacOs/.
mkdir -p qgroundcontrol.app/Contents/Frameworks/ mkdir -p qgroundcontrol.app/Contents/Frameworks/
mkdir -p qgroundcontrol.app/Contents/PlugIns/imageformats
mkdir -p qgroundcontrol.app/Contents/PlugIns/codecs
mkdir -p qgroundcontrol.app/Contents/PlugIns/accessible
# SDL is not copied by Qt - for whatever reason # SDL is not copied by Qt - for whatever reason
cp -r /Library/Frameworks/SDL.framework qgroundcontrol.app/Contents/Frameworks/. cp -r /Library/Frameworks/SDL.framework qgroundcontrol.app/Contents/Frameworks/.
echo -e '\n\nStarting to create disk image. This may take a while..\n' echo -e '\n\nStarting to create disk image. This may take a while..\n'
macdeployqt qgroundcontrol.app -dmg $HOME/QtSDK/Desktop/Qt/4.8.1/gcc/bin/macdeployqt qgroundcontrol.app -dmg
rm -rf qgroundcontrol.app rm -rf qgroundcontrol.app
echo -e '\n\n QGroundControl .DMG file is now ready for publishing\n' echo -e '\n\n QGroundControl .DMG file is now ready for publishing\n'
...@@ -552,11 +552,11 @@ void MainWindow::buildCommonWidgets() ...@@ -552,11 +552,11 @@ void MainWindow::buildCommonWidgets()
addCentralWidget(protocolWidget, "Mavlink Generator"); addCentralWidget(protocolWidget, "Mavlink Generator");
} }
if (!firmwareUpdateWidget) // if (!firmwareUpdateWidget)
{ // {
firmwareUpdateWidget = new QGCFirmwareUpdate(this); // firmwareUpdateWidget = new QGCFirmwareUpdate(this);
addCentralWidget(firmwareUpdateWidget, "Firmware Update"); // addCentralWidget(firmwareUpdateWidget, "Firmware Update");
} // }
if (!hudWidget) if (!hudWidget)
{ {
...@@ -564,11 +564,11 @@ void MainWindow::buildCommonWidgets() ...@@ -564,11 +564,11 @@ void MainWindow::buildCommonWidgets()
addCentralWidget(hudWidget, tr("Head Up Display")); addCentralWidget(hudWidget, tr("Head Up Display"));
} }
if (!configWidget) // if (!configWidget)
{ // {
configWidget = new QGCVehicleConfig(this); // configWidget = new QGCVehicleConfig(this);
addCentralWidget(configWidget, tr("Vehicle Configuration")); // addCentralWidget(configWidget, tr("Vehicle Configuration"));
} // }
if (!dataplotWidget) if (!dataplotWidget)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment