TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 10:54:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

More fixes for 1.1

Browse Source
This commit is contained in:
Josh Yelon 2005-07-07 22:17:34 +00:00
parent 72a085946a
commit a1a1bf8826
1 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
doc/makepanda/makepanda.py
View File

@ -1143,33 +1143,37 @@ def CopyAllFiles(dstdir, srcdir, suffix=""):
if (suflen==0) or (x[-suflen:]==suffix): if (suflen==0) or (x[-suflen:]==suffix):
CopyFile(dstdir+x, srcdir+x) CopyFile(dstdir+x, srcdir+x)
def CopyAllHeaders(dir): def CopyAllHeaders(dir, skip=[]):
# get a list of headers # get a list of headers
dirlist = os.listdir(dir) dirlist = os.listdir(dir)
dirlist.sort() dirlist.sort()
files = fnmatch.filter(dirlist,"*.h")+fnmatch.filter(dirlist,"*.I")+fnmatch.filter(dirlist,"*.T") files = fnmatch.filter(dirlist,"*.h")+fnmatch.filter(dirlist,"*.I")+fnmatch.filter(dirlist,"*.T")
# actually copy the headers.
copied = []
if (skip!="ALL"):
for filename in files:
if (skip.count(filename)==0):
srcfile = dir + "/" + filename
dstfile = PREFIX + "/include/" + filename
if (older(dstfile,srcfile)):
copied.append(filename)
WriteFile(dstfile,ReadFile(srcfile))
if (len(copied)>0):
print "\nCompiling in directory: %s\n\nCopied headers: %s"%(dir,copied)
# sanity check - do headers in directory match headers in CVS? # sanity check - do headers in directory match headers in CVS?
cvsentries = ReadCvsEntries(dir) cvsentries = ReadCvsEntries(dir)
if (cvsentries != 0): if (cvsentries != 0):
cvsheaders = fnmatch.filter(cvsentries,"*.h")+fnmatch.filter(cvsentries,"*.I")+fnmatch.filter(cvsentries,"*.T") cvsheaders = fnmatch.filter(cvsentries,"*.h")+fnmatch.filter(cvsentries,"*.I")+fnmatch.filter(cvsentries,"*.T")
for x in SetDifference(files, cvsheaders): for x in SetDifference(files, cvsheaders):
msg = "WARNING: header file %s is in your directory, but not in CVS"%(dir+"/"+x) if ((skip=="ALL") or (skip.count(x)==0)):
print msg msg = "WARNING: header file %s is in your directory, but not in CVS"%(dir+"/"+x)
WARNINGS.append(msg) print msg
WARNINGS.append(msg)
for x in SetDifference(cvsheaders, files): for x in SetDifference(cvsheaders, files):
msg = "WARNING: header file %s is CVS, but not in your directory"%(dir+"/"+x) if ((skip=="ALL") or (skip.count(x)==0)):
print msg msg = "WARNING: header file %s is CVS, but not in your directory"%(dir+"/"+x)
WARNINGS.append(msg) print msg
# actually copy the headers. WARNINGS.append(msg)
copied = []
for filename in files:
srcfile = dir + "/" + filename
dstfile = PREFIX + "/include/" + filename
if (older(dstfile,srcfile)):
copied.append(filename)
WriteFile(dstfile,ReadFile(srcfile))
if (len(copied)>0):
print "\nCompiling in directory: %s\n\nCopied headers: %s"%(dir,copied)
def CopyTree(dstdir,srcdir): def CopyTree(dstdir,srcdir):
if (os.path.isdir(dstdir)): return 0 if (os.path.isdir(dstdir)): return 0
@ -1324,11 +1328,7 @@ def Interrogate(ipath=0, opts=0, outd=0, outc=0, src=0, module=0, library=0, als
else: else:
files.sort() files.sort()
for x in skip: for x in skip:
if (files.count(x)==0): if (files.count(x)!=0): files.remove(x)
w = "WARNING: file %s is not present in directory %s"%(x,src)
print w
WARNINGS.append(w)
else: files.remove(x)
for x in also: files.append(x) for x in also: files.append(x)
# interrogate them. # interrogate them.
@ -2026,6 +2026,7 @@ IPATH=['dtool/src/dtoolbase']
OPTS=['BUILDING_DTOOL', 'NSPR'] OPTS=['BUILDING_DTOOL', 'NSPR']
CopyAllHeaders(IPATH[0]) CopyAllHeaders(IPATH[0])
CompileC(ipath=IPATH, opts=OPTS, src='dtoolbase.cxx', obj='dtoolbase_dtoolbase.obj') CompileC(ipath=IPATH, opts=OPTS, src='dtoolbase.cxx', obj='dtoolbase_dtoolbase.obj')
CompileC(ipath=IPATH, opts=OPTS, src='indent.cxx', obj='dtoolbase_indent.obj')
# #
# DIRECTORY: dtool/src/dtoolutil/ # DIRECTORY: dtool/src/dtoolutil/
@ -2033,7 +2034,7 @@ CompileC(ipath=IPATH, opts=OPTS, src='dtoolbase.cxx', obj='dtoolbase_dtoolbase.o
IPATH=['dtool/src/dtoolutil'] IPATH=['dtool/src/dtoolutil']
OPTS=['BUILDING_DTOOL', 'NSPR'] OPTS=['BUILDING_DTOOL', 'NSPR']
CopyAllHeaders(IPATH[0]) CopyAllHeaders(IPATH[0], skip=["pandaVersion.h", "checkPandaVersion.h"])
CopyFile(PREFIX+'/include/','dtool/src/dtoolutil/vector_src.cxx') CopyFile(PREFIX+'/include/','dtool/src/dtoolutil/vector_src.cxx')
CompileC(ipath=IPATH, opts=OPTS, src='gnu_getopt.c', obj='dtoolutil_gnu_getopt.obj') CompileC(ipath=IPATH, opts=OPTS, src='gnu_getopt.c', obj='dtoolutil_gnu_getopt.obj')
CompileC(ipath=IPATH, opts=OPTS, src='gnu_getopt1.c', obj='dtoolutil_gnu_getopt1.obj') CompileC(ipath=IPATH, opts=OPTS, src='gnu_getopt1.c', obj='dtoolutil_gnu_getopt1.obj')
@ -2055,6 +2056,7 @@ CompileLink(opts=['ADVAPI', 'NSPR'], dll='libdtool.dll', obj=[
'dtoolutil_composite1.obj', 'dtoolutil_composite1.obj',
'dtoolutil_composite2.obj', 'dtoolutil_composite2.obj',
'dtoolbase_dtoolbase.obj', 'dtoolbase_dtoolbase.obj',
'dtoolbase_indent.obj',
]) ])
# #
@ -2063,7 +2065,7 @@ CompileLink(opts=['ADVAPI', 'NSPR'], dll='libdtool.dll', obj=[
IPATH=['dtool/src/cppparser'] IPATH=['dtool/src/cppparser']
OPTS=['NSPR'] OPTS=['NSPR']
# CopyAllHeaders(IPATH[0]) --- do NOT copy these headers. CopyAllHeaders(IPATH[0], skip="ALL")
CompileBison(pre='cppyy', dstc='cppBison.cxx', dsth='cppBison.h', src='dtool/src/cppparser/cppBison.yxx') CompileBison(pre='cppyy', dstc='cppBison.cxx', dsth='cppBison.h', src='dtool/src/cppparser/cppBison.yxx')
CompileC(ipath=IPATH, opts=OPTS, src='cppParser_composite1.cxx', obj='cppParser_composite1.obj') CompileC(ipath=IPATH, opts=OPTS, src='cppParser_composite1.cxx', obj='cppParser_composite1.obj')
CompileC(ipath=IPATH, opts=OPTS, src='cppParser_composite2.cxx', obj='cppParser_composite2.obj') CompileC(ipath=IPATH, opts=OPTS, src='cppParser_composite2.cxx', obj='cppParser_composite2.obj')
@ -2196,6 +2198,7 @@ if (OMIT.count("SSL")==0):
IPATH=['dtool/src/test_interrogate'] IPATH=['dtool/src/test_interrogate']
OPTS=['NSPR'] OPTS=['NSPR']
CopyAllHeaders(IPATH[0], skip="ALL")
CompileC(ipath=IPATH, opts=OPTS, src='test_interrogate.cxx', obj='test_interrogate_test_interrogate.obj') CompileC(ipath=IPATH, opts=OPTS, src='test_interrogate.cxx', obj='test_interrogate_test_interrogate.obj')
CompileLink(opts=['ADVAPI', 'NSPR', 'SSL'], dll='test_interrogate.exe', obj=[ CompileLink(opts=['ADVAPI', 'NSPR', 'SSL'], dll='test_interrogate.exe', obj=[
'test_interrogate_test_interrogate.obj', 'test_interrogate_test_interrogate.obj',