2
0
Эх сурвалжийг харах

Remove win-extras (smartroom/BeyondQuestion, serial, JOD, phidgets) from the Windows SDK
Let me know if you still need any of these and we'll find a better spot for them.

rdb 9 жил өмнө
parent
commit
879b8a5ccb

+ 0 - 6
makepanda/installer.nsi

@@ -15,7 +15,6 @@
 ;   BUILT         - location of panda install tree.
 ;   BUILT         - location of panda install tree.
 ;   SOURCE        - location of the panda source-tree if available, OR location of panda install tree.
 ;   SOURCE        - location of the panda source-tree if available, OR location of panda install tree.
 ;   PYVER         - version of Python that Panda was built with (ie, "2.7")
 ;   PYVER         - version of Python that Panda was built with (ie, "2.7")
-;   PYEXTRAS      - directory containing python extras, if any.
 ;   REGVIEW       - either 32 or 64, depending on the build architecture.
 ;   REGVIEW       - either 32 or 64, depending on the build architecture.
 ;
 ;
 
 
@@ -372,11 +371,6 @@ SectionGroup "Python support"
         SetOutPath "$INSTDIR\python"
         SetOutPath "$INSTDIR\python"
         File /r "${BUILT}\python\*"
         File /r "${BUILT}\python\*"
 
 
-        !ifdef PYEXTRAS
-        SetOutPath "$INSTDIR\python\lib"
-        File /nonfatal /r "${PYEXTRAS}\*"
-        !endif
-
         SetDetailsPrint both
         SetDetailsPrint both
         DetailPrint "Adding registry keys for Python..."
         DetailPrint "Adding registry keys for Python..."
         SetDetailsPrint listonly
         SetDetailsPrint listonly

+ 0 - 1
makepanda/makepanda.py

@@ -6521,7 +6521,6 @@ def MakeInstallerNSIS(file, title, installdir):
         'BUILT'       : panda,
         'BUILT'       : panda,
         'SOURCE'      : psource,
         'SOURCE'      : psource,
         'PYVER'       : SDK["PYTHONVERSION"][6:9],
         'PYVER'       : SDK["PYTHONVERSION"][6:9],
-        'PYEXTRAS'    : os.path.join(os.path.abspath(GetThirdpartyBase()), 'win-extras'),
         'REGVIEW'     : regview,
         'REGVIEW'     : regview,
     }
     }