From ff06e12ceb3d70ae7ad7e3d648f240463904f191 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 2 May 2018 15:56:26 +0200 Subject: [PATCH] Remove unused and outdates samples/Info.plist file This file was added in 4d524cdd0e084d1191b9fc83a98147002d8015d6 a long time ago but doesn't seem to have been ever actually used for anything and is outdated, e.g. contains LSRequiresCarbon=true, which shouldn't be used any longer. Remove the file itself and all references to it. --- build/bakefiles/make_dist.mk | 2 -- docs/contributing/about-version-numbers.md | 1 - misc/scripts/inc_release | 4 --- samples/Info.plist | 36 ---------------------- 4 files changed, 43 deletions(-) delete mode 100644 samples/Info.plist diff --git a/build/bakefiles/make_dist.mk b/build/bakefiles/make_dist.mk index 706589a17f..39a3a6ffc3 100644 --- a/build/bakefiles/make_dist.mk +++ b/build/bakefiles/make_dist.mk @@ -317,7 +317,6 @@ BASE_DIST: ALL_DIST INTL_DIST mkdir $(DISTDIR)/samples $(CP_P) $(SAMPDIR)/Makefile.in $(DISTDIR)/samples $(CP_P) $(SAMPDIR)/makefile.* $(DISTDIR)/samples - $(CP_P) $(SAMPDIR)/Info.plist $(DISTDIR)/samples $(CP_P) $(SAMPDIR)/sample.* $(DISTDIR)/samples $(CP_P) $(SAMPDIR)/samples.* $(DISTDIR)/samples @@ -544,7 +543,6 @@ SAMPLES_DIST: ALL_GUI_DIST mkdir $(DISTDIR)/samples $(CP_P) $(SAMPDIR)/Makefile.in $(DISTDIR)/samples $(CP_P) $(SAMPDIR)/makefile.* $(DISTDIR)/samples - $(CP_P) $(SAMPDIR)/Info.plist $(DISTDIR)/samples $(CP_P) $(SAMPDIR)/sample.* $(DISTDIR)/samples $(CP_P) $(SAMPDIR)/samples.* $(DISTDIR)/samples diff --git a/docs/contributing/about-version-numbers.md b/docs/contributing/about-version-numbers.md index f87d6c90ab..48c79a20db 100644 --- a/docs/contributing/about-version-numbers.md +++ b/docs/contributing/about-version-numbers.md @@ -26,7 +26,6 @@ Here is the list of files that need to be updated: docs/msw/install.txt {major release only} include/wx/version.h include/wx/osx/config_xcode.h - samples/Info.plist samples/docview/Info.plist samples/minimal/Info_carbon.plist samples/minimal/Info_cocoa.plist diff --git a/misc/scripts/inc_release b/misc/scripts/inc_release index 021a77e2fb..4a81ad9d91 100755 --- a/misc/scripts/inc_release +++ b/misc/scripts/inc_release @@ -97,10 +97,6 @@ run_sed include/wx/version.h \ run_sed include/wx/osx/config_xcode.h \ "/^#define PACKAGE/s/$ver_for_sed/$ver_string_new/" -run_sed samples/Info.plist \ - "/version/s/$ver_for_sed/$ver_string_new/" \ - "//s/$ver_for_sed/$ver_string_new/" - run_sed samples/minimal/Info_cocoa.plist \ "//s/$ver_for_sed/$ver_string_new/" diff --git a/samples/Info.plist b/samples/Info.plist deleted file mode 100644 index bcdc6ce2d6..0000000000 --- a/samples/Info.plist +++ /dev/null @@ -1,36 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - $(PRODUCT_NAME) - CFBundleGetInfoString - $(PRODUCT_NAME) version 3.1.2, (c) 2005-2018 wxWidgets - CFBundleIconFile - wxmac.icns - CFBundleIdentifier - org.wxwidgets.samples.$(PRODUCT_NAME) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleLongVersionString - 3.1.2, (c) 2005-2018 wxWidgets - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - APPL - CFBundleShortVersionString - 3.1.2 - CFBundleSignature - ???? - CFBundleVersion - 3.1.2 - CSResourcesFileMapped - - LSRequiresCarbon - - NSHumanReadableCopyright - Copyright 2005-2018 wxWidgets - -