Skip to content

Commit 29a01dc

Browse files
authored
try to fix missing pyd files in installer msi files (#231)
1 parent d0719cf commit 29a01dc

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

installer/PythonScript.wxs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
<ComponentRef Id="C_pythonscript.dll" />
7171
<ComponentRef Id="C_python310.dll" />
7272
<ComponentGroupRef Id="CG_PythonLib" />
73+
<ComponentGroupRef Id="CG_PythonLibDll" />
7374
</Feature>
7475
<Feature Id="FT_Help" Title="Help" AllowAdvertise="no" Description="HTML files with documentation for all the classes, methods and enums in PythonScript">
7576
<ComponentGroupRef Id="CG_HtmlDocs" />
@@ -79,6 +80,7 @@
7980
</Feature>
8081
<Feature Id="FT_TclTkLibs" Title="Tcl/Tk Suport" Level="10" AllowAdvertise="no" Description="Support for Tcl/Tk (allows dynamically building GUIs)">
8182
<ComponentGroupRef Id="CG_PythonTclTkLib" />
83+
<ComponentGroupRef Id="CG_PythonTclTkLibDll" />
8284
</Feature>
8385
<Feature Id="FT_UnitTests" Title="Unit Tests" Level="10" AllowAdvertise="no" Description="Unit tests for PythonScript. Not usually necessary, but if you are having problems, any issues reported from the tests will be useful for diagnosis.">
8486
<ComponentGroupRef Id="CG_UnitTests" />

installer/buildInstaller.bat

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ IF "%1"=="x64" SET NAME_ADDON=_x64
2828
IF "%1"=="x64" SET MSI_ARCH=x64
2929

3030
IF NOT EXIST "%PYTHONBUILDDIR%\python.exe" (
31-
echo Your PYTHONBUILDDIR in buildPaths.bat does not contain python.exe. Please set PYTHONBUILDDIR to the root of a built Python 3.8
31+
echo Your PYTHONBUILDDIR in buildPaths.bat does not contain python.exe. Please set PYTHONBUILDDIR to the root of a built Python 3.10
3232
goto error
3333
)
3434

3535
IF NOT EXIST "%PYTHONBUILDDIR%\python310.dll" (
36-
echo Your PYTHONBUILDDIR in buildPaths.bat does not contain python310.dll. Please set PYTHONBUILDDIR to the root of a built Python 3.8
36+
echo Your PYTHONBUILDDIR in buildPaths.bat does not contain python310.dll. Please set PYTHONBUILDDIR to the root of a built Python 3.10
3737
goto error
3838
)
3939

@@ -56,7 +56,7 @@ if NOT [%ERRORLEVEL%]==[0] (
5656
)
5757

5858
echo Generating WiX information for ..\pythonlib\full_dll%NAME_ADDON%
59-
heat dir ..\pythonlib\full_dll%NAME_ADDON% -ag -cg CG_PythonLib -dr D_PythonScript -var var.pylibSource -t changeDirLib.xsl -o %INST_TEMP_DIR%\fullLib_dll%NAME_ADDON%.wxs
59+
heat dir ..\pythonlib\full_dll%NAME_ADDON% -ag -cg CG_PythonLibDll -dr D_PythonScript -var var.pylibSource -t changeDirLib.xsl -o %INST_TEMP_DIR%\fullLib_dll%NAME_ADDON%.wxs
6060
if NOT [%ERRORLEVEL%]==[0] (
6161
goto error
6262
)
@@ -80,7 +80,7 @@ if NOT [%ERRORLEVEL%]==[0] (
8080
)
8181

8282
echo Generating WiX information for ..\pythonlib\tcl_dll%NAME_ADDON%
83-
heat dir ..\pythonlib\tcl_dll%NAME_ADDON% -ag -cg CG_PythonTclTkLib -dr D_PythonScript -var var.pylibSource -t changeDirLib.xsl -o %INST_TEMP_DIR%\tcl_dll%NAME_ADDON%.wxs
83+
heat dir ..\pythonlib\tcl_dll%NAME_ADDON% -ag -cg CG_PythonTclTkLibDll -dr D_PythonScript -var var.pylibSource -t changeDirLib.xsl -o %INST_TEMP_DIR%\tcl_dll%NAME_ADDON%.wxs
8484
if NOT [%ERRORLEVEL%]==[0] (
8585
goto error
8686
)
@@ -141,7 +141,7 @@ IF NOT EXIST "build\%PYTHONSCRIPTVERSION%" (
141141
)
142142

143143

144-
light %INST_TEMP_DIR%\pythonscript.wixobj %INST_TEMP_DIR%\fullLib.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
144+
light %INST_TEMP_DIR%\pythonscript.wixobj %INST_TEMP_DIR%\fullLib.wixobj %INST_TEMP_DIR%\fullLib_dll%NAME_ADDON%.wixobj %INST_TEMP_DIR%\unittests.wixobj %INST_TEMP_DIR%\tcl.wixobj %INST_TEMP_DIR%\tcl_dll%NAME_ADDON%.wixobj %INST_TEMP_DIR%\sampleScripts.wixobj %INST_TEMP_DIR%\htmldoc.wixobj -o build\%PYTHONSCRIPTVERSION%\PythonScript_%PYTHONSCRIPTVERSION%%NAME_ADDON%.msi -ext WixUIExtension
145145
if NOT [%ERRORLEVEL%]==[0] (
146146
goto error
147147
)

0 commit comments

Comments
 (0)