Updated release scripts for Windows

OpenBoard.iss

@@ -8,7 +8,7 @@
 ; NOTE: The value of AppId uniquely identifies this application.
 ; Do not use the same AppId value in installers for other applications.
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
-AppId={{F6E79ADE-83AE-4A2E-92D7-145BDC014271}
+AppId={{8CCA6AC7-BBF9-4DD2-8E70-A907E0FCA38F}}
 AppName=OpenBoard
 AppVerName=OpenBoard {#ApplicationVersion}
 AppPublisher=Open Education Foundation
@@ -46,58 +46,80 @@ Type: filesandordirs ; Name: "{app}\plugins"
 Type: filesandordirs ; Name: "{app}\i18n"
 Type: files ; Name: "{app}\*.dll"
 
+
+#define QtLibs GetEnv('QT_BIN')
+#define QtDir GetEnv('QT_DIR')
+
 [Files]
 Source: "..\OpenBoard-ThirdParty\microsoft\vcredist_x86.exe"; DestDir:"{tmp}"
 Source: "build\win32\release\product\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 
 ;OpenSSL
-Source: "..\OpenBoard-ThirdParty\openssl\openssl-1.0.0d\out32dll\libeay32.dll"; DestDir:"{app}"; Flags: ignoreversion
-Source: "..\OpenBoard-ThirdParty\openssl\openssl-1.0.0d\out32dll\ssleay32.dll"; DestDir:"{app}"; Flags: ignoreversion
+Source: "..\OpenBoard-ThirdParty\openssl\openssl-1.0.2-win32\lib\libeay32.lib"; DestDir:"{app}"; Flags: ignoreversion
+Source: "..\OpenBoard-ThirdParty\openssl\openssl-1.0.2-win32\lib\ssleay32.lib"; DestDir:"{app}"; Flags: ignoreversion
 
 ;Qt base dll
-Source: "..\Qt-4.8\lib\QtScript4.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\Qt-4.8\lib\QtGui4.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\Qt-4.8\lib\QtXml4.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\Qt-4.8\lib\QtCore4.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\Qt-4.8\lib\QtWebKit4.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\Qt-4.8\lib\phonon4.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\Qt-4.8\lib\QtNetwork4.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\Qt-4.8\lib\QtSvg4.dll"; DestDir: "{app}"; Flags: ignoreversion
-
-;Qt plugins
-Source: "..\Qt-4.8\plugins\accessible\qtaccessiblecompatwidgets4.dll"; DestDir: "{app}\accessible"; Flags: ignoreversion
-Source: "..\Qt-4.8\plugins\accessible\qtaccessiblewidgets4.dll"; DestDir: "{app}\accessible"; Flags: ignoreversion
-Source: "..\Qt-4.8\plugins\bearer\qgenericbearer4.dll"; DestDir: "{app}\bearer"; Flags: ignoreversion
-Source: "..\Qt-4.8\plugins\bearer\qnativewifibearer4.dll"; DestDir: "{app}\bearer"; Flags: ignoreversion
-Source: "..\Qt-4.8\plugins\codecs\qcncodecs4.dll"; DestDir: "{app}\codecs"; Flags: ignoreversion
-Source: "..\Qt-4.8\plugins\codecs\qjpcodecs4.dll"; DestDir: "{app}\codecs"; Flags: ignoreversion
-Source: "..\Qt-4.8\plugins\codecs\qkrcodecs4.dll"; DestDir: "{app}\codecs"; Flags: ignoreversion
-Source: "..\Qt-4.8\plugins\codecs\qtwcodecs4.dll"; DestDir: "{app}\codecs"; Flags: ignoreversion
-Source: "..\Qt-4.8\plugins\graphicssystems\qglgraphicssystem4.dll"; DestDir: "{app}\graphicssystems"; Flags: ignoreversion
-Source: "..\Qt-4.8\plugins\graphicssystems\qtracegraphicssystem4.dll"; DestDir: "{app}\graphicssystems"; Flags: ignoreversion
-Source: "..\Qt-4.8\plugins\iconengines\qsvgicon4.dll"; DestDir: "{app}\iconengines"; Flags: ignoreversion
-Source: "..\Qt-4.8\plugins\imageformats\qgif4.dll"; DestDir: "{app}\imageformats"; Flags: ignoreversion
-Source: "..\Qt-4.8\plugins\imageformats\qico4.dll"; DestDir: "{app}\imageformats"; Flags: ignoreversion
-Source: "..\Qt-4.8\plugins\imageformats\qjpeg4.dll"; DestDir: "{app}\imageformats"; Flags: ignoreversion
-Source: "..\Qt-4.8\plugins\imageformats\qmng4.dll"; DestDir: "{app}\imageformats"; Flags: ignoreversion
-Source: "..\Qt-4.8\plugins\imageformats\qsvg4.dll"; DestDir: "{app}\imageformats"; Flags: ignoreversion
-Source: "..\Qt-4.8\plugins\imageformats\qtiff4.dll"; DestDir: "{app}\imageformats"; Flags: ignoreversion
-Source: "..\Qt-4.8\plugins\phonon_backend\phonon_ds94.dll"; DestDir: "{app}\phonon_backend"; Flags: ignoreversion
+;Source: "OpenBoard.exe"; DestDir: "{app}"
+Source: "{#QtLibs}\Qt5Core.dll"; DestDir: "{app}"
+Source: "{#QtLibs}\Qt5Gui.dll"; DestDir: "{app}"
+Source: "{#QtLibs}\Qt5Multimedia.dll"; DestDir: "{app}"
+Source: "{#QtLibs}\Qt5MultimediaWidgets.dll"; DestDir: "{app}"
+Source: "{#QtLibs}\Qt5Network.dll"; DestDir: "{app}"
+Source: "{#QtLibs}\Qt5Opengl.dll"; DestDir: "{app}"
+Source: "{#QtLibs}\Qt5PrintSupport.dll"; DestDir: "{app}"
+Source: "{#QtLibs}\Qt5Qml.dll"; DestDir: "{app}"
+Source: "{#QtLibs}\Qt5Script.dll"; DestDir: "{app}"
+Source: "{#QtLibs}\Qt5Sql.dll"; DestDir: "{app}"
+Source: "{#QtLibs}\Qt5Svg.dll"; DestDir: "{app}"   
+;Source: "Qt5V8.dll"; DestDir: "{app}"
+Source: "{#QtLibs}\Qt5WebKit.dll"; DestDir: "{app}"
+Source: "{#QtLibs}\Qt5WebKitWidgets.dll"; DestDir: "{app}"
+Source: "{#QtLibs}\Qt5Widgets.dll"; DestDir: "{app}"
+Source: "{#QtLibs}\Qt5Xml.dll"; DestDir: "{app}"
+Source: "{#QtLibs}\libGLESv2.dll"; DestDir: "{app}"  
+Source: "{#QtLibs}\Qt5Quick.dll"; DestDir: "{app}"  
+Source: "{#QtLibs}\Qt5Positioning.dll"; DestDir: "{app}"  
+Source: "{#QtLibs}\Qt5Sensors.dll"; DestDir: "{app}"
+Source: "{#QtLibs}\Qt5WebChannel.dll"; DestDir: "{app}"
+Source: "{#QtLibs}\libEGL.dll"; DestDir: "{app}"  
+;Source: "/etc/freezedWidgetWrapper.html"; DestDir: "{app}"  
+;Source: "*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+
+Source: "{#QtLibs}\icudt54.dll"; DestDir: "{app}"  
+Source: "{#QtLibs}\icuin54.dll"; DestDir: "{app}"
+Source: "{#QtLibs}\icuuc54.dll"; DestDir: "{app}"  
+
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
-;qt multimedia plugins
-Source: "c:\OpenBoard\plugins\mediaservice\qtmedia_audioengine.dll"; DestDir: "c:\OpenBoard\plugins\mediaservice"; Flags: ignoreversion
-Source: "c:\OpenBoard\plugins\mediaservice\qtmedia_audioengined.dll"; DestDir: "c:\OpenBoard\plugins\mediaservice"; Flags: ignoreversion
-Source: "c:\OpenBoard\plugins\mediaservice\dsengine.dll"; DestDir: "c:\OpenBoard\plugins\mediaservice"; Flags: ignoreversion
-Source: "c:\OpenBoard\plugins\mediaservice\dsengined.dll"; DestDir: "c:\OpenBoard\plugins\mediaservice"; Flags: ignoreversion
+;Qt windows plugins
+Source: "{#QtDir}\plugins\platforms\qminimal.dll"; DestDir: "{app}\platforms"; Flags: ignoreversion
+Source: "{#QtDir}\plugins\platforms\qoffscreen.dll"; DestDir: "{app}\platforms"; Flags: ignoreversion
+Source: "{#QtDir}\plugins\platforms\qwindows.dll"; DestDir: "{app}\platforms"; Flags: ignoreversion
 
-Source: "c:\OpenBoard\plugins\playlistformats\qtmultimediakit_m3u.dll"; DestDir: "c:\OpenBoard\plugins\playlistformats"; Flags: ignoreversion
-Source: "c:\OpenBoard\plugins\playlistformats\qtmultimediakit_m3ud.dll"; DestDir: "c:\OpenBoard\plugins\playlistformats"; Flags: ignoreversion
+
+;Qt images formats plugins
+Source: "{#QtDir}\plugins\imageformats\qgif.dll"; DestDir: "{app}\imageformats"; Flags: ignoreversion
+Source: "{#QtDir}\plugins\imageformats\qico.dll"; DestDir: "{app}\imageformats"; Flags: ignoreversion
+Source: "{#QtDir}\plugins\imageformats\qjpeg.dll"; DestDir: "{app}\imageformats"; Flags: ignoreversion
+Source: "{#QtDir}\plugins\imageformats\qmng.dll"; DestDir: "{app}\imageformats"; Flags: ignoreversion
+Source: "{#QtDir}\plugins\imageformats\qsvg.dll"; DestDir: "{app}\imageformats"; Flags: ignoreversion
+Source: "{#QtDir}\plugins\imageformats\qtiff.dll"; DestDir: "{app}\imageformats"; Flags: ignoreversion   
+
+;qt icon engine plugins
+Source: "{#QtDir}\plugins\iconengines\qsvgicon.dll"; DestDir: "{app}\iconengines"; Flags: ignoreversion
+
+;qt multimedia plugins
+Source: "{#QtDir}\plugins\mediaservice\dsengine.dll"; DestDir: "\plugins\mediaservice"; Flags: ignoreversion
+Source: "{#QtDir}\plugins\mediaservice\dsengined.dll"; DestDir: "\plugins\mediaservice"; Flags: ignoreversion
+Source: "{#QtDir}\plugins\mediaservice\qtmedia_audioengine.dll"; DestDir: "\plugins\mediaservice"; Flags: ignoreversion
+Source: "{#QtDir}\plugins\mediaservice\qtmedia_audioengined.dll"; DestDir: "\plugins\mediaservice"; Flags: ignoreversion
+Source: "{#QtDir}\plugins\mediaservice\wmfengine.dll"; DestDir: "\plugins\mediaservice"; Flags: ignoreversion
+Source: "{#QtDir}\plugins\mediaservice\wmfengined.dll"; DestDir: "\plugins\mediaservice"; Flags: ignoreversion   
 
 ;OpenBoardImporter
 Source: "..\OpenBoard-Importer\release\OpenBoardImporter.exe"; DestDir: "c:\OpenBoard\Importer"; Flags: ignoreversion
-Source: "..\Qt-4.8\lib\QtGui4.dll"; DestDir: "c:\OpenBoard\Importer"; Flags: ignoreversion
-Source: "..\Qt-4.8\lib\QtCore4.dll"; DestDir: "c:\OpenBoard\Importer"; Flags: ignoreversion
+Source: "{#QtLibs}\Qt5Core.dll"; DestDir: "{app}"
+Source: "{#QtLibs}\Qt5Gui.dll"; DestDir: "{app}"
 
 ;fonts for xpdf
 Source: "resources\windows\xpdfrc"; DestDir: "{app}"; Flags: ignoreversion

release.win7.vc9.bat

@@ -16,13 +16,13 @@ REM ---------------------------------------------------------------------
 
 
 set APPLICATION_NAME=OpenBoard
-set QT_DIR=..\Qt-4.8
+set QT_DIR=C:\Qt\5.5\msvc2010
 set QT_BIN=%QT_DIR%\bin
 
-set PROGRAMS_FILE_PATH=C:\Program Files
+set PROGRAMS_FILE_PATH=C:\Program Files (x86)
 
 set GIT_BIN=%PROGRAMS_FILE_PATH%\Git\bin
-set VS_BIN=%PROGRAMS_FILE_PATH%\Microsoft Visual Studio 9.0\VC\bin
+set VS_BIN=%PROGRAMS_FILE_PATH%\Microsoft Visual Studio 10.0\VC\bin
 set WIN_SDK_BIN=%PROGRAMS_FILE_PATH%\Microsoft SDKs\Windows\v6.0A\Bin
 set INNO_EXE=%PROGRAMS_FILE_PATH%\Inno Setup 5\iscc.exe 
 set BUILD_DIR=build\win32\release
@@ -37,7 +37,7 @@ echo %PATH%
 
 REM Third party impoter application
 set IMPORTER_NAME=OpenBoardImporter
-set IMPORTER_PATH="%cd%\..\OpenBoard-Importer"
+set IMPORTER_PATH="..\OpenBoard-Importer"
 
 IF NOT EXIST "%IMPORTER_PATH%" GOTO EXIT_WITH_ERROR
 set HOME_DIR="%cd%"
@@ -47,7 +47,7 @@ IF EXIST "debug" (del "debug\*.*" /Q)
 IF EXIST "MakeFile" (del "MakeFile*" /Q)
 IF EXIST "MakeFile" (del "MakeFile*" /Q)
 IF EXIST "%IMPORTER_NAME%.exe" (del "%IMPORTER_NAME%.exe" /Q)
-"%QT_BIN%\qmake.exe" %IMPORTER_NAME%.pro"
+"%QT_BIN%\qmake.exe" %IMPORTER_NAME%.pro
 nmake release
 IF NOT EXIST release\"%IMPORTER_NAME%.exe" GOTO EXIT_WITH_ERROR
 cd %HOME_DIR%
@@ -55,7 +55,7 @@ cd %HOME_DIR%
 REM this checks if the custom qt directory path
 REM is correct. This is important because installer
 REM pick up dll from this directory
-IF NOT EXIST "%QT_DIR%\lib\QtCore4.dll" GOTO EXIT_WITH_ERROR
+REM IF NOT EXIST "%QT_DIR%\bin\Qt5Core.dll" GOTO EXIT_WITH_ERROR
 
 rmdir /S /Q %BUILD_DIR%
 rmdir /S /Q install
@@ -81,8 +81,8 @@ REM echo %LAST_TAG_VERSION%
 nmake release-install
 IF NOT EXIST build\win32\release\product\%APPLICATION_NAME%.exe GOTO EXIT_WITH_ERROR
 
-xcopy C:\%APPLICATION_NAME%\lib\*.dll build\win32\release\product\
-xcopy %QT_DIR%\lib\QtOpenGL4.dll build\win32\release\product\
+xcopy C:\%APPLICATION_NAME%\bin\*.dll build\win32\release\product\
+xcopy %QT_DIR%\bin\Qt5OpenGL.dll build\win32\release\product\
 
 set CUSTOMIZATIONS=build\win32\release\product\customizations
 mkdir %CUSTOMIZATIONS%