mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-12 18:02:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merged revisions 62954-62959,62961,62963-62967,62969-62970,62972-62973,62975-62976,62978-62982,62984,62987-62996 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r62954 | martin.v.loewis | 2008-05-09 16:11:37 -0400 (Fri, 09 May 2008) | 1 line

  Port to VS 2008. Drop W9x support.
........
  r62957 | benjamin.peterson | 2008-05-09 17:30:26 -0400 (Fri, 09 May 2008) | 2 lines

  In stdtypes.rst, move methods under class directives where applicable
........
  r62958 | brett.cannon | 2008-05-09 17:30:36 -0400 (Fri, 09 May 2008) | 2 lines

  Add a todo list to the module deletion command.
........
  r62963 | brett.cannon | 2008-05-09 18:52:28 -0400 (Fri, 09 May 2008) | 2 lines

  Add support for extension modules in 3.0 deprection command.
........
  r62967 | brett.cannon | 2008-05-09 22:25:00 -0400 (Fri, 09 May 2008) | 2 lines

  Fix some errors in the deprecation warnings for new and user.
........
  r62975 | brett.cannon | 2008-05-09 22:54:52 -0400 (Fri, 09 May 2008) | 3 lines

  Suppress deprecations for packages as well when using
  test.test_support.import_module().
........
  r62976 | brett.cannon | 2008-05-09 22:57:03 -0400 (Fri, 09 May 2008) | 2 lines

  Also ignore package deprecations.
........
  r62982 | benjamin.peterson | 2008-05-09 23:08:17 -0400 (Fri, 09 May 2008) | 2 lines

  Add the examples in the json module docstring as a doctest
........
  r62992 | martin.v.loewis | 2008-05-10 09:24:09 -0400 (Sat, 10 May 2008) | 2 lines

  Explicitly refer to current hhp file (2.6a3)
........
  r62993 | skip.montanaro | 2008-05-10 10:48:49 -0400 (Sat, 10 May 2008) | 2 lines

  Note the PyPI-edness of bsddb185 for people who might still need it.
........
  r62994 | andrew.kuchling | 2008-05-10 13:36:24 -0400 (Sat, 10 May 2008) | 1 line

  Docstring typo
........
  r62995 | andrew.kuchling | 2008-05-10 13:37:05 -0400 (Sat, 10 May 2008) | 1 line

  Document the 'line' argument
........
  r62996 | andrew.kuchling | 2008-05-10 13:48:45 -0400 (Sat, 10 May 2008) | 1 line

  #1625509: describe behaviour of import lock
........
This commit is contained in:
Alexandre Vassalotti 2008-05-15 22:51:26 +00:00
parent 6461e10158
commit a79e33e039
12 changed files with 223 additions and 204 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Doc/library/imp.rst
View file

@ -112,10 +112,16 @@ This module provides an interface to the mechanisms used to implement the
.. function:: acquire_lock() .. function:: acquire_lock()
Acquires the interpreter's import lock for the current thread. This lock should Acquire the interpreter's import lock for the current thread. This lock should
be used by import hooks to ensure thread-safety when importing modules. On be used by import hooks to ensure thread-safety when importing modules. On
platforms without threads, this function does nothing. platforms without threads, this function does nothing.
Once a thread has acquired the import lock, the same thread may acquire it
again without blocking; the thread must release it once for each time it has
acquired it.
On platforms without threads, this function does nothing.
.. function:: release_lock() .. function:: release_lock()

198
Doc/library/stdtypes.rst
View file

