Changeset 421:b31840962826 in SMSSender


Ignore:
Timestamp:
May 8, 2014 5:53:42 PM (4 years ago)
Author:
Sämy Zehnder <saemy.zehnder@…>
Branch:
default
Message:
  • Updates the windows installer files to the newest version.
  • Fixes multi-language support in the windows installer.
  • Removes windows binaries from VCS.
  • Removes deprecated toolchain setup howtos.
Files:
26 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • deploy/win/languages/english.nsh

    r314 r421  
    1 StrCpy $Message_RunningProcess "There is a running SMSSender instance. $\nPlease close it before updating."
     1LangString Message_RunningProcess ${LANG_ENGLISH} "There is a running SMSSender instance. $\nPlease close it before updating."
    22
     3LangString Name_Sec_MainProgram ${LANG_ENGLISH} "SMSSender (required)"
     4LangString Name_Sec_Gateways ${LANG_ENGLISH} "SMS-Gateways"
     5LangString Name_Sec_Gtwy_ETHZ ${LANG_ENGLISH} "ETHZ"
     6LangString Name_Sec_Gtwy_Post ${LANG_ENGLISH} "Post"
     7LangString Name_Sec_Gtwy_Schoolnet ${LANG_ENGLISH} "Schoolnet"
     8LangString Name_Sec_Gtwy_Smartphone ${LANG_ENGLISH} "Smartphone"
     9LangString Name_Sec_Gtwy_Sunrise ${LANG_ENGLISH} "Sunrise"
    310
    4 StrCpy $Name_Sec_MainProgram "SMSSender (required)"
    5 StrCpy $Name_Sec_Gateways "SMS-Gateways"
    6 StrCpy $Name_Sec_Gtwy_ETHZ "ETHZ"
    7 StrCpy $Name_Sec_Gtwy_Post "Post"
    8 StrCpy $Name_Sec_Gtwy_Schoolnet "Schoolnet"
    9 StrCpy $Name_Sec_Gtwy_Sunrise "Sunrise"
     11LangString Desc_Sec_MainProgram ${LANG_ENGLISH} "The SMSSender itself."
     12LangString Desc_Sec_Gateways ${LANG_ENGLISH} "Gateways(i.e. Webpages) for sending SMS."
     13LangString Desc_Sec_Gtwy_ETHZ ${LANG_ENGLISH} "The interface for the ETHZ gateway."
     14LangString Desc_Sec_Gtwy_Post ${LANG_ENGLISH} "The interface for the Post gateway."
     15LangString Desc_Sec_Gtwy_Schoolnet ${LANG_ENGLISH} "The interface for the Schoolnet gateway."
     16LangString Desc_Sec_Gtwy_Smartphone ${LANG_ENGLISH} "The interface for connecting a Smartphone."
     17LangString Desc_Sec_Gtwy_Sunrise ${LANG_ENGLISH} "The interface for the Sunrise gateway."
    1018
    11 StrCpy $Desc_Sec_MainProgram "The SMSSender itself."
    12 StrCpy $Desc_Sec_Gateways "Gateways(i.e. Webpages) for sending SMS."
    13 StrCpy $Desc_Sec_Gtwy_ETHZ "The interface for the ETHZ gateway."
    14 StrCpy $Desc_Sec_Gtwy_Post "The interface for the Post gateway."
    15 StrCpy $Desc_Sec_Gtwy_Schoolnet "The interface for the Schoolnet gateway."
    16 StrCpy $Desc_Sec_Gtwy_Sunrise "The interface for the Sunrise gateway."
     19LangString Message_AlreadyInstalled ${LANG_ENGLISH}  "SMSSender has already been installed. $\nDo you want to remove the previous version before installing $(^Name) ?"
    1720
     21LangString Name_Sec_Uninstall ${LANG_ENGLISH} "Uninstall"
     22LangString Name_Sec_Uninstall_Prefs ${LANG_ENGLISH} "Uninstall preferences and the contact list"
    1823
    19 StrCpy $Message_AlreadyInstalled  "SMSSender has already been installed. $\nDo you want to remove the previous version before installing $(^Name) ?"
     24LangString Desc_Sec_Uninstall ${LANG_ENGLISH} "Uninstall SMSSender and all its components"
     25LangString Desc_Sec_Uninstall_Prefs ${LANG_ENGLISH} "Uninstall preferences and the contact list"
    2026
    21 StrCpy $Name_Sec_Uninstall "Uninstall"
    22 StrCpy $Name_Sec_Uninstall_Prefs "Uninstall preferences and the contact list"
     27LangString Link_VisitWebsite ${LANG_ENGLISH} "Visit the SMSSender project page"
    2328
    24 StrCpy $Desc_Sec_Uninstall "Uninstall SMSSender and all its components"
    25 StrCpy $Desc_Sec_Uninstall_Prefs "Uninstall preferences and the contact list"
    26 
    27 StrCpy $Link_VisitWebsite "Visit the SMSSender project page"
    28 
    29 StrCpy $Name_InstTypeMinimum "Minimum"
    30 StrCpy $Name_InstTypeFull "Full"
     29LangString Name_InstTypeMinimum ${LANG_ENGLISH} "Minimum"
     30LangString Name_InstTypeFull ${LANG_ENGLISH} "Full"
  • deploy/win/languages/german.nsh

    r314 r421  
    1 StrCpy $Message_RunningProcess "Eine Instanz des Programms SMSSender ist am laufen: $\nBitte schliessen Sie diese bevor Sie mit dem Update fortfahren."
     1LangString Message_RunningProcess ${LANG_GERMAN} "Eine Instanz des Programms SMSSender ist am laufen: $\nBitte schliessen Sie diese bevor Sie mit dem Update fortfahren."
    22
     3LangString Name_Sec_MainProgram ${LANG_GERMAN} "SMSSender (benötigt)"
     4LangString Name_Sec_Gateways ${LANG_GERMAN} "SMS-Dienste"
     5LangString Name_Sec_Gtwy_ETHZ ${LANG_GERMAN} "ETHZ"
     6LangString Name_Sec_Gtwy_Post ${LANG_GERMAN} "Post"
     7LangString Name_Sec_Gtwy_Schoolnet ${LANG_GERMAN} "Schoolnet"
     8LangString Name_Sec_Gtwy_Smartphone ${LANG_GERMAN} "Smartphone"
     9LangString Name_Sec_Gtwy_Sunrise ${LANG_GERMAN} "Sunrise"
    310
    4 StrCpy $Name_Sec_MainProgram "SMSSender (benötigt)"
    5 StrCpy $Name_Sec_Gateways "SMS-Dienste"
    6 StrCpy $Name_Sec_Gtwy_ETHZ "ETHZ"
    7 StrCpy $Name_Sec_Gtwy_Post "Post"
    8 StrCpy $Name_Sec_Gtwy_Schoolnet "Schoolnet"
    9 StrCpy $Name_Sec_Gtwy_Sunrise "Sunrise"
     11LangString Desc_Sec_MainProgram ${LANG_GERMAN} "Das Programm SMSSender."
     12LangString Desc_Sec_Gateways ${LANG_GERMAN} "Dienste(z.B. Webseiten) für den SMS-Versandt."
     13LangString Desc_Sec_Gtwy_ETHZ ${LANG_GERMAN} "Das Plugin für den ETHZ SMS-Webdienst."
     14LangString Desc_Sec_Gtwy_Post ${LANG_GERMAN} "Das Plugin für den Post SMS-Webdienst."
     15LangString Desc_Sec_Gtwy_Schoolnet ${LANG_GERMAN} "Das Plugin für den Schoolnet SMS-Webdienst."
     16LangString Desc_Sec_Gtwy_Smartphone ${LANG_GERMAN} "Das Plugin für die Verbindung mit einem Smartphone."
     17LangString Desc_Sec_Gtwy_Sunrise ${LANG_GERMAN} "Das Plugin für den Sunrise SMS-Webdienst."
    1018
    11 StrCpy $Desc_Sec_MainProgram "Das Programm SMSSender."
    12 StrCpy $Desc_Sec_Gateways "Dienste(z.B. Webseiten) für den SMS-Versandt."
    13 StrCpy $Desc_Sec_Gtwy_ETHZ "Das Plugin für den ETHZ SMS-Webdienst."
    14 StrCpy $Desc_Sec_Gtwy_Post "Das Plugin für den Post SMS-Webdienst."
    15 StrCpy $Desc_Sec_Gtwy_Schoolnet "Das Plugin für den Schoolnet SMS-Webdienst."
    16 StrCpy $Desc_Sec_Gtwy_Sunrise "Das Plugin für den Sunrise SMS-Webdienst."
     19LangString Message_AlreadyInstalled ${LANG_GERMAN}  "SMSSender wurde bereits installiert. $\nSoll die alte Version entfernt werden, bevor $(^Name) installiert wird?"
    1720
     21LangString Name_Sec_Uninstall ${LANG_GERMAN} "Entfernen"
     22LangString Name_Sec_Uninstall_Prefs ${LANG_GERMAN} "Entferne die Einstellungen und Kontaktliste"
    1823
    19 StrCpy $Message_AlreadyInstalled  "SMSSender wurde bereits installiert. $\nSoll die alte Version entfernt werden, bevor $(^Name) installiert wird?"
     24LangString Desc_Sec_Uninstall ${LANG_GERMAN} "Entferne SMSSender und alle zugehörigen Komponenten"
     25LangString Desc_Sec_Uninstall_Prefs ${LANG_GERMAN} "Entferne die Einstellungen und die Kontaktliste"
    2026
    21 StrCpy $Name_Sec_Uninstall "Entfernen"
    22 StrCpy $Name_Sec_Uninstall_Prefs "Entferne die Einstellungen und Kontaktliste"
     27LangString Link_VisitWebsite ${LANG_GERMAN} "Besuchen Sie die SMSSender Projektseite"
    2328
    24 StrCpy $Desc_Sec_Uninstall "Entferne SMSSender und alle zugehörigen Komponenten"
    25 StrCpy $Desc_Sec_Uninstall_Prefs "Entferne die Einstellungen und die Kontaktliste"
    26 
    27 StrCpy $Link_VisitWebsite "Besuchen Sie die SMSSender Projektseite"
    28 
    29 StrCpy $Name_InstTypeMinimum "Minimum"
    30 StrCpy $Name_InstTypeFull "Voll"
     29LangString Name_InstTypeMinimum ${LANG_GERMAN} "Minimum"
     30LangString Name_InstTypeFull ${LANG_GERMAN} "Voll"
  • deploy/win/setup.nsi

    r314 r421  
    33; (http://nsis.sourceforge.net)       ;
    44;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
    5  
    6  
    7 !include "languages\declaration.nsh"
     5 !define MUI_CUSTOMFUNCTION_GUIINIT myGuiInit
     6 
     7!define build_path "c:\development\smssender-build"
     8!define mingw_path "c:\toolchain\MinGW"
     9!define openssl_path "c:\toolchain\OpenSSL"
     10!define qt_path "c:\toolchain\Qt\4.8.6"
    811 
    912!define PRODUCT_NAME "SMSSender"
    10 !define MAJOR_VERSION "3.0"
    11 !define VERSION "3.0.beta2"
     13!define MAJOR_VERSION "3"
     14!define VERSION "3.2"
    1215!define PRODUCT_VERSION "${VERSION}"
    1316!define PRODUCT_GROUP "gorrion"
     
    4245!define UMUI_PREUNINSTALL_FUNCTION preuninstall_function
    4346 
    44 !define STARTMENU_DIR "$SMPROGRAMS\${PRODUCT_GROUP}\${PRODUCT_NAME}${MAJOR_VERSION}"
     47!define STARTMENU_DIR "$SMPROGRAMS\${PRODUCT_NAME}"
    4548
    4649;;;;;;;;;;;;;
     
    5760        Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
    5861        OutFile SMSSender-${VERSION}-win32.exe
    59         InstallDir "$PROGRAMFILES\${PRODUCT_GROUP}\${PRODUCT_NAME}${MAJOR_VERSION}"
     62        InstallDir "$PROGRAMFILES\${PRODUCT_NAME}"
    6063        InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
    6164        !ifdef NSIS_LZMA_COMPRESS_WHOLE
     
    6770         
    6871        ;Request application privileges for Windows Vista
    69                 RequestExecutionLevel admin
     72        RequestExecutionLevel admin
    7073
    7174         
    7275        ;ShowInstDetails show
    7376        ;ShowUnInstDetails show
    74                 SetOverwrite ifnewer
    75                 CRCCheck on
    76                 BrandingText "${PRODUCT_GROUP} ${PRODUCT_NAME}"
     77        SetOverwrite ifnewer
     78        CRCCheck on
     79        BrandingText "${PRODUCT_NAME}"
    7780 
    7881        ;Installation types
    79                 InstType $Name_InstTypeFull
    80                 InstType $Name_InstTypeMinimum
     82        InstType $(Name_InstTypeFull)
     83        InstType $(Name_InstTypeMinimum)
    8184 
    8285 
     
    111114                !insertmacro UMUI_PAGE_UPDATE
    112115  ; License page
    113     !insertmacro MUI_PAGE_LICENSE "files\copyright.txt"
     116    !insertmacro MUI_PAGE_LICENSE "..\..\copyright.txt"
    114117  ; Components page
    115118                !define UMUI_COMPONENTSPAGE_REGISTRY_VALUENAME "components"
     
    129132    !insertmacro MUI_PAGE_INSTFILES
    130133  ; Finish page
    131     !define MUI_FINISHPAGE_RUN "$INSTDIR\smssender.exe"
     134    !define MUI_FINISHPAGE_RUN "$INSTDIR\bin\smssender.exe"
    132135                !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\changelog.txt"
    133136                !define MUI_TEXT_FINISH_SHOWREADME "&Show Changelog"
     
    135138;    !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\README.txt"
    136139;    !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
    137     !define MUI_FINISHPAGE_LINK $Link_VisitWebsite
     140    !define MUI_FINISHPAGE_LINK $(Link_VisitWebsite)
    138141    !define MUI_FINISHPAGE_LINK_LOCATION "${PRODUCT_WEB_SITE}"
    139142    !define MUI_FINISHPAGE_NOREBOOTSUPPORT
     
    154157  !insertmacro MUI_LANGUAGE "English" # first language is the default language
    155158  !insertmacro MUI_LANGUAGE "German"
    156  
     159  !include "languages\english.nsh" 
     160  !include "languages\german.nsh" 
     161
    157162 
    158163; Reserve files for solid compression
     
    199204  "${Index}-Loop:"
    200205    StrCmp $1 "" "${Index}-End"
    201                 !insertmacro WriteFileToUninstallLog "${FILEPATH}$1$\r$\n"
     206        !insertmacro WriteFileToUninstallLog "${FILEPATH}$1$\r$\n"
    202207    FindNext $0 $1
    203208    Goto "${Index}-Loop"
     
    249254
    250255
    251 Section $Name_Sec_MainProgram Sec_MainProgram
     256Section $(Name_Sec_MainProgram) Sec_MainProgram
    252257        SectionIn 1 2 RO
    253   SetShellVarContext all
    254   SetOutPath "$INSTDIR"
     258        SetShellVarContext all
     259        SetOutPath "$INSTDIR"
    255260 
    256261        FileOpen $9 $INSTDIR\version w
     
    260265 
    261266  !insertmacro OpenUninstallLog
    262           !insertmacro InstallFile "files\" copyright.txt ""
    263           !insertmacro InstallFile "files\" efsadu.dll ""
    264           !insertmacro InstallFile "files\" libeay32.dll ""
    265           !insertmacro InstallFile "files\" libgcc_s_dw2-1.dll ""
    266           !insertmacro InstallFile "files\" libstdc++-6.dll ""
    267           !insertmacro InstallFile "files\" mingwm10.dll ""
    268           !insertmacro InstallFile "files\" msvcp60.dll ""
    269           !insertmacro InstallFile "files\" msvcr90.dll ""
    270           !insertmacro InstallFile "files\" msvcrt.dll ""
    271           !insertmacro InstallFile "files\" QtCore4.dll ""
    272           !insertmacro InstallFile "files\" QtGui4.dll ""
    273           !insertmacro InstallFile "files\" QtNetwork4.dll ""
    274           !insertmacro InstallFile "files\" QtSql4.dll ""
    275           !insertmacro InstallFile "files\" QtXml4.dll ""
    276           !insertmacro InstallFile "..\..\release\" smssender.exe ""
    277           !insertmacro InstallFile "..\..\lib\" datatypes3.dll ""
    278           !insertmacro InstallFile "files\" ssleay32.dll ""
    279 
    280           SetOutPath "$INSTDIR\lib\imageformats"
    281           !insertmacro InstallFile "files\lib\imageformats\" qgif4.dll "lib\imageformats\"
    282           !insertmacro InstallFile "files\lib\imageformats\" qico4.dll "lib\imageformats\"
    283           !insertmacro InstallFile "files\lib\imageformats\" qjpeg4.dll "lib\imageformats\"
    284           !insertmacro InstallFile "files\lib\imageformats\" qmng4.dll "lib\imageformats\"
    285           !insertmacro InstallFile "files\lib\imageformats\" qsvg4.dll "lib\imageformats\"
    286           !insertmacro InstallFile "files\lib\imageformats\" qtiff4.dll "lib\imageformats\"
    287 
    288           SetOutPath "$INSTDIR\lib\sqldrivers"
    289           !insertmacro InstallFile "files\lib\sqldrivers\" qsqlite4.dll "lib\sqldrivers\"
     267          SetOutPath "$INSTDIR"
     268          !insertmacro InstallFile "..\..\" copyright.txt ""
     269      CreateShortCut "$INSTDIR\smssender.lnk" "$INSTDIR\bin\smssender.exe"
     270          !insertmacro WriteFileToUninstallLog "smssender.lnk$\r$\n"
     271         
     272          SetOutPath "$INSTDIR\bin"
     273          !insertmacro InstallFile "${build_path}\" smssender.exe "bin\"
     274          !insertmacro InstallFile "${build_path}\" common-gui3.dll "bin\"
     275          !insertmacro InstallFile "${build_path}\" gateways-common-gui3.dll "bin\"
     276         
     277          !insertmacro InstallFile "${mingw_path}\bin\" cryptopp.dll "bin\"
     278          !insertmacro InstallFile "${mingw_path}\bin\" libgcc_s_dw2-1.dll "bin\"
     279          !insertmacro InstallFile "${mingw_path}\bin\" libqjson.dll "bin\"
     280          !insertmacro InstallFile "${mingw_path}\bin\" libstdc++-6.dll "bin\"
     281          !insertmacro InstallFile "${openssl_path}\" libeay32.dll "bin\"
     282          !insertmacro InstallFile "${openssl_path}\" libssl32.dll "bin\"
     283          !insertmacro InstallFile "${openssl_path}\" ssleay32.dll "bin\"
     284          !insertmacro InstallFile "${qt_path}\bin\" libwinpthread-1.dll "bin\"
     285          !insertmacro InstallFile "${qt_path}\bin\" QtCore4.dll "bin\"
     286          !insertmacro InstallFile "${qt_path}\bin\" QtGui4.dll "bin\"
     287          !insertmacro InstallFile "${qt_path}\bin\" QtNetwork4.dll "bin\"
     288          !insertmacro InstallFile "${qt_path}\bin\" QtSql4.dll "bin\"
     289          !insertmacro InstallFile "${qt_path}\bin\" QtXml4.dll "bin\"
     290;         !insertmacro InstallFile "files\" efsadu.dll ""
     291;         !insertmacro InstallFile "files\" mingwm10.dll ""
     292;         !insertmacro InstallFile "files\" msvcp60.dll ""
     293;         !insertmacro InstallFile "files\" msvcr90.dll ""
     294;         !insertmacro InstallFile "files\" msvcrt.dll ""
     295         
     296          SetOutPath "$INSTDIR\bin\imageformats"
     297          !insertmacro InstallFile "${qt_path}\plugins\imageformats\" qgif4.dll "bin\imageformats\"
     298          !insertmacro InstallFile "${qt_path}\plugins\imageformats\" qico4.dll "bin\imageformats\"
     299          !insertmacro InstallFile "${qt_path}\plugins\imageformats\" qjpeg4.dll "bin\imageformats\"
     300          !insertmacro InstallFile "${qt_path}\plugins\imageformats\" qmng4.dll "bin\imageformats\"
     301          !insertmacro InstallFile "${qt_path}\plugins\imageformats\" qsvg4.dll "bin\imageformats\"
     302          !insertmacro InstallFile "${qt_path}\plugins\imageformats\" qtga4.dll "bin\imageformats\"
     303          !insertmacro InstallFile "${qt_path}\plugins\imageformats\" qtiff4.dll "bin\imageformats\"
     304
     305          SetOutPath "$INSTDIR\bin\sqldrivers"
     306          !insertmacro InstallFile "${qt_path}\plugins\sqldrivers\" qsqlite4.dll "bin\sqldrivers\"
    290307
    291308
     
    298315SectionEnd
    299316
    300 SectionGroup /e $Name_Sec_Gateways Sec_Gateways
    301 
    302         Section $Name_Sec_Gtwy_ETHZ Sec_Gtwy_ETHZ
     317SectionGroup /e $(Name_Sec_Gateways) Sec_Gateways
     318
     319        Section $(Name_Sec_Gtwy_ETHZ) Sec_Gtwy_ETHZ
    303320                SectionIn 1
    304321                SetOutPath "$INSTDIR\gateways"
    305322               
    306323                !insertmacro OpenUninstallLog
    307                         !insertmacro InstallFile "..\..\gateways\" ETHZ1.dll "gateways\"
     324                        !insertmacro InstallFile "${build_path}\gateways\" ethz-gui3.dll "gateways\"
    308325                !insertmacro CloseUninstallLog
    309326        SectionEnd
    310         Section $Name_Sec_Gtwy_Post Sec_Gtwy_Post
     327        Section $(Name_Sec_Gtwy_Post) Sec_Gtwy_Post
    311328                SectionIn 1
    312329                SetOutPath "$INSTDIR\gateways"
    313330               
    314331                !insertmacro OpenUninstallLog
    315                         !insertmacro InstallFile "..\..\gateways\" Post1.dll "gateways\"
     332                        !insertmacro InstallFile "${build_path}\gateways\" post-gui3.dll "gateways\"
    316333                !insertmacro CloseUninstallLog
    317334        SectionEnd
    318         Section $Name_Sec_Gtwy_Schoolnet Sec_Gtwy_Schoolnet
     335        Section $(Name_Sec_Gtwy_Schoolnet) Sec_Gtwy_Schoolnet
    319336                SectionIn 1
    320337                SetOutPath "$INSTDIR\gateways"
    321338               
    322339                !insertmacro OpenUninstallLog
    323                         !insertmacro InstallFile "..\..\gateways\" Schoolnet2.dll "gateways\"
     340                        !insertmacro InstallFile "${build_path}\gateways\" schoolnet-gui3.dll "gateways\"
    324341                !insertmacro CloseUninstallLog
    325342        SectionEnd
    326         Section $Name_Sec_Gtwy_Sunrise Sec_Gtwy_Sunrise
     343        Section $(Name_Sec_Gtwy_Smartphone) Sec_Gtwy_Smartphone
    327344                SectionIn 1
    328345                SetOutPath "$INSTDIR\gateways"
    329346               
    330347                !insertmacro OpenUninstallLog
    331                         !insertmacro InstallFile "..\..\gateways\" Sunrise2.dll "gateways\"
     348                        !insertmacro InstallFile "${build_path}\gateways\" smartphone-gui3.dll "gateways\"
     349                !insertmacro CloseUninstallLog
     350        SectionEnd
     351        Section $(Name_Sec_Gtwy_Sunrise) Sec_Gtwy_Sunrise
     352                SectionIn 1
     353                SetOutPath "$INSTDIR\gateways"
     354               
     355                !insertmacro OpenUninstallLog
     356                        !insertmacro InstallFile "${build_path}\gateways\" sunrise-gui3.dll "gateways\"
    332357                !insertmacro CloseUninstallLog
    333358        SectionEnd
     
    383408  !insertmacro confirm_addline Gtwy_Post
    384409  !insertmacro confirm_addline Gtwy_Schoolnet
     410  !insertmacro confirm_addline Gtwy_Smartphone
    385411  !insertmacro confirm_addline Gtwy_Sunrise
    386412FunctionEnd
     
    395421  !insertmacro UMUI_COMPONENT Sec_Gtwy_Post
    396422  !insertmacro UMUI_COMPONENT Sec_Gtwy_Schoolnet
     423  !insertmacro UMUI_COMPONENT Sec_Gtwy_Smartphone
    397424  !insertmacro UMUI_COMPONENT Sec_Gtwy_Sunrise
    398425  !insertmacro UMUI_DECLARECOMPONENTS_END
     
    400427  ;Assign language strings to sections
    401428  !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
    402   !insertmacro MUI_DESCRIPTION_TEXT ${Sec_MainProgram} $Desc_Sec_MainProgram
    403   !insertmacro MUI_DESCRIPTION_TEXT ${Sec_Gateways} $Desc_Sec_Gateways
    404   !insertmacro MUI_DESCRIPTION_TEXT ${Sec_Gtwy_ETHZ} $Desc_Sec_Gtwy_ETHZ
    405   !insertmacro MUI_DESCRIPTION_TEXT ${Sec_Gtwy_Post} $Desc_Sec_Gtwy_Post
    406   !insertmacro MUI_DESCRIPTION_TEXT ${Sec_Gtwy_Schoolnet} $Desc_Sec_Gtwy_Schoolnet
    407   !insertmacro MUI_DESCRIPTION_TEXT ${Sec_Gtwy_Sunrise} $Desc_Sec_Gtwy_Sunrise
     429  !insertmacro MUI_DESCRIPTION_TEXT ${Sec_MainProgram} $(Desc_Sec_MainProgram)
     430  !insertmacro MUI_DESCRIPTION_TEXT ${Sec_Gateways} $(Desc_Sec_Gateways)
     431  !insertmacro MUI_DESCRIPTION_TEXT ${Sec_Gtwy_ETHZ} $(Desc_Sec_Gtwy_ETHZ)
     432  !insertmacro MUI_DESCRIPTION_TEXT ${Sec_Gtwy_Post} $(Desc_Sec_Gtwy_Post)
     433  !insertmacro MUI_DESCRIPTION_TEXT ${Sec_Gtwy_Schoolnet} $(Desc_Sec_Gtwy_Schoolnet)
     434  !insertmacro MUI_DESCRIPTION_TEXT ${Sec_Gtwy_Smartphone} $(Desc_Sec_Gtwy_Smartphone)
     435  !insertmacro MUI_DESCRIPTION_TEXT ${Sec_Gtwy_Sunrise} $(Desc_Sec_Gtwy_Sunrise)
    408436  !insertmacro MUI_FUNCTION_DESCRIPTION_END
    409437
     
    412440Function .onInit
    413441  !insertmacro MUI_LANGDLL_DISPLAY
    414 
    415   !include "languages\english.nsh" 
    416   !include "languages\german.nsh" 
    417 
     442FunctionEnd
     443
     444Function myGuiInit
    418445  loop:
    419446    ${nsProcess::FindProcess} "smssender.exe" $R0
    420447    StrCmp $R0 0 0 +3
    421     MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION $Message_RunningProcess IDOK loop IDCANCEL cancel
     448    MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION $(Message_RunningProcess) IDOK loop IDCANCEL cancel
    422449  cancel:
    423450    Abort
     
    436463  StrCmp $R1 1 done ; If it is newer than 2.2.0.0
    437464 
    438   MessageBox MB_YESNO|MB_ICONEXCLAMATION $Message_AlreadyInstalled IDNO done
     465  MessageBox MB_YESNO|MB_ICONEXCLAMATION $(Message_AlreadyInstalled) IDNO done
    439466
    440467  ;Run the uninstaller
     
    454481  WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "InstallDir" $INSTDIR
    455482  WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "Version" "${VERSION}"
    456   WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\smssender.exe"
     483  WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\bin\smssender.exe"
    457484 
    458485 
    459486  WriteRegStr ${PRODUCT_REG_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
    460487  WriteRegStr ${PRODUCT_REG_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninstall.exe"
    461   WriteRegStr ${PRODUCT_REG_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\smssender.exe"
     488  WriteRegStr ${PRODUCT_REG_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\bin\smssender.exe"
    462489  WriteRegStr ${PRODUCT_REG_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
    463490  WriteRegStr ${PRODUCT_REG_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
     
    466493  ;Save Startmenu items, if needed
    467494  !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
    468     CreateShortCut "$DESKTOP\smssender.lnk" "$INSTDIR\smssender.exe"
     495    CreateShortCut "$DESKTOP\smssender.lnk" "$INSTDIR\bin\smssender.exe"
    469496    CreateDirectory "${STARTMENU_DIR}"
    470     CreateShortCut "${STARTMENU_DIR}\smssender.lnk" "$INSTDIR\smssender.exe"
     497    CreateShortCut "${STARTMENU_DIR}\smssender.lnk" "$INSTDIR\bin\smssender.exe"
    471498    CreateShortCut "${STARTMENU_DIR}\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
    472499  !insertmacro MUI_STARTMENU_WRITE_END
     
    554581 
    555582 
    556 Section "un.$Name_Sec_Uninstall" Sec_Uninstall
     583Section "un.$(Name_Sec_Uninstall)" Sec_Uninstall
    557584  SectionIn 1 2 RO
    558585  SetShellVarContext all
     
    589616  Delete "${STARTMENU_DIR}\SMSSender.lnk"
    590617  RMDir "${STARTMENU_DIR}"
    591   RMDir "$SMPROGRAMS\${PRODUCT_GROUP}"
     618  RMDir "$SMPROGRAMS\${PRODUCT_NAME}"
    592619SectionEnd
    593620
    594621
    595 Section /o "un.$Name_Sec_Uninstall_Prefs" Sec_Uninstall_Prefs
     622Section /o "un.$(Name_Sec_Uninstall_Prefs)" Sec_Uninstall_Prefs
    596623  Delete "$INSTDIR\accounts.ini"
    597624  Delete "$INSTDIR\contacts.ini"
     
    605632; Uninstaller section descriptions
    606633!insertmacro MUI_UNFUNCTION_DESCRIPTION_BEGIN
    607 !insertmacro MUI_DESCRIPTION_TEXT ${Sec_Uninstall} $Desc_Sec_Uninstall
    608 !insertmacro MUI_DESCRIPTION_TEXT ${Sec_Uninstall_Prefs} $Desc_Sec_Uninstall_Prefs
     634!insertmacro MUI_DESCRIPTION_TEXT ${Sec_Uninstall} $(Desc_Sec_Uninstall)
     635!insertmacro MUI_DESCRIPTION_TEXT ${Sec_Uninstall_Prefs} $(Desc_Sec_Uninstall_Prefs)
    609636!insertmacro MUI_UNFUNCTION_DESCRIPTION_END
    610637 
    611638Function un.onInit
    612639  !insertmacro MUI_UNGETLANGUAGE
    613  
    614   !include "languages\english.nsh"
    615   !include "languages\german.nsh"
    616640FunctionEnd
Note: See TracChangeset for help on using the changeset viewer.