Browse Source

Updated deployment script, disabled unfinished windows

QGC4.4
Lorenz Meier 13 years ago
parent
commit
d5fd2dc088
  1. 9
      deploy/mac_create_dmg.sh
  2. 20
      src/ui/MainWindow.cc

9
deploy/mac_create_dmg.sh

@ -1,12 +1,15 @@ @@ -1,12 +1,15 @@
#!/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/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
cp -r /Library/Frameworks/SDL.framework qgroundcontrol.app/Contents/Frameworks/.
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
echo -e '\n\n QGroundControl .DMG file is now ready for publishing\n'

20
src/ui/MainWindow.cc

@ -552,11 +552,11 @@ void MainWindow::buildCommonWidgets() @@ -552,11 +552,11 @@ void MainWindow::buildCommonWidgets()
addCentralWidget(protocolWidget, "Mavlink Generator");
}
if (!firmwareUpdateWidget)
{
firmwareUpdateWidget = new QGCFirmwareUpdate(this);
addCentralWidget(firmwareUpdateWidget, "Firmware Update");
}
// if (!firmwareUpdateWidget)
// {
// firmwareUpdateWidget = new QGCFirmwareUpdate(this);
// addCentralWidget(firmwareUpdateWidget, "Firmware Update");
// }
if (!hudWidget)
{
@ -564,11 +564,11 @@ void MainWindow::buildCommonWidgets() @@ -564,11 +564,11 @@ void MainWindow::buildCommonWidgets()
addCentralWidget(hudWidget, tr("Head Up Display"));
}
if (!configWidget)
{
configWidget = new QGCVehicleConfig(this);
addCentralWidget(configWidget, tr("Vehicle Configuration"));
}
// if (!configWidget)
// {
// configWidget = new QGCVehicleConfig(this);
// addCentralWidget(configWidget, tr("Vehicle Configuration"));
// }
if (!dataplotWidget)
{

Loading…
Cancel
Save