@ -1458,159 +1458,160 @@ The constructors for both classes work the same:
sets, the inner sets must be :class:`frozenset` objects. If *iterable* is sets, the inner sets must be :class:`frozenset` objects. If *iterable* is
not specified, a new empty set is returned. not specified, a new empty set is returned.
Instances of :class:`set` and :class:`frozenset` provide the following Instances of :class:`set` and :class:`frozenset` provide the following
operations: operations:
.. describe:: len(s) .. describe:: len(s)
Return the cardinality of set *s*. Return the cardinality of set *s*.
.. describe:: x in s .. describe:: x in s
Test *x* for membership in *s*. Test *x* for membership in *s*.
.. describe:: x not in s .. describe:: x not in s
Test *x* for non-membership in *s*. Test *x* for non-membership in *s*.
.. method:: set.isdisjoint(other) .. method:: isdisjoint(other)
Return True if the set has no elements in common with *other*. Return True if the set has no elements in common with *other*. Sets are
Sets are disjoint if and only if their interesection is the empty set. disjoint if and only if their interesection is the empty set.
.. method:: set.issubset(other) .. method:: issubset(other)
set <= other set <= other
Test whether every element in the set is in *other*. Test whether every element in the set is in *other*.
.. method:: set < other .. method:: set < other
Test whether the set is a true subset of *other*, that is, Test whether the set is a true subset of *other*, that is,
``set <= other and set != other``. ``set <= other and set != other``.
.. method:: set.issuperset(other) .. method:: issuperset(other)
set >= other set >= other
Test whether every element in *other* is in the set. Test whether every element in *other* is in the set.
.. method:: set > other .. method:: set > other
Test whether the set is a true superset of *other*, that is, Test whether the set is a true superset of *other*, that is, ``set >=
``set >= other and set != other``. other and set != other``.
.. method:: set.union(other) .. method:: union(other)
set | other set | other
Return a new set with elements from both sets. Return a new set with elements from both sets.
.. method:: set.intersection(other) .. method:: intersection(other)
set & other set & other
Return a new set with elements common to both sets. Return a new set with elements common to both sets.
.. method:: set.difference(other) .. method:: difference(other)
set - other set - other
Return a new set with elements in the set that are not in *other*. Return a new set with elements in the set that are not in *other*.
.. method:: set.symmetric_difference(other) .. method:: symmetric_difference(other)
set ^ other set ^ other
Return a new set with elements in either the set or *other* but not both. Return a new set with elements in either the set or *other* but not both.
.. method:: set.copy() .. method:: copy()
Return a new set with a shallow copy of *s*. Return a new set with a shallow copy of *s*.
Note, the non-operator versions of :meth:`union`, :meth:`intersection`, Note, the non-operator versions of :meth:`union`, :meth:`intersection`,
:meth:`difference`, and :meth:`symmetric_difference`, :meth:`issubset`, and :meth:`difference`, and :meth:`symmetric_difference`, :meth:`issubset`, and
:meth:`issuperset` methods will accept any iterable as an argument. In :meth:`issuperset` methods will accept any iterable as an argument. In
contrast, their operator based counterparts require their arguments to be sets. contrast, their operator based counterparts require their arguments to be
This precludes error-prone constructions like ``set('abc') & 'cbs'`` in favor of sets. This precludes error-prone constructions like ``set('abc') & 'cbs'``
the more readable ``set('abc').intersection('cbs')``. in favor of the more readable ``set('abc').intersection('cbs')``.
Both :class:`set` and :class:`frozenset` support set to set comparisons. Two Both :class:`set` and :class:`frozenset` support set to set comparisons. Two
sets are equal if and only if every element of each set is contained in the sets are equal if and only if every element of each set is contained in the
other (each is a subset of the other). A set is less than another set if and other (each is a subset of the other). A set is less than another set if and
only if the first set is a proper subset of the second set (is a subset, but is only if the first set is a proper subset of the second set (is a subset, but
not equal). A set is greater than another set if and only if the first set is a is not equal). A set is greater than another set if and only if the first set
proper superset of the second set (is a superset, but is not equal). is a proper superset of the second set (is a superset, but is not equal).
Instances of :class:`set` are compared to instances of :class:`frozenset` based Instances of :class:`set` are compared to instances of :class:`frozenset`
on their members. For example, ``set('abc') == frozenset('abc')`` returns based on their members. For example, ``set('abc') == frozenset('abc')``
``True`` and so does ``set('abc') in set([frozenset('abc')])``. returns ``True`` and so does ``set('abc') in set([frozenset('abc')])``.
The subset and equality comparisons do not generalize to a complete ordering The subset and equality comparisons do not generalize to a complete ordering
function. For example, any two disjoint sets are not equal and are not subsets function. For example, any two disjoint sets are not equal and are not
of each other, so *all* of the following return ``False``: ``a<b``, ``a==b``, subsets of each other, so *all* of the following return ``False``: ``a<b``,
or ``a>b``. Accordingly, sets do not implement the :meth:`__cmp__` method. ``a==b``, or ``a>b``. Accordingly, sets do not implement the :meth:`__cmp__`
method.
Since sets only define partial ordering (subset relationships), the output of Since sets only define partial ordering (subset relationships), the output of
the :meth:`list.sort` method is undefined for lists of sets. the :meth:`list.sort` method is undefined for lists of sets.
Set elements, like dictionary keys, must be :term:`hashable`. Set elements, like dictionary keys, must be :term:`hashable`.
Binary operations that mix :class:`set` instances with :class:`frozenset` return Binary operations that mix :class:`set` instances with :class:`frozenset`
the type of the first operand. For example: ``frozenset('ab') | set('bc')`` return the type of the first operand. For example: ``frozenset('ab') |
returns an instance of :class:`frozenset`. set('bc')`` returns an instance of :class:`frozenset`.
The following table lists operations available for :class:`set` that do not The following table lists operations available for :class:`set` that do not
apply to immutable instances of :class:`frozenset`: apply to immutable instances of :class:`frozenset`:
.. method:: set.update(other) .. method:: update(other)
set |= other set |= other
Update the set, adding elements from *other*. Update the set, adding elements from *other*.
.. method:: set.intersection_update(other) .. method:: intersection_update(other)
set &= other set &= other
Update the set, keeping only elements found in it and *other*. Update the set, keeping only elements found in it and *other*.
.. method:: set.difference_update(other) .. method:: difference_update(other)
set -= other set -= other
Update the set, removing elements found in *other*. Update the set, removing elements found in *other*.
.. method:: set.symmetric_difference_update(other) .. method:: symmetric_difference_update(other)
set ^= other set ^= other
Update the set, keeping only elements found in either set, but not in both. Update the set, keeping only elements found in either set, but not in both.
.. method:: set.add(elem) .. method:: add(elem)
Add element *elem* to the set. Add element *elem* to the set.
.. method:: set.remove(elem) .. method:: remove(elem)
Remove element *elem* from the set. Raises :exc:`KeyError` if *elem* is not Remove element *elem* from the set. Raises :exc:`KeyError` if *elem* is
contained in the set. not contained in the set.
.. method:: set.discard(elem) .. method:: discard(elem)
Remove element *elem* from the set if it is present. Remove element *elem* from the set if it is present.
.. method:: set.pop() .. method:: pop()
Remove and return an arbitrary element from the set. Raises :exc:`KeyError` Remove and return an arbitrary element from the set. Raises
if the set is empty. :exc:`KeyError` if the set is empty.
.. method:: set.clear() .. method:: clear()
Remove all elements from the set. Remove all elements from the set.
Note, the non-operator versions of the :meth:`update`, Note, the non-operator versions of the :meth:`update`,
:meth:`intersection_update`, :meth:`difference_update`, and :meth:`intersection_update`, :meth:`difference_update`, and
:meth:`symmetric_difference_update` methods will accept any iterable as an :meth:`symmetric_difference_update` methods will accept any iterable as an
argument. argument.
Note, the *elem* argument to the :meth:`__contains__`, :meth:`remove`, and Note, the *elem* argument to the :meth:`__contains__`, :meth:`remove`, and
:meth:`discard` methods may be a set. To support searching for an equivalent :meth:`discard` methods may be a set. To support searching for an equivalent
frozenset, the *elem* set is temporarily mutated during the search and then frozenset, the *elem* set is temporarily mutated during the search and then
restored. During the search, the *elem* set should not be read or mutated restored. During the search, the *elem* set should not be read or mutated
since it does not have a meaningful value. since it does not have a meaningful value.
.. _typesmapping: .. _typesmapping:
@ -1674,14 +1675,14 @@ pairs within braces, for example: ``{'jack': 4098, 'sjoerd': 4127}`` or ``{4098:
others work with any valid keys. others work with any valid keys.
These are the operations that dictionaries support (and therefore, custom mapping These are the operations that dictionaries support (and therefore, custom
types should support too): mapping types should support too):
.. describe:: len(d) .. describe:: len(d)
Return the number of items in the dictionary *d*. Return the number of items in the dictionary *d*.
.. describe:: d[key] .. describe:: d[key]
Return the item of *d* with key *key*. Raises a :exc:`KeyError` if *key* is Return the item of *d* with key *key*. Raises a :exc:`KeyError` if *key* is
not in the map. not in the map.
@ -1695,84 +1696,85 @@ types should support too):
:meth:`__missing__` must be a method; it cannot be an instance variable. For :meth:`__missing__` must be a method; it cannot be an instance variable. For
an example, see :class:`collections.defaultdict`. an example, see :class:`collections.defaultdict`.
.. describe:: d[key] = value .. describe:: d[key] = value
Set ``d[key]`` to *value*. Set ``d[key]`` to *value*.
.. describe:: del d[key] .. describe:: del d[key]
Remove ``d[key]`` from *d*. Raises a :exc:`KeyError` if *key* is not in the Remove ``d[key]`` from *d*. Raises a :exc:`KeyError` if *key* is not in the
map. map.
.. describe:: key in d .. describe:: key in d
Return ``True`` if *d* has a key *key*, else ``False``. Return ``True`` if *d* has a key *key*, else ``False``.
.. describe:: key not in d .. describe:: key not in d
Equivalent to ``not key in d``. Equivalent to ``not key in d``.
.. method:: dict.clear() .. method:: clear()
Remove all items from the dictionary. Remove all items from the dictionary.
.. method:: dict.copy() .. method:: copy()
Return a shallow copy of the dictionary. Return a shallow copy of the dictionary.
.. method:: dict.fromkeys(seq[, value]) .. method:: fromkeys(seq[, value])
Create a new dictionary with keys from *seq* and values set to *value*. Create a new dictionary with keys from *seq* and values set to *value*.
:func:`fromkeys` is a class method that returns a new dictionary. *value* :meth:`fromkeys` is a class method that returns a new dictionary. *value*
defaults to ``None``. defaults to ``None``.
.. method:: dict.get(key[, default]) .. method:: get(key[, default])
Return the value for *key* if *key* is in the dictionary, else *default*. If Return the value for *key* if *key* is in the dictionary, else *default*.
*default* is not given, it defaults to ``None``, so that this method never If *default* is not given, it defaults to ``None``, so that this method
raises a :exc:`KeyError`. never raises a :exc:`KeyError`.
.. method:: dict.items() .. method:: items()
Return a new view of the dictionary's items (``(key, value)`` pairs). See Return a new view of the dictionary's items (``(key, value)`` pairs). See
below for documentation of view objects. below for documentation of view objects.
.. method:: dict.keys() .. method:: keys()
Return a new view of the dictionary's keys. See below for documentation of Return a new view of the dictionary's keys. See below for documentation of
view objects. view objects.
.. method:: dict.pop(key[, default]) .. method:: pop(key[, default])
If *key* is in the dictionary, remove it and return its value, else return If *key* is in the dictionary, remove it and return its value, else return
*default*. If *default* is not given and *key* is not in the dictionary, a *default*. If *default* is not given and *key* is not in the dictionary,
:exc:`KeyError` is raised. a :exc:`KeyError` is raised.
.. method:: dict.popitem() .. method:: popitem()
Remove and return an arbitrary ``(key, value)`` pair from the dictionary. Remove and return an arbitrary ``(key, value)`` pair from the dictionary.
:func:`popitem` is useful to destructively iterate over a dictionary, as :meth:`popitem` is useful to destructively iterate over a dictionary, as
often used in set algorithms. If the dictionary is empty, calling often used in set algorithms. If the dictionary is empty, calling
:func:`popitem` raises a :exc:`KeyError`. :meth:`popitem` raises a :exc:`KeyError`.
.. method:: dict.setdefault(key[, default]) .. method:: setdefault(key[, default])
If *key* is in the dictionary, return its value. If not, insert *key* with If *key* is in the dictionary, return its value. If not, insert *key*
a value of *default* and return *default*. *default* defaults to ``None``. with a value of *default* and return *default*. *default* defaults to
``None``.
.. method:: dict.update([other]) .. method:: update([other])
Update the dictionary with the key/value pairs from *other*, overwriting Update the dictionary with the key/value pairs from *other*, overwriting
existing keys. Return ``None``. existing keys. Return ``None``.
:func:`update` accepts either another dictionary object or an iterable of :meth:`update` accepts either another dictionary object or an iterable of
key/value pairs (as a tuple or other iterable of length two). If keyword key/value pairs (as a tuple or other iterable of length two). If keyword
arguments are specified, the dictionary is then is updated with those arguments are specified, the dictionary is then is updated with those
key/value pairs: ``d.update(red=1, blue=2)``. key/value pairs: ``d.update(red=1, blue=2)``.
.. method:: dict.values() .. method:: values()
Return a new view of the dictionary's values. See below for documentation of Return a new view of the dictionary's values. See below for documentation of
view objects. view objects.

