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

Fixes for plugin versioning

Browse Source
This commit is contained in:
rdb 2009-10-17 18:35:40 +00:00
parent 68f224ff08
commit 5d84be4214
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
makepanda/makepanda.py
View File

@ -1323,6 +1323,7 @@ PANDAVERSION_H="""
#define PANDA_MINOR_VERSION $VERSION2 #define PANDA_MINOR_VERSION $VERSION2
#define PANDA_SEQUENCE_VERSION $VERSION2 #define PANDA_SEQUENCE_VERSION $VERSION2
#define PANDA_VERSION $NVERSION #define PANDA_VERSION $NVERSION
#define PANDA_NUMERIC_VERSION $NVERSION
#define PANDA_VERSION_STR "$VERSION1.$VERSION2.$VERSION3" #define PANDA_VERSION_STR "$VERSION1.$VERSION2.$VERSION3"
#define PANDA_DISTRIBUTOR "$DISTRIBUTOR" #define PANDA_DISTRIBUTOR "$DISTRIBUTOR"
#define PANDA_PACKAGE_VERSION_STR "$RUNTIME_VERSION" #define PANDA_PACKAGE_VERSION_STR "$RUNTIME_VERSION"
@ -1354,6 +1355,9 @@ def CreatePandaVersionFiles():
pversion2=int(PLUGIN_VERSION.split(".")[1]) pversion2=int(PLUGIN_VERSION.split(".")[1])
pversion3=int(PLUGIN_VERSION.split(".")[2]) pversion3=int(PLUGIN_VERSION.split(".")[2])
nversion=version1*1000000+version2*1000+version3 nversion=version1*1000000+version2*1000+version3
if (DISTRIBUTOR != "cmu"):
# Subtract 1 if we are not an official version.
nversion -= 1
pandaversion_h = PANDAVERSION_H.replace("$VERSION1",str(version1)) pandaversion_h = PANDAVERSION_H.replace("$VERSION1",str(version1))
pandaversion_h = pandaversion_h.replace("$VERSION2",str(version2)) pandaversion_h = pandaversion_h.replace("$VERSION2",str(version2))
@ -1367,8 +1371,8 @@ def CreatePandaVersionFiles():
pandaversion_h += "\n#undef PANDA_OFFICIAL_VERSION\n" pandaversion_h += "\n#undef PANDA_OFFICIAL_VERSION\n"
if RUNTIME: if RUNTIME:
pandaversion_h += "\n#define P3D_PLUGIN_MAJOR_VERSION %s\n" % pversion1 pandaversion_h += "\n#define P3D_PLUGIN_MAJOR_VERSION %s\n" % pversion1
pandaversion_h += "\n#define P3D_PLUGIN_MINOR_VERSION %s\n" % pversion1 pandaversion_h += "\n#define P3D_PLUGIN_MINOR_VERSION %s\n" % pversion2
pandaversion_h += "\n#define P3D_PLUGIN_SEQUENCE_VERSION %s\n" % pversion1 pandaversion_h += "\n#define P3D_PLUGIN_SEQUENCE_VERSION %s\n" % pversion3
checkpandaversion_cxx = CHECKPANDAVERSION_CXX.replace("$VERSION1",str(version1)) checkpandaversion_cxx = CHECKPANDAVERSION_CXX.replace("$VERSION1",str(version1))
checkpandaversion_cxx = checkpandaversion_cxx.replace("$VERSION2",str(version2)) checkpandaversion_cxx = checkpandaversion_cxx.replace("$VERSION2",str(version2))

17
makepanda/makepandacore.py
View File

@ -717,7 +717,6 @@ def MakeBuildTree():
MakeDirectory(OUTPUTDIR+"/models/maps") MakeDirectory(OUTPUTDIR+"/models/maps")
MakeDirectory(OUTPUTDIR+"/models/misc") MakeDirectory(OUTPUTDIR+"/models/misc")
MakeDirectory(OUTPUTDIR+"/models/gui") MakeDirectory(OUTPUTDIR+"/models/gui")
MakeDirectory(OUTPUTDIR+"/direct")
MakeDirectory(OUTPUTDIR+"/pandac") MakeDirectory(OUTPUTDIR+"/pandac")
MakeDirectory(OUTPUTDIR+"/pandac/input") MakeDirectory(OUTPUTDIR+"/pandac/input")
@ -1500,11 +1499,11 @@ def ParsePandaVersion(fn):
for line in f: for line in f:
match = pattern.match(line,0) match = pattern.match(line,0)
if (match): if (match):
version = match.group(1)+"."+match.group(2)+"."+match.group(3)
break
f.close() f.close()
except: version="0.0.0" return match.group(1)+"."+match.group(2)+"."+match.group(3)
return version f.close()
except: pass
return "0.0.0"
def ParsePluginVersion(fn): def ParsePluginVersion(fn):
try: try:
@ -1513,11 +1512,11 @@ def ParsePluginVersion(fn):
for line in f: for line in f:
match = pattern.match(line,0) match = pattern.match(line,0)
if (match): if (match):
version = match.group(1)+"."+match.group(2)+"."+match.group(3)
break
f.close() f.close()
except: version="0.0.0" return match.group(1)+"."+match.group(2)+"."+match.group(3)
return version f.close()
except: pass
return "0.0.0"
######################################################################## ########################################################################
## ##