mirror of
				https://github.com/python/cpython.git
				synced 2025-10-29 17:38:56 +00:00 
			
		
		
		
	Added --plat-name option to override sysconfig.get_platform() in
generated filenames.
This commit is contained in:
		
							parent
							
								
									14deaaec12
								
							
						
					
					
						commit
						20283e5cc3
					
				
					 2 changed files with 18 additions and 4 deletions
				
			
		|  | @ -32,6 +32,9 @@ class bdist (Command): | ||||||
| 
 | 
 | ||||||
|     user_options = [('bdist-base=', 'b', |     user_options = [('bdist-base=', 'b', | ||||||
|                      "temporary directory for creating built distributions"), |                      "temporary directory for creating built distributions"), | ||||||
|  |                     ('plat-name=', 'p', | ||||||
|  |                      "platform name to embed in generated filenames " | ||||||
|  |                      "(default: %s)" % get_platform()), | ||||||
|                     ('formats=', None, |                     ('formats=', None, | ||||||
|                      "formats for distribution (comma-separated list)"), |                      "formats for distribution (comma-separated list)"), | ||||||
|                     ('dist-dir=', 'd', |                     ('dist-dir=', 'd', | ||||||
|  | @ -70,6 +73,7 @@ class bdist (Command): | ||||||
| 
 | 
 | ||||||
|     def initialize_options (self): |     def initialize_options (self): | ||||||
|         self.bdist_base = None |         self.bdist_base = None | ||||||
|  |         self.plat_name = None | ||||||
|         self.formats = None |         self.formats = None | ||||||
|         self.dist_dir = None |         self.dist_dir = None | ||||||
| 
 | 
 | ||||||
|  | @ -77,13 +81,16 @@ class bdist (Command): | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|     def finalize_options (self): |     def finalize_options (self): | ||||||
|  |         # have to finalize 'plat_name' before 'bdist_base' | ||||||
|  |         if self.plat_name is None: | ||||||
|  |             self.plat_name = get_platform() | ||||||
|  | 
 | ||||||
|         # 'bdist_base' -- parent of per-built-distribution-format |         # 'bdist_base' -- parent of per-built-distribution-format | ||||||
|         # temporary directories (eg. we'll probably have |         # temporary directories (eg. we'll probably have | ||||||
|         # "build/bdist.<plat>/dumb", "build/bdist.<plat>/rpm", etc.) |         # "build/bdist.<plat>/dumb", "build/bdist.<plat>/rpm", etc.) | ||||||
|         if self.bdist_base is None: |         if self.bdist_base is None: | ||||||
|             build_base = self.get_finalized_command('build').build_base |             build_base = self.get_finalized_command('build').build_base | ||||||
|             plat = get_platform() |             self.bdist_base = os.path.join(build_base, 'bdist.' + self.plat_name) | ||||||
|             self.bdist_base = os.path.join (build_base, 'bdist.' + plat) |  | ||||||
| 
 | 
 | ||||||
|         self.ensure_string_list('formats') |         self.ensure_string_list('formats') | ||||||
|         if self.formats is None: |         if self.formats is None: | ||||||
|  |  | ||||||
|  | @ -20,6 +20,9 @@ class bdist_dumb (Command): | ||||||
| 
 | 
 | ||||||
|     user_options = [('bdist-dir=', 'd', |     user_options = [('bdist-dir=', 'd', | ||||||
|                      "temporary directory for creating the distribution"), |                      "temporary directory for creating the distribution"), | ||||||
|  |                     ('plat-name=', 'p', | ||||||
|  |                      "platform name to embed in generated filenames " | ||||||
|  |                      "(default: %s)" % get_platform()), | ||||||
|                     ('format=', 'f', |                     ('format=', 'f', | ||||||
|                      "archive format to create (tar, ztar, gztar, zip)"), |                      "archive format to create (tar, ztar, gztar, zip)"), | ||||||
|                     ('keep-tree', 'k', |                     ('keep-tree', 'k', | ||||||
|  | @ -35,6 +38,7 @@ class bdist_dumb (Command): | ||||||
| 
 | 
 | ||||||
|     def initialize_options (self): |     def initialize_options (self): | ||||||
|         self.bdist_dir = None |         self.bdist_dir = None | ||||||
|  |         self.plat_name = None | ||||||
|         self.format = None |         self.format = None | ||||||
|         self.keep_tree = 0 |         self.keep_tree = 0 | ||||||
|         self.dist_dir = None |         self.dist_dir = None | ||||||
|  | @ -43,6 +47,7 @@ class bdist_dumb (Command): | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|     def finalize_options (self): |     def finalize_options (self): | ||||||
|  | 
 | ||||||
|         if self.bdist_dir is None: |         if self.bdist_dir is None: | ||||||
|             bdist_base = self.get_finalized_command('bdist').bdist_base |             bdist_base = self.get_finalized_command('bdist').bdist_base | ||||||
|             self.bdist_dir = os.path.join(bdist_base, 'dumb') |             self.bdist_dir = os.path.join(bdist_base, 'dumb') | ||||||
|  | @ -55,7 +60,9 @@ class bdist_dumb (Command): | ||||||
|                       ("don't know how to create dumb built distributions " + |                       ("don't know how to create dumb built distributions " + | ||||||
|                        "on platform %s") % os.name |                        "on platform %s") % os.name | ||||||
| 
 | 
 | ||||||
|         self.set_undefined_options('bdist', ('dist_dir', 'dist_dir')) |         self.set_undefined_options('bdist', | ||||||
|  |                                    ('dist_dir', 'dist_dir'), | ||||||
|  |                                    ('plat_name', 'plat_name')) | ||||||
| 
 | 
 | ||||||
|     # finalize_options() |     # finalize_options() | ||||||
| 
 | 
 | ||||||
|  | @ -74,7 +81,7 @@ class bdist_dumb (Command): | ||||||
|         # And make an archive relative to the root of the |         # And make an archive relative to the root of the | ||||||
|         # pseudo-installation tree. |         # pseudo-installation tree. | ||||||
|         archive_basename = "%s.%s" % (self.distribution.get_fullname(), |         archive_basename = "%s.%s" % (self.distribution.get_fullname(), | ||||||
|                                       get_platform()) |                                       self.plat_name) | ||||||
|         print "self.bdist_dir = %s" % self.bdist_dir |         print "self.bdist_dir = %s" % self.bdist_dir | ||||||
|         print "self.format = %s" % self.format |         print "self.format = %s" % self.format | ||||||
|         self.make_archive (os.path.join(self.dist_dir, archive_basename), |         self.make_archive (os.path.join(self.dist_dir, archive_basename), | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Greg Ward
						Greg Ward