diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-09-25 12:22:02 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-09-25 12:22:02 +0000 |
| commit | 8ebe62781b62ec36890c01a0cae92149a59d71e9 (patch) | |
| tree | d789b103846b486b896fb463e36f68df4ebb74dd /python | |
| parent | 75fa944e86b69cb04f84df28501f310440feed7d (diff) | |
INTEGRATION: CWS obo05 (1.11.2); FILE MERGED
2006/07/03 08:13:33 obo 1.11.2.1: #i53611# .net 2005
Diffstat (limited to 'python')
| -rwxr-xr-x | python/Python-2.3.4.patch | 3712 |
1 files changed, 1308 insertions, 2404 deletions
diff --git a/python/Python-2.3.4.patch b/python/Python-2.3.4.patch index b840bac377f4..d25f4a081ee0 100755 --- a/python/Python-2.3.4.patch +++ b/python/Python-2.3.4.patch @@ -1,5 +1,5 @@ *** misc/Python-2.3.4/Makefile.pre.in Tue Nov 18 20:54:00 2003 ---- misc/build/Python-2.3.4/Makefile.pre.in Thu Sep 1 19:40:57 2005 +--- misc/build/Python-2.3.4/Makefile.pre.in Thu Jun 29 11:02:18 2006 *************** *** 114,123 **** RUNSHARED= @RUNSHARED@ @@ -66,7 +66,7 @@ # Install the manual page maninstall: *** misc/Python-2.3.4/configure Fri May 7 21:13:40 2004 ---- misc/build/Python-2.3.4/configure Thu Sep 1 19:40:57 2005 +--- misc/build/Python-2.3.4/configure Thu Jun 29 11:02:18 2006 *************** *** 1479,1490 **** --- 1479,1503 ---- @@ -150,7 +150,7 @@ fi ;; Darwin/*) LDSHARED='$(CC) $(LDFLAGS) -bundle' ---- 10099,10105 ---- +--- 10098,10104 ---- LDSHARED="$LDSHARED "'-framework $(PYTHONFRAMEWORK)' else # No framework. Ignore undefined symbols, assuming they come from Python @@ -168,7 +168,7 @@ fi ;; Linux*|GNU*) LDSHARED='$(CC) -shared';; dgux*) LDSHARED="ld -G";; ---- 10108,10115 ---- +--- 10107,10114 ---- LDSHARED="$LDSHARED "'-framework $(PYTHONFRAMEWORK)' else # No framework, use the Python app as bundle-loader @@ -179,7 +179,7 @@ dgux*) LDSHARED="ld -G";; *************** *** 10129,10134 **** ---- 10146,10152 ---- +--- 10145,10151 ---- case $ac_sys_system/$ac_sys_release in SunOS*) if test "$GCC" = yes; then CCSHARED="-fPIC"; @@ -196,7 +196,7 @@ atheos*) DYNLOADFILE="dynload_atheos.o";; *) # use dynload_shlib.c and dlopen() if we have it; otherwise stub ---- 13004,13010 ---- +--- 13003,13009 ---- ;; BeOS*) DYNLOADFILE="dynload_beos.o";; hp*|HP*) DYNLOADFILE="dynload_hpux.o";; @@ -204,744 +204,8 @@ atheos*) DYNLOADFILE="dynload_atheos.o";; *) # use dynload_shlib.c and dlopen() if we have it; otherwise stub -*** misc/Python-2.3.4/Lib/plat-freebsd6/IN.py Tue Aug 9 06:26:23 2005 ---- misc/build/Python-2.3.4/Lib/plat-freebsd6/IN.py Tue Aug 9 06:20:25 2005 -*************** -*** 0 **** ---- 1,355 ---- -+ # Generated by h2py from /usr/include/netinet/in.h -+ IPPROTO_IP = 0 -+ IPPROTO_HOPOPTS = 0 -+ IPPROTO_ICMP = 1 -+ IPPROTO_IGMP = 2 -+ IPPROTO_GGP = 3 -+ IPPROTO_IPV4 = 4 -+ IPPROTO_IPIP = IPPROTO_IPV4 -+ IPPROTO_TCP = 6 -+ IPPROTO_ST = 7 -+ IPPROTO_EGP = 8 -+ IPPROTO_PIGP = 9 -+ IPPROTO_RCCMON = 10 -+ IPPROTO_NVPII = 11 -+ IPPROTO_PUP = 12 -+ IPPROTO_ARGUS = 13 -+ IPPROTO_EMCON = 14 -+ IPPROTO_XNET = 15 -+ IPPROTO_CHAOS = 16 -+ IPPROTO_UDP = 17 -+ IPPROTO_MUX = 18 -+ IPPROTO_MEAS = 19 -+ IPPROTO_HMP = 20 -+ IPPROTO_PRM = 21 -+ IPPROTO_IDP = 22 -+ IPPROTO_TRUNK1 = 23 -+ IPPROTO_TRUNK2 = 24 -+ IPPROTO_LEAF1 = 25 -+ IPPROTO_LEAF2 = 26 -+ IPPROTO_RDP = 27 -+ IPPROTO_IRTP = 28 -+ IPPROTO_TP = 29 -+ IPPROTO_BLT = 30 -+ IPPROTO_NSP = 31 -+ IPPROTO_INP = 32 -+ IPPROTO_SEP = 33 -+ IPPROTO_3PC = 34 -+ IPPROTO_IDPR = 35 -+ IPPROTO_XTP = 36 -+ IPPROTO_DDP = 37 -+ IPPROTO_CMTP = 38 -+ IPPROTO_TPXX = 39 -+ IPPROTO_IL = 40 -+ IPPROTO_IPV6 = 41 -+ IPPROTO_SDRP = 42 -+ IPPROTO_ROUTING = 43 -+ IPPROTO_FRAGMENT = 44 -+ IPPROTO_IDRP = 45 -+ IPPROTO_RSVP = 46 -+ IPPROTO_GRE = 47 -+ IPPROTO_MHRP = 48 -+ IPPROTO_BHA = 49 -+ IPPROTO_ESP = 50 -+ IPPROTO_AH = 51 -+ IPPROTO_INLSP = 52 -+ IPPROTO_SWIPE = 53 -+ IPPROTO_NHRP = 54 -+ IPPROTO_ICMPV6 = 58 -+ IPPROTO_NONE = 59 -+ IPPROTO_DSTOPTS = 60 -+ IPPROTO_AHIP = 61 -+ IPPROTO_CFTP = 62 -+ IPPROTO_HELLO = 63 -+ IPPROTO_SATEXPAK = 64 -+ IPPROTO_KRYPTOLAN = 65 -+ IPPROTO_RVD = 66 -+ IPPROTO_IPPC = 67 -+ IPPROTO_ADFS = 68 -+ IPPROTO_SATMON = 69 -+ IPPROTO_VISA = 70 -+ IPPROTO_IPCV = 71 -+ IPPROTO_CPNX = 72 -+ IPPROTO_CPHB = 73 -+ IPPROTO_WSN = 74 -+ IPPROTO_PVP = 75 -+ IPPROTO_BRSATMON = 76 -+ IPPROTO_ND = 77 -+ IPPROTO_WBMON = 78 -+ IPPROTO_WBEXPAK = 79 -+ IPPROTO_EON = 80 -+ IPPROTO_VMTP = 81 -+ IPPROTO_SVMTP = 82 -+ IPPROTO_VINES = 83 -+ IPPROTO_TTP = 84 -+ IPPROTO_IGP = 85 -+ IPPROTO_DGP = 86 -+ IPPROTO_TCF = 87 -+ IPPROTO_IGRP = 88 -+ IPPROTO_OSPFIGP = 89 -+ IPPROTO_SRPC = 90 -+ IPPROTO_LARP = 91 -+ IPPROTO_MTP = 92 -+ IPPROTO_AX25 = 93 -+ IPPROTO_IPEIP = 94 -+ IPPROTO_MICP = 95 -+ IPPROTO_SCCSP = 96 -+ IPPROTO_ETHERIP = 97 -+ IPPROTO_ENCAP = 98 -+ IPPROTO_APES = 99 -+ IPPROTO_GMTP = 100 -+ IPPROTO_IPCOMP = 108 -+ IPPROTO_PIM = 103 -+ IPPROTO_PGM = 113 -+ IPPROTO_DIVERT = 254 -+ IPPROTO_RAW = 255 -+ IPPROTO_MAX = 256 -+ IPPROTO_DONE = 257 -+ IPPORT_RESERVED = 1024 -+ IPPORT_USERRESERVED = 5000 -+ IPPORT_HIFIRSTAUTO = 49152 -+ IPPORT_HILASTAUTO = 65535 -+ IPPORT_RESERVEDSTART = 600 -+ def IN_CLASSA(i): return (((u_int32_t)(i) & 0x80000000) == 0) -+ -+ IN_CLASSA_NET = 0xff000000 -+ IN_CLASSA_NSHIFT = 24 -+ IN_CLASSA_HOST = 0x00ffffff -+ IN_CLASSA_MAX = 128 -+ def IN_CLASSB(i): return (((u_int32_t)(i) & 0xc0000000) == 0x80000000) -+ -+ IN_CLASSB_NET = 0xffff0000 -+ IN_CLASSB_NSHIFT = 16 -+ IN_CLASSB_HOST = 0x0000ffff -+ IN_CLASSB_MAX = 65536 -+ def IN_CLASSC(i): return (((u_int32_t)(i) & 0xe0000000) == 0xc0000000) -+ -+ IN_CLASSC_NET = 0xffffff00 -+ IN_CLASSC_NSHIFT = 8 -+ IN_CLASSC_HOST = 0x000000ff -+ def IN_CLASSD(i): return (((u_int32_t)(i) & 0xf0000000) == 0xe0000000) -+ -+ IN_CLASSD_NET = 0xf0000000 -+ IN_CLASSD_NSHIFT = 28 -+ IN_CLASSD_HOST = 0x0fffffff -+ def IN_MULTICAST(i): return IN_CLASSD(i) -+ -+ def IN_EXPERIMENTAL(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000) -+ -+ def IN_BADCLASS(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000) -+ -+ INADDR_NONE = 0xffffffff -+ IN_LOOPBACKNET = 127 -+ INET_ADDRSTRLEN = 16 -+ IP_OPTIONS = 1 -+ IP_HDRINCL = 2 -+ IP_TOS = 3 -+ IP_TTL = 4 -+ IP_RECVOPTS = 5 -+ IP_RECVRETOPTS = 6 -+ IP_RECVDSTADDR = 7 -+ IP_RETOPTS = 8 -+ IP_MULTICAST_IF = 9 -+ IP_MULTICAST_TTL = 10 -+ IP_MULTICAST_LOOP = 11 -+ IP_ADD_MEMBERSHIP = 12 -+ IP_DROP_MEMBERSHIP = 13 -+ IP_MULTICAST_VIF = 14 -+ IP_RSVP_ON = 15 -+ IP_RSVP_OFF = 16 -+ IP_RSVP_VIF_ON = 17 -+ IP_RSVP_VIF_OFF = 18 -+ IP_PORTRANGE = 19 -+ IP_RECVIF = 20 -+ IP_IPSEC_POLICY = 21 -+ IP_FAITH = 22 -+ IP_FW_ADD = 50 -+ IP_FW_DEL = 51 -+ IP_FW_FLUSH = 52 -+ IP_FW_ZERO = 53 -+ IP_FW_GET = 54 -+ IP_FW_RESETLOG = 55 -+ IP_DUMMYNET_CONFIGURE = 60 -+ IP_DUMMYNET_DEL = 61 -+ IP_DUMMYNET_FLUSH = 62 -+ IP_DUMMYNET_GET = 64 -+ IP_DEFAULT_MULTICAST_TTL = 1 -+ IP_DEFAULT_MULTICAST_LOOP = 1 -+ IP_MAX_MEMBERSHIPS = 20 -+ IP_PORTRANGE_DEFAULT = 0 -+ IP_PORTRANGE_HIGH = 1 -+ IP_PORTRANGE_LOW = 2 -+ IPPROTO_MAXID = (IPPROTO_AH + 1) -+ IPCTL_FORWARDING = 1 -+ IPCTL_SENDREDIRECTS = 2 -+ IPCTL_DEFTTL = 3 -+ IPCTL_DEFMTU = 4 -+ IPCTL_RTEXPIRE = 5 -+ IPCTL_RTMINEXPIRE = 6 -+ IPCTL_RTMAXCACHE = 7 -+ IPCTL_SOURCEROUTE = 8 -+ IPCTL_DIRECTEDBROADCAST = 9 -+ IPCTL_INTRQMAXLEN = 10 -+ IPCTL_INTRQDROPS = 11 -+ IPCTL_STATS = 12 -+ IPCTL_ACCEPTSOURCEROUTE = 13 -+ IPCTL_FASTFORWARDING = 14 -+ IPCTL_KEEPFAITH = 15 -+ IPCTL_GIF_TTL = 16 -+ IPCTL_MAXID = 17 -+ -+ # Included from netinet6/in6.h -+ -+ # Included from sys/queue.h -+ def SLIST_HEAD_INITIALIZER(head): return \ -+ -+ def SLIST_ENTRY(type): return \ -+ -+ def STAILQ_HEAD_INITIALIZER(head): return \ -+ -+ def STAILQ_ENTRY(type): return \ -+ -+ def LIST_HEAD_INITIALIZER(head): return \ -+ -+ def LIST_ENTRY(type): return \ -+ -+ def TAILQ_HEAD_INITIALIZER(head): return \ -+ -+ def TAILQ_ENTRY(type): return \ -+ -+ def CIRCLEQ_ENTRY(type): return \ -+ -+ __KAME_VERSION = "20000701/FreeBSD-current" -+ IPV6PORT_RESERVED = 1024 -+ IPV6PORT_ANONMIN = 49152 -+ IPV6PORT_ANONMAX = 65535 -+ IPV6PORT_RESERVEDMIN = 600 -+ IPV6PORT_RESERVEDMAX = (IPV6PORT_RESERVED-1) -+ INET6_ADDRSTRLEN = 46 -+ IPV6_ADDR_INT32_ONE = 1 -+ IPV6_ADDR_INT32_TWO = 2 -+ IPV6_ADDR_INT32_MNL = 0xff010000 -+ IPV6_ADDR_INT32_MLL = 0xff020000 -+ IPV6_ADDR_INT32_SMP = 0x0000ffff -+ IPV6_ADDR_INT16_ULL = 0xfe80 -+ IPV6_ADDR_INT16_USL = 0xfec0 -+ IPV6_ADDR_INT16_MLL = 0xff02 -+ IPV6_ADDR_INT32_ONE = 0x01000000 -+ IPV6_ADDR_INT32_TWO = 0x02000000 -+ IPV6_ADDR_INT32_MNL = 0x000001ff -+ IPV6_ADDR_INT32_MLL = 0x000002ff -+ IPV6_ADDR_INT32_SMP = 0xffff0000 -+ IPV6_ADDR_INT16_ULL = 0x80fe -+ IPV6_ADDR_INT16_USL = 0xc0fe -+ IPV6_ADDR_INT16_MLL = 0x02ff -+ def IN6_IS_ADDR_UNSPECIFIED(a): return \ -+ -+ def IN6_IS_ADDR_LOOPBACK(a): return \ -+ -+ def IN6_IS_ADDR_V4COMPAT(a): return \ -+ -+ def IN6_IS_ADDR_V4MAPPED(a): return \ -+ -+ IPV6_ADDR_SCOPE_NODELOCAL = 0x01 -+ IPV6_ADDR_SCOPE_LINKLOCAL = 0x02 -+ IPV6_ADDR_SCOPE_SITELOCAL = 0x05 -+ IPV6_ADDR_SCOPE_ORGLOCAL = 0x08 -+ IPV6_ADDR_SCOPE_GLOBAL = 0x0e -+ __IPV6_ADDR_SCOPE_NODELOCAL = 0x01 -+ __IPV6_ADDR_SCOPE_LINKLOCAL = 0x02 -+ __IPV6_ADDR_SCOPE_SITELOCAL = 0x05 -+ __IPV6_ADDR_SCOPE_ORGLOCAL = 0x08 -+ __IPV6_ADDR_SCOPE_GLOBAL = 0x0e -+ def IN6_IS_ADDR_LINKLOCAL(a): return \ -+ -+ def IN6_IS_ADDR_SITELOCAL(a): return \ -+ -+ def IN6_IS_ADDR_MC_NODELOCAL(a): return \ -+ -+ def IN6_IS_ADDR_MC_LINKLOCAL(a): return \ -+ -+ def IN6_IS_ADDR_MC_SITELOCAL(a): return \ -+ -+ def IN6_IS_ADDR_MC_ORGLOCAL(a): return \ -+ -+ def IN6_IS_ADDR_MC_GLOBAL(a): return \ -+ -+ def IN6_IS_ADDR_MC_NODELOCAL(a): return \ -+ -+ def IN6_IS_ADDR_MC_LINKLOCAL(a): return \ -+ -+ def IN6_IS_ADDR_MC_SITELOCAL(a): return \ -+ -+ def IN6_IS_ADDR_MC_ORGLOCAL(a): return \ -+ -+ def IN6_IS_ADDR_MC_GLOBAL(a): return \ -+ -+ def IN6_IS_SCOPE_LINKLOCAL(a): return \ -+ -+ IPV6_OPTIONS = 1 -+ IPV6_RECVOPTS = 5 -+ IPV6_RECVRETOPTS = 6 -+ IPV6_RECVDSTADDR = 7 -+ IPV6_RETOPTS = 8 -+ IPV6_SOCKOPT_RESERVED1 = 3 -+ IPV6_UNICAST_HOPS = 4 -+ IPV6_MULTICAST_IF = 9 -+ IPV6_MULTICAST_HOPS = 10 -+ IPV6_MULTICAST_LOOP = 11 -+ IPV6_JOIN_GROUP = 12 -+ IPV6_LEAVE_GROUP = 13 -+ IPV6_PORTRANGE = 14 -+ ICMP6_FILTER = 18 -+ IPV6_PKTINFO = 19 -+ IPV6_HOPLIMIT = 20 -+ IPV6_NEXTHOP = 21 -+ IPV6_HOPOPTS = 22 -+ IPV6_DSTOPTS = 23 -+ IPV6_RTHDR = 24 -+ IPV6_PKTOPTIONS = 25 -+ IPV6_CHECKSUM = 26 -+ IPV6_BINDV6ONLY = 27 -+ IPV6_IPSEC_POLICY = 28 -+ IPV6_FAITH = 29 -+ IPV6_FW_ADD = 30 -+ IPV6_FW_DEL = 31 -+ IPV6_FW_FLUSH = 32 -+ IPV6_FW_ZERO = 33 -+ IPV6_FW_GET = 34 -+ IPV6_RTHDR_LOOSE = 0 -+ IPV6_RTHDR_STRICT = 1 -+ IPV6_RTHDR_TYPE_0 = 0 -+ IPV6_DEFAULT_MULTICAST_HOPS = 1 -+ IPV6_DEFAULT_MULTICAST_LOOP = 1 -+ IPV6_PORTRANGE_DEFAULT = 0 -+ IPV6_PORTRANGE_HIGH = 1 -+ IPV6_PORTRANGE_LOW = 2 -+ IPV6PROTO_MAXID = (IPPROTO_PIM + 1) -+ IPV6CTL_FORWARDING = 1 -+ IPV6CTL_SENDREDIRECTS = 2 -+ IPV6CTL_DEFHLIM = 3 -+ IPV6CTL_DEFMTU = 4 -+ IPV6CTL_FORWSRCRT = 5 -+ IPV6CTL_STATS = 6 -+ IPV6CTL_MRTSTATS = 7 -+ IPV6CTL_MRTPROTO = 8 -+ IPV6CTL_MAXFRAGPACKETS = 9 -+ IPV6CTL_SOURCECHECK = 10 -+ IPV6CTL_SOURCECHECK_LOGINT = 11 -+ IPV6CTL_ACCEPT_RTADV = 12 -+ IPV6CTL_KEEPFAITH = 13 -+ IPV6CTL_LOG_INTERVAL = 14 -+ IPV6CTL_HDRNESTLIMIT = 15 -+ IPV6CTL_DAD_COUNT = 16 -+ IPV6CTL_AUTO_FLOWLABEL = 17 -+ IPV6CTL_DEFMCASTHLIM = 18 -+ IPV6CTL_GIF_HLIM = 19 -+ IPV6CTL_KAME_VERSION = 20 -+ IPV6CTL_USE_DEPRECATED = 21 -+ IPV6CTL_RR_PRUNE = 22 -+ IPV6CTL_MAPPED_ADDR = 23 -+ IPV6CTL_BINDV6ONLY = 24 -+ IPV6CTL_RTEXPIRE = 25 -+ IPV6CTL_RTMINEXPIRE = 26 -+ IPV6CTL_RTMAXCACHE = 27 -+ IPV6CTL_MAXID = 28 -*** misc/Python-2.3.4/Lib/plat-freebsd6/regen Tue Aug 9 06:26:27 2005 ---- misc/build/Python-2.3.4/Lib/plat-freebsd6/regen Tue Aug 9 06:19:02 2005 -*************** -*** 0 **** ---- 1,3 ---- -+ #! /bin/sh -+ set -v -+ python ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h -*** misc/Python-2.3.4/Lib/plat-freebsd7/IN.py Tue Aug 9 06:26:23 2005 ---- misc/build/Python-2.3.4/Lib/plat-freebsd7/IN.py Tue Aug 9 06:20:25 2005 -*************** -*** 0 **** ---- 1,355 ---- -+ # Generated by h2py from /usr/include/netinet/in.h -+ IPPROTO_IP = 0 -+ IPPROTO_HOPOPTS = 0 -+ IPPROTO_ICMP = 1 -+ IPPROTO_IGMP = 2 -+ IPPROTO_GGP = 3 -+ IPPROTO_IPV4 = 4 -+ IPPROTO_IPIP = IPPROTO_IPV4 -+ IPPROTO_TCP = 6 -+ IPPROTO_ST = 7 -+ IPPROTO_EGP = 8 -+ IPPROTO_PIGP = 9 -+ IPPROTO_RCCMON = 10 -+ IPPROTO_NVPII = 11 -+ IPPROTO_PUP = 12 -+ IPPROTO_ARGUS = 13 -+ IPPROTO_EMCON = 14 -+ IPPROTO_XNET = 15 -+ IPPROTO_CHAOS = 16 -+ IPPROTO_UDP = 17 -+ IPPROTO_MUX = 18 -+ IPPROTO_MEAS = 19 -+ IPPROTO_HMP = 20 -+ IPPROTO_PRM = 21 -+ IPPROTO_IDP = 22 -+ IPPROTO_TRUNK1 = 23 -+ IPPROTO_TRUNK2 = 24 -+ IPPROTO_LEAF1 = 25 -+ IPPROTO_LEAF2 = 26 -+ IPPROTO_RDP = 27 -+ IPPROTO_IRTP = 28 -+ IPPROTO_TP = 29 -+ IPPROTO_BLT = 30 -+ IPPROTO_NSP = 31 -+ IPPROTO_INP = 32 -+ IPPROTO_SEP = 33 -+ IPPROTO_3PC = 34 -+ IPPROTO_IDPR = 35 -+ IPPROTO_XTP = 36 -+ IPPROTO_DDP = 37 -+ IPPROTO_CMTP = 38 -+ IPPROTO_TPXX = 39 -+ IPPROTO_IL = 40 -+ IPPROTO_IPV6 = 41 -+ IPPROTO_SDRP = 42 -+ IPPROTO_ROUTING = 43 -+ IPPROTO_FRAGMENT = 44 -+ IPPROTO_IDRP = 45 -+ IPPROTO_RSVP = 46 -+ IPPROTO_GRE = 47 -+ IPPROTO_MHRP = 48 -+ IPPROTO_BHA = 49 -+ IPPROTO_ESP = 50 -+ IPPROTO_AH = 51 -+ IPPROTO_INLSP = 52 -+ IPPROTO_SWIPE = 53 -+ IPPROTO_NHRP = 54 -+ IPPROTO_ICMPV6 = 58 -+ IPPROTO_NONE = 59 -+ IPPROTO_DSTOPTS = 60 -+ IPPROTO_AHIP = 61 -+ IPPROTO_CFTP = 62 -+ IPPROTO_HELLO = 63 -+ IPPROTO_SATEXPAK = 64 -+ IPPROTO_KRYPTOLAN = 65 -+ IPPROTO_RVD = 66 -+ IPPROTO_IPPC = 67 -+ IPPROTO_ADFS = 68 -+ IPPROTO_SATMON = 69 -+ IPPROTO_VISA = 70 -+ IPPROTO_IPCV = 71 -+ IPPROTO_CPNX = 72 -+ IPPROTO_CPHB = 73 -+ IPPROTO_WSN = 74 -+ IPPROTO_PVP = 75 -+ IPPROTO_BRSATMON = 76 -+ IPPROTO_ND = 77 -+ IPPROTO_WBMON = 78 -+ IPPROTO_WBEXPAK = 79 -+ IPPROTO_EON = 80 -+ IPPROTO_VMTP = 81 -+ IPPROTO_SVMTP = 82 -+ IPPROTO_VINES = 83 -+ IPPROTO_TTP = 84 -+ IPPROTO_IGP = 85 -+ IPPROTO_DGP = 86 -+ IPPROTO_TCF = 87 -+ IPPROTO_IGRP = 88 -+ IPPROTO_OSPFIGP = 89 -+ IPPROTO_SRPC = 90 -+ IPPROTO_LARP = 91 -+ IPPROTO_MTP = 92 -+ IPPROTO_AX25 = 93 -+ IPPROTO_IPEIP = 94 -+ IPPROTO_MICP = 95 -+ IPPROTO_SCCSP = 96 -+ IPPROTO_ETHERIP = 97 -+ IPPROTO_ENCAP = 98 -+ IPPROTO_APES = 99 -+ IPPROTO_GMTP = 100 -+ IPPROTO_IPCOMP = 108 -+ IPPROTO_PIM = 103 -+ IPPROTO_PGM = 113 -+ IPPROTO_DIVERT = 254 -+ IPPROTO_RAW = 255 -+ IPPROTO_MAX = 256 -+ IPPROTO_DONE = 257 -+ IPPORT_RESERVED = 1024 -+ IPPORT_USERRESERVED = 5000 -+ IPPORT_HIFIRSTAUTO = 49152 -+ IPPORT_HILASTAUTO = 65535 -+ IPPORT_RESERVEDSTART = 600 -+ def IN_CLASSA(i): return (((u_int32_t)(i) & 0x80000000) == 0) -+ -+ IN_CLASSA_NET = 0xff000000 -+ IN_CLASSA_NSHIFT = 24 -+ IN_CLASSA_HOST = 0x00ffffff -+ IN_CLASSA_MAX = 128 -+ def IN_CLASSB(i): return (((u_int32_t)(i) & 0xc0000000) == 0x80000000) -+ -+ IN_CLASSB_NET = 0xffff0000 -+ IN_CLASSB_NSHIFT = 16 -+ IN_CLASSB_HOST = 0x0000ffff -+ IN_CLASSB_MAX = 65536 -+ def IN_CLASSC(i): return (((u_int32_t)(i) & 0xe0000000) == 0xc0000000) -+ -+ IN_CLASSC_NET = 0xffffff00 -+ IN_CLASSC_NSHIFT = 8 -+ IN_CLASSC_HOST = 0x000000ff -+ def IN_CLASSD(i): return (((u_int32_t)(i) & 0xf0000000) == 0xe0000000) -+ -+ IN_CLASSD_NET = 0xf0000000 -+ IN_CLASSD_NSHIFT = 28 -+ IN_CLASSD_HOST = 0x0fffffff -+ def IN_MULTICAST(i): return IN_CLASSD(i) -+ -+ def IN_EXPERIMENTAL(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000) -+ -+ def IN_BADCLASS(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000) -+ -+ INADDR_NONE = 0xffffffff -+ IN_LOOPBACKNET = 127 -+ INET_ADDRSTRLEN = 16 -+ IP_OPTIONS = 1 -+ IP_HDRINCL = 2 -+ IP_TOS = 3 -+ IP_TTL = 4 -+ IP_RECVOPTS = 5 -+ IP_RECVRETOPTS = 6 -+ IP_RECVDSTADDR = 7 -+ IP_RETOPTS = 8 -+ IP_MULTICAST_IF = 9 -+ IP_MULTICAST_TTL = 10 -+ IP_MULTICAST_LOOP = 11 -+ IP_ADD_MEMBERSHIP = 12 -+ IP_DROP_MEMBERSHIP = 13 -+ IP_MULTICAST_VIF = 14 -+ IP_RSVP_ON = 15 -+ IP_RSVP_OFF = 16 -+ IP_RSVP_VIF_ON = 17 -+ IP_RSVP_VIF_OFF = 18 -+ IP_PORTRANGE = 19 -+ IP_RECVIF = 20 -+ IP_IPSEC_POLICY = 21 -+ IP_FAITH = 22 -+ IP_FW_ADD = 50 -+ IP_FW_DEL = 51 -+ IP_FW_FLUSH = 52 -+ IP_FW_ZERO = 53 -+ IP_FW_GET = 54 -+ IP_FW_RESETLOG = 55 -+ IP_DUMMYNET_CONFIGURE = 60 -+ IP_DUMMYNET_DEL = 61 -+ IP_DUMMYNET_FLUSH = 62 -+ IP_DUMMYNET_GET = 64 -+ IP_DEFAULT_MULTICAST_TTL = 1 -+ IP_DEFAULT_MULTICAST_LOOP = 1 -+ IP_MAX_MEMBERSHIPS = 20 -+ IP_PORTRANGE_DEFAULT = 0 -+ IP_PORTRANGE_HIGH = 1 -+ IP_PORTRANGE_LOW = 2 -+ IPPROTO_MAXID = (IPPROTO_AH + 1) -+ IPCTL_FORWARDING = 1 -+ IPCTL_SENDREDIRECTS = 2 -+ IPCTL_DEFTTL = 3 -+ IPCTL_DEFMTU = 4 -+ IPCTL_RTEXPIRE = 5 -+ IPCTL_RTMINEXPIRE = 6 -+ IPCTL_RTMAXCACHE = 7 -+ IPCTL_SOURCEROUTE = 8 -+ IPCTL_DIRECTEDBROADCAST = 9 -+ IPCTL_INTRQMAXLEN = 10 -+ IPCTL_INTRQDROPS = 11 -+ IPCTL_STATS = 12 -+ IPCTL_ACCEPTSOURCEROUTE = 13 -+ IPCTL_FASTFORWARDING = 14 -+ IPCTL_KEEPFAITH = 15 -+ IPCTL_GIF_TTL = 16 -+ IPCTL_MAXID = 17 -+ -+ # Included from netinet6/in6.h -+ -+ # Included from sys/queue.h -+ def SLIST_HEAD_INITIALIZER(head): return \ -+ -+ def SLIST_ENTRY(type): return \ -+ -+ def STAILQ_HEAD_INITIALIZER(head): return \ -+ -+ def STAILQ_ENTRY(type): return \ -+ -+ def LIST_HEAD_INITIALIZER(head): return \ -+ -+ def LIST_ENTRY(type): return \ -+ -+ def TAILQ_HEAD_INITIALIZER(head): return \ -+ -+ def TAILQ_ENTRY(type): return \ -+ -+ def CIRCLEQ_ENTRY(type): return \ -+ -+ __KAME_VERSION = "20000701/FreeBSD-current" -+ IPV6PORT_RESERVED = 1024 -+ IPV6PORT_ANONMIN = 49152 -+ IPV6PORT_ANONMAX = 65535 -+ IPV6PORT_RESERVEDMIN = 600 -+ IPV6PORT_RESERVEDMAX = (IPV6PORT_RESERVED-1) -+ INET6_ADDRSTRLEN = 46 -+ IPV6_ADDR_INT32_ONE = 1 -+ IPV6_ADDR_INT32_TWO = 2 -+ IPV6_ADDR_INT32_MNL = 0xff010000 -+ IPV6_ADDR_INT32_MLL = 0xff020000 -+ IPV6_ADDR_INT32_SMP = 0x0000ffff -+ IPV6_ADDR_INT16_ULL = 0xfe80 -+ IPV6_ADDR_INT16_USL = 0xfec0 -+ IPV6_ADDR_INT16_MLL = 0xff02 -+ IPV6_ADDR_INT32_ONE = 0x01000000 -+ IPV6_ADDR_INT32_TWO = 0x02000000 -+ IPV6_ADDR_INT32_MNL = 0x000001ff -+ IPV6_ADDR_INT32_MLL = 0x000002ff -+ IPV6_ADDR_INT32_SMP = 0xffff0000 -+ IPV6_ADDR_INT16_ULL = 0x80fe -+ IPV6_ADDR_INT16_USL = 0xc0fe -+ IPV6_ADDR_INT16_MLL = 0x02ff -+ def IN6_IS_ADDR_UNSPECIFIED(a): return \ -+ -+ def IN6_IS_ADDR_LOOPBACK(a): return \ -+ -+ def IN6_IS_ADDR_V4COMPAT(a): return \ -+ -+ def IN6_IS_ADDR_V4MAPPED(a): return \ -+ -+ IPV6_ADDR_SCOPE_NODELOCAL = 0x01 -+ IPV6_ADDR_SCOPE_LINKLOCAL = 0x02 -+ IPV6_ADDR_SCOPE_SITELOCAL = 0x05 -+ IPV6_ADDR_SCOPE_ORGLOCAL = 0x08 -+ IPV6_ADDR_SCOPE_GLOBAL = 0x0e -+ __IPV6_ADDR_SCOPE_NODELOCAL = 0x01 -+ __IPV6_ADDR_SCOPE_LINKLOCAL = 0x02 -+ __IPV6_ADDR_SCOPE_SITELOCAL = 0x05 -+ __IPV6_ADDR_SCOPE_ORGLOCAL = 0x08 -+ __IPV6_ADDR_SCOPE_GLOBAL = 0x0e -+ def IN6_IS_ADDR_LINKLOCAL(a): return \ -+ -+ def IN6_IS_ADDR_SITELOCAL(a): return \ -+ -+ def IN6_IS_ADDR_MC_NODELOCAL(a): return \ -+ -+ def IN6_IS_ADDR_MC_LINKLOCAL(a): return \ -+ -+ def IN6_IS_ADDR_MC_SITELOCAL(a): return \ -+ -+ def IN6_IS_ADDR_MC_ORGLOCAL(a): return \ -+ -+ def IN6_IS_ADDR_MC_GLOBAL(a): return \ -+ -+ def IN6_IS_ADDR_MC_NODELOCAL(a): return \ -+ -+ def IN6_IS_ADDR_MC_LINKLOCAL(a): return \ -+ -+ def IN6_IS_ADDR_MC_SITELOCAL(a): return \ -+ -+ def IN6_IS_ADDR_MC_ORGLOCAL(a): return \ -+ -+ def IN6_IS_ADDR_MC_GLOBAL(a): return \ -+ -+ def IN6_IS_SCOPE_LINKLOCAL(a): return \ -+ -+ IPV6_OPTIONS = 1 -+ IPV6_RECVOPTS = 5 -+ IPV6_RECVRETOPTS = 6 -+ IPV6_RECVDSTADDR = 7 -+ IPV6_RETOPTS = 8 -+ IPV6_SOCKOPT_RESERVED1 = 3 -+ IPV6_UNICAST_HOPS = 4 -+ IPV6_MULTICAST_IF = 9 -+ IPV6_MULTICAST_HOPS = 10 -+ IPV6_MULTICAST_LOOP = 11 -+ IPV6_JOIN_GROUP = 12 -+ IPV6_LEAVE_GROUP = 13 -+ IPV6_PORTRANGE = 14 -+ ICMP6_FILTER = 18 -+ IPV6_PKTINFO = 19 -+ IPV6_HOPLIMIT = 20 -+ IPV6_NEXTHOP = 21 -+ IPV6_HOPOPTS = 22 -+ IPV6_DSTOPTS = 23 -+ IPV6_RTHDR = 24 -+ IPV6_PKTOPTIONS = 25 -+ IPV6_CHECKSUM = 26 -+ IPV6_BINDV6ONLY = 27 -+ IPV6_IPSEC_POLICY = 28 -+ IPV6_FAITH = 29 -+ IPV6_FW_ADD = 30 -+ IPV6_FW_DEL = 31 -+ IPV6_FW_FLUSH = 32 -+ IPV6_FW_ZERO = 33 -+ IPV6_FW_GET = 34 -+ IPV6_RTHDR_LOOSE = 0 -+ IPV6_RTHDR_STRICT = 1 -+ IPV6_RTHDR_TYPE_0 = 0 -+ IPV6_DEFAULT_MULTICAST_HOPS = 1 -+ IPV6_DEFAULT_MULTICAST_LOOP = 1 -+ IPV6_PORTRANGE_DEFAULT = 0 -+ IPV6_PORTRANGE_HIGH = 1 -+ IPV6_PORTRANGE_LOW = 2 -+ IPV6PROTO_MAXID = (IPPROTO_PIM + 1) -+ IPV6CTL_FORWARDING = 1 -+ IPV6CTL_SENDREDIRECTS = 2 -+ IPV6CTL_DEFHLIM = 3 -+ IPV6CTL_DEFMTU = 4 -+ IPV6CTL_FORWSRCRT = 5 -+ IPV6CTL_STATS = 6 -+ IPV6CTL_MRTSTATS = 7 -+ IPV6CTL_MRTPROTO = 8 -+ IPV6CTL_MAXFRAGPACKETS = 9 -+ IPV6CTL_SOURCECHECK = 10 -+ IPV6CTL_SOURCECHECK_LOGINT = 11 -+ IPV6CTL_ACCEPT_RTADV = 12 -+ IPV6CTL_KEEPFAITH = 13 -+ IPV6CTL_LOG_INTERVAL = 14 -+ IPV6CTL_HDRNESTLIMIT = 15 -+ IPV6CTL_DAD_COUNT = 16 -+ IPV6CTL_AUTO_FLOWLABEL = 17 -+ IPV6CTL_DEFMCASTHLIM = 18 -+ IPV6CTL_GIF_HLIM = 19 -+ IPV6CTL_KAME_VERSION = 20 -+ IPV6CTL_USE_DEPRECATED = 21 -+ IPV6CTL_RR_PRUNE = 22 -+ IPV6CTL_MAPPED_ADDR = 23 -+ IPV6CTL_BINDV6ONLY = 24 -+ IPV6CTL_RTEXPIRE = 25 -+ IPV6CTL_RTMINEXPIRE = 26 -+ IPV6CTL_RTMAXCACHE = 27 -+ IPV6CTL_MAXID = 28 -*** misc/Python-2.3.4/Lib/plat-freebsd7/regen Tue Aug 9 06:26:27 2005 ---- misc/build/Python-2.3.4/Lib/plat-freebsd7/regen Tue Aug 9 06:19:02 2005 -*************** -*** 0 **** ---- 1,3 ---- -+ #! /bin/sh -+ set -v -+ python ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h *** misc/Python-2.3.4/configure.in Fri May 7 21:13:47 2004 ---- misc/build/Python-2.3.4/configure.in Thu Sep 1 19:40:57 2005 +--- misc/build/Python-2.3.4/configure.in Thu Jun 29 11:02:18 2006 *************** *** 174,182 **** # several APIs are not declared. Since this is also needed in some @@ -977,7 +241,7 @@ # *** misc/Python-2.3.4/Include/pyport.h Tue Sep 30 16:56:50 2003 ---- misc/build/Python-2.3.4/Include/pyport.h Thu Sep 1 19:40:57 2005 +--- misc/build/Python-2.3.4/Include/pyport.h Thu Jun 29 11:02:18 2006 *************** *** 346,356 **** in platform-specific #ifdefs. @@ -993,7 +257,7 @@ /* It's in the libs, but not the headers... - [cjh] */ --- 346,351 ---- *** misc/Python-2.3.4/Mac/OSX/Makefile Tue Nov 4 23:45:16 2003 ---- misc/build/Python-2.3.4/Mac/OSX/Makefile Thu Sep 1 19:40:57 2005 +--- misc/build/Python-2.3.4/Mac/OSX/Makefile Thu Jun 29 11:02:18 2006 *************** *** 26,33 **** INSTALLED_PYTHONW=$(APPINSTALLDIR)/Contents/MacOS/Python @@ -1014,7 +278,7 @@ INSTALL_SYMLINK=ln -fsn INSTALL_PROGRAM=${INSTALL} *** misc/Python-2.3.4/Misc/setuid-prog.c Thu Sep 10 22:18:09 1998 ---- misc/build/Python-2.3.4/Misc/setuid-prog.c Thu Sep 1 19:40:57 2005 +--- misc/build/Python-2.3.4/Misc/setuid-prog.c Thu Jun 29 11:02:19 2006 *************** *** 70,75 **** --- 70,81 ---- @@ -1031,7 +295,7 @@ char def_IFS[] = "IFS= \t\n"; /* you may want to change def_PATH, but you should really change it in */ *** misc/Python-2.3.4/Modules/posixmodule.c Tue May 4 10:07:49 2004 ---- misc/build/Python-2.3.4/Modules/posixmodule.c Thu Sep 1 19:40:58 2005 +--- misc/build/Python-2.3.4/Modules/posixmodule.c Thu Jun 29 11:02:19 2006 *************** *** 304,310 **** #endif @@ -1066,8 +330,8 @@ if (environ == NULL) environ = *_NSGetEnviron(); #endif -*** misc/Python-2.3.4/PCbuild/_bsddb.dep Thu Sep 1 19:41:43 2005 ---- misc/build/Python-2.3.4/PCbuild/_bsddb.dep Thu Sep 1 19:40:58 2005 +*** misc/Python-2.3.4/PCbuild/_bsddb.dep Thu Jun 29 12:10:03 2006 +--- misc/build/Python-2.3.4/PCbuild/_bsddb.dep Thu Jun 29 11:02:19 2006 *************** *** 1 **** ! dummy @@ -1120,38 +384,17 @@ ! "..\PC\pyconfig.h"\ ! {$(INCLUDE)}"basetsd.h"\ ! -*** misc/Python-2.3.4/PCbuild/_bsddb.mak Thu Sep 1 19:41:42 2005 ---- misc/build/Python-2.3.4/PCbuild/_bsddb.mak Thu Sep 1 19:40:58 2005 +*** misc/Python-2.3.4/PCbuild/_bsddb.mak Thu Jun 29 12:10:03 2006 +--- misc/build/Python-2.3.4/PCbuild/_bsddb.mak Thu Jun 29 16:33:48 2006 *************** *** 1 **** ! dummy ---- 1,255 ---- -! # Microsoft Developer Studio Generated NMAKE File, Based on _bsddb.dsp +--- 1,238 ---- ! !IF "$(CFG)" == "" ! CFG=_bsddb - Win32 Release -! !MESSAGE Keine Konfiguration angegeben. _bsddb - Win32 Release wird als Standard verwendet. -! !ENDIF +! !ENDIF ! -! !IF "$(CFG)" != "_bsddb - Win32 Release" && "$(CFG)" != "_bsddb - Win32 Debug" -! !MESSAGE Ungltige Konfiguration "$(CFG)" angegeben. -! !MESSAGE Sie k”nnen beim Ausfhren von NMAKE eine Konfiguration angeben -! !MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel: -! !MESSAGE -! !MESSAGE NMAKE /f "_bsddb.mak" CFG="_bsddb - Win32 Release" -! !MESSAGE -! !MESSAGE Fr die Konfiguration stehen zur Auswahl: -! !MESSAGE -! !MESSAGE "_bsddb - Win32 Release" (basierend auf "Win32 (x86) Dynamic-Link Library") -! !MESSAGE "_bsddb - Win32 Debug" (basierend auf "Win32 (x86) Dynamic-Link Library") -! !MESSAGE -! !ERROR Eine ungltige Konfiguration wurde angegeben. -! !ENDIF -! -! !IF "$(OS)" == "Windows_NT" ! NULL= -! !ELSE -! NULL=nul -! !ENDIF ! ! !IF "$(CFG)" == "_bsddb - Win32 Release" ! @@ -1161,21 +404,21 @@ ! OutDir=.\. ! # End Custom Macros ! -! !IF "$(RECURSE)" == "0" +! !IF "$(RECURSE)" == "0" ! ! ALL : "$(OUTDIR)\_bsddb.pyd" ! -! !ELSE +! !ELSE ! ! ALL : "pythoncore - Win32 Release" "$(OUTDIR)\_bsddb.pyd" ! -! !ENDIF +! !ENDIF ! -! !IF "$(RECURSE)" == "1" -! CLEAN :"pythoncore - Win32 ReleaseCLEAN" -! !ELSE +! !IF "$(RECURSE)" == "1" +! CLEAN :"pythoncore - Win32 ReleaseCLEAN" +! !ELSE ! CLEAN : -! !ENDIF +! !ENDIF ! -@erase "$(INTDIR)\_bsddb.obj" ! -@erase "$(INTDIR)\vc60.idb" ! -@erase "$(INTDIR)\vc60.pdb" @@ -1192,47 +435,47 @@ ! ! F90=df.exe ! CPP=cl.exe -! CPP_PROJ=/nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "..\..\db-4.1.25\build_win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\_bsddb.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +! CPP_PROJ=/nologo /MD /W3 $(EXFLAGS) /Zi /O2 /I "..\Include" /I "..\PC" /I "..\..\db-4.1.25\build_win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\_bsddb.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c ! ! .c{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .c{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! MTL=midl.exe -! MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +! MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 ! RSC=rc.exe ! BSC32=bscmake.exe -! BSC32_FLAGS=/nologo /o"$(OUTDIR)\_bsddb.bsc" +! BSC32_FLAGS=/nologo /o"$(OUTDIR)\_bsddb.bsc" ! BSC32_SBRS= \ -! +! ! LINK32=link.exe -! LINK32_FLAGS=user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\..\db-4.1.25\build_win32\Release_static\libdb41s.lib /nologo /base:"0x1e180000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\_bsddb.pdb" /debug /machine:I386 /nodefaultlib:"msvcrt" /out:"$(OUTDIR)\_bsddb.pyd" /implib:"$(OUTDIR)\_bsddb.lib" +! LINK32_FLAGS=user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\..\db-4.1.25\build_win32\Release_static\libdb41s.lib /nologo /base:"0x1e180000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\_bsddb.pdb" /debug /machine:I386 /nodefaultlib:"msvcrt" /out:"$(OUTDIR)\_bsddb.pyd" /implib:"$(OUTDIR)\_bsddb.lib" ! LINK32_OBJS= \ ! "$(INTDIR)\_bsddb.obj" \ ! "$(OUTDIR)\python23.lib" @@ -1241,6 +484,8 @@ ! $(LINK32) @<< ! $(LINK32_FLAGS) $(LINK32_OBJS) ! << +! if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2 +! echo $(CPP_PROJ) ! ! !ELSEIF "$(CFG)" == "_bsddb - Win32 Debug" ! @@ -1250,21 +495,21 @@ ! OutDir=.\. ! # End Custom Macros ! -! !IF "$(RECURSE)" == "0" +! !IF "$(RECURSE)" == "0" ! ! ALL : "$(OUTDIR)\_bsddb_d.pyd" ! -! !ELSE +! !ELSE ! ! ALL : "pythoncore - Win32 Debug" "$(OUTDIR)\_bsddb_d.pyd" ! -! !ENDIF +! !ENDIF ! -! !IF "$(RECURSE)" == "1" -! CLEAN :"pythoncore - Win32 DebugCLEAN" -! !ELSE +! !IF "$(RECURSE)" == "1" +! CLEAN :"pythoncore - Win32 DebugCLEAN" +! !ELSE ! CLEAN : -! !ENDIF +! !ENDIF ! -@erase "$(INTDIR)\_bsddb.obj" ! -@erase "$(INTDIR)\vc60.idb" ! -@erase "$(INTDIR)\vc60.pdb" @@ -1282,47 +527,47 @@ ! ! F90=df.exe ! CPP=cl.exe -! CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /I "..\..\db-4.1.25\build_win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\_bsddb.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +! CPP_PROJ=/nologo /MDd /W3 /Gm $(EXFLAGS) /Zi /Od /I "..\Include" /I "..\PC" /I "..\..\db-4.1.25\build_win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\_bsddb.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c ! ! .c{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .c{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! MTL=midl.exe -! MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 +! MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 ! RSC=rc.exe ! BSC32=bscmake.exe -! BSC32_FLAGS=/nologo /o"$(OUTDIR)\_bsddb.bsc" +! BSC32_FLAGS=/nologo /o"$(OUTDIR)\_bsddb.bsc" ! BSC32_SBRS= \ -! +! ! LINK32=link.exe -! LINK32_FLAGS=user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\..\db-4.1.25\build_win32\Release_static\libdb41s.lib /nologo /base:"0x1e180000" /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\_bsddb_d.pdb" /debug /machine:I386 /nodefaultlib:"msvcrtd" /out:"$(OUTDIR)\_bsddb_d.pyd" /implib:"$(OUTDIR)\_bsddb_d.lib" /pdbtype:sept +! LINK32_FLAGS=user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\..\db-4.1.25\build_win32\Release_static\libdb41s.lib /nologo /base:"0x1e180000" /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\_bsddb_d.pdb" /debug /machine:I386 /nodefaultlib:"msvcrtd" /out:"$(OUTDIR)\_bsddb_d.pyd" /implib:"$(OUTDIR)\_bsddb_d.lib" /pdbtype:sept ! LINK32_OBJS= \ ! "$(INTDIR)\_bsddb.obj" \ ! "$(OUTDIR)\python23_d.lib" @@ -1331,17 +576,19 @@ ! $(LINK32) @<< ! $(LINK32_FLAGS) $(LINK32_OBJS) ! << +! if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2 +! echo $(CPP_PROJ) ! -! !ENDIF +! !ENDIF ! ! ! !IF "$(NO_EXTERNAL_DEPS)" != "1" ! !IF EXISTS("_bsddb.dep") ! !INCLUDE "_bsddb.dep" -! !ELSE +! !ELSE ! !MESSAGE Warning: cannot find "_bsddb.dep" -! !ENDIF -! !ENDIF +! !ENDIF +! !ENDIF ! ! ! !IF "$(CFG)" == "_bsddb - Win32 Release" || "$(CFG)" == "_bsddb - Win32 Debug" @@ -1381,8 +628,8 @@ ! ! !ENDIF ! -*** misc/Python-2.3.4/PCbuild/_csv.dep Thu Sep 1 19:41:42 2005 ---- misc/build/Python-2.3.4/PCbuild/_csv.dep Thu Sep 1 19:40:58 2005 +*** misc/Python-2.3.4/PCbuild/_csv.dep Thu Jun 29 12:10:01 2006 +--- misc/build/Python-2.3.4/PCbuild/_csv.dep Thu Jun 29 11:02:19 2006 *************** *** 1 **** ! dummy @@ -1436,38 +683,17 @@ ! "..\PC\pyconfig.h"\ ! {$(INCLUDE)}"basetsd.h"\ ! -*** misc/Python-2.3.4/PCbuild/_csv.mak Thu Sep 1 19:41:42 2005 ---- misc/build/Python-2.3.4/PCbuild/_csv.mak Thu Sep 1 19:40:58 2005 +*** misc/Python-2.3.4/PCbuild/_csv.mak Thu Jun 29 12:10:01 2006 +--- misc/build/Python-2.3.4/PCbuild/_csv.mak Thu Jun 29 16:33:48 2006 *************** *** 1 **** ! dummy ---- 1,255 ---- -! # Microsoft Developer Studio Generated NMAKE File, Based on _csv.dsp +--- 1,237 ---- ! !IF "$(CFG)" == "" ! CFG=_csv - Win32 Release -! !MESSAGE Keine Konfiguration angegeben. _csv - Win32 Release wird als Standard verwendet. -! !ENDIF -! -! !IF "$(CFG)" != "_csv - Win32 Release" && "$(CFG)" != "_csv - Win32 Debug" -! !MESSAGE Ungltige Konfiguration "$(CFG)" angegeben. -! !MESSAGE Sie k”nnen beim Ausfhren von NMAKE eine Konfiguration angeben -! !MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel: -! !MESSAGE -! !MESSAGE NMAKE /f "_csv.mak" CFG="_csv - Win32 Release" -! !MESSAGE -! !MESSAGE Fr die Konfiguration stehen zur Auswahl: -! !MESSAGE -! !MESSAGE "_csv - Win32 Release" (basierend auf "Win32 (x86) Dynamic-Link Library") -! !MESSAGE "_csv - Win32 Debug" (basierend auf "Win32 (x86) Dynamic-Link Library") -! !MESSAGE -! !ERROR Eine ungltige Konfiguration wurde angegeben. -! !ENDIF +! !ENDIF ! -! !IF "$(OS)" == "Windows_NT" ! NULL= -! !ELSE -! NULL=nul -! !ENDIF ! ! !IF "$(CFG)" == "_csv - Win32 Release" ! @@ -1477,21 +703,21 @@ ! OutDir=.\. ! # End Custom Macros ! -! !IF "$(RECURSE)" == "0" +! !IF "$(RECURSE)" == "0" ! ! ALL : "$(OUTDIR)\_csv.pyd" ! -! !ELSE +! !ELSE ! ! ALL : "pythoncore - Win32 Release" "$(OUTDIR)\_csv.pyd" ! -! !ENDIF +! !ENDIF ! -! !IF "$(RECURSE)" == "1" -! CLEAN :"pythoncore - Win32 ReleaseCLEAN" -! !ELSE +! !IF "$(RECURSE)" == "1" +! CLEAN :"pythoncore - Win32 ReleaseCLEAN" +! !ELSE ! CLEAN : -! !ENDIF +! !ENDIF ! -@erase "$(INTDIR)\_csv.obj" ! -@erase "$(INTDIR)\vc60.idb" ! -@erase "$(INTDIR)\vc60.pdb" @@ -1508,47 +734,47 @@ ! ! F90=df.exe ! CPP=cl.exe -! CPP_PROJ=/nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\_csv.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +! CPP_PROJ=/nologo /MD /W3 $(EXFLAGS) /Zi /O2 /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\_csv.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c ! ! .c{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .c{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! MTL=midl.exe -! MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +! MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 ! RSC=rc.exe ! BSC32=bscmake.exe -! BSC32_FLAGS=/nologo /o"$(OUTDIR)\_csv.bsc" +! BSC32_FLAGS=/nologo /o"$(OUTDIR)\_csv.bsc" ! BSC32_SBRS= \ -! +! ! LINK32=link.exe -! LINK32_FLAGS=user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1d190000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\_csv.pdb" /debug /machine:I386 /out:"$(OUTDIR)\_csv.pyd" /implib:"$(OUTDIR)\_csv.lib" +! LINK32_FLAGS=user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1d190000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\_csv.pdb" /debug /machine:I386 /out:"$(OUTDIR)\_csv.pyd" /implib:"$(OUTDIR)\_csv.lib" ! LINK32_OBJS= \ ! "$(INTDIR)\_csv.obj" \ ! "$(OUTDIR)\python23.lib" @@ -1557,6 +783,8 @@ ! $(LINK32) @<< ! $(LINK32_FLAGS) $(LINK32_OBJS) ! << +! if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2 +! echo $(CPP_PROJ) ! ! !ELSEIF "$(CFG)" == "_csv - Win32 Debug" ! @@ -1566,21 +794,21 @@ ! OutDir=.\. ! # End Custom Macros ! -! !IF "$(RECURSE)" == "0" +! !IF "$(RECURSE)" == "0" ! ! ALL : "$(OUTDIR)\_csv_d.pyd" ! -! !ELSE +! !ELSE ! ! ALL : "pythoncore - Win32 Debug" "$(OUTDIR)\_csv_d.pyd" ! -! !ENDIF +! !ENDIF ! -! !IF "$(RECURSE)" == "1" -! CLEAN :"pythoncore - Win32 DebugCLEAN" -! !ELSE +! !IF "$(RECURSE)" == "1" +! CLEAN :"pythoncore - Win32 DebugCLEAN" +! !ELSE ! CLEAN : -! !ENDIF +! !ENDIF ! -@erase "$(INTDIR)\_csv.obj" ! -@erase "$(INTDIR)\vc60.idb" ! -@erase "$(INTDIR)\vc60.pdb" @@ -1598,47 +826,47 @@ ! ! F90=df.exe ! CPP=cl.exe -! CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\_csv.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +! CPP_PROJ=/nologo /MDd /W3 /Gm $(EXFLAGS) /Zi /Od /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\_csv.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c ! ! .c{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .c{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! MTL=midl.exe -! MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 +! MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 ! RSC=rc.exe ! BSC32=bscmake.exe -! BSC32_FLAGS=/nologo /o"$(OUTDIR)\_csv.bsc" +! BSC32_FLAGS=/nologo /o"$(OUTDIR)\_csv.bsc" ! BSC32_SBRS= \ -! +! ! LINK32=link.exe -! LINK32_FLAGS=user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1d190000" /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\_csv_d.pdb" /debug /machine:I386 /out:"$(OUTDIR)\_csv_d.pyd" /implib:"$(OUTDIR)\_csv_d.lib" /pdbtype:sept +! LINK32_FLAGS=user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1d190000" /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\_csv_d.pdb" /debug /machine:I386 /out:"$(OUTDIR)\_csv_d.pyd" /implib:"$(OUTDIR)\_csv_d.lib" /pdbtype:sept ! LINK32_OBJS= \ ! "$(INTDIR)\_csv.obj" \ ! "$(OUTDIR)\python23_d.lib" @@ -1647,46 +875,48 @@ ! $(LINK32) @<< ! $(LINK32_FLAGS) $(LINK32_OBJS) ! << +! if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2 +! echo $(CPP_PROJ) ! -! !ENDIF +! !ENDIF ! ! ! !IF "$(NO_EXTERNAL_DEPS)" != "1" ! !IF EXISTS("_csv.dep") ! !INCLUDE "_csv.dep" -! !ELSE +! !ELSE ! !MESSAGE Warning: cannot find "_csv.dep" -! !ENDIF -! !ENDIF +! !ENDIF +! !ENDIF ! ! ! !IF "$(CFG)" == "_csv - Win32 Release" || "$(CFG)" == "_csv - Win32 Debug" ! ! !IF "$(CFG)" == "_csv - Win32 Release" ! -! "pythoncore - Win32 Release" : +! "pythoncore - Win32 Release" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" ! cd "." ! -! "pythoncore - Win32 ReleaseCLEAN" : +! "pythoncore - Win32 ReleaseCLEAN" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" RECURSE=1 CLEAN +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" RECURSE=1 CLEAN ! cd "." ! ! !ELSEIF "$(CFG)" == "_csv - Win32 Debug" ! -! "pythoncore - Win32 Debug" : +! "pythoncore - Win32 Debug" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" ! cd "." ! -! "pythoncore - Win32 DebugCLEAN" : +! "pythoncore - Win32 DebugCLEAN" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" RECURSE=1 CLEAN +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" RECURSE=1 CLEAN ! cd "." ! -! !ENDIF +! !ENDIF ! ! SOURCE=..\Modules\_csv.c ! @@ -1695,10 +925,9 @@ ! ! ! -! !ENDIF -! -*** misc/Python-2.3.4/PCbuild/_socket.dep Thu Sep 1 19:41:41 2005 ---- misc/build/Python-2.3.4/PCbuild/_socket.dep Thu Sep 1 19:40:58 2005 +! !ENDIF +*** misc/Python-2.3.4/PCbuild/_socket.dep Thu Jun 29 12:10:01 2006 +--- misc/build/Python-2.3.4/PCbuild/_socket.dep Thu Jun 29 11:02:19 2006 *************** *** 1 **** ! dummy @@ -1756,38 +985,17 @@ ! "..\PC\pyconfig.h"\ ! {$(INCLUDE)}"basetsd.h"\ ! -*** misc/Python-2.3.4/PCbuild/_socket.mak Thu Sep 1 19:41:41 2005 ---- misc/build/Python-2.3.4/PCbuild/_socket.mak Thu Sep 1 19:40:58 2005 +*** misc/Python-2.3.4/PCbuild/_socket.mak Thu Jun 29 12:10:01 2006 +--- misc/build/Python-2.3.4/PCbuild/_socket.mak Thu Jun 29 16:33:48 2006 *************** *** 1 **** ! dummy ---- 1,255 ---- -! # Microsoft Developer Studio Generated NMAKE File, Based on _socket.dsp +--- 1,237 ---- ! !IF "$(CFG)" == "" -! CFG=_socket - Win32 Debug -! !MESSAGE Keine Konfiguration angegeben. _socket - Win32 Debug wird als Standard verwendet. -! !ENDIF +! CFG=_socket - Win32 Release +! !ENDIF ! -! !IF "$(CFG)" != "_socket - Win32 Release" && "$(CFG)" != "_socket - Win32 Debug" -! !MESSAGE Ungltige Konfiguration "$(CFG)" angegeben. -! !MESSAGE Sie k”nnen beim Ausfhren von NMAKE eine Konfiguration angeben -! !MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel: -! !MESSAGE -! !MESSAGE NMAKE /f "_socket.mak" CFG="_socket - Win32 Debug" -! !MESSAGE -! !MESSAGE Fr die Konfiguration stehen zur Auswahl: -! !MESSAGE -! !MESSAGE "_socket - Win32 Release" (basierend auf "Win32 (x86) Dynamic-Link Library") -! !MESSAGE "_socket - Win32 Debug" (basierend auf "Win32 (x86) Dynamic-Link Library") -! !MESSAGE -! !ERROR Eine ungltige Konfiguration wurde angegeben. -! !ENDIF -! -! !IF "$(OS)" == "Windows_NT" ! NULL= -! !ELSE -! NULL=nul -! !ENDIF ! ! !IF "$(CFG)" == "_socket - Win32 Release" ! @@ -1797,21 +1005,21 @@ ! OutDir=.\. ! # End Custom Macros ! -! !IF "$(RECURSE)" == "0" +! !IF "$(RECURSE)" == "0" ! ! ALL : "$(OUTDIR)\_socket.pyd" ! -! !ELSE +! !ELSE ! ! ALL : "pythoncore - Win32 Release" "$(OUTDIR)\_socket.pyd" ! -! !ENDIF +! !ENDIF ! -! !IF "$(RECURSE)" == "1" -! CLEAN :"pythoncore - Win32 ReleaseCLEAN" -! !ELSE +! !IF "$(RECURSE)" == "1" +! CLEAN :"pythoncore - Win32 ReleaseCLEAN" +! !ELSE ! CLEAN : -! !ENDIF +! !ENDIF ! -@erase "$(INTDIR)\socketmodule.obj" ! -@erase "$(INTDIR)\vc60.idb" ! -@erase "$(INTDIR)\vc60.pdb" @@ -1828,47 +1036,47 @@ ! ! F90=df.exe ! CPP=cl.exe -! CPP_PROJ=/nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\_socket.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +! CPP_PROJ=/nologo /MD /W3 $(EXFLAGS) /Zi /O2 /I "..\Include" /I "..\PC" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\_socket.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c ! ! .c{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .c{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! MTL=midl.exe -! MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +! MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 ! RSC=rc.exe ! BSC32=bscmake.exe -! BSC32_FLAGS=/nologo /o"$(OUTDIR)\_socket.bsc" +! BSC32_FLAGS=/nologo /o"$(OUTDIR)\_socket.bsc" ! BSC32_SBRS= \ -! +! ! LINK32=link.exe -! LINK32_FLAGS=user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /base:"0x1e1D0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\_socket.pdb" /debug /machine:I386 /out:"$(OUTDIR)\_socket.pyd" /implib:"$(OUTDIR)\_socket.lib" +! LINK32_FLAGS=user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /base:"0x1e1D0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\_socket.pdb" /debug /machine:I386 /out:"$(OUTDIR)\_socket.pyd" /implib:"$(OUTDIR)\_socket.lib" ! LINK32_OBJS= \ ! "$(INTDIR)\socketmodule.obj" \ ! "$(OUTDIR)\python23.lib" @@ -1877,6 +1085,8 @@ ! $(LINK32) @<< ! $(LINK32_FLAGS) $(LINK32_OBJS) ! << +! if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2 +! echo $(CPP_PROJ) ! ! !ELSEIF "$(CFG)" == "_socket - Win32 Debug" ! @@ -1886,21 +1096,21 @@ ! OutDir=.\. ! # End Custom Macros ! -! !IF "$(RECURSE)" == "0" +! !IF "$(RECURSE)" == "0" ! ! ALL : "$(OUTDIR)\_socket_d.pyd" ! -! !ELSE +! !ELSE ! ! ALL : "pythoncore - Win32 Debug" "$(OUTDIR)\_socket_d.pyd" ! -! !ENDIF +! !ENDIF ! -! !IF "$(RECURSE)" == "1" -! CLEAN :"pythoncore - Win32 DebugCLEAN" -! !ELSE +! !IF "$(RECURSE)" == "1" +! CLEAN :"pythoncore - Win32 DebugCLEAN" +! !ELSE ! CLEAN : -! !ENDIF +! !ENDIF ! -@erase "$(INTDIR)\socketmodule.obj" ! -@erase "$(INTDIR)\vc60.idb" ! -@erase "$(INTDIR)\vc60.pdb" @@ -1918,47 +1128,47 @@ ! ! F90=df.exe ! CPP=cl.exe -! CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\_socket.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +! CPP_PROJ=/nologo /MDd /W3 /Gm $(EXFLAGS) /Zi /Od /I "..\Include" /I "..\PC" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\_socket.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c ! ! .c{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .c{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! MTL=midl.exe -! MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 +! MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 ! RSC=rc.exe ! BSC32=bscmake.exe -! BSC32_FLAGS=/nologo /o"$(OUTDIR)\_socket.bsc" +! BSC32_FLAGS=/nologo /o"$(OUTDIR)\_socket.bsc" ! BSC32_SBRS= \ -! +! ! LINK32=link.exe -! LINK32_FLAGS=user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /base:"0x1e1D0000" /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\_socket_d.pdb" /debug /machine:I386 /out:"$(OUTDIR)\_socket_d.pyd" /implib:"$(OUTDIR)\_socket_d.lib" /pdbtype:sept +! LINK32_FLAGS=user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /base:"0x1e1D0000" /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\_socket_d.pdb" /debug /machine:I386 /out:"$(OUTDIR)\_socket_d.pyd" /implib:"$(OUTDIR)\_socket_d.lib" /pdbtype:sept ! LINK32_OBJS= \ ! "$(INTDIR)\socketmodule.obj" \ ! "$(OUTDIR)\python23_d.lib" @@ -1967,46 +1177,48 @@ ! $(LINK32) @<< ! $(LINK32_FLAGS) $(LINK32_OBJS) ! << +! if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2 +! echo $(CPP_PROJ) ! -! !ENDIF +! !ENDIF ! ! ! !IF "$(NO_EXTERNAL_DEPS)" != "1" ! !IF EXISTS("_socket.dep") ! !INCLUDE "_socket.dep" -! !ELSE +! !ELSE ! !MESSAGE Warning: cannot find "_socket.dep" -! !ENDIF -! !ENDIF +! !ENDIF +! !ENDIF ! ! ! !IF "$(CFG)" == "_socket - Win32 Release" || "$(CFG)" == "_socket - Win32 Debug" ! ! !IF "$(CFG)" == "_socket - Win32 Release" ! -! "pythoncore - Win32 Release" : +! "pythoncore - Win32 Release" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" ! cd "." ! -! "pythoncore - Win32 ReleaseCLEAN" : +! "pythoncore - Win32 ReleaseCLEAN" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" RECURSE=1 CLEAN +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" RECURSE=1 CLEAN ! cd "." ! ! !ELSEIF "$(CFG)" == "_socket - Win32 Debug" ! -! "pythoncore - Win32 Debug" : +! "pythoncore - Win32 Debug" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" ! cd "." ! -! "pythoncore - Win32 DebugCLEAN" : +! "pythoncore - Win32 DebugCLEAN" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" RECURSE=1 CLEAN +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" RECURSE=1 CLEAN ! cd "." ! -! !ENDIF +! !ENDIF ! ! SOURCE=..\Modules\socketmodule.c ! @@ -2015,10 +1227,9 @@ ! ! ! -! !ENDIF -! -*** misc/Python-2.3.4/PCbuild/_sre.dep Thu Sep 1 19:41:42 2005 ---- misc/build/Python-2.3.4/PCbuild/_sre.dep Thu Sep 1 19:40:58 2005 +! !ENDIF +*** misc/Python-2.3.4/PCbuild/_sre.dep Thu Jun 29 12:10:01 2006 +--- misc/build/Python-2.3.4/PCbuild/_sre.dep Thu Jun 29 11:02:19 2006 *************** *** 1 **** ! dummy @@ -2074,38 +1285,17 @@ ! "..\PC\pyconfig.h"\ ! {$(INCLUDE)}"basetsd.h"\ ! -*** misc/Python-2.3.4/PCbuild/_sre.mak Thu Sep 1 19:41:42 2005 ---- misc/build/Python-2.3.4/PCbuild/_sre.mak Thu Sep 1 19:40:58 2005 +*** misc/Python-2.3.4/PCbuild/_sre.mak Thu Jun 29 12:10:01 2006 +--- misc/build/Python-2.3.4/PCbuild/_sre.mak Thu Jun 29 16:33:48 2006 *************** *** 1 **** ! dummy ---- 1,255 ---- -! # Microsoft Developer Studio Generated NMAKE File, Based on _sre.dsp +--- 1,237 ---- ! !IF "$(CFG)" == "" ! CFG=_sre - Win32 Release -! !MESSAGE Keine Konfiguration angegeben. _sre - Win32 Release wird als Standard verwendet. -! !ENDIF -! -! !IF "$(CFG)" != "_sre - Win32 Release" && "$(CFG)" != "_sre - Win32 Debug" -! !MESSAGE Ungltige Konfiguration "$(CFG)" angegeben. -! !MESSAGE Sie k”nnen beim Ausfhren von NMAKE eine Konfiguration angeben -! !MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel: -! !MESSAGE -! !MESSAGE NMAKE /f "_sre.mak" CFG="_sre - Win32 Release" -! !MESSAGE -! !MESSAGE Fr die Konfiguration stehen zur Auswahl: -! !MESSAGE -! !MESSAGE "_sre - Win32 Release" (basierend auf "Win32 (x86) Dynamic-Link Library") -! !MESSAGE "_sre - Win32 Debug" (basierend auf "Win32 (x86) Dynamic-Link Library") -! !MESSAGE -! !ERROR Eine ungltige Konfiguration wurde angegeben. -! !ENDIF +! !ENDIF ! -! !IF "$(OS)" == "Windows_NT" ! NULL= -! !ELSE -! NULL=nul -! !ENDIF ! ! !IF "$(CFG)" == "_sre - Win32 Release" ! @@ -2115,21 +1305,21 @@ ! OutDir=.\. ! # End Custom Macros ! -! !IF "$(RECURSE)" == "0" +! !IF "$(RECURSE)" == "0" ! ! ALL : "$(OUTDIR)\_sre.pyd" ! -! !ELSE +! !ELSE ! ! ALL : "pythoncore - Win32 Release" "$(OUTDIR)\_sre.pyd" ! -! !ENDIF +! !ENDIF ! -! !IF "$(RECURSE)" == "1" -! CLEAN :"pythoncore - Win32 ReleaseCLEAN" -! !ELSE +! !IF "$(RECURSE)" == "1" +! CLEAN :"pythoncore - Win32 ReleaseCLEAN" +! !ELSE ! CLEAN : -! !ENDIF +! !ENDIF ! -@erase "$(INTDIR)\_sre.obj" ! -@erase "$(INTDIR)\vc60.idb" ! -@erase "$(INTDIR)\vc60.pdb" @@ -2146,47 +1336,47 @@ ! ! F90=df.exe ! CPP=cl.exe -! CPP_PROJ=/nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\_sre.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +! CPP_PROJ=/nologo /MD /W3 $(EXFLAGS) /Zi /O2 /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\_sre.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c ! ! .c{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .c{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! MTL=midl.exe -! MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +! MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 ! RSC=rc.exe ! BSC32=bscmake.exe -! BSC32_FLAGS=/nologo /o"$(OUTDIR)\_sre.bsc" +! BSC32_FLAGS=/nologo /o"$(OUTDIR)\_sre.bsc" ! BSC32_SBRS= \ -! +! ! LINK32=link.exe -! LINK32_FLAGS=user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1e1e0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\_sre.pdb" /debug /machine:I386 /out:"$(OUTDIR)\_sre.pyd" /implib:"$(OUTDIR)\_sre.lib" +! LINK32_FLAGS=user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1e1e0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\_sre.pdb" /debug /machine:I386 /out:"$(OUTDIR)\_sre.pyd" /implib:"$(OUTDIR)\_sre.lib" ! LINK32_OBJS= \ ! "$(INTDIR)\_sre.obj" \ ! "$(OUTDIR)\python23.lib" @@ -2195,6 +1385,8 @@ ! $(LINK32) @<< ! $(LINK32_FLAGS) $(LINK32_OBJS) ! << +! if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2 +! echo $(CPP_PROJ) ! ! !ELSEIF "$(CFG)" == "_sre - Win32 Debug" ! @@ -2204,21 +1396,21 @@ ! OutDir=.\. ! # End Custom Macros ! -! !IF "$(RECURSE)" == "0" +! !IF "$(RECURSE)" == "0" ! ! ALL : "$(OUTDIR)\_sre_d.pyd" ! -! !ELSE +! !ELSE ! ! ALL : "pythoncore - Win32 Debug" "$(OUTDIR)\_sre_d.pyd" ! -! !ENDIF +! !ENDIF ! -! !IF "$(RECURSE)" == "1" -! CLEAN :"pythoncore - Win32 DebugCLEAN" -! !ELSE +! !IF "$(RECURSE)" == "1" +! CLEAN :"pythoncore - Win32 DebugCLEAN" +! !ELSE ! CLEAN : -! !ENDIF +! !ENDIF ! -@erase "$(INTDIR)\_sre.obj" ! -@erase "$(INTDIR)\vc60.idb" ! -@erase "$(INTDIR)\vc60.pdb" @@ -2236,47 +1428,47 @@ ! ! F90=df.exe ! CPP=cl.exe -! CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\_sre.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +! CPP_PROJ=/nologo /MDd /W3 /Gm $(EXFLAGS) /Zi /Od /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\_sre.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c ! ! .c{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .c{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! MTL=midl.exe -! MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 +! MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 ! RSC=rc.exe ! BSC32=bscmake.exe -! BSC32_FLAGS=/nologo /o"$(OUTDIR)\_sre.bsc" +! BSC32_FLAGS=/nologo /o"$(OUTDIR)\_sre.bsc" ! BSC32_SBRS= \ -! +! ! LINK32=link.exe -! LINK32_FLAGS=user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1e1e0000" /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\_sre_d.pdb" /debug /machine:I386 /out:"$(OUTDIR)\_sre_d.pyd" /implib:"$(OUTDIR)\_sre_d.lib" /pdbtype:sept +! LINK32_FLAGS=user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1e1e0000" /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\_sre_d.pdb" /debug /machine:I386 /out:"$(OUTDIR)\_sre_d.pyd" /implib:"$(OUTDIR)\_sre_d.lib" /pdbtype:sept ! LINK32_OBJS= \ ! "$(INTDIR)\_sre.obj" \ ! "$(OUTDIR)\python23_d.lib" @@ -2285,46 +1477,48 @@ ! $(LINK32) @<< ! $(LINK32_FLAGS) $(LINK32_OBJS) ! << +! if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2 +! echo $(CPP_PROJ) ! -! !ENDIF +! !ENDIF ! ! ! !IF "$(NO_EXTERNAL_DEPS)" != "1" ! !IF EXISTS("_sre.dep") ! !INCLUDE "_sre.dep" -! !ELSE +! !ELSE ! !MESSAGE Warning: cannot find "_sre.dep" -! !ENDIF -! !ENDIF +! !ENDIF +! !ENDIF ! ! ! !IF "$(CFG)" == "_sre - Win32 Release" || "$(CFG)" == "_sre - Win32 Debug" ! ! !IF "$(CFG)" == "_sre - Win32 Release" ! -! "pythoncore - Win32 Release" : +! "pythoncore - Win32 Release" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" ! cd "." ! -! "pythoncore - Win32 ReleaseCLEAN" : +! "pythoncore - Win32 ReleaseCLEAN" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" RECURSE=1 CLEAN +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" RECURSE=1 CLEAN ! cd "." ! ! !ELSEIF "$(CFG)" == "_sre - Win32 Debug" ! -! "pythoncore - Win32 Debug" : +! "pythoncore - Win32 Debug" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" ! cd "." ! -! "pythoncore - Win32 DebugCLEAN" : +! "pythoncore - Win32 DebugCLEAN" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" RECURSE=1 CLEAN +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" RECURSE=1 CLEAN ! cd "." ! -! !ENDIF +! !ENDIF ! ! SOURCE=..\Modules\_sre.c ! @@ -2333,10 +1527,9 @@ ! ! ! -! !ENDIF -! -*** misc/Python-2.3.4/PCbuild/_symtable.dep Thu Sep 1 19:41:42 2005 ---- misc/build/Python-2.3.4/PCbuild/_symtable.dep Thu Sep 1 19:40:58 2005 +! !ENDIF +*** misc/Python-2.3.4/PCbuild/_symtable.dep Thu Jun 29 12:10:02 2006 +--- misc/build/Python-2.3.4/PCbuild/_symtable.dep Thu Jun 29 11:02:19 2006 *************** *** 1 **** ! dummy @@ -2391,38 +1584,17 @@ ! "..\PC\pyconfig.h"\ ! {$(INCLUDE)}"basetsd.h"\ ! -*** misc/Python-2.3.4/PCbuild/_symtable.mak Thu Sep 1 19:41:42 2005 ---- misc/build/Python-2.3.4/PCbuild/_symtable.mak Thu Sep 1 19:40:58 2005 +*** misc/Python-2.3.4/PCbuild/_symtable.mak Thu Jun 29 12:10:01 2006 +--- misc/build/Python-2.3.4/PCbuild/_symtable.mak Thu Jun 29 16:33:48 2006 *************** *** 1 **** ! dummy ---- 1,253 ---- -! # Microsoft Developer Studio Generated NMAKE File, Based on _symtable.dsp +--- 1,236 ---- ! !IF "$(CFG)" == "" -! CFG=_symtable - Win32 Debug -! !MESSAGE Keine Konfiguration angegeben. _symtable - Win32 Debug wird als Standard verwendet. -! !ENDIF -! -! !IF "$(CFG)" != "_symtable - Win32 Release" && "$(CFG)" != "_symtable - Win32 Debug" -! !MESSAGE Ungltige Konfiguration "$(CFG)" angegeben. -! !MESSAGE Sie k”nnen beim Ausfhren von NMAKE eine Konfiguration angeben -! !MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel: -! !MESSAGE -! !MESSAGE NMAKE /f "_symtable.mak" CFG="_symtable - Win32 Debug" -! !MESSAGE -! !MESSAGE Fr die Konfiguration stehen zur Auswahl: -! !MESSAGE -! !MESSAGE "_symtable - Win32 Release" (basierend auf "Win32 (x86) Dynamic-Link Library") -! !MESSAGE "_symtable - Win32 Debug" (basierend auf "Win32 (x86) Dynamic-Link Library") -! !MESSAGE -! !ERROR Eine ungltige Konfiguration wurde angegeben. -! !ENDIF +! CFG=_symtable - Win32 Release +! !ENDIF ! -! !IF "$(OS)" == "Windows_NT" ! NULL= -! !ELSE -! NULL=nul -! !ENDIF ! ! !IF "$(CFG)" == "_symtable - Win32 Release" ! @@ -2432,21 +1604,21 @@ ! OutDir=.\. ! # End Custom Macros ! -! !IF "$(RECURSE)" == "0" +! !IF "$(RECURSE)" == "0" ! ! ALL : "$(OUTDIR)\_symtable.pyd" ! -! !ELSE +! !ELSE ! ! ALL : "pythoncore - Win32 Release" "$(OUTDIR)\_symtable.pyd" ! -! !ENDIF +! !ENDIF ! -! !IF "$(RECURSE)" == "1" -! CLEAN :"pythoncore - Win32 ReleaseCLEAN" -! !ELSE +! !IF "$(RECURSE)" == "1" +! CLEAN :"pythoncore - Win32 ReleaseCLEAN" +! !ELSE ! CLEAN : -! !ENDIF +! !ENDIF ! -@erase "$(INTDIR)\symtablemodule.obj" ! -@erase "$(INTDIR)\vc60.idb" ! -@erase "$(OUTDIR)\_symtable.exp" @@ -2461,47 +1633,47 @@ ! ! F90=df.exe ! CPP=cl.exe -! CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MMAP_EXPORTS" /Fp"$(INTDIR)\_symtable.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +! CPP_PROJ=/nologo /MD /W3 $(EXFLAGS) /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MMAP_EXPORTS" /Fp"$(INTDIR)\_symtable.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c ! ! .c{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .c{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! MTL=midl.exe -! MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 +! MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 ! RSC=rc.exe ! BSC32=bscmake.exe -! BSC32_FLAGS=/nologo /o"$(OUTDIR)\_symtable.bsc" +! BSC32_FLAGS=/nologo /o"$(OUTDIR)\_symtable.bsc" ! BSC32_SBRS= \ -! +! ! LINK32=link.exe -! LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1e100000" /dll /incremental:no /pdb:"$(OUTDIR)\_symtable.pdb" /machine:I386 /out:"$(OUTDIR)\_symtable.pyd" /implib:"$(OUTDIR)\_symtable.lib" +! LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1e100000" /dll /incremental:no /pdb:"$(OUTDIR)\_symtable.pdb" /machine:I386 /out:"$(OUTDIR)\_symtable.pyd" /implib:"$(OUTDIR)\_symtable.lib" ! LINK32_OBJS= \ ! "$(INTDIR)\symtablemodule.obj" \ ! "$(OUTDIR)\python23.lib" @@ -2510,6 +1682,8 @@ ! $(LINK32) @<< ! $(LINK32_FLAGS) $(LINK32_OBJS) ! << +! if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2 +! echo $(CPP_PROJ) ! ! !ELSEIF "$(CFG)" == "_symtable - Win32 Debug" ! @@ -2519,21 +1693,21 @@ ! OutDir=.\. ! # End Custom Macros ! -! !IF "$(RECURSE)" == "0" +! !IF "$(RECURSE)" == "0" ! ! ALL : "$(OUTDIR)\_symtable_d.pyd" ! -! !ELSE +! !ELSE ! ! ALL : "pythoncore - Win32 Debug" "$(OUTDIR)\_symtable_d.pyd" ! -! !ENDIF +! !ENDIF ! -! !IF "$(RECURSE)" == "1" -! CLEAN :"pythoncore - Win32 DebugCLEAN" -! !ELSE +! !IF "$(RECURSE)" == "1" +! CLEAN :"pythoncore - Win32 DebugCLEAN" +! !ELSE ! CLEAN : -! !ENDIF +! !ENDIF ! -@erase "$(INTDIR)\symtablemodule.obj" ! -@erase "$(INTDIR)\vc60.idb" ! -@erase "$(INTDIR)\vc60.pdb" @@ -2551,47 +1725,47 @@ ! ! F90=df.exe ! CPP=cl.exe -! CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MMAP_EXPORTS" /Fp"$(INTDIR)\_symtable.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c +! CPP_PROJ=/nologo /MDd /W3 /Gm $(EXFLAGS) /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MMAP_EXPORTS" /Fp"$(INTDIR)\_symtable.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c ! ! .c{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .c{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! MTL=midl.exe -! MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 +! MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 ! RSC=rc.exe ! BSC32=bscmake.exe -! BSC32_FLAGS=/nologo /o"$(OUTDIR)\_symtable.bsc" +! BSC32_FLAGS=/nologo /o"$(OUTDIR)\_symtable.bsc" ! BSC32_SBRS= \ -! +! ! LINK32=link.exe -! LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1e100000" /dll /incremental:yes /pdb:"$(OUTDIR)\_symtable_d.pdb" /debug /machine:I386 /out:"$(OUTDIR)\_symtable_d.pyd" /implib:"$(OUTDIR)\_symtable_d.lib" /pdbtype:sept +! LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1e100000" /dll /incremental:yes /pdb:"$(OUTDIR)\_symtable_d.pdb" /debug /machine:I386 /out:"$(OUTDIR)\_symtable_d.pyd" /implib:"$(OUTDIR)\_symtable_d.lib" /pdbtype:sept ! LINK32_OBJS= \ ! "$(INTDIR)\symtablemodule.obj" \ ! "$(OUTDIR)\python23_d.lib" @@ -2600,24 +1774,26 @@ ! $(LINK32) @<< ! $(LINK32_FLAGS) $(LINK32_OBJS) ! << +! if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2 +! echo $(CPP_PROJ) ! -! !ENDIF +! !ENDIF ! ! ! !IF "$(NO_EXTERNAL_DEPS)" != "1" ! !IF EXISTS("_symtable.dep") ! !INCLUDE "_symtable.dep" -! !ELSE +! !ELSE ! !MESSAGE Warning: cannot find "_symtable.dep" -! !ENDIF -! !ENDIF +! !ENDIF +! !ENDIF ! ! ! !IF "$(CFG)" == "_symtable - Win32 Release" || "$(CFG)" == "_symtable - Win32 Debug" ! ! !IF "$(CFG)" == "_symtable - Win32 Release" ! -! "pythoncore - Win32 Release" : +! "pythoncore - Win32 Release" : ! cd "." ! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" ! cd "." @@ -2650,8 +1826,8 @@ ! ! !ENDIF ! -*** misc/Python-2.3.4/PCbuild/_testcapi.dep Thu Sep 1 19:41:42 2005 ---- misc/build/Python-2.3.4/PCbuild/_testcapi.dep Thu Sep 1 19:40:58 2005 +*** misc/Python-2.3.4/PCbuild/_testcapi.dep Thu Jun 29 12:10:02 2006 +--- misc/build/Python-2.3.4/PCbuild/_testcapi.dep Thu Jun 29 11:02:19 2006 *************** *** 1 **** ! dummy @@ -2706,38 +1882,17 @@ ! "..\PC\pyconfig.h"\ ! {$(INCLUDE)}"basetsd.h"\ ! -*** misc/Python-2.3.4/PCbuild/_testcapi.mak Thu Sep 1 19:41:42 2005 ---- misc/build/Python-2.3.4/PCbuild/_testcapi.mak Thu Sep 1 19:40:58 2005 +*** misc/Python-2.3.4/PCbuild/_testcapi.mak Thu Jun 29 12:10:02 2006 +--- misc/build/Python-2.3.4/PCbuild/_testcapi.mak Thu Jun 29 16:33:48 2006 *************** *** 1 **** ! dummy ---- 1,253 ---- -! # Microsoft Developer Studio Generated NMAKE File, Based on _testcapi.dsp +--- 1,235 ---- ! !IF "$(CFG)" == "" ! CFG=_testcapi - Win32 Debug -! !MESSAGE Keine Konfiguration angegeben. _testcapi - Win32 Debug wird als Standard verwendet. -! !ENDIF -! -! !IF "$(CFG)" != "_testcapi - Win32 Release" && "$(CFG)" != "_testcapi - Win32 Debug" -! !MESSAGE Ungltige Konfiguration "$(CFG)" angegeben. -! !MESSAGE Sie k”nnen beim Ausfhren von NMAKE eine Konfiguration angeben -! !MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel: -! !MESSAGE -! !MESSAGE NMAKE /f "_testcapi.mak" CFG="_testcapi - Win32 Debug" -! !MESSAGE -! !MESSAGE Fr die Konfiguration stehen zur Auswahl: -! !MESSAGE -! !MESSAGE "_testcapi - Win32 Release" (basierend auf "Win32 (x86) Dynamic-Link Library") -! !MESSAGE "_testcapi - Win32 Debug" (basierend auf "Win32 (x86) Dynamic-Link Library") -! !MESSAGE -! !ERROR Eine ungltige Konfiguration wurde angegeben. -! !ENDIF +! !ENDIF ! -! !IF "$(OS)" == "Windows_NT" ! NULL= -! !ELSE -! NULL=nul -! !ENDIF ! ! !IF "$(CFG)" == "_testcapi - Win32 Release" ! @@ -2747,21 +1902,21 @@ ! OutDir=.\. ! # End Custom Macros ! -! !IF "$(RECURSE)" == "0" +! !IF "$(RECURSE)" == "0" ! ! ALL : "$(OUTDIR)\_testcapi.pyd" ! -! !ELSE +! !ELSE ! ! ALL : "pythoncore - Win32 Release" "$(OUTDIR)\_testcapi.pyd" ! -! !ENDIF +! !ENDIF ! -! !IF "$(RECURSE)" == "1" -! CLEAN :"pythoncore - Win32 ReleaseCLEAN" -! !ELSE +! !IF "$(RECURSE)" == "1" +! CLEAN :"pythoncore - Win32 ReleaseCLEAN" +! !ELSE ! CLEAN : -! !ENDIF +! !ENDIF ! -@erase "$(INTDIR)\_testcapimodule.obj" ! -@erase "$(INTDIR)\vc60.idb" ! -@erase "$(OUTDIR)\_testcapi.exp" @@ -2776,47 +1931,47 @@ ! ! F90=df.exe ! CPP=cl.exe -! CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MMAP_EXPORTS" /Fp"$(INTDIR)\_testcapi.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +! CPP_PROJ=/nologo /MD /W3 $(EXFLAGS) /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MMAP_EXPORTS" /Fp"$(INTDIR)\_testcapi.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c ! ! .c{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .c{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! MTL=midl.exe -! MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 +! MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 ! RSC=rc.exe ! BSC32=bscmake.exe -! BSC32_FLAGS=/nologo /o"$(OUTDIR)\_testcapi.bsc" +! BSC32_FLAGS=/nologo /o"$(OUTDIR)\_testcapi.bsc" ! BSC32_SBRS= \ -! +! ! LINK32=link.exe -! LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1e1F0000" /dll /incremental:no /pdb:"$(OUTDIR)\_testcapi.pdb" /machine:I386 /out:"$(OUTDIR)\_testcapi.pyd" /implib:"$(OUTDIR)\_testcapi.lib" +! LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1e1F0000" /dll /incremental:no /pdb:"$(OUTDIR)\_testcapi.pdb" /machine:I386 /out:"$(OUTDIR)\_testcapi.pyd" /implib:"$(OUTDIR)\_testcapi.lib" ! LINK32_OBJS= \ ! "$(INTDIR)\_testcapimodule.obj" \ ! "$(OUTDIR)\python23.lib" @@ -2825,6 +1980,8 @@ ! $(LINK32) @<< ! $(LINK32_FLAGS) $(LINK32_OBJS) ! << +! if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2 +! echo $(CPP_PROJ) ! ! !ELSEIF "$(CFG)" == "_testcapi - Win32 Debug" ! @@ -2834,21 +1991,21 @@ ! OutDir=.\. ! # End Custom Macros ! -! !IF "$(RECURSE)" == "0" +! !IF "$(RECURSE)" == "0" ! ! ALL : "$(OUTDIR)\_testcapi_d.pyd" ! -! !ELSE +! !ELSE ! ! ALL : "pythoncore - Win32 Debug" "$(OUTDIR)\_testcapi_d.pyd" ! -! !ENDIF +! !ENDIF ! -! !IF "$(RECURSE)" == "1" -! CLEAN :"pythoncore - Win32 DebugCLEAN" -! !ELSE +! !IF "$(RECURSE)" == "1" +! CLEAN :"pythoncore - Win32 DebugCLEAN" +! !ELSE ! CLEAN : -! !ENDIF +! !ENDIF ! -@erase "$(INTDIR)\_testcapimodule.obj" ! -@erase "$(INTDIR)\vc60.idb" ! -@erase "$(INTDIR)\vc60.pdb" @@ -2866,47 +2023,47 @@ ! ! F90=df.exe ! CPP=cl.exe -! CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MMAP_EXPORTS" /Fp"$(INTDIR)\_testcapi.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c +! CPP_PROJ=/nologo /MDd /W3 /Gm $(EXFLAGS) /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MMAP_EXPORTS" /Fp"$(INTDIR)\_testcapi.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c ! ! .c{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .c{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! MTL=midl.exe -! MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 +! MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 ! RSC=rc.exe ! BSC32=bscmake.exe -! BSC32_FLAGS=/nologo /o"$(OUTDIR)\_testcapi.bsc" +! BSC32_FLAGS=/nologo /o"$(OUTDIR)\_testcapi.bsc" ! BSC32_SBRS= \ -! +! ! LINK32=link.exe -! LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1e1F0000" /dll /incremental:yes /pdb:"$(OUTDIR)\_testcapi_d.pdb" /debug /machine:I386 /out:"$(OUTDIR)\_testcapi_d.pyd" /implib:"$(OUTDIR)\_testcapi_d.lib" /pdbtype:sept +! LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1e1F0000" /dll /incremental:yes /pdb:"$(OUTDIR)\_testcapi_d.pdb" /debug /machine:I386 /out:"$(OUTDIR)\_testcapi_d.pyd" /implib:"$(OUTDIR)\_testcapi_d.lib" /pdbtype:sept ! LINK32_OBJS= \ ! "$(INTDIR)\_testcapimodule.obj" \ ! "$(OUTDIR)\python23_d.lib" @@ -2915,46 +2072,48 @@ ! $(LINK32) @<< ! $(LINK32_FLAGS) $(LINK32_OBJS) ! << +! if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2 +! echo $(CPP_PROJ) ! -! !ENDIF +! !ENDIF ! ! ! !IF "$(NO_EXTERNAL_DEPS)" != "1" ! !IF EXISTS("_testcapi.dep") ! !INCLUDE "_testcapi.dep" -! !ELSE +! !ELSE ! !MESSAGE Warning: cannot find "_testcapi.dep" -! !ENDIF -! !ENDIF +! !ENDIF +! !ENDIF ! ! ! !IF "$(CFG)" == "_testcapi - Win32 Release" || "$(CFG)" == "_testcapi - Win32 Debug" ! ! !IF "$(CFG)" == "_testcapi - Win32 Release" ! -! "pythoncore - Win32 Release" : +! "pythoncore - Win32 Release" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" ! cd "." ! -! "pythoncore - Win32 ReleaseCLEAN" : +! "pythoncore - Win32 ReleaseCLEAN" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" RECURSE=1 CLEAN +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" RECURSE=1 CLEAN ! cd "." ! ! !ELSEIF "$(CFG)" == "_testcapi - Win32 Debug" ! -! "pythoncore - Win32 Debug" : +! "pythoncore - Win32 Debug" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" ! cd "." ! -! "pythoncore - Win32 DebugCLEAN" : +! "pythoncore - Win32 DebugCLEAN" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" RECURSE=1 CLEAN +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" RECURSE=1 CLEAN ! cd "." ! -! !ENDIF +! !ENDIF ! ! SOURCE=..\Modules\_testcapimodule.c ! @@ -2963,10 +2122,9 @@ ! ! ! -! !ENDIF -! -*** misc/Python-2.3.4/PCbuild/_tkinter.dep Thu Sep 1 19:41:42 2005 ---- misc/build/Python-2.3.4/PCbuild/_tkinter.dep Thu Sep 1 19:40:58 2005 +! !ENDIF +*** misc/Python-2.3.4/PCbuild/_tkinter.dep Thu Jun 29 12:10:03 2006 +--- misc/build/Python-2.3.4/PCbuild/_tkinter.dep Thu Jun 29 11:02:19 2006 *************** *** 1 **** ! dummy @@ -3020,38 +2178,17 @@ ! "..\PC\pyconfig.h"\ ! {$(INCLUDE)}"basetsd.h"\ ! -*** misc/Python-2.3.4/PCbuild/_tkinter.mak Thu Sep 1 19:41:42 2005 ---- misc/build/Python-2.3.4/PCbuild/_tkinter.mak Thu Sep 1 19:40:58 2005 +*** misc/Python-2.3.4/PCbuild/_tkinter.mak Thu Jun 29 12:10:03 2006 +--- misc/build/Python-2.3.4/PCbuild/_tkinter.mak Thu Jun 29 16:33:48 2006 *************** *** 1 **** ! dummy ---- 1,265 ---- -! # Microsoft Developer Studio Generated NMAKE File, Based on _tkinter.dsp +--- 1,247 ---- ! !IF "$(CFG)" == "" ! CFG=_tkinter - Win32 Release -! !MESSAGE Keine Konfiguration angegeben. _tkinter - Win32 Release wird als Standard verwendet. -! !ENDIF -! -! !IF "$(CFG)" != "_tkinter - Win32 Debug" && "$(CFG)" != "_tkinter - Win32 Release" -! !MESSAGE Ungltige Konfiguration "$(CFG)" angegeben. -! !MESSAGE Sie k”nnen beim Ausfhren von NMAKE eine Konfiguration angeben -! !MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel: -! !MESSAGE -! !MESSAGE NMAKE /f "_tkinter.mak" CFG="_tkinter - Win32 Release" -! !MESSAGE -! !MESSAGE Fr die Konfiguration stehen zur Auswahl: -! !MESSAGE -! !MESSAGE "_tkinter - Win32 Debug" (basierend auf "Win32 (x86) Dynamic-Link Library") -! !MESSAGE "_tkinter - Win32 Release" (basierend auf "Win32 (x86) Dynamic-Link Library") -! !MESSAGE -! !ERROR Eine ungltige Konfiguration wurde angegeben. -! !ENDIF +! !ENDIF ! -! !IF "$(OS)" == "Windows_NT" ! NULL= -! !ELSE -! NULL=nul -! !ENDIF ! ! !IF "$(CFG)" == "_tkinter - Win32 Debug" ! @@ -3061,21 +2198,21 @@ ! OutDir=.\. ! # End Custom Macros ! -! !IF "$(RECURSE)" == "0" +! !IF "$(RECURSE)" == "0" ! ! ALL : "$(OUTDIR)\_tkinter_d.pyd" ! -! !ELSE +! !ELSE ! ! ALL : "pythoncore - Win32 Debug" "$(OUTDIR)\_tkinter_d.pyd" ! -! !ENDIF +! !ENDIF ! -! !IF "$(RECURSE)" == "1" -! CLEAN :"pythoncore - Win32 DebugCLEAN" -! !ELSE +! !IF "$(RECURSE)" == "1" +! CLEAN :"pythoncore - Win32 DebugCLEAN" +! !ELSE ! CLEAN : -! !ENDIF +! !ENDIF ! -@erase "$(INTDIR)\_tkinter.obj" ! -@erase "$(INTDIR)\tkappinit.obj" ! -@erase "$(INTDIR)\vc60.idb" @@ -3094,47 +2231,47 @@ ! ! F90=df.exe ! CPP=cl.exe -! CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\tcl84\include" /I "..\Include" /I "..\PC" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "WITH_APPINIT" /Fp"$(INTDIR)\_tkinter.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +! CPP_PROJ=/nologo /MDd /W3 /Gm $(EXFLAGS) /Zi /Od /I "..\..\tcl84\include" /I "..\Include" /I "..\PC" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "WITH_APPINIT" /Fp"$(INTDIR)\_tkinter.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c ! ! .c{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .c{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! MTL=midl.exe -! MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 +! MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 ! RSC=rc.exe ! BSC32=bscmake.exe -! BSC32_FLAGS=/nologo /o"$(OUTDIR)\_tkinter.bsc" +! BSC32_FLAGS=/nologo /o"$(OUTDIR)\_tkinter.bsc" ! BSC32_SBRS= \ -! +! ! LINK32=link.exe -! LINK32_FLAGS=..\..\tcl84\lib\tk84.lib ..\..\tcl84\lib\tcl84.lib odbc32.lib odbccp32.lib user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e190000" /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\_tkinter_d.pdb" /debug /machine:I386 /out:"$(OUTDIR)\_tkinter_d.pyd" /implib:"$(OUTDIR)\_tkinter_d.lib" /pdbtype:sept /libpath:"C:\Program Files\Tcl\lib" +! LINK32_FLAGS=..\..\tcl84\lib\tk84.lib ..\..\tcl84\lib\tcl84.lib odbc32.lib odbccp32.lib user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e190000" /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\_tkinter_d.pdb" /debug /machine:I386 /out:"$(OUTDIR)\_tkinter_d.pyd" /implib:"$(OUTDIR)\_tkinter_d.lib" /pdbtype:sept /libpath:"C:\Program Files\Tcl\lib" ! LINK32_OBJS= \ ! "$(INTDIR)\_tkinter.obj" \ ! "$(INTDIR)\tkappinit.obj" \ @@ -3144,6 +2281,8 @@ ! $(LINK32) @<< ! $(LINK32_FLAGS) $(LINK32_OBJS) ! << +! if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2 +! echo $(CPP_PROJ) ! ! !ELSEIF "$(CFG)" == "_tkinter - Win32 Release" ! @@ -3153,21 +2292,21 @@ ! OutDir=.\. ! # End Custom Macros ! -! !IF "$(RECURSE)" == "0" +! !IF "$(RECURSE)" == "0" ! ! ALL : "$(OUTDIR)\_tkinter.pyd" ! -! !ELSE +! !ELSE ! ! ALL : "pythoncore - Win32 Release" "$(OUTDIR)\_tkinter.pyd" ! -! !ENDIF +! !ENDIF ! -! !IF "$(RECURSE)" == "1" -! CLEAN :"pythoncore - Win32 ReleaseCLEAN" -! !ELSE +! !IF "$(RECURSE)" == "1" +! CLEAN :"pythoncore - Win32 ReleaseCLEAN" +! !ELSE ! CLEAN : -! !ENDIF +! !ENDIF ! -@erase "$(INTDIR)\_tkinter.obj" ! -@erase "$(INTDIR)\tkappinit.obj" ! -@erase "$(INTDIR)\vc60.idb" @@ -3185,47 +2324,47 @@ ! ! F90=df.exe ! CPP=cl.exe -! CPP_PROJ=/nologo /MD /W3 /GX /Zi /O2 /I "..\..\tcl84\include" /I "..\Include" /I "..\PC" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WITH_APPINIT" /Fp"$(INTDIR)\_tkinter.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +! CPP_PROJ=/nologo /MD /W3 $(EXFLAGS) /Zi /O2 /I "..\..\tcl84\include" /I "..\Include" /I "..\PC" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WITH_APPINIT" /Fp"$(INTDIR)\_tkinter.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c ! ! .c{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .c{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! MTL=midl.exe -! MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +! MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 ! RSC=rc.exe ! BSC32=bscmake.exe -! BSC32_FLAGS=/nologo /o"$(OUTDIR)\_tkinter.bsc" +! BSC32_FLAGS=/nologo /o"$(OUTDIR)\_tkinter.bsc" ! BSC32_SBRS= \ -! +! ! LINK32=link.exe -! LINK32_FLAGS=..\..\tcl84\lib\tk84.lib ..\..\tcl84\lib\tcl84.lib odbc32.lib odbccp32.lib user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e190000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\_tkinter.pdb" /debug /machine:I386 /out:"$(OUTDIR)\_tkinter.pyd" /implib:"$(OUTDIR)\_tkinter.lib" /libpath:"C:\Program Files\Tcl\lib" +! LINK32_FLAGS=..\..\tcl84\lib\tk84.lib ..\..\tcl84\lib\tcl84.lib odbc32.lib odbccp32.lib user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e190000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\_tkinter.pdb" /debug /machine:I386 /out:"$(OUTDIR)\_tkinter.pyd" /implib:"$(OUTDIR)\_tkinter.lib" /libpath:"C:\Program Files\Tcl\lib" ! LINK32_OBJS= \ ! "$(INTDIR)\_tkinter.obj" \ ! "$(INTDIR)\tkappinit.obj" \ @@ -3235,46 +2374,48 @@ ! $(LINK32) @<< ! $(LINK32_FLAGS) $(LINK32_OBJS) ! << +! if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2 +! echo $(CPP_PROJ) ! -! !ENDIF +! !ENDIF ! ! ! !IF "$(NO_EXTERNAL_DEPS)" != "1" ! !IF EXISTS("_tkinter.dep") ! !INCLUDE "_tkinter.dep" -! !ELSE +! !ELSE ! !MESSAGE Warning: cannot find "_tkinter.dep" -! !ENDIF -! !ENDIF +! !ENDIF +! !ENDIF ! ! ! !IF "$(CFG)" == "_tkinter - Win32 Debug" || "$(CFG)" == "_tkinter - Win32 Release" ! ! !IF "$(CFG)" == "_tkinter - Win32 Debug" ! -! "pythoncore - Win32 Debug" : +! "pythoncore - Win32 Debug" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" ! cd "." ! -! "pythoncore - Win32 DebugCLEAN" : +! "pythoncore - Win32 DebugCLEAN" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" RECURSE=1 CLEAN +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" RECURSE=1 CLEAN ! cd "." ! ! !ELSEIF "$(CFG)" == "_tkinter - Win32 Release" ! -! "pythoncore - Win32 Release" : +! "pythoncore - Win32 Release" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" ! cd "." ! -! "pythoncore - Win32 ReleaseCLEAN" : +! "pythoncore - Win32 ReleaseCLEAN" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" RECURSE=1 CLEAN +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" RECURSE=1 CLEAN ! cd "." ! -! !ENDIF +! !ENDIF ! ! SOURCE=..\Modules\_tkinter.c ! @@ -3289,10 +2430,9 @@ ! ! ! -! !ENDIF -! -*** misc/Python-2.3.4/PCbuild/bz2.dep Thu Sep 1 19:41:42 2005 ---- misc/build/Python-2.3.4/PCbuild/bz2.dep Thu Sep 1 19:40:58 2005 +! !ENDIF +*** misc/Python-2.3.4/PCbuild/bz2.dep Thu Jun 29 12:10:03 2006 +--- misc/build/Python-2.3.4/PCbuild/bz2.dep Thu Jun 29 11:02:20 2006 *************** *** 1 **** ! dummy @@ -3347,38 +2487,17 @@ ! "..\PC\pyconfig.h"\ ! {$(INCLUDE)}"basetsd.h"\ ! -*** misc/Python-2.3.4/PCbuild/bz2.mak Thu Sep 1 19:41:42 2005 ---- misc/build/Python-2.3.4/PCbuild/bz2.mak Thu Sep 1 19:40:58 2005 +*** misc/Python-2.3.4/PCbuild/bz2.mak Thu Jun 29 12:10:03 2006 +--- misc/build/Python-2.3.4/PCbuild/bz2.mak Mon Jul 3 09:46:36 2006 *************** *** 1 **** ! dummy ---- 1,204 ---- -! # Microsoft Developer Studio Generated NMAKE File, Based on bz2.dsp +--- 1,187 ---- ! !IF "$(CFG)" == "" -! CFG=bz2 - Win32 Debug -! !MESSAGE Keine Konfiguration angegeben. bz2 - Win32 Debug wird als Standard verwendet. -! !ENDIF +! CFG=bz2 - Win32 Release +! !ENDIF ! -! !IF "$(CFG)" != "bz2 - Win32 Release" && "$(CFG)" != "bz2 - Win32 Debug" -! !MESSAGE Ungltige Konfiguration "$(CFG)" angegeben. -! !MESSAGE Sie k”nnen beim Ausfhren von NMAKE eine Konfiguration angeben -! !MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel: -! !MESSAGE -! !MESSAGE NMAKE /f "bz2.mak" CFG="bz2 - Win32 Debug" -! !MESSAGE -! !MESSAGE Fr die Konfiguration stehen zur Auswahl: -! !MESSAGE -! !MESSAGE "bz2 - Win32 Release" (basierend auf "Win32 (x86) Dynamic-Link Library") -! !MESSAGE "bz2 - Win32 Debug" (basierend auf "Win32 (x86) Dynamic-Link Library") -! !MESSAGE -! !ERROR Eine ungltige Konfiguration wurde angegeben. -! !ENDIF -! -! !IF "$(OS)" == "Windows_NT" ! NULL= -! !ELSE -! NULL=nul -! !ENDIF ! ! !IF "$(CFG)" == "bz2 - Win32 Release" ! @@ -3408,47 +2527,47 @@ ! ! F90=df.exe ! CPP=cl.exe -! CPP_PROJ=/nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "..\..\bzip2-1.0.2" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\bz2.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +! CPP_PROJ=/nologo /MD /W3 $(EXFLAGS) /Zi /O2 /I "..\Include" /I "..\PC" /I "..\..\bzip2-1.0.2" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\bz2.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c ! ! .c{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .c{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! MTL=midl.exe -! MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +! MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 ! RSC=rc.exe ! BSC32=bscmake.exe -! BSC32_FLAGS=/nologo /o"$(OUTDIR)\bz2.bsc" +! BSC32_FLAGS=/nologo /o"$(OUTDIR)\bz2.bsc" ! BSC32_SBRS= \ -! +! ! LINK32=link.exe -! LINK32_FLAGS=..\..\bzip2-1.0.2\libbz2.lib /nologo /base:"0x1D170000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\bz2.pdb" /debug /machine:I386 /nodefaultlib:"libc" /out:"$(OUTDIR)\bz2.pyd" /implib:"$(OUTDIR)\bz2.lib" +! LINK32_FLAGS=..\..\bzip2-1.0.2\libbz2.lib /nologo /base:"0x1D170000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\bz2.pdb" /debug /machine:I386 /nodefaultlib:"libc" /out:"$(OUTDIR)\bz2.pyd" /implib:"$(OUTDIR)\bz2.lib" ! LINK32_OBJS= \ ! "$(INTDIR)\bz2module.obj" ! @@ -3456,6 +2575,8 @@ ! $(LINK32) @<< ! $(LINK32_FLAGS) $(LINK32_OBJS) ! << +! if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2 +! echo $(CPP_PROJ) ! ! !ELSEIF "$(CFG)" == "bz2 - Win32 Debug" ! @@ -3486,47 +2607,47 @@ ! ! F90=df.exe ! CPP=cl.exe -! CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /I "..\..\bzip2-1.0.2" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\bz2.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +! CPP_PROJ=/nologo /MDd /W3 /Gm $(EXFLAGS) /Zi /Od /I "..\Include" /I "..\PC" /I "..\..\bzip2-1.0.2" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\bz2.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c ! ! .c{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .c{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! MTL=midl.exe -! MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 +! MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 ! RSC=rc.exe ! BSC32=bscmake.exe -! BSC32_FLAGS=/nologo /o"$(OUTDIR)\bz2.bsc" +! BSC32_FLAGS=/nologo /o"$(OUTDIR)\bz2.bsc" ! BSC32_SBRS= \ -! +! ! LINK32=link.exe -! LINK32_FLAGS=..\..\bzip2-1.0.2\libbz2.lib /nologo /base:"0x1D170000" /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\bz2_d.pdb" /debug /machine:I386 /nodefaultlib:"msvcrt" /nodefaultlib:"libc" /out:"$(OUTDIR)\bz2_d.pyd" /implib:"$(OUTDIR)\bz2_d.lib" /pdbtype:sept +! LINK32_FLAGS=..\..\bzip2-1.0.2\libbz2.lib /nologo /base:"0x1D170000" /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\bz2_d.pdb" /debug /machine:I386 /nodefaultlib:"msvcrt" /nodefaultlib:"libc" /out:"$(OUTDIR)\bz2_d.pyd" /implib:"$(OUTDIR)\bz2_d.lib" /pdbtype:sept ! LINK32_OBJS= \ ! "$(INTDIR)\bz2module.obj" ! @@ -3534,17 +2655,19 @@ ! $(LINK32) @<< ! $(LINK32_FLAGS) $(LINK32_OBJS) ! << +! if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2 +! echo $(CPP_PROJ) ! -! !ENDIF +! !ENDIF ! ! ! !IF "$(NO_EXTERNAL_DEPS)" != "1" ! !IF EXISTS("bz2.dep") ! !INCLUDE "bz2.dep" -! !ELSE +! !ELSE ! !MESSAGE Warning: cannot find "bz2.dep" -! !ENDIF -! !ENDIF +! !ENDIF +! !ENDIF ! ! ! !IF "$(CFG)" == "bz2 - Win32 Release" || "$(CFG)" == "bz2 - Win32 Debug" @@ -3555,10 +2678,10 @@ ! ! ! -! !ENDIF +! !ENDIF ! -*** misc/Python-2.3.4/PCbuild/datetime.dep Thu Sep 1 19:41:40 2005 ---- misc/build/Python-2.3.4/PCbuild/datetime.dep Thu Sep 1 19:40:58 2005 +*** misc/Python-2.3.4/PCbuild/datetime.dep Thu Jun 29 12:09:57 2006 +--- misc/build/Python-2.3.4/PCbuild/datetime.dep Thu Jun 29 11:02:20 2006 *************** *** 1 **** ! dummy @@ -3613,38 +2736,17 @@ ! "..\PC\pyconfig.h"\ ! {$(INCLUDE)}"basetsd.h"\ ! -*** misc/Python-2.3.4/PCbuild/datetime.mak Thu Sep 1 19:41:40 2005 ---- misc/build/Python-2.3.4/PCbuild/datetime.mak Thu Sep 1 19:40:58 2005 +*** misc/Python-2.3.4/PCbuild/datetime.mak Thu Jun 29 12:09:57 2006 +--- misc/build/Python-2.3.4/PCbuild/datetime.mak Fri Jun 30 10:05:26 2006 *************** *** 1 **** ! dummy ---- 1,255 ---- -! # Microsoft Developer Studio Generated NMAKE File, Based on datetime.dsp +--- 1,239 ---- ! !IF "$(CFG)" == "" -! CFG=datetime - Win32 Debug -! !MESSAGE Keine Konfiguration angegeben. datetime - Win32 Debug wird als Standard verwendet. -! !ENDIF +! CFG=datetime - Win32 Release +! !ENDIF ! -! !IF "$(CFG)" != "datetime - Win32 Release" && "$(CFG)" != "datetime - Win32 Debug" -! !MESSAGE Ungltige Konfiguration "$(CFG)" angegeben. -! !MESSAGE Sie k”nnen beim Ausfhren von NMAKE eine Konfiguration angeben -! !MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel: -! !MESSAGE -! !MESSAGE NMAKE /f "datetime.mak" CFG="datetime - Win32 Debug" -! !MESSAGE -! !MESSAGE Fr die Konfiguration stehen zur Auswahl: -! !MESSAGE -! !MESSAGE "datetime - Win32 Release" (basierend auf "Win32 (x86) Dynamic-Link Library") -! !MESSAGE "datetime - Win32 Debug" (basierend auf "Win32 (x86) Dynamic-Link Library") -! !MESSAGE -! !ERROR Eine ungltige Konfiguration wurde angegeben. -! !ENDIF -! -! !IF "$(OS)" == "Windows_NT" ! NULL= -! !ELSE -! NULL=nul -! !ENDIF ! ! !IF "$(CFG)" == "datetime - Win32 Release" ! @@ -3654,21 +2756,23 @@ ! OutDir=.\. ! # End Custom Macros ! -! !IF "$(RECURSE)" == "0" +! !MESSAGE datetime - Win32 Release +! +! !IF "$(RECURSE)" == "0" ! ! ALL : "$(OUTDIR)\datetime.pyd" ! -! !ELSE +! !ELSE ! ! ALL : "pythoncore - Win32 Release" "$(OUTDIR)\datetime.pyd" ! -! !ENDIF +! !ENDIF ! -! !IF "$(RECURSE)" == "1" -! CLEAN :"pythoncore - Win32 ReleaseCLEAN" -! !ELSE +! !IF "$(RECURSE)" == "1" +! CLEAN :"pythoncore - Win32 ReleaseCLEAN" +! !ELSE ! CLEAN : -! !ENDIF +! !ENDIF ! -@erase "$(INTDIR)\datetimemodule.obj" ! -@erase "$(INTDIR)\vc60.idb" ! -@erase "$(INTDIR)\vc60.pdb" @@ -3685,47 +2789,47 @@ ! ! F90=df.exe ! CPP=cl.exe -! CPP_PROJ=/nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\datetime.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +! CPP_PROJ=/nologo /MD /W3 $(EXFLAGS) /Zi /O2 /I "..\Include" /I "..\PC" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\datetime.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c ! ! .c{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .c{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! MTL=midl.exe -! MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +! MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 ! RSC=rc.exe ! BSC32=bscmake.exe -! BSC32_FLAGS=/nologo /o"$(OUTDIR)\datetime.bsc" +! BSC32_FLAGS=/nologo /o"$(OUTDIR)\datetime.bsc" ! BSC32_SBRS= \ -! +! ! LINK32=link.exe -! LINK32_FLAGS=user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /base:"0x1D180000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\datetime.pdb" /debug /machine:I386 /nodefaultlib:"libc" /out:"$(OUTDIR)\datetime.pyd" /implib:"$(OUTDIR)\datetime.lib" +! LINK32_FLAGS=user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /base:"0x1D180000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\datetime.pdb" /debug /machine:I386 /nodefaultlib:"libc" /out:"$(OUTDIR)\datetime.pyd" /implib:"$(OUTDIR)\datetime.lib" ! LINK32_OBJS= \ ! "$(INTDIR)\datetimemodule.obj" \ ! "$(OUTDIR)\python23.lib" @@ -3734,6 +2838,8 @@ ! $(LINK32) @<< ! $(LINK32_FLAGS) $(LINK32_OBJS) ! << +! if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2 +! echo $(CPP_PROJ) ! ! !ELSEIF "$(CFG)" == "datetime - Win32 Debug" ! @@ -3743,21 +2849,21 @@ ! OutDir=.\. ! # End Custom Macros ! -! !IF "$(RECURSE)" == "0" +! !IF "$(RECURSE)" == "0" ! ! ALL : "$(OUTDIR)\datetime_d.pyd" ! -! !ELSE +! !ELSE ! ! ALL : "pythoncore - Win32 Debug" "$(OUTDIR)\datetime_d.pyd" ! -! !ENDIF +! !ENDIF ! -! !IF "$(RECURSE)" == "1" -! CLEAN :"pythoncore - Win32 DebugCLEAN" -! !ELSE +! !IF "$(RECURSE)" == "1" +! CLEAN :"pythoncore - Win32 DebugCLEAN" +! !ELSE ! CLEAN : -! !ENDIF +! !ENDIF ! -@erase "$(INTDIR)\datetimemodule.obj" ! -@erase "$(INTDIR)\vc60.idb" ! -@erase "$(INTDIR)\vc60.pdb" @@ -3775,47 +2881,47 @@ ! ! F90=df.exe ! CPP=cl.exe -! CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\datetime.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +! CPP_PROJ=/nologo /MDd /W3 /Gm $(EXFLAGS) /Zi /Od /I "..\Include" /I "..\PC" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\datetime.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c ! ! .c{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .c{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! MTL=midl.exe -! MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 +! MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 ! RSC=rc.exe ! BSC32=bscmake.exe -! BSC32_FLAGS=/nologo /o"$(OUTDIR)\datetime.bsc" +! BSC32_FLAGS=/nologo /o"$(OUTDIR)\datetime.bsc" ! BSC32_SBRS= \ -! +! ! LINK32=link.exe -! LINK32_FLAGS=user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /base:"0x1D180000" /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\datetime_d.pdb" /debug /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"msvcrt" /out:"$(OUTDIR)\datetime_d.pyd" /implib:"$(OUTDIR)\datetime_d.lib" /pdbtype:sept +! LINK32_FLAGS=user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /base:"0x1D180000" /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\datetime_d.pdb" /debug /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"msvcrt" /out:"$(OUTDIR)\datetime_d.pyd" /implib:"$(OUTDIR)\datetime_d.lib" /pdbtype:sept ! LINK32_OBJS= \ ! "$(INTDIR)\datetimemodule.obj" \ ! "$(OUTDIR)\python23_d.lib" @@ -3824,46 +2930,48 @@ ! $(LINK32) @<< ! $(LINK32_FLAGS) $(LINK32_OBJS) ! << +! if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2 +! echo $(CPP_PROJ) ! -! !ENDIF +! !ENDIF ! ! ! !IF "$(NO_EXTERNAL_DEPS)" != "1" ! !IF EXISTS("datetime.dep") ! !INCLUDE "datetime.dep" -! !ELSE +! !ELSE ! !MESSAGE Warning: cannot find "datetime.dep" -! !ENDIF -! !ENDIF +! !ENDIF +! !ENDIF ! ! ! !IF "$(CFG)" == "datetime - Win32 Release" || "$(CFG)" == "datetime - Win32 Debug" ! ! !IF "$(CFG)" == "datetime - Win32 Release" ! -! "pythoncore - Win32 Release" : +! "pythoncore - Win32 Release" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" EXFLAGS="$(EXFLAGS)" ! cd "." ! -! "pythoncore - Win32 ReleaseCLEAN" : +! "pythoncore - Win32 ReleaseCLEAN" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" RECURSE=1 CLEAN +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" RECURSE=1 CLEAN ! cd "." ! ! !ELSEIF "$(CFG)" == "datetime - Win32 Debug" ! -! "pythoncore - Win32 Debug" : +! "pythoncore - Win32 Debug" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" EXFLAGS="$(EXFLAGS)" ! cd "." ! -! "pythoncore - Win32 DebugCLEAN" : +! "pythoncore - Win32 DebugCLEAN" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" RECURSE=1 CLEAN +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" RECURSE=1 CLEAN ! cd "." ! -! !ENDIF +! !ENDIF ! ! SOURCE=..\Modules\datetimemodule.c ! @@ -3872,10 +2980,9 @@ ! ! ! -! !ENDIF -! -*** misc/Python-2.3.4/PCbuild/make_versioninfo.dep Thu Sep 1 19:41:42 2005 ---- misc/build/Python-2.3.4/PCbuild/make_versioninfo.dep Thu Sep 1 19:40:58 2005 +! !ENDIF +*** misc/Python-2.3.4/PCbuild/make_versioninfo.dep Thu Jun 29 12:10:03 2006 +--- misc/build/Python-2.3.4/PCbuild/make_versioninfo.dep Thu Jun 29 11:02:20 2006 *************** *** 1 **** ! dummy @@ -3885,38 +2992,17 @@ ! ..\PC\make_versioninfo.c : \ ! "..\Include\patchlevel.h"\ ! -*** misc/Python-2.3.4/PCbuild/make_versioninfo.mak Thu Sep 1 19:41:42 2005 ---- misc/build/Python-2.3.4/PCbuild/make_versioninfo.mak Thu Sep 1 19:40:58 2005 +*** misc/Python-2.3.4/PCbuild/make_versioninfo.mak Thu Jun 29 12:10:02 2006 +--- misc/build/Python-2.3.4/PCbuild/make_versioninfo.mak Mon Jul 3 09:47:14 2006 *************** *** 1 **** ! dummy ---- 1,236 ---- -! # Microsoft Developer Studio Generated NMAKE File, Based on make_versioninfo.dsp +--- 1,220 ---- ! !IF "$(CFG)" == "" ! CFG=make_versioninfo - Win32 Release -! !MESSAGE Keine Konfiguration angegeben. make_versioninfo - Win32 Release wird als Standard verwendet. -! !ENDIF -! -! !IF "$(CFG)" != "make_versioninfo - Win32 Release" && "$(CFG)" != "make_versioninfo - Win32 Debug" -! !MESSAGE Ungltige Konfiguration "$(CFG)" angegeben. -! !MESSAGE Sie k”nnen beim Ausfhren von NMAKE eine Konfiguration angeben -! !MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel: -! !MESSAGE -! !MESSAGE NMAKE /f "make_versioninfo.mak" CFG="make_versioninfo - Win32 Release" -! !MESSAGE -! !MESSAGE Fr die Konfiguration stehen zur Auswahl: -! !MESSAGE -! !MESSAGE "make_versioninfo - Win32 Release" (basierend auf "Win32 (x86) Console Application") -! !MESSAGE "make_versioninfo - Win32 Debug" (basierend auf "Win32 (x86) Console Application") -! !MESSAGE -! !ERROR Eine ungltige Konfiguration wurde angegeben. -! !ENDIF +! !ENDIF ! -! !IF "$(OS)" == "Windows_NT" ! NULL= -! !ELSE -! NULL=nul -! !ENDIF ! ! !IF "$(CFG)" == "make_versioninfo - Win32 Release" ! @@ -3945,45 +3031,45 @@ ! if not exist "$(INTDIR)/$(NULL)" mkdir .\x86-temp-release && mkdir .\x86-temp-release\make_versioninfo ! ! CPP=cl.exe -! CPP_PROJ=/nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\make_versioninfo.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +! CPP_PROJ=/nologo /MD /W3 $(EXFLAGS) /Zi /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\make_versioninfo.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c ! ! .c{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .c{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! RSC=rc.exe ! BSC32=bscmake.exe -! BSC32_FLAGS=/nologo /o"$(OUTDIR)\make_versioninfo.bsc" +! BSC32_FLAGS=/nologo /o"$(OUTDIR)\make_versioninfo.bsc" ! BSC32_SBRS= \ -! +! ! LINK32=link.exe -! LINK32_FLAGS=odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1d000000" /subsystem:console /incremental:no /pdb:"$(OUTDIR)\make_versioninfo.pdb" /debug /machine:I386 /out:"$(OUTDIR)\make_versioninfo.exe" +! LINK32_FLAGS=odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1d000000" /subsystem:console /incremental:no /pdb:"$(OUTDIR)\make_versioninfo.pdb" /debug /machine:I386 /out:"$(OUTDIR)\make_versioninfo.exe" ! LINK32_OBJS= \ ! "$(INTDIR)\make_versioninfo.obj" ! @@ -3991,16 +3077,18 @@ ! $(LINK32) @<< ! $(LINK32_FLAGS) $(LINK32_OBJS) ! << +! if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;1 +! echo $(CPP_PROJ) ! ! InputPath=.\make_versioninfo.exe ! SOURCE="$(InputPath)" ! ! "..\PC\pythonnt_rc.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" -! <<tempfile.bat -! @echo off +! <<tempfile.bat +! @echo off ! .\make_versioninfo.exe >..\PC\pythonnt_rc.h -! << -! +! << +! ! ! !ELSEIF "$(CFG)" == "make_versioninfo - Win32 Debug" ! @@ -4031,41 +3119,41 @@ ! if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)" ! ! CPP=cl.exe -! CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\make_versioninfo.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +! CPP_PROJ=/nologo /MDd /W3 /Gm $(EXFLAGS) /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\make_versioninfo.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c ! ! .c{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .c{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! RSC=rc.exe ! BSC32=bscmake.exe -! BSC32_FLAGS=/nologo /o"$(OUTDIR)\make_versioninfo.bsc" +! BSC32_FLAGS=/nologo /o"$(OUTDIR)\make_versioninfo.bsc" ! BSC32_SBRS= \ ! "$(INTDIR)\make_versioninfo.sbr" ! @@ -4075,7 +3163,7 @@ ! << ! ! LINK32=link.exe -! LINK32_FLAGS=odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1d000000" /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\make_versioninfo_d.pdb" /debug /machine:I386 /out:"$(OUTDIR)\make_versioninfo_d.exe" /pdbtype:sept +! LINK32_FLAGS=odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1d000000" /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\make_versioninfo_d.pdb" /debug /machine:I386 /out:"$(OUTDIR)\make_versioninfo_d.exe" /pdbtype:sept ! LINK32_OBJS= \ ! "$(INTDIR)\make_versioninfo.obj" ! @@ -4083,27 +3171,29 @@ ! $(LINK32) @<< ! $(LINK32_FLAGS) $(LINK32_OBJS) ! << +! if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;1 +! echo $(CPP_PROJ) ! ! InputPath=.\make_versioninfo_d.exe ! SOURCE="$(InputPath)" ! ! "..\PC\pythonnt_rc_d.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" -! <<tempfile.bat -! @echo off +! <<tempfile.bat +! @echo off ! .\make_versioninfo_d.exe >..\PC\pythonnt_rc_d.h -! << -! +! << ! -! !ENDIF +! +! !ENDIF ! ! ! !IF "$(NO_EXTERNAL_DEPS)" != "1" ! !IF EXISTS("make_versioninfo.dep") ! !INCLUDE "make_versioninfo.dep" -! !ELSE +! !ELSE ! !MESSAGE Warning: cannot find "make_versioninfo.dep" -! !ENDIF -! !ENDIF +! !ENDIF +! !ENDIF ! ! ! !IF "$(CFG)" == "make_versioninfo - Win32 Release" || "$(CFG)" == "make_versioninfo - Win32 Debug" @@ -4123,12 +3213,13 @@ ! $(CPP) $(CPP_PROJ) $(SOURCE) ! ! -! !ENDIF +! !ENDIF ! ! -! !ENDIF -*** misc/Python-2.3.4/PCbuild/mmap.dep Thu Sep 1 19:41:40 2005 ---- misc/build/Python-2.3.4/PCbuild/mmap.dep Thu Sep 1 19:40:58 2005 +! !ENDIF +! +*** misc/Python-2.3.4/PCbuild/mmap.dep Thu Jun 29 12:09:58 2006 +--- misc/build/Python-2.3.4/PCbuild/mmap.dep Thu Jun 29 11:02:20 2006 *************** *** 1 **** ! dummy @@ -4181,38 +3272,17 @@ ! "..\PC\pyconfig.h"\ ! {$(INCLUDE)}"basetsd.h"\ ! -*** misc/Python-2.3.4/PCbuild/mmap.mak Thu Sep 1 19:41:40 2005 ---- misc/build/Python-2.3.4/PCbuild/mmap.mak Thu Sep 1 19:40:58 2005 +*** misc/Python-2.3.4/PCbuild/mmap.mak Thu Jun 29 12:09:57 2006 +--- misc/build/Python-2.3.4/PCbuild/mmap.mak Thu Jun 29 16:33:50 2006 *************** *** 1 **** ! dummy ---- 1,253 ---- -! # Microsoft Developer Studio Generated NMAKE File, Based on mmap.dsp +--- 1,235 ---- ! !IF "$(CFG)" == "" -! CFG=mmap - Win32 Debug -! !MESSAGE Keine Konfiguration angegeben. mmap - Win32 Debug wird als Standard verwendet. -! !ENDIF -! -! !IF "$(CFG)" != "mmap - Win32 Release" && "$(CFG)" != "mmap - Win32 Debug" -! !MESSAGE Ungltige Konfiguration "$(CFG)" angegeben. -! !MESSAGE Sie k”nnen beim Ausfhren von NMAKE eine Konfiguration angeben -! !MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel: -! !MESSAGE -! !MESSAGE NMAKE /f "mmap.mak" CFG="mmap - Win32 Debug" -! !MESSAGE -! !MESSAGE Fr die Konfiguration stehen zur Auswahl: -! !MESSAGE -! !MESSAGE "mmap - Win32 Release" (basierend auf "Win32 (x86) Dynamic-Link Library") -! !MESSAGE "mmap - Win32 Debug" (basierend auf "Win32 (x86) Dynamic-Link Library") -! !MESSAGE -! !ERROR Eine ungltige Konfiguration wurde angegeben. -! !ENDIF +! CFG=mmap - Win32 Release +! !ENDIF ! -! !IF "$(OS)" == "Windows_NT" ! NULL= -! !ELSE -! NULL=nul -! !ENDIF ! ! !IF "$(CFG)" == "mmap - Win32 Release" ! @@ -4222,21 +3292,21 @@ ! OutDir=.\. ! # End Custom Macros ! -! !IF "$(RECURSE)" == "0" +! !IF "$(RECURSE)" == "0" ! ! ALL : "$(OUTDIR)\mmap.pyd" ! -! !ELSE +! !ELSE ! ! ALL : "pythoncore - Win32 Release" "$(OUTDIR)\mmap.pyd" ! -! !ENDIF +! !ENDIF ! -! !IF "$(RECURSE)" == "1" -! CLEAN :"pythoncore - Win32 ReleaseCLEAN" -! !ELSE +! !IF "$(RECURSE)" == "1" +! CLEAN :"pythoncore - Win32 ReleaseCLEAN" +! !ELSE ! CLEAN : -! !ENDIF +! !ENDIF ! -@erase "$(INTDIR)\mmapmodule.obj" ! -@erase "$(INTDIR)\vc60.idb" ! -@erase "$(OUTDIR)\mmap.exp" @@ -4251,47 +3321,47 @@ ! ! F90=df.exe ! CPP=cl.exe -! CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MMAP_EXPORTS" /Fp"$(INTDIR)\mmap.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +! CPP_PROJ=/nologo /MD /W3 $(EXFLAGS) /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MMAP_EXPORTS" /Fp"$(INTDIR)\mmap.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c ! ! .c{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .c{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! MTL=midl.exe -! MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 +! MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 ! RSC=rc.exe ! BSC32=bscmake.exe -! BSC32_FLAGS=/nologo /o"$(OUTDIR)\mmap.bsc" +! BSC32_FLAGS=/nologo /o"$(OUTDIR)\mmap.bsc" ! BSC32_SBRS= \ -! +! ! LINK32=link.exe -! LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1e1F0000" /dll /incremental:no /pdb:"$(OUTDIR)\mmap.pdb" /machine:I386 /out:"$(OUTDIR)\mmap.pyd" /implib:"$(OUTDIR)\mmap.lib" +! LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1e1F0000" /dll /incremental:no /pdb:"$(OUTDIR)\mmap.pdb" /machine:I386 /out:"$(OUTDIR)\mmap.pyd" /implib:"$(OUTDIR)\mmap.lib" ! LINK32_OBJS= \ ! "$(INTDIR)\mmapmodule.obj" \ ! "$(OUTDIR)\python23.lib" @@ -4300,6 +3370,8 @@ ! $(LINK32) @<< ! $(LINK32_FLAGS) $(LINK32_OBJS) ! << +! if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2 +! echo $(CPP_PROJ) ! ! !ELSEIF "$(CFG)" == "mmap - Win32 Debug" ! @@ -4309,21 +3381,21 @@ ! OutDir=.\. ! # End Custom Macros ! -! !IF "$(RECURSE)" == "0" +! !IF "$(RECURSE)" == "0" ! ! ALL : "$(OUTDIR)\mmap_d.pyd" ! -! !ELSE +! !ELSE ! ! ALL : "pythoncore - Win32 Debug" "$(OUTDIR)\mmap_d.pyd" ! -! !ENDIF +! !ENDIF ! -! !IF "$(RECURSE)" == "1" -! CLEAN :"pythoncore - Win32 DebugCLEAN" -! !ELSE +! !IF "$(RECURSE)" == "1" +! CLEAN :"pythoncore - Win32 DebugCLEAN" +! !ELSE ! CLEAN : -! !ENDIF +! !ENDIF ! -@erase "$(INTDIR)\mmapmodule.obj" ! -@erase "$(INTDIR)\vc60.idb" ! -@erase "$(INTDIR)\vc60.pdb" @@ -4341,47 +3413,47 @@ ! ! F90=df.exe ! CPP=cl.exe -! CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MMAP_EXPORTS" /Fp"$(INTDIR)\mmap.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c +! CPP_PROJ=/nologo /MDd /W3 /Gm $(EXFLAGS) /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MMAP_EXPORTS" /Fp"$(INTDIR)\mmap.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c ! ! .c{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .c{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! MTL=midl.exe -! MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 +! MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 ! RSC=rc.exe ! BSC32=bscmake.exe -! BSC32_FLAGS=/nologo /o"$(OUTDIR)\mmap.bsc" +! BSC32_FLAGS=/nologo /o"$(OUTDIR)\mmap.bsc" ! BSC32_SBRS= \ -! +! ! LINK32=link.exe -! LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1e1F0000" /dll /incremental:yes /pdb:"$(OUTDIR)\mmap_d.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mmap_d.pyd" /implib:"$(OUTDIR)\mmap_d.lib" /pdbtype:sept +! LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1e1F0000" /dll /incremental:yes /pdb:"$(OUTDIR)\mmap_d.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mmap_d.pyd" /implib:"$(OUTDIR)\mmap_d.lib" /pdbtype:sept ! LINK32_OBJS= \ ! "$(INTDIR)\mmapmodule.obj" \ ! "$(OUTDIR)\python23_d.lib" @@ -4390,46 +3462,48 @@ ! $(LINK32) @<< ! $(LINK32_FLAGS) $(LINK32_OBJS) ! << +! if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2 +! echo $(CPP_PROJ) ! -! !ENDIF +! !ENDIF ! ! ! !IF "$(NO_EXTERNAL_DEPS)" != "1" ! !IF EXISTS("mmap.dep") ! !INCLUDE "mmap.dep" -! !ELSE +! !ELSE ! !MESSAGE Warning: cannot find "mmap.dep" -! !ENDIF -! !ENDIF +! !ENDIF +! !ENDIF ! ! ! !IF "$(CFG)" == "mmap - Win32 Release" || "$(CFG)" == "mmap - Win32 Debug" ! ! !IF "$(CFG)" == "mmap - Win32 Release" ! -! "pythoncore - Win32 Release" : +! "pythoncore - Win32 Release" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" ! cd "." ! -! "pythoncore - Win32 ReleaseCLEAN" : +! "pythoncore - Win32 ReleaseCLEAN" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" RECURSE=1 CLEAN +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" RECURSE=1 CLEAN ! cd "." ! ! !ELSEIF "$(CFG)" == "mmap - Win32 Debug" ! -! "pythoncore - Win32 Debug" : +! "pythoncore - Win32 Debug" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" ! cd "." ! -! "pythoncore - Win32 DebugCLEAN" : +! "pythoncore - Win32 DebugCLEAN" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" RECURSE=1 CLEAN +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" RECURSE=1 CLEAN ! cd "." ! -! !ENDIF +! !ENDIF ! ! SOURCE=..\Modules\mmapmodule.c ! @@ -4438,10 +3512,9 @@ ! ! ! -! !ENDIF -! -*** misc/Python-2.3.4/PCbuild/parser.dep Thu Sep 1 19:41:41 2005 ---- misc/build/Python-2.3.4/PCbuild/parser.dep Thu Sep 1 19:40:58 2005 +! !ENDIF +*** misc/Python-2.3.4/PCbuild/parser.dep Thu Jun 29 12:09:58 2006 +--- misc/build/Python-2.3.4/PCbuild/parser.dep Thu Jun 29 11:02:20 2006 *************** *** 1 **** ! dummy @@ -4499,38 +3572,17 @@ ! "..\PC\pyconfig.h"\ ! {$(INCLUDE)}"basetsd.h"\ ! -*** misc/Python-2.3.4/PCbuild/parser.mak Thu Sep 1 19:41:40 2005 ---- misc/build/Python-2.3.4/PCbuild/parser.mak Thu Sep 1 19:40:58 2005 +*** misc/Python-2.3.4/PCbuild/parser.mak Thu Jun 29 12:09:58 2006 +--- misc/build/Python-2.3.4/PCbuild/parser.mak Thu Jun 29 16:33:50 2006 *************** *** 1 **** ! dummy ---- 1,255 ---- -! # Microsoft Developer Studio Generated NMAKE File, Based on parser.dsp +--- 1,237 ---- ! !IF "$(CFG)" == "" ! CFG=parser - Win32 Release -! !MESSAGE Keine Konfiguration angegeben. parser - Win32 Release wird als Standard verwendet. -! !ENDIF +! !ENDIF ! -! !IF "$(CFG)" != "parser - Win32 Release" && "$(CFG)" != "parser - Win32 Debug" -! !MESSAGE Ungltige Konfiguration "$(CFG)" angegeben. -! !MESSAGE Sie k”nnen beim Ausfhren von NMAKE eine Konfiguration angeben -! !MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel: -! !MESSAGE -! !MESSAGE NMAKE /f "parser.mak" CFG="parser - Win32 Release" -! !MESSAGE -! !MESSAGE Fr die Konfiguration stehen zur Auswahl: -! !MESSAGE -! !MESSAGE "parser - Win32 Release" (basierend auf "Win32 (x86) Dynamic-Link Library") -! !MESSAGE "parser - Win32 Debug" (basierend auf "Win32 (x86) Dynamic-Link Library") -! !MESSAGE -! !ERROR Eine ungltige Konfiguration wurde angegeben. -! !ENDIF -! -! !IF "$(OS)" == "Windows_NT" ! NULL= -! !ELSE -! NULL=nul -! !ENDIF ! ! !IF "$(CFG)" == "parser - Win32 Release" ! @@ -4540,21 +3592,21 @@ ! OutDir=.\. ! # End Custom Macros ! -! !IF "$(RECURSE)" == "0" +! !IF "$(RECURSE)" == "0" ! ! ALL : "$(OUTDIR)\parser.pyd" ! -! !ELSE +! !ELSE ! ! ALL : "pythoncore - Win32 Release" "$(OUTDIR)\parser.pyd" ! -! !ENDIF +! !ENDIF ! -! !IF "$(RECURSE)" == "1" -! CLEAN :"pythoncore - Win32 ReleaseCLEAN" -! !ELSE +! !IF "$(RECURSE)" == "1" +! CLEAN :"pythoncore - Win32 ReleaseCLEAN" +! !ELSE ! CLEAN : -! !ENDIF +! !ENDIF ! -@erase "$(INTDIR)\parsermodule.obj" ! -@erase "$(INTDIR)\vc60.idb" ! -@erase "$(INTDIR)\vc60.pdb" @@ -4571,47 +3623,47 @@ ! ! F90=df.exe ! CPP=cl.exe -! CPP_PROJ=/nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\parser.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +! CPP_PROJ=/nologo /MD /W3 $(EXFLAGS) /Zi /O2 /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\parser.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c ! ! .c{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .c{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! MTL=midl.exe -! MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +! MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 ! RSC=rc.exe ! BSC32=bscmake.exe -! BSC32_FLAGS=/nologo /o"$(OUTDIR)\parser.bsc" +! BSC32_FLAGS=/nologo /o"$(OUTDIR)\parser.bsc" ! BSC32_SBRS= \ -! +! ! LINK32=link.exe -! LINK32_FLAGS=user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1e1A0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\parser.pdb" /debug /machine:I386 /out:"$(OUTDIR)\parser.pyd" /implib:"$(OUTDIR)\parser.lib" +! LINK32_FLAGS=user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1e1A0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\parser.pdb" /debug /machine:I386 /out:"$(OUTDIR)\parser.pyd" /implib:"$(OUTDIR)\parser.lib" ! LINK32_OBJS= \ ! "$(INTDIR)\parsermodule.obj" \ ! "$(OUTDIR)\python23.lib" @@ -4620,6 +3672,8 @@ ! $(LINK32) @<< ! $(LINK32_FLAGS) $(LINK32_OBJS) ! << +! if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2 +! echo $(CPP_PROJ) ! ! !ELSEIF "$(CFG)" == "parser - Win32 Debug" ! @@ -4629,21 +3683,21 @@ ! OutDir=.\. ! # End Custom Macros ! -! !IF "$(RECURSE)" == "0" +! !IF "$(RECURSE)" == "0" ! ! ALL : "$(OUTDIR)\parser_d.pyd" ! -! !ELSE +! !ELSE ! ! ALL : "pythoncore - Win32 Debug" "$(OUTDIR)\parser_d.pyd" ! -! !ENDIF +! !ENDIF ! -! !IF "$(RECURSE)" == "1" -! CLEAN :"pythoncore - Win32 DebugCLEAN" -! !ELSE +! !IF "$(RECURSE)" == "1" +! CLEAN :"pythoncore - Win32 DebugCLEAN" +! !ELSE ! CLEAN : -! !ENDIF +! !ENDIF ! -@erase "$(INTDIR)\parsermodule.obj" ! -@erase "$(INTDIR)\vc60.idb" ! -@erase "$(INTDIR)\vc60.pdb" @@ -4661,47 +3715,47 @@ ! ! F90=df.exe ! CPP=cl.exe -! CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\parser.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +! CPP_PROJ=/nologo /MDd /W3 /Gm $(EXFLAGS) /Zi /Od /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\parser.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c ! ! .c{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .c{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! MTL=midl.exe -! MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 +! MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 ! RSC=rc.exe ! BSC32=bscmake.exe -! BSC32_FLAGS=/nologo /o"$(OUTDIR)\parser.bsc" +! BSC32_FLAGS=/nologo /o"$(OUTDIR)\parser.bsc" ! BSC32_SBRS= \ -! +! ! LINK32=link.exe -! LINK32_FLAGS=user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1e1A0000" /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\parser_d.pdb" /debug /machine:I386 /out:"$(OUTDIR)\parser_d.pyd" /implib:"$(OUTDIR)\parser_d.lib" /pdbtype:sept +! LINK32_FLAGS=user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1e1A0000" /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\parser_d.pdb" /debug /machine:I386 /out:"$(OUTDIR)\parser_d.pyd" /implib:"$(OUTDIR)\parser_d.lib" /pdbtype:sept ! LINK32_OBJS= \ ! "$(INTDIR)\parsermodule.obj" \ ! "$(OUTDIR)\python23_d.lib" @@ -4710,46 +3764,48 @@ ! $(LINK32) @<< ! $(LINK32_FLAGS) $(LINK32_OBJS) ! << +! if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2 +! echo $(CPP_PROJ) ! -! !ENDIF +! !ENDIF ! ! ! !IF "$(NO_EXTERNAL_DEPS)" != "1" ! !IF EXISTS("parser.dep") ! !INCLUDE "parser.dep" -! !ELSE +! !ELSE ! !MESSAGE Warning: cannot find "parser.dep" -! !ENDIF -! !ENDIF +! !ENDIF +! !ENDIF ! ! ! !IF "$(CFG)" == "parser - Win32 Release" || "$(CFG)" == "parser - Win32 Debug" ! ! !IF "$(CFG)" == "parser - Win32 Release" ! -! "pythoncore - Win32 Release" : +! "pythoncore - Win32 Release" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" ! cd "." ! -! "pythoncore - Win32 ReleaseCLEAN" : +! "pythoncore - Win32 ReleaseCLEAN" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" RECURSE=1 CLEAN +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" RECURSE=1 CLEAN ! cd "." ! ! !ELSEIF "$(CFG)" == "parser - Win32 Debug" ! -! "pythoncore - Win32 Debug" : +! "pythoncore - Win32 Debug" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" ! cd "." ! -! "pythoncore - Win32 DebugCLEAN" : +! "pythoncore - Win32 DebugCLEAN" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" RECURSE=1 CLEAN +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" RECURSE=1 CLEAN ! cd "." ! -! !ENDIF +! !ENDIF ! ! SOURCE=..\Modules\parsermodule.c ! @@ -4758,10 +3814,9 @@ ! ! ! -! !ENDIF -! -*** misc/Python-2.3.4/PCbuild/pyexpat.dep Thu Sep 1 19:41:41 2005 ---- misc/build/Python-2.3.4/PCbuild/pyexpat.dep Thu Sep 1 19:40:58 2005 +! !ENDIF +*** misc/Python-2.3.4/PCbuild/pyexpat.dep Thu Jun 29 12:09:58 2006 +--- misc/build/Python-2.3.4/PCbuild/pyexpat.dep Thu Jun 29 11:02:20 2006 *************** *** 1 **** ! dummy @@ -4851,38 +3906,17 @@ ! "..\Modules\expat\xmltok_impl.h"\ ! "..\Modules\expat\xmltok_ns.c"\ ! -*** misc/Python-2.3.4/PCbuild/pyexpat.mak Thu Sep 1 19:41:41 2005 ---- misc/build/Python-2.3.4/PCbuild/pyexpat.mak Thu Sep 1 19:40:58 2005 +*** misc/Python-2.3.4/PCbuild/pyexpat.mak Thu Jun 29 12:09:58 2006 +--- misc/build/Python-2.3.4/PCbuild/pyexpat.mak Mon Jul 3 09:47:55 2006 *************** *** 1 **** ! dummy ---- 1,285 ---- -! # Microsoft Developer Studio Generated NMAKE File, Based on pyexpat.dsp +--- 1,268 ---- ! !IF "$(CFG)" == "" ! CFG=pyexpat - Win32 Release -! !MESSAGE Keine Konfiguration angegeben. pyexpat - Win32 Release wird als Standard verwendet. -! !ENDIF +! !ENDIF ! -! !IF "$(CFG)" != "pyexpat - Win32 Release" && "$(CFG)" != "pyexpat - Win32 Debug" -! !MESSAGE Ungltige Konfiguration "$(CFG)" angegeben. -! !MESSAGE Sie k”nnen beim Ausfhren von NMAKE eine Konfiguration angeben -! !MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel: -! !MESSAGE -! !MESSAGE NMAKE /f "pyexpat.mak" CFG="pyexpat - Win32 Release" -! !MESSAGE -! !MESSAGE Fr die Konfiguration stehen zur Auswahl: -! !MESSAGE -! !MESSAGE "pyexpat - Win32 Release" (basierend auf "Win32 (x86) Dynamic-Link Library") -! !MESSAGE "pyexpat - Win32 Debug" (basierend auf "Win32 (x86) Dynamic-Link Library") -! !MESSAGE -! !ERROR Eine ungltige Konfiguration wurde angegeben. -! !ENDIF -! -! !IF "$(OS)" == "Windows_NT" ! NULL= -! !ELSE -! NULL=nul -! !ENDIF ! ! !IF "$(CFG)" == "pyexpat - Win32 Release" ! @@ -4892,21 +3926,21 @@ ! OutDir=.\. ! # End Custom Macros ! -! !IF "$(RECURSE)" == "0" +! !IF "$(RECURSE)" == "0" ! ! ALL : "$(OUTDIR)\pyexpat.pyd" ! -! !ELSE +! !ELSE ! ! ALL : "pythoncore - Win32 Release" "$(OUTDIR)\pyexpat.pyd" ! -! !ENDIF +! !ENDIF ! -! !IF "$(RECURSE)" == "1" -! CLEAN :"pythoncore - Win32 ReleaseCLEAN" -! !ELSE +! !IF "$(RECURSE)" == "1" +! CLEAN :"pythoncore - Win32 ReleaseCLEAN" +! !ELSE ! CLEAN : -! !ENDIF +! !ENDIF ! -@erase "$(INTDIR)\pyexpat.obj" ! -@erase "$(INTDIR)\vc60.idb" ! -@erase "$(INTDIR)\vc60.pdb" @@ -4926,47 +3960,47 @@ ! ! F90=df.exe ! CPP=cl.exe -! CPP_PROJ=/nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "..\Modules\expat" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "XML_NS" /D "XML_DTD" /D BYTEORDER=1234 /D XML_CONTEXT_BYTES=1024 /D "XML_STATIC" /D "HAVE_MEMMOVE" /Fp"$(INTDIR)\pyexpat.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +! CPP_PROJ=/nologo /MD /W3 $(EXFLAGS) /Zi /O2 /I "..\Include" /I "..\PC" /I "..\Modules\expat" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "XML_NS" /D "XML_DTD" /D BYTEORDER=1234 /D XML_CONTEXT_BYTES=1024 /D "XML_STATIC" /D "HAVE_MEMMOVE" /Fp"$(INTDIR)\pyexpat.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c ! ! .c{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .c{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! MTL=midl.exe -! MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +! MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 ! RSC=rc.exe ! BSC32=bscmake.exe -! BSC32_FLAGS=/nologo /o"$(OUTDIR)\pyexpat.bsc" +! BSC32_FLAGS=/nologo /o"$(OUTDIR)\pyexpat.bsc" ! BSC32_SBRS= \ -! +! ! LINK32=link.exe -! LINK32_FLAGS=user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1D100000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\pyexpat.pdb" /debug /machine:I386 /out:"$(OUTDIR)\pyexpat.pyd" /implib:"$(OUTDIR)\pyexpat.lib" +! LINK32_FLAGS=user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1D100000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\pyexpat.pdb" /debug /machine:I386 /out:"$(OUTDIR)\pyexpat.pyd" /implib:"$(OUTDIR)\pyexpat.lib" ! LINK32_OBJS= \ ! "$(INTDIR)\pyexpat.obj" \ ! "$(INTDIR)\xmlparse.obj" \ @@ -4978,6 +4012,8 @@ ! $(LINK32) @<< ! $(LINK32_FLAGS) $(LINK32_OBJS) ! << +! if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2 +! echo $(CPP_PROJ) ! ! !ELSEIF "$(CFG)" == "pyexpat - Win32 Debug" ! @@ -4987,21 +4023,21 @@ ! OutDir=.\. ! # End Custom Macros ! -! !IF "$(RECURSE)" == "0" +! !IF "$(RECURSE)" == "0" ! ! ALL : "$(OUTDIR)\pyexpat_d.pyd" ! -! !ELSE +! !ELSE ! ! ALL : "pythoncore - Win32 Debug" "$(OUTDIR)\pyexpat_d.pyd" ! -! !ENDIF +! !ENDIF ! -! !IF "$(RECURSE)" == "1" -! CLEAN :"pythoncore - Win32 DebugCLEAN" -! !ELSE +! !IF "$(RECURSE)" == "1" +! CLEAN :"pythoncore - Win32 DebugCLEAN" +! !ELSE ! CLEAN : -! !ENDIF +! !ENDIF ! -@erase "$(INTDIR)\pyexpat.obj" ! -@erase "$(INTDIR)\vc60.idb" ! -@erase "$(INTDIR)\vc60.pdb" @@ -5022,47 +4058,47 @@ ! ! F90=df.exe ! CPP=cl.exe -! CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /I "..\Modules\expat" /D "_DEBUG" /D "HAVE_EXPAT_H" /D "WIN32" /D "_WINDOWS" /D "XML_NS" /D "XML_DTD" /D BYTEORDER=1234 /D XML_CONTEXT_BYTES=1024 /D "XML_STATIC" /D "HAVE_MEMMOVE" /Fp"$(INTDIR)\pyexpat.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +! CPP_PROJ=/nologo /MDd /W3 /Gm $(EXFLAGS) /Zi /Od /I "..\Include" /I "..\PC" /I "..\Modules\expat" /D "_DEBUG" /D "HAVE_EXPAT_H" /D "WIN32" /D "_WINDOWS" /D "XML_NS" /D "XML_DTD" /D BYTEORDER=1234 /D XML_CONTEXT_BYTES=1024 /D "XML_STATIC" /D "HAVE_MEMMOVE" /Fp"$(INTDIR)\pyexpat.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c ! ! .c{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .c{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! MTL=midl.exe -! MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 +! MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 ! RSC=rc.exe ! BSC32=bscmake.exe -! BSC32_FLAGS=/nologo /o"$(OUTDIR)\pyexpat.bsc" +! BSC32_FLAGS=/nologo /o"$(OUTDIR)\pyexpat.bsc" ! BSC32_SBRS= \ -! +! ! LINK32=link.exe -! LINK32_FLAGS=user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1D100000" /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\pyexpat_d.pdb" /debug /machine:I386 /out:"$(OUTDIR)\pyexpat_d.pyd" /implib:"$(OUTDIR)\pyexpat_d.lib" /pdbtype:sept +! LINK32_FLAGS=user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1D100000" /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\pyexpat_d.pdb" /debug /machine:I386 /out:"$(OUTDIR)\pyexpat_d.pyd" /implib:"$(OUTDIR)\pyexpat_d.lib" /pdbtype:sept ! LINK32_OBJS= \ ! "$(INTDIR)\pyexpat.obj" \ ! "$(INTDIR)\xmlparse.obj" \ @@ -5074,46 +4110,48 @@ ! $(LINK32) @<< ! $(LINK32_FLAGS) $(LINK32_OBJS) ! << +! if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2 +! echo $(CPP_PROJ) ! -! !ENDIF +! !ENDIF ! ! ! !IF "$(NO_EXTERNAL_DEPS)" != "1" ! !IF EXISTS("pyexpat.dep") ! !INCLUDE "pyexpat.dep" -! !ELSE +! !ELSE ! !MESSAGE Warning: cannot find "pyexpat.dep" -! !ENDIF -! !ENDIF +! !ENDIF +! !ENDIF ! ! ! !IF "$(CFG)" == "pyexpat - Win32 Release" || "$(CFG)" == "pyexpat - Win32 Debug" ! ! !IF "$(CFG)" == "pyexpat - Win32 Release" ! -! "pythoncore - Win32 Release" : +! "pythoncore - Win32 Release" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" ! cd "." ! -! "pythoncore - Win32 ReleaseCLEAN" : +! "pythoncore - Win32 ReleaseCLEAN" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" RECURSE=1 CLEAN +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" RECURSE=1 CLEAN ! cd "." ! ! !ELSEIF "$(CFG)" == "pyexpat - Win32 Debug" ! -! "pythoncore - Win32 Debug" : +! "pythoncore - Win32 Debug" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" ! cd "." ! -! "pythoncore - Win32 DebugCLEAN" : +! "pythoncore - Win32 DebugCLEAN" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" RECURSE=1 CLEAN +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" RECURSE=1 CLEAN ! cd "." ! -! !ENDIF +! !ENDIF ! ! SOURCE=..\Modules\pyexpat.c ! @@ -5140,10 +4178,10 @@ ! ! ! -! !ENDIF +! !ENDIF ! -*** misc/Python-2.3.4/PCbuild/python.dep Thu Sep 1 19:41:41 2005 ---- misc/build/Python-2.3.4/PCbuild/python.dep Thu Sep 1 19:40:58 2005 +*** misc/Python-2.3.4/PCbuild/python.dep Thu Jun 29 12:09:59 2006 +--- misc/build/Python-2.3.4/PCbuild/python.dep Thu Jun 29 11:02:20 2006 *************** *** 1 **** ! dummy @@ -5200,38 +4238,17 @@ ! ..\PC\python_exe.rc : \ ! "..\PC\pycon.ico"\ ! -*** misc/Python-2.3.4/PCbuild/python.mak Thu Sep 1 19:41:41 2005 ---- misc/build/Python-2.3.4/PCbuild/python.mak Thu Sep 1 19:40:58 2005 +*** misc/Python-2.3.4/PCbuild/python.mak Thu Jun 29 12:09:58 2006 +--- misc/build/Python-2.3.4/PCbuild/python.mak Thu Jun 29 16:33:50 2006 *************** *** 1 **** ! dummy ---- 1,289 ---- -! # Microsoft Developer Studio Generated NMAKE File, Based on python.dsp +--- 1,271 ---- ! !IF "$(CFG)" == "" ! CFG=python - Win32 Release -! !MESSAGE Keine Konfiguration angegeben. python - Win32 Release wird als Standard verwendet. -! !ENDIF +! !ENDIF ! -! !IF "$(CFG)" != "python - Win32 Release" && "$(CFG)" != "python - Win32 Debug" -! !MESSAGE Ungltige Konfiguration "$(CFG)" angegeben. -! !MESSAGE Sie k”nnen beim Ausfhren von NMAKE eine Konfiguration angeben -! !MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel: -! !MESSAGE -! !MESSAGE NMAKE /f "python.mak" CFG="python - Win32 Release" -! !MESSAGE -! !MESSAGE Fr die Konfiguration stehen zur Auswahl: -! !MESSAGE -! !MESSAGE "python - Win32 Release" (basierend auf "Win32 (x86) Console Application") -! !MESSAGE "python - Win32 Debug" (basierend auf "Win32 (x86) Console Application") -! !MESSAGE -! !ERROR Eine ungltige Konfiguration wurde angegeben. -! !ENDIF -! -! !IF "$(OS)" == "Windows_NT" ! NULL= -! !ELSE -! NULL=nul -! !ENDIF ! ! !IF "$(CFG)" == "python - Win32 Release" ! @@ -5241,21 +4258,21 @@ ! OutDir=.\. ! # End Custom Macros ! -! !IF "$(RECURSE)" == "0" +! !IF "$(RECURSE)" == "0" ! ! ALL : "$(OUTDIR)\python.exe" ! -! !ELSE +! !ELSE ! ! ALL : "pythoncore - Win32 Release" "$(OUTDIR)\python.exe" ! -! !ENDIF +! !ENDIF ! -! !IF "$(RECURSE)" == "1" -! CLEAN :"pythoncore - Win32 ReleaseCLEAN" -! !ELSE +! !IF "$(RECURSE)" == "1" +! CLEAN :"pythoncore - Win32 ReleaseCLEAN" +! !ELSE ! CLEAN : -! !ENDIF +! !ENDIF ! -@erase "$(INTDIR)\python.obj" ! -@erase "$(INTDIR)\python_exe.res" ! -@erase "$(INTDIR)\vc60.idb" @@ -5270,46 +4287,46 @@ ! if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)" ! ! CPP=cl.exe -! CPP_PROJ=/nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\python.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +! CPP_PROJ=/nologo /MD /W3 $(EXFLAGS) /Zi /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\python.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c ! ! .c{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .c{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! RSC=rc.exe -! RSC_PROJ=/l 0x409 /fo"$(INTDIR)\python_exe.res" /d "NDEBUG" +! RSC_PROJ=/l 0x409 /fo"$(INTDIR)\python_exe.res" /d "NDEBUG" ! BSC32=bscmake.exe -! BSC32_FLAGS=/nologo /o"$(OUTDIR)\python.bsc" +! BSC32_FLAGS=/nologo /o"$(OUTDIR)\python.bsc" ! BSC32_SBRS= \ -! +! ! LINK32=link.exe -! LINK32_FLAGS=odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1d000000" /subsystem:console /incremental:no /pdb:"$(OUTDIR)\python.pdb" /debug /machine:I386 /out:"$(OUTDIR)\python.exe" +! LINK32_FLAGS=odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1d000000" /subsystem:console /incremental:no /pdb:"$(OUTDIR)\python.pdb" /debug /machine:I386 /out:"$(OUTDIR)\python.exe" ! LINK32_OBJS= \ ! "$(INTDIR)\python.obj" \ ! "$(INTDIR)\python_exe.res" \ @@ -5319,6 +4336,8 @@ ! $(LINK32) @<< ! $(LINK32_FLAGS) $(LINK32_OBJS) ! << +! if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;1 +! echo $(CPP_PROJ) ! ! !ELSEIF "$(CFG)" == "python - Win32 Debug" ! @@ -5328,21 +4347,21 @@ ! OutDir=.\. ! # End Custom Macros ! -! !IF "$(RECURSE)" == "0" +! !IF "$(RECURSE)" == "0" ! ! ALL : "$(OUTDIR)\python_d.exe" "$(OUTDIR)\python.bsc" ! -! !ELSE +! !ELSE ! ! ALL : "pythoncore - Win32 Debug" "$(OUTDIR)\python_d.exe" "$(OUTDIR)\python.bsc" ! -! !ENDIF +! !ENDIF ! -! !IF "$(RECURSE)" == "1" -! CLEAN :"pythoncore - Win32 DebugCLEAN" -! !ELSE +! !IF "$(RECURSE)" == "1" +! CLEAN :"pythoncore - Win32 DebugCLEAN" +! !ELSE ! CLEAN : -! !ENDIF +! !ENDIF ! -@erase "$(INTDIR)\python.obj" ! -@erase "$(INTDIR)\python.sbr" ! -@erase "$(INTDIR)\python_exe.res" @@ -5360,42 +4379,42 @@ ! if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)" ! ! CPP=cl.exe -! CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\python.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +! CPP_PROJ=/nologo /MDd /W3 /Gm $(EXFLAGS) /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\python.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c ! ! .c{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .c{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! RSC=rc.exe -! RSC_PROJ=/l 0x409 /fo"$(INTDIR)\python_exe.res" /i "..\Include" /d "_DEBUG" +! RSC_PROJ=/l 0x409 /fo"$(INTDIR)\python_exe.res" /i "..\Include" /d "_DEBUG" ! BSC32=bscmake.exe -! BSC32_FLAGS=/nologo /o"$(OUTDIR)\python.bsc" +! BSC32_FLAGS=/nologo /o"$(OUTDIR)\python.bsc" ! BSC32_SBRS= \ ! "$(INTDIR)\python.sbr" ! @@ -5405,7 +4424,7 @@ ! << ! ! LINK32=link.exe -! LINK32_FLAGS=odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1d000000" /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\python_d.pdb" /debug /machine:I386 /out:"$(OUTDIR)\python_d.exe" /pdbtype:sept +! LINK32_FLAGS=odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1d000000" /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\python_d.pdb" /debug /machine:I386 /out:"$(OUTDIR)\python_d.exe" /pdbtype:sept ! LINK32_OBJS= \ ! "$(INTDIR)\python.obj" \ ! "$(INTDIR)\python_exe.res" \ @@ -5415,46 +4434,48 @@ ! $(LINK32) @<< ! $(LINK32_FLAGS) $(LINK32_OBJS) ! << +! if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;1 +! echo $(CPP_PROJ) ! -! !ENDIF +! !ENDIF ! ! ! !IF "$(NO_EXTERNAL_DEPS)" != "1" ! !IF EXISTS("python.dep") ! !INCLUDE "python.dep" -! !ELSE +! !ELSE ! !MESSAGE Warning: cannot find "python.dep" -! !ENDIF -! !ENDIF +! !ENDIF +! !ENDIF ! ! ! !IF "$(CFG)" == "python - Win32 Release" || "$(CFG)" == "python - Win32 Debug" ! ! !IF "$(CFG)" == "python - Win32 Release" ! -! "pythoncore - Win32 Release" : +! "pythoncore - Win32 Release" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" ! cd "." ! -! "pythoncore - Win32 ReleaseCLEAN" : +! "pythoncore - Win32 ReleaseCLEAN" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" RECURSE=1 CLEAN +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" RECURSE=1 CLEAN ! cd "." ! ! !ELSEIF "$(CFG)" == "python - Win32 Debug" ! -! "pythoncore - Win32 Debug" : +! "pythoncore - Win32 Debug" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" ! cd "." ! -! "pythoncore - Win32 DebugCLEAN" : +! "pythoncore - Win32 DebugCLEAN" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" RECURSE=1 CLEAN +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" RECURSE=1 CLEAN ! cd "." ! -! !ENDIF +! !ENDIF ! ! SOURCE=..\Modules\python.c ! @@ -5472,7 +4493,7 @@ ! $(CPP) $(CPP_PROJ) $(SOURCE) ! ! -! !ENDIF +! !ENDIF ! ! SOURCE=..\PC\python_exe.rc ! @@ -5490,13 +4511,12 @@ ! $(RSC) /l 0x409 /fo"$(INTDIR)\python_exe.res" /i "..\Include" /i "\tmp\Python-2.3.4\PC" /d "_DEBUG" $(SOURCE) ! ! -! !ENDIF -! +! !ENDIF ! -! !ENDIF ! -*** misc/Python-2.3.4/PCbuild/pythoncore.dep Thu Sep 1 19:41:43 2005 ---- misc/build/Python-2.3.4/PCbuild/pythoncore.dep Thu Sep 1 19:40:58 2005 +! !ENDIF +*** misc/Python-2.3.4/PCbuild/pythoncore.dep Thu Jun 29 12:10:04 2006 +--- misc/build/Python-2.3.4/PCbuild/pythoncore.dep Thu Jun 29 11:02:21 2006 *************** *** 1 **** ! dummy @@ -10953,38 +9973,17 @@ ! "..\PC\pyconfig.h"\ ! {$(INCLUDE)}"basetsd.h"\ ! -*** misc/Python-2.3.4/PCbuild/pythoncore.mak Thu Sep 1 19:41:43 2005 ---- misc/build/Python-2.3.4/PCbuild/pythoncore.mak Thu Sep 1 19:40:58 2005 +*** misc/Python-2.3.4/PCbuild/pythoncore.mak Thu Jun 29 12:10:04 2006 +--- misc/build/Python-2.3.4/PCbuild/pythoncore.mak Thu Jun 29 16:56:38 2006 *************** *** 1 **** ! dummy ---- 1,1453 ---- -! # Microsoft Developer Studio Generated NMAKE File, Based on pythoncore.dsp +--- 1,1433 ---- ! !IF "$(CFG)" == "" ! CFG=pythoncore - Win32 Release -! !MESSAGE Keine Konfiguration angegeben. pythoncore - Win32 Release wird als Standard verwendet. -! !ENDIF +! !ENDIF ! -! !IF "$(CFG)" != "pythoncore - Win32 Release" && "$(CFG)" != "pythoncore - Win32 Debug" -! !MESSAGE Ungltige Konfiguration "$(CFG)" angegeben. -! !MESSAGE Sie k”nnen beim Ausfhren von NMAKE eine Konfiguration angeben -! !MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel: -! !MESSAGE -! !MESSAGE NMAKE /f "pythoncore.mak" CFG="pythoncore - Win32 Release" -! !MESSAGE -! !MESSAGE Fr die Konfiguration stehen zur Auswahl: -! !MESSAGE -! !MESSAGE "pythoncore - Win32 Release" (basierend auf "Win32 (x86) Dynamic-Link Library") -! !MESSAGE "pythoncore - Win32 Debug" (basierend auf "Win32 (x86) Dynamic-Link Library") -! !MESSAGE -! !ERROR Eine ungltige Konfiguration wurde angegeben. -! !ENDIF -! -! !IF "$(OS)" == "Windows_NT" ! NULL= -! !ELSE -! NULL=nul -! !ENDIF ! ! !IF "$(CFG)" == "pythoncore - Win32 Release" ! @@ -10994,21 +9993,21 @@ ! OutDir=.\. ! # End Custom Macros ! -! !IF "$(RECURSE)" == "0" +! !IF "$(RECURSE)" == "0" ! ! ALL : "$(OUTDIR)\python23.dll" ! -! !ELSE +! !ELSE ! ! ALL : "make_versioninfo - Win32 Release" "$(OUTDIR)\python23.dll" ! -! !ENDIF +! !ENDIF ! -! !IF "$(RECURSE)" == "1" -! CLEAN :"make_versioninfo - Win32 ReleaseCLEAN" -! !ELSE +! !IF "$(RECURSE)" == "1" +! CLEAN :"make_versioninfo - Win32 ReleaseCLEAN" +! !ELSE ! CLEAN : -! !ENDIF +! !ENDIF ! -@erase "$(INTDIR)\_codecsmodule.obj" ! -@erase "$(INTDIR)\_hotshot.obj" ! -@erase "$(INTDIR)\_localemodule.obj" @@ -11133,55 +10132,55 @@ ! -@erase "$(OUTDIR)\python23.pdb" ! ! "$(OUTDIR)" : -! if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" +! if not exist "$(OUTDIR)" mkdir "$(OUTDIR)" ! ! "$(INTDIR)" : -! if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)" +! if not exist "$(INTDIR)" mkdir "$(INTDIR)" ! ! F90=df.exe ! CPP=cl.exe -! CPP_PROJ=/nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "USE_DL_EXPORT" /Fp"$(INTDIR)\pythoncore.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /Zm200 /c +! CPP_PROJ=/nologo /MD /W3 $(EXFLAGS) /Zi /O2 /I "..\Include" /I "..\PC" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "USE_DL_EXPORT" /Fp"$(INTDIR)\pythoncore.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /Zm200 /c ! ! .c{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .c{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! MTL=midl.exe -! MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" +! MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" ! RSC=rc.exe -! RSC_PROJ=/l 0x409 /fo"$(INTDIR)\python_nt.res" /i "..\Include" /d "NDEBUG" +! RSC_PROJ=/l 0x409 /fo"$(INTDIR)\python_nt.res" /i "..\Include" /d "NDEBUG" ! BSC32=bscmake.exe -! BSC32_FLAGS=/nologo /o"$(OUTDIR)\pythoncore.bsc" +! BSC32_FLAGS=/nologo /o"$(OUTDIR)\pythoncore.bsc" ! BSC32_SBRS= \ -! +! ! LINK32=link.exe -! LINK32_FLAGS= kernel32.lib user32.lib advapi32.lib shell32.lib /nologo /base:"0x1e000000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\python23.pdb" /debug /machine:I386 /nodefaultlib:"libc" /out:"$(OUTDIR)\python23.dll" /implib:"$(OUTDIR)\python23.lib" +! LINK32_FLAGS= kernel32.lib user32.lib advapi32.lib shell32.lib /nologo /base:"0x1e000000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\python23.pdb" /debug /machine:I386 /nodefaultlib:"libc" /out:"$(OUTDIR)\python23.dll" /implib:"$(OUTDIR)\python23.lib" ! LINK32_OBJS= \ ! "$(INTDIR)\_codecsmodule.obj" \ ! "$(INTDIR)\_hotshot.obj" \ @@ -11313,21 +10312,21 @@ ! OutDir=.\. ! # End Custom Macros ! -! !IF "$(RECURSE)" == "0" +! !IF "$(RECURSE)" == "0" ! ! ALL : "$(OUTDIR)\python23_d.dll" ! -! !ELSE +! !ELSE ! ! ALL : "make_versioninfo - Win32 Debug" "$(OUTDIR)\python23_d.dll" ! -! !ENDIF +! !ENDIF ! -! !IF "$(RECURSE)" == "1" -! CLEAN :"make_versioninfo - Win32 DebugCLEAN" -! !ELSE +! !IF "$(RECURSE)" == "1" +! CLEAN :"make_versioninfo - Win32 DebugCLEAN" +! !ELSE ! CLEAN : -! !ENDIF +! !ENDIF ! -@erase "$(INTDIR)\_codecsmodule.obj" ! -@erase "$(INTDIR)\_hotshot.obj" ! -@erase "$(INTDIR)\_localemodule.obj" @@ -11460,48 +10459,48 @@ ! ! F90=df.exe ! CPP=cl.exe -! CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /D "_DEBUG" /D "USE_DL_EXPORT" /D "WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\pythoncore.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /Zm200 /c +! CPP_PROJ=/nologo /MDd /W3 /Gm $(EXFLAGS) /Zi /Od /I "..\Include" /I "..\PC" /D "_DEBUG" /D "USE_DL_EXPORT" /D "WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\pythoncore.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /Zm200 /c ! ! .c{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .c{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! MTL=midl.exe -! MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" +! MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" ! RSC=rc.exe -! RSC_PROJ=/l 0x409 /fo"$(INTDIR)\python_nt.res" /i "..\Include" /d "_DEBUG" +! RSC_PROJ=/l 0x409 /fo"$(INTDIR)\python_nt.res" /i "..\Include" /d "_DEBUG" ! BSC32=bscmake.exe -! BSC32_FLAGS=/nologo /o"$(OUTDIR)\pythoncore.bsc" +! BSC32_FLAGS=/nologo /o"$(OUTDIR)\pythoncore.bsc" ! BSC32_SBRS= \ -! +! ! LINK32=link.exe -! LINK32_FLAGS= kernel32.lib user32.lib advapi32.lib shell32.lib /nologo /base:"0x1e000000" /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\python23_d.pdb" /debug /machine:I386 /nodefaultlib:"libc" /out:"$(OUTDIR)\python23_d.dll" /implib:"$(OUTDIR)\python23_d.lib" /pdbtype:sept +! LINK32_FLAGS= kernel32.lib user32.lib advapi32.lib shell32.lib /nologo /base:"0x1e000000" /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\python23_d.pdb" /debug /machine:I386 /nodefaultlib:"libc" /out:"$(OUTDIR)\python23_d.dll" /implib:"$(OUTDIR)\python23_d.lib" /pdbtype:sept ! LINK32_OBJS= \ ! "$(INTDIR)\_codecsmodule.obj" \ ! "$(INTDIR)\_hotshot.obj" \ @@ -11624,46 +10623,48 @@ ! $(LINK32) @<< ! $(LINK32_FLAGS) $(LINK32_OBJS) ! << +! if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2 +! echo $(CPP_PROJ) ! -! !ENDIF +! !ENDIF ! ! ! !IF "$(NO_EXTERNAL_DEPS)" != "1" ! !IF EXISTS("pythoncore.dep") ! !INCLUDE "pythoncore.dep" -! !ELSE +! !ELSE ! !MESSAGE Warning: cannot find "pythoncore.dep" -! !ENDIF -! !ENDIF +! !ENDIF +! !ENDIF ! ! ! !IF "$(CFG)" == "pythoncore - Win32 Release" || "$(CFG)" == "pythoncore - Win32 Debug" ! ! !IF "$(CFG)" == "pythoncore - Win32 Release" ! -! "make_versioninfo - Win32 Release" : +! "make_versioninfo - Win32 Release" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\make_versioninfo.mak" CFG="make_versioninfo - Win32 Release" +! $(MAKE) /$(MAKEFLAGS) /F ".\make_versioninfo.mak" CFG="make_versioninfo - Win32 Release" ! cd "." ! -! "make_versioninfo - Win32 ReleaseCLEAN" : +! "make_versioninfo - Win32 ReleaseCLEAN" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\make_versioninfo.mak" CFG="make_versioninfo - Win32 Release" RECURSE=1 CLEAN +! $(MAKE) /$(MAKEFLAGS) /F ".\make_versioninfo.mak" CFG="make_versioninfo - Win32 Release" RECURSE=1 CLEAN ! cd "." ! ! !ELSEIF "$(CFG)" == "pythoncore - Win32 Debug" ! -! "make_versioninfo - Win32 Debug" : +! "make_versioninfo - Win32 Debug" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\make_versioninfo.mak" CFG="make_versioninfo - Win32 Debug" +! $(MAKE) /$(MAKEFLAGS) /F ".\make_versioninfo.mak" CFG="make_versioninfo - Win32 Debug" ! cd "." ! -! "make_versioninfo - Win32 DebugCLEAN" : +! "make_versioninfo - Win32 DebugCLEAN" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\make_versioninfo.mak" CFG="make_versioninfo - Win32 Debug" RECURSE=1 CLEAN +! $(MAKE) /$(MAKEFLAGS) /F ".\make_versioninfo.mak" CFG="make_versioninfo - Win32 Debug" RECURSE=1 CLEAN ! cd "." ! -! !ENDIF +! !ENDIF ! ! SOURCE=..\Modules\_codecsmodule.c ! @@ -11915,7 +10916,7 @@ ! ! !IF "$(CFG)" == "pythoncore - Win32 Release" ! -! CPP_SWITCHES=/nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "USE_DL_EXPORT" /D BUILD=53 /Fp"$(INTDIR)\pythoncore.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /Zm200 /c +! CPP_SWITCHES=/nologo /MD /W3 $(EXFLAGS) /Zi /O2 /I "..\Include" /I "..\PC" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "USE_DL_EXPORT" /D BUILD=53 /Fp"$(INTDIR)\pythoncore.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /Zm200 /c ! ! "$(INTDIR)\getbuildinfo.obj" : $(SOURCE) "$(INTDIR)" ! $(CPP) @<< @@ -11925,7 +10926,7 @@ ! ! !ELSEIF "$(CFG)" == "pythoncore - Win32 Debug" ! -! CPP_SWITCHES=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /D "_DEBUG" /D "USE_DL_EXPORT" /D "WIN32" /D "_WINDOWS" /D BUILD=53 /Fp"$(INTDIR)\pythoncore.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /Zm200 /c +! CPP_SWITCHES=/nologo /MDd /W3 /Gm $(EXFLAGS) /Zi /Od /I "..\Include" /I "..\PC" /D "_DEBUG" /D "USE_DL_EXPORT" /D "WIN32" /D "_WINDOWS" /D BUILD=53 /Fp"$(INTDIR)\pythoncore.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /Zm200 /c ! ! "$(INTDIR)\getbuildinfo.obj" : $(SOURCE) "$(INTDIR)" ! $(CPP) @<< @@ -11933,7 +10934,7 @@ ! << ! ! -! !ENDIF +! !ENDIF ! ! SOURCE=..\Python\getcompiler.c ! @@ -12005,7 +11006,7 @@ ! ! !IF "$(CFG)" == "pythoncore - Win32 Release" ! -! CPP_SWITCHES=/nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "..\Python" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "USE_DL_EXPORT" /Fp"$(INTDIR)\pythoncore.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /Zm200 /c +! CPP_SWITCHES=/nologo /MD /W3 $(EXFLAGS) /Zi /O2 /I "..\Include" /I "..\PC" /I "..\Python" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "USE_DL_EXPORT" /Fp"$(INTDIR)\pythoncore.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /Zm200 /c ! ! "$(INTDIR)\import_nt.obj" : $(SOURCE) "$(INTDIR)" ! $(CPP) @<< @@ -12015,7 +11016,7 @@ ! ! !ELSEIF "$(CFG)" == "pythoncore - Win32 Debug" ! -! CPP_SWITCHES=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /I "..\Python" /D "_DEBUG" /D "USE_DL_EXPORT" /D "WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\pythoncore.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /Zm200 /c +! CPP_SWITCHES=/nologo /MDd /W3 /Gm $(EXFLAGS) /Zi /Od /I "..\Include" /I "..\PC" /I "..\Python" /D "_DEBUG" /D "USE_DL_EXPORT" /D "WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\pythoncore.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /Zm200 /c ! ! "$(INTDIR)\import_nt.obj" : $(SOURCE) "$(INTDIR)" ! $(CPP) @<< @@ -12023,7 +11024,7 @@ ! << ! ! -! !ENDIF +! !ENDIF ! ! SOURCE=..\Python\importdl.c ! @@ -12227,7 +11228,7 @@ ! $(RSC) /l 0x409 /fo"$(INTDIR)\python_nt.res" /i "..\Include" /i "\tmp\Python-2.3.4\PC" /d "_DEBUG" $(SOURCE) ! ! -! !ENDIF +! !ENDIF ! ! SOURCE=..\Python\pythonrun.c ! @@ -12410,10 +11411,9 @@ ! ! ! -! !ENDIF -! -*** misc/Python-2.3.4/PCbuild/pythonw.dep Thu Sep 1 19:41:41 2005 ---- misc/build/Python-2.3.4/PCbuild/pythonw.dep Thu Sep 1 19:40:58 2005 +! !ENDIF +*** misc/Python-2.3.4/PCbuild/pythonw.dep Thu Jun 29 12:09:59 2006 +--- misc/build/Python-2.3.4/PCbuild/pythonw.dep Thu Jun 29 11:02:21 2006 *************** *** 1 **** ! dummy @@ -12470,38 +11470,17 @@ ! "..\PC\pyconfig.h"\ ! {$(INCLUDE)}"basetsd.h"\ ! -*** misc/Python-2.3.4/PCbuild/pythonw.mak Thu Sep 1 19:41:41 2005 ---- misc/build/Python-2.3.4/PCbuild/pythonw.mak Thu Sep 1 19:40:58 2005 +*** misc/Python-2.3.4/PCbuild/pythonw.mak Thu Jun 29 12:09:59 2006 +--- misc/build/Python-2.3.4/PCbuild/pythonw.mak Thu Jun 29 16:33:50 2006 *************** *** 1 **** ! dummy ---- 1,273 ---- -! # Microsoft Developer Studio Generated NMAKE File, Based on pythonw.dsp +--- 1,255 ---- ! !IF "$(CFG)" == "" ! CFG=pythonw - Win32 Release -! !MESSAGE Keine Konfiguration angegeben. pythonw - Win32 Release wird als Standard verwendet. -! !ENDIF +! !ENDIF ! -! !IF "$(CFG)" != "pythonw - Win32 Release" && "$(CFG)" != "pythonw - Win32 Debug" -! !MESSAGE Ungltige Konfiguration "$(CFG)" angegeben. -! !MESSAGE Sie k”nnen beim Ausfhren von NMAKE eine Konfiguration angeben -! !MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel: -! !MESSAGE -! !MESSAGE NMAKE /f "pythonw.mak" CFG="pythonw - Win32 Release" -! !MESSAGE -! !MESSAGE Fr die Konfiguration stehen zur Auswahl: -! !MESSAGE -! !MESSAGE "pythonw - Win32 Release" (basierend auf "Win32 (x86) Application") -! !MESSAGE "pythonw - Win32 Debug" (basierend auf "Win32 (x86) Application") -! !MESSAGE -! !ERROR Eine ungltige Konfiguration wurde angegeben. -! !ENDIF -! -! !IF "$(OS)" == "Windows_NT" ! NULL= -! !ELSE -! NULL=nul -! !ENDIF ! ! !IF "$(CFG)" == "pythonw - Win32 Release" ! @@ -12511,21 +11490,21 @@ ! OutDir=.\. ! # End Custom Macros ! -! !IF "$(RECURSE)" == "0" +! !IF "$(RECURSE)" == "0" ! ! ALL : "$(OUTDIR)\pythonw.exe" ! -! !ELSE +! !ELSE ! ! ALL : "pythoncore - Win32 Release" "$(OUTDIR)\pythonw.exe" ! -! !ENDIF +! !ENDIF ! -! !IF "$(RECURSE)" == "1" -! CLEAN :"pythoncore - Win32 ReleaseCLEAN" -! !ELSE +! !IF "$(RECURSE)" == "1" +! CLEAN :"pythoncore - Win32 ReleaseCLEAN" +! !ELSE ! CLEAN : -! !ENDIF +! !ENDIF ! -@erase "$(INTDIR)\python_exe.res" ! -@erase "$(INTDIR)\vc60.idb" ! -@erase "$(INTDIR)\vc60.pdb" @@ -12540,48 +11519,48 @@ ! if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)" ! ! CPP=cl.exe -! CPP_PROJ=/nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\pythonw.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +! CPP_PROJ=/nologo /MD /W3 $(EXFLAGS) /Zi /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\pythonw.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c ! ! .c{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .c{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! MTL=midl.exe -! MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +! MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 ! RSC=rc.exe -! RSC_PROJ=/l 0x409 /fo"$(INTDIR)\python_exe.res" /d "NDEBUG" +! RSC_PROJ=/l 0x409 /fo"$(INTDIR)\python_exe.res" /d "NDEBUG" ! BSC32=bscmake.exe -! BSC32_FLAGS=/nologo /o"$(OUTDIR)\pythonw.bsc" +! BSC32_FLAGS=/nologo /o"$(OUTDIR)\pythonw.bsc" ! BSC32_SBRS= \ -! +! ! LINK32=link.exe -! LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1d000000" /subsystem:windows /incremental:no /pdb:"$(OUTDIR)\pythonw.pdb" /debug /machine:I386 /out:"$(OUTDIR)\pythonw.exe" +! LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1d000000" /subsystem:windows /incremental:no /pdb:"$(OUTDIR)\pythonw.pdb" /debug /machine:I386 /out:"$(OUTDIR)\pythonw.exe" ! LINK32_OBJS= \ ! "$(INTDIR)\WinMain.obj" \ ! "$(INTDIR)\python_exe.res" \ @@ -12591,6 +11570,8 @@ ! $(LINK32) @<< ! $(LINK32_FLAGS) $(LINK32_OBJS) ! << +! if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;1 +! echo $(CPP_PROJ) ! ! !ELSEIF "$(CFG)" == "pythonw - Win32 Debug" ! @@ -12600,21 +11581,21 @@ ! OutDir=.\. ! # End Custom Macros ! -! !IF "$(RECURSE)" == "0" +! !IF "$(RECURSE)" == "0" ! ! ALL : "$(OUTDIR)\pythonw_d.exe" ! -! !ELSE +! !ELSE ! ! ALL : "pythoncore - Win32 Debug" "$(OUTDIR)\pythonw_d.exe" ! -! !ENDIF +! !ENDIF ! -! !IF "$(RECURSE)" == "1" -! CLEAN :"pythoncore - Win32 DebugCLEAN" -! !ELSE +! !IF "$(RECURSE)" == "1" +! CLEAN :"pythoncore - Win32 DebugCLEAN" +! !ELSE ! CLEAN : -! !ENDIF +! !ENDIF ! -@erase "$(INTDIR)\python_exe.res" ! -@erase "$(INTDIR)\vc60.idb" ! -@erase "$(INTDIR)\vc60.pdb" @@ -12630,48 +11611,48 @@ ! if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)" ! ! CPP=cl.exe -! CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\pythonw.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +! CPP_PROJ=/nologo /MDd /W3 /Gm $(EXFLAGS) /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\pythonw.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c ! ! .c{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .c{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! MTL=midl.exe -! MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 +! MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 ! RSC=rc.exe -! RSC_PROJ=/l 0x409 /fo"$(INTDIR)\python_exe.res" /d "_DEBUG" +! RSC_PROJ=/l 0x409 /fo"$(INTDIR)\python_exe.res" /d "_DEBUG" ! BSC32=bscmake.exe -! BSC32_FLAGS=/nologo /o"$(OUTDIR)\pythonw.bsc" +! BSC32_FLAGS=/nologo /o"$(OUTDIR)\pythonw.bsc" ! BSC32_SBRS= \ -! +! ! LINK32=link.exe -! LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1d000000" /subsystem:windows /incremental:yes /pdb:"$(OUTDIR)\pythonw_d.pdb" /debug /machine:I386 /out:"$(OUTDIR)\pythonw_d.exe" /pdbtype:sept +! LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1d000000" /subsystem:windows /incremental:yes /pdb:"$(OUTDIR)\pythonw_d.pdb" /debug /machine:I386 /out:"$(OUTDIR)\pythonw_d.exe" /pdbtype:sept ! LINK32_OBJS= \ ! "$(INTDIR)\WinMain.obj" \ ! "$(INTDIR)\python_exe.res" \ @@ -12681,46 +11662,48 @@ ! $(LINK32) @<< ! $(LINK32_FLAGS) $(LINK32_OBJS) ! << +! if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;1 +! echo $(CPP_PROJ) ! -! !ENDIF +! !ENDIF ! ! ! !IF "$(NO_EXTERNAL_DEPS)" != "1" ! !IF EXISTS("pythonw.dep") ! !INCLUDE "pythonw.dep" -! !ELSE +! !ELSE ! !MESSAGE Warning: cannot find "pythonw.dep" -! !ENDIF -! !ENDIF +! !ENDIF +! !ENDIF ! ! ! !IF "$(CFG)" == "pythonw - Win32 Release" || "$(CFG)" == "pythonw - Win32 Debug" ! ! !IF "$(CFG)" == "pythonw - Win32 Release" ! -! "pythoncore - Win32 Release" : +! "pythoncore - Win32 Release" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" ! cd "." ! -! "pythoncore - Win32 ReleaseCLEAN" : +! "pythoncore - Win32 ReleaseCLEAN" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" RECURSE=1 CLEAN +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" RECURSE=1 CLEAN ! cd "." ! ! !ELSEIF "$(CFG)" == "pythonw - Win32 Debug" ! -! "pythoncore - Win32 Debug" : +! "pythoncore - Win32 Debug" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" ! cd "." ! -! "pythoncore - Win32 DebugCLEAN" : +! "pythoncore - Win32 DebugCLEAN" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" RECURSE=1 CLEAN +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" RECURSE=1 CLEAN ! cd "." ! -! !ENDIF +! !ENDIF ! ! SOURCE=..\PC\python_exe.rc ! @@ -12738,7 +11721,7 @@ ! $(RSC) /l 0x409 /fo"$(INTDIR)\python_exe.res" /i "\tmp\Python-2.3.4\PC" /d "_DEBUG" $(SOURCE) ! ! -! !ENDIF +! !ENDIF ! ! SOURCE=..\PC\WinMain.c ! @@ -12747,10 +11730,9 @@ ! ! ! -! !ENDIF -! -*** misc/Python-2.3.4/PCbuild/select.dep Thu Sep 1 19:41:41 2005 ---- misc/build/Python-2.3.4/PCbuild/select.dep Thu Sep 1 19:40:58 2005 +! !ENDIF +*** misc/Python-2.3.4/PCbuild/select.dep Thu Jun 29 12:09:59 2006 +--- misc/build/Python-2.3.4/PCbuild/select.dep Thu Jun 29 11:02:21 2006 *************** *** 1 **** ! dummy @@ -12803,38 +11785,17 @@ ! "..\PC\pyconfig.h"\ ! {$(INCLUDE)}"basetsd.h"\ ! -*** misc/Python-2.3.4/PCbuild/select.mak Thu Sep 1 19:41:41 2005 ---- misc/build/Python-2.3.4/PCbuild/select.mak Thu Sep 1 19:40:58 2005 +*** misc/Python-2.3.4/PCbuild/select.mak Thu Jun 29 12:09:59 2006 +--- misc/build/Python-2.3.4/PCbuild/select.mak Mon Jul 3 09:49:06 2006 *************** *** 1 **** ! dummy ---- 1,255 ---- -! # Microsoft Developer Studio Generated NMAKE File, Based on select.dsp +--- 1,238 ---- ! !IF "$(CFG)" == "" -! CFG=select - Win32 Debug -! !MESSAGE Keine Konfiguration angegeben. select - Win32 Debug wird als Standard verwendet. -! !ENDIF -! -! !IF "$(CFG)" != "select - Win32 Release" && "$(CFG)" != "select - Win32 Debug" -! !MESSAGE Ungltige Konfiguration "$(CFG)" angegeben. -! !MESSAGE Sie k”nnen beim Ausfhren von NMAKE eine Konfiguration angeben -! !MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel: -! !MESSAGE -! !MESSAGE NMAKE /f "select.mak" CFG="select - Win32 Debug" -! !MESSAGE -! !MESSAGE Fr die Konfiguration stehen zur Auswahl: -! !MESSAGE -! !MESSAGE "select - Win32 Release" (basierend auf "Win32 (x86) Dynamic-Link Library") -! !MESSAGE "select - Win32 Debug" (basierend auf "Win32 (x86) Dynamic-Link Library") -! !MESSAGE -! !ERROR Eine ungltige Konfiguration wurde angegeben. -! !ENDIF +! CFG=select - Win32 Release +! !ENDIF ! -! !IF "$(OS)" == "Windows_NT" ! NULL= -! !ELSE -! NULL=nul -! !ENDIF ! ! !IF "$(CFG)" == "select - Win32 Release" ! @@ -12844,21 +11805,21 @@ ! OutDir=.\. ! # End Custom Macros ! -! !IF "$(RECURSE)" == "0" +! !IF "$(RECURSE)" == "0" ! ! ALL : "$(OUTDIR)\select.pyd" ! -! !ELSE +! !ELSE ! ! ALL : "pythoncore - Win32 Release" "$(OUTDIR)\select.pyd" ! -! !ENDIF +! !ENDIF ! -! !IF "$(RECURSE)" == "1" -! CLEAN :"pythoncore - Win32 ReleaseCLEAN" -! !ELSE +! !IF "$(RECURSE)" == "1" +! CLEAN :"pythoncore - Win32 ReleaseCLEAN" +! !ELSE ! CLEAN : -! !ENDIF +! !ENDIF ! -@erase "$(INTDIR)\selectmodule.obj" ! -@erase "$(INTDIR)\vc60.idb" ! -@erase "$(INTDIR)\vc60.pdb" @@ -12875,47 +11836,47 @@ ! ! F90=df.exe ! CPP=cl.exe -! CPP_PROJ=/nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "..\..\select113" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\select.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +! CPP_PROJ=/nologo /MD /W3 $(EXFLAGS) /Zi /O2 /I "..\Include" /I "..\PC" /I "..\..\select113" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\select.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c ! ! .c{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .c{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! MTL=midl.exe -! MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +! MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 ! RSC=rc.exe ! BSC32=bscmake.exe -! BSC32_FLAGS=/nologo /o"$(OUTDIR)\select.bsc" +! BSC32_FLAGS=/nologo /o"$(OUTDIR)\select.bsc" ! BSC32_SBRS= \ -! +! ! LINK32=link.exe -! LINK32_FLAGS=user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /base:"0x1D110000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\select.pdb" /debug /machine:I386 /nodefaultlib:"libc" /out:"$(OUTDIR)\select.pyd" /implib:"$(OUTDIR)\select.lib" +! LINK32_FLAGS=user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /base:"0x1D110000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\select.pdb" /debug /machine:I386 /nodefaultlib:"libc" /out:"$(OUTDIR)\select.pyd" /implib:"$(OUTDIR)\select.lib" ! LINK32_OBJS= \ ! "$(INTDIR)\selectmodule.obj" \ ! "$(OUTDIR)\python23.lib" @@ -12924,6 +11885,8 @@ ! $(LINK32) @<< ! $(LINK32_FLAGS) $(LINK32_OBJS) ! << +! if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2 +! echo $(CPP_PROJ) ! ! !ELSEIF "$(CFG)" == "select - Win32 Debug" ! @@ -12933,21 +11896,21 @@ ! OutDir=.\. ! # End Custom Macros ! -! !IF "$(RECURSE)" == "0" +! !IF "$(RECURSE)" == "0" ! ! ALL : "$(OUTDIR)\select_d.pyd" ! -! !ELSE +! !ELSE ! ! ALL : "pythoncore - Win32 Debug" "$(OUTDIR)\select_d.pyd" ! -! !ENDIF +! !ENDIF ! -! !IF "$(RECURSE)" == "1" -! CLEAN :"pythoncore - Win32 DebugCLEAN" -! !ELSE +! !IF "$(RECURSE)" == "1" +! CLEAN :"pythoncore - Win32 DebugCLEAN" +! !ELSE ! CLEAN : -! !ENDIF +! !ENDIF ! -@erase "$(INTDIR)\selectmodule.obj" ! -@erase "$(INTDIR)\vc60.idb" ! -@erase "$(INTDIR)\vc60.pdb" @@ -12965,47 +11928,47 @@ ! ! F90=df.exe ! CPP=cl.exe -! CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /I "..\..\select113" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\select.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +! CPP_PROJ=/nologo /MDd /W3 /Gm $(EXFLAGS) /Zi /Od /I "..\Include" /I "..\PC" /I "..\..\select113" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\select.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c ! ! .c{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .c{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! MTL=midl.exe -! MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 +! MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 ! RSC=rc.exe ! BSC32=bscmake.exe -! BSC32_FLAGS=/nologo /o"$(OUTDIR)\select.bsc" +! BSC32_FLAGS=/nologo /o"$(OUTDIR)\select.bsc" ! BSC32_SBRS= \ -! +! ! LINK32=link.exe -! LINK32_FLAGS=user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /base:"0x1D110000" /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\select_d.pdb" /debug /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"msvcrt" /out:"$(OUTDIR)\select_d.pyd" /implib:"$(OUTDIR)\select_d.lib" /pdbtype:sept +! LINK32_FLAGS=user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /base:"0x1D110000" /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\select_d.pdb" /debug /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"msvcrt" /out:"$(OUTDIR)\select_d.pyd" /implib:"$(OUTDIR)\select_d.lib" /pdbtype:sept ! LINK32_OBJS= \ ! "$(INTDIR)\selectmodule.obj" \ ! "$(OUTDIR)\python23_d.lib" @@ -13014,46 +11977,48 @@ ! $(LINK32) @<< ! $(LINK32_FLAGS) $(LINK32_OBJS) ! << +! if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2 +! echo $(CPP_PROJ) ! -! !ENDIF +! !ENDIF ! ! ! !IF "$(NO_EXTERNAL_DEPS)" != "1" ! !IF EXISTS("select.dep") ! !INCLUDE "select.dep" -! !ELSE +! !ELSE ! !MESSAGE Warning: cannot find "select.dep" -! !ENDIF -! !ENDIF +! !ENDIF +! !ENDIF ! ! ! !IF "$(CFG)" == "select - Win32 Release" || "$(CFG)" == "select - Win32 Debug" ! ! !IF "$(CFG)" == "select - Win32 Release" ! -! "pythoncore - Win32 Release" : +! "pythoncore - Win32 Release" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" ! cd "." ! -! "pythoncore - Win32 ReleaseCLEAN" : +! "pythoncore - Win32 ReleaseCLEAN" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" RECURSE=1 CLEAN +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" RECURSE=1 CLEAN ! cd "." ! ! !ELSEIF "$(CFG)" == "select - Win32 Debug" ! -! "pythoncore - Win32 Debug" : +! "pythoncore - Win32 Debug" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" ! cd "." ! -! "pythoncore - Win32 DebugCLEAN" : +! "pythoncore - Win32 DebugCLEAN" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" RECURSE=1 CLEAN +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" RECURSE=1 CLEAN ! cd "." ! -! !ENDIF +! !ENDIF ! ! SOURCE=..\Modules\selectmodule.c ! @@ -13062,10 +12027,10 @@ ! ! ! -! !ENDIF +! !ENDIF ! -*** misc/Python-2.3.4/PCbuild/unicodedata.dep Thu Sep 1 19:41:41 2005 ---- misc/build/Python-2.3.4/PCbuild/unicodedata.dep Thu Sep 1 19:40:58 2005 +*** misc/Python-2.3.4/PCbuild/unicodedata.dep Thu Jun 29 12:09:59 2006 +--- misc/build/Python-2.3.4/PCbuild/unicodedata.dep Thu Jun 29 11:02:21 2006 *************** *** 1 **** ! dummy @@ -13121,38 +12086,17 @@ ! "..\PC\pyconfig.h"\ ! {$(INCLUDE)}"basetsd.h"\ ! -*** misc/Python-2.3.4/PCbuild/unicodedata.mak Thu Sep 1 19:41:41 2005 ---- misc/build/Python-2.3.4/PCbuild/unicodedata.mak Thu Sep 1 19:40:58 2005 +*** misc/Python-2.3.4/PCbuild/unicodedata.mak Thu Jun 29 12:09:59 2006 +--- misc/build/Python-2.3.4/PCbuild/unicodedata.mak Thu Jun 29 16:33:50 2006 *************** *** 1 **** ! dummy ---- 1,253 ---- -! # Microsoft Developer Studio Generated NMAKE File, Based on unicodedata.dsp +--- 1,235 ---- ! !IF "$(CFG)" == "" -! CFG=unicodedata - Win32 Debug -! !MESSAGE Keine Konfiguration angegeben. unicodedata - Win32 Debug wird als Standard verwendet. -! !ENDIF -! -! !IF "$(CFG)" != "unicodedata - Win32 Release" && "$(CFG)" != "unicodedata - Win32 Debug" -! !MESSAGE Ungltige Konfiguration "$(CFG)" angegeben. -! !MESSAGE Sie k”nnen beim Ausfhren von NMAKE eine Konfiguration angeben -! !MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel: -! !MESSAGE -! !MESSAGE NMAKE /f "unicodedata.mak" CFG="unicodedata - Win32 Debug" -! !MESSAGE -! !MESSAGE Fr die Konfiguration stehen zur Auswahl: -! !MESSAGE -! !MESSAGE "unicodedata - Win32 Release" (basierend auf "Win32 (x86) Dynamic-Link Library") -! !MESSAGE "unicodedata - Win32 Debug" (basierend auf "Win32 (x86) Dynamic-Link Library") -! !MESSAGE -! !ERROR Eine ungltige Konfiguration wurde angegeben. -! !ENDIF +! CFG=unicodedata - Win32 Release +! !ENDIF ! -! !IF "$(OS)" == "Windows_NT" ! NULL= -! !ELSE -! NULL=nul -! !ENDIF ! ! !IF "$(CFG)" == "unicodedata - Win32 Release" ! @@ -13162,21 +12106,21 @@ ! OutDir=.\. ! # End Custom Macros ! -! !IF "$(RECURSE)" == "0" +! !IF "$(RECURSE)" == "0" ! ! ALL : "$(OUTDIR)\unicodedata.pyd" ! -! !ELSE +! !ELSE ! ! ALL : "pythoncore - Win32 Release" "$(OUTDIR)\unicodedata.pyd" ! -! !ENDIF +! !ENDIF ! -! !IF "$(RECURSE)" == "1" -! CLEAN :"pythoncore - Win32 ReleaseCLEAN" -! !ELSE +! !IF "$(RECURSE)" == "1" +! CLEAN :"pythoncore - Win32 ReleaseCLEAN" +! !ELSE ! CLEAN : -! !ENDIF +! !ENDIF ! -@erase "$(INTDIR)\unicodedata.obj" ! -@erase "$(INTDIR)\vc60.idb" ! -@erase "$(OUTDIR)\unicodedata.exp" @@ -13191,47 +12135,47 @@ ! ! F90=df.exe ! CPP=cl.exe -! CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MMAP_EXPORTS" /Fp"$(INTDIR)\unicodedata.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +! CPP_PROJ=/nologo /MD /W3 $(EXFLAGS) /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MMAP_EXPORTS" /Fp"$(INTDIR)\unicodedata.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c ! ! .c{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .c{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! MTL=midl.exe -! MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 +! MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 ! RSC=rc.exe ! BSC32=bscmake.exe -! BSC32_FLAGS=/nologo /o"$(OUTDIR)\unicodedata.bsc" +! BSC32_FLAGS=/nologo /o"$(OUTDIR)\unicodedata.bsc" ! BSC32_SBRS= \ -! +! ! LINK32=link.exe -! LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1D120000" /dll /incremental:no /pdb:"$(OUTDIR)\unicodedata.pdb" /machine:I386 /out:"$(OUTDIR)\unicodedata.pyd" /implib:"$(OUTDIR)\unicodedata.lib" +! LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1D120000" /dll /incremental:no /pdb:"$(OUTDIR)\unicodedata.pdb" /machine:I386 /out:"$(OUTDIR)\unicodedata.pyd" /implib:"$(OUTDIR)\unicodedata.lib" ! LINK32_OBJS= \ ! "$(INTDIR)\unicodedata.obj" \ ! "$(OUTDIR)\python23.lib" @@ -13240,6 +12184,8 @@ ! $(LINK32) @<< ! $(LINK32_FLAGS) $(LINK32_OBJS) ! << +! if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2 +! echo $(CPP_PROJ) ! ! !ELSEIF "$(CFG)" == "unicodedata - Win32 Debug" ! @@ -13249,21 +12195,21 @@ ! OutDir=.\. ! # End Custom Macros ! -! !IF "$(RECURSE)" == "0" +! !IF "$(RECURSE)" == "0" ! ! ALL : "$(OUTDIR)\unicodedata_d.pyd" ! -! !ELSE +! !ELSE ! ! ALL : "pythoncore - Win32 Debug" "$(OUTDIR)\unicodedata_d.pyd" ! -! !ENDIF +! !ENDIF ! -! !IF "$(RECURSE)" == "1" -! CLEAN :"pythoncore - Win32 DebugCLEAN" -! !ELSE +! !IF "$(RECURSE)" == "1" +! CLEAN :"pythoncore - Win32 DebugCLEAN" +! !ELSE ! CLEAN : -! !ENDIF +! !ENDIF ! -@erase "$(INTDIR)\unicodedata.obj" ! -@erase "$(INTDIR)\vc60.idb" ! -@erase "$(INTDIR)\vc60.pdb" @@ -13281,47 +12227,47 @@ ! ! F90=df.exe ! CPP=cl.exe -! CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MMAP_EXPORTS" /Fp"$(INTDIR)\unicodedata.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c +! CPP_PROJ=/nologo /MDd /W3 /Gm $(EXFLAGS) /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MMAP_EXPORTS" /Fp"$(INTDIR)\unicodedata.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c ! ! .c{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .c{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! MTL=midl.exe -! MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 +! MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 ! RSC=rc.exe ! BSC32=bscmake.exe -! BSC32_FLAGS=/nologo /o"$(OUTDIR)\unicodedata.bsc" +! BSC32_FLAGS=/nologo /o"$(OUTDIR)\unicodedata.bsc" ! BSC32_SBRS= \ -! +! ! LINK32=link.exe -! LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1D120000" /dll /incremental:yes /pdb:"$(OUTDIR)\unicodedata_d.pdb" /debug /machine:I386 /out:"$(OUTDIR)\unicodedata_d.pyd" /implib:"$(OUTDIR)\unicodedata_d.lib" /pdbtype:sept +! LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1D120000" /dll /incremental:yes /pdb:"$(OUTDIR)\unicodedata_d.pdb" /debug /machine:I386 /out:"$(OUTDIR)\unicodedata_d.pyd" /implib:"$(OUTDIR)\unicodedata_d.lib" /pdbtype:sept ! LINK32_OBJS= \ ! "$(INTDIR)\unicodedata.obj" \ ! "$(OUTDIR)\python23_d.lib" @@ -13330,46 +12276,48 @@ ! $(LINK32) @<< ! $(LINK32_FLAGS) $(LINK32_OBJS) ! << +! if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2 +! echo $(CPP_PROJ) ! -! !ENDIF +! !ENDIF ! ! ! !IF "$(NO_EXTERNAL_DEPS)" != "1" ! !IF EXISTS("unicodedata.dep") ! !INCLUDE "unicodedata.dep" -! !ELSE +! !ELSE ! !MESSAGE Warning: cannot find "unicodedata.dep" -! !ENDIF -! !ENDIF +! !ENDIF +! !ENDIF ! ! ! !IF "$(CFG)" == "unicodedata - Win32 Release" || "$(CFG)" == "unicodedata - Win32 Debug" ! ! !IF "$(CFG)" == "unicodedata - Win32 Release" ! -! "pythoncore - Win32 Release" : +! "pythoncore - Win32 Release" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" ! cd "." ! -! "pythoncore - Win32 ReleaseCLEAN" : +! "pythoncore - Win32 ReleaseCLEAN" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" RECURSE=1 CLEAN +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" RECURSE=1 CLEAN ! cd "." ! ! !ELSEIF "$(CFG)" == "unicodedata - Win32 Debug" ! -! "pythoncore - Win32 Debug" : +! "pythoncore - Win32 Debug" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" ! cd "." ! -! "pythoncore - Win32 DebugCLEAN" : +! "pythoncore - Win32 DebugCLEAN" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" RECURSE=1 CLEAN +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" RECURSE=1 CLEAN ! cd "." ! -! !ENDIF +! !ENDIF ! ! SOURCE=..\Modules\unicodedata.c ! @@ -13378,48 +12326,26 @@ ! ! ! -! !ENDIF -! -*** misc/Python-2.3.4/PCbuild/w9xpopen.dep Thu Sep 1 19:41:41 2005 ---- misc/build/Python-2.3.4/PCbuild/w9xpopen.dep Thu Sep 1 19:40:58 2005 +! !ENDIF +*** misc/Python-2.3.4/PCbuild/w9xpopen.dep Thu Jun 29 12:10:00 2006 +--- misc/build/Python-2.3.4/PCbuild/w9xpopen.dep Thu Jun 29 11:02:21 2006 *************** *** 1 **** ! dummy --- 1,2 ---- ! # Microsoft Developer Studio erstellte Abhängigkeitsdatei, einbezogen von w9xpopen.mak ! -*** misc/Python-2.3.4/PCbuild/w9xpopen.mak Thu Sep 1 19:41:41 2005 ---- misc/build/Python-2.3.4/PCbuild/w9xpopen.mak Thu Sep 1 19:40:58 2005 +*** misc/Python-2.3.4/PCbuild/w9xpopen.mak Thu Jun 29 12:10:00 2006 +--- misc/build/Python-2.3.4/PCbuild/w9xpopen.mak Thu Jun 29 16:33:50 2006 *************** *** 1 **** ! dummy ---- 1,196 ---- -! # Microsoft Developer Studio Generated NMAKE File, Based on w9xpopen.dsp +--- 1,178 ---- ! !IF "$(CFG)" == "" -! CFG=w9xpopen - Win32 Debug -! !MESSAGE Keine Konfiguration angegeben. w9xpopen - Win32 Debug wird als Standard verwendet. -! !ENDIF -! -! !IF "$(CFG)" != "w9xpopen - Win32 Release" && "$(CFG)" != "w9xpopen - Win32 Debug" -! !MESSAGE Ungltige Konfiguration "$(CFG)" angegeben. -! !MESSAGE Sie k”nnen beim Ausfhren von NMAKE eine Konfiguration angeben -! !MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel: -! !MESSAGE -! !MESSAGE NMAKE /f "w9xpopen.mak" CFG="w9xpopen - Win32 Debug" -! !MESSAGE -! !MESSAGE Fr die Konfiguration stehen zur Auswahl: -! !MESSAGE -! !MESSAGE "w9xpopen - Win32 Release" (basierend auf "Win32 (x86) Application") -! !MESSAGE "w9xpopen - Win32 Debug" (basierend auf "Win32 (x86) Application") -! !MESSAGE -! !ERROR Eine ungltige Konfiguration wurde angegeben. -! !ENDIF +! CFG=w9xpopen - Win32 Release +! !ENDIF ! -! !IF "$(OS)" == "Windows_NT" ! NULL= -! !ELSE -! NULL=nul -! !ENDIF ! ! !IF "$(CFG)" == "w9xpopen - Win32 Release" ! @@ -13444,47 +12370,47 @@ ! if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)" ! ! CPP=cl.exe -! CPP_PROJ=/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /Fp"$(INTDIR)\w9xpopen.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +! CPP_PROJ=/nologo /MD /W3 $(EXFLAGS) /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /Fp"$(INTDIR)\w9xpopen.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c ! ! .c{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .c{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! MTL=midl.exe -! MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 +! MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 ! RSC=rc.exe ! BSC32=bscmake.exe -! BSC32_FLAGS=/nologo /o"$(OUTDIR)\w9xpopen.bsc" +! BSC32_FLAGS=/nologo /o"$(OUTDIR)\w9xpopen.bsc" ! BSC32_SBRS= \ -! +! ! LINK32=link.exe -! LINK32_FLAGS=user32.lib /nologo /incremental:no /pdb:"$(OUTDIR)\w9xpopen.pdb" /machine:I386 /out:"$(OUTDIR)\w9xpopen.exe" +! LINK32_FLAGS=user32.lib /nologo /incremental:no /pdb:"$(OUTDIR)\w9xpopen.pdb" /machine:I386 /out:"$(OUTDIR)\w9xpopen.exe" ! LINK32_OBJS= \ ! "$(INTDIR)\w9xpopen.obj" ! @@ -13492,6 +12418,8 @@ ! $(LINK32) @<< ! $(LINK32_FLAGS) $(LINK32_OBJS) ! << +! if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;1 +! echo $(CPP_PROJ) ! ! !ELSEIF "$(CFG)" == "w9xpopen - Win32 Debug" ! @@ -13519,47 +12447,47 @@ ! if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)" ! ! CPP=cl.exe -! CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /Fp"$(INTDIR)\w9xpopen.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c +! CPP_PROJ=/nologo /MDd /W3 /Gm $(EXFLAGS) /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /Fp"$(INTDIR)\w9xpopen.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c ! ! .c{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .c{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! MTL=midl.exe -! MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 +! MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 ! RSC=rc.exe ! BSC32=bscmake.exe -! BSC32_FLAGS=/nologo /o"$(OUTDIR)\w9xpopen.bsc" +! BSC32_FLAGS=/nologo /o"$(OUTDIR)\w9xpopen.bsc" ! BSC32_SBRS= \ -! +! ! LINK32=link.exe -! LINK32_FLAGS=user32.lib /nologo /incremental:yes /pdb:"$(OUTDIR)\w9xpopen_d.pdb" /debug /machine:I386 /out:"$(OUTDIR)\w9xpopen_d.exe" /pdbtype:sept +! LINK32_FLAGS=user32.lib /nologo /incremental:yes /pdb:"$(OUTDIR)\w9xpopen_d.pdb" /debug /machine:I386 /out:"$(OUTDIR)\w9xpopen_d.exe" /pdbtype:sept ! LINK32_OBJS= \ ! "$(INTDIR)\w9xpopen.obj" ! @@ -13567,17 +12495,19 @@ ! $(LINK32) @<< ! $(LINK32_FLAGS) $(LINK32_OBJS) ! << +! if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;1 +! echo $(CPP_PROJ) ! -! !ENDIF +! !ENDIF ! ! ! !IF "$(NO_EXTERNAL_DEPS)" != "1" ! !IF EXISTS("w9xpopen.dep") ! !INCLUDE "w9xpopen.dep" -! !ELSE +! !ELSE ! !MESSAGE Warning: cannot find "w9xpopen.dep" -! !ENDIF -! !ENDIF +! !ENDIF +! !ENDIF ! ! ! !IF "$(CFG)" == "w9xpopen - Win32 Release" || "$(CFG)" == "w9xpopen - Win32 Debug" @@ -13588,10 +12518,9 @@ ! ! ! -! !ENDIF -! -*** misc/Python-2.3.4/PCbuild/winreg.dep Thu Sep 1 19:41:41 2005 ---- misc/build/Python-2.3.4/PCbuild/winreg.dep Thu Sep 1 19:40:58 2005 +! !ENDIF +*** misc/Python-2.3.4/PCbuild/winreg.dep Thu Jun 29 12:10:00 2006 +--- misc/build/Python-2.3.4/PCbuild/winreg.dep Thu Jun 29 11:02:21 2006 *************** *** 1 **** ! dummy @@ -13645,38 +12574,17 @@ ! "..\PC\pyconfig.h"\ ! {$(INCLUDE)}"basetsd.h"\ ! -*** misc/Python-2.3.4/PCbuild/winreg.mak Thu Sep 1 19:41:41 2005 ---- misc/build/Python-2.3.4/PCbuild/winreg.mak Thu Sep 1 19:40:58 2005 +*** misc/Python-2.3.4/PCbuild/winreg.mak Thu Jun 29 12:10:00 2006 +--- misc/build/Python-2.3.4/PCbuild/winreg.mak Thu Jun 29 16:33:50 2006 *************** *** 1 **** ! dummy ---- 1,271 ---- -! # Microsoft Developer Studio Generated NMAKE File, Based on winreg.dsp +--- 1,253 ---- ! !IF "$(CFG)" == "" -! CFG=winreg - Win32 Debug -! !MESSAGE Keine Konfiguration angegeben. winreg - Win32 Debug wird als Standard verwendet. -! !ENDIF +! CFG=winreg - Win32 Release +! !ENDIF ! -! !IF "$(CFG)" != "winreg - Win32 Release" && "$(CFG)" != "winreg - Win32 Debug" -! !MESSAGE Ungltige Konfiguration "$(CFG)" angegeben. -! !MESSAGE Sie k”nnen beim Ausfhren von NMAKE eine Konfiguration angeben -! !MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel: -! !MESSAGE -! !MESSAGE NMAKE /f "winreg.mak" CFG="winreg - Win32 Debug" -! !MESSAGE -! !MESSAGE Fr die Konfiguration stehen zur Auswahl: -! !MESSAGE -! !MESSAGE "winreg - Win32 Release" (basierend auf "Win32 (x86) Dynamic-Link Library") -! !MESSAGE "winreg - Win32 Debug" (basierend auf "Win32 (x86) Dynamic-Link Library") -! !MESSAGE -! !ERROR Eine ungltige Konfiguration wurde angegeben. -! !ENDIF -! -! !IF "$(OS)" == "Windows_NT" ! NULL= -! !ELSE -! NULL=nul -! !ENDIF ! ! !IF "$(CFG)" == "winreg - Win32 Release" ! @@ -13686,21 +12594,21 @@ ! OutDir=.\. ! # End Custom Macros ! -! !IF "$(RECURSE)" == "0" +! !IF "$(RECURSE)" == "0" ! ! ALL : "$(OUTDIR)\_winreg.pyd" ! -! !ELSE +! !ELSE ! ! ALL : "pythoncore - Win32 Release" "$(OUTDIR)\_winreg.pyd" ! -! !ENDIF +! !ENDIF ! -! !IF "$(RECURSE)" == "1" -! CLEAN :"pythoncore - Win32 ReleaseCLEAN" -! !ELSE +! !IF "$(RECURSE)" == "1" +! CLEAN :"pythoncore - Win32 ReleaseCLEAN" +! !ELSE ! CLEAN : -! !ENDIF +! !ENDIF ! -@erase "$(INTDIR)\_winreg.obj" ! -@erase "$(INTDIR)\vc60.idb" ! -@erase "$(OUTDIR)\_winreg.exp" @@ -13715,47 +12623,47 @@ ! ! F90=df.exe ! CPP=cl.exe -! CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\Include" /I "..\PC" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /Fp"$(INTDIR)\winreg.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +! CPP_PROJ=/nologo /MD /W3 $(EXFLAGS) /O2 /I "..\Include" /I "..\PC" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /Fp"$(INTDIR)\winreg.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c ! ! .c{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .c{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! MTL=midl.exe -! MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 +! MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 ! RSC=rc.exe ! BSC32=bscmake.exe -! BSC32_FLAGS=/nologo /o"$(OUTDIR)\winreg.bsc" +! BSC32_FLAGS=/nologo /o"$(OUTDIR)\winreg.bsc" ! BSC32_SBRS= \ -! +! ! LINK32=link.exe -! LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1e1C0000" /dll /incremental:no /pdb:"$(OUTDIR)\_winreg.pdb" /machine:I386 /out:"$(OUTDIR)\_winreg.pyd" /implib:"$(OUTDIR)\_winreg.lib" +! LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1e1C0000" /dll /incremental:no /pdb:"$(OUTDIR)\_winreg.pdb" /machine:I386 /out:"$(OUTDIR)\_winreg.pyd" /implib:"$(OUTDIR)\_winreg.lib" ! LINK32_OBJS= \ ! "$(INTDIR)\_winreg.obj" \ ! "$(OUTDIR)\python23.lib" @@ -13764,6 +12672,8 @@ ! $(LINK32) @<< ! $(LINK32_FLAGS) $(LINK32_OBJS) ! << +! if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2 +! echo $(CPP_PROJ) ! ! !ELSEIF "$(CFG)" == "winreg - Win32 Debug" ! @@ -13773,21 +12683,21 @@ ! OutDir=.\. ! # End Custom Macros ! -! !IF "$(RECURSE)" == "0" +! !IF "$(RECURSE)" == "0" ! ! ALL : "$(OUTDIR)\_winreg_d.pyd" ! -! !ELSE +! !ELSE ! ! ALL : "pythoncore - Win32 Debug" "$(OUTDIR)\_winreg_d.pyd" ! -! !ENDIF +! !ENDIF ! -! !IF "$(RECURSE)" == "1" -! CLEAN :"pythoncore - Win32 DebugCLEAN" -! !ELSE +! !IF "$(RECURSE)" == "1" +! CLEAN :"pythoncore - Win32 DebugCLEAN" +! !ELSE ! CLEAN : -! !ENDIF +! !ENDIF ! -@erase "$(INTDIR)\_winreg.obj" ! -@erase "$(INTDIR)\vc60.idb" ! -@erase "$(INTDIR)\vc60.pdb" @@ -13805,47 +12715,47 @@ ! ! F90=df.exe ! CPP=cl.exe -! CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\Include" /I "..\PC" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /Fp"$(INTDIR)\winreg.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c +! CPP_PROJ=/nologo /MDd /W3 $(EXFLAGS) /Zi /Od /I "..\Include" /I "..\PC" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /Fp"$(INTDIR)\winreg.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c ! ! .c{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .c{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! MTL=midl.exe -! MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 +! MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 ! RSC=rc.exe ! BSC32=bscmake.exe -! BSC32_FLAGS=/nologo /o"$(OUTDIR)\winreg.bsc" +! BSC32_FLAGS=/nologo /o"$(OUTDIR)\winreg.bsc" ! BSC32_SBRS= \ -! +! ! LINK32=link.exe -! LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1e1C0000" /dll /incremental:yes /pdb:"$(OUTDIR)\_winreg_d.pdb" /debug /machine:I386 /out:"$(OUTDIR)\_winreg_d.pyd" /implib:"$(OUTDIR)\_winreg_d.lib" /pdbtype:sept +! LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1e1C0000" /dll /incremental:yes /pdb:"$(OUTDIR)\_winreg_d.pdb" /debug /machine:I386 /out:"$(OUTDIR)\_winreg_d.pyd" /implib:"$(OUTDIR)\_winreg_d.lib" /pdbtype:sept ! LINK32_OBJS= \ ! "$(INTDIR)\_winreg.obj" \ ! "$(OUTDIR)\python23_d.lib" @@ -13854,52 +12764,54 @@ ! $(LINK32) @<< ! $(LINK32_FLAGS) $(LINK32_OBJS) ! << +! if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2 +! echo $(CPP_PROJ) ! -! !ENDIF +! !ENDIF ! ! ! !IF "$(NO_EXTERNAL_DEPS)" != "1" ! !IF EXISTS("winreg.dep") ! !INCLUDE "winreg.dep" -! !ELSE +! !ELSE ! !MESSAGE Warning: cannot find "winreg.dep" -! !ENDIF -! !ENDIF +! !ENDIF +! !ENDIF ! ! ! !IF "$(CFG)" == "winreg - Win32 Release" || "$(CFG)" == "winreg - Win32 Debug" ! ! !IF "$(CFG)" == "winreg - Win32 Release" ! -! "pythoncore - Win32 Release" : +! "pythoncore - Win32 Release" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" ! cd "." ! -! "pythoncore - Win32 ReleaseCLEAN" : +! "pythoncore - Win32 ReleaseCLEAN" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" RECURSE=1 CLEAN +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" RECURSE=1 CLEAN ! cd "." ! ! !ELSEIF "$(CFG)" == "winreg - Win32 Debug" ! -! "pythoncore - Win32 Debug" : +! "pythoncore - Win32 Debug" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" ! cd "." ! -! "pythoncore - Win32 DebugCLEAN" : +! "pythoncore - Win32 DebugCLEAN" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" RECURSE=1 CLEAN +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" RECURSE=1 CLEAN ! cd "." ! -! !ENDIF +! !ENDIF ! ! SOURCE=..\PC\_winreg.c ! ! !IF "$(CFG)" == "winreg - Win32 Release" ! -! CPP_SWITCHES=/nologo /MD /W3 /GX /O2 /I "..\Include" /I "..\PC" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /Fp"$(INTDIR)\winreg.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +! CPP_SWITCHES=/nologo /MD /W3 $(EXFLAGS) /O2 /I "..\Include" /I "..\PC" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /Fp"$(INTDIR)\winreg.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c ! ! "$(INTDIR)\_winreg.obj" : $(SOURCE) "$(INTDIR)" ! $(CPP) @<< @@ -13909,7 +12821,7 @@ ! ! !ELSEIF "$(CFG)" == "winreg - Win32 Debug" ! -! CPP_SWITCHES=/nologo /MDd /W3 /GX /Zi /Od /I "..\Include" /I "..\PC" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /Fp"$(INTDIR)\winreg.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c +! CPP_SWITCHES=/nologo /MDd /W3 $(EXFLAGS) /Zi /Od /I "..\Include" /I "..\PC" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /Fp"$(INTDIR)\winreg.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c ! ! "$(INTDIR)\_winreg.obj" : $(SOURCE) "$(INTDIR)" ! $(CPP) @<< @@ -13917,13 +12829,12 @@ ! << ! ! -! !ENDIF -! +! !ENDIF ! -! !ENDIF ! -*** misc/Python-2.3.4/PCbuild/winsound.dep Thu Sep 1 19:41:41 2005 ---- misc/build/Python-2.3.4/PCbuild/winsound.dep Thu Sep 1 19:40:58 2005 +! !ENDIF +*** misc/Python-2.3.4/PCbuild/winsound.dep Thu Jun 29 12:10:00 2006 +--- misc/build/Python-2.3.4/PCbuild/winsound.dep Thu Jun 29 11:02:21 2006 *************** *** 1 **** ! dummy @@ -13976,38 +12887,17 @@ ! "..\PC\pyconfig.h"\ ! {$(INCLUDE)}"basetsd.h"\ ! -*** misc/Python-2.3.4/PCbuild/winsound.mak Thu Sep 1 19:41:41 2005 ---- misc/build/Python-2.3.4/PCbuild/winsound.mak Thu Sep 1 19:40:58 2005 +*** misc/Python-2.3.4/PCbuild/winsound.mak Thu Jun 29 12:10:00 2006 +--- misc/build/Python-2.3.4/PCbuild/winsound.mak Thu Jun 29 16:33:50 2006 *************** *** 1 **** ! dummy ---- 1,253 ---- -! # Microsoft Developer Studio Generated NMAKE File, Based on winsound.dsp +--- 1,235 ---- ! !IF "$(CFG)" == "" -! CFG=winsound - Win32 Debug -! !MESSAGE Keine Konfiguration angegeben. winsound - Win32 Debug wird als Standard verwendet. -! !ENDIF -! -! !IF "$(CFG)" != "winsound - Win32 Release" && "$(CFG)" != "winsound - Win32 Debug" -! !MESSAGE Ungltige Konfiguration "$(CFG)" angegeben. -! !MESSAGE Sie k”nnen beim Ausfhren von NMAKE eine Konfiguration angeben -! !MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel: -! !MESSAGE -! !MESSAGE NMAKE /f "winsound.mak" CFG="winsound - Win32 Debug" -! !MESSAGE -! !MESSAGE Fr die Konfiguration stehen zur Auswahl: -! !MESSAGE -! !MESSAGE "winsound - Win32 Release" (basierend auf "Win32 (x86) Dynamic-Link Library") -! !MESSAGE "winsound - Win32 Debug" (basierend auf "Win32 (x86) Dynamic-Link Library") -! !MESSAGE -! !ERROR Eine ungltige Konfiguration wurde angegeben. -! !ENDIF +! CFG=winsound - Win32 Release +! !ENDIF ! -! !IF "$(OS)" == "Windows_NT" ! NULL= -! !ELSE -! NULL=nul -! !ENDIF ! ! !IF "$(CFG)" == "winsound - Win32 Release" ! @@ -14017,21 +12907,21 @@ ! OutDir=.\. ! # End Custom Macros ! -! !IF "$(RECURSE)" == "0" +! !IF "$(RECURSE)" == "0" ! ! ALL : "$(OUTDIR)\winsound.pyd" ! -! !ELSE +! !ELSE ! ! ALL : "pythoncore - Win32 Release" "$(OUTDIR)\winsound.pyd" ! -! !ENDIF +! !ENDIF ! -! !IF "$(RECURSE)" == "1" -! CLEAN :"pythoncore - Win32 ReleaseCLEAN" -! !ELSE +! !IF "$(RECURSE)" == "1" +! CLEAN :"pythoncore - Win32 ReleaseCLEAN" +! !ELSE ! CLEAN : -! !ENDIF +! !ENDIF ! -@erase "$(INTDIR)\vc60.idb" ! -@erase "$(INTDIR)\winsound.obj" ! -@erase "$(OUTDIR)\winsound.exp" @@ -14046,47 +12936,47 @@ ! ! F90=df.exe ! CPP=cl.exe -! CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WINSOUND_EXPORTS" /Fp"$(INTDIR)\winsound.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +! CPP_PROJ=/nologo /MD /W3 $(EXFLAGS) /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WINSOUND_EXPORTS" /Fp"$(INTDIR)\winsound.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c ! ! .c{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .c{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! MTL=midl.exe -! MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 +! MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 ! RSC=rc.exe ! BSC32=bscmake.exe -! BSC32_FLAGS=/nologo /o"$(OUTDIR)\winsound.bsc" +! BSC32_FLAGS=/nologo /o"$(OUTDIR)\winsound.bsc" ! BSC32_SBRS= \ -! +! ! LINK32=link.exe -! LINK32_FLAGS=kernel32.lib winmm.lib user32.lib /nologo /base:"0x1D160000" /dll /incremental:no /pdb:"$(OUTDIR)\winsound.pdb" /machine:I386 /out:"$(OUTDIR)\winsound.pyd" /implib:"$(OUTDIR)\winsound.lib" +! LINK32_FLAGS=kernel32.lib winmm.lib user32.lib /nologo /base:"0x1D160000" /dll /incremental:no /pdb:"$(OUTDIR)\winsound.pdb" /machine:I386 /out:"$(OUTDIR)\winsound.pyd" /implib:"$(OUTDIR)\winsound.lib" ! LINK32_OBJS= \ ! "$(INTDIR)\winsound.obj" \ ! "$(OUTDIR)\python23.lib" @@ -14095,6 +12985,8 @@ ! $(LINK32) @<< ! $(LINK32_FLAGS) $(LINK32_OBJS) ! << +! if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2 +! echo $(CPP_PROJ) ! ! !ELSEIF "$(CFG)" == "winsound - Win32 Debug" ! @@ -14104,21 +12996,21 @@ ! OutDir=.\. ! # End Custom Macros ! -! !IF "$(RECURSE)" == "0" +! !IF "$(RECURSE)" == "0" ! ! ALL : "$(OUTDIR)\winsound_d.pyd" ! -! !ELSE +! !ELSE ! ! ALL : "pythoncore - Win32 Debug" "$(OUTDIR)\winsound_d.pyd" ! -! !ENDIF +! !ENDIF ! -! !IF "$(RECURSE)" == "1" -! CLEAN :"pythoncore - Win32 DebugCLEAN" -! !ELSE +! !IF "$(RECURSE)" == "1" +! CLEAN :"pythoncore - Win32 DebugCLEAN" +! !ELSE ! CLEAN : -! !ENDIF +! !ENDIF ! -@erase "$(INTDIR)\vc60.idb" ! -@erase "$(INTDIR)\vc60.pdb" ! -@erase "$(INTDIR)\winsound.obj" @@ -14136,47 +13028,47 @@ ! ! F90=df.exe ! CPP=cl.exe -! CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WINSOUND_EXPORTS" /Fp"$(INTDIR)\winsound.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c +! CPP_PROJ=/nologo /MDd /W3 /Gm $(EXFLAGS) /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WINSOUND_EXPORTS" /Fp"$(INTDIR)\winsound.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c ! ! .c{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .c{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! MTL=midl.exe -! MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 +! MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 ! RSC=rc.exe ! BSC32=bscmake.exe -! BSC32_FLAGS=/nologo /o"$(OUTDIR)\winsound.bsc" +! BSC32_FLAGS=/nologo /o"$(OUTDIR)\winsound.bsc" ! BSC32_SBRS= \ -! +! ! LINK32=link.exe -! LINK32_FLAGS=user32.lib kernel32.lib winmm.lib /nologo /base:"0x1D160000" /dll /incremental:yes /pdb:"$(OUTDIR)\winsound_d.pdb" /debug /machine:I386 /out:"$(OUTDIR)\winsound_d.pyd" /implib:"$(OUTDIR)\winsound_d.lib" /pdbtype:sept +! LINK32_FLAGS=user32.lib kernel32.lib winmm.lib /nologo /base:"0x1D160000" /dll /incremental:yes /pdb:"$(OUTDIR)\winsound_d.pdb" /debug /machine:I386 /out:"$(OUTDIR)\winsound_d.pyd" /implib:"$(OUTDIR)\winsound_d.lib" /pdbtype:sept ! LINK32_OBJS= \ ! "$(INTDIR)\winsound.obj" \ ! "$(OUTDIR)\python23_d.lib" @@ -14185,46 +13077,48 @@ ! $(LINK32) @<< ! $(LINK32_FLAGS) $(LINK32_OBJS) ! << +! if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2 +! echo $(CPP_PROJ) ! -! !ENDIF +! !ENDIF ! ! ! !IF "$(NO_EXTERNAL_DEPS)" != "1" ! !IF EXISTS("winsound.dep") ! !INCLUDE "winsound.dep" -! !ELSE +! !ELSE ! !MESSAGE Warning: cannot find "winsound.dep" -! !ENDIF -! !ENDIF +! !ENDIF +! !ENDIF ! ! ! !IF "$(CFG)" == "winsound - Win32 Release" || "$(CFG)" == "winsound - Win32 Debug" ! ! !IF "$(CFG)" == "winsound - Win32 Release" ! -! "pythoncore - Win32 Release" : +! "pythoncore - Win32 Release" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" ! cd "." ! -! "pythoncore - Win32 ReleaseCLEAN" : +! "pythoncore - Win32 ReleaseCLEAN" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" RECURSE=1 CLEAN +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" RECURSE=1 CLEAN ! cd "." ! ! !ELSEIF "$(CFG)" == "winsound - Win32 Debug" ! -! "pythoncore - Win32 Debug" : +! "pythoncore - Win32 Debug" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" ! cd "." ! -! "pythoncore - Win32 DebugCLEAN" : +! "pythoncore - Win32 DebugCLEAN" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" RECURSE=1 CLEAN +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" RECURSE=1 CLEAN ! cd "." ! -! !ENDIF +! !ENDIF ! ! SOURCE=..\PC\winsound.c ! @@ -14233,10 +13127,9 @@ ! ! ! -! !ENDIF -! -*** misc/Python-2.3.4/PCbuild/zlib.dep Thu Sep 1 19:41:42 2005 ---- misc/build/Python-2.3.4/PCbuild/zlib.dep Thu Sep 1 19:40:58 2005 +! !ENDIF +*** misc/Python-2.3.4/PCbuild/zlib.dep Thu Jun 29 12:10:02 2006 +--- misc/build/Python-2.3.4/PCbuild/zlib.dep Thu Jun 29 11:02:22 2006 *************** *** 1 **** ! dummy @@ -14290,38 +13183,17 @@ ! "..\PC\pyconfig.h"\ ! {$(INCLUDE)}"basetsd.h"\ ! -*** misc/Python-2.3.4/PCbuild/zlib.mak Thu Sep 1 19:41:42 2005 ---- misc/build/Python-2.3.4/PCbuild/zlib.mak Thu Sep 1 19:40:58 2005 +*** misc/Python-2.3.4/PCbuild/zlib.mak Thu Jun 29 12:10:02 2006 +--- misc/build/Python-2.3.4/PCbuild/zlib.mak Thu Jun 29 16:33:50 2006 *************** *** 1 **** ! dummy ---- 1,263 ---- -! # Microsoft Developer Studio Generated NMAKE File, Based on zlib.dsp +--- 1,245 ---- ! !IF "$(CFG)" == "" -! CFG=zlib - Win32 Debug -! !MESSAGE Keine Konfiguration angegeben. zlib - Win32 Debug wird als Standard verwendet. -! !ENDIF -! -! !IF "$(CFG)" != "zlib - Win32 Release" && "$(CFG)" != "zlib - Win32 Debug" -! !MESSAGE Ungltige Konfiguration "$(CFG)" angegeben. -! !MESSAGE Sie k”nnen beim Ausfhren von NMAKE eine Konfiguration angeben -! !MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel: -! !MESSAGE -! !MESSAGE NMAKE /f "zlib.mak" CFG="zlib - Win32 Debug" -! !MESSAGE -! !MESSAGE Fr die Konfiguration stehen zur Auswahl: -! !MESSAGE -! !MESSAGE "zlib - Win32 Release" (basierend auf "Win32 (x86) Dynamic-Link Library") -! !MESSAGE "zlib - Win32 Debug" (basierend auf "Win32 (x86) Dynamic-Link Library") -! !MESSAGE -! !ERROR Eine ungltige Konfiguration wurde angegeben. -! !ENDIF +! CFG=zlib - Win32 Release +! !ENDIF ! -! !IF "$(OS)" == "Windows_NT" ! NULL= -! !ELSE -! NULL=nul -! !ENDIF ! ! !IF "$(CFG)" == "zlib - Win32 Release" ! @@ -14331,21 +13203,21 @@ ! OutDir=.\. ! # End Custom Macros ! -! !IF "$(RECURSE)" == "0" +! !IF "$(RECURSE)" == "0" ! ! ALL : "$(OUTDIR)\zlib.pyd" ! -! !ELSE +! !ELSE ! ! ALL : "pythoncore - Win32 Release" "$(OUTDIR)\zlib.pyd" ! -! !ENDIF +! !ENDIF ! -! !IF "$(RECURSE)" == "1" -! CLEAN :"pythoncore - Win32 ReleaseCLEAN" -! !ELSE +! !IF "$(RECURSE)" == "1" +! CLEAN :"pythoncore - Win32 ReleaseCLEAN" +! !ELSE ! CLEAN : -! !ENDIF +! !ENDIF ! -@erase "$(INTDIR)\vc60.idb" ! -@erase "$(INTDIR)\vc60.pdb" ! -@erase "$(INTDIR)\zlibmodule.obj" @@ -14362,47 +13234,47 @@ ! ! F90=df.exe ! CPP=cl.exe -! CPP_PROJ=/nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "..\..\zlib-1.1.4" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\zlib.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +! CPP_PROJ=/nologo /MD /W3 $(EXFLAGS) /Zi /O2 /I "..\Include" /I "..\PC" /I "..\..\zlib-1.1.4" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\zlib.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c ! ! .c{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .c{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! MTL=midl.exe -! MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +! MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 ! RSC=rc.exe ! BSC32=bscmake.exe -! BSC32_FLAGS=/nologo /o"$(OUTDIR)\zlib.bsc" +! BSC32_FLAGS=/nologo /o"$(OUTDIR)\zlib.bsc" ! BSC32_SBRS= \ -! +! ! LINK32=link.exe -! LINK32_FLAGS=..\..\zlib-1.1.4\zlib.lib /nologo /base:"0x1e1B0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\zlib.pdb" /debug /machine:I386 /nodefaultlib:"libc" /out:"$(OUTDIR)\zlib.pyd" /implib:"$(OUTDIR)\zlib.lib" +! LINK32_FLAGS=..\..\zlib-1.1.4\zlib.lib /nologo /base:"0x1e1B0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\zlib.pdb" /debug /machine:I386 /nodefaultlib:"libc" /out:"$(OUTDIR)\zlib.pyd" /implib:"$(OUTDIR)\zlib.lib" ! LINK32_OBJS= \ ! "$(INTDIR)\zlibmodule.obj" \ ! "$(OUTDIR)\python23.lib" @@ -14413,6 +13285,8 @@ ! $(LINK32) @<< ! $(LINK32_FLAGS) $(LINK32_OBJS) ! << +! if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2 +! echo $(CPP_PROJ) ! ! SOURCE="$(InputPath)" ! @@ -14424,21 +13298,21 @@ ! OutDir=.\. ! # End Custom Macros ! -! !IF "$(RECURSE)" == "0" +! !IF "$(RECURSE)" == "0" ! ! ALL : "$(OUTDIR)\zlib_d.pyd" ! -! !ELSE +! !ELSE ! ! ALL : "pythoncore - Win32 Debug" "$(OUTDIR)\zlib_d.pyd" ! -! !ENDIF +! !ENDIF ! -! !IF "$(RECURSE)" == "1" -! CLEAN :"pythoncore - Win32 DebugCLEAN" -! !ELSE +! !IF "$(RECURSE)" == "1" +! CLEAN :"pythoncore - Win32 DebugCLEAN" +! !ELSE ! CLEAN : -! !ENDIF +! !ENDIF ! -@erase "$(INTDIR)\vc60.idb" ! -@erase "$(INTDIR)\vc60.pdb" ! -@erase "$(INTDIR)\zlibmodule.obj" @@ -14456,47 +13330,47 @@ ! ! F90=df.exe ! CPP=cl.exe -! CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /I "..\..\zlib-1.1.4" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\zlib.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +! CPP_PROJ=/nologo /MDd /W3 /Gm $(EXFLAGS) /Zi /Od /I "..\Include" /I "..\PC" /I "..\..\zlib-1.1.4" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\zlib.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c ! ! .c{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.obj:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .c{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cpp{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! .cxx{$(INTDIR)}.sbr:: ! $(CPP) @<< -! $(CPP_PROJ) $< +! $(CPP_PROJ) $< ! << ! ! MTL=midl.exe -! MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 +! MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 ! RSC=rc.exe ! BSC32=bscmake.exe -! BSC32_FLAGS=/nologo /o"$(OUTDIR)\zlib.bsc" +! BSC32_FLAGS=/nologo /o"$(OUTDIR)\zlib.bsc" ! BSC32_SBRS= \ -! +! ! LINK32=link.exe -! LINK32_FLAGS=..\..\zlib-1.1.4\zlib.lib /nologo /base:"0x1e1B0000" /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\zlib_d.pdb" /debug /machine:I386 /nodefaultlib:"libc" /out:"$(OUTDIR)\zlib_d.pyd" /implib:"$(OUTDIR)\zlib_d.lib" /pdbtype:sept +! LINK32_FLAGS=..\..\zlib-1.1.4\zlib.lib /nologo /base:"0x1e1B0000" /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\zlib_d.pdb" /debug /machine:I386 /nodefaultlib:"libc" /out:"$(OUTDIR)\zlib_d.pyd" /implib:"$(OUTDIR)\zlib_d.lib" /pdbtype:sept ! LINK32_OBJS= \ ! "$(INTDIR)\zlibmodule.obj" \ ! "$(OUTDIR)\python23_d.lib" @@ -14507,48 +13381,50 @@ ! $(LINK32) @<< ! $(LINK32_FLAGS) $(LINK32_OBJS) ! << +! if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2 +! echo $(CPP_PROJ) ! ! SOURCE="$(InputPath)" ! -! !ENDIF +! !ENDIF ! ! ! !IF "$(NO_EXTERNAL_DEPS)" != "1" ! !IF EXISTS("zlib.dep") ! !INCLUDE "zlib.dep" -! !ELSE +! !ELSE ! !MESSAGE Warning: cannot find "zlib.dep" -! !ENDIF -! !ENDIF +! !ENDIF +! !ENDIF ! ! ! !IF "$(CFG)" == "zlib - Win32 Release" || "$(CFG)" == "zlib - Win32 Debug" ! ! !IF "$(CFG)" == "zlib - Win32 Release" ! -! "pythoncore - Win32 Release" : +! "pythoncore - Win32 Release" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" ! cd "." ! -! "pythoncore - Win32 ReleaseCLEAN" : +! "pythoncore - Win32 ReleaseCLEAN" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" RECURSE=1 CLEAN +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Release" RECURSE=1 CLEAN ! cd "." ! ! !ELSEIF "$(CFG)" == "zlib - Win32 Debug" ! -! "pythoncore - Win32 Debug" : +! "pythoncore - Win32 Debug" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" ! cd "." ! -! "pythoncore - Win32 DebugCLEAN" : +! "pythoncore - Win32 DebugCLEAN" : ! cd "." -! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" RECURSE=1 CLEAN +! $(MAKE) /$(MAKEFLAGS) /F ".\pythoncore.mak" CFG="pythoncore - Win32 Debug" RECURSE=1 CLEAN ! cd "." ! -! !ENDIF +! !ENDIF ! ! SOURCE=..\Modules\zlibmodule.c ! @@ -14557,5 +13433,33 @@ ! ! ! -! !ENDIF -! +! !ENDIF +*** misc/Python-2.3.4/Python/pythonrun.c Mon Mar 22 21:41:47 2004 +--- misc/build/Python-2.3.4/Python/pythonrun.c Fri Jun 30 16:03:06 2006 +*************** +*** 1674,1679 **** +--- 1674,1697 ---- + return context.sa_handler; + #else + PyOS_sighandler_t handler; ++ /* Special signal handling for the secure CRT in Visual Studio 2005 */ ++ #if defined(_MSC_VER) && _MSC_VER >= 1400 ++ switch (sig) { ++ /* Only these signals are valid */ ++ case SIGINT: ++ case SIGILL: ++ case SIGFPE: ++ case SIGSEGV: ++ case SIGTERM: ++ case SIGBREAK: ++ case SIGABRT: ++ break; ++ /* Don't call signal() with other values or it will assert */ ++ default: ++ return SIG_ERR; ++ } ++ #endif /* _MSC_VER && _MSC_VER >= 1400 */ ++ + handler = signal(sig, SIG_IGN); + signal(sig, handler); + return handler; |