further fix for bruderstein#92

- switch to html version of docu, because singlehtml doesn't provide an index/search
- adapted zip and msi build therefore

Author: chcg

appveyor.yml

@@ -45,7 +45,7 @@ after_build:
     - if "%configuration%"=="Release" cd "%APPVEYOR_BUILD_FOLDER%"\docs
     - if "%configuration%"=="Release" python -m pip install --upgrade pip
     - if "%configuration%"=="Release" pip install -U sphinx
-    - if "%configuration%"=="Release" make.bat singlehtml
+    - if "%configuration%"=="Release" make.bat html
 
     - cd "%APPVEYOR_BUILD_FOLDER%"\installer
     - set WIX_PATH="C:\Program Files (x86)\WiX Toolset v3.11\bin"

installer/PythonScript.wxs

@@ -40,12 +40,7 @@
 							</Directory>
 						</Directory>
 						<Directory Id="D_doc" Name="doc">
-							<Directory Id="D_DocPythonScript" Name="PythonScript">
-								<Component Id="C_PythonScript.chm" Guid="*">
-									<RemoveFile Id="Remove_F_PythonScript.chm" Name="PythonScript.chm" On="install"/>
-									<File Id="F_PythonScript.chm" KeyPath="yes" Name="PythonScript.chm" Source="$(var.baseDir)\docs\build\singlehtml\index.html" />
-								</Component>
-							</Directory>
+							<Directory Id="D_DocPythonScript" Name="PythonScript" />
 						</Directory>
 						<Component Id="C_pythonscript.dll" Guid="*">
 							<RemoveFile Id="Remove_F_pythonscript.dll" Name="PythonScript.dll" On="install"/>
@@ -69,7 +64,7 @@
 				<ComponentGroupRef Id="CG_PythonLib" />
 			</Feature>
 			<Feature Id="FT_Help" Title="Help" AllowAdvertise="no" Description="HTML files with documentation for all the classes, methods and enums in PythonScript">
-				<ComponentRef Id="C_PythonScript.chm" />
+				<ComponentGroupRef Id="CG_HtmlDocs" />
 			</Feature>
 			<Feature Id="FT_SampleScripts" Title="Sample Scripts" AllowAdvertise="no" Description="Sample scripts to show basic usage">
 				<ComponentGroupRef Id="CG_SampleScripts" />

installer/buildInstaller.bat

@@ -133,12 +133,22 @@ if NOT [%ERRORLEVEL%]==[0] (
 )
 
 echo Compiling Unit test WiX source
-candle %INST_TEMP_DIR%\unittests.wxs -o %INST_TEMP_DIR%\unittests.wixobj -dunittestSource=..\pythonscript\python_tests
+candle %INST_TEMP_DIR%\unittests.wxs -o %INST_TEMP_DIR%\unittests.wixobj -dunittestSource=..\PythonScript\python_tests
 if NOT [%ERRORLEVEL%]==[0] (
  goto error
 )
 
+echo Generating WiX information for ..\docs\build\html
+heat dir ..\docs\build\html -ag -cg CG_HtmlDocs -dr D_PythonScript -var var.htmldocsSource -t changeDirHtmlDoc.xsl -o %INST_TEMP_DIR%\htmldoc.wxs
+if NOT [%ERRORLEVEL%]==[0] (
+ goto error
+)
 
+echo Compiling Html doc WiX source
+candle %INST_TEMP_DIR%\htmldoc.wxs -o %INST_TEMP_DIR%\htmldoc.wixobj -dhtmldocsSource=..\docs\build\html
+if NOT [%ERRORLEVEL%]==[0] (
+ goto error
+)
 
 echo Compiling main PythonScript installer
 candle pythonscript.wxs -o %INST_TEMP_DIR%\pythonscript.wixobj -dversion=%PYTHONSCRIPTVERSION% -dbaseDir=.. -dpythonDir=%PYTHONBUILDDIR% -dvariantDir=%PYTHONSCRIPTDLLDIR%
@@ -153,7 +163,7 @@ IF NOT EXIST "build\%PYTHONSCRIPTVERSION%" (
 )
 
 
-light %INST_TEMP_DIR%\pythonscript.wixobj %INST_TEMP_DIR%\fullLib.wixobj %INST_TEMP_DIR%\extra.wixobj %INST_TEMP_DIR%\unittests.wixobj %INST_TEMP_DIR%\tcl.wixobj %INST_TEMP_DIR%\sampleScripts.wixobj -o build\%PYTHONSCRIPTVERSION%\PythonScript_%PYTHONSCRIPTVERSION%%NAME_ADDON%.msi -ext WixUIExtension
+light %INST_TEMP_DIR%\pythonscript.wixobj %INST_TEMP_DIR%\fullLib.wixobj %INST_TEMP_DIR%\extra.wixobj %INST_TEMP_DIR%\unittests.wixobj %INST_TEMP_DIR%\tcl.wixobj %INST_TEMP_DIR%\sampleScripts.wixobj %INST_TEMP_DIR%\htmldoc.wixobj -o build\%PYTHONSCRIPTVERSION%\PythonScript_%PYTHONSCRIPTVERSION%%NAME_ADDON%.msi -ext WixUIExtension
 if NOT [%ERRORLEVEL%]==[0] (
  goto error
 )

installer/buildReleaseZips.bat

@@ -83,8 +83,8 @@ copy ..\%PYTHONSCRIPTDLLDIR%\release\PythonScript.dll %INST_TEMP_DIR%\release\Fu
 copy ..\%PYTHONSCRIPTDLLDIR%\release\PythonScript.dll %INST_TEMP_DIR%\release\min\plugins
 
 echo Copying Help
-xcopy /s /q ..\docs\build\singlehtml\*.* %INST_TEMP_DIR%\release\full\plugins\doc\PythonScript
-xcopy /s /q ..\docs\build\singlehtml\*.* %INST_TEMP_DIR%\release\min\plugins\doc\PythonScript
+xcopy /s /q ..\docs\build\html\*.* %INST_TEMP_DIR%\release\full\plugins\doc\PythonScript
+xcopy /s /q ..\docs\build\html\*.* %INST_TEMP_DIR%\release\min\plugins\doc\PythonScript
 
 echo Copying Scripts
 xcopy /s /q ..\scripts\*.* %INST_TEMP_DIR%\release\full\plugins\PythonScript\scripts

installer/changeDirHtmlDoc.xsl

@@ -0,0 +1,7 @@
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:wix="http://schemas.microsoft.com/wix/2006/wi" version="1.0">
+
+	<xsl:output method="xml" indent="yes" />
+	<xsl:param name="realDirectoryId" select="'D_DocPythonScript'" />
+	<xsl:include href="fixDirectoryAndFileRefs.xsl" />
+
+</xsl:stylesheet>