From ba606bd2831c40bc25b4b152c47f75e2987f61dd Mon Sep 17 00:00:00 2001 From: rdb Date: Mon, 30 Nov 2009 14:30:24 +0000 Subject: [PATCH] Don't tuck away the plugin installer in some directory --- makepanda/makepanda.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index 1598cbcc28..0ac6cf2067 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -4493,6 +4493,7 @@ def MakeInstallerNSIS(file, fullname, smdirectory, installdir): AddToPathEnv("PATH", GetOutputDir() + "\\bin") AddToPathEnv("PATH", GetOutputDir() + "\\plugins") oscmd(SDK["PYTHONEXEC"] + " direct\\src\\plugin_installer\\make_installer.py --version %s" % VERSION) + shutil.move("direct\\src\\plugin_installer\\p3d-setup.exe", file) return print "Building "+fullname+" installer. This can take up to an hour." @@ -4875,9 +4876,15 @@ if (INSTALLER != 0): dbg = "" if (GetOptimize() <= 2): dbg = "-dbg" if (platform.architecture()[0] == "64bit"): - MakeInstallerNSIS("Panda3D-"+VERSION+dbg+"-x64.exe", "Panda3D", "Panda3D "+VERSION, "C:\\Panda3D-"+VERSION) + if (RUNTIME): + MakeInstallerNSIS("Panda3D-Runtime-"+VERSION+dbg+"-x64.exe", "Panda3D", "Panda3D "+VERSION, "C:\\Panda3D-"+VERSION) + else: + MakeInstallerNSIS("Panda3D-"+VERSION+dbg+"-x64.exe", "Panda3D", "Panda3D "+VERSION, "C:\\Panda3D-"+VERSION) else: - MakeInstallerNSIS("Panda3D-"+VERSION+dbg+".exe", "Panda3D", "Panda3D "+VERSION, "C:\\Panda3D-"+VERSION) + if (RUNTIME): + MakeInstallerNSIS("Panda3D-Runtime-"+VERSION+dbg+".exe", "Panda3D", "Panda3D "+VERSION, "C:\\Panda3D-"+VERSION) + else: + MakeInstallerNSIS("Panda3D-"+VERSION+dbg+".exe", "Panda3D", "Panda3D "+VERSION, "C:\\Panda3D-"+VERSION) elif (sys.platform == "linux2"): MakeInstallerLinux() elif (sys.platform == "darwin"):