Skip to content

Commit 580748b

Browse files
committed
Merge branch 'dev/doc'
2 parents fb7eaf7 + b57ba6e commit 580748b

File tree

6 files changed

+36
-34
lines changed

6 files changed

+36
-34
lines changed

CHANGELOG.md

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,26 @@
11
# Change Log 更新日志
22

3-
[email](mailto:xsro@foxmail.com)|[issue](https://github.com/dosasm/masm-tasm/issues)
3+
[email](mailto:xsro@foxmail.com?subject=VSCode_Extension(xsro.masm-tasm)_report&body=hello)|[issue](https://github.com/dosasm/masm-tasm/issues)
44

55
## 1.0 Web Extension Support 浏览器端支持
66

7+
![web extension Demo](pics/demo_web-russiacube.gif)
8+
79
To keep the extension simple, I split the part of interaction with DOS emulator to a new
810
platform-specified extension [xsro.vscode-dosbox][vscode-dosbox]
911

1012
- add support for browser, you can use this extension in sites like [vscode.dev][vscode-dev] and [github-dev][github-dev]
1113
- add support for DOS emulator [DOSBox-x][dosbox-x]
1214
- change default emulator to jsdos
13-
- now only support single file DOS assembly, I try to add some multi-file assembly support, but is's confusing for me.
15+
- now **only** support single file DOS assembly, I try to add some multi-file assembly support, but is's confusing for me.
1416
- remove the capture of warning message
1517
- remove command `DOSBox here`
18+
- 1.0.1 patch
19+
- fix #31 #32: improve **document format**
20+
- thanks to [BillLee-CN][BillLee-CN], [x402][x402]
21+
- fix #32: use a TDConfig when debugging with TD for better experience.
22+
- thanks to [x402][x402]
23+
- (vscode-DOSBox) fix the error of update dosbox config
1624

1725
为了保持简洁,我将与DOS模拟器交互的部分独立为一个新的插件[xsro.vscode-dosbox][vscode-dosbox]
1826

@@ -22,13 +30,17 @@ platform-specified extension [xsro.vscode-dosbox][vscode-dosbox]
2230
- 移除一些烦人的设置,目前只支持单文件的DOS环境下汇编
2331
- 移除对汇编成功但是有警告信息时显示的界面消息
2432
- 移除命令`DOSBox here`
33+
- 1.0.1
34+
- 修复格式化中未完全替换原内容的问题
35+
- 恢复原来版本中的TDConfig
36+
- (vscode-dosbox) 修复注入DOSBox设置会出现的混乱
2537

2638
[vscode-dosbox]: https://marketplace.visualstudio.com/items?itemName=xsro.vscode-dosbox "VSCode DOSBox"
2739
[dosbox-x]: https://www.dosbox-x.com "DOSBox-x"
28-
[github-dev]: https://github.dev
29-
[vscode-dev]: https://vscode.dev
30-
31-
---
40+
[github-dev]: https://github.dev/dosasm/dos-assembly-codes "open sample code with github.dev"
41+
[vscode-dev]: https://vscode.dev/github/dosasm/dos-assembly-codes "open sample code with vscode.dev"
42+
[x402]: https://github.com/x402
43+
[BillLee-CN]: https://github.com/BillLee-CN
3244

3345
## 0.9.0
3446

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ when you are editing `assembly` files ,you can right click at the editor panel,t
4242

4343
- If your code just in a single file, set configuration `masmtasm.ASM.mode` as `single file`. The extension will copy your file to a seperate space in your machine to keep your workspace Folder clean.
4444
- If your project is complex and making up with many files, you may set configuration `masmtasm.ASM.mode` as `workspace` and keep your files' names follow the emulator's limitation.
45+
- take `include <filename>` for example, the `<filename>` should be the relative path to your workspace Folder
4546
- Obviously, this extension may be not suitable for complex project
4647

4748
## Platform Support

README.zh.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
## 平台支持
4343

4444
插件依赖[vscode-dosbox](https://marketplace.visualstudio.com/items?itemName=xsro.vscode-dosbox) 来与 DOS 模拟器交互。
45-
`vscode-dosbox`打包了 win 平台上的二进制文件,参考[它的文档](https://github.com/dosasm/vscode-dosbox#dependency-installation) 在其他平台安装相关 DOS 模拟器。
45+
`vscode-dosbox`打包了 win 平台上的二进制文件,参考[它的文档](https://github.com/dosasm/vscode-dosbox/blob/main/README.zh.md#安装依赖) 在其他平台安装相关 DOS 模拟器。
4646

4747
## 自定义 Actions
4848

doc/develop.md

Lines changed: 14 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,40 @@
11
# Develop
22

3-
## Requirement
3+
## STEPS
44

55
### 0.use GIT to clone this repository
66

7-
```bash
8-
cd myFolder
7+
```sh
8+
#cd myFolder
99
git clone https://github.com/dosasm/masm-tasm.git
1010
```
1111

12-
### 1.install nodejs and npm
12+
### 1.install nodejs and npm and yarn
1313

1414
the website of nodejs: <http://nodejs.org>, <http://nodejs.cn/>
1515

16-
```bash
16+
```sh
1717
sudo apt install nodejs
1818
sudo apt install npm
19+
npm install --global yarn
1920
```
2021

21-
<details>
22-
<summary>use CNPM</summary>
23-
24-
可以使用[CNPM](<https://developer.aliyun.com/mirror/NPM?from=tnpm>)来安装npm包
25-
26-
```bash
27-
# 使用alias来使用cnpm:
28-
alias cnpm="npm --registry=https://registry.npm.taobao.org --cache=$HOME/.npm/.cache/cnpm --disturl=https://npm.taobao.org/dist --userconfig=$HOME/.cnpmrc"
29-
# 使用npm安装cnpm:
30-
sudo npm install -g cnpm --registry=https://registry.npm.taobao.org
31-
```
32-
33-
</details>
34-
3522
### 2.install dependence
3623

37-
```bash
38-
# install npm packages
39-
npm install #or use cnpm install
40-
# install for tool jsdos
41-
cd tools/js-dos && npm install && cd ../..
24+
```sh
25+
yarn install
4226
```
4327

4428
### 3.generate `visx` package
4529

46-
```bash
47-
npm run package
30+
```sh
31+
npx vsce package
4832
```
4933

5034
### Debug
5135

36+
```sh
37+
yarn watch
38+
```
39+
5240
Press <kbd>F5</kbd> or Click `run` -> `Start Debugging`

pics/demo_web-russiacube.gif

355 KB
Loading

src/readme.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
- folder `language`: provide Programmatic language features
44
- folder `utils`: chore like i18n
55
- folder `diagnose`: process the message of Assembler
6-
- folder `ASM`: codes for action with assembler and emulator
6+
- folder `ASM`: interface for interaction with assembler and emulator
7+
- folder `emulators`: codes for interaction with assembler and emulator

0 commit comments

Comments
 (0)