7
Doc/library/warnings.rst
View file

@ -209,12 +209,17 @@ Available Functions
resulting string to *file*, which defaults to ``sys.stderr``. You may replace resulting string to *file*, which defaults to ``sys.stderr``. You may replace
this function with an alternative implementation by assigning to this function with an alternative implementation by assigning to
``warnings.showwarning``. ``warnings.showwarning``.
*line* is a line of source code to be included in the warning
message; if *line* is not supplied, :func:`showwarning` will
try to read the line specified by *filename* and *lineno*.
.. function:: formatwarning(message, category, filename, lineno[, line]) .. function:: formatwarning(message, category, filename, lineno[, line])
Format a warning the standard way. This returns a string which may contain Format a warning the standard way. This returns a string which may contain
embedded newlines and ends in a newline. embedded newlines and ends in a newline. *line* is
a line of source code to be included in the warning message; if *line* is not supplied,
:func:`formatwarning` will try to read the line specified by *filename* and *lineno*.
.. function:: filterwarnings(action[, message[, category[, module[, lineno[, append]]]]]) .. function:: filterwarnings(action[, message[, category[, module[, lineno[, append]]]]])

2
Lib/site.py
View file

@ -184,7 +184,7 @@ def addsitedir(sitedir, known_paths=None):
def check_enableusersite(): def check_enableusersite():
"""Check if user site directory is safe for inclusion """Check if user site directory is safe for inclusion
The functions tests for the command line flag (including environment var), The function tests for the command line flag (including environment var),
process uid/gid equal to effective uid/gid. process uid/gid equal to effective uid/gid.
None: Disabled for security reasons None: Disabled for security reasons

