소스 검색

Remove RPM dependency of Python - there's no standard naming convention. Also, fix packpanda on windows with new 'direct' changes.

rdb 16 년 전
부모
커밋
701fad9f3c
2개의 변경된 파일6개의 추가작업 그리고 3개의 파일을 삭제
  1. 1 1
      direct/src/directscripts/packpanda.nsi
  2. 5 2
      doc/makepanda/makepanda.py

+ 1 - 1
direct/src/directscripts/packpanda.nsi

@@ -106,8 +106,8 @@ Section "${SMDIRECTORY}" SecCore
         File /r /x CVS /x Opt?-Win32 "${PSOURCE}\direct\src\filter\*.sha"
         SetOutPath $INSTDIR\direct
         File /r /x CVS /x Opt?-Win32 "${PSOURCE}\direct\src\*.py"
+        File "${PANDA}\tmp\__init__.py"
         !endif
-        File "${PANDA}\direct\__init__.py"
         SetOutPath $INSTDIR\pandac
         File /r "${PANDA}\pandac\*.py"
         SetOutPath $INSTDIR\python

+ 5 - 2
doc/makepanda/makepanda.py

@@ -3578,6 +3578,7 @@ def MakeInstallerNSIS(file,fullname,smdirectory,installdir):
         os.remove(file)
     if (os.path.exists("nsis-output.exe")):
         os.remove("nsis-output.exe")
+    WriteFile("built/tmp/__init__.py", "")
     psource=os.path.abspath(".")
     panda=os.path.abspath(GetOutputDir())
     cmd="thirdparty/win-nsis/makensis /V2 "
@@ -3614,15 +3615,17 @@ Maintainer: [email protected]
 Description: The Panda3D free 3D engine
 """
 
+# We're not putting "python" in the "Requires" field,
+# since the rpm-based distros don't have a common
+# naming for the Python package.
 INSTALLER_SPEC_FILE="""
-Summary: Panda 3D Engine
+Summary: The Panda3D free 3D engine
 Name: panda3d
 Version: VERSION
 Release: 1
 License: BSD License
 Group: Development/Libraries
 BuildRoot: PANDASOURCE/linuxroot
-Requires: python (>= PV)
 %description
 The Panda3D engine.
 %post