Skip to content

Commit

Permalink
Prepare for release
Browse files Browse the repository at this point in the history
  • Loading branch information
joncampbell123 committed Apr 1, 2023
1 parent 57ed218 commit 10add44
Show file tree
Hide file tree
Showing 21 changed files with 30 additions and 24 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Next
2023.03.31
- "mount -t overlay" will now print a message on the console to
let you know if the act of mounting the overlay replaced a
previous overlay mount. Overlay mounts cannot be stacked in
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
dnl Init.
AC_INIT(dosbox-x,2022.12.26,[https://github.com/joncampbell123/dosbox-x/issues],[],[https://dosbox-x.com])
AC_INIT(dosbox-x,2023.03.31,[https://github.com/joncampbell123/dosbox-x/issues],[],[https://dosbox-x.com])
AC_PREREQ(2.60)
AC_CONFIG_SRCDIR(README.md)

Expand Down
2 changes: 1 addition & 1 deletion contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<category>Emulation</category>
</categories>
<releases>
<release version="@PACKAGE_VERSION@" date="2023-3-27"/>
<release version="@PACKAGE_VERSION@" date="2023-3-31"/>
</releases>
<screenshots>
<screenshot type="default">
Expand Down
2 changes: 1 addition & 1 deletion contrib/translations/de/de_DE.lng
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
:DOSBOX-X:LANGUAGE:German
:DOSBOX-X:CODEPAGE:850
:DOSBOX-X:VERSION:2022.12.26
:DOSBOX-X:VERSION:2023.03.31
:DOSBOX-X:REMARK:
:AUTOEXEC_CONFIGFILE_HELP
Befehle in diesen Zeilen werden zum Start ausgeführt.
Expand Down
2 changes: 1 addition & 1 deletion contrib/translations/en/en_US.lng
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
:DOSBOX-X:LANGUAGE:English (United States)
:DOSBOX-X:CODEPAGE:437
:DOSBOX-X:VERSION:2022.12.26
:DOSBOX-X:VERSION:2023.03.31
:DOSBOX-X:REMARK:
:AUTOEXEC_CONFIGFILE_HELP
Lines in this section will be run at startup.
Expand Down
2 changes: 1 addition & 1 deletion contrib/translations/es/es_ES.lng
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
:DOSBOX-X:LANGUAGE:Spanish (Spain)
:DOSBOX-X:CODEPAGE:858
:DOSBOX-X:VERSION:2022.12.26
:DOSBOX-X:VERSION:2023.03.31
:DOSBOX-X:REMARK:
:AUTOEXEC_CONFIGFILE_HELP
Las líneas de esta sección se iniciarán al inicio.
Expand Down
2 changes: 1 addition & 1 deletion contrib/translations/fr/fr_FR.lng
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
:DOSBOX-X:LANGUAGE:French (France)
:DOSBOX-X:CODEPAGE:859
:DOSBOX-X:VERSION:2022.12.26
:DOSBOX-X:VERSION:2023.03.31
:DOSBOX-X:REMARK:
:AUTOEXEC_CONFIGFILE_HELP
Les lignes de cette section seront exécutées au démarrage.
Expand Down
2 changes: 1 addition & 1 deletion contrib/translations/ja/ja_JP.lng
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
:DOSBOX-X:LANGUAGE:Japanese
:DOSBOX-X:CODEPAGE:932
:DOSBOX-X:VERSION:2022.12.26
:DOSBOX-X:VERSION:2023.03.31
:DOSBOX-X:REMARK:PC-98, JEGA, DOS/V エミュレーション、または とコード ページ 932 の日本語フォントを使用して、日本語の表示と印刷を直接サポートします
:AUTOEXEC_CONFIGFILE_HELP
このセクションに記載の行は起動時に実行されます。
Expand Down
2 changes: 1 addition & 1 deletion contrib/translations/ko/ko_KR.lng
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
:DOSBOX-X:LANGUAGE:Korean
:DOSBOX-X:CODEPAGE:949
:DOSBOX-X:VERSION:2022.12.26
:DOSBOX-X:VERSION:2023.03.31
:DOSBOX-X:REMARK:DOS/V 에뮬레이션 또는 코드 페이지 949의 한국어 글꼴을 사용하여 한국어 표시 및 인쇄를 직접 지원합니다.
:AUTOEXEC_CONFIGFILE_HELP
이 섹션에 나열된 줄은 시작할 때 실행됩니다.
Expand Down
2 changes: 1 addition & 1 deletion contrib/translations/nl/nl_NL.lng
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
:DOSBOX-X:LANGUAGE:Nederlands (Nederland)
:DOSBOX-X:CODEPAGE:858
:DOSBOX-X:VERSION:2022.12.26
:DOSBOX-X:VERSION:2023.03.31
:DOSBOX-X:REMARK:
:AUTOEXEC_CONFIGFILE_HELP
Lijnen in dit gedeelte worden uitgevoerd bij opstarten.
Expand Down
2 changes: 1 addition & 1 deletion contrib/translations/pt/pt_BR.lng
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
:DOSBOX-X:LANGUAGE:Portuguese (Brazil)
:DOSBOX-X:CODEPAGE:860
:DOSBOX-X:VERSION:2022.12.26
:DOSBOX-X:VERSION:2023.03.31
:DOSBOX-X:REMARK:
:AUTOEXEC_CONFIGFILE_HELP
As linhas nesta seção serão sempre executadas ao se iniciar o DOSBox-X.
Expand Down
2 changes: 1 addition & 1 deletion contrib/translations/tr/tr_TR.lng
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
:DOSBOX-X:LANGUAGE:Turkish (Turkey)
:DOSBOX-X:CODEPAGE:857
:DOSBOX-X:VERSION:2022.12.26
:DOSBOX-X:VERSION:2023.03.31
:DOSBOX-X:REMARK:
:AUTOEXEC_CONFIGFILE_HELP
Lines in this section will be run at startup.
Expand Down
2 changes: 1 addition & 1 deletion contrib/translations/zh/zh_CN.lng
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
:DOSBOX-X:LANGUAGE:Simplified Chinese
:DOSBOX-X:CODEPAGE:936
:DOSBOX-X:VERSION:2022.12.26
:DOSBOX-X:VERSION:2023.03.31
:DOSBOX-X:REMARK:建议将国家和代码页设为 86,936 并搭配中文字体; 或使用 chs 或 cn 中文 DOS/V 模式以直接支持中文显示和打印
:AUTOEXEC_CONFIGFILE_HELP
Lines in this section will be run at startup.
Expand Down
2 changes: 1 addition & 1 deletion contrib/translations/zh/zh_TW.lng
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
:DOSBOX-X:LANGUAGE:Traditional Chinese
:DOSBOX-X:CODEPAGE:950
:DOSBOX-X:VERSION:2022.12.26
:DOSBOX-X:VERSION:2023.03.31
:DOSBOX-X:REMARK:建議將國家和字碼頁設為 886,950 並搭配中文字型; 或使用 cht 或 tw 中文 DOS/V 模式以直接支援中文顯示和列印
:AUTOEXEC_CONFIGFILE_HELP
段落中的指令行會在啟動時執行.
Expand Down
2 changes: 1 addition & 1 deletion contrib/windows/installer/DOSBox-X-setup.iss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#define MyAppName "DOSBox-X"
#define MyAppVersion "2022.12.26"
#define MyAppVersion "2023.03.31"
#define MyAppBit "(32-bit)"
#define MyAppPublisher "joncampbell123 [DOSBox-X Team]"
#define MyAppURL "https://dosbox-x.com/"
Expand Down
2 changes: 1 addition & 1 deletion contrib/windows/installer/DOSBox-X-setupXP.iss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#define MyAppName "DOSBox-X"
#define MyAppVersion "2022.12.26"
#define MyAppVersion "2023.03.31"
#define MyAppBit "(32/64bit for XP)"
#define MyAppPublisher "joncampbell123 [DOSBox-X Team]"
#define MyAppURL "https://dosbox-x.com/"
Expand Down
4 changes: 3 additions & 1 deletion contrib/windows/installer/dosbox-x.reference.setup.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This is the configuration file for DOSBox-X 2022.12.26. (Please use the latest version of DOSBox-X)
# This is the configuration file for DOSBox-X 2023.03.31. (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.
Expand Down Expand Up @@ -1048,6 +1048,7 @@ vsyncrate = 75
#DOSBOX-X-ADV:# If not set, then emulation will act as if the PSN has been disabled by the BIOS.
#DOSBOX-X-ADV:# Enter as 4 sets of 16-bit hexadecimal digits XXXX-XXXX-XXXX-XXXX.
#DOSBOX-X-ADV:# Note that the processor info and feature bits form the topmost 32 bits of the PSN and cannot be changed.
# rdtsc rate: If nonzero, the Pentium RDTSC counter will tick at this rate per millisecond instead of by the cycle count
# segment limits: Enforce checks for segment limits on 80286 and higher CPU types.
#DOSBOX-X-ADV:# double fault: Emulate double fault exception
#DOSBOX-X-ADV:# clear trap flag on unhandled int 1: If set, the DOS kernel INT 01h handler will clear the trap flag when called.
Expand Down Expand Up @@ -1146,6 +1147,7 @@ core = auto
fpu = true
#DOSBOX-X-ADV:cpuid string =
#DOSBOX-X-ADV:processor serial number =
rdtsc rate = 0
segment limits = true
#DOSBOX-X-ADV:double fault = true
#DOSBOX-X-ADV:clear trap flag on unhandled int 1 = false
Expand Down
4 changes: 3 additions & 1 deletion dosbox-x.reference.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This is the configuration file for DOSBox-X 2022.12.26. (Please use the latest version of DOSBox-X)
# This is the configuration file for DOSBox-X 2023.03.31. (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.
Expand Down Expand Up @@ -430,6 +430,7 @@ vsyncrate = 75
# Possible values: auto, dynamic, dynamic_x86, dynamic_nodhfpu, dynamic, dynamic_rec, normal, full, simple.
# fpu: Enable FPU emulation
# Possible values: true, false, 1, 0, auto, 8087, 287, 387.
# rdtsc rate: If nonzero, the Pentium RDTSC counter will tick at this rate per millisecond instead of by the cycle count
# segment limits: Enforce checks for segment limits on 80286 and higher CPU types.
# cputype: CPU Type used in emulation. "auto" emulates a 486 which tolerates Pentium instructions.
# "experimental" enables newer instructions not normally found in the CPU types emulated by DOSBox-X, such as FISTTP.
Expand Down Expand Up @@ -458,6 +459,7 @@ vsyncrate = 75
#
core = auto
fpu = true
rdtsc rate = 0
segment limits = true
cputype = auto
cycles = auto
Expand Down
4 changes: 3 additions & 1 deletion dosbox-x.reference.full.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This is the configuration file for DOSBox-X 2022.12.26. (Please use the latest version of DOSBox-X)
# This is the configuration file for DOSBox-X 2023.03.31. (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.
Expand Down Expand Up @@ -1020,6 +1020,7 @@ vsyncrate = 75
# If not set, then emulation will act as if the PSN has been disabled by the BIOS.
# Enter as 4 sets of 16-bit hexadecimal digits XXXX-XXXX-XXXX-XXXX.
# Note that the processor info and feature bits form the topmost 32 bits of the PSN and cannot be changed.
# rdtsc rate: If nonzero, the Pentium RDTSC counter will tick at this rate per millisecond instead of by the cycle count
# segment limits: Enforce checks for segment limits on 80286 and higher CPU types.
# double fault: Emulate double fault exception
# clear trap flag on unhandled int 1: If set, the DOS kernel INT 01h handler will clear the trap flag when called.
Expand Down Expand Up @@ -1114,6 +1115,7 @@ core = auto
fpu = true
cpuid string =
processor serial number =
rdtsc rate = 0
segment limits = true
double fault = true
clear trap flag on unhandled int 1 = false
Expand Down
4 changes: 2 additions & 2 deletions include/build_timestamp.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*auto-generated*/
#define UPDATED_STR "Mar 27, 2023 3:31:30pm"
#define GIT_COMMIT_HASH "8805f85"
#define UPDATED_STR "Mar 31, 2023 7:26:36pm"
#define GIT_COMMIT_HASH "57ed218"
#define COPYRIGHT_END_YEAR "2023"
6 changes: 3 additions & 3 deletions vs/config_package.h
Original file line number Diff line number Diff line change
@@ -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 2022.12.26"
#define PACKAGE_STRING "dosbox-x 2023.03.31"
#define PACKAGE_TARNAME "dosbox-x"
#define PACKAGE_URL "https://dosbox-x.com"
#define PACKAGE_VERSION "2022.12.26"
#define VERSION "2022.12.26"
#define PACKAGE_VERSION "2023.03.31"
#define VERSION "2023.03.31"

0 comments on commit 10add44

Please sign in to comment.