Commit 5c4cef09 authored by jim's avatar jim

Log scripts created, as suggested in:

https://bugs.launchpad.net/zc.buildout/+bug/71353


git-svn-id: http://svn.zope.org/repos/main/zc.buildout/trunk@75600 62d5b8a3-27da-0310-9561-8e5933582275
parent 9a654c9c
...@@ -11,6 +11,16 @@ priorities include: ...@@ -11,6 +11,16 @@ priorities include:
Change History Change History
************** **************
1.0.0b23 (2007-05-??)
=====================
Feature Changes
---------------
- Improved error reporting by showing which packages require other
packages that can't be found or that cause version conflicts.
1.0.0b23 (2007-03-19) 1.0.0b23 (2007-03-19)
===================== =====================
...@@ -23,22 +33,15 @@ Feature Changes ...@@ -23,22 +33,15 @@ Feature Changes
distributions for applications allowing install without network distributions for applications allowing install without network
access. access.
- Log scripts created, as suggested in:
https://bugs.launchpad.net/zc.buildout/+bug/71353
Bugs Fixed Bugs Fixed
---------- ----------
- It wasn't possible to give options on the command line for sections - It wasn't possible to give options on the command line for sections
not defined in a configuration file. not defined in a configuration file.
1.0.0b23 (2007-05-??)
=====================
Feature Changes
---------------
- Improved error reporting by showing which packages require other
packages that can't be found or that cause version conflicts.
1.0.0b22 (2007-03-15) 1.0.0b22 (2007-03-15)
===================== =====================
......
...@@ -1703,6 +1703,7 @@ local buildout scripts. ...@@ -1703,6 +1703,7 @@ local buildout scripts.
buildout: Creating directory /sample-bootstrapped/parts buildout: Creating directory /sample-bootstrapped/parts
buildout: Creating directory /sample-bootstrapped/eggs buildout: Creating directory /sample-bootstrapped/eggs
buildout: Creating directory /sample-bootstrapped/develop-eggs buildout: Creating directory /sample-bootstrapped/develop-eggs
zc.buildout.easy_install: Generated script /sample-bootstrapped/bin/buildout.
Note that a basic setup.cfg was created for us. Note that a basic setup.cfg was created for us.
......
...@@ -64,6 +64,7 @@ server as usual: ...@@ -64,6 +64,7 @@ server as usual:
zc.buildout.easy_install: Got demo 0.2 zc.buildout.easy_install: Got demo 0.2
zc.buildout.easy_install: Getting new distribution for demoneeded zc.buildout.easy_install: Getting new distribution for demoneeded
zc.buildout.easy_install: Got demoneeded 1.1 zc.buildout.easy_install: Got demoneeded 1.1
zc.buildout.easy_install: Generated script /sample-buildout/bin/demo.
We'll also get the download cache populated. The buildout doesn't put We'll also get the download cache populated. The buildout doesn't put
files in the cache directly. It creates an intermediate directory, files in the cache directly. It creates an intermediate directory,
...@@ -91,6 +92,7 @@ If we remove the installed eggs from eggs directory and re-run the buildout: ...@@ -91,6 +92,7 @@ If we remove the installed eggs from eggs directory and re-run the buildout:
zc.buildout.easy_install: Got demo 0.2 zc.buildout.easy_install: Got demo 0.2
zc.buildout.easy_install: Getting new distribution for demoneeded zc.buildout.easy_install: Getting new distribution for demoneeded
zc.buildout.easy_install: Got demoneeded 1.1 zc.buildout.easy_install: Got demoneeded 1.1
zc.buildout.easy_install: Generated script /sample-buildout/bin/demo.
We see that the distributions aren't downloaded, because they're We see that the distributions aren't downloaded, because they're
downloaded from the cache. downloaded from the cache.
...@@ -134,3 +136,4 @@ install-from-cache option set to true: ...@@ -134,3 +136,4 @@ install-from-cache option set to true:
zc.buildout.easy_install: Got demo 0.2 zc.buildout.easy_install: Got demo 0.2
zc.buildout.easy_install: Getting new distribution for demoneeded zc.buildout.easy_install: Getting new distribution for demoneeded
zc.buildout.easy_install: Got demoneeded 1.1 zc.buildout.easy_install: Got demoneeded 1.1
zc.buildout.easy_install: Generated script /sample-buildout/bin/demo.
...@@ -829,6 +829,7 @@ def scripts(reqs, working_set, executable, dest, ...@@ -829,6 +829,7 @@ def scripts(reqs, working_set, executable, dest,
def _script(module_name, attrs, path, dest, executable, arguments, def _script(module_name, attrs, path, dest, executable, arguments,
initialization): initialization):
generated = [] generated = []
script = dest
if sys.platform == 'win32': if sys.platform == 'win32':
# generate exe file and give the script a magic name: # generate exe file and give the script a magic name:
open(dest+'.exe', 'wb').write( open(dest+'.exe', 'wb').write(
...@@ -850,6 +851,7 @@ def _script(module_name, attrs, path, dest, executable, arguments, ...@@ -850,6 +851,7 @@ def _script(module_name, attrs, path, dest, executable, arguments,
except (AttributeError, os.error): except (AttributeError, os.error):
pass pass
generated.append(dest) generated.append(dest)
logger.info("Generated script %s.", script)
return generated return generated
script_template = '''\ script_template = '''\
...@@ -869,6 +871,7 @@ if __name__ == '__main__': ...@@ -869,6 +871,7 @@ if __name__ == '__main__':
def _pyscript(path, dest, executable): def _pyscript(path, dest, executable):
generated = [] generated = []
script = dest
if sys.platform == 'win32': if sys.platform == 'win32':
# generate exe file and give the script a magic name: # generate exe file and give the script a magic name:
open(dest+'.exe', 'wb').write( open(dest+'.exe', 'wb').write(
...@@ -886,6 +889,7 @@ def _pyscript(path, dest, executable): ...@@ -886,6 +889,7 @@ def _pyscript(path, dest, executable):
except (AttributeError, os.error): except (AttributeError, os.error):
pass pass
generated.append(dest) generated.append(dest)
logger.info("Generated interpreter %s.", script)
return generated return generated
py_script_template = '''\ py_script_template = '''\
......
...@@ -793,6 +793,7 @@ bootstrapping. ...@@ -793,6 +793,7 @@ bootstrapping.
buildout: Creating directory /sample-bootstrap/parts buildout: Creating directory /sample-bootstrap/parts
buildout: Creating directory /sample-bootstrap/eggs buildout: Creating directory /sample-bootstrap/eggs
buildout: Creating directory /sample-bootstrap/develop-eggs buildout: Creating directory /sample-bootstrap/develop-eggs
zc.buildout.easy_install: Generated script /sample-bootstrap/bin/buildout.
""" """
def removing_eggs_from_develop_section_causes_egg_link_to_be_removed(): def removing_eggs_from_develop_section_causes_egg_link_to_be_removed():
...@@ -1856,6 +1857,7 @@ def bug_105081_Specific_egg_versions_are_ignored_when_newer_eggs_are_around(): ...@@ -1856,6 +1857,7 @@ def bug_105081_Specific_egg_versions_are_ignored_when_newer_eggs_are_around():
zc.buildout.easy_install: Got demo 0.3 zc.buildout.easy_install: Got demo 0.3
zc.buildout.easy_install: Getting new distribution for demoneeded zc.buildout.easy_install: Getting new distribution for demoneeded
zc.buildout.easy_install: Got demoneeded 1.1 zc.buildout.easy_install: Got demoneeded 1.1
zc.buildout.easy_install: Generated script /sample-buildout/bin/demo.
>>> print system(join('bin', 'demo')), >>> print system(join('bin', 'demo')),
3 1 3 1
...@@ -1876,6 +1878,7 @@ def bug_105081_Specific_egg_versions_are_ignored_when_newer_eggs_are_around(): ...@@ -1876,6 +1878,7 @@ def bug_105081_Specific_egg_versions_are_ignored_when_newer_eggs_are_around():
buildout: Installing x buildout: Installing x
zc.buildout.easy_install: Getting new distribution for demo==0.1 zc.buildout.easy_install: Getting new distribution for demo==0.1
zc.buildout.easy_install: Got demo 0.1 zc.buildout.easy_install: Got demo 0.1
zc.buildout.easy_install: Generated script /sample-buildout/bin/demo.
>>> print system(join('bin', 'demo')), >>> print system(join('bin', 'demo')),
1 1 1 1
......
...@@ -72,6 +72,7 @@ new versions found in new releases: ...@@ -72,6 +72,7 @@ new versions found in new releases:
zc.buildout version 99.99, zc.buildout version 99.99,
setuptools version 99.99; setuptools version 99.99;
restarting. restarting.
zc.buildout.easy_install: Generated script /sample-buildout/bin/buildout.
buildout: Develop: /sample-buildout/showversions buildout: Develop: /sample-buildout/showversions
buildout: Installing show-versions buildout: Installing show-versions
zc.buildout 99.99 zc.buildout 99.99
...@@ -120,6 +121,7 @@ We'll actually "upgrade" to an earlier version. ...@@ -120,6 +121,7 @@ We'll actually "upgrade" to an earlier version.
zc.buildout version 1.0.0, zc.buildout version 1.0.0,
setuptools version 0.6; setuptools version 0.6;
restarting. restarting.
zc.buildout.easy_install: Generated script /sample-buildout/bin/buildout.
buildout: Develop: /sample-buildout/showversions buildout: Develop: /sample-buildout/showversions
buildout: Updating show-versions buildout: Updating show-versions
zc.buildout 1.0.0 zc.buildout 1.0.0
......
...@@ -111,6 +111,7 @@ scripts recipe: ...@@ -111,6 +111,7 @@ scripts recipe:
>>> print system(buildout), >>> print system(buildout),
buildout: Uninstalling demo buildout: Uninstalling demo
buildout: Installing demo buildout: Installing demo
zc.buildout.easy_install: Generated script /sample-buildout/bin/demo.
Now we also see the script defined by the dmo script: Now we also see the script defined by the dmo script:
...@@ -172,6 +173,8 @@ the default entry point for the zc.recipe.egg egg. ...@@ -172,6 +173,8 @@ the default entry point for the zc.recipe.egg egg.
>>> print system(buildout), >>> print system(buildout),
buildout: Uninstalling demo buildout: Uninstalling demo
buildout: Installing demo buildout: Installing demo
zc.buildout.easy_install: Generated script /sample-buildout/bin/demo.
zc.buildout.easy_install: Generated interpreter /sample-buildout/bin/py-demo.
Now we also get a py-demo script for giving us a Python prompt with Now we also get a py-demo script for giving us a Python prompt with
the path for demo and any eggs it depends on included in sys.path. the path for demo and any eggs it depends on included in sys.path.
...@@ -228,6 +231,7 @@ and run the buildout in non-newest mode: ...@@ -228,6 +231,7 @@ and run the buildout in non-newest mode:
>>> print system(buildout+' -N'), >>> print system(buildout+' -N'),
buildout: Uninstalling demo buildout: Uninstalling demo
buildout: Installing demo buildout: Installing demo
zc.buildout.easy_install: Generated script /sample-buildout/bin/demo.
Note that we removed the eggs option, and the eggs defaulted to the Note that we removed the eggs option, and the eggs defaulted to the
part name. Because we removed the eggs option, the demo was part name. Because we removed the eggs option, the demo was
...@@ -237,6 +241,7 @@ We'll also run the buildout in off-line mode: ...@@ -237,6 +241,7 @@ We'll also run the buildout in off-line mode:
>>> print system(buildout+' -o'), >>> print system(buildout+' -o'),
buildout: Updating demo buildout: Updating demo
zc.buildout.easy_install: Generated script /sample-buildout/bin/demo.
We didn't get an update for demo: We didn't get an update for demo:
...@@ -253,6 +258,7 @@ we'll get an update for demo: ...@@ -253,6 +258,7 @@ we'll get an update for demo:
buildout: Updating demo buildout: Updating demo
zc.buildout.easy_install: Getting new distribution for demo zc.buildout.easy_install: Getting new distribution for demo
zc.buildout.easy_install: Got demo 0.3 zc.buildout.easy_install: Got demo 0.3
zc.buildout.easy_install: Generated script /sample-buildout/bin/demo.
Then we'll get a new demo egg: Then we'll get a new demo egg:
...@@ -312,6 +318,7 @@ You can also control the name used for scripts: ...@@ -312,6 +318,7 @@ You can also control the name used for scripts:
>>> print system(buildout), >>> print system(buildout),
buildout: Uninstalling demo buildout: Uninstalling demo
buildout: Installing demo buildout: Installing demo
zc.buildout.easy_install: Generated script /sample-buildout/bin/foo.
>>> ls(sample_buildout, 'bin') >>> ls(sample_buildout, 'bin')
- buildout - buildout
...@@ -341,6 +348,7 @@ extra-paths option: ...@@ -341,6 +348,7 @@ extra-paths option:
>>> print system(buildout), >>> print system(buildout),
buildout: Uninstalling demo buildout: Uninstalling demo
buildout: Installing demo buildout: Installing demo
zc.buildout.easy_install: Generated script /sample-buildout/bin/foo.
Let's look at the script that was generated: Let's look at the script that was generated:
...@@ -389,6 +397,7 @@ to be included in generated scripts: ...@@ -389,6 +397,7 @@ to be included in generated scripts:
>>> print system(buildout), >>> print system(buildout),
buildout: Uninstalling demo buildout: Uninstalling demo
buildout: Installing demo buildout: Installing demo
zc.buildout.easy_install: Generated script /sample-buildout/bin/foo.
>>> cat(sample_buildout, 'bin', 'foo') # doctest: +NORMALIZE_WHITESPACE >>> cat(sample_buildout, 'bin', 'foo') # doctest: +NORMALIZE_WHITESPACE
#!/usr/local/bin/python2.4 #!/usr/local/bin/python2.4
...@@ -438,6 +447,9 @@ declare entry points using the entry-points option: ...@@ -438,6 +447,9 @@ declare entry points using the entry-points option:
>>> print system(buildout), >>> print system(buildout),
buildout: Uninstalling demo buildout: Uninstalling demo
buildout: Installing demo buildout: Installing demo
zc.buildout.easy_install: Generated script /sample-buildout/bin/demo.
zc.buildout.easy_install: Generated script /sample-buildout/bin/alt.
zc.buildout.easy_install: Generated script /sample-buildout/bin/other.
>>> ls(sample_buildout, 'bin') >>> ls(sample_buildout, 'bin')
- alt - alt
...@@ -482,3 +494,4 @@ be made to contact an index server: ...@@ -482,3 +494,4 @@ be made to contact an index server:
>>> print system(buildout), >>> print system(buildout),
buildout: Uninstalling demo buildout: Uninstalling demo
buildout: Installing demo buildout: Installing demo
zc.buildout.easy_install: Generated script /sample-buildout/bin/foo.
...@@ -192,6 +192,7 @@ Let's define a script that uses out ext demo: ...@@ -192,6 +192,7 @@ Let's define a script that uses out ext demo:
buildout: Develop: /sample-buildout/demo buildout: Develop: /sample-buildout/demo
buildout: Updating extdemo buildout: Updating extdemo
buildout: Installing demo buildout: Installing demo
zc.buildout.easy_install: Generated script /sample-buildout/bin/demo.
When we run the script, we'll 42 printed: When we run the script, we'll 42 printed:
...@@ -214,11 +215,13 @@ If we run the buildout in non-newest or offline modes: ...@@ -214,11 +215,13 @@ If we run the buildout in non-newest or offline modes:
buildout: Develop: /sample-buildout/demo buildout: Develop: /sample-buildout/demo
buildout: Updating extdemo buildout: Updating extdemo
buildout: Updating demo buildout: Updating demo
zc.buildout.easy_install: Generated script /sample-buildout/bin/demo.
>>> print system(buildout+' -o'), >>> print system(buildout+' -o'),
buildout: Develop: /sample-buildout/demo buildout: Develop: /sample-buildout/demo
buildout: Updating extdemo buildout: Updating extdemo
buildout: Updating demo buildout: Updating demo
zc.buildout.easy_install: Generated script /sample-buildout/bin/demo.
We won't get an update. We won't get an update.
...@@ -235,6 +238,7 @@ will: ...@@ -235,6 +238,7 @@ will:
buildout: Updating extdemo buildout: Updating extdemo
zip_safe flag not set; analyzing archive contents... zip_safe flag not set; analyzing archive contents...
buildout: Updating demo buildout: Updating demo
zc.buildout.easy_install: Generated script /sample-buildout/bin/demo.
>>> ls(sample_buildout, 'develop-eggs') >>> ls(sample_buildout, 'develop-eggs')
- demo.egg-link - demo.egg-link
...@@ -274,6 +278,7 @@ We can specify a specific version using the egg option: ...@@ -274,6 +278,7 @@ We can specify a specific version using the egg option:
buildout: Installing extdemo buildout: Installing extdemo
zip_safe flag not set; analyzing archive contents... zip_safe flag not set; analyzing archive contents...
buildout: Installing demo buildout: Installing demo
zc.buildout.easy_install: Generated script /sample-buildout/bin/demo.
>>> ls(sample_buildout, 'develop-eggs') >>> ls(sample_buildout, 'develop-eggs')
- demo.egg-link - demo.egg-link
...@@ -383,6 +388,7 @@ set with a value of 2. ...@@ -383,6 +388,7 @@ set with a value of 2.
buildout: Uninstalling extdemo buildout: Uninstalling extdemo
buildout: Installing extdemo buildout: Installing extdemo
buildout: Installing demo buildout: Installing demo
zc.buildout.easy_install: Generated script /sample-buildout/bin/demo.
Our develop-eggs now includes an egg link for extdemo: Our develop-eggs now includes an egg link for extdemo:
......
...@@ -55,6 +55,8 @@ Now, if we run the buildout: ...@@ -55,6 +55,8 @@ Now, if we run the buildout:
zc.buildout.easy_install: Getting new distribution for setuptools zc.buildout.easy_install: Getting new distribution for setuptools
zc.buildout.easy_install: Got setuptools 0.6 zc.buildout.easy_install: Got setuptools 0.6
zc.buildout.easy_install: Got demoneeded 1.1 zc.buildout.easy_install: Got demoneeded 1.1
zc.buildout.easy_install: Generated script /sample-buildout/bin/demo.
zc.buildout.easy_install: Generated interpreter /sample-buildout/bin/py-demo.
we'll get the Python 2.3 eggs for demo and demoneeded: we'll get the Python 2.3 eggs for demo and demoneeded:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment