public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/chromium-tools:master commit in: scripts/, /
@ 2011-02-22 15:38 Paweł Hajdan, Jr.
  0 siblings, 0 replies; 3+ messages in thread
From: Paweł Hajdan, Jr. @ 2011-02-22 15:38 UTC (permalink / raw
  To: gentoo-commits

commit:     f8b2a44f38c35fd7ee0854cd12a85e8b314de676
Author:     Pawel Hajdan, Jr <phajdan.jr <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 22 15:34:47 2011 +0000
Commit:     Paweł Hajdan, Jr. <phajdan.jr <AT> gentoo <DOT> org>
CommitDate: Tue Feb 22 15:34:47 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/chromium-tools.git;a=commit;h=f8b2a44f

Move chromium-depot-tool to libexec, to avoid cluttering $PATH.

---
 MANIFEST.in                                        |    4 +++
 chromium-depot-tool => scripts/chromium-depot-tool |    0
 v8-create-tarball => scripts/v8-create-tarball     |    0
 v8-extract-version => scripts/v8-extract-version   |    0
 setup.py                                           |   28 +++++++++----------
 5 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..9ecf870
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,4 @@
+global-include *.py
+global-exclude *.pyc *.pyo
+graft scripts
+include LICENSE

diff --git a/chromium-depot-tool b/scripts/chromium-depot-tool
similarity index 100%
rename from chromium-depot-tool
rename to scripts/chromium-depot-tool

diff --git a/v8-create-tarball b/scripts/v8-create-tarball
similarity index 100%
rename from v8-create-tarball
rename to scripts/v8-create-tarball

diff --git a/v8-extract-version b/scripts/v8-extract-version
similarity index 100%
rename from v8-extract-version
rename to scripts/v8-extract-version

diff --git a/setup.py b/setup.py
index 2c1b88d..09abc3a 100644
--- a/setup.py
+++ b/setup.py
@@ -3,6 +3,7 @@ import subprocess
 import sys
 
 from distutils.command.install_scripts import install_scripts
+from distutils.command.install_data import install_data
 from distutils.command.sdist import sdist
 from distutils.core import setup
 from distutils.errors import *
@@ -46,21 +47,16 @@ class my_sdist(sdist):
 		sdist.make_release_tree(self, base_dir, files)
 		open(os.path.join(base_dir, 'VERSION'), 'w').write(get_version_from_git())
 
-class my_install_scripts(install_scripts):
-	def __symlink(self, src, dst):
-		dest_name, _ = self.copy_file(
-			src,
-			os.path.join(self.install_dir, dst),
-			link='sym')
-		self.outfiles.append(dest_name)
-
+class my_install_data(install_data):
 	def run(self):
-		install_scripts.run(self)
-		self.__symlink('chromium-depot-tool', 'drover')
-		self.__symlink('chromium-depot-tool', 'gcl')
-		self.__symlink('chromium-depot-tool', 'gclient')
+		install_data.run(self)
+		for tool in ['drover', 'gcl', 'gclient']:
+			os.symlink(
+				os.path.join('..', 'libexec', 'chromium-depot-tool'),
+				os.path.join(self.install_dir, 'bin', tool))
 
-scripts = ["v8-extract-version"]
+scripts = ["scripts/v8-extract-version"]
+data_files = []
 
 cmdclass = {'sdist': my_sdist}
 
@@ -68,14 +64,16 @@ args = sys.argv[1:]
 
 enable_subversion = get_option(args, 'subversion', default=True)
 if enable_subversion:
-	scripts += ["chromium-depot-tool", "v8-create-tarball"]
-	cmdclass['install_scripts'] = my_install_scripts
+	scripts += ["scripts/v8-create-tarball"]
+	data_files += [["libexec", ["scripts/chromium-depot-tool"]]]
+	cmdclass['install_data'] = my_install_data
 
 setup(
 	name="chromium-tools",
 	version=get_version(),
 	py_modules=["chromium_tools"],
 	scripts=scripts,
+	data_files=data_files,
 	cmdclass=cmdclass,
 	script_args=args
 )



^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] proj/chromium-tools:master commit in: scripts/, /
@ 2011-04-27  9:57 Paweł Hajdan
  0 siblings, 0 replies; 3+ messages in thread
