Skip to content

Commit

Permalink
Build system changes to allow for both 32bit and 64bit installer gene…
Browse files Browse the repository at this point in the history
…ration
  • Loading branch information
malcom2073 committed May 28, 2013
1 parent 0e085bb commit 188ee4c
Show file tree
Hide file tree
Showing 2 changed files with 142 additions and 16 deletions.
32 changes: 16 additions & 16 deletions emstudio.cross.nsi → emstudio32.cross.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ Section "EMStudio (Required)" ;No components page, name is not important
SetOutPath "$INSTDIR\dashboards"
File "core/src/gauges.qml"
SetOutPath "$INSTDIR\plugins"
File "core/plugins/freeemsplugin.lib"
File "core/plugins/libfreeemsplugin.a"

; Write the installation path into the registry
WriteRegStr HKLM SOFTWARE\EMStudio "Install_Dir" "$INSTDIR"
Expand All @@ -74,21 +74,21 @@ Section "Qt Components"

SetOutPath $INSTDIR

File /usr/lib/qt4win32/QtCore4.dll
File /usr/lib/qt4win32/QtGui4.dll
File /usr/lib/qt4win32/QtOpenGL4.dll
File /usr/lib/qt4win32/QtSvg4.dll
File /usr/lib/qt4win32/QtDeclarative4.dll
File /usr/lib/qt4win32/QtGui4.dll
File /usr/lib/qt4win32/QtNetwork4.dll
File /usr/lib/qt4win32/QtScript4.dll
File /usr/lib/qt4win32/QtSql4.dll
File /usr/lib/qt4win32/QtXml4.dll
File /usr/lib/qt4win32/QtXmlPatterns4.dll
File /home/michael/QtWin/libs/qwt/bin/qwt.dll
File /home/michael/QtWin/libs/qjson/bin/qjson0.dll
File /usr/share/doc/mingw32-runtime/mingwm10.dll
File /home/michael/QtWin/lib/libgcc_s_dw2-1.dll
File /home/michael/QtWin32/lib/QtCore4.dll
File /home/michael/QtWin32/lib/QtGui4.dll
File /home/michael/QtWin32/lib/QtOpenGL4.dll
File /home/michael/QtWin32/lib/QtSvg4.dll
File /home/michael/QtWin32/lib/QtDeclarative4.dll
File /home/michael/QtWin32/lib/QtGui4.dll
File /home/michael/QtWin32/lib/QtNetwork4.dll
File /home/michael/QtWin32/lib/QtScript4.dll
File /home/michael/QtWin32/lib/QtSql4.dll
File /home/michael/QtWin32/lib/QtXml4.dll
File /home/michael/QtWin32/lib/QtXmlPatterns4.dll
File /home/michael/QtWin32/libs/qwt/bin/qwt.dll
File /home/michael/QtWin32/libs/qjson/bin/qjson0.dll
File /home/michael/QtWin32/lib/mingwm10.dll
File /home/michael/QtWin32/lib/libgcc_s_dw2-1.dll

SectionEnd

Expand Down
126 changes: 126 additions & 0 deletions emstudio64.cross.nsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
; example1.nsi
;
; This script is perhaps one of the simplest NSIs you can make. All of the
; optional settings are left to their default settings. The installer simply
; prompts the user asking them where to install, and drops a copy of example1.nsi
; there.

;--------------------------------

; The name of the installer
Name "EMStudio"

; The file to write
OutFile "EMStudioInstaller.exe"

; The default installation directory
InstallDir $PROGRAMFILES\EMStudio

InstallDirRegKey HKLM "Software\EMStudio" "Install_Dir"

; Request application privileges for Windows Vista
RequestExecutionLevel admin

;--------------------------------

; Pages

Page components
Page directory
Page instfiles

UninstPage uninstConfirm
UninstPage instfiles

;--------------------------------

; The stuff to install
Section "EMStudio (Required)" ;No components page, name is not important

SectionIn RO

; Set output path to the installation directory.
SetOutPath $INSTDIR

; Put file there
; These files should be local to this script
;File "/home/michael/code/emstudio/release/emstudio.exe"
;File "/home/michael/code/emstudio/src/gauges.qml"
;File "/home/michael/code/emstudio/freeems.config.json"
File "core/release/emstudio.exe"



SetOutPath "$INSTDIR\definitions"
File "core/freeems.config.json"
File "core/decodersettings.json"
SetOutPath "$INSTDIR\dashboards"
File "core/src/gauges.qml"
SetOutPath "$INSTDIR\plugins"
File "core/plugins/libfreeemsplugin.a"

; Write the installation path into the registry
WriteRegStr HKLM SOFTWARE\EMStudio "Install_Dir" "$INSTDIR"

; Write the uninstall keys for Windows
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\EMStudio" "DisplayName" "EMStudio"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\EMStudio" "UninstallString" '"$INSTDIR\uninstall.exe"'
WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\EMStudio" "NoModify" 1
WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\FreeTune" "NoRepair" 1
WriteUninstaller "uninstall.exe"
SectionEnd ; end the section

Section "Qt Components"

SetOutPath $INSTDIR

File /home/michael/QtWin64/lib/QtCore4.dll
File /home/michael/QtWin64/lib/QtGui4.dll
File /home/michael/QtWin64/lib/QtOpenGL4.dll
File /home/michael/QtWin64/lib/QtSvg4.dll
File /home/michael/QtWin64/lib/QtDeclarative4.dll
File /home/michael/QtWin64/lib/QtGui4.dll
File /home/michael/QtWin64/lib/QtNetwork4.dll
File /home/michael/QtWin64/lib/QtScript4.dll
File /home/michael/QtWin64/lib/QtSql4.dll
File /home/michael/QtWin64/lib/QtXml4.dll
File /home/michael/QtWin64/lib/QtXmlPatterns4.dll
File /home/michael/QtWin64/libs/qwt/bin/qwt.dll
File /home/michael/QtWin64/libs/qjson/bin/qjson0.dll
File /home/michael/QtWin64/lib/mingwm10.dll
File /home/michael/QtWin64/lib/libgcc_s_dw2-1.dll

SectionEnd

; Optional section (can be disabled by the user)
Section "Start Menu Shortcuts"

CreateDirectory "$SMPROGRAMS\EMStudio"
CreateShortCut "$SMPROGRAMS\EMStudio\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
CreateShortCut "$SMPROGRAMS\EMStudio\EMStudio.lnk" "$INSTDIR\EMStudio.exe" "" "$INSTDIR\EMStudio.exe" 0

SectionEnd

;--------------------------------

; Uninstaller

Section "Uninstall"

; Remove registry keys
DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\EMStudio"
DeleteRegKey HKLM SOFTWARE\EMStudio

; Remove files and uninstaller
Delete $INSTDIR\EMStudio.exe
Delete $INSTDIR\uninstall.exe
Delete $INSTDIR\*.*"
; Remove shortcuts, if any
Delete "$SMPROGRAMS\EMStudio\*.*"
; Remove directories used
RMDir "$SMPROGRAMS\EMStudio"
RMDir "$INSTDIR"
SectionEnd

0 comments on commit 188ee4c

Please sign in to comment.