TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 16:58:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

dist: Fix ability to deploy app without requiring OpenSSL enabled

Browse Source 
Fixes #1073
This commit is contained in:
rdb 2020-12-17 23:59:50 +01:00
parent a18edf54b7
commit 66c41d6c31
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
direct/src/p3d/DeploymentTools.py
View File

@ -13,9 +13,10 @@ import os, sys, subprocess, tarfile, shutil, time, zipfile, socket, getpass, str
import gzip, plistlib import gzip, plistlib
from direct.directnotify.DirectNotifyGlobal import * from direct.directnotify.DirectNotifyGlobal import *
from direct.showbase.AppRunnerGlobal import appRunner from direct.showbase.AppRunnerGlobal import appRunner
from panda3d.core import PandaSystem, HTTPClient, Filename, VirtualFileSystem, Multifile from panda3d.core import PandaSystem, Filename, VirtualFileSystem, Multifile
from panda3d.core import TiXmlDocument, TiXmlDeclaration, TiXmlElement, readXmlStream from panda3d.core import TiXmlDocument, TiXmlDeclaration, TiXmlElement, readXmlStream
from panda3d.core import PNMImage, PNMFileTypeRegistry, StringStream from panda3d.core import PNMImage, PNMFileTypeRegistry, StringStream
from panda3d import core
from direct.stdpy.file import * from direct.stdpy.file import *
from direct.p3d.HostInfo import HostInfo from direct.p3d.HostInfo import HostInfo
# This is important for some reason # This is important for some reason
@ -87,7 +88,7 @@ class Standalone:
self.tempDir.makeDir() self.tempDir.makeDir()
self.host = HostInfo(PandaSystem.getPackageHostUrl(), appRunner = appRunner, hostDir = self.tempDir, asMirror = False, perPlatform = True) self.host = HostInfo(PandaSystem.getPackageHostUrl(), appRunner = appRunner, hostDir = self.tempDir, asMirror = False, perPlatform = True)
self.http = HTTPClient.getGlobalPtr() self.http = core.HTTPClient.getGlobalPtr()
if not self.host.hasContentsFile: if not self.host.hasContentsFile:
if not self.host.readContentsFile(): if not self.host.readContentsFile():
if not self.host.downloadContentsFile(self.http): if not self.host.downloadContentsFile(self.http):
@ -245,7 +246,7 @@ class PackageTree:
self.hostUrl = hostUrl self.hostUrl = hostUrl
self.hostDir = Filename(hostDir) self.hostDir = Filename(hostDir)
self.hostDir.makeDir() self.hostDir.makeDir()
self.http = HTTPClient.getGlobalPtr() self.http = core.HTTPClient.getGlobalPtr()
def getHost(self, hostUrl): def getHost(self, hostUrl):
if hostUrl in self.hosts: if hostUrl in self.hosts:

6
direct/src/p3d/HostInfo.py
View File

@ -6,7 +6,7 @@
__all__ = ["HostInfo"] __all__ = ["HostInfo"]
from panda3d.core import HashVal, Filename, PandaSystem, DocumentSpec, Ramfile from panda3d.core import HashVal, Filename, PandaSystem, DocumentSpec, Ramfile
from panda3d.core import HTTPChannel, ConfigVariableInt from panda3d.core import ConfigVariableInt
from panda3d import core from panda3d import core
from direct.p3d.PackageInfo import PackageInfo from direct.p3d.PackageInfo import PackageInfo
from direct.p3d.FileSpec import FileSpec from direct.p3d.FileSpec import FileSpec
@ -230,8 +230,8 @@ class HostInfo:
self.notify.warning("Unable to download %s" % (url,)) self.notify.warning("Unable to download %s" % (url,))
try: try:
# Something screwed up. # Something screwed up.
if statusCode == HTTPChannel.SCDownloadOpenError or \ if statusCode == core.HTTPChannel.SCDownloadOpenError or \
statusCode == HTTPChannel.SCDownloadWriteError: statusCode == core.HTTPChannel.SCDownloadWriteError:
launcher.setPandaErrorCode(2) launcher.setPandaErrorCode(2)
elif statusCode == 404: elif statusCode == 404:
# 404 not found # 404 not found