From bb767e0ebc5eea6bda16ad85205cc34c24f83466 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 15 Aug 2021 15:39:52 +0200 Subject: [PATCH] Remove apparently unused Info.plist in docview sample Only Info.plist.in is used by configure and it doesn't hardcode the version, so there is no need to update it there. --- docs/contributing/about-version-numbers.md | 1 - misc/scripts/inc_release | 4 - misc/scripts/inc_year | 2 +- samples/docview/Info.plist | 87 ---------------------- 4 files changed, 1 insertion(+), 93 deletions(-) delete mode 100644 samples/docview/Info.plist diff --git a/docs/contributing/about-version-numbers.md b/docs/contributing/about-version-numbers.md index c19cc1da6a..7cc12fc220 100644 --- a/docs/contributing/about-version-numbers.md +++ b/docs/contributing/about-version-numbers.md @@ -25,7 +25,6 @@ Here is the list of files that need to be updated: docs/doxygen/mainpages/manual.h (just date) [NOT UPDATED AUTOMATICALLY] include/wx/version.h include/wx/osx/config_xcode.h - samples/docview/Info.plist samples/minimal/Info_cocoa.plist Do not forget to rebake everything after updating version.bkl! diff --git a/misc/scripts/inc_release b/misc/scripts/inc_release index 9f9280c6d1..0fe5cc38f1 100755 --- a/misc/scripts/inc_release +++ b/misc/scripts/inc_release @@ -52,10 +52,6 @@ run_sed include/wx/osx/config_xcode.h \ run_sed samples/minimal/Info_cocoa.plist \ "//s/$ver_for_sed/$ver_string_new/" -run_sed samples/docview/Info.plist \ - "/versionon/s/$ver_for_sed/$ver_string_new/" \ - "//s/$ver_for_sed/$ver_string_new/" - run_sed build/msw/wx_setup.props \ "//s/\($ver_major$ver_minor\)$ver_release/\1$ver_release_new/" diff --git a/misc/scripts/inc_year b/misc/scripts/inc_year index 28e2e53a2f..2ba23f5499 100755 --- a/misc/scripts/inc_year +++ b/misc/scripts/inc_year @@ -27,6 +27,6 @@ run_sed src/msw/version.rc "s/1993-$old_year/1993-$new_year/" run_sed src/common/utilscmn.cpp "s/1995-$old_year/1995-$new_year/" # And Mac files are much newer than that. -for f in samples/docview/Info.plist samples/minimal/Info_cocoa.plist; do +for f in samples/minimal/Info_cocoa.plist; do run_sed $f "s/2005-$old_year/2005-$new_year/" done diff --git a/samples/docview/Info.plist b/samples/docview/Info.plist deleted file mode 100644 index fb5948e04d..0000000000 --- a/samples/docview/Info.plist +++ /dev/null @@ -1,87 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleDocumentTypes - - - CFBundleTypeExtensions - - drw - - CFBundleTypeIconFile - chart.icns - CFBundleTypeName - DocView Drawing - CFBundleTypeOSTypes - - WXMB - - CFBundleTypeRole - Editor - LSTypeIsPackage - - NSPersistentStoreTypeKey - Binary - - - CFBundleTypeExtensions - - txt - text - - CFBundleTypeIconFile - notepad.icns - CFBundleTypeName - DocView Text - CFBundleTypeOSTypes - - TEXT - - CFBundleTypeRole - Editor - LSTypeIsPackage - - NSPersistentStoreTypeKey - Binary - - - CFBundleExecutable - $(PRODUCT_NAME) - CFBundleGetInfoString - $(PRODUCT_NAME) version 3.1.6, (c) 2005-2021 wxWidgets - CFBundleIconFile - doc - CFBundleIdentifier - org.wxwidgets.samples.$(PRODUCT_NAME) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleLocalizations - - de - en - fr - it - - CFBundleLongVersionString - 3.1.6, (c) 2005-2021 wxWidgets - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - APPL - CFBundleShortVersionString - 3.1.6 - CFBundleSignature - WXMA - CFBundleVersion - 3.1.6 - CSResourcesFileMapped - - LSRequiresCarbon - - NSHumanReadableCopyright - Copyright 2005-2021 wxWidgets - -