From 214c0482674316aa8e8a8d895ab5b4ff94fc8141 Mon Sep 17 00:00:00 2001 From: Jonathan Campbell Date: Mon, 1 Jul 2024 20:45:26 -0700 Subject: [PATCH] Prepare for release --- CHANGELOG | 2 +- configure.ac | 2 +- contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in | 2 +- contrib/translations/de/de_DE.lng | 2 +- contrib/translations/de/de_pc98.lng | 2 +- contrib/translations/en/en_US.lng | 2 +- contrib/translations/es/es_ES.lng | 2 +- contrib/translations/fr/fr_FR.lng | 2 +- contrib/translations/hu/hu_HU.lng | 2 +- contrib/translations/it/it_IT.lng | 2 +- contrib/translations/ja/ja_JP.lng | 2 +- contrib/translations/ko/ko_KR.lng | 2 +- contrib/translations/nl/nl_NL.lng | 2 +- contrib/translations/pt/pt_BR.lng | 2 +- contrib/translations/ru/ru_RU.lng | 2 +- contrib/translations/tr/tr_TR.lng | 2 +- contrib/translations/zh/zh_CN.lng | 2 +- contrib/translations/zh/zh_TW.lng | 2 +- contrib/windows/installer/DOSBox-X-setup.iss | 2 +- contrib/windows/installer/dosbox-x.reference.setup.conf | 2 +- dosbox-x.reference.conf | 2 +- dosbox-x.reference.full.conf | 2 +- include/build_timestamp.h | 4 ++-- src/winres.rc | 2 +- vs/config_package.h | 6 +++--- 25 files changed, 28 insertions(+), 28 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 367c6ac9d73..89c2ed8a351 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -Next: +2024.07.01 - Correct Hercules InColor memory emulation. Read and write planar behavior was incorrect due to a misunderstanding of available documentation. (joncampbell123). diff --git a/configure.ac b/configure.ac index 2b6827a5265..b8b2e71a245 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ dnl Init. -AC_INIT(dosbox-x,2024.03.01,[https://github.com/joncampbell123/dosbox-x/issues],[],[https://dosbox-x.com]) +AC_INIT(dosbox-x,2024.07.01,[https://github.com/joncampbell123/dosbox-x/issues],[],[https://dosbox-x.com]) AC_PREREQ(2.60) AC_CONFIG_SRCDIR(README.md) diff --git a/contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in b/contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in index c5ec117e108..9b06d39d79f 100644 --- a/contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in +++ b/contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in @@ -10,7 +10,7 @@ Emulation - + diff --git a/contrib/translations/de/de_DE.lng b/contrib/translations/de/de_DE.lng index aa7a649c459..fec86a8f429 100644 --- a/contrib/translations/de/de_DE.lng +++ b/contrib/translations/de/de_DE.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:German :DOSBOX-X:CODEPAGE:858 -:DOSBOX-X:VERSION:2024.03.01 +:DOSBOX-X:VERSION:2024.07.01 :DOSBOX-X:REMARK: :PROGRAM_BOOT_BOOTING Starte von Laufwerk diff --git a/contrib/translations/de/de_pc98.lng b/contrib/translations/de/de_pc98.lng index de4d6ae7725..42d4c460615 100644 --- a/contrib/translations/de/de_pc98.lng +++ b/contrib/translations/de/de_pc98.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:German :DOSBOX-X:CODEPAGE:858 -:DOSBOX-X:VERSION:2024.03.01 +:DOSBOX-X:VERSION:2024.07.01 :DOSBOX-X:REMARK: :PROGRAM_BOOT_BOOTING Starte von Laufwerk diff --git a/contrib/translations/en/en_US.lng b/contrib/translations/en/en_US.lng index 14f0ac85161..1fd3c649246 100644 --- a/contrib/translations/en/en_US.lng +++ b/contrib/translations/en/en_US.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:English (United States) :DOSBOX-X:CODEPAGE:437 -:DOSBOX-X:VERSION:2024.03.01 +:DOSBOX-X:VERSION:2024.07.01 :DOSBOX-X:REMARK: :AUTOEXEC_CONFIGFILE_HELP Lines in this section will be run at startup. diff --git a/contrib/translations/es/es_ES.lng b/contrib/translations/es/es_ES.lng index b87797a5fdf..4be9e98d845 100644 --- a/contrib/translations/es/es_ES.lng +++ b/contrib/translations/es/es_ES.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Spanish (Spain) :DOSBOX-X:CODEPAGE:858 -:DOSBOX-X:VERSION:2024.03.01 +:DOSBOX-X:VERSION:2024.07.01 :DOSBOX-X:REMARK: :AUTOEXEC_CONFIGFILE_HELP Las líneas de esta sección se iniciarán al inicio. diff --git a/contrib/translations/fr/fr_FR.lng b/contrib/translations/fr/fr_FR.lng index 7f00635a679..03ffe6ed101 100644 --- a/contrib/translations/fr/fr_FR.lng +++ b/contrib/translations/fr/fr_FR.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:French (France) :DOSBOX-X:CODEPAGE:859 -:DOSBOX-X:VERSION:2024.03.01 +:DOSBOX-X:VERSION:2024.07.01 :DOSBOX-X:REMARK: :AUTOEXEC_CONFIGFILE_HELP Les lignes de cette section seront exécutées au démarrage. diff --git a/contrib/translations/hu/hu_HU.lng b/contrib/translations/hu/hu_HU.lng index fc9f495bd0c..3be5e92453f 100644 --- a/contrib/translations/hu/hu_HU.lng +++ b/contrib/translations/hu/hu_HU.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Hungarian (Hungary) :DOSBOX-X:CODEPAGE:852 -:DOSBOX-X:VERSION:2024.03.01 +:DOSBOX-X:VERSION:2024.07.01 :DOSBOX-X:REMARK: :AUTOEXEC_CONFIGFILE_HELP Ebben a szekcióban lévő sorok indításkor lefutnak. diff --git a/contrib/translations/it/it_IT.lng b/contrib/translations/it/it_IT.lng index 8cbc31e1357..3787a8d61a1 100644 --- a/contrib/translations/it/it_IT.lng +++ b/contrib/translations/it/it_IT.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Italiano (Italy) :DOSBOX-X:CODEPAGE:437 -:DOSBOX-X:VERSION:2024.03.01 +:DOSBOX-X:VERSION:2024.07.01 :DOSBOX-X:REMARK: :PROGRAM_IMGMAKE_BADSIZE Argomenti errati per -size o -chs. diff --git a/contrib/translations/ja/ja_JP.lng b/contrib/translations/ja/ja_JP.lng index 6bd0179903b..66bc2377049 100644 --- a/contrib/translations/ja/ja_JP.lng +++ b/contrib/translations/ja/ja_JP.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Japanese :DOSBOX-X:CODEPAGE:932 -:DOSBOX-X:VERSION:2024.03.01 +:DOSBOX-X:VERSION:2024.07.01 :DOSBOX-X:REMARK:PC-98, JEGA, DOS/V エミュレーション、または とコード ページ 932 の日本語フォントを使用して、日本語の表示と印刷を直接サポートします :AUTOEXEC_CONFIGFILE_HELP このセクションに記載の行は起動時に実行されます。 diff --git a/contrib/translations/ko/ko_KR.lng b/contrib/translations/ko/ko_KR.lng index 0cbdc170b3a..f792674fd7b 100644 --- a/contrib/translations/ko/ko_KR.lng +++ b/contrib/translations/ko/ko_KR.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Korean :DOSBOX-X:CODEPAGE:949 -:DOSBOX-X:VERSION:2024.03.01 +:DOSBOX-X:VERSION:2024.07.01 :DOSBOX-X:REMARK:DOS/V 에뮬레이션 또는 코드 페이지 949의 한국어 글꼴을 사용하여 한국어 표시 및 인쇄를 직접 지원합니다. :AUTOEXEC_CONFIGFILE_HELP 이 섹션에 나열된 줄은 시작할 때 실행됩니다. diff --git a/contrib/translations/nl/nl_NL.lng b/contrib/translations/nl/nl_NL.lng index 082f05a3fb3..42a95352d4b 100644 --- a/contrib/translations/nl/nl_NL.lng +++ b/contrib/translations/nl/nl_NL.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Nederlands (Nederland) :DOSBOX-X:CODEPAGE:858 -:DOSBOX-X:VERSION:2024.03.01 +:DOSBOX-X:VERSION:2024.07.01 :DOSBOX-X:REMARK: :AUTOEXEC_CONFIGFILE_HELP Lijnen in dit gedeelte worden uitgevoerd bij opstarten. diff --git a/contrib/translations/pt/pt_BR.lng b/contrib/translations/pt/pt_BR.lng index b72e109c8fb..0359377bd0a 100644 --- a/contrib/translations/pt/pt_BR.lng +++ b/contrib/translations/pt/pt_BR.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Portuguese (Brazil) :DOSBOX-X:CODEPAGE:860 -:DOSBOX-X:VERSION:2024.03.01 +:DOSBOX-X:VERSION:2024.07.01 :DOSBOX-X:REMARK: :AUTOEXEC_CONFIGFILE_HELP As linhas nesta seção serão sempre executadas ao se iniciar o DOSBox-X. diff --git a/contrib/translations/ru/ru_RU.lng b/contrib/translations/ru/ru_RU.lng index c8cf529b3a9..65a08cdb287 100644 --- a/contrib/translations/ru/ru_RU.lng +++ b/contrib/translations/ru/ru_RU.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Русский (Россия) :DOSBOX-X:CODEPAGE:866 -:DOSBOX-X:VERSION:2024.03.01 +:DOSBOX-X:VERSION:2024.07.01 :DOSBOX-X:REMARK: :AUTOEXEC_CONFIGFILE_HELP Строки в этом разделе будут выполнены при запуске. diff --git a/contrib/translations/tr/tr_TR.lng b/contrib/translations/tr/tr_TR.lng index 777b2c26df8..4a58460e3ab 100644 --- a/contrib/translations/tr/tr_TR.lng +++ b/contrib/translations/tr/tr_TR.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Turkish (Turkey) :DOSBOX-X:CODEPAGE:857 -:DOSBOX-X:VERSION:2024.03.01 +:DOSBOX-X:VERSION:2024.07.01 :DOSBOX-X:REMARK: :AUTOEXEC_CONFIGFILE_HELP Lines in this section will be run at startup. diff --git a/contrib/translations/zh/zh_CN.lng b/contrib/translations/zh/zh_CN.lng index 5ff4543d813..35ad46db9c7 100644 --- a/contrib/translations/zh/zh_CN.lng +++ b/contrib/translations/zh/zh_CN.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Simplified Chinese :DOSBOX-X:CODEPAGE:936 -:DOSBOX-X:VERSION:2024.03.01 +:DOSBOX-X:VERSION:2024.07.01 :DOSBOX-X:REMARK:建议将国家和代码页设为 86,936 并搭配中文字体; 或使用 chs 或 cn 中文 DOS/V 模式以直接支持中文显示和打印 :AUTOEXEC_CONFIGFILE_HELP Lines in this section will be run at startup. diff --git a/contrib/translations/zh/zh_TW.lng b/contrib/translations/zh/zh_TW.lng index c6274927f37..4a282a981f4 100644 --- a/contrib/translations/zh/zh_TW.lng +++ b/contrib/translations/zh/zh_TW.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Traditional Chinese :DOSBOX-X:CODEPAGE:950 -:DOSBOX-X:VERSION:2024.03.01 +:DOSBOX-X:VERSION:2024.07.01 :DOSBOX-X:REMARK:建議將國家和字碼頁設為 886,950 並搭配中文字型; 或使用 cht 或 tw 中文 DOS/V 模式以直接支援中文顯示和列印 :AUTOEXEC_CONFIGFILE_HELP 區段中的指令行會在啟動時執行. diff --git a/contrib/windows/installer/DOSBox-X-setup.iss b/contrib/windows/installer/DOSBox-X-setup.iss index 790b49db4a5..aca9cc5354e 100644 --- a/contrib/windows/installer/DOSBox-X-setup.iss +++ b/contrib/windows/installer/DOSBox-X-setup.iss @@ -1,5 +1,5 @@ #define MyAppName "DOSBox-X" -#define MyAppVersion "2024.03.01" +#define MyAppVersion "2024.07.01" #define MyAppBit "(32-bit)" #define MyAppPublisher "joncampbell123 [DOSBox-X Team]" #define MyAppURL "https://dosbox-x.com/" diff --git a/contrib/windows/installer/dosbox-x.reference.setup.conf b/contrib/windows/installer/dosbox-x.reference.setup.conf index 7b02897a452..c14fc42ae16 100644 --- a/contrib/windows/installer/dosbox-x.reference.setup.conf +++ b/contrib/windows/installer/dosbox-x.reference.setup.conf @@ -1,4 +1,4 @@ -# This is the configuration file for DOSBox-X 2024.03.01. (Please use the latest version of DOSBox-X) +# This is the configuration file for DOSBox-X 2024.07.01. (Please use the latest version of DOSBox-X) # Lines starting with a # are comment lines and are ignored by DOSBox-X. # They are used to (briefly) document the effect of each option. # To write out ALL options, use command 'config -all' with -wc or -writeconf options. diff --git a/dosbox-x.reference.conf b/dosbox-x.reference.conf index 3926a00ce2c..ac5bb432751 100644 --- a/dosbox-x.reference.conf +++ b/dosbox-x.reference.conf @@ -1,4 +1,4 @@ -# This is the configuration file for DOSBox-X 2024.03.01. (Please use the latest version of DOSBox-X) +# This is the configuration file for DOSBox-X 2024.07.01. (Please use the latest version of DOSBox-X) # Lines starting with a # are comment lines and are ignored by DOSBox-X. # They are used to (briefly) document the effect of each option. # To write out ALL options, use command 'config -all' with -wc or -writeconf options. diff --git a/dosbox-x.reference.full.conf b/dosbox-x.reference.full.conf index 79b168c9031..8f784d36080 100644 --- a/dosbox-x.reference.full.conf +++ b/dosbox-x.reference.full.conf @@ -1,4 +1,4 @@ -# This is the configuration file for DOSBox-X 2024.03.01. (Please use the latest version of DOSBox-X) +# This is the configuration file for DOSBox-X 2024.07.01. (Please use the latest version of DOSBox-X) # Lines starting with a # are comment lines and are ignored by DOSBox-X. # They are used to (briefly) document the effect of each option. # To write out ALL options, use command 'config -all' with -wc or -writeconf options. diff --git a/include/build_timestamp.h b/include/build_timestamp.h index cb2e1f762d7..df7c301734d 100644 --- a/include/build_timestamp.h +++ b/include/build_timestamp.h @@ -1,4 +1,4 @@ /*auto-generated*/ -#define UPDATED_STR "Jun 22, 2024 5:52:19pm" -#define GIT_COMMIT_HASH "2d3dcc2" +#define UPDATED_STR "Jul 1, 2024 8:44:00pm" +#define GIT_COMMIT_HASH "6f1ab09" #define COPYRIGHT_END_YEAR "2024" diff --git a/src/winres.rc b/src/winres.rc index b0f1039859b..96f47cf9f20 100644 --- a/src/winres.rc +++ b/src/winres.rc @@ -3,7 +3,7 @@ #include "../include/resource.h" #include "../vs/config_package.h" -#define VERSION_NUMBER 2022,12,26,0 +#define VERSION_NUMBER 2024,07,01,0 // icon resource dosbox_ico ICON "../contrib/icons/dosbox-x.ico" diff --git a/vs/config_package.h b/vs/config_package.h index a6794ca46fd..5595ab6acae 100644 --- a/vs/config_package.h +++ b/vs/config_package.h @@ -1,8 +1,8 @@ #define PACKAGE "dosbox-x" #define PACKAGE_BUGREPORT "https://github.com/joncampbell123/dosbox-x/issues" #define PACKAGE_NAME "dosbox-x" -#define PACKAGE_STRING "dosbox-x 2024.03.01" +#define PACKAGE_STRING "dosbox-x 2024.07.01" #define PACKAGE_TARNAME "dosbox-x" #define PACKAGE_URL "https://dosbox-x.com" -#define PACKAGE_VERSION "2024.03.01" -#define VERSION "2024.03.01" +#define PACKAGE_VERSION "2024.07.01" +#define VERSION "2024.07.01"