Переглянути джерело

use packp3d1.8 instead of packp3d

rdb 14 роки тому
батько
коміт
7db58e6ad1
1 змінених файлів з 5 додано та 2 видалено
  1. 5 2
      makepanda/makepanda.py

+ 5 - 2
makepanda/makepanda.py

@@ -47,7 +47,7 @@ DISTRIBUTOR=""
 VERSION=None
 VERSION=None
 DEBVERSION=None
 DEBVERSION=None
 RPMRELEASE="1"
 RPMRELEASE="1"
-P3DSUFFIX=""
+P3DSUFFIX=None
 MAJOR_VERSION=None
 MAJOR_VERSION=None
 COREAPI_VERSION=None
 COREAPI_VERSION=None
 PLUGIN_VERSION=None
 PLUGIN_VERSION=None
@@ -247,6 +247,9 @@ if (DEBVERSION is None):
 
 
 MAJOR_VERSION = VERSION[:3]
 MAJOR_VERSION = VERSION[:3]
 
 
+if (P3DSUFFIX is None):
+    P3DSUFFIX = MAJOR_VERSION
+
 if (RUNTIME or RTDIST):
 if (RUNTIME or RTDIST):
     # Compiling Maya/Max is pointless in rtdist build
     # Compiling Maya/Max is pointless in rtdist build
     for ver in MAYAVERSIONS + MAXVERSIONS:
     for ver in MAYAVERSIONS + MAXVERSIONS:
@@ -261,7 +264,7 @@ if (RUNTIME or RTDIST):
         elif (RUNTIME):
         elif (RUNTIME):
             SetOutputDir("built_" + DISTRIBUTOR.strip() + "_rt")
             SetOutputDir("built_" + DISTRIBUTOR.strip() + "_rt")
 
 
-    RTDIST_VERSION = DISTRIBUTOR.strip() + "_" + VERSION[:3]
+    RTDIST_VERSION = DISTRIBUTOR.strip() + "_" + MAJOR_VERSION
 elif (DISTRIBUTOR == ""):
 elif (DISTRIBUTOR == ""):
     DISTRIBUTOR = "makepanda"
     DISTRIBUTOR = "makepanda"