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

makepanda: refactor code to emit errors/warnings

Browse Source
This commit is contained in:
rdb 2018-11-08 15:49:06 +01:00
parent 61dbe47884
commit 87c453fc08
2 changed files with 32 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
makepanda/makepanda.py
View File

@ -2573,9 +2573,9 @@ WriteConfigSettings()
WarnConflictingFiles()
if SystemLibraryExists("dtoolbase"):
print("%sWARNING:%s Found conflicting Panda3D libraries from other ppremake build!" % (GetColor("red"), GetColor()))
Warn("Found conflicting Panda3D libraries from other ppremake build!")
if SystemLibraryExists("p3dtoolconfig"):
print("%sWARNING:%s Found conflicting Panda3D libraries from other makepanda build!" % (GetColor("red"), GetColor()))
Warn("Found conflicting Panda3D libraries from other makepanda build!")
##########################################################################################
#
@ -3061,7 +3061,7 @@ if tp_dir is not None:
pattern = os.path.join('C:' + os.sep, 'Windows', 'WinSxS', 'Manifests', sxs_name + '_*.manifest')
manifests = glob.glob(pattern)
if not manifests:
print("%sWARNING:%s Could not locate manifest %s. You may need to reinstall the Visual C++ Redistributable." % (GetColor("red"), GetColor(), pattern))
Warn("Could not locate manifest %s. You may need to reinstall the Visual C++ Redistributable." % (pattern))
continue
CopyFile(GetOutputDir() + "/python/" + ident.get('name') + ".manifest", manifests[0])
@ -7008,7 +7008,7 @@ def MakeInstallerLinux():
rpmbuild_present = True
if dpkg_present and rpmbuild_present:
print("Warning: both dpkg and rpmbuild present.")
Warn("both dpkg and rpmbuild present.")
if dpkg_present:
# Invoke installpanda.py to install it into a temporary dir

46
makepanda/makepandacore.py
View File

@ -150,7 +150,7 @@ CONFLICTING_FILES=["dtool/src/dtoolutil/pandaVersion.h",
def WarnConflictingFiles(delete = False):
for cfile in CONFLICTING_FILES:
if os.path.exists(cfile):
print("%sWARNING:%s file may conflict with build: %s%s%s" % (GetColor("red"), GetColor(), GetColor("green"), cfile, GetColor()))
Warn("file may conflict with build:", cfile)
if delete:
os.unlink(cfile)
print("Deleted.")
@ -284,6 +284,20 @@ def exit(msg = ""):
print(msg)
raise "initiate-exit"
def Warn(msg, extra=None):
if extra is not None:
print("%sWARNING:%s %s %s%s%s" % (GetColor("red"), GetColor(), msg, GetColor("green"), extra, GetColor()))
else:
print("%sWARNING:%s %s" % (GetColor("red"), GetColor(), msg))
sys.stdout.flush()
def Error(msg, extra=None):
if extra is not None:
print("%sERROR:%s %s %s%s%s" % (GetColor("red"), GetColor(), msg, GetColor("green"), extra, GetColor()))
else:
print("%sERROR:%s %s" % (GetColor("red"), GetColor(), msg))
exit()
########################################################################
##
## SetTarget, GetTarget, GetHost
@ -723,7 +737,7 @@ def NeedsBuild(files, others):
print(" dependency changed: %s" % (key))
if VERBOSE and frozenset(cached) != frozenset(dates):
print("%sWARNING:%s file dependencies changed: %s%s%s" % (GetColor("red"), GetColor(), GetColor("green"), files, GetColor()))
Warn("file dependencies changed:", files)
return True
@ -1298,7 +1312,7 @@ def GetThirdpartyDir():
THIRDPARTYDIR = GetThirdpartyBase()+"/android-libs-%s/" % (GetTargetArch())
else:
print("%s Unsupported platform: %s" % (ColorText("red", "WARNING:"), target))
Warn("Unsupported platform:", target)
return
if (GetVerbose()):
@ -1744,11 +1758,10 @@ def SmartPkgEnable(pkg, pkgconfig = None, libs = None, incs = None, defs = None,
if not custom_loc and pkgconfig is not None and not libs:
# pkg-config is all we can do, abort if it wasn't found.
if pkg in PkgListGet():
print("%sWARNING:%s Could not locate pkg-config package %s, excluding from build" % (GetColor("red"), GetColor(), pkgconfig))
Warn("Could not locate pkg-config package %s, excluding from build" % (pkgconfig))
PkgDisable(pkg)
else:
print("%sERROR:%s Could not locate pkg-config package %s, aborting build" % (GetColor("red"), GetColor(), pkgconfig))
exit()
Error("Could not locate pkg-config package %s, aborting build" % (pkgconfig))
else:
# Okay, our pkg-config attempts failed. Let's try locating the libs by ourselves.
@ -1812,14 +1825,12 @@ def SmartPkgEnable(pkg, pkgconfig = None, libs = None, incs = None, defs = None,
if not have_pkg:
if custom_loc:
print("%sERROR:%s Could not locate thirdparty package %s in specified directory, aborting build" % (GetColor("red"), GetColor(), pkg.lower()))
exit()
Error("Could not locate thirdparty package %s in specified directory, aborting build" % (pkg.lower()))
elif pkg in PkgListGet():
print("%sWARNING:%s Could not locate thirdparty package %s, excluding from build" % (GetColor("red"), GetColor(), pkg.lower()))
Warn("Could not locate thirdparty package %s, excluding from build" % (pkg.lower()))
PkgDisable(pkg)
else:
print("%sERROR:%s Could not locate thirdparty package %s, aborting build" % (GetColor("red"), GetColor(), pkg.lower()))
exit()
Error("Could not locate thirdparty package %s, aborting build" % (pkg.lower()))
########################################################################
##
@ -2100,7 +2111,7 @@ def SdkLocatePython(prefer_thirdparty_python=False):
os.environ["PYTHONHOME"] = SDK["PYTHON"]
if sys.version[:3] != ver:
print("Warning: running makepanda with Python %s, but building Panda3D with Python %s." % (sys.version[:3], ver))
Warn("running makepanda with Python %s, but building Panda3D with Python %s." % (sys.version[:3], ver))
elif CrossCompiling() or (prefer_thirdparty_python and os.path.isdir(os.path.join(GetThirdpartyDir(), "python"))):
tp_python = os.path.join(GetThirdpartyDir(), "python")
@ -2743,12 +2754,11 @@ def LibName(opt, name):
WARNINGS.append(name + " not found. Skipping Package " + opt)
if (opt in PkgListGet()):
if not PkgSkip(opt):
print("%sWARNING:%s Could not locate thirdparty package %s, excluding from build" % (GetColor("red"), GetColor(), opt.lower()))
Warn("Could not locate thirdparty package %s, excluding from build" % (opt.lower()))
PkgDisable(opt)
return
else:
print("%sERROR:%s Could not locate thirdparty package %s, aborting build" % (GetColor("red"), GetColor(), opt.lower()))
exit()
Error("Could not locate thirdparty package %s, aborting build" % (opt.lower()))
LIBNAMES.append((opt, name))
def DefSymbol(opt, sym, val=""):
@ -2831,7 +2841,7 @@ def SetupBuildEnvironment(compiler):
returnval = handle.close()
if returnval != None and returnval != 0:
print("%sWARNING:%s %s failed" % (GetColor("red"), GetColor(), cmd))
Warn("%s failed" % (cmd))
SYS_LIB_DIRS += [SDK.get("SYSROOT", "") + "/usr/lib"]
# Now extract the preprocessor's include directories.
@ -2860,7 +2870,7 @@ def SetupBuildEnvironment(compiler):
print("Ignoring non-existent include directory %s" % (line))
if handle.returncode != 0 or not SYS_INC_DIRS:
print("%sWARNING:%s %s failed or did not produce the expected result" % (GetColor("red"), GetColor(), cmd))
Warn("%s failed or did not produce the expected result" % (cmd))
sysroot = SDK.get("SYSROOT", "")
# Add some sensible directories as a fallback.
SYS_INC_DIRS = [
@ -3374,7 +3384,7 @@ def FindLocation(fn, ipath, pyabi=None):
elif ext != ".pyd" and loc not in WARNED_FILES:
WARNED_FILES.add(loc)
print("%sWARNING:%s file depends on Python but is not in an ABI-specific directory: %s%s%s" % (GetColor("red"), GetColor(), GetColor("green"), loc, GetColor()))
Warn("file depends on Python but is not in an ABI-specific directory:", loc)
ORIG_EXT[loc] = ext
return loc