From 6221ddd9b47a836be262923f7ddff706e9bf8477 Mon Sep 17 00:00:00 2001 From: Philippe Renon Date: Wed, 21 Sep 2016 09:13:08 +0200 Subject: [PATCH 1/4] LP-406 revert changes to inf file (i.e. remove sparky and version bump) --- flight/Project/Windows USB/OpenPilot-CDC.inf | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/flight/Project/Windows USB/OpenPilot-CDC.inf b/flight/Project/Windows USB/OpenPilot-CDC.inf index 087538d5d..6d256f7b1 100644 --- a/flight/Project/Windows USB/OpenPilot-CDC.inf +++ b/flight/Project/Windows USB/OpenPilot-CDC.inf @@ -3,7 +3,7 @@ Signature = "$Windows NT$" Class = Ports ClassGuid = {4D36E978-E325-11CE-BFC1-08002BE10318} Provider = %ProviderName% -DriverVer=05/25/2016,4.0.0.0 +DriverVer=11/21/2014,3.0.0.0 CatalogFile.NTx86 = OpenPilot-CDC_x86.cat CatalogFile.NTamd64 = OpenPilot-CDC_amd64.cat @@ -15,14 +15,12 @@ CatalogFile.NTamd64 = OpenPilot-CDC_amd64.cat %Revolution% = DriverInstall,USB\VID_20A0&PID_415e&MI_00 %OPLinkMini% = DriverInstall,USB\VID_20A0&PID_415c&MI_00 %OPLink1W% = DriverInstall,USB\VID_20A0&PID_4195&MI_00 -%Sparky2% = DriverInstall,USB\VID_20A0&PID_41d0&MI_00 [DeviceList.NTamd64] %CopterControl% = DriverInstall,USB\VID_20A0&PID_415b&MI_00 %Revolution% = DriverInstall,USB\VID_20A0&PID_415e&MI_00 %OPLinkMini% = DriverInstall,USB\VID_20A0&PID_415c&MI_00 %OPLink1W% = DriverInstall,USB\VID_20A0&PID_4195&MI_00 -%Sparky2% = DriverInstall,USB\VID_20A0&PID_41d0&MI_00 [DriverInstall] include = mdmcpq.inf @@ -43,4 +41,3 @@ CopterControl = "CopterControl Virtual COM Port" Revolution = "Revolution Virtual COM Port" OPLinkMini = "OPLinkMini Virtual COM Port" OPLink1W = "OPLink1W Virtual COM Port" -Sparky2 = "Sparky2 Virtual COM Port" From 2b8e5e78f6bbc334c6ec92e21591b6f1eec2d874 Mon Sep 17 00:00:00 2001 From: Philippe Renon Date: Wed, 21 Sep 2016 09:39:56 +0200 Subject: [PATCH 2/4] LP-406 remove space from Windows USB directory name --- .../{Windows USB => WindowsUSB}/OpenPilot-CDC.inf | 0 .../openpilot-cdc_amd64.cat | Bin .../openpilot-cdc_x86.cat | Bin package/winx86/gcs.nsi | 2 +- 4 files changed, 1 insertion(+), 1 deletion(-) rename flight/Project/{Windows USB => WindowsUSB}/OpenPilot-CDC.inf (100%) rename flight/Project/{Windows USB => WindowsUSB}/openpilot-cdc_amd64.cat (100%) rename flight/Project/{Windows USB => WindowsUSB}/openpilot-cdc_x86.cat (100%) diff --git a/flight/Project/Windows USB/OpenPilot-CDC.inf b/flight/Project/WindowsUSB/OpenPilot-CDC.inf similarity index 100% rename from flight/Project/Windows USB/OpenPilot-CDC.inf rename to flight/Project/WindowsUSB/OpenPilot-CDC.inf diff --git a/flight/Project/Windows USB/openpilot-cdc_amd64.cat b/flight/Project/WindowsUSB/openpilot-cdc_amd64.cat similarity index 100% rename from flight/Project/Windows USB/openpilot-cdc_amd64.cat rename to flight/Project/WindowsUSB/openpilot-cdc_amd64.cat diff --git a/flight/Project/Windows USB/openpilot-cdc_x86.cat b/flight/Project/WindowsUSB/openpilot-cdc_x86.cat similarity index 100% rename from flight/Project/Windows USB/openpilot-cdc_x86.cat rename to flight/Project/WindowsUSB/openpilot-cdc_x86.cat diff --git a/package/winx86/gcs.nsi b/package/winx86/gcs.nsi index 609f67594..7f2793b1e 100644 --- a/package/winx86/gcs.nsi +++ b/package/winx86/gcs.nsi @@ -198,7 +198,7 @@ SectionEnd ; Copy driver files Section "-Drivers" InSecDrivers SetOutPath "$INSTDIR\drivers" - File /r "${PROJECT_ROOT}\flight\Project\Windows USB\*" + File /r "${PROJECT_ROOT}\flight\Project\WindowsUSB\*" SectionEnd ; Preinstall OpenPilot CDC driver From 018e2dfb1444df26e8aaded61fa0eb6105f2d805 Mon Sep 17 00:00:00 2001 From: Philippe Renon Date: Wed, 21 Sep 2016 22:54:33 +0200 Subject: [PATCH 3/4] LP-406 win installer: do not select CDC driver by default --- package/winx86/gcs.nsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/winx86/gcs.nsi b/package/winx86/gcs.nsi index 7f2793b1e..0d950575f 100644 --- a/package/winx86/gcs.nsi +++ b/package/winx86/gcs.nsi @@ -202,7 +202,7 @@ Section "-Drivers" InSecDrivers SectionEnd ; Preinstall OpenPilot CDC driver -Section "CDC driver" InSecInstallDrivers +Section /o "CDC driver" InSecInstallDrivers InitPluginsDir SetOutPath "$PLUGINSDIR" ${If} ${RunningX64} From c693e40783968a724d707058c7860b4413a62eca Mon Sep 17 00:00:00 2001 From: Philippe Renon Date: Wed, 21 Sep 2016 23:11:29 +0200 Subject: [PATCH 4/4] LP-406 win installer: change section order --- package/winx86/gcs.nsi | 62 +++++++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/package/winx86/gcs.nsi b/package/winx86/gcs.nsi index 0d950575f..158ac2290 100644 --- a/package/winx86/gcs.nsi +++ b/package/winx86/gcs.nsi @@ -156,7 +156,7 @@ ; Installer sections ; Copy GCS core files -Section "Core files" InSecCore +Section "${GCS_BIG_NAME}" InSecCore SectionIn RO SetOutPath "$INSTDIR\bin" File /r "${GCS_BUILD_TREE}\bin\*" @@ -195,36 +195,6 @@ Section "-Utilities" InSecUtilities File "/oname=OPLogConvert-${PACKAGE_LBL}.m" "${UAVO_SYNTH_TREE}\matlab\OPLogConvert.m" SectionEnd -; Copy driver files -Section "-Drivers" InSecDrivers - SetOutPath "$INSTDIR\drivers" - File /r "${PROJECT_ROOT}\flight\Project\WindowsUSB\*" -SectionEnd - -; Preinstall OpenPilot CDC driver -Section /o "CDC driver" InSecInstallDrivers - InitPluginsDir - SetOutPath "$PLUGINSDIR" - ${If} ${RunningX64} - File "/oname=dpinst.exe" "${NSIS_DATA_TREE}\redist\dpinst_x64.exe" - ${Else} - File "/oname=dpinst.exe" "${NSIS_DATA_TREE}\redist\dpinst_x86.exe" - ${EndIf} - ExecWait '"$PLUGINSDIR\dpinst.exe" /lm /path "$INSTDIR\drivers"' -SectionEnd - -; Copy Opengl32.dll if needed (disabled by default) -Section /o "Mesa OpenGL driver" InSecInstallOpenGL - SetOutPath "$INSTDIR\bin" - File /r "${GCS_BUILD_TREE}\bin\opengl32\opengl32.dll" -SectionEnd - -; AeroSimRC plugin files -Section "AeroSimRC plugin" InSecAeroSimRC - SetOutPath "$INSTDIR\misc\AeroSIM-RC" - File /r "${AEROSIMRC_TREE}\*" -SectionEnd - Section "Shortcuts" InSecShortcuts ; Create desktop and start menu shortcuts SetOutPath "$INSTDIR" @@ -252,6 +222,36 @@ Section "Shortcuts" InSecShortcuts CreateShortCut "$SMPROGRAMS\${ORG_BIG_NAME}\Uninstall.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0 SectionEnd +; AeroSimRC plugin files +Section "AeroSimRC plugin" InSecAeroSimRC + SetOutPath "$INSTDIR\misc\AeroSIM-RC" + File /r "${AEROSIMRC_TREE}\*" +SectionEnd + +; Copy driver files (hidden, driver is always copied to install directory) +Section "-Drivers" InSecDrivers + SetOutPath "$INSTDIR\drivers" + File /r "${PROJECT_ROOT}\flight\Project\WindowsUSB\*" +SectionEnd + +; Preinstall OpenPilot CDC driver (disabled by default) +Section /o "CDC driver" InSecInstallDrivers + InitPluginsDir + SetOutPath "$PLUGINSDIR" + ${If} ${RunningX64} + File "/oname=dpinst.exe" "${NSIS_DATA_TREE}\redist\dpinst_x64.exe" + ${Else} + File "/oname=dpinst.exe" "${NSIS_DATA_TREE}\redist\dpinst_x86.exe" + ${EndIf} + ExecWait '"$PLUGINSDIR\dpinst.exe" /lm /path "$INSTDIR\drivers"' +SectionEnd + +; Copy Opengl32.dll if needed (disabled by default) +Section /o "Mesa OpenGL driver" InSecInstallOpenGL + SetOutPath "$INSTDIR\bin" + File /r "${GCS_BUILD_TREE}\bin\opengl32\opengl32.dll" +SectionEnd + Section ; create uninstall info ; Write the installation path into the registry WriteRegStr HKCU "Software\${ORG_BIG_NAME}" "Install Location" $INSTDIR