Commit Graph
19 Commits
Author SHA1 Message Date
Keir Fraser 11e1149fe0 tools: Always use sane upstream (`native') python paths
Previously, by default we would install our python modules into
/usr/lib/python/xen, for example /usr/lib/python/xen/__init__.py.
Upstream python's standard install location (a) includes the Python
version number and (b) puts things in site-packages by default.

Our best conjecture for the reason for this was an attempt to make the
installs portable between different python versions.  However, that
doesn't work because compiled python modules (.pyc), and C python
extensions corresponding to one version of python, are not compatible
across different versions of python.

This is why upstream include the version number.

site-packages is the standard location for locally-installed packages
and is automatically included on the python search path.

In this change, we abandon our own unusual python path setup:

 * Invoke setup.py in an entirely standard manner.  We pass
   PREFIX and DESTDIR using the appropriate options provided by
   setup.py for those purposes (adding them to setup.py calls
   which were previously lacking them).

 * Since the installation locations are now on the standard
   python path, we no longer need to add anything to the path
   in any of our python utilities.  Therefore remove all that
   code from every python script.  (Many of these scripts
   unconditionally added /usr/lib/python and /usr/lib64/python which
   is wrong even in the old world.)

 * There is no longer any special `Xen python path'.  xen-python-path
   is no longer needed.  It is no longer called by anything in our
   tree.  However since out-of-tree callers may still invoke it, we
   retain it.  It now prints a fixed string referring to a directory
   which does not to exist; callers (who use it to augment their
   python path) will thus add a nonexistent directory to their python
   path which is harmless.

 * Remove various workarounds including use of setup.py --home
   (which is intended for something completely different).

 * Remove tests for the XEN_PYTHON_NATIVE_INSTALL build-time
   environment variable.  The new behaviour is the behaviour which we
   should have had if this variable had been set.  That is, it is now
   as if this variable was always set but also bugs in the resulting
   install have been fixed.

This should be a proper fix for the bug addressed by c/s 19515.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
2009-04-08 19:13:04 +01:00
kaf24@firebug.cl.cam.ac.uk b5fa90ac8e build: Clean up use of .PHONY
* Move .PHONY directives next to targets,
  this makes them a lot harder to miss
* Add missing .PHONY directives
* Remove nonexistent .PHONY directives
* Hopefully I didn'T miss anything...

Signed-Off-By: Horms <horms@verge.net.au>
2006-04-10 17:02:49 +01:00
twilkie@paploo.uk.xensource.com 8aa46fd245 Updates to SV. New look. Removed and simplified lots of files. 2005-08-09 12:55:18 +00:00
cl349@firebug.cl.cam.ac.uk 1b268774e8 Get rid of internet_copy.jpg once more.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
2005-07-27 18:41:49 +00:00
cl349@firebug.cl.cam.ac.uk 1693f2a523 Rename file with space in name.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>


--HG--
rename : tools/sv/images/internet copy.jpg => tools/sv/images/internet_copy.jpg
2005-07-27 09:56:31 +00:00
twilkie@paploo.uk.xensource.com 2145204551 Add XenSV back into the repository.
Now uses Python Server Pages, not twisted.
2005-07-26 13:56:30 +00:00
cl349@firebug.cl.cam.ac.uk 76105d8a76 bitkeeper revision 1.1542.1.1 (42943a71LGhR_dI1LOX6lKtJ08zzTA)
setup.py, Makefile:
  Remove XenSV -- it's been broken since twisted was removed.
Many files:
  Delete: tools/misc/xensv
  Delete: tools/python/xen/sv/params.py
  Delete: tools/python/xen/sv/__init__.py
  Delete: tools/python/xen/sv/MigrateDomain.py
  Delete: tools/python/xen/sv/Daemon.py
  Delete: tools/python/xen/sv/util.py
  Delete: tools/python/xen/sv/Wizard.py
  Delete: tools/python/xen/sv/TabView.py
  Delete: tools/python/xen/sv/SaveDomain.py
  Delete: tools/python/xen/sv/RestoreDomain.py
  Delete: tools/python/xen/sv/NodeInfo.py
  Delete: tools/python/xen/sv/Main.py
  Delete: tools/python/xen/sv/HTMLBase.py
  Delete: tools/python/xen/sv/GenTabbed.py
  Delete: tools/python/xen/sv/DomList.py
  Delete: tools/python/xen/sv/DomInfo.py
  Delete: tools/python/xen/sv/CreateDomain.py
  Delete: tools/sv/images/unpause.png
  Delete: tools/sv/images/small-unpause.png
  Delete: tools/sv/images/small-pause.png
  Delete: tools/sv/images/small-destroy.png
  Delete: tools/sv/images/shutdown.png
  Delete: tools/sv/images/seperator.jpg
  Delete: tools/sv/images/right-end-highlight.jpg
  Delete: tools/sv/images/reboot.png
  Delete: tools/sv/images/previous.png
  Delete: tools/sv/images/pause.png
  Delete: tools/sv/images/orb_02.jpg
  Delete: tools/sv/images/next.png
  Delete: tools/sv/images/middle-no-highlight.jpg
  Delete: tools/sv/images/middle-highlight.jpg
  Delete: tools/sv/images/left-end-no-highlight.jpg
  Delete: tools/sv/images/left-end-highlight.jpg
  Delete: tools/sv/images/finish.png
  Delete: tools/sv/images/destroy.png
  Delete: tools/sv/inc/style.css
  Delete: tools/sv/images/seperator-right-highlight.jpg
  Delete: tools/sv/images/seperator-left-highlight.jpg
  Delete: tools/sv/inc/script.js
  Delete: tools/sv/images/right-end-no-highlight.jpg
  Delete: tools/sv/images/orb_01.jpg
  Delete: tools/sv/Makefile
  Delete: tools/sv/Main.rpy
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
2005-05-25 08:42:25 +00:00
cl349@arcadians.cl.cam.ac.uk 8f230701e2 bitkeeper revision 1.1159.234.1 (41f9203a3hESfmWBG29VVoqa-chOrA)
Build system cleanups.

Signed-off-by: c@pin.lu
2005-01-27 17:09:14 +00:00
iap10@labyrinth.cl.cam.ac.uk d2f5d53621 bitkeeper revision 1.1159.223.26 (41f2cdb6LNpheOtPoAKEUn-czlZFig)
Description: use DESTDIR correctly
Standard makefiles always attempt to install to the root(/).  Setting
DESTDIR is the normal way to install to an alternative location.
Setting prefix has the possibility of breaking programs, as the prefix
may have been embedded inside a compiled binary.

From: Adam Heath <doogie@brainfood.com>
Signed-off-by: ian.pratt@cl.cam.ac.uk
2005-01-22 22:03:34 +00:00
iap10@labyrinth.cl.cam.ac.uk 41df713e01 bitkeeper revision 1.1159.223.23 (41f2c9e33H5dJn6K7RN-o2UASMwI3Q)
Description: Use FHS-compatible paths

From: Adam Heath <doogie@brainfood.com>
Signed-off-by: ian.pratt@cl.cam.ac.uk
2005-01-22 21:47:15 +00:00
iap10@labyrinth.cl.cam.ac.uk 6b422c28fa bitkeeper revision 1.1159.223.18 (41f2c6eamwtTkjdrv4CuL1WnOy4iGw)
Description: use INSTALL everywhere
Use install(by way of INSTALL variables) to create directories, install
programs, and install data files.

From: Adam Heath <doogie@brainfood.com>
Signed-off-by: ian.pratt@cl.cam.ac.uk
2005-01-22 21:34:34 +00:00
cl349@freefall.cl.cam.ac.uk d93f0e0156 bitkeeper revision 1.1159.1.294 (4180c875SLNksrza17zCYoYyptjEyA)
Makefile:
  Make install a lot less noisy and cleanup.
2004-10-28 10:22:45 +00:00
tw275@labyrinth.cl.cam.ac.uk 992c4d6f0b bitkeeper revision 1.1159.32.1 (4120b0e7LRYrL1B3ICa0Qkit5txAbQ)
Added error checking, small button on domain list, 
updated to be compatible with latest xend, and
some small changes to domain creation.
2004-08-16 13:04:39 +00:00
tw275@labyrinth.cl.cam.ac.uk a37512ea46 bitkeeper revision 1.1108.30.3 (4107c922o_Bx20-5N8PsVBcjjHYmQA)
More work on wizard
2004-07-28 15:41:22 +00:00
tw275@labyrinth.cl.cam.ac.uk 589aaab18f bitkeeper revision 1.1108.19.1 (41052eba3ZVcoufgBgwBIOi8WV_BbQ)
Started to implement the Create Domain Wizzard.  
Doesn't work yet (along way off).
Slight refactoring of other code to make it more extensible
2004-07-26 16:18:02 +00:00
tw275@labyrinth.cl.cam.ac.uk a33793ae44 bitkeeper revision 1.1108.1.21 (4104ffcb0fLoE7HIdNvUGJI49n_Sxg)
Added menu writing, improving the menu on the left of the page,
and gerneralized getDomInfoHash, should work with upgraded versions
 of xend
2004-07-26 12:57:47 +00:00
tw275@labyrinth.cl.cam.ac.uk 0ee1e6a7ba bitkeeper revision 1.1108.13.1 (41013a844lXqlHgR5n6-9AZ5s3WCsQ)
Added general support for actions
Slightly generalized and refactored code for modules / tabs
2004-07-23 16:19:16 +00:00
cl349@freefall.cl.cam.ac.uk 7f8baa9018 bitkeeper revision 1.1108.2.20 (4100050ee2rhUkBYDjTlzUWJXwt3Dg)
make 'make install' work more than once if the installed files are not writable
2004-07-22 18:18:54 +00:00
tw275@labyrinth.cl.cam.ac.uk 332f9ea88f bitkeeper revision 1.1108.2.16 (40ffbcb9BiiQEdm3tM2wR3kHhi0avQ)
Changed location of sv - http share sits at /var/xen/sv
 while python files have been move out of xend
2004-07-22 13:10:17 +00:00