From: Paweł Hajdan @ 2011-04-27  9:57 UTC (permalink / raw
  To: gentoo-commits

commit:     afa74fe53dfb6deacd24a9a91105882dfb5bec6b
Author:     Pawel Hajdan, Jr <phajdan.jr <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 27 09:27:29 2011 +0000
Commit:     Paweł Hajdan <phajdan.jr <AT> gentoo <DOT> org>
CommitDate: Wed Apr 27 09:30:57 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/chromium-tools.git;a=commit;h=afa74fe5

Clean up:

- remove switchable subversion support
- remove unused v8-extract-version
- take advantage of python-2.7 when it leads to simpler code
- simplify setup.py
- remove chromium_tools.py module (only one user now)

---
 chromium_tools.py          |   28 ----------------------------
 scripts/v8-create-tarball  |   30 +++++++++++++++++++++++++++---
 scripts/v8-extract-version |   11 -----------
 setup.py                   |   43 ++++---------------------------------------
 4 files changed, 31 insertions(+), 81 deletions(-)

diff --git a/chromium_tools.py b/chromium_tools.py
deleted file mode 100644
index 9fbf9f9..0000000
--- a/chromium_tools.py
+++ /dev/null
@@ -1,28 +0,0 @@
-"""Common utilities for chromium-tools scripts."""
-
-import re
-
-_V8_MAJOR_VERSION_PATTERN = re.compile(r"#define\s+MAJOR_VERSION\s+(.*)")
-_V8_MINOR_VERSION_PATTERN = re.compile(r"#define\s+MINOR_VERSION\s+(.*)")
-_V8_BUILD_NUMBER_PATTERN = re.compile(r"#define\s+BUILD_NUMBER\s+(.*)")
-_V8_PATCH_LEVEL_PATTERN = re.compile(r"#define\s+PATCH_LEVEL\s+(.*)")
-
-_V8_PATTERNS = [
-	_V8_MAJOR_VERSION_PATTERN,
-	_V8_MINOR_VERSION_PATTERN,
-	_V8_BUILD_NUMBER_PATTERN,
-	_V8_PATCH_LEVEL_PATTERN]
-
-def v8_extract_version(version_contents):
-	"""
-	Returns version number as string based on the string
-	contents of version.cc file.
-	"""
-	version_components = []
-	for pattern in _V8_PATTERNS:
-	  version_components.append(pattern.search(version_contents).group(1).strip())
-
-	if version_components[len(version_components) - 1] == '0':
-	  version_components.pop()
-
-	return '.'.join(version_components)

diff --git a/scripts/v8-create-tarball b/scripts/v8-create-tarball
index 8306819..0f7f6bb 100755
--- a/scripts/v8-create-tarball
+++ b/scripts/v8-create-tarball
@@ -1,5 +1,5 @@
 #!/usr/bin/python2
-# Copyright 2010 Gentoo Foundation
+# Copyright 2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 """Creates a tarball containing V8 sources based on an SVN tag."""
@@ -7,11 +7,35 @@
 import optparse
 import os.path
 import pysvn
+import re
 import shutil
 import tarfile
 import tempfile
 
-import chromium_tools
+_V8_MAJOR_VERSION_PATTERN = re.compile(r"#define\s+MAJOR_VERSION\s+(.*)")
+_V8_MINOR_VERSION_PATTERN = re.compile(r"#define\s+MINOR_VERSION\s+(.*)")
+_V8_BUILD_NUMBER_PATTERN = re.compile(r"#define\s+BUILD_NUMBER\s+(.*)")
+_V8_PATCH_LEVEL_PATTERN = re.compile(r"#define\s+PATCH_LEVEL\s+(.*)")
+
+_V8_PATTERNS = [
+	_V8_MAJOR_VERSION_PATTERN,
+	_V8_MINOR_VERSION_PATTERN,
+	_V8_BUILD_NUMBER_PATTERN,
+	_V8_PATCH_LEVEL_PATTERN]
+
+def v8_extract_version(version_contents):
+	"""
+	Returns version number as string based on the string
+	contents of version.cc file.
+	"""
+	version_components = []
+	for pattern in _V8_PATTERNS:
+	  version_components.append(pattern.search(version_contents).group(1).strip())
+
+	if version_components[len(version_components) - 1] == '0':
+	  version_components.pop()
+
+	return '.'.join(version_components)
 
 parser = optparse.OptionParser(usage="%prog <v8-version>")
 (options, args) = parser.parse_args()
@@ -32,7 +56,7 @@ try:
 	svn_client.checkout(checkout_url, checkout_dir)
 
 	version_contents = open(os.path.join(checkout_dir, 'src', 'version.cc')).read()
-	actual_version = chromium_tools.v8_extract_version(version_contents)
+	actual_version = v8_extract_version(version_contents)
 	if actual_version != args[0]:
 		print 'Version info inside version.cc does not match!'
 		print 'Expected %s, got %s. Exiting' % (args[0], actual_version)

diff --git a/scripts/v8-extract-version b/scripts/v8-extract-version
deleted file mode 100755
index 277df29..0000000
--- a/scripts/v8-extract-version
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/python2
-# Copyright 2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-"""Extracts V8 version number based on given version.cc file."""
-
-import sys
-
-import chromium_tools
-
-print chromium_tools.v8_extract_version(open(sys.argv[1]).read())

diff --git a/setup.py b/setup.py
index 09abc3a..0f3351b 100644
--- a/setup.py
+++ b/setup.py
@@ -12,10 +12,7 @@ def get_version_from_file():
 	return open(os.path.join(os.path.dirname(os.path.abspath(__file__)), 'VERSION')).read()
 
 def get_version_from_git():
-	# TODO: replace with check_output when python-2.7 is stable.
-	output = subprocess.Popen(
-		['git', 'describe'],
-		stdout=subprocess.PIPE).communicate()[0]
+	output = subprocess.check_output(['git', 'describe'])
 	chunks = output.split('-')
 	return '.'.join(chunks[:2])
 
@@ -25,23 +22,6 @@ def get_version():
 	except IOError:
 		return get_version_from_git()
 
-def get_option(args, name, default=False):
-	disable_arg = "--disable-" + name
-	enable_arg = "--enable-" + name
-	if disable_arg in args and enable_arg in args:
-		raise DistutilsArgError(
-			"Conflicting flags: %s, %s" % (disable_arg, enable_arg))
-	
-	if disable_arg in args:
-		args.remove(disable_arg)
-		return False
-	
-	if enable_arg in args:
-		args.remove(enable_arg)
-		return True
-	
-	return default
-
 class my_sdist(sdist):
 	def make_release_tree(self, base_dir, files):
 		sdist.make_release_tree(self, base_dir, files)
@@ -55,25 +35,10 @@ class my_install_data(install_data):
 				os.path.join('..', 'libexec', 'chromium-depot-tool'),
 				os.path.join(self.install_dir, 'bin', tool))
 
-scripts = ["scripts/v8-extract-version"]
-data_files = []
-
-cmdclass = {'sdist': my_sdist}
-
-args = sys.argv[1:]
-
-enable_subversion = get_option(args, 'subversion', default=True)
-if enable_subversion:
-	scripts += ["scripts/v8-create-tarball"]
-	data_files += [["libexec", ["scripts/chromium-depot-tool"]]]
-	cmdclass['install_data'] = my_install_data
-
 setup(
 	name="chromium-tools",
 	version=get_version(),
-	py_modules=["chromium_tools"],
-	scripts=scripts,
-	data_files=data_files,
-	cmdclass=cmdclass,
-	script_args=args
+	scripts=["scripts/v8-create-tarball"],
+	data_files=[["libexec", ["scripts/chromium-depot-tool"]]],
+	cmdclass={'install_data': my_install_data, 'sdist': my_sdist},
 )



^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] proj/chromium-tools:master commit in: scripts/, /
@ 2012-02-27 15:31 Paweł Hajdan
  0 siblings, 0 replies; 3+ messages in thread
From: Paweł Hajdan @ 2012-02-27 15:31 UTC (permalink / raw
  To: gentoo-commits

commit:     6377345b6e2626bcd1d3215cfb028e7e0067bcdb
Author:     Pawel Hajdan, Jr <phajdan.jr <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 27 15:30:50 2012 +0000
Commit:     Paweł Hajdan <phajdan.jr <AT> gentoo <DOT> org>
CommitDate: Mon Feb 27 15:30:50 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/chromium-tools.git;a=commit;h=6377345b

delete unused files

---
 LICENSE                     |  340 -------------------------------------------
 MANIFEST.in                 |    4 -
 scripts/chromium-depot-tool |   94 ------------
 scripts/v8-create-tarball   |   76 ----------
 setup.py                    |   44 ------
 5 files changed, 0 insertions(+), 558 deletions(-)

diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index 3912109..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-\f
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-\f
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-\f
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-\f
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-\f
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.

diff --git a/MANIFEST.in b/MANIFEST.in
deleted file mode 100644
index 9ecf870..0000000
--- a/MANIFEST.in
+++ /dev/null
@@ -1,4 +0,0 @@
-global-include *.py
-global-exclude *.pyc *.pyo
-graft scripts
-include LICENSE

diff --git a/scripts/chromium-depot-tool b/scripts/chromium-depot-tool
deleted file mode 100755
index e5de0ee..0000000
--- a/scripts/chromium-depot-tool
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/usr/bin/python2
-# Copyright 2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-"""Transparent wrapper for chromium depot_tools."""
-
-import httplib
-import os.path
-import pysvn
-import re
-import sys
-
-sys.path.insert(0, "/usr/lib/portage/pym")
-import portage.output
-
-DAV_QUERY = '<propfind xmlns="DAV:"><allprop/></propfind>'
-
-CHECKOUT_DIR = os.path.expanduser('~/.chromium-depot-tools')
-CHECKOUT_URL = 'http://src.chromium.org/svn/trunk/tools/depot_tools'
-
-eoutput = portage.output.EOutput()
-
-if not os.path.exists(CHECKOUT_DIR):
-	os.makedirs(CHECKOUT_DIR)
-
-svn_client = pysvn.Client()
-
-def IsCheckoutUpToDate(current_revision):
-	"""
-	Performs a quick version check.
-
-	Returns true if the local depot_tools checkout is up to date.
-	"""
-	try:
-		conn = httplib.HTTPConnection('src.chromium.org')
-		conn.putrequest('PROPFIND', '/svn/!svn/vcc/default')
-		conn.endheaders()
-		conn.send(DAV_QUERY)
-
-		response = conn.getresponse()
-		if response.status != 207:
-			eoutput.ewarn('Fast update check failed.')
-			return False
-		data = response.read()
-		match = re.match('.*/svn/!svn/bln/(\d+).*', data, re.DOTALL)
-		rev = match.group(1)
-
-		conn = httplib.HTTPConnection('src.chromium.org')
-		conn.putrequest('PROPFIND', '/svn/!svn/bc/%s/trunk/tools/depot_tools' % rev)
-		conn.putheader('Depth', '0')
-		conn.endheaders()
-		conn.send(DAV_QUERY)
-
-		response = conn.getresponse()
-		if response.status != 207:
-			eoutput.ewarn('Fast update check failed.')
-			return False
-		data = response.read()
-		match = re.match('.*/svn/!svn/ver/(\d+).*', data, re.DOTALL)
-		rev = int(match.group(1))
-
-		return rev == current_revision
-	except:
-		eoutput.ewarn('Fast update check failed.')
-		return False
-
-try:
-	entry = svn_client.info(CHECKOUT_DIR)
-except pysvn.ClientError:
-	eoutput.einfo('Checking out depot_tools...')
-	svn_client.checkout(CHECKOUT_URL, CHECKOUT_DIR)
-else:
-	if not IsCheckoutUpToDate(entry.commit_revision.number):
-		eoutput.einfo('Updating depot_tools...')
-		svn_client.cleanup(CHECKOUT_DIR)
-		svn_client.update(CHECKOUT_DIR)
-
-tools = {
-	'drover': 'drover.py',
-	'gcl': 'gcl.py',
-	'gclient': 'gclient.py',
-}
-
-argv = sys.argv[:]
-argv[0] = os.path.basename(argv[0])
-if argv[0] in tools:
-	tool = argv[0]
-	argv = argv[1:]
-elif len(sys.argv) >= 1:
-	tool = argv[1]
-	argv = argv[2:]
-
-os.execvp('python2',
-          ['python2', os.path.join(CHECKOUT_DIR, tools[tool])] + argv)

diff --git a/scripts/v8-create-tarball b/scripts/v8-create-tarball
deleted file mode 100755
index 0f7f6bb..0000000
--- a/scripts/v8-create-tarball
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/usr/bin/python2
-# Copyright 2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-"""Creates a tarball containing V8 sources based on an SVN tag."""
-
-import optparse
-import os.path
-import pysvn
-import re
-import shutil
-import tarfile
-import tempfile
-
-_V8_MAJOR_VERSION_PATTERN = re.compile(r"#define\s+MAJOR_VERSION\s+(.*)")
-_V8_MINOR_VERSION_PATTERN = re.compile(r"#define\s+MINOR_VERSION\s+(.*)")
-_V8_BUILD_NUMBER_PATTERN = re.compile(r"#define\s+BUILD_NUMBER\s+(.*)")
-_V8_PATCH_LEVEL_PATTERN = re.compile(r"#define\s+PATCH_LEVEL\s+(.*)")
-
-_V8_PATTERNS = [
-	_V8_MAJOR_VERSION_PATTERN,
-	_V8_MINOR_VERSION_PATTERN,
-	_V8_BUILD_NUMBER_PATTERN,
-	_V8_PATCH_LEVEL_PATTERN]
-
-def v8_extract_version(version_contents):
-	"""
-	Returns version number as string based on the string
-	contents of version.cc file.
-	"""
-	version_components = []
-	for pattern in _V8_PATTERNS:
-	  version_components.append(pattern.search(version_contents).group(1).strip())
-
-	if version_components[len(version_components) - 1] == '0':
-	  version_components.pop()
-
-	return '.'.join(version_components)
-
-parser = optparse.OptionParser(usage="%prog <v8-version>")
-(options, args) = parser.parse_args()
-if len(args) != 1:
-	parser.error("Exactly one argument required: <v8-version>")
-
-target_name = 'v8-%s' % args[0]
-
-tmpdir = tempfile.mkdtemp()
-
-try:
-	checkout_dir = os.path.join(tmpdir, target_name)
-	os.makedirs(checkout_dir)
-
-	checkout_url = 'http://v8.googlecode.com/svn/tags/%s' % args[0]
-
-	svn_client = pysvn.Client()
-	svn_client.checkout(checkout_url, checkout_dir)
-
-	version_contents = open(os.path.join(checkout_dir, 'src', 'version.cc')).read()
-	actual_version = v8_extract_version(version_contents)
-	if actual_version != args[0]:
-		print 'Version info inside version.cc does not match!'
-		print 'Expected %s, got %s. Exiting' % (args[0], actual_version)
-		sys.exit(1)
-
-	archive_name = '%s.tar.gz' % target_name
-	try:
-		archive = tarfile.open(archive_name, 'w:gz')
-		archive.add(checkout_dir, target_name, exclude=(lambda x: '.svn' in x))
-	except:
-		os.remove(archive_name)
-		raise
-	finally:
-		archive.close()
-finally:
-	shutil.rmtree(tmpdir)
-	pass

diff --git a/setup.py b/setup.py
deleted file mode 100644
index 0f3351b..0000000
--- a/setup.py
+++ /dev/null
@@ -1,44 +0,0 @@
-import os.path
-import subprocess
-import sys
-
-from distutils.command.install_scripts import install_scripts
-from distutils.command.install_data import install_data
-from distutils.command.sdist import sdist
-from distutils.core import setup
-from distutils.errors import *
-
-def get_version_from_file():
-	return open(os.path.join(os.path.dirname(os.path.abspath(__file__)), 'VERSION')).read()
-
-def get_version_from_git():
-	output = subprocess.check_output(['git', 'describe'])
-	chunks = output.split('-')
-	return '.'.join(chunks[:2])
-
-def get_version():
-	try:
-		return get_version_from_file()
-	except IOError:
-		return get_version_from_git()
-
-class my_sdist(sdist):
-	def make_release_tree(self, base_dir, files):
-		sdist.make_release_tree(self, base_dir, files)
-		open(os.path.join(base_dir, 'VERSION'), 'w').write(get_version_from_git())
-
-class my_install_data(install_data):
-	def run(self):
-		install_data.run(self)
-		for tool in ['drover', 'gcl', 'gclient']:
-			os.symlink(
-				os.path.join('..', 'libexec', 'chromium-depot-tool'),
-				os.path.join(self.install_dir, 'bin', tool))
-
-setup(
-	name="chromium-tools",
-	version=get_version(),
-	scripts=["scripts/v8-create-tarball"],
-	data_files=[["libexec", ["scripts/chromium-depot-tool"]]],
-	cmdclass={'install_data': my_install_data, 'sdist': my_sdist},
-)



^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2012-02-27 15:31 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-22 15:38 [gentoo-commits] proj/chromium-tools:master commit in: scripts/, / Paweł Hajdan, Jr.
  -- strict thread matches above, loose matches on Subject: below --
2011-04-27  9:57 Paweł Hajdan
2012-02-27 15:31 Paweł Hajdan

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox