Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-25 01:05:10 +03:00
Code Issues Wiki Activity

More renaming. Just for the life of me can't get the translations to be recognised. Also, while a clean install will use the new app folders, the nsi scripts are currently configured to retrieve the install folder from registry if present. Might want to think about whether we want to remove this or not.

Browse source
This commit is contained in:
Andre Bernet 2014-01-05 12:11:51 +01:00
parent 0d189b87da
commit d65b74269b
15 changed files with 453 additions and 453 deletions
Download patch file Download diff file Expand all files Collapse all files

84
companion/src/CMakeLists.txt
View file

@ -1,4 +1,4 @@
PROJECT( companion9x ) PROJECT( companion )
SET( C9X_VERSION_MAJOR "1" ) SET( C9X_VERSION_MAJOR "1" )
SET( C9X_VERSION_MINOR "51" ) SET( C9X_VERSION_MINOR "51" )
@ -109,7 +109,7 @@ add_custom_command(
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/firmwares/ersky9x/ersky9xsimulator.cpp DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/firmwares/ersky9x/ersky9xsimulator.cpp
) )
SET( companion9x_SRCS SET( companion_SRCS
eeprominterface.cpp eeprominterface.cpp
hexinterface.cpp hexinterface.cpp
flashinterface.cpp flashinterface.cpp
@ -168,7 +168,7 @@ SET( companion9x_SRCS
qcustomplot.cpp qcustomplot.cpp
) )
SET( companion9x_MOC_HDRS SET( companion_MOC_HDRS
avroutputdialog.h avroutputdialog.h
preferencesdialog.h preferencesdialog.h
burnconfigdialog.h burnconfigdialog.h
@ -201,7 +201,7 @@ SET( companion9x_MOC_HDRS
qcustomplot.h qcustomplot.h
) )
SET( companion9x_UIS SET( companion_UIS
mdichild.ui mdichild.ui
avroutputdialog.ui avroutputdialog.ui
comparedialog.ui comparedialog.ui
@ -225,25 +225,25 @@ SET( companion9x_UIS
) )
IF ( SDL_FOUND ) IF ( SDL_FOUND )
SET( companion9x_SRCS SET( companion_SRCS
${companion9x_SRCS} ${companion_SRCS}
joystick.cpp joystick.cpp
joystickdialog.cpp joystickdialog.cpp
) )
SET( companion9x_MOC_HDRS SET( companion_MOC_HDRS
${companion9x_MOC_HDRS} ${companion_MOC_HDRS}
joystick.h joystick.h
joystickdialog.h joystickdialog.h
) )
SET( companion9x_UIS SET( companion_UIS
${companion9x_UIS} ${companion_UIS}
joystickdialog.ui joystickdialog.ui
) )
ENDIF( ) ENDIF( )
SET( companion9x_RCS SET( companion_RCS
companion9x.qrc companion9x.qrc
${CMAKE_CURRENT_BINARY_DIR}/translations.qrc ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc
) )
@ -286,7 +286,7 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/firmwares/opentx/stamp-opentx.h.in ${
SET( PATCH_FLAGS "--binary" ) SET( PATCH_FLAGS "--binary" )
IF( WIN32 ) IF( WIN32 )
SET( companion9x_SRCS ${companion9x_SRCS} icon.rc ) SET( companion_SRCS ${companion_SRCS} icon.rc )
IF ( NOT MSVC ) IF ( NOT MSVC )
SET(CMAKE_EXE_LINKER_FLAGS -mwindows) SET(CMAKE_EXE_LINKER_FLAGS -mwindows)
ENDIF( ) ENDIF( )
@ -298,28 +298,28 @@ INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} )
SET( LANGUAGES he pt ru de fr it sv cs ) SET( LANGUAGES he pt ru de fr it sv cs )
FOREACH( language ${LANGUAGES} ) FOREACH( language ${LANGUAGES} )
SET( companion9x_TS ${companion9x_TS} translations/companion9x_${language}.ts ) SET( companion_TS ${companion_TS} translations/companion_${language}.ts )
ENDFOREACH( language ) ENDFOREACH( language )
QT4_WRAP_UI( companion9x_SRCS ${companion9x_UIS} ) QT4_WRAP_UI( companion_SRCS ${companion_UIS} )
QT4_WRAP_CPP( companion9x_SRCS ${companion9x_MOC_HDRS} ) QT4_WRAP_CPP( companion_SRCS ${companion_MOC_HDRS} )
QT4_ADD_TRANSLATION( companion9x_QM ${companion9x_TS} ) QT4_ADD_TRANSLATION( companion_QM ${companion_TS} )
QT4_ADD_RESOURCES( companion9x_SRCS ${companion9x_RCS} ) QT4_ADD_RESOURCES( companion_SRCS ${companion_RCS} )
ADD_DEFINITIONS( -DQT_TRANSLATIONS_DIR="${QT_TRANSLATIONS_DIR}" ) ADD_DEFINITIONS( -DQT_TRANSLATIONS_DIR="${QT_TRANSLATIONS_DIR}" )
IF( APPLE ) IF( APPLE )
ADD_EXECUTABLE( ${PROJECT_NAME} MACOSX_BUNDLE ${companion9x_SRCS} ${companion9x_QM} ) ADD_EXECUTABLE( ${PROJECT_NAME} MACOSX_BUNDLE ${companion_SRCS} ${companion_QM} )
ELSE( ) ELSE( )
ADD_EXECUTABLE( ${PROJECT_NAME} WIN32 ${companion9x_SRCS} ${companion9x_QM} ) ADD_EXECUTABLE( ${PROJECT_NAME} WIN32 ${companion_SRCS} ${companion_QM} )
ENDIF( ) ENDIF( )
TARGET_LINK_LIBRARIES( ${PROJECT_NAME} ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} ${XERCESC_LIBRARY} ${PTHREAD_LIBRARY} ${SDL_LIBRARY} ${PHONON_LIBS} ) TARGET_LINK_LIBRARIES( ${PROJECT_NAME} ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} ${XERCESC_LIBRARY} ${PTHREAD_LIBRARY} ${SDL_LIBRARY} ${PHONON_LIBS} )
IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux") IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
INSTALL( TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin ) INSTALL( TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin )
INSTALL( FILES companion9x.desktop DESTINATION share/applications ) INSTALL( FILES companion.desktop DESTINATION share/applications )
INSTALL( FILES companion9x.png DESTINATION share/icons ) INSTALL( FILES companion.png DESTINATION share/icons )
INSTALL( FILES ../targets/linux/45-taranis.rules DESTINATION /etc/udev/rules.d/ ) INSTALL( FILES ../targets/linux/45-taranis.rules DESTINATION /etc/udev/rules.d/ )
# Linux specific code # Linux specific code
SET(OperatingSystem "Linux") SET(OperatingSystem "Linux")
@ -329,13 +329,13 @@ ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
IF( WIN32 ) IF( WIN32 )
IF( MSVC ) IF( MSVC )
SET( NSI_IN_FILE companion9x-vs.nsi.in ) SET( NSI_IN_FILE companion-vs.nsi.in )
ELSE( ) ELSE( )
SET( NSI_IN_FILE companion9x-msys.nsi.in ) SET( NSI_IN_FILE companion-msys.nsi.in )
ENDIF( ) ENDIF( )
SET( SYSDIR "$ENV{windir}/system32" ) SET( SYSDIR "$ENV{windir}/system32" )
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/../targets/windows/${NSI_IN_FILE} ${CMAKE_CURRENT_BINARY_DIR}/companion9x.nsi @ONLY) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/../targets/windows/${NSI_IN_FILE} ${CMAKE_CURRENT_BINARY_DIR}/companion.nsi @ONLY)
FIND_PROGRAM(NSIS_EXE makensis.exe PATHS FIND_PROGRAM(NSIS_EXE makensis.exe PATHS
"C:/Program Files/NSIS" "C:/Program Files/NSIS"
@ -343,14 +343,14 @@ IF( WIN32 )
"C:/Programs/NSIS" "C:/Programs/NSIS"
) )
ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/companion9xInstall.exe ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/companionInstall.exe
COMMAND "${NSIS_EXE}" ARGS companion9x.nsi COMMAND "${NSIS_EXE}" ARGS companion.nsi
DEPENDS ${PROJECT_NAME} ${PROJECT_BINARY_DIR}/companion9x.nsi DEPENDS ${PROJECT_NAME} ${PROJECT_BINARY_DIR}/companion.nsi
COMMENT "Windows NSIS Installer") COMMENT "Windows NSIS Installer")
ADD_CUSTOM_TARGET( installer ADD_CUSTOM_TARGET( installer
DEPENDS ${PROJECT_BINARY_DIR}/companion9xInstall.exe DEPENDS ${PROJECT_BINARY_DIR}/companionInstall.exe
SOURCES ${PROJECT_BINARY_DIR}/companion9x.nsi) SOURCES ${PROJECT_BINARY_DIR}/companion.nsi)
ENDIF( ) ENDIF( )
IF( APPLE ) IF( APPLE )
@ -362,35 +362,35 @@ IF( APPLE )
ENDIF() ENDIF()
ADD_CUSTOM_TARGET( addframeworks ALL ADD_CUSTOM_TARGET( addframeworks ALL
COMMAND mkdir -p companion9x.app/Contents/Frameworks COMMAND mkdir -p companion.app/Contents/Frameworks
COMMAND mkdir -p companion9x.app/Contents/Resources COMMAND mkdir -p companion.app/Contents/Resources
COMMAND mkdir -p companion9x.app/Contents/translations COMMAND mkdir -p companion.app/Contents/translations
COMMAND rsync ${PROJECT_SOURCE_DIR}/images/${MACOSX_BUNDLE_ICON_FILE} companion9x.app/Contents/Resources/${MACOSX_BUNDLE_ICON_FILE} # Copy the icon files COMMAND rsync ${PROJECT_SOURCE_DIR}/images/${MACOSX_BUNDLE_ICON_FILE} companion.app/Contents/Resources/${MACOSX_BUNDLE_ICON_FILE} # Copy the icon files
COMMAND rsync ${PROJECT_SOURCE_DIR}/../macbuild/lib* companion9x.app/Contents/Frameworks COMMAND rsync ${PROJECT_SOURCE_DIR}/../macbuild/lib* companion.app/Contents/Frameworks
#COMMAND rsync ${PROJECT_SOURCE_DIR}/../macbuild/libcrypto.1.0.0.dylib companion9x.app/Contents/Frameworks #COMMAND rsync ${PROJECT_SOURCE_DIR}/../macbuild/libcrypto.1.0.0.dylib companion.app/Contents/Frameworks
COMMAND rsync -r --exclude=.svn ${PROJECT_SOURCE_DIR}/../macbuild/qt_menu.nib companion9x.app/Contents/Resources/ COMMAND rsync -r --exclude=.svn ${PROJECT_SOURCE_DIR}/../macbuild/qt_menu.nib companion.app/Contents/Resources/
COMMAND rsync ${PROJECT_BINARY_DIR}/*.qm companion9x.app/Contents/translations COMMAND rsync ${PROJECT_BINARY_DIR}/*.qm companion.app/Contents/translations
COMMAND ${QT_BINARY_DIR}/macdeployqt companion9x.app COMMAND ${QT_BINARY_DIR}/macdeployqt companion.app
WORKING_DIRECTORY ${WORK_DIR} WORKING_DIRECTORY ${WORK_DIR}
DEPENDS ${PROJECT_NAME} ) DEPENDS ${PROJECT_NAME} )
ADD_CUSTOM_TARGET( makedmg ADD_CUSTOM_TARGET( makedmg
COMMAND ${QT_BINARY_DIR}/macdeployqt companion9x.app -dmg -no-plugins COMMAND ${QT_BINARY_DIR}/macdeployqt companion.app -dmg -no-plugins
WORKING_DIRECTORY ${WORK_DIR} WORKING_DIRECTORY ${WORK_DIR}
DEPENDS addframeworks ) DEPENDS addframeworks )
ENDIF( ) ENDIF( )
ADD_CUSTOM_TARGET( stamp ADD_CUSTOM_TARGET( stamp
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/version.h ${CMAKE_SOURCE_DIR}/../companion9x.stamp COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/version.h ${CMAKE_SOURCE_DIR}/../companion.stamp
DEPENDS ${CMAKE_BINARY_DIR}/version.h ) DEPENDS ${CMAKE_BINARY_DIR}/version.h )
ADD_CUSTOM_TARGET( translations ADD_CUSTOM_TARGET( translations
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
COMMAND lupdate-qt4 ${CMAKE_SOURCE_DIR} -ts ${companion9x_TS} ) COMMAND lupdate-qt4 ${CMAKE_SOURCE_DIR} -ts ${companion_TS} )
SET(CPACK_PACKAGE_NAME "COMPANION9X") SET(CPACK_PACKAGE_NAME "COMPANION")
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Models and settings editor for the OpenTx open source firmware") SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Models and settings editor for the OpenTx open source firmware")
string(TOLOWER "${CPACK_PACKAGE_NAME}" CPACK_PACKAGE_NAME_LOWERCASE) string(TOLOWER "${CPACK_PACKAGE_NAME}" CPACK_PACKAGE_NAME_LOWERCASE)
find_program(DPKG_PROGRAM dpkg DOC "dpkg program of Debian-based systems") find_program(DPKG_PROGRAM dpkg DOC "dpkg program of Debian-based systems")

0
companion/src/companion9x.desktop → companion/src/companion.desktop
View file

0
companion/src/companion9x.png → companion/src/companion.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

Before After
Before After

6
companion/src/main.cpp
View file

@ -89,13 +89,13 @@ int main(int argc, char *argv[])
QString locale = settings.value("locale",QLocale::system().name()).toString(); QString locale = settings.value("locale",QLocale::system().name()).toString();
bool showSplash = settings.value("show_splash", true).toBool(); bool showSplash = settings.value("show_splash", true).toBool();
QTranslator companion9xTranslator; QTranslator companionTranslator;
companion9xTranslator.load(":/companion9x_" + locale); companionTranslator.load(":/companion_" + locale);
QTranslator qtTranslator; QTranslator qtTranslator;
qtTranslator.load((QString)"qt_" + locale.left(2), QLibraryInfo::location(QLibraryInfo::TranslationsPath)); qtTranslator.load((QString)"qt_" + locale.left(2), QLibraryInfo::location(QLibraryInfo::TranslationsPath));
// qDebug() << locale; // qDebug() << locale;
// qtTranslator.load("qt_" + QLocale::system().name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath)); // qtTranslator.load("qt_" + QLocale::system().name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath));
app.installTranslator(&companion9xTranslator); app.installTranslator(&companionTranslator);
app.installTranslator(&qtTranslator); app.installTranslator(&qtTranslator);
QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8")); QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));

16
companion/src/translations.qrc.in
View file

@ -1,12 +1,12 @@
<!DOCTYPE RCC><RCC version="1.0"> <!DOCTYPE RCC><RCC version="1.0">
<qresource prefix="/"> <qresource prefix="/">
<file>companion9x_fr.qm</file> <file>companion_fr.qm</file>
<file>companion9x_de.qm</file> <file>companion_de.qm</file>
<file>companion9x_he.qm</file> <file>companion_he.qm</file>
<file>companion9x_it.qm</file> <file>companion_it.qm</file>
<file>companion9x_pt.qm</file> <file>companion_pt.qm</file>
<file>companion9x_ru.qm</file> <file>companion_ru.qm</file>
<file>companion9x_sv.qm</file> <file>companion_sv.qm</file>
<file>companion9x_cs.qm</file> <file>companion_cs.qm</file>
</qresource> </qresource>
</RCC> </RCC>

0
companion/src/translations/companion9x_cs.ts → companion/src/translations/companion_cs.ts
View file

0
companion/src/translations/companion9x_de.ts → companion/src/translations/companion_de.ts
View file

0
companion/src/translations/companion9x_fr.ts → companion/src/translations/companion_fr.ts
View file

0
companion/src/translations/companion9x_he.ts → companion/src/translations/companion_he.ts
View file

0
companion/src/translations/companion9x_it.ts → companion/src/translations/companion_it.ts
View file

0
companion/src/translations/companion9x_pt.ts → companion/src/translations/companion_pt.ts
View file

0
companion/src/translations/companion9x_ru.ts → companion/src/translations/companion_ru.ts
View file

0
companion/src/translations/companion9x_sv.ts → companion/src/translations/companion_sv.ts
View file

34
companion/targets/windows/companion9x-msys.nsi.in → companion/targets/windows/companion-msys.nsi.in
View file

@ -12,11 +12,11 @@
;General ;General
;Name and file ;Name and file
Name "companion9x" Name "openTx companion"
OutFile "companion9xInstall_v@C9X_VERSION@.exe" OutFile "companionInstall_v@C9X_VERSION@.exe"
;Default installation folder ;Default installation folder
InstallDir "$PROGRAMFILES\companion9x" InstallDir "$PROGRAMFILES\openTx companion"
;Get installation folder from registry if available ;Get installation folder from registry if available
InstallDirRegKey HKCU "Software\companion9x" "" InstallDirRegKey HKCU "Software\companion9x" ""
@ -58,7 +58,7 @@
!define MUI_FINISHPAGE_NOAUTOCLOSE !define MUI_FINISHPAGE_NOAUTOCLOSE
!define MUI_FINISHPAGE_RUN !define MUI_FINISHPAGE_RUN
!define MUI_FINISHPAGE_RUN_CHECKED !define MUI_FINISHPAGE_RUN_CHECKED
!define MUI_FINISHPAGE_RUN_TEXT "Launch companion9x" !define MUI_FINISHPAGE_RUN_TEXT "Launch companion"
!define MUI_FINISHPAGE_RUN_FUNCTION "LaunchLink" !define MUI_FINISHPAGE_RUN_FUNCTION "LaunchLink"
# !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED # !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
# !define MUI_FINISHPAGE_SHOWREADME $INSTDIR\readme.txt # !define MUI_FINISHPAGE_SHOWREADME $INSTDIR\readme.txt
@ -76,12 +76,12 @@
;-------------------------------- ;--------------------------------
;Installer Sections ;Installer Sections
Section "companion9x" SecDummy Section "openTx companion" SecDummy
SetOutPath "$INSTDIR" SetOutPath "$INSTDIR"
File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\license.txt" File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\license.txt"
File "companion9x.exe" File "companion.exe"
File "C:\Programs\xerces\src\.libs\libxerces-c-3-1.dll" File "C:\Programs\xerces\src\.libs\libxerces-c-3-1.dll"
File "C:\MinGW\bin\libgcc_s_dw2-1.dll" File "C:\MinGW\bin\libgcc_s_dw2-1.dll"
File "C:\MinGW\bin\mingwm10.dll" File "C:\MinGW\bin\mingwm10.dll"
@ -105,10 +105,10 @@ Section "companion9x" SecDummy
WriteRegStr HKCU "Software\companion9x" "" $INSTDIR WriteRegStr HKCU "Software\companion9x" "" $INSTDIR
;Associate with extentions ,bin and .hex ;Associate with extentions ,bin and .hex
${registerExtension} "$INSTDIR\companion9x.exe" ".bin" "BIN_File" ${registerExtension} "$INSTDIR\companion.exe" ".bin" "BIN_File"
${registerExtension} "$INSTDIR\companion9x.exe" ".hex" "HEX_File" ${registerExtension} "$INSTDIR\companion.exe" ".hex" "HEX_File"
${registerExtension} "$INSTDIR\companion9x.exe" ".companion9x" "EEPE_File" ${registerExtension} "$INSTDIR\companion.exe" ".companion" "EEPE_File"
${registerExtension} "$INSTDIR\companion9x.exe" ".eepm" "EEPM_File" ${registerExtension} "$INSTDIR\companion.exe" ".eepm" "EEPM_File"
;Create uninstaller ;Create uninstaller
@ -118,7 +118,7 @@ Section "companion9x" SecDummy
;Create shortcuts ;Create shortcuts
CreateDirectory "$SMPROGRAMS\$StartMenuFolder" CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\companion9x.lnk" "$INSTDIR\companion9x.exe" CreateShortCut "$SMPROGRAMS\$StartMenuFolder\companion.lnk" "$INSTDIR\companion.exe"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe" CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
!insertmacro MUI_STARTMENU_WRITE_END !insertmacro MUI_STARTMENU_WRITE_END
@ -129,8 +129,8 @@ SectionEnd
;Descriptions ;Descriptions
;Language strings ;Language strings
LangString DESC_SecDummy ${LANG_ENGLISH} "companion9x EEPROM editor." LangString DESC_SecDummy ${LANG_ENGLISH} "Models and settings editor for openTx"
LangString DESC_SecDummy ${LANG_FRENCH} "companion9x editeur d'EEPROM" LangString DESC_SecDummy ${LANG_FRENCH} "Editeur de réglages et modèles pour openTx"
;Assign language strings to sections ;Assign language strings to sections
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
@ -145,7 +145,7 @@ Section "Uninstall"
;ADD YOUR OWN FILES HERE... ;ADD YOUR OWN FILES HERE...
Delete "$INSTDIR\license.txt" Delete "$INSTDIR\license.txt"
Delete "$INSTDIR\companion9x.exe" Delete "$INSTDIR\companion.exe"
Delete "$INSTDIR\libxerces-c-3-1.dll" Delete "$INSTDIR\libxerces-c-3-1.dll"
Delete "$INSTDIR\libgcc_s_dw2-1.dll" Delete "$INSTDIR\libgcc_s_dw2-1.dll"
Delete "$INSTDIR\mingwm10.dll" Delete "$INSTDIR\mingwm10.dll"
@ -169,11 +169,11 @@ Section "Uninstall"
${unregisterExtension} ".bin" "BIN File" ${unregisterExtension} ".bin" "BIN File"
${unregisterExtension} ".hex" "HEX File" ${unregisterExtension} ".hex" "HEX File"
${unregisterExtension} ".eepm" "EEPE File" ${unregisterExtension} ".eepm" "EEPE File"
${unregisterExtension} ".companion9x" "EEPM File" ${unregisterExtension} ".companion" "EEPM File"
!insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder
Delete "$SMPROGRAMS\$StartMenuFolder\companion9x.lnk" Delete "$SMPROGRAMS\$StartMenuFolder\companion.lnk"
Delete "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" Delete "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk"
RMDir "$SMPROGRAMS\$StartMenuFolder" RMDir "$SMPROGRAMS\$StartMenuFolder"
@ -182,5 +182,5 @@ Section "Uninstall"
SectionEnd SectionEnd
Function LaunchLink Function LaunchLink
ExecShell "" "$INSTDIR\companion9x.exe" ExecShell "" "$INSTDIR\companion.exe"
FunctionEnd FunctionEnd

34
companion/targets/windows/companion9x-vs.nsi.in → companion/targets/windows/companion-vs.nsi.in
View file

@ -12,11 +12,11 @@
;General ;General
;Name and file ;Name and file
Name "companion9x" Name "openTx companion"
OutFile "companion9xInstall_v@C9X_VERSION@.exe" OutFile "companionInstall_v@C9X_VERSION@.exe"
;Default installation folder ;Default installation folder
InstallDir "$PROGRAMFILES\companion9x" InstallDir "$PROGRAMFILES\openTx companion"
;Get installation folder from registry if available ;Get installation folder from registry if available
InstallDirRegKey HKCU "Software\companion9x" "" InstallDirRegKey HKCU "Software\companion9x" ""
@ -77,7 +77,7 @@
!define MUI_FINISHPAGE_NOAUTOCLOSE !define MUI_FINISHPAGE_NOAUTOCLOSE
!define MUI_FINISHPAGE_RUN !define MUI_FINISHPAGE_RUN
!define MUI_FINISHPAGE_RUN_CHECKED !define MUI_FINISHPAGE_RUN_CHECKED
!define MUI_FINISHPAGE_RUN_TEXT "Launch companion9x" !define MUI_FINISHPAGE_RUN_TEXT "Launch companion"
!define MUI_FINISHPAGE_RUN_FUNCTION "LaunchLink" !define MUI_FINISHPAGE_RUN_FUNCTION "LaunchLink"
# !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED # !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
# !define MUI_FINISHPAGE_SHOWREADME $INSTDIR\readme.txt # !define MUI_FINISHPAGE_SHOWREADME $INSTDIR\readme.txt
@ -95,12 +95,12 @@
;-------------------------------- ;--------------------------------
;Installer Sections ;Installer Sections
Section "companion9x" SecDummy Section "openTx companion" SecDummy
SetOutPath "$INSTDIR" SetOutPath "$INSTDIR"
File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\license.txt" File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\license.txt"
File "Release\companion9x.exe" File "Release\companion.exe"
${!defineifexist} PTHREAD_WINDIR "C:\Programs\pthreads\Pre-built.2\lib\pthreadVC2.dll" ${!defineifexist} PTHREAD_WINDIR "C:\Programs\pthreads\Pre-built.2\lib\pthreadVC2.dll"
!ifdef PTHREAD_WINDIR !ifdef PTHREAD_WINDIR
File "C:\Programs\pthreads\Pre-built.2\lib\pthreadVC2.dll" File "C:\Programs\pthreads\Pre-built.2\lib\pthreadVC2.dll"
@ -131,10 +131,10 @@ Section "companion9x" SecDummy
WriteRegStr HKCU "Software\companion9x" "" $INSTDIR WriteRegStr HKCU "Software\companion9x" "" $INSTDIR
;Associate with extentions ,bin and .hex ;Associate with extentions ,bin and .hex
${registerExtension} "$INSTDIR\companion9x.exe" ".bin" "BIN_File" ${registerExtension} "$INSTDIR\companion.exe" ".bin" "BIN_File"
${registerExtension} "$INSTDIR\companion9x.exe" ".hex" "HEX_File" ${registerExtension} "$INSTDIR\companion.exe" ".hex" "HEX_File"
${registerExtension} "$INSTDIR\companion9x.exe" ".companion9x" "EEPE_File" ${registerExtension} "$INSTDIR\companion.exe" ".companion" "EEPE_File"
${registerExtension} "$INSTDIR\companion9x.exe" ".eepm" "EEPM_File" ${registerExtension} "$INSTDIR\companion.exe" ".eepm" "EEPM_File"
;Create uninstaller ;Create uninstaller
@ -144,7 +144,7 @@ Section "companion9x" SecDummy
;Create shortcuts ;Create shortcuts
CreateDirectory "$SMPROGRAMS\$StartMenuFolder" CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\companion9x.lnk" "$INSTDIR\companion9x.exe" CreateShortCut "$SMPROGRAMS\$StartMenuFolder\companion.lnk" "$INSTDIR\companion.exe"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe" CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
!insertmacro MUI_STARTMENU_WRITE_END !insertmacro MUI_STARTMENU_WRITE_END
@ -155,8 +155,8 @@ SectionEnd
;Descriptions ;Descriptions
;Language strings ;Language strings
LangString DESC_SecDummy ${LANG_ENGLISH} "companion9x EEPROM editor." LangString DESC_SecDummy ${LANG_ENGLISH} "Models and settings editor for openTx"
LangString DESC_SecDummy ${LANG_FRENCH} "companion9x editeur d'EEPROM" LangString DESC_SecDummy ${LANG_FRENCH} "Editeur de réglages et modèles pour openTx"
;Assign language strings to sections ;Assign language strings to sections
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
@ -171,7 +171,7 @@ Section "Uninstall"
;ADD YOUR OWN FILES HERE... ;ADD YOUR OWN FILES HERE...
Delete "$INSTDIR\license.txt" Delete "$INSTDIR\license.txt"
Delete "$INSTDIR\companion9x.exe" Delete "$INSTDIR\companion.exe"
Delete "$INSTDIR\pthreadVC2.dll" Delete "$INSTDIR\pthreadVC2.dll"
Delete "$INSTDIR\xerces-c_3_1.dll" Delete "$INSTDIR\xerces-c_3_1.dll"
Delete "$INSTDIR\SDL.dll" Delete "$INSTDIR\SDL.dll"
@ -197,11 +197,11 @@ Section "Uninstall"
${unregisterExtension} ".bin" "BIN File" ${unregisterExtension} ".bin" "BIN File"
${unregisterExtension} ".hex" "HEX File" ${unregisterExtension} ".hex" "HEX File"
${unregisterExtension} ".eepm" "EEPE File" ${unregisterExtension} ".eepm" "EEPE File"
${unregisterExtension} ".companion9x" "EEPM File" ${unregisterExtension} ".companion" "EEPM File"
!insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder
Delete "$SMPROGRAMS\$StartMenuFolder\companion9x.lnk" Delete "$SMPROGRAMS\$StartMenuFolder\companion.lnk"
Delete "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" Delete "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk"
RMDir "$SMPROGRAMS\$StartMenuFolder" RMDir "$SMPROGRAMS\$StartMenuFolder"
@ -210,5 +210,5 @@ Section "Uninstall"
SectionEnd SectionEnd
Function LaunchLink Function LaunchLink
ExecShell "" "$INSTDIR\companion9x.exe" ExecShell "" "$INSTDIR\companion.exe"
FunctionEnd FunctionEnd