Skip to content

Commit e6dde9d

Browse files
kaorutkaorut
committed
Merge pull request #148 from kaorut/github_actions_setup
Modify the GitHub Actions script for Visual C++ #147 (cherry picked from commit ba5a0d9)
1 parent 8a9724a commit e6dde9d

File tree

3 files changed

+59
-35
lines changed

3 files changed

+59
-35
lines changed

‎.github/workflows/windows-visualcpp.yml‎

Lines changed: 29 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,29 +61,49 @@ jobs:
6161
with:
6262
submodules: recursive
6363

64-
- name: Build 32bit
64+
- name: Build product 32bit
6565
shell: cmd
6666
run: |
6767
set BOOST_INCLUDE=%GITHUB_WORKSPACE%\..\boost_build\boost_%BOOST_VER%
6868
set BOOST_LIB_x86=%GITHUB_WORKSPACE%\..\boost_build\boost_%BOOST_VER%\stage\Win32\lib
69-
set EMBEDTRANSFORMDIR=%GITHUB_WORKSPACE%\..\EmbedTransform\EmbedTransform\
7069
msbuild /t:Rebuild /m:1 /p:Configuration=Release;Platform=x86 tetengo.sln
7170
msbuild /t:Rebuild /m:1 /p:Configuration=Debug;Platform=x86 tetengo.sln
72-
msbuild /t:Rebuild /m:1 /p:Configuration=Release;Platform=x86 tetengo.setup.sln
73-
msbuild /t:Clean /m:1 /p:Configuration=Release;Platform=x86 tetengo.sln
74-
msbuild /t:Clean /m:1 /p:Configuration=Debug;Platform=x86 tetengo.sln
71+
for /r %%f in (*.pch) do del /f /q %%f
72+
for /r %%f in (*.sbr) do del /f /q %%f
73+
for /r %%f in (*.bsc) do del /f /q %%f
74+
for /r %%f in (*.obj) do del /f /q %%f
75+
for /r %%f in (*.ipch) do del /f /q %%f
76+
for /r %%f in (*.VC.db) do del /f /q %%f
7577
76-
- name: Build 64bit
78+
- name: Build product 64bit
7779
shell: cmd
7880
run: |
7981
set BOOST_INCLUDE=%GITHUB_WORKSPACE%\..\boost_build\boost_%BOOST_VER%
8082
set BOOST_LIB_x64=%GITHUB_WORKSPACE%\..\boost_build\boost_%BOOST_VER%\stage\x64\lib
81-
set EMBEDTRANSFORMDIR=%GITHUB_WORKSPACE%\..\EmbedTransform\EmbedTransform\
8283
msbuild /t:Rebuild /m:1 /p:Configuration=Release;Platform=x64 tetengo.sln
8384
msbuild /t:Rebuild /m:1 /p:Configuration=Debug;Platform=x64 tetengo.sln
85+
for /r %%f in (*.pch) do del /f /q %%f
86+
for /r %%f in (*.sbr) do del /f /q %%f
87+
for /r %%f in (*.bsc) do del /f /q %%f
88+
for /r %%f in (*.obj) do del /f /q %%f
89+
for /r %%f in (*.ipch) do del /f /q %%f
90+
for /r %%f in (*.VC.db) do del /f /q %%f
91+
92+
- name: Build setup 32bit
93+
shell: cmd
94+
run: |
95+
set BOOST_INCLUDE=%GITHUB_WORKSPACE%\..\boost_build\boost_%BOOST_VER%
96+
set BOOST_LIB_x86=%GITHUB_WORKSPACE%\..\boost_build\boost_%BOOST_VER%\stage\Win32\lib
97+
set EMBEDTRANSFORMDIR=%GITHUB_WORKSPACE%\..\EmbedTransform\EmbedTransform\
98+
msbuild /t:Rebuild /m:1 /p:Configuration=Release;Platform=x86 tetengo.setup.sln
99+
100+
- name: Build setup 64bit
101+
shell: cmd
102+
run: |
103+
set BOOST_INCLUDE=%GITHUB_WORKSPACE%\..\boost_build\boost_%BOOST_VER%
104+
set BOOST_LIB_x64=%GITHUB_WORKSPACE%\..\boost_build\boost_%BOOST_VER%\stage\x64\lib
105+
set EMBEDTRANSFORMDIR=%GITHUB_WORKSPACE%\..\EmbedTransform\EmbedTransform\
84106
msbuild /t:Rebuild /m:1 /p:Configuration=Release;Platform=x64 tetengo.setup.sln
85-
msbuild /t:Clean /m:1 /p:Configuration=Release;Platform=x64 tetengo.sln
86-
msbuild /t:Clean /m:1 /p:Configuration=Debug;Platform=x64 tetengo.sln
87107
88108
- name: Make archive
89109
shell: powershell

‎setup/installer/file_guid_map.txt‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
COPYING A6E51A24-155C-4544-8B3C-584418C923C6
2+
README.md 0873D1F9-1563-4733-AC24-CDF59D0AB7CE
3+
bin\Win32\setup\setup.exe 2030C38E-16CB-4E7C-95FE-EEE3604F38EF
4+
bin\x64\setup\setup.exe 91550D4F-A0FC-43A8-8954-E88433A5E79F
25
include.cpp\tetengo\json\0namespace.dox 24280793-2622-469A-8E56-67766440E0EC
36
include.cpp\tetengo\json\channel.hpp B3757270-32C0-4C63-BC70-A61AFBAF83F5
47
include.cpp\tetengo\json\comment_removing_reader.hpp 4AFE950F-251B-4E8D-9F8A-D2A4650BD855
@@ -183,38 +186,37 @@ lib\Release.x64\tetengo.trie.cpp.pdb EDE6E39B-100B-4386-8499-C2B4AF198A03
183186
lib\Release.x64\tetengo.trie.dll 14D0C89B-F8C9-4464-BCC2-45FE8CFC40B9
184187
lib\Release.x64\tetengo.trie.lib 8F77FF7F-6D8B-4437-88FA-B0DCAC16863C
185188
lib\Release.x64\tetengo.trie.pdb 15BBEA0B-4AE2-4D4F-B7F4-D9BDDE54DA54
186-
README.md 0873D1F9-1563-4733-AC24-CDF59D0AB7CE
189+
sample\Win32\json2timetable\README.md 3561A08A-A98F-47CD-9102-5171E9268C71
187190
sample\Win32\json2timetable\hohi_down.json 9ECF86DB-F270-4FC0-9313-E40693C11685
188191
sample\Win32\json2timetable\hohi_up.json BD23EFC2-8734-416E-B73B-021235FFF5F9
189192
sample\Win32\json2timetable\json2timetable.exe EC9F4A1D-D9FD-4C10-BC6E-4460BA404951
190-
sample\Win32\json2timetable\README.md 3561A08A-A98F-47CD-9102-5171E9268C71
191193
sample\Win32\json2timetable\tetengo.json.dll 5758D20D-6BE6-41EF-A7B7-ECDB764EC299
192194
sample\Win32\json2timetable\tetengo.text.dll 2C2D48C5-ECDF-47C3-B5C2-CE9B241EC7DF
193-
sample\Win32\make_dict\make_dict.exe 9CF0E95A-27AB-49F4-BC38-ADB12088F002
194195
sample\Win32\make_dict\README.md A04603F1-06D4-401C-9FF1-DD7BDE605F95
196+
sample\Win32\make_dict\make_dict.exe 9CF0E95A-27AB-49F4-BC38-ADB12088F002
197+
sample\Win32\search_dict\README.md E6832089-4021-4DC8-A5C7-3C2B034C995A
198+
sample\Win32\search_dict\search_dict.exe 23DB8019-8549-4F21-A87D-03C5CF55ED4D
195199
sample\Win32\search_dict_c\README.md 558D3332-5E97-4046-A90A-3759EE488D7A
196200
sample\Win32\search_dict_c\search_dict_c.exe 86648AC6-5F6E-4F29-97B4-7CF62B7CB097
197201
sample\Win32\search_dict_c\tetengo.trie.dll BB11211D-BAEF-426F-A6A7-6DEE4D908376
198-
sample\Win32\search_dict\README.md E6832089-4021-4DC8-A5C7-3C2B034C995A
199-
sample\Win32\search_dict\search_dict.exe 23DB8019-8549-4F21-A87D-03C5CF55ED4D
202+
sample\Win32\transfer_trains\README.md E3A1020E-D570-43B1-9A55-5C4CD96FD094
200203
sample\Win32\transfer_trains\kagoshima_down.txt 514F1F33-921E-44BF-850C-8D4EDBD11EB6
201204
sample\Win32\transfer_trains\kotoku_up.txt 395825B3-C1C3-435C-8D11-59AABFA50457
202-
sample\Win32\transfer_trains\README.md E3A1020E-D570-43B1-9A55-5C4CD96FD094
203205
sample\Win32\transfer_trains\transfer_trains.exe FDF448AC-6444-43FB-87DD-7B37AEC9C0C8
206+
sample\x64\json2timetable\README.md 9066C7E7-447A-423E-8377-478480A584EB
204207
sample\x64\json2timetable\hohi_down.json 76BE1CAD-64E3-4334-8E65-CB97EC9694AD
205208
sample\x64\json2timetable\hohi_up.json 2E279921-2AA5-4207-853D-042364EBC42A
206209
sample\x64\json2timetable\json2timetable.exe 1E3E75E0-676B-4CF2-B901-1A9299EBB3EB
207-
sample\x64\json2timetable\README.md 9066C7E7-447A-423E-8377-478480A584EB
208210
sample\x64\json2timetable\tetengo.json.dll EA9AF582-20A8-40E7-AC62-2739B23E5205
209211
sample\x64\json2timetable\tetengo.text.dll 8AB2E289-7DA0-4EB2-87E1-E3433D0E640B
210-
sample\x64\make_dict\make_dict.exe AD350D99-4E2D-4A61-B61B-E1DA7603B64F
211212
sample\x64\make_dict\README.md 09887548-CC2D-4689-99D6-1A51453DBECB
213+
sample\x64\make_dict\make_dict.exe AD350D99-4E2D-4A61-B61B-E1DA7603B64F
214+
sample\x64\search_dict\README.md 78727BA4-FF77-49F7-A87C-E9B9EA763CD9
215+
sample\x64\search_dict\search_dict.exe CC7621BE-BAF1-412D-973E-0052EC7F06E5
212216
sample\x64\search_dict_c\README.md A8BBFDA5-9F5E-4850-8FF2-68647913C756
213217
sample\x64\search_dict_c\search_dict_c.exe FD4847F5-01B4-4EA2-B9E7-184C90678CC3
214218
sample\x64\search_dict_c\tetengo.trie.dll 8611A69F-5E50-47D6-9BC9-807B0BA0632D
215-
sample\x64\search_dict\README.md 78727BA4-FF77-49F7-A87C-E9B9EA763CD9
216-
sample\x64\search_dict\search_dict.exe CC7621BE-BAF1-412D-973E-0052EC7F06E5
219+
sample\x64\transfer_trains\README.md 46EB6AC7-1844-434A-8538-C14FA9338957
217220
sample\x64\transfer_trains\kagoshima_down.txt B2270766-F367-45B9-B6D3-3F94AE215129
218221
sample\x64\transfer_trains\kotoku_up.txt BE0ABA42-6650-4316-9820-43FE3DA2B7A5
219-
sample\x64\transfer_trains\README.md 46EB6AC7-1844-434A-8538-C14FA9338957
220222
sample\x64\transfer_trains\transfer_trains.exe 7D5718A1-4FB8-4E99-9FBA-D0C0A03A6443

‎setup/installer/files_to_install.txt‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
bin.Win32 bin\Release.Win32\setup.exe bin\Win32\setup\
2+
bin.x64 bin\Release.x64\setup.exe bin\x64\setup\
3+
document COPYING .
4+
document README.md .
15
include library\json\c\include\tetengo\json\** include\tetengo\json\
26
include library\json\cpp\include\tetengo\json\** include.cpp\tetengo\json\
37
include library\lattice\c\include\tetengo\lattice\** include\tetengo\lattice\
@@ -9,51 +13,49 @@ include library\text\c\include\tetengo\text\**
913
include library\text\cpp\include\tetengo\text\** include.cpp\tetengo\text\
1014
include library\trie\c\include\tetengo\trie\** include\tetengo\trie\
1115
include library\trie\cpp\include\tetengo\trie\** include.cpp\tetengo\trie\
12-
lib.Release.Win32 bin\Release.Win32\tetengo.*.lib lib\Release.Win32\
13-
lib.Release.Win32 bin\Release.Win32\tetengo.*.dll lib\Release.Win32\
14-
lib.Release.Win32 bin\Release.Win32\tetengo.*.pdb lib\Release.Win32\
15-
lib.Debug.Win32 bin\Debug.Win32\tetengo.*.lib lib\Debug.Win32\
1616
lib.Debug.Win32 bin\Debug.Win32\tetengo.*.dll lib\Debug.Win32\
17+
lib.Debug.Win32 bin\Debug.Win32\tetengo.*.lib lib\Debug.Win32\
1718
lib.Debug.Win32 bin\Debug.Win32\tetengo.*.pdb lib\Debug.Win32\
18-
lib.Release.x64 bin\Release.x64\tetengo.*.lib lib\Release.x64\
19-
lib.Release.x64 bin\Release.x64\tetengo.*.dll lib\Release.x64\
20-
lib.Release.x64 bin\Release.x64\tetengo.*.pdb lib\Release.x64\
21-
lib.Debug.x64 bin\Debug.x64\tetengo.*.lib lib\Debug.x64\
2219
lib.Debug.x64 bin\Debug.x64\tetengo.*.dll lib\Debug.x64\
20+
lib.Debug.x64 bin\Debug.x64\tetengo.*.lib lib\Debug.x64\
2321
lib.Debug.x64 bin\Debug.x64\tetengo.*.pdb lib\Debug.x64\
22+
lib.Release.Win32 bin\Release.Win32\tetengo.*.dll lib\Release.Win32\
23+
lib.Release.Win32 bin\Release.Win32\tetengo.*.lib lib\Release.Win32\
24+
lib.Release.Win32 bin\Release.Win32\tetengo.*.pdb lib\Release.Win32\
25+
lib.Release.x64 bin\Release.x64\tetengo.*.dll lib\Release.x64\
26+
lib.Release.x64 bin\Release.x64\tetengo.*.lib lib\Release.x64\
27+
lib.Release.x64 bin\Release.x64\tetengo.*.pdb lib\Release.x64\
2428
sample.Win32.json2timetable bin\Release.Win32\json2timetable.exe sample\Win32\json2timetable\
2529
sample.Win32.json2timetable bin\Release.Win32\tetengo.json.dll sample\Win32\json2timetable\
2630
sample.Win32.json2timetable bin\Release.Win32\tetengo.text.dll sample\Win32\json2timetable\
31+
sample.Win32.json2timetable sample\json2timetable\README.md sample\Win32\json2timetable\
2732
sample.Win32.json2timetable sample\json2timetable\data\hohi_down.json sample\Win32\json2timetable\
2833
sample.Win32.json2timetable sample\json2timetable\data\hohi_up.json sample\Win32\json2timetable\
29-
sample.Win32.json2timetable sample\json2timetable\README.md sample\Win32\json2timetable\
3034
sample.Win32.make_dict bin\Release.Win32\make_dict.exe sample\Win32\make_dict\
3135
sample.Win32.make_dict sample\make_dict\README.md sample\Win32\make_dict\
3236
sample.Win32.search_dict bin\Release.Win32\search_dict.exe sample\Win32\search_dict\
3337
sample.Win32.search_dict sample\search_dict\README.md sample\Win32\search_dict\
3438
sample.Win32.search_dict_c bin\Release.Win32\search_dict_c.exe sample\Win32\search_dict_c\
3539
sample.Win32.search_dict_c bin\Release.Win32\tetengo.trie.dll sample\Win32\search_dict_c\
3640
sample.Win32.search_dict_c sample\search_dict_c\README.md sample\Win32\search_dict_c\
41+
sample.Win32.search_dict_c sample\search_dict_c\README.md sample\x64\search_dict_c\
3742
sample.Win32.transfer_trains bin\Release.Win32\transfer_trains.exe sample\Win32\transfer_trains\
43+
sample.Win32.transfer_trains sample\transfer_trains\README.md sample\Win32\transfer_trains\
3844
sample.Win32.transfer_trains sample\transfer_trains\data\kagoshima_down.txt sample\Win32\transfer_trains\
3945
sample.Win32.transfer_trains sample\transfer_trains\data\kotoku_up.txt sample\Win32\transfer_trains\
40-
sample.Win32.transfer_trains sample\transfer_trains\README.md sample\Win32\transfer_trains\
4146
sample.x64.json2timetable bin\Release.x64\json2timetable.exe sample\x64\json2timetable\
4247
sample.x64.json2timetable bin\Release.x64\tetengo.json.dll sample\x64\json2timetable\
4348
sample.x64.json2timetable bin\Release.x64\tetengo.text.dll sample\x64\json2timetable\
49+
sample.x64.json2timetable sample\json2timetable\README.md sample\x64\json2timetable\
4450
sample.x64.json2timetable sample\json2timetable\data\hohi_down.json sample\x64\json2timetable\
4551
sample.x64.json2timetable sample\json2timetable\data\hohi_up.json sample\x64\json2timetable\
46-
sample.x64.json2timetable sample\json2timetable\README.md sample\x64\json2timetable\
4752
sample.x64.make_dict bin\Release.x64\make_dict.exe sample\x64\make_dict\
4853
sample.x64.make_dict sample\make_dict\README.md sample\x64\make_dict\
4954
sample.x64.search_dict bin\Release.x64\search_dict.exe sample\x64\search_dict\
5055
sample.x64.search_dict sample\search_dict\README.md sample\x64\search_dict\
5156
sample.x64.search_dict_c bin\Release.x64\search_dict_c.exe sample\x64\search_dict_c\
5257
sample.x64.search_dict_c bin\Release.x64\tetengo.trie.dll sample\x64\search_dict_c\
53-
sample.Win32.search_dict_c sample\search_dict_c\README.md sample\x64\search_dict_c\
5458
sample.x64.transfer_trains bin\Release.x64\transfer_trains.exe sample\x64\transfer_trains\
59+
sample.x64.transfer_trains sample\transfer_trains\README.md sample\x64\transfer_trains\
5560
sample.x64.transfer_trains sample\transfer_trains\data\kagoshima_down.txt sample\x64\transfer_trains\
5661
sample.x64.transfer_trains sample\transfer_trains\data\kotoku_up.txt sample\x64\transfer_trains\
57-
sample.x64.transfer_trains sample\transfer_trains\README.md sample\x64\transfer_trains\
58-
document README.md .
59-
document COPYING .

0 commit comments

Comments
 (0)