Thread: [Python-ogre-commit] SF.net SVN: python-ogre:[702] trunk/python-ogre/BuildModule.py
Brought to you by:
andy_miller,
roman_yakovenko
From: <mi...@us...> - 2008-08-18 09:44:31
|
Revision: 702 http://python-ogre.svn.sourceforge.net/python-ogre/?rev=702&view=rev Author: mithro Date: 2008-08-18 09:44:39 +0000 (Mon, 18 Aug 2008) Log Message: ----------- Import the containing environment into Python-Ogre's environment. Modified Paths: -------------- trunk/python-ogre/BuildModule.py Modified: trunk/python-ogre/BuildModule.py =================================================================== --- trunk/python-ogre/BuildModule.py 2008-08-18 09:15:24 UTC (rev 701) +++ trunk/python-ogre/BuildModule.py 2008-08-18 09:44:39 UTC (rev 702) @@ -80,9 +80,13 @@ ##env["LDFLAGS"]="-Wl,-rpath='\$\$ORIGIN/../../lib' -Wl,-rpath='\$\$ORIGIN' -Wl,-z,origin" ### Mac GCC 4.0.1 doesn't support rpath env["PYTHONPATH"]=PREFIX+"/lib/python"+environment.PythonVersionString+"/site-packages" else: - env["CFLAGS"]="-I"+os.path.join(PREFIX,"include")+ " -L"+os.path.join(PREFIX,"lib") - env["CXXFLAGS"]=env["CFLAGS"] - env["LDFLAGS"]="-Wl,-rpath='$$ORIGIN/../../lib' -Wl,-rpath='$$ORIGIN' -Wl,-z,origin" + for FLAGS in "CFLAGS", "CXXFLAGS", "CCFLAGS", "LDFLAGS": + if not FLAGS in env: + env[FLAGS] = "" + env["CFLAGS"]+=" "+"-I"+os.path.join(PREFIX,"include")+ " -L"+os.path.join(PREFIX,"lib") + env["CXXFLAGS"]+=" "+env["CFLAGS"] + env["CCFLAGS"]+=" "+env["CFLAGS"] + env["LDFLAGS"]+="-Wl,-rpath='$$ORIGIN/../../lib' -Wl,-rpath='$$ORIGIN' -Wl,-z,origin" env["PYTHONPATH"]=PREFIX+"/lib/python"+environment.PythonVersionString+"/site-packages" env["ZZIPLIB_LIBS"]="-lzzip" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mi...@us...> - 2008-09-02 07:35:46
|
Revision: 717 http://python-ogre.svn.sourceforge.net/python-ogre/?rev=717&view=rev Author: mithro Date: 2008-09-02 07:35:55 +0000 (Tue, 02 Sep 2008) Log Message: ----------- Slight indent fixeds. Fixed Error. Modified Paths: -------------- trunk/python-ogre/BuildModule.py Modified: trunk/python-ogre/BuildModule.py =================================================================== --- trunk/python-ogre/BuildModule.py 2008-09-01 14:19:39 UTC (rev 716) +++ trunk/python-ogre/BuildModule.py 2008-09-02 07:35:55 UTC (rev 717) @@ -184,11 +184,11 @@ # Rewrite any place holders for file in os.listdir(debiandir): - if not os.path.isfile(os.path.join(debiandir, file)): - continue - ret = spawnTask( "sed --in-place "+os.path.join(debiandir,file)+" -e\"s|%%SHORTDATE%%|`date +%Y%m%d`|\" -e\"s|%%LONGDATE%%|`date +'%a, %d %b %Y %H:%m:%S %z'`|\" -e\"s|%%VERSION%%|"+module.source_version+"|\"", srcdir) - if ret != 0: - exit("Was not able to update the debian change log.") + if not os.path.isfile(os.path.join(debiandir, file)): + continue + ret = spawnTask( "sed --in-place "+os.path.join(debiandir,file)+" -e\"s|%%SHORTDATE%%|`date +%Y%m%d`|\" -e\"s|%%LONGDATE%%|`date +'%a, %d %b %Y %H:%m:%S %z'`|\" -e\"s|%%VERSION%%|"+module.source_version+"|\"", srcdir) + if ret != 0: + exit("Was not able to update the debian %s." % file) # Check that all the dependencies for this package are avaliable c = StringIO() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mi...@us...> - 2008-09-02 07:40:55
|
Revision: 718 http://python-ogre.svn.sourceforge.net/python-ogre/?rev=718&view=rev Author: mithro Date: 2008-09-02 07:41:04 +0000 (Tue, 02 Sep 2008) Log Message: ----------- Add a verbose option. Modified Paths: -------------- trunk/python-ogre/BuildModule.py Modified: trunk/python-ogre/BuildModule.py =================================================================== --- trunk/python-ogre/BuildModule.py 2008-09-02 07:35:55 UTC (rev 717) +++ trunk/python-ogre/BuildModule.py 2008-09-02 07:41:04 UTC (rev 718) @@ -16,6 +16,7 @@ logger = None FULL_LOGGING = False # Set to true to log everything, even if successful ENV_SET = False # global to ensure we don't set the environment too many times and break the shell. +VERBOSE = False def setupLogging (logfilename): # set up logging to file @@ -98,12 +99,18 @@ ENV_SET=True logger.debug ( "Spawning '%s' in '%s'" % (task,cwdin) ) - process = subprocess.Popen (task, shell=True,stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd = cwdin, env=env) - try: - out,err = process.communicate() - returncode = process.returncode - except: - returncode = -1 + + if VERBOSE: + out, err = "", "" + process = subprocess.Popen (task, shell=True, cwd = cwdin, env=env) + returncode = process.wait() + else: + process = subprocess.Popen (task, shell=True,stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd = cwdin, env=env) + try: + out,err = process.communicate() + returncode = process.returncode + except: + returncode = -1 if getoutput is not None: if returncode != -1: @@ -237,6 +244,7 @@ """Handle command line input """ usage = "usage: %prog [options] moduleName" parser = OptionParser(usage=usage, version="%prog 1.0") + parser.add_option("-v", "--verbose", action="store_true", default=False,dest="verbose", help="Output all output to stdout rather then saving to the log file") parser.add_option("-r", "--retrieve", action="store_true", default=False,dest="retrieve", help="Retrieve the appropiate source before building") parser.add_option("-b", "--build", action="store_true", default=False ,dest="build", help="Build the appropiate module") parser.add_option("-g", "--gen", action="store_true", default=False ,dest="gencode", help="Generate Source Code for the module") @@ -269,6 +277,7 @@ exit ( "You can only specify build or builddeb, not both!" ) FAILHARD=options.failhard + VERBOSE=options.verbose if not os.path.exists( environment.downloadPath ): os.mkdir ( environment.downloadPath ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mi...@us...> - 2008-09-29 05:02:38
|
Revision: 752 http://python-ogre.svn.sourceforge.net/python-ogre/?rev=752&view=rev Author: mithro Date: 2008-09-29 05:02:26 +0000 (Mon, 29 Sep 2008) Log Message: ----------- Add opensuse build-service support to BuildModule. Modified Paths: -------------- trunk/python-ogre/BuildModule.py Modified: trunk/python-ogre/BuildModule.py =================================================================== --- trunk/python-ogre/BuildModule.py 2008-09-29 04:59:16 UTC (rev 751) +++ trunk/python-ogre/BuildModule.py 2008-09-29 05:02:26 UTC (rev 752) @@ -213,6 +213,77 @@ logger.warning("Was not able to build package") logger.info("Package successfully built!") +def buildService ( module, install = False ): + """ Create a debian package for the module + """ + logger.info("Trying to prepare a package for module %s to upload to build service" % module.base) + srcdir = os.path.join(os.getcwd(), module.base) + if not os.path.exists(srcdir): + exit("You need to get the src first, use -r") + + buildbase = os.path.join(os.getcwd(), 'build', module.base) + builddir = os.path.join(buildbase, module.base) + + # Make the builddir + spawnTask("mkdir -p %s" % buildbase, os.getcwd()) + + # Create the source we are making + spawnTask("cp -rvf %s/ %s" % (srcdir, builddir), os.getcwd()) + + # Clean up the directories + spawnTask("find -name .svn | xargs rm -rf", builddir) + spawnTask("find -name .cvs | xargs rm -rf", builddir) + + # Remove the debian directory + spawnTask("rm -rf debian", builddir) + + # Tar up the source dir + spawnTask("tar -zcvf %s.tar.gz %s" % (module.base, module.base), buildbase) + + # md5sum the package + spawnTask("md5sum %s.tar.gz | sed -e's/ .*//' > %s.md5sum" % (module.base, module.base), buildbase) + + debiandir = os.path.join(srcdir, "debian") + if not os.path.exists(debiandir): + debiandir = os.path.join("python-ogre", "debs", "%s-debian" % module.base) + + if not os.path.exists(debiandir): + exit(" Was not able to find a debian directory! ") + + for file in ["changelog", "control", "rules"]: + filepath = os.path.join(buildbase, "debian."+file) + logger.debug ( file ) + logger.debug ( filepath ) + ret = spawnTask("cp -f %s %s" % (os.path.join(debiandir, file), filepath), os.getcwd()) + if ret != 0: + exit("Was not able to copy the debian %s." % file) + + ret = spawnTask( "sed --in-place "+filepath+' ' + \ + ' -e"s|%%SHORTDATE%%|`date +%Y%m%d`|" ' + \ + ' -e"s|%%LONGDATE%%|`date +\'%a, %d %b %Y %H:%m:%S %z\'`|" ' + \ + ' -e"s|%%VERSION%%|'+module.source_version+'|"' + , srcdir) + if ret != 0: + exit("Was not able to update the debian %s." % file) + + # Create the dsc file + dsc = os.path.join(buildbase, "%s.dsc" % module.base) + spawnTask("cp -f %s %s" % (os.path.join(debiandir, "dsc"), dsc), os.getcwd()) + spawnTask( "sed --in-place "+dsc+ \ + ' -e "s|%%MD5SUM%%|`cat '+module.base+'.md5sum`|" ' + \ + ' -e "s|%%SIZE%%|`du -b '+module.base+'.tar.gz | sed -e\'s/[\t ]/ /g\'`|" ' + \ + ' -e "s|%%SHORTDATE%%|`date +%Y%m%d`|" ' + \ + ' -e "s|%%LONGDATE%%|`date +\'%a, %d %b %Y %H:%m:%S %z\'`|" ' + \ + ' -e "s^%%BUILDDEPS%%^`cat '+os.path.join(debiandir, "control")+' | grep Build-Depends:`^"' + \ + ' -e "s|%%VERSION%%|'+module.source_version+'|g"' + , buildbase) + + # Do some cleanup + spawnTask("rm -rf %s" % builddir, buildbase) + spawnTask("rm %s.md5sum" % module.base, buildbase) + return + + def buildInstall ( module ): """ Create a debian package for the module """ @@ -250,6 +321,7 @@ parser.add_option("-g", "--gen", action="store_true", default=False ,dest="gencode", help="Generate Source Code for the module") parser.add_option("-d", "--build-deb", action="store_true", default=False ,dest="builddeb", help="Build a debian package for the module") parser.add_option("", "--install-deb", action="store_true", default=False ,dest="installdeb", help="Install the debian packages after building") + parser.add_option("-s", "--build-service", action="store_true", default=False ,dest="buildservice", help="Prepare a package for the opensuse build service") parser.add_option("-c", "--compile", action="store_true", default=False ,dest="compilecode", help="Compile Source Code for the module") parser.add_option("-l", "--logfilename", default="log.out" ,dest="logfilename", help="Override the default log file name") parser.add_option("-G", "--genall", action="store_true", default=False ,dest="gencodeall", help="Generate Source Code for all possible modules") @@ -271,10 +343,10 @@ if options.retrieve==False and options.build==False and options.gencode==False and options.compilecode==False\ and options.compilecodeall==False and options.gencodeall==False and options.builddeb==False\ - and options.installdeb==False: + and options.installdeb==False and options.buildservice==False: exit ( "You need to specific at least one option. Use -h for help") - if options.builddeb and options.build: - exit ( "You can only specify build or builddeb, not both!" ) + if options.builddeb and options.build and options.buildservice: + exit ( "You can only specify build or builddeb or buildservice!" ) FAILHARD=options.failhard VERBOSE=options.verbose @@ -300,7 +372,9 @@ exit("Module specificed was not found (%s is not in environment.py) " % moduleName ) if options.retrieve: retrieveSource ( classList[ moduleName ] ) - if options.builddeb: + if options.buildservice: + buildService( classList[ moduleName ] ) + elif options.builddeb: buildDeb( classList[ moduleName ] ) if options.installdeb: buildInstall( classList[ moduleName ] ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mi...@us...> - 2008-11-23 15:49:27
|
Revision: 815 http://python-ogre.svn.sourceforge.net/python-ogre/?rev=815&view=rev Author: mithro Date: 2008-11-23 15:49:24 +0000 (Sun, 23 Nov 2008) Log Message: ----------- Also search the lib64 directory on 64bit arch's. Modified Paths: -------------- trunk/python-ogre/BuildModule.py Modified: trunk/python-ogre/BuildModule.py =================================================================== --- trunk/python-ogre/BuildModule.py 2008-11-23 15:39:04 UTC (rev 814) +++ trunk/python-ogre/BuildModule.py 2008-11-23 15:49:24 UTC (rev 815) @@ -88,6 +88,9 @@ env["CFLAGS"]+=" "+"-I"+os.path.join(PREFIX,"include") else: env["CFLAGS"]+=" "+"-I"+os.path.join(PREFIX,"include")+ " -L"+os.path.join(PREFIX,"lib") + if environment.is64(): + env["CFLAGS"]+=" -L"+os.path.join(PREFIX,"lib64") + env["CXXFLAGS"]+=" "+env["CFLAGS"] env["CCFLAGS"]+=" "+env["CFLAGS"] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mi...@us...> - 2008-11-23 15:50:40
|
Revision: 816 http://python-ogre.svn.sourceforge.net/python-ogre/?rev=816&view=rev Author: mithro Date: 2008-11-23 15:50:26 +0000 (Sun, 23 Nov 2008) Log Message: ----------- Remove all that extra whitespace. Modified Paths: -------------- trunk/python-ogre/BuildModule.py Modified: trunk/python-ogre/BuildModule.py =================================================================== --- trunk/python-ogre/BuildModule.py 2008-11-23 15:49:24 UTC (rev 815) +++ trunk/python-ogre/BuildModule.py 2008-11-23 15:50:26 UTC (rev 816) @@ -34,36 +34,36 @@ console.setFormatter(formatter) # add the handler to the root logger logging.getLogger('').addHandler(console) - - + + def getClassList (): """ create a dictionary of classes from the environment modules """ dict = {} for c in dir(environment): var = environment.__dict__[c] - if isinstance ( var, types.ClassType ) : ## OK so we know it's a class + if isinstance ( var, types.ClassType ) : ## OK so we know it's a class # logger.debug ( "getClassList: Checking %s" % c ) if hasattr(var, 'active') and hasattr(var, 'pythonModule'): # and it looks like one we care about # logger.debug ( "getClassList: it's one of ours") dict[c] = var return dict - + def exit( ExitMessage ): logger.error( ExitMessage ) sys.exit( -1 ) - -## This stuff has to be in my spawing sub process + +## This stuff has to be in my spawing sub process # # export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$PREFIX/lib/pkgconfig # # export LD_LIBRARY_PATH=$PREFIX/lib # # export CFLAGS="-I$PREFIX/include -L$PREFIX/lib" # # export CXXFLAGS=$CFLAGS # # export LDFLAGS="-Wl,-rpath='\$\$ORIGIN/../../lib' -Wl,-rpath='\$\$ORIGIN' -Wl,-z,origin" # # export PATH=$PREFIX/bin:$PATH -# # export PYTHONPATH=$PREFIX/lib/python$PYTHONVERSION/site-packages - - +# # export PYTHONPATH=$PREFIX/lib/python$PYTHONVERSION/site-packages + + def spawnTask ( task, cwdin = '', getoutput=None ): """Execute a command line task and manage the return code etc """ @@ -76,7 +76,7 @@ env["PKG_CONFIG_PATH"]=os.path.join(PREFIX,"lib/pkgconfig") env["LD_LIBRARY_PATH"]=os.path.join(PREFIX,"lib") if environment.isMac(): - env["CFLAGS"]="-I"+PREFIX+"/include -L"+PREFIX+"/lib" + env["CFLAGS"]="-I"+PREFIX+"/include -L"+PREFIX+"/lib" env["CXXFLAGS"]="-I"+PREFIX+"/include -L"+PREFIX+"/lib" ##env["LDFLAGS"]="-Wl,-rpath='\$\$ORIGIN/../../lib' -Wl,-rpath='\$\$ORIGIN' -Wl,-z,origin" ### Mac GCC 4.0.1 doesn't support rpath env["PYTHONPATH"]=PREFIX+"/lib/python"+environment.PythonVersionString+"/site-packages" @@ -84,23 +84,23 @@ for FLAGS in "CFLAGS", "CXXFLAGS", "CCFLAGS", "LDFLAGS": if not FLAGS in env: env[FLAGS] = "" - if environment.isWindows(): + if environment.isWindows(): env["CFLAGS"]+=" "+"-I"+os.path.join(PREFIX,"include") else: env["CFLAGS"]+=" "+"-I"+os.path.join(PREFIX,"include")+ " -L"+os.path.join(PREFIX,"lib") if environment.is64(): env["CFLAGS"]+=" -L"+os.path.join(PREFIX,"lib64") - + env["CXXFLAGS"]+=" "+env["CFLAGS"] env["CCFLAGS"]+=" "+env["CFLAGS"] env["LDFLAGS"]+="-Wl,-rpath='$$ORIGIN/../../lib' -Wl,-rpath='$$ORIGIN' -Wl,-z,origin" env["PYTHONPATH"]=PREFIX+"/lib/python"+environment.PythonVersionString+"/site-packages" env["ZZIPLIB_LIBS"]="-lzzip" - + env["PATH"]=PREFIX+"/bin:" + PATH - ENV_SET=True - + ENV_SET=True + logger.debug ( "Spawning '%s' in '%s'" % (task,cwdin) ) if VERBOSE: @@ -114,7 +114,7 @@ returncode = process.returncode except: returncode = -1 - + if getoutput is not None: if returncode != -1: getoutput.write(out) @@ -128,14 +128,14 @@ logger.warning ( "Full Logging ON" ) logger.debug ( out ) logger.debug ( err ) - + if returncode != 0 and FAILHARD: exit(" The following command failed %s" % task) - return returncode - + return returncode + def retrieveSource ( module ): """ Here's we we retrieve the necessary source files - """ + """ for cmd,args,cwd in module.source: logger.info ("Retrieving %s" % args ) ret = spawnTask ( cmd+ " " + args, cwd ) @@ -149,7 +149,7 @@ path = os.getcwd() ret = spawnTask ( cmd, path ) - + def buildModule ( module ): """ Execute the build commands for the module """ @@ -163,7 +163,7 @@ logger.debug ("Compiling %s " % cmd ) code = compile ( cmd, '<string>', 'exec' ) logger.debug ("executing codeblock " ) - exec code + exec code logger.debug ( "Exec done") from cStringIO import StringIO @@ -191,7 +191,7 @@ ret = spawnTask("cp -rvf %s %s" % (debianour, debiandir), os.getcwd()) if ret != 0: exit("Was not able to copy the debian directory over") - + # Rewrite any place holders for file in os.listdir(debiandir): if not os.path.isfile(os.path.join(debiandir, file)): @@ -199,7 +199,7 @@ ret = spawnTask( "sed --in-place "+os.path.join(debiandir,file)+" -e\"s|%%SHORTDATE%%|`date +%Y%m%d`|\" -e\"s|%%LONGDATE%%|`date +'%a, %d %b %Y %H:%m:%S %z'`|\" -e\"s|%%VERSION%%|"+module.source_version+"|\"", srcdir) if ret != 0: exit("Was not able to update the debian %s." % file) - + # Check that all the dependencies for this package are avaliable c = StringIO() ret = spawnTask("dpkg-checkbuilddeps", srcdir, c) @@ -280,7 +280,7 @@ ' -e "s^%%BUILDDEPS%%^`cat '+os.path.join(debiandir, "control")+' | grep Build-Depends:`^"' + \ ' -e "s|%%VERSION%%|'+module.source_version+'|g"' , buildbase) - + # Do some cleanup spawnTask("rm -rf %s" % builddir, buildbase) spawnTask("rm %s.md5sum" % module.base, buildbase) @@ -296,22 +296,22 @@ if ret != 0: logger.warning("Was not able to the install package!") logger.info("Package installed.") - + def generateCode ( module ): """ Generate the C++ wrapper code """ logger.info ( "Building Source code for " + module.name ) ### AJM -- note the assumption that environment.py is sitting in the 'python-ogre' directory... - ret = spawnTask ( 'python generate_code.py'+('', ' --usesystem')[environment.UseSystem], os.path.join(environment.root_dir, 'code_generators', module.name) ) + ret = spawnTask ( 'python generate_code.py'+('', ' --usesystem')[environment.UseSystem], os.path.join(environment.root_dir, 'code_generators', module.name) ) def compileCode ( module ): """ Compile the wrapper code and make the modules """ logger.info ( "Compiling Source code for " + module.name ) ### AJM -- note the assumption that environment.py is sitting in the 'python-ogre' directory... - ret = spawnTask ( 'scons PROJECTS='+module.name, os.path.join(environment.root_dir) ) + ret = spawnTask ( 'scons PROJECTS='+module.name, os.path.join(environment.root_dir) ) if ret != 0 : - time.sleep(5) ## not sure why scons doesn't work after first failure + time.sleep(5) ## not sure why scons doesn't work after first failure FAILHARD=False def parseInput(): @@ -329,21 +329,21 @@ parser.add_option("-l", "--logfilename", default="log.out" ,dest="logfilename", help="Override the default log file name") parser.add_option("-G", "--genall", action="store_true", default=False ,dest="gencodeall", help="Generate Source Code for all possible modules") parser.add_option("-C", "--compileall", action="store_true", default=False ,dest="compilecodeall", help="Compile Source Code for all posssible modules") - parser.add_option("-e", "--failhard", action="store_true", default=False, dest="failhard", help="Exit with failure code on first error.") - + parser.add_option("-e", "--failhard", action="store_true", default=False, dest="failhard", help="Exit with failure code on first error.") + (options, args) = parser.parse_args() return (options,args) - + if __name__ == '__main__': classList = getClassList () - + (options, args) = parseInput() if len(args) == 0 and not (options.compilecodeall or options.gencodeall): exit("The module to build wasn't specified. Use -h for help") setupLogging(options.logfilename) logger = logging.getLogger('PythonOgre.BuildModule') - + if options.retrieve==False and options.build==False and options.gencode==False and options.compilecode==False\ and options.compilecodeall==False and options.gencodeall==False and options.builddeb==False\ and options.installdeb==False and options.buildservice==False: @@ -355,25 +355,25 @@ VERBOSE=options.verbose if not os.path.exists( environment.downloadPath ): - os.mkdir ( environment.downloadPath ) + os.mkdir ( environment.downloadPath ) if not os.path.exists( environment.Config.ROOT_DIR ): - os.mkdir ( environment.Config.ROOT_DIR ) + os.mkdir ( environment.Config.ROOT_DIR ) if not os.path.exists( os.path.join(environment.Config.ROOT_DIR, 'usr' ) ): - os.mkdir ( os.path.join(environment.Config.ROOT_DIR, 'usr' ) ) + os.mkdir ( os.path.join(environment.Config.ROOT_DIR, 'usr' ) ) if options.gencodeall or options.compilecodeall: for name,cls in environment.projects.items(): if cls.active and cls.pythonModule: if options.gencodeall: generateCode( cls ) if options.compilecodeall: - compileCode( cls ) + compileCode( cls ) else: - for moduleName in args: + for moduleName in args: if not classList.has_key( moduleName ): exit("Module specificed was not found (%s is not in environment.py) " % moduleName ) - if options.retrieve: + if options.retrieve: retrieveSource ( classList[ moduleName ] ) if options.buildservice: buildService( classList[ moduleName ] ) @@ -382,7 +382,7 @@ if options.installdeb: buildInstall( classList[ moduleName ] ) - if options.build : + if options.build : buildModule ( classList[ moduleName ] ) if options.gencode : if classList[ moduleName ].pythonModule == True: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mi...@us...> - 2008-11-24 00:08:31
|
Revision: 817 http://python-ogre.svn.sourceforge.net/python-ogre/?rev=817&view=rev Author: mithro Date: 2008-11-24 00:08:28 +0000 (Mon, 24 Nov 2008) Log Message: ----------- Another AMD64 fix. Modified Paths: -------------- trunk/python-ogre/BuildModule.py Modified: trunk/python-ogre/BuildModule.py =================================================================== --- trunk/python-ogre/BuildModule.py 2008-11-23 15:50:26 UTC (rev 816) +++ trunk/python-ogre/BuildModule.py 2008-11-24 00:08:28 UTC (rev 817) @@ -96,6 +96,8 @@ env["CCFLAGS"]+=" "+env["CFLAGS"] env["LDFLAGS"]+="-Wl,-rpath='$$ORIGIN/../../lib' -Wl,-rpath='$$ORIGIN' -Wl,-z,origin" env["PYTHONPATH"]=PREFIX+"/lib/python"+environment.PythonVersionString+"/site-packages" + if environment.is64(): + env["PYTHONPATH"]=PREFIX+"/lib64/python"+environment.PythonVersionString+"/site-packages" env["ZZIPLIB_LIBS"]="-lzzip" env["PATH"]=PREFIX+"/bin:" + PATH This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mi...@us...> - 2009-01-12 07:37:49
|
Revision: 833 http://python-ogre.svn.sourceforge.net/python-ogre/?rev=833&view=rev Author: mithro Date: 2009-01-12 07:37:43 +0000 (Mon, 12 Jan 2009) Log Message: ----------- Add support for BuildModule to run the osc commands which upload to the build service. Modified Paths: -------------- trunk/python-ogre/BuildModule.py Modified: trunk/python-ogre/BuildModule.py =================================================================== --- trunk/python-ogre/BuildModule.py 2009-01-05 17:59:09 UTC (rev 832) +++ trunk/python-ogre/BuildModule.py 2009-01-12 07:37:43 UTC (rev 833) @@ -218,6 +218,7 @@ logger.warning("Was not able to build package") logger.info("Package successfully built!") +BUILDSERVICE_MODULE = "home:mithro:python-ogre-build" def buildService ( module, install = False ): """ Create a debian package for the module """ @@ -226,12 +227,28 @@ if not os.path.exists(srcdir): exit("You need to get the src first, use -r") + # Make sure that the build directory exists + buildloc = os.path.join(os.getcwd(), 'build') + if not os.path.exists(buildloc): + spawnTask("mkdir -p %s" % buildloc, os.getcwd()) + buildbase = os.path.join(os.getcwd(), 'build', module.base) builddir = os.path.join(buildbase, module.base) - # Make the builddir - spawnTask("mkdir -p %s" % buildbase, os.getcwd()) + if not os.path.exists(buildbase): + # Do the initial checkout + logger.info("Downloading %s:%s into %s" % (BUILDSERVICE_MODULE, module.base, buildloc)) + spawnTask("osc checkout %s %s" % (BUILDSERVICE_MODULE, module.base), buildloc) + spawnTask("mv %s/%s %s" % (BUILDSERVICE_MODULE, module.base, module.base), buildloc) + spawnTask("rm -rf %s" % (BUILDSERVICE_MODULE,), buildloc) + else: + if not os.path.exists(os.path.join(buildbase, ".osc")): + raise TypeError("The buildservice directory is not a osc checkout! (Please remove and rerun this command.)") + # Do an update so we don't get conflicts + logger.info("Updating home:mithro:python-ogre:%s in %s" % (module.base, buildloc)) + spawnTask("osc update", buildbase) + # Create the source we are making spawnTask("cp -rvf %s/ %s" % (srcdir, builddir), os.getcwd()) @@ -279,13 +296,15 @@ ' -e "s|%%SIZE%%|`du -b '+module.base+'.tar.gz | sed -e\'s/[\t ]/ /g\'`|g" ' + \ ' -e "s|%%SHORTDATE%%|`date +%Y%m%d`|g" ' + \ ' -e "s|%%LONGDATE%%|`date +\'%a, %d %b %Y %H:%m:%S %z\'`|g" ' + \ - ' -e "s^%%BUILDDEPS%%^`cat '+os.path.join(debiandir, "control")+' | grep Build-Depends:`^g"' + \ + ' -e "s^%%BUILDDEPS%%^`cat debian.control | grep Build-Depends:`^" ' + \ ' -e "s|%%VERSION%%|'+module.source_version+'|g"' , buildbase) # Do some cleanup spawnTask("rm -rf %s" % builddir, buildbase) spawnTask("rm %s.md5sum" % module.base, buildbase) + + spawnTask("osc diff", buildbase) return This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mi...@us...> - 2009-01-29 11:21:55
|
Revision: 865 http://python-ogre.svn.sourceforge.net/python-ogre/?rev=865&view=rev Author: mithro Date: 2009-01-29 11:21:49 +0000 (Thu, 29 Jan 2009) Log Message: ----------- Rework the build-service module name. Modified Paths: -------------- trunk/python-ogre/BuildModule.py Modified: trunk/python-ogre/BuildModule.py =================================================================== --- trunk/python-ogre/BuildModule.py 2009-01-29 10:33:22 UTC (rev 864) +++ trunk/python-ogre/BuildModule.py 2009-01-29 11:21:49 UTC (rev 865) @@ -218,7 +218,7 @@ logger.warning("Was not able to build package") logger.info("Package successfully built!") -BUILDSERVICE_MODULE = "home:mithro:python-ogre-build" +BUILDSERVICE_MODULE = "home:mithro:python-ogre" def buildService ( module, install = False ): """ Create a debian package for the module """ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mi...@us...> - 2010-01-14 06:52:28
|
Revision: 1062 http://python-ogre.svn.sourceforge.net/python-ogre/?rev=1062&view=rev Author: mithro Date: 2010-01-14 06:52:22 +0000 (Thu, 14 Jan 2010) Log Message: ----------- Fixing a missing dos newline. Modified Paths: -------------- trunk/python-ogre/BuildModule.py This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |