Don't run install step when deploying.
This commit is contained in:
parent
209c7afc33
commit
1eb560543b
5 changed files with 2 additions and 11 deletions
|
@ -16,7 +16,7 @@ REM along with Webcamoid. If not, see <http://www.gnu.org/licenses/>.
|
||||||
REM
|
REM
|
||||||
REM Web-Site: http://webcamoid.github.io/
|
REM Web-Site: http://webcamoid.github.io/
|
||||||
|
|
||||||
set INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%\ports\deploy\temp_priv\data
|
set INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%\ports\deploy\temp_priv
|
||||||
|
|
||||||
echo.
|
echo.
|
||||||
echo Building x64 virtual camera driver
|
echo Building x64 virtual camera driver
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
# Web-Site: http://webcamoid.github.io/
|
# Web-Site: http://webcamoid.github.io/
|
||||||
|
|
||||||
BUILDSCRIPT=dockerbuild.sh
|
BUILDSCRIPT=dockerbuild.sh
|
||||||
INSTALL_PREFIX=${TRAVIS_BUILD_DIR}/ports/deploy/temp_priv/data
|
INSTALL_PREFIX=${TRAVIS_BUILD_DIR}/ports/deploy/temp_priv
|
||||||
|
|
||||||
if [ "${TRAVIS_OS_NAME}" = linux ]; then
|
if [ "${TRAVIS_OS_NAME}" = linux ]; then
|
||||||
sudo mount --bind root.x86_64 root.x86_64
|
sudo mount --bind root.x86_64 root.x86_64
|
||||||
|
|
|
@ -65,9 +65,6 @@ class Deploy(DTDeployBase.DeployBase, DTQt5.Qt5Tools):
|
||||||
self.programVersion))
|
self.programVersion))
|
||||||
|
|
||||||
def prepare(self):
|
def prepare(self):
|
||||||
print('Executing make install')
|
|
||||||
params = {'INSTALL_ROOT': self.installDir}
|
|
||||||
self.makeInstall(self.buildDir, params)
|
|
||||||
self.detectTargetArch()
|
self.detectTargetArch()
|
||||||
print('Stripping symbols')
|
print('Stripping symbols')
|
||||||
self.binarySolver.stripSymbols(self.installDir)
|
self.binarySolver.stripSymbols(self.installDir)
|
||||||
|
|
|
@ -75,10 +75,6 @@ class Deploy(DTDeployBase.DeployBase, DTQt5.Qt5Tools):
|
||||||
os.remove(afile)
|
os.remove(afile)
|
||||||
|
|
||||||
def prepare(self):
|
def prepare(self):
|
||||||
print('Executing make install')
|
|
||||||
params = {'INSTALL_ROOT': self.installDir}
|
|
||||||
self.makeInstall(self.buildDir, params)
|
|
||||||
|
|
||||||
if self.targetArch == '32bit':
|
if self.targetArch == '32bit':
|
||||||
self.binarySolver.sysBinsPath = ['/usr/i686-w64-mingw32/bin']
|
self.binarySolver.sysBinsPath = ['/usr/i686-w64-mingw32/bin']
|
||||||
else:
|
else:
|
||||||
|
|
|
@ -59,8 +59,6 @@ class Deploy(DTDeployBase.DeployBase, DTQt5.Qt5Tools):
|
||||||
self.changeLog = os.path.join(self.rootDir, 'ChangeLog')
|
self.changeLog = os.path.join(self.rootDir, 'ChangeLog')
|
||||||
|
|
||||||
def prepare(self):
|
def prepare(self):
|
||||||
print('Executing make install')
|
|
||||||
self.makeInstall(self.buildDir)
|
|
||||||
self.detectTargetArch()
|
self.detectTargetArch()
|
||||||
|
|
||||||
if self.qtIFWVersion == '' or int(self.qtIFWVersion.split('.')[0]) < 3:
|
if self.qtIFWVersion == '' or int(self.qtIFWVersion.split('.')[0]) < 3:
|
||||||
|
|
Loading…
Reference in a new issue