Skip to content

Commit 2d789cc

Browse files
committed
Merge branch 'master' into JennyBranch
2 parents 844ebb3 + 2127f88 commit 2d789cc

File tree

435 files changed

+898
-51495
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

435 files changed

+898
-51495
lines changed

.github/workflows/full-site-build.yml

Lines changed: 0 additions & 72 deletions
This file was deleted.

.github/workflows/main.yml

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,15 @@ jobs:
3030
- name: Run a multi-line script
3131
run: |
3232
cd /home/ubuntu
33-
[ ! -d DLRDoc ] && mkdir -p DLRDoc
34-
[ ! -d label-recognition-docs ] && git clone --depth 1 https://github.com/Dynamsoft/label-recognition-docs.git
35-
cd label-recognition-docs && git pull && cd .. && cp -rfp ./label-recognition-docs/* ./DLRDoc/
36-
cd Docs-Template-Repo-Preview && git pull && cd .. && cp -rfp ./Docs-Template-Repo-Preview/* ./DLRDoc/
37-
cd DLRDoc && bundle exec jekyll build --incremental
33+
[ -d DLRDocCore ] && rm -rf DLRDocCore
34+
[ -d label-recognition-docs ] && rm -rf label-recognition-docs
35+
[ -d Docs-Template-Repo-Preview ] && rm -rf Docs-Template-Repo-Preview
36+
[ ! -d DLRDocCore ] && mkdir -p DLRDocCore
37+
git clone --depth 1 https://github.com/dynamsoft-docs/label-recognition-docs.git label-recognition-docs
38+
git clone --depth 1 --branch preview https://github.com/dynamsoft-docs/Docs-Template-Repo.git Docs-Template-Repo-Preview
39+
cp -rfp ./label-recognition-docs/* ./DLRDocCore/
40+
cp -rfp ./Docs-Template-Repo-Preview/* ./DLRDocCore/
41+
cd DLRDocCore && bundle exec jekyll build --incremental
3842
3943
- name: Sync files - Main Site
4044
uses: SamKirkland/FTP-Deploy-Action@4.3.0
@@ -43,8 +47,8 @@ jobs:
4347
username: ${{ secrets.FTP_DYNAMSOFT_LOCAL_USER }}
4448
password: ${{ secrets.FTP_DYNAMSOFT_LOCAL_PASSWORD }}
4549
port: 21
46-
local-dir: /home/ubuntu/DLRDoc/_site/
47-
server-dir: /www.dynamsoft.com/label-recognition/docs/
50+
local-dir: /home/ubuntu/DLRDocCore/_site/
51+
server-dir: /www.dynamsoft.com/label-recognition/docs/core/
4852

4953
Build-Preview:
5054
if: ${{ github.ref == 'refs/heads/preview' }}
@@ -54,17 +58,25 @@ jobs:
5458
# Steps represent a sequence of tasks that will be executed as part of the job
5559
steps:
5660
# Runs a set of commands using the runners shell
61+
- name: clear space
62+
run: |
63+
cd /home/ubuntu
64+
[ -d DLRDocCorePreview ] && rm -rf DLRDocCorePreview
65+
[ -d label-recognition-docs-core-preview ] && rm -rf label-recognition-docs-core-preview
66+
[ -d Docs-Template-Repo-Preview ] && rm -rf Docs-Template-Repo-Preview
67+
cd /home/ubuntu
68+
5769
- name: Build the site
5870
run: |
5971
cd /home/ubuntu
60-
[ ! -d DLRDocPreview ] && mkdir -p DLRDocPreview
61-
[ ! -d label-recognition-docs-preview ] && git clone --depth 1 --branch preview https://github.com/Dynamsoft/label-recognition-docs.git label-recognition-docs-preview
62-
[ ! -d Docs-Template-Repo-preview ] && git clone --depth 1 --branch preview https://github.com/dynamsoft-docs/Docs-Template-Repo.git Docs-Template-Repo-preview
63-
cd label-recognition-docs-preview && git pull && cd .. && cp -rfp ./label-recognition-docs-preview/* ./DLRDocPreview/
64-
cd Docs-Template-Repo-Preview && git pull && cd .. && cp -rfp ./Docs-Template-Repo-Preview/* ./DLRDocPreview/
72+
[ ! -d DLRDocCorePreview ] && mkdir -p DLRDocCorePreview
73+
git clone --depth 1 --branch preview https://github.com/Dynamsoft-Docs/label-recognition-docs.git label-recognition-docs-core-preview
74+
git clone --depth 1 --branch preview https://github.com/dynamsoft-docs/Docs-Template-Repo.git Docs-Template-Repo-Preview
75+
cp -rfp ./label-recognition-docs-core-preview/* ./DLRDocCorePreview/
76+
cp -rfp ./Docs-Template-Repo-Preview/* ./DLRDocCorePreview/
6577
sed -i -e "1,3s/blob\/master$/blob\/preview/" \
66-
-e "1,3s/blob\/main$/blob\/preview/" /home/ubuntu/DLRDocPreview/_config.yml
67-
cd DLRDocPreview && bundle exec jekyll build
78+
-e "1,3s/blob\/main$/blob\/preview/" /home/ubuntu/DLRDocCorePreview/_config.yml
79+
cd DLRDocCorePreview && bundle exec jekyll build
6880
6981
- name: Sync files
7082
uses: SamKirkland/FTP-Deploy-Action@4.3.0
@@ -73,5 +85,5 @@ jobs:
7385
username: ${{ secrets.FTP_TEST_SITE_USER }}
7486
password: ${{ secrets.FTP_TEST_SITE_PASSWORD }}
7587
port: 7500
76-
local-dir: /home/ubuntu/DLRDocPreview/_site/
77-
server-dir: /www.dynamsoft.com/label-recognition/docs/
88+
local-dir: /home/ubuntu/DLRDocCorePreview/_site/
89+
server-dir: /www.dynamsoft.com/label-recognition/docs/core/

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
# label-recognizer
1+
# label-recognizer-docs

_config.yml

Lines changed: 72 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,90 @@
11
repositoryUrl: https://github.com/dynamsoft-docs/label-recognition-docs/blob/master
2-
repository: Dynamsoft/label-recognition-docs
3-
docFullPath: https://www.dynamsoft.com/label-recognition/docs
4-
firstLevelUrl: /label-recognition/docs
5-
docHomePage: /label-recognition/docs/introduction/
2+
repository: Dynamsoft-Docs/label-recognition-docs
3+
docFullPath: https://www.dynamsoft.com/label-recognition/docs/core
4+
firstLevelUrl: /label-recognition/docs/core
5+
docHomePage: /label-recognition/docs/core/introduction/
66

7-
introduction: /label-recognition/docs/introduction/
8-
parameters: /label-recognition/docs/parameters/
9-
enumerations: /label-recognition/docs/parameters/enum/
10-
parameters-reference: /label-recognition/docs/parameters/reference/
7+
introduction: /label-recognition/docs/core/introduction/
8+
parameters: /label-recognition/docs/core/parameters/
9+
enumerations: /label-recognition/docs/core/parameters/enum/
10+
parameters-reference: /label-recognition/docs/core/parameters/reference/
1111

12-
programming: /label-recognition/docs/programming/
12+
dcv_parameters: /capture-vision/docs/core/parameters/
13+
dcv_parameters_reference: /capture-vision/docs/core/parameters/reference/
14+
#license: /capture-vision/docs/core/license/
1315

14-
c-cplusplus: /label-recognition/docs/programming/c-cplusplus/
15-
c-cplusplus-api-reference: /label-recognition/docs/programming/c-cplusplus/api-reference/
16+
c-cplusplus: /label-recognition/docs/server/programming/c-cplusplus/
17+
c-cplusplus-api-reference: /label-recognition/docs/server/programming/c-cplusplus/api-reference/
1618

17-
c-functions: /label-recognition/docs/programming/c-cplusplus/api-reference/c-functions/
18-
cpp-methods: /label-recognition/docs/programming/c-cplusplus/api-reference/c-label-recognition-class/
19-
c-cplusplus-structs: /label-recognition/docs/programming/c-cplusplus/api-reference/structs/
19+
c-functions: /label-recognition/docs/server/programming/c-cplusplus/api-reference/c-functions/
20+
cpp-methods: /label-recognition/docs/server/programming/c-cplusplus/api-reference/c-label-recognition-class/
21+
c-cplusplus-structs: /label-recognition/docs/server/programming/c-cplusplus/api-reference/structs/
2022

21-
c-cplusplus-release-notes: /label-recognition/docs/programming/c-cplusplus/release-notes/
23+
c-cplusplus-release-notes: /label-recognition/docs/server/programming/c-cplusplus/release-notes/
2224

23-
android: /label-recognition/docs/programming/android/
24-
android-api: /label-recognition/docs/programming/android/api-reference/
25-
android-release-notes: /label-recognition/docs/programming/android/release-notes/
25+
cpp: /label-recognition/docs/server/programming/cplusplus/
26+
cpp_api: /label-recognition/docs/server/programming/cplusplus/api-reference/
27+
cpp_release_notes: /label-recognition/docs/server/programming/cplusplus/release-notes/
2628

27-
dotnet: /label-recognition/docs/programming/dotnet/
28-
dotnet_api: /label-recognition/docs/programming/dotnet/api-reference/
29-
dotnet_release_notes: /label-recognition/docs/programming/dotnet/release-notes/
29+
c: /label-recognition/docs/server/programming/c/
30+
c_api: /label-recognition/docs/server/programming/c/api-reference/
3031

31-
objectivec-swift: /label-recognition/docs/programming/objectivec-swift/
32-
objectivec-swift-api: /label-recognition/docs/programming/objectivec-swift/api-reference/
33-
objectivec-swift-release-notes: /label-recognition/docs/programming/objectivec-swift/release-notes/
32+
android: /label-recognition/docs/mobile/programming/android/
33+
android-api: /label-recognition/docs/mobile/programming/android/api-reference/
34+
android-release-notes: /label-recognition/docs/mobile/programming/android/release-notes/
3435

35-
java: /label-recognition/docs/programming/java/
36-
java-api: /label-recognition/docs/programming/java/api-reference/
37-
java-release-notes: /label-recognition/docs/programming/java/release-notes/
36+
dotnet: /label-recognition/docs/server/programming/dotnet/
37+
dotnet_api: /label-recognition/docs/server/programming/dotnet/api-reference/
38+
dotnet_release_notes: /label-recognition/docs/server/programming/dotnet/release-notes/
3839

39-
javascript: /label-recognition/docs/programming/javascript/
40-
javascript-api: /label-recognition/docs/programming/javascript/api-reference/
41-
javascript-release-notes: /label-recognition/docs/programming/javascript/release-notes/
40+
objectivec-swift: /label-recognition/docs/mobile/programming/objectivec-swift/
41+
objectivec-swift-api: /label-recognition/docs/mobile/programming/objectivec-swift/api-reference/
42+
objectivec-swift-release-notes: /label-recognition/docs/mobile/programming/objectivec-swift/release-notes/
4243

43-
assets: /label-recognition/docs/assets/
44-
edit_icon: /label-recognition/docs/assets/img-icon/edit-icon.png
45-
smile_icon: /label-recognition/docs/assets/img-icon/icon-smile.png
46-
sad_icon: /label-recognition/docs/assets/img-icon/icon-sad.png
47-
dbr_icon: /label-recognition/docs/assets/img-icon/icon-dbr.svg
48-
dwt_icon: /label-recognition/docs/assets/img-icon/icon-dwt.svg
49-
dnt_icon: /label-recognition/docs/assets/img-icon/icon-dnt.svg
44+
java: /label-recognition/docs/server/programming/java/
45+
java-api: /label-recognition/docs/server/programming/java/api-reference/
46+
java-release-notes: /label-recognition/docs/server/programming/java/release-notes/
5047

51-
release-notes: /label-recognition/docs/release-notes/
52-
license-activation: /label-recognition/docs/license-activation/
48+
js: /label-recognition/docs/web/programming/javascript/
49+
js-api: /label-recognition/docs/web/programming/javascript/api-reference/
50+
js-release-notes: /label-recognition/docs/web/programming/javascript/release-notes/
51+
52+
assets: /label-recognition/docs/core/assets/
53+
edit_icon: /label-recognition/docs/core/assets/img-icon/edit-icon.png
54+
smile_icon: /label-recognition/docs/core/assets/img-icon/icon-smile.png
55+
sad_icon: /label-recognition/docs/core/assets/img-icon/icon-sad.png
56+
dbr_icon: /label-recognition/docs/core/assets/img-icon/icon-dbr.svg
57+
dwt_icon: /label-recognition/docs/core/assets/img-icon/icon-dwt.svg
58+
dnt_icon: /label-recognition/docs/core/assets/img-icon/icon-dnt.svg
59+
60+
release-notes: /label-recognition/docs/core/release-notes/
61+
license-activation: /label-recognition/docs/core/license-activation/
5362

5463
useVersionTree: true
5564

56-
baseurl: "/label-recognition/docs"
65+
baseurl: "/label-recognition/docs/core"
66+
5767
plugins:
5868
- jemoji
59-
60-
url: "https://www.dynamsoft.com" # sitemap root
61-
69+
- jekyll-sitemap
70+
71+
72+
defaults:
73+
- scope:
74+
path: ""
75+
values:
76+
layout: "default-layout"
77+
noTitleIndex: true
78+
needAutoGenerateSidebar: true
79+
needGenerateH3Content: true
80+
- scope:
81+
path: ""
82+
values:
83+
docRootName: "Label Recognizer"
84+
docHomePage: "/label-recognition/docs/core/introduction/"
85+
- scope:
86+
path: "Hide_Tree_Page.html"
87+
values:
88+
sitemap: false
89+
90+
url: "https://www.dynamsoft.com" # sitemap root

_data/full_tree.yml

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,13 @@ tree_file_list:
55
- sidelist-parameters/parameters-enumerations.html
66
- sidelist-parameters/parameters-references-v1.2.1.html
77
- sidelist-parameters/parameters-references.html
8-
- sidelist-parameters.html
9-
- sidelist-programming/programming-android-v1.2.1.html
10-
- sidelist-programming/programming-android-v2.0.0.html
11-
- sidelist-programming/programming-android.html
12-
- sidelist-programming/programming-c-v1.2.1.html
13-
- sidelist-programming/programming-c.html
14-
- sidelist-programming/programming-cpp-v1.2.1.html
15-
- sidelist-programming/programming-cpp-v2.2.10.html
16-
- sidelist-programming/programming-cpp.html
17-
- sidelist-programming/programming-dotnet-v1.2.1.html
18-
- sidelist-programming/programming-dotnet.html
19-
- sidelist-programming/programming-java-v1.2.1.html
20-
- sidelist-programming/programming-java.html
21-
- sidelist-programming/programming-objectivec-swift-v1.2.1.html
22-
- sidelist-programming/programming-objectivec-swift.html
23-
- sidelist-programming/programming-javascript-v2.2.10.html
24-
- sidelist-programming/programming-javascript.html
25-
- sidelist-programming-v1.2.1.html
26-
- sidelist-programming.html
278
- sidelist-release-notes.html
289
- sidelist-license-activation.html
29-
10+
- sidelist-development-v1.2.1.html
11+
- sidelist-development-v2.2.20.html
12+
- sidelist-development.html
13+
- sidelist-parameters-organization.html
14+
- sidelist-parameters-reference.html
15+
- sidelist-understanding.html
16+
- sidelist-understanding-v2.2.20.html
17+
- sidelist-useful.html

0 commit comments

Comments
 (0)