Removes bdist_wininst dependency on MFC.

python · Dec 15, 2014 · 1f6c29a · 1f6c29a
1 parent f074f01
commit 1f6c29a
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 167 deletions.
diff --git a/Lib/distutils/command/wininst-14.0-amd64.exe b/Lib/distutils/command/wininst-14.0-amd64.exe
diff --git a/Lib/distutils/command/wininst-14.0.exe b/Lib/distutils/command/wininst-14.0.exe
diff --git a/PC/bdist_wininst/install.rc b/PC/bdist_wininst/install.rc
@@ -6,91 +6,15 @@
   CHECKED IN AS WELL!
 */
 
-//Microsoft Developer Studio generated resource script.
-//
+#include <winres.h>
 #include "resource.h"
 
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// Neutral resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
-#ifdef _WIN32
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Bitmap
-//
 
 IDB_BITMAP              BITMAP  DISCARDABLE     "PythonPowered.bmp"
-#endif    // Neutral resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// German (Germany) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU)
-#ifdef _WIN32
-LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-#endif    // German (Germany) resources
-/////////////////////////////////////////////////////////////////////////////
 
 
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
 IDD_INTRO DIALOGEX 0, 0, 379, 178
 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Setup"
@@ -151,78 +75,3 @@ BEGIN
     EDITTEXT        IDC_INFO,125,40,247,131,ES_MULTILINE | ES_READONLY | 
                     WS_VSCROLL | WS_HSCROLL | NOT WS_TABSTOP
 END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
-BEGIN
-    IDD_INTRO, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 372
-        VERTGUIDE, 125
-        VERTGUIDE, 372
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 171
-        HORZGUIDE, 8
-        HORZGUIDE, 31
-    END
-
-    IDD_SELECTPYTHON, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 372
-        VERTGUIDE, 125
-        VERTGUIDE, 372
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 171
-        HORZGUIDE, 8
-        HORZGUIDE, 41
-    END
-
-    IDD_INSTALLFILES, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 372
-        VERTGUIDE, 125
-        VERTGUIDE, 371
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 171
-        HORZGUIDE, 8
-        HORZGUIDE, 41
-    END
-
-    IDD_FINISHED, DIALOG
-    BEGIN
-        LEFTMARGIN, 6
-        RIGHTMARGIN, 372
-        VERTGUIDE, 125
-        VERTGUIDE, 372
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 171
-        HORZGUIDE, 8
-        HORZGUIDE, 41
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
diff --git a/PC/bdist_wininst/resource.h b/PC/bdist_wininst/resource.h
@@ -6,10 +6,6 @@
   CHECKED IN AS WELL!
 */
 
-//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by install.rc
-//
 #define IDD_DIALOG1                     101
 #define IDB_BITMAP1                     103
 #define IDD_INTRO                       107
@@ -33,14 +29,3 @@
 #define IDC_BUILD_INFO                  1024
 #define IDC_BITMAP                      1025
 #define IDC_OTHERPYTHON                 1026
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        112
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1028
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif