From 1f6c29a914e442601ca6e71aa40b93689ed0fbe1 Mon Sep 17 00:00:00 2001 From: Steve Dower Date: Mon, 15 Dec 2014 15:03:44 -0800 Subject: [PATCH] Removes bdist_wininst dependency on MFC. --- Lib/distutils/command/wininst-14.0-amd64.exe | Bin 84480 -> 84480 bytes Lib/distutils/command/wininst-14.0.exe | Bin 75264 -> 75264 bytes PC/bdist_wininst/install.rc | 153 +------------------ PC/bdist_wininst/resource.h | 15 -- 4 files changed, 1 insertion(+), 167 deletions(-) diff --git a/Lib/distutils/command/wininst-14.0-amd64.exe b/Lib/distutils/command/wininst-14.0-amd64.exe index 9affe13039517798970f5e3a8d9f4d1d13e79464..43b85b6d4f2dd93f4b77c4b904276293ff667054 100644 GIT binary patch delta 111 zcmZpe!rCx}bpr<@^QQFv&D@Nfv*m$|5C$M%0^%?rKB3OYaDtZ+B*XwxWIShPpQf E0SG@DrT_o{ diff --git a/Lib/distutils/command/wininst-14.0.exe b/Lib/distutils/command/wininst-14.0.exe index 3ce71b9f1b49afc4e6eb8a60ef551e7ced3e04b6..764524d746b35fe28228e41e8b75a6ed665d9228 100644 GIT binary patch delta 159 zcmZoT!_shuWdjEz^YXO*&D@MH8|8tF5C$M%0^$H5-onJlu;mj-gn #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 index 0611709e41..86aeabb13a 100644 --- 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 -- 2.50.1