3
Lib/test/test___all__.py
View file

@ -9,7 +9,8 @@ class AllTest(unittest.TestCase):
def check_all(self, modname): def check_all(self, modname):
names = {} names = {}
with catch_warning(): with catch_warning():
warnings.filterwarnings("ignore", ".* module", DeprecationWarning) warnings.filterwarnings("ignore", ".* (module|package)",
DeprecationWarning)
try: try:
exec("import %s" % modname, names) exec("import %s" % modname, names)
except ImportError: except ImportError:

1
Lib/test/test_json.py
View file

@ -11,6 +11,7 @@ import test.test_support
def test_main(): def test_main():
test.test_support.run_unittest(json.tests.test_suite()) test.test_support.run_unittest(json.tests.test_suite())
test.test_support.run_doctest(json)
if __name__ == "__main__": if __name__ == "__main__":

3
Lib/test/test_support.py
View file

@ -42,7 +42,8 @@ def import_module(name, deprecated=False):
available.""" available."""
with catch_warning(record=False): with catch_warning(record=False):
if deprecated: if deprecated:
warnings.filterwarnings("ignore", ".+ module", DeprecationWarning) warnings.filterwarnings("ignore", ".+ (module|package)",
DeprecationWarning)
try: try:
module = __import__(name, level=0) module = __import__(name, level=0)
except ImportError: except ImportError:

38
Misc/TextMate/Python-Dev.tmbundle/Commands/2 to 3 - Module Deletion.tmCommand
View file

@ -6,24 +6,50 @@
<string>nop</string> <string>nop</string>
<key>command</key> <key>command</key>
<string>#!/usr/bin/python <string>#!/usr/bin/python
"""Generate code to warn about a module's removal in Python 3.0.
template = """from warnings import warnpy3k XXX Not supported:
- Module's in a package do not have their full name generated.
- Package's __init__ module; should detect and use the package's name instead.
"""
py_template = """from warnings import warnpy3k
warnpy3k("the ${1:%s} module has been removed in Python 3.0", stacklevel=2) warnpy3k("the ${1:%s} module has been removed in Python 3.0", stacklevel=2)
del warnpy3k del warnpy3k$0"""
$0"""
c_template = """
if (PyErr_WarnPy3k("the ${1:%s} module has been removed in "
"Python 3.0", 2) &lt; 0)
return;$0"""
import imp import imp
import os import os
file_name = os.path.split(os.environ['TM_FILEPATH'])[1] file_name = os.path.split(os.environ['TM_FILEPATH'])[1]
for suffix in (tuple_[0] for tuple_ in imp.get_suffixes()):
py_suffixes = reversed(sorted((suffix[0] for suffix in imp.get_suffixes() if suffix[2] == imp.PY_SOURCE), key=len))
c_suffixes = reversed(sorted((os.path.splitext(suffix[0])[0] + '.c'
for suffix in imp.get_suffixes() if suffix[2] == imp.C_EXTENSION), key=len))
pairings = ((py_suffixes, py_template), (c_suffixes, c_template))
def create_template(suffixes, template):
for suffix in suffixes:
if not file_name.endswith(suffix): if not file_name.endswith(suffix):
continue continue
module_name = file_name[:-len(suffix)] module_name = file_name[:-len(suffix)]
print (template % module_name), return template % module_name
else:
return None
for template in (create_template(*pair) for pair in pairings):
if not template:
continue
print template,
break break
else: else:
print (template % "XXX"),</string> print 'XXX Could not generate code.'</string>
<key>input</key> <key>input</key>
<string>none</string> <string>none</string>
<key>name</key> <key>name</key>

2
Misc/TextMate/Python-Dev.tmbundle/info.plist
View file

@ -22,10 +22,12 @@
<string>Python-Dev</string> <string>Python-Dev</string>
<key>ordering</key> <key>ordering</key>
<array> <array>
<string>9519C22B-6AB8-41A1-94F6-079E0B45C147</string>
<string>B545BB1B-A8E1-426C-B50A-426E78B96D38</string> <string>B545BB1B-A8E1-426C-B50A-426E78B96D38</string>
<string>6EF151E5-7149-4F82-8796-0CC40FE589FA</string> <string>6EF151E5-7149-4F82-8796-0CC40FE589FA</string>
<string>FD25A8DC-22DC-4ED4-B222-B943C8A9117D</string> <string>FD25A8DC-22DC-4ED4-B222-B943C8A9117D</string>
<string>BF336FFF-E14D-4BF1-A156-71CF768AC034</string> <string>BF336FFF-E14D-4BF1-A156-71CF768AC034</string>
<string>EDBB037F-AAE3-4512-863F-D9AA82C9E51E</string>
</array> </array>
<key>uuid</key> <key>uuid</key>
<string>A932ECD1-D43A-4F57-B7FB-A1CEC3B65D20</string> <string>A932ECD1-D43A-4F57-B7FB-A1CEC3B65D20</string>

2
Tools/buildbot/buildmsi.bat
View file

