Thread: [cgkit-commits] SF.net SVN: cgkit:[250] cgkit/trunk/setup.py
Brought to you by:
mbaas
From: <mb...@us...> - 2008-08-25 15:02:58
|
Revision: 250 http://cgkit.svn.sourceforge.net/cgkit/?rev=250&view=rev Author: mbaas Date: 2008-08-25 15:02:53 +0000 (Mon, 25 Aug 2008) Log Message: ----------- Installing cgkit light on Windows still required the support lib to be present. Modified Paths: -------------- cgkit/trunk/setup.py Modified: cgkit/trunk/setup.py =================================================================== --- cgkit/trunk/setup.py 2008-08-25 14:58:56 UTC (rev 249) +++ cgkit/trunk/setup.py 2008-08-25 15:02:53 UTC (rev 250) @@ -320,62 +320,63 @@ ##### Windows specific stuff ##### if sys.platform=="win32": - MACROS += [("WIN32", None)] - - # Boost - if BOOST_BASE==None: - BOOST_BIN = None - else: - BOOST_BIN = os.path.join(BOOST_BASE, "libs", "python", "build", "bin-stage") - INC_DIRS = [BOOST_BASE]+INC_DIRS - LIB_DIRS = [BOOST_BIN] + LIB_DIRS - - if BOOST_DLL!=None: - # Search for the Boost DLL - boost_dll = findFile(BOOST_DLL, LIB_DIRS) - # Add the boost dll as additional file + if not INSTALL_CGKIT_LIGHT: + MACROS += [("WIN32", None)] + + # Boost + if BOOST_BASE==None: + BOOST_BIN = None + else: + BOOST_BIN = os.path.join(BOOST_BASE, "libs", "python", "build", "bin-stage") + INC_DIRS = [BOOST_BASE]+INC_DIRS + LIB_DIRS = [BOOST_BIN] + LIB_DIRS + + if BOOST_DLL!=None: + # Search for the Boost DLL + boost_dll = findFile(BOOST_DLL, LIB_DIRS) + # Add the boost dll as additional file + # (it is supposed to go into the root package directory) + packageDLL(boost_dll) + + # OpenGL + LIBS += ["opengl32", "glu32"] + + # Additional compiler options + CC_ARGS += ["/GR", "/Zm700"] + # Additional linker options + LINK_ARGS += ["/NODEFAULTLIB:LIBCMT"] + + # Add the stlport dll as additional file # (it is supposed to go into the root package directory) - packageDLL(boost_dll) + if USING_STLPORT: + if os.path.isabs(STLPORT_DLL): + stlport_dll = STLPORT_DLL + else: + stlport_dll = os.path.join(STLPORT_BASE, "lib", STLPORT_DLL) + packageDLL(stlport_dll) + + # Lib3ds + if LIB3DS_AVAILABLE: + INC_DIRS += [LIB3DS_PATH] + LIB_DIRS += [os.path.join(LIB3DS_PATH, "msvc", "Build", "Release")] +# LIBS += ["lib3ds-120s"] +# MACROS += [("LIB3DS_AVAILABLE", None)] + + # CyberX3D + if CYBERX3D_AVAILABLE: + INC_DIRS += [os.path.join(CYBERX3D_PATH, "include")] + LIB_DIRS += [os.path.join(CYBERX3D_PATH, "lib")] + LIB_DIRS += [os.path.join(XERCES_PATH, "lib")] + if CYBERX3D_LIB==None: + CYBERX3D_LIB = "CyberX3D" + if CYBERX3D_XERCES_LIB==None: + CYBERX3D_XERCES_LIB = "xerces-c_2" + LIBS += [CYBERX3D_LIB, CYBERX3D_XERCES_LIB, "gdi32"] + if os.path.isabs(CYBERX3D_XERCES_DLL): + packageDLL(CYBERX3D_XERCES_DLL) + else: + packageDLL(os.path.join(XERCES_PATH, "bin", CYBERX3D_XERCES_DLL)) - # OpenGL - LIBS += ["opengl32", "glu32"] - - # Additional compiler options - CC_ARGS += ["/GR", "/Zm700"] - # Additional linker options - LINK_ARGS += ["/NODEFAULTLIB:LIBCMT"] - - # Add the stlport dll as additional file - # (it is supposed to go into the root package directory) - if USING_STLPORT: - if os.path.isabs(STLPORT_DLL): - stlport_dll = STLPORT_DLL - else: - stlport_dll = os.path.join(STLPORT_BASE, "lib", STLPORT_DLL) - packageDLL(stlport_dll) - - # Lib3ds - if LIB3DS_AVAILABLE: - INC_DIRS += [LIB3DS_PATH] - LIB_DIRS += [os.path.join(LIB3DS_PATH, "msvc", "Build", "Release")] -# LIBS += ["lib3ds-120s"] -# MACROS += [("LIB3DS_AVAILABLE", None)] - - # CyberX3D - if CYBERX3D_AVAILABLE: - INC_DIRS += [os.path.join(CYBERX3D_PATH, "include")] - LIB_DIRS += [os.path.join(CYBERX3D_PATH, "lib")] - LIB_DIRS += [os.path.join(XERCES_PATH, "lib")] - if CYBERX3D_LIB==None: - CYBERX3D_LIB = "CyberX3D" - if CYBERX3D_XERCES_LIB==None: - CYBERX3D_XERCES_LIB = "xerces-c_2" - LIBS += [CYBERX3D_LIB, CYBERX3D_XERCES_LIB, "gdi32"] - if os.path.isabs(CYBERX3D_XERCES_DLL): - packageDLL(CYBERX3D_XERCES_DLL) - else: - packageDLL(os.path.join(XERCES_PATH, "bin", CYBERX3D_XERCES_DLL)) - ##### Mac OS X (Darwin) ##### elif sys.platform=="darwin": # OpenGL This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mb...@us...> - 2009-04-26 18:14:38
|
Revision: 308 http://cgkit.svn.sourceforge.net/cgkit/?rev=308&view=rev Author: mbaas Date: 2009-04-26 18:14:28 +0000 (Sun, 26 Apr 2009) Log Message: ----------- Added the sequence utilities. Modified Paths: -------------- cgkit/trunk/setup.py Modified: cgkit/trunk/setup.py =================================================================== --- cgkit/trunk/setup.py 2009-04-26 18:13:51 UTC (rev 307) +++ cgkit/trunk/setup.py 2009-04-26 18:14:28 UTC (rev 308) @@ -286,7 +286,10 @@ "render.py", "utilities/postbake.py", "utilities/info3d.py", - "utilities/convert3d.py"] + "utilities/convert3d.py", + "utilities/seqls.py", + "utilities/seqmv.py", + "utilities/seqrm.py",] # Lib3ds if LIB3DS_AVAILABLE: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mb...@us...> - 2009-06-20 17:49:33
|
Revision: 320 http://cgkit.svn.sourceforge.net/cgkit/?rev=320&view=rev Author: mbaas Date: 2009-06-20 17:49:32 +0000 (Sat, 20 Jun 2009) Log Message: ----------- Ported the setup script over to Python 3 Modified Paths: -------------- cgkit/trunk/setup.py Modified: cgkit/trunk/setup.py =================================================================== --- cgkit/trunk/setup.py 2009-06-17 19:51:46 UTC (rev 319) +++ cgkit/trunk/setup.py 2009-06-20 17:49:32 UTC (rev 320) @@ -65,7 +65,7 @@ msg = 'Error: File "%s" not found in:\n'%filename for dir in dirs: msg += ' %s\n'%dir - print msg + print (msg) sys.exit(1) # packageDLL @@ -81,7 +81,7 @@ # Copy the DLL (only if the source is newer than the dest)... dstdll = os.path.join(PACKAGE_NAME, dllname) if (not os.path.exists(dstdll)) or (os.path.getmtime(dstdll)<os.path.getmtime(dll)): - print 'Copying DLL %s...'%dll + print ('Copying DLL %s...'%dll) shutil.copyfile(dll, dstdll) # Add it to the list of data files... dest = os.path.join(get_python_lib(plat_specific=True), PACKAGE_NAME) @@ -104,17 +104,17 @@ current date and time. """ - print "Updating version in the cgkitinfo module..." + print ("Updating version in the cgkitinfo module...") template = os.path.join("cgkit", "cgkitinfo_template.txt") infomod = os.path.join("cgkit", "cgkitinfo.py") # Read the cgkitinfo template module try: - f = file(template) + f = open(template, "rt") lines = f.readlines() f.close() except: - print 'Error: Could not read file "%s"'%template + print ('Error: Could not read file "%s"'%template) sys.exit(1) # Replace the version string... @@ -126,7 +126,9 @@ continue if f[0]=="version_info": try: - exec s.strip() + ns = {} + exec(s.strip(), ns) + version_info = ns.get("version_info") if type(version_info)!=tuple: raise Exception if len(version_info)!=4: @@ -137,11 +139,12 @@ if type(rlevel)!=str: raise Exception except: - print 'Invalid version tuple in file "%s": %s'%(template,s.strip()) + print ('Invalid version tuple in file "%s": %s'%(template,s.strip())) + raise sys.exit(1) if f[0]=="version": if version_info==None: - print '%s: version_info must occur before version'%template + print ('%s: version_info must occur before version'%template) sys.exit(1) major,minor,micro,rlevel = version_info v = "%d.%d.%d"%(major,minor,micro) @@ -151,17 +154,17 @@ v += " 'light'" v+=" (%s)"%time.strftime("%b %d %Y, %H:%M") lines[i] = 'version = "%s"\n'%v - print "Version:",v + print ("Version:",v) lines.append("\ncgkit_light = %s"%cgkit_light) # Save the new content to the actual module file... try: - f = file(infomod, "wt") + f = open(infomod, "wt") f.writelines(lines) f.close() except: - print 'Could not write file "%s"'%infomod + print ('Could not write file "%s"'%infomod) sys.exit(1) def pyx2c(pyxName, cName): @@ -170,10 +173,10 @@ pyxName is the input pyx file, cName the output C file. """ cmd = "pyrexc -o %s %s"%(cName, pyxName) - print cmd + print (cmd) res = os.system(cmd) if res!=0: - print >>sys.stderr, "Error running pyrexc" + sys.stderr.write("Error running pyrexc\n") sys.exit() def convertPyxFiles(): @@ -186,7 +189,7 @@ if isNewer(pyxFile, cFile): pyx2c(pyxFile, cFile) else: - print "%s is up-to-date"%cFile + print ("%s is up-to-date"%cFile) ###################################################################### ###################################################################### @@ -240,11 +243,11 @@ # Read the config file if os.path.exists("config.cfg"): - execfile("config.cfg") + exec(open("config.cfg").read()) else: - print 70*"-" - print "Warning: No config file available (config.cfg)" - print 70*"-" + print (70*"-") + print ("Warning: No config file available (config.cfg)") + print (70*"-") # Disable all optional libs, STL and Boost for the light version... if INSTALL_CGKIT_LIGHT: @@ -331,17 +334,17 @@ libcore = "libcore.a" libcore = os.path.join("supportlib", "lib", libcore) if not os.path.exists(libcore) and not INSTALL_CGKIT_LIGHT: - print 70*"-" - print "The library %s does not exist."%libcore - print "You have to compile the C++ support library first. Please go to the" - print "subdirectory 'supportlib' and invoke scons:\n" - print " > cd supportlib" - print " > scons\n" - print "After that, you can proceed with calling the setup script. Please" - print "see the file readme.txt or the section about compiling the package" - print "in the manual if you encounter any further problems." - print "Note: You can read the manual online at http://cgkit.sf.net" - print 70*"-" + print (70*"-") + print ("The library %s does not exist."%libcore) + print ("You have to compile the C++ support library first. Please go to the") + print ("subdirectory 'supportlib' and invoke scons:\n") + print (" > cd supportlib") + print (" > scons\n") + print ("After that, you can proceed with calling the setup script. Please") + print ("see the file readme.txt or the section about compiling the package") + print ("in the manual if you encounter any further problems.") + print ("Note: You can read the manual online at http://cgkit.sf.net") + print (70*"-") sys.exit(1) ##### Windows specific stuff ##### @@ -394,10 +397,10 @@ INC_DIRS += [os.path.join(CYBERX3D_PATH, "include")] LIB_DIRS += [os.path.join(CYBERX3D_PATH, "lib")] LIB_DIRS += [os.path.join(XERCES_PATH, "lib")] - if CYBERX3D_LIB==None: - CYBERX3D_LIB = "CyberX3D" - if CYBERX3D_XERCES_LIB==None: - CYBERX3D_XERCES_LIB = "xerces-c_2" + if CYBERX3D_LIB==None: + CYBERX3D_LIB = "CyberX3D" + if CYBERX3D_XERCES_LIB==None: + CYBERX3D_XERCES_LIB = "xerces-c_2" LIBS += [CYBERX3D_LIB, CYBERX3D_XERCES_LIB, "gdi32"] if os.path.isabs(CYBERX3D_XERCES_DLL): packageDLL(CYBERX3D_XERCES_DLL) @@ -431,10 +434,10 @@ # CyberX3D if CYBERX3D_AVAILABLE: - if CYBERX3D_LIB==None: - CYBERX3D_LIB = "cx3d" - if CYBERX3D_XERCES_LIB==None: - CYBERX3D_XERCES_LIB = "xerces-c" + if CYBERX3D_LIB==None: + CYBERX3D_LIB = "cx3d" + if CYBERX3D_XERCES_LIB==None: + CYBERX3D_XERCES_LIB = "xerces-c" LIBS += [CYBERX3D_LIB, CYBERX3D_XERCES_LIB] # "Disable" debug symbols @@ -575,28 +578,28 @@ # Infos... updateInfoModule(INSTALL_CGKIT_LIGHT) -print 70*"=" -print "3DS importer: %s"%(enabledStr(LIB3DS_AVAILABLE)) -print "VRML/X3D importer: %s"%(enabledStr(CYBERX3D_AVAILABLE)) -print "OpenSceneGraph: %s"%(enabledStr(OSG_AVAILABLE)) -print "OGRE: %s"%(enabledStr(OGRE_AVAILABLE)) -print "3DXWare: %s"%(enabledStr(THREEDXWARE_AVAILABLE)) -print "Wintab: %s"%(enabledStr(WINTAB_AVAILABLE)) -print "Glove module: %s"%(enabledStr(GLOVESDK_AVAILABLE)) -print 70*"=" +print (70*"=") +print ("3DS importer: %s"%(enabledStr(LIB3DS_AVAILABLE))) +print ("VRML/X3D importer: %s"%(enabledStr(CYBERX3D_AVAILABLE))) +print ("OpenSceneGraph: %s"%(enabledStr(OSG_AVAILABLE))) +print ("OGRE: %s"%(enabledStr(OGRE_AVAILABLE))) +print ("3DXWare: %s"%(enabledStr(THREEDXWARE_AVAILABLE))) +print ("Wintab: %s"%(enabledStr(WINTAB_AVAILABLE))) +print ("Glove module: %s"%(enabledStr(GLOVESDK_AVAILABLE))) +print (70*"=") -print "Include paths (INC_DIRS):\n" +print ("Include paths (INC_DIRS):\n") for p in INC_DIRS: - print " ",p + print (" ",p) -print "\nLibrary paths (LIB_DIRS):\n" +print ("\nLibrary paths (LIB_DIRS):\n") for p in LIB_DIRS: - print " ",p + print (" ",p) -print "\nLibraries to link with (LIBS):\n" -print " ",", ".join(LIBS) +print ("\nLibraries to link with (LIBS):\n") +print (" ",", ".join(LIBS)) -print "" +print () # Check if the boost/python.hpp header can be found... # [disabled the test because it doesn't take the built-in search paths @@ -617,10 +620,10 @@ # (because optional libs might have been included or excluded) if os.path.exists("config.cfg") and not INSTALL_CGKIT_LIGHT: if isNewer("config.cfg", "wrappers/py_wrapper.cpp"): - print "Forcing compilation of py_wrapper.cpp" + print ("Forcing compilation of py_wrapper.cpp") os.utime("wrappers/py_wrapper.cpp", None) -print 70*"=" +print (70*"=") # Test (to enable light version) if INSTALL_CGKIT_LIGHT: @@ -655,4 +658,4 @@ data_files = data_files ) -print "... finished setup" +print ("... finished setup") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mb...@us...> - 2009-06-21 07:42:12
|
Revision: 321 http://cgkit.svn.sourceforge.net/cgkit/?rev=321&view=rev Author: mbaas Date: 2009-06-21 07:42:06 +0000 (Sun, 21 Jun 2009) Log Message: ----------- Changed some print statements again so that they work as intended again on Python 2.x (there should only be one string inside the parentheses, otherwise a tuple is printed). Modified Paths: -------------- cgkit/trunk/setup.py Modified: cgkit/trunk/setup.py =================================================================== --- cgkit/trunk/setup.py 2009-06-20 17:49:32 UTC (rev 320) +++ cgkit/trunk/setup.py 2009-06-21 07:42:06 UTC (rev 321) @@ -154,7 +154,7 @@ v += " 'light'" v+=" (%s)"%time.strftime("%b %d %Y, %H:%M") lines[i] = 'version = "%s"\n'%v - print ("Version:",v) + print ("Version: %s"%v) lines.append("\ncgkit_light = %s"%cgkit_light) @@ -590,16 +590,16 @@ print ("Include paths (INC_DIRS):\n") for p in INC_DIRS: - print (" ",p) + print (" %s"%p) print ("\nLibrary paths (LIB_DIRS):\n") for p in LIB_DIRS: - print (" ",p) + print (" %s"%p) print ("\nLibraries to link with (LIBS):\n") -print (" ",", ".join(LIBS)) +print (" %s"%(", ".join(LIBS))) -print () +print ("") # Check if the boost/python.hpp header can be found... # [disabled the test because it doesn't take the built-in search paths This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mb...@us...> - 2009-06-28 14:34:52
|
Revision: 323 http://cgkit.svn.sourceforge.net/cgkit/?rev=323&view=rev Author: mbaas Date: 2009-06-28 14:34:49 +0000 (Sun, 28 Jun 2009) Log Message: ----------- Additional compile flag for VS9. Disabling CyberX3D didn't properly work. Modified Paths: -------------- cgkit/trunk/setup.py Modified: cgkit/trunk/setup.py =================================================================== --- cgkit/trunk/setup.py 2009-06-24 09:20:36 UTC (rev 322) +++ cgkit/trunk/setup.py 2009-06-28 14:34:49 UTC (rev 323) @@ -381,7 +381,7 @@ LIBS += ["opengl32", "glu32"] # Additional compiler options - CC_ARGS += ["/GR", "/Zm700"] + CC_ARGS += ["/GR", "/Zm700", "/EHsc"] # Additional linker options LINK_ARGS += ["/NODEFAULTLIB:LIBCMT"] @@ -406,15 +406,15 @@ INC_DIRS += [os.path.join(CYBERX3D_PATH, "include")] LIB_DIRS += [os.path.join(CYBERX3D_PATH, "lib")] LIB_DIRS += [os.path.join(XERCES_PATH, "lib")] - if CYBERX3D_LIB==None: - CYBERX3D_LIB = "CyberX3D" - if CYBERX3D_XERCES_LIB==None: - CYBERX3D_XERCES_LIB = "xerces-c_2" - LIBS += [CYBERX3D_LIB, CYBERX3D_XERCES_LIB, "gdi32"] - if os.path.isabs(CYBERX3D_XERCES_DLL): - packageDLL(CYBERX3D_XERCES_DLL) - else: - packageDLL(os.path.join(XERCES_PATH, "bin", CYBERX3D_XERCES_DLL)) + if CYBERX3D_LIB==None: + CYBERX3D_LIB = "CyberX3D" + if CYBERX3D_XERCES_LIB==None: + CYBERX3D_XERCES_LIB = "xerces-c_2" + LIBS += [CYBERX3D_LIB, CYBERX3D_XERCES_LIB, "gdi32"] + if os.path.isabs(CYBERX3D_XERCES_DLL): + packageDLL(CYBERX3D_XERCES_DLL) + else: + packageDLL(os.path.join(XERCES_PATH, "bin", CYBERX3D_XERCES_DLL)) ##### Mac OS X (Darwin) ##### elif sys.platform=="darwin": This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mb...@us...> - 2009-08-20 21:59:46
|
Revision: 339 http://cgkit.svn.sourceforge.net/cgkit/?rev=339&view=rev Author: mbaas Date: 2009-08-20 21:59:35 +0000 (Thu, 20 Aug 2009) Log Message: ----------- Additional Windows build flag. Modified Paths: -------------- cgkit/trunk/setup.py Modified: cgkit/trunk/setup.py =================================================================== --- cgkit/trunk/setup.py 2009-08-20 21:00:14 UTC (rev 338) +++ cgkit/trunk/setup.py 2009-08-20 21:59:35 UTC (rev 339) @@ -546,7 +546,7 @@ ,include_dirs=INC_DIRS ,library_dirs=LIB_DIRS ,extra_compile_args=CC_ARGS - ,extra_link_args=LINK_ARGS + ,extra_link_args=LINK_ARGS+["/NODEFAULTLIB:LIBC"] ,define_macros=MACROS)] # Wintab This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |