Changeset: 216869db257b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=216869db257b
Modified Files:
Branch: default
Log Message:
Merge with Oct2010 branch.
diffs (43 lines):
diff -r 09c6c8d2b302 -r 216869db257b buildtools/Makefile.msc
--- a/buildtools/Makefile.msc Wed Sep 08 17:45:44 2010 +0200
+++ b/buildtools/Makefile.msc Wed Sep 08 18:04:15 2010 +0200
@@ -22,13 +22,13 @@
prefix = $(MAKEDIR)\NT
all:
- cd autogen && python setup.py build
+ cd autogen && setup.py build
cd Mx && $(MAKE) /nologo /f Makefile.msc
cd mel && $(MAKE) /nologo /f Makefile.msc
cd burg && $(MAKE) /nologo /f Makefile.msc
install:
- cd autogen && python setup.py install "--prefix=$(prefix)"
+ cd autogen && setup.py install "--prefix=$(prefix)"
cd Mx && $(MAKE) /nologo /f Makefile.msc "prefix=$(prefix)" install
cd mel && $(MAKE) /nologo /f Makefile.msc "prefix=$(prefix)" install
cd burg && $(MAKE) /nologo /f Makefile.msc "prefix=$(prefix)" install
diff -r 09c6c8d2b302 -r 216869db257b buildtools/autogen/setup.py
--- a/buildtools/autogen/setup.py Wed Sep 08 17:45:44 2010 +0200
+++ b/buildtools/autogen/setup.py Wed Sep 08 18:04:15 2010 +0200
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
# The contents of this file are subject to the MonetDB Public License
# Version 1.1 (the "License"); you may not use this file except in
# compliance with the License. You may obtain a copy of the License at
diff -r 09c6c8d2b302 -r 216869db257b buildtools/doc/windowsbuild.rst
--- a/buildtools/doc/windowsbuild.rst Wed Sep 08 17:45:44 2010 +0200
+++ b/buildtools/doc/windowsbuild.rst Wed Sep 08 18:04:15 2010 +0200
@@ -196,7 +196,10 @@
Windows binary distribution.
On Windows64 you can use either the 32-bit or 64-bit version of
-Python.
+Python. However, if you're going to create an installer for the
+python component using ``python setup.py bdist_msi`` or ``python
+setup.py bdist_wininst``, you should use the version of Python for
+which you're creating the installer.
__ http://www.python.org/
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
