Skip to content

Commit 90d6fc4

Browse files
committed
replace wixobj -> wixlib
1 parent 3b58006 commit 90d6fc4

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

installer/buildInstaller.bat

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ if NOT [%ERRORLEVEL%]==[0] (
5050
)
5151

5252
echo Compiling python lib WiX source
53-
wix build %INST_TEMP_DIR%\fullLib.wxs -o %INST_TEMP_DIR%\fullLib.wixobj -d pylibSource=..\pythonlib\full -arch %MSI_ARCH%
53+
wix build %INST_TEMP_DIR%\fullLib.wxs -o %INST_TEMP_DIR%\fullLib.wixlib -d pylibSource=..\pythonlib\full -arch %MSI_ARCH%
5454
if NOT [%ERRORLEVEL%]==[0] (
5555
goto error
5656
)
@@ -62,7 +62,7 @@ if NOT [%ERRORLEVEL%]==[0] (
6262
)
6363

6464
echo Compiling python pyd lib WiX source
65-
wix build %INST_TEMP_DIR%\fullLib_dll%NAME_ADDON%.wxs -o %INST_TEMP_DIR%\fullLib_dll%NAME_ADDON%.wixobj -d pylibSource=..\pythonlib\full_dll%NAME_ADDON% -arch %MSI_ARCH%
65+
wix build %INST_TEMP_DIR%\fullLib_dll%NAME_ADDON%.wxs -o %INST_TEMP_DIR%\fullLib_dll%NAME_ADDON%.wixlib -d pylibSource=..\pythonlib\full_dll%NAME_ADDON% -arch %MSI_ARCH%
6666
if NOT [%ERRORLEVEL%]==[0] (
6767
goto error
6868
)
@@ -74,7 +74,7 @@ if NOT [%ERRORLEVEL%]==[0] (
7474
)
7575

7676
echo Compiling tcl lib WiX source
77-
wix build %INST_TEMP_DIR%\tcl.wxs -o %INST_TEMP_DIR%\tcl.wixobj -d pylibSource=..\pythonlib\tcl -arch %MSI_ARCH%
77+
wix build %INST_TEMP_DIR%\tcl.wxs -o %INST_TEMP_DIR%\tcl.wixlib -d pylibSource=..\pythonlib\tcl -arch %MSI_ARCH%
7878
if NOT [%ERRORLEVEL%]==[0] (
7979
goto error
8080
)
@@ -86,7 +86,7 @@ if NOT [%ERRORLEVEL%]==[0] (
8686
)
8787

8888
echo Compiling tcl lib WiX source
89-
wix build %INST_TEMP_DIR%\tcl_dll%NAME_ADDON%.wxs -o %INST_TEMP_DIR%\tcl_dll%NAME_ADDON%.wixobj -d pylibSource=..\pythonlib\tcl_dll%NAME_ADDON% -arch %MSI_ARCH%
89+
wix build %INST_TEMP_DIR%\tcl_dll%NAME_ADDON%.wxs -o %INST_TEMP_DIR%\tcl_dll%NAME_ADDON%.wixlib -d pylibSource=..\pythonlib\tcl_dll%NAME_ADDON% -arch %MSI_ARCH%
9090
if NOT [%ERRORLEVEL%]==[0] (
9191
goto error
9292
)
@@ -98,7 +98,7 @@ if NOT [%ERRORLEVEL%]==[0] (
9898
)
9999

100100
echo Compiling Sample Scripts WiX source
101-
wix build %INST_TEMP_DIR%\sampleScripts.wxs -o %INST_TEMP_DIR%\sampleScripts.wixobj -d scriptSource=..\scripts\Samples -arch %MSI_ARCH%
101+
wix build %INST_TEMP_DIR%\sampleScripts.wxs -o %INST_TEMP_DIR%\sampleScripts.wixlib -d scriptSource=..\scripts\Samples -arch %MSI_ARCH%
102102
if NOT [%ERRORLEVEL%]==[0] (
103103
goto error
104104
)
@@ -111,7 +111,7 @@ if NOT [%ERRORLEVEL%]==[0] (
111111
)
112112

113113
echo Compiling Unit test WiX source
114-
wix build %INST_TEMP_DIR%\unittests.wxs -o %INST_TEMP_DIR%\unittests.wixobj -d unittestSource=..\PythonScript\python_tests -arch %MSI_ARCH%
114+
wix build %INST_TEMP_DIR%\unittests.wxs -o %INST_TEMP_DIR%\unittests.wixlib -d unittestSource=..\PythonScript\python_tests -arch %MSI_ARCH%
115115
if NOT [%ERRORLEVEL%]==[0] (
116116
goto error
117117
)
@@ -123,13 +123,13 @@ if NOT [%ERRORLEVEL%]==[0] (
123123
)
124124

125125
echo Compiling Html doc WiX source
126-
wix build %INST_TEMP_DIR%\htmldoc.wxs -o %INST_TEMP_DIR%\htmldoc.wixobj -d htmldocsSource=..\docs\build\html -arch %MSI_ARCH%
126+
wix build %INST_TEMP_DIR%\htmldoc.wxs -o %INST_TEMP_DIR%\htmldoc.wixlib -d htmldocsSource=..\docs\build\html -arch %MSI_ARCH%
127127
if NOT [%ERRORLEVEL%]==[0] (
128128
goto error
129129
)
130130

131131
echo Compiling main PythonScript installer
132-
wix build pythonscript.wxs -o %INST_TEMP_DIR%\pythonscript.wixobj -d version=%PYTHONSCRIPTVERSION% -d baseDir=.. -dpythonDir=%PYTHONBUILDDIR% -d variantDir=%PYTHONSCRIPTDLLDIR% -d Platform=%MSI_ARCH% -arch %MSI_ARCH%
132+
wix build pythonscript.wxs -o %INST_TEMP_DIR%\pythonscript.wixlib -d version=%PYTHONSCRIPTVERSION% -d baseDir=.. -d pythonDir=%PYTHONBUILDDIR% -d variantDir=%PYTHONSCRIPTDLLDIR% -d Platform=%MSI_ARCH% -arch %MSI_ARCH%
133133
if NOT [%ERRORLEVEL%]==[0] (
134134
goto error
135135
)
@@ -141,7 +141,7 @@ IF NOT EXIST "build\%PYTHONSCRIPTVERSION%" (
141141
)
142142

143143

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

0 commit comments

Comments
 (0)