@ -9,7 +9,7 @@ vcbuild /useenv PCbuild\pcbuild.sln "Release|Win32"
@rem build the documentation @rem build the documentation
bash.exe -c 'cd Doc;make PYTHON=python2.5 update htmlhelp' bash.exe -c 'cd Doc;make PYTHON=python2.5 update htmlhelp'
"%ProgramFiles%\HTML Help Workshop\hhc.exe" Doc\build\htmlhelp\pydoc.hhp "%ProgramFiles%\HTML Help Workshop\hhc.exe" Doc\build\htmlhelp\python30a5.hhp
@rem buold the MSI file @rem buold the MSI file
cd PC cd PC

9
Tools/msi/msisupport.c
View file

@ -1,8 +1,6 @@
#include "windows.h" #include "windows.h"
#include "msiquery.h" #include "msiquery.h"
int isWinNT;
/* Print a debug message to the installer log file. /* Print a debug message to the installer log file.
* To see the debug messages, install with * To see the debug messages, install with
* msiexec /i pythonxy.msi /l*v python.log * msiexec /i pythonxy.msi /l*v python.log
@ -30,21 +28,14 @@ UINT __declspec(dllexport) __stdcall CheckDir(MSIHANDLE hInstall)
DWORD size = PSIZE; DWORD size = PSIZE;
DWORD attributes; DWORD attributes;
isWinNT = (GetVersion() < 0x80000000) ? 1 : 0;
if (isWinNT)
result = MsiGetPropertyW(hInstall, L"TARGETDIR", wpath, &size); result = MsiGetPropertyW(hInstall, L"TARGETDIR", wpath, &size);
else
result = MsiGetPropertyA(hInstall, "TARGETDIR", path, &size);
if (result != ERROR_SUCCESS) if (result != ERROR_SUCCESS)
return result; return result;
wpath[size] = L'\0'; wpath[size] = L'\0';
path[size] = L'\0'; path[size] = L'\0';
if (isWinNT)
attributes = GetFileAttributesW(wpath); attributes = GetFileAttributesW(wpath);
else
attributes = GetFileAttributesA(path);
if (attributes == INVALID_FILE_ATTRIBUTES || if (attributes == INVALID_FILE_ATTRIBUTES ||
!(attributes & FILE_ATTRIBUTE_DIRECTORY)) !(attributes & FILE_ATTRIBUTE_DIRECTORY))
{ {

18
Tools/msi/msisupport.mak
View file

@ -1,25 +1,9 @@
!IF "$(CPU)" == ""
# VS environment
# /OPT: REF and ICF are added by VS.NET by default # /OPT: REF and ICF are added by VS.NET by default
# NOWIN98 saves 7k of executable size, at the expense of some
# slowdown on Win98
msisupport.dll: msisupport.obj msisupport.dll: msisupport.obj
link.exe /OUT:msisupport.dll /INCREMENTAL:NO /NOLOGO /DLL /MACHINE:X86 /SUBSYSTEM:WINDOWS /OPT:REF /OPT:ICF /OPT:NOWIN98 msisupport.obj msi.lib kernel32.lib link.exe /OUT:msisupport.dll /INCREMENTAL:NO /NOLOGO /DLL /SUBSYSTEM:WINDOWS /OPT:REF /OPT:ICF msisupport.obj msi.lib kernel32.lib
# We request a static CRT, so that there will be no CRT dependencies # We request a static CRT, so that there will be no CRT dependencies
# for the target system. We cannot do without a CRT, since it provides # for the target system. We cannot do without a CRT, since it provides
# the DLL entry point. # the DLL entry point.
msisupport.obj: msisupport.c msisupport.obj: msisupport.c
cl /O2 /D WIN32 /D NDEBUG /D _WINDOWS /MT /W3 /c msisupport.c cl /O2 /D WIN32 /D NDEBUG /D _WINDOWS /MT /W3 /c msisupport.c
!ELSE
# SDK environment: assume all options are already correct
msisupport.dll: msisupport.obj
link.exe /OUT:msisupport.dll /INCREMENTAL:NO /NOLOGO /DLL msisupport.obj msi.lib kernel32.lib
msisupport.obj: msisupport.c
cl /O2 /D WIN32 /D NDEBUG /D _WINDOWS /MD /W3 /GS- /c msisupport.c
!ENDIF