[Python-checkins] cpython (merge 3.5 -> default): Merge from 3.5
steve.dower
python-checkins at python.org
Mon Jul 18 00:58:22 EDT 2016
https://hg.python.org/cpython/rev/61bb66fe1fb7
changeset: 102395:61bb66fe1fb7
parent: 102393:da735eb8b7a2
parent: 102394:610b6a5d0c34
user: Steve Dower <steve.dower at microsoft.com>
date: Sun Jul 17 21:58:11 2016 -0700
summary:
Merge from 3.5
files:
PC/icons.mak | 9 -------
PC/icons.rc | 4 ---
PC/make_versioninfo.c | 38 -------------------------------
3 files changed, 0 insertions(+), 51 deletions(-)
diff --git a/PC/icons.mak b/PC/icons.mak
deleted file mode 100644
--- a/PC/icons.mak
+++ /dev/null
@@ -1,9 +0,0 @@
-python_icon.exe: py.res empty.obj
- link /out:python_icon.exe /machine:x86 /subsystem:windows py.res empty.obj
-
-py.res: py.ico pyc.ico pycon.ico icons.rc
- rc /fo py.res icons.rc
-
-empty.obj: empty.c
- cl /c empty.c
-
diff --git a/PC/icons.rc b/PC/icons.rc
deleted file mode 100644
--- a/PC/icons.rc
+++ /dev/null
@@ -1,4 +0,0 @@
-101 ICON "py.ico"
-102 ICON "pyc.ico"
-103 ICON "pycon.ico"
-
diff --git a/PC/make_versioninfo.c b/PC/make_versioninfo.c
deleted file mode 100644
--- a/PC/make_versioninfo.c
+++ /dev/null
@@ -1,38 +0,0 @@
-#include <stdio.h>
-#include "patchlevel.h"
-/*
- * This program prints out an include file containing fields required to build
- * the version info resource of pythonxx.dll because the resource compiler
- * cannot do the arithmetic.
- */
-/*
- * FIELD3 is the third field of the version number.
- * This is what we'd like FIELD3 to be:
- *
- * #define FIELD3 (PY_MICRO_VERSION*1000 + PY_RELEASE_LEVEL*10 + PY_RELEASE_SERIAL)
- *
- * but that neither gives an error nor comes anywhere close to working.
- *
- * For 2.4a0,
- * PY_MICRO_VERSION = 0
- * PY_RELEASE_LEVEL = 'alpha' = 0xa
- * PY_RELEASE_SERIAL = 0
- *
- * gives FIELD3 = 0*1000 + 10*10 + 0 = 100
- */
-int main(int argc, char **argv)
-{
- printf("/* This file created by make_versioninfo.exe */\n");
- printf("#define FIELD3 %d\n",
- PY_MICRO_VERSION*1000 + PY_RELEASE_LEVEL*10 + PY_RELEASE_SERIAL);
- printf("#define MS_DLL_ID \"%d.%d\"\n",
- PY_MAJOR_VERSION, PY_MINOR_VERSION);
- printf("#ifndef _DEBUG\n");
- printf("#define PYTHON_DLL_NAME \"python%d%d.dll\"\n",
- PY_MAJOR_VERSION, PY_MINOR_VERSION);
- printf("#else\n");
- printf("#define PYTHON_DLL_NAME \"python%d%d_d.dll\"\n",
- PY_MAJOR_VERSION, PY_MINOR_VERSION);
- printf("#endif\n");
- return 0;
-}
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list