Commit 20a0f783 authored by lm's avatar lm
Browse files

Updated to latest MAVLinkGen version

parent 7ef517d4
#!/bin/sh
cp -r ../../mavlinkgen-build-desktop/mavlinkgen.app .
echo -e '\n\nStarting to create disk image. This may take a while..\n'
macdeployqt mavlinkgen.app -dmg
rm -rf mavlinkgen.app
echo -e '\n\n MAVLinkGen .DMG file is now ready for publishing\n'
Name "QGroundcontrol" Name "MAVLink Generator"
OutFile "qgroundcontrol-installer-win32.exe" OutFile "mavlinkgen-installer-win32.exe"
InstallDir $PROGRAMFILES\qgroundcontrol InstallDir $PROGRAMFILES\mavlinkgen
Page license Page license
Page directory Page directory
...@@ -17,19 +17,19 @@ Section "" ...@@ -17,19 +17,19 @@ Section ""
SetOutPath $INSTDIR SetOutPath $INSTDIR
File ..\release\*.* File ..\release\*.*
WriteUninstaller $INSTDIR\QGroundControl_uninstall.exe WriteUninstaller $INSTDIR\mavlinkgen_uninstall.exe
SectionEnd SectionEnd
Section "Uninstall" Section "Uninstall"
Delete $INSTDIR\QGroundControl_uninstall.exe Delete $INSTDIR\mavlinkgen_uninstall.exe
Delete $INSTDIR\*.* Delete $INSTDIR\*.*
RMDir $INSTDIR RMDir $INSTDIR
Delete "$SMPROGRAMS\QGroundControl\*.*" Delete "$SMPROGRAMS\mavlinkgen\*.*"
RMDir "$SMPROGRAMS\QGroundControl\" RMDir "$SMPROGRAMS\mavlinkgen\"
SectionEnd SectionEnd
Section "create Start Menu Shortcuts" Section "create Start Menu Shortcuts"
CreateDirectory "$SMPROGRAMS\QGroundControl" CreateDirectory "$SMPROGRAMS\MAVLink"
CreateShortCut "$SMPROGRAMS\QGroundControl\uninstall.lnk" "$INSTDIR\QGroundControl_uninstall.exe" "" "$INSTDIR\QGroundControl_uninstall.exe" 0 CreateShortCut "$SMPROGRAMS\MAVLink\Uninstall.lnk" "$INSTDIR\mavlinkgen_uninstall.exe" "" "$INSTDIR\mavlinkgen_uninstall.exe" 0
CreateShortCut "$SMPROGRAMS\QGroundControl\QGroundControl.lnk" "$INSTDIR\qgroundcontrol.exe" "" "$INSTDIR\qgroundcontrol.exe" 0 CreateShortCut "$SMPROGRAMS\MAVLink\MAVLinkGen.lnk" "$INSTDIR\mavlinkgen.exe" "" "$INSTDIR\mavlinkgen.exe" 0
SectionEnd SectionEnd
\ No newline at end of file
...@@ -103,7 +103,7 @@ bool MAVLinkXMLParser::generate() ...@@ -103,7 +103,7 @@ bool MAVLinkXMLParser::generate()
// Start main header // Start main header
QString mainHeader = QString("/** @file\n *\t@brief MAVLink comm protocol.\n *\t@see http://pixhawk.ethz.ch/software/mavlink\n *\t Generated on %1\n */\n#ifndef " + pureFileName.toUpper() + "_H\n#define " + pureFileName.toUpper() + "_H\n\n").arg(date); // The main header includes all messages QString mainHeader = QString("/** @file\n *\t@brief MAVLink comm protocol.\n *\t@see http://qgroundcontrol.org/mavlink/\n *\t Generated on %1\n */\n#ifndef " + pureFileName.toUpper() + "_H\n#define " + pureFileName.toUpper() + "_H\n\n").arg(date); // The main header includes all messages
// Mark all code as C code // Mark all code as C code
mainHeader += "#ifdef __cplusplus\nextern \"C\" {\n#endif\n\n"; mainHeader += "#ifdef __cplusplus\nextern \"C\" {\n#endif\n\n";
mainHeader += "\n#include \"../protocol.h\"\n"; mainHeader += "\n#include \"../protocol.h\"\n";
......
This diff is collapsed.
Supports Markdown
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