Merge 7ce00f7 into 3187f37

Author: rorywalsh

appveyor.yml

@@ -7,7 +7,6 @@ environment:
   CsoundDepsDir: C:\projects\csound\msvc\deps\bin
   CSOUND_VERSION: 6.11.0-beta
   HDF5_HOME: C:\Program Files\HDF_Group\HDF5\1.8.19
-#  QTDIR: C:\Qt\5.9.2\msvc2017_64
   VCPKGDir: C:\Tools\vcpkg
   VSGENERATOR: Visual Studio 15 2017 Win64
   VSTOOLSET: v141
@@ -31,8 +30,6 @@ init:
   - set VCREDIST_CXXAMP_DIR=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.12.25810\x64\Microsoft.VC141.CXXAMP
   - set VCREDIST_OPENMP_DIR=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.12.25810\x64\Microsoft.VC141.OpenMP
   - set
-  #- echo "Qt SDK configuration files:"
-  #- dir "%QTDIR%\\mkspecs"
   - echo "Redistributable runtime libraries:"
   - dir /B /S "%VCToolsRedistDir%"
   - dir /B /S "%VCREDIST_CRT_DIR%"
@@ -49,13 +46,21 @@ install:
   - powershell -ExecutionPolicy ByPass -File downloadDependencies.ps1 -vsGenerator "%VSGENERATOR%" -vsToolset "%VSTOOLSET%"
   - powershell -ExecutionPolicy ByPass -File generateProject.ps1 -vsGenerator "%VSGENERATOR%" -vsToolset "%VSTOOLSET%" -vstSdkHome "%VST_SDK2_HOME%
   - cd ..
+  #download an unzip manual and CsoundQT for inclusion with the installer
+  - cd c:/
+  - ps: Start-FileDownload 'https://github.com/csound/csound/releases/download/6.10.0/Csound6.10.0_manual_html.zip'
+  - cmd: 7z.exe x Csound6.10.0_manual_html.zip
+  - ps: Start-FileDownload 'https://github.com/CsoundQt/CsoundQt/releases/download/0.9.5/CsoundQt-0.9.5-win64.zip'
+  - cmd: 7z.exe x CsoundQt-0.9.5-win64.zip
+  - dir c:\
+  - dir c:\html
+  - dir c:\CsoundQt-0.9.5-win64\bin
 
 build:
   parallel: true
   project: msvc\csound-vs\Csound.sln
 
 after_build:
-  - dir "%VCPKGDir%\installed\x64-windows-static\include"
   - set PATH=%PATH%;"C:\\Program Files (x86)\\Inno Setup 5"
   - iscc /dVcpkgInstalledBinDir=%VCPKGDir%\\installed\\x64-windows\\bin\\ /omsvc installer\\windows\\csound6_x64_appveyor.iss
   - 7z a csound-windows-x64-%CSOUND_VERSION%-%APPVEYOR_BUILD_NUMBER%.zip %APPVEYOR_BUILD_FOLDER%\msvc\csound-vs\RelWithDebInfo\*.exe %APPVEYOR_BUILD_FOLDER%\msvc\csound-vs\RelWithDebInfo\csound64.lib %APPVEYOR_BUILD_FOLDER%\include\ %APPVEYOR_BUILD_FOLDER%\msvc\csound-vs\RelWithDebInfo\*.dll %APPVEYOR_BUILD_FOLDER%\msvc\csound-vs\RelWithDebInfo\*.pyd %APPVEYOR_BUILD_FOLDER%\msvc\csound-vs\*.jar %APPVEYOR_BUILD_FOLDER%\msvc\csound-vs\*.py 

installer/windows/csound6_x64_appveyor.iss

@@ -31,9 +31,12 @@
 #define AppPublisher "Csound"
 #define AppURL "http://csound.github.io/"
 #define LibStkSourceDir "..\..\msvc\deps\stk-master\"
+#define ManualSourceDir "c:\html\"
+#define CsoundQTDir "c:\CsoundQt-0.9.5-win64\bin\"
 
 [Components]
 Name: "core"; Description: "Core Csound"; Types: full custom; Flags: fixed
+Name: "csoundqt"; Description: "Csound QT"; Types: full custom; Flags: fixed
 Name: "python"; Description: "Python features (requires Python 2.7)"; Types: full;
 
 [Dirs]
@@ -54,6 +57,9 @@ Name: "{app}\include"
 ; All Csound examples go here.
 Name: "{app}\examples"; Permissions: users-modify
 #define APP_EXAMPLES "{app}\examples\"
+; Csound manual
+Name: "{app}\doc\manual"
+#define "{app}\doc\manual\"
 ; Any SoundFonts or sound samples used by Csound examples go here.
 Name: "{app}\samples"
 #define APP_SAMPLES "{app}\samples\"
@@ -207,6 +213,9 @@ Source: ../../interfaces/*.py; DestDir: "{#APP_BIN}"; Flags: ignoreversion;  Com
 Source: "../../examples\*.*"; DestDir: "{#APP_EXAMPLES}"; Excludes: "*.wav *.html"; Flags: ignoreversion recursesubdirs;  Components: core
 Source: "../../samples\*.*"; DestDir: "{#APP_SAMPLES}"; Flags: ignoreversion recursesubdirs;  Components: core
 Source: "{#LibStkSourceDir}rawwaves\*.*"; DestDir: "{#APP_SAMPLES}"; Flags: ignoreversion recursesubdirs;  Components: core
+;; Source: {#ManualSourceDir}*.*; DestDir: "{#APP_MANUAL}"; Flags: ignoreversion recursesubdirs; Components: core
+;; Source: {#CsoundQTDir}*.*; DestDir: "{app}\bin"; Flags: ignoreversion recursesubdirs; Components: csoundqt
+
 
 [Icons]
 Name: "{group}\{cm:ProgramOnTheWeb,Csound}"; Filename: "{#AppURL}";  Components: core;