@@ -6,19 +6,18 @@ import { __dirname } from './paths.js';
66
77export default class Context {
88 buildDir = path . normalize ( __dirname + '\\..\\build\\' ) ;
9- signDir = `${ this . buildDir } ;
109
11- vcvarsCommunityPath = 'C:\\Program Files (x86) \\Microsoft Visual Studio\\2019 \\Community\\VC\\Auxiliary\\Build\\vcvarsall.bat' ;
12- vcvarsEnterprisePath = 'C:\\Program Files (x86) \\Microsoft Visual Studio\\2019 \\Enterprise\\VC\\Auxiliary\\Build\\vcvarsall.bat' ;
10+ vcvarsCommunityPath = 'C:\\Program Files\\Microsoft Visual Studio\\2022 \\Community\\VC\\Auxiliary\\Build\\vcvarsall.bat' ;
11+ vcvarsEnterprisePath = 'C:\\Program Files\\Microsoft Visual Studio\\2022 \\Enterprise\\VC\\Auxiliary\\Build\\vcvarsall.bat' ;
1312 vcPath = null ;
1413
1514 cmakeTplPath = path . normalize ( __dirname + '\\..\\templates\\CMakeLists.txt.tpl' ) ;
1615 infTplPath = path . normalize ( __dirname + '\\..\\templates\\chamd.inf.tpl' ) ;
16+ makeCatTplPath = path . normalize ( __dirname + '\\..\\templates\\makecat.cdf.tpl' ) ;
1717 datTplPath = path . normalize ( __dirname + '\\..\\templates\\driver64.dat.tpl' ) ;
1818 datPath = `${ this . buildDir } ;
1919 srcDir = path . normalize ( __dirname + '\\..\\src\\' ) ;
2020 cmakeConfigPath = this . srcDir + 'CMakeLists.txt' ;
21- inf2CatPath = "C:\\Program Files (x86)\\Windows Kits\\10\\bin\\x86\\inf2cat.exe"
2221
2322 constructor ( driverName , distDir ) {
2423 this . distDir = distDir ;
@@ -37,18 +36,16 @@ export default class Context {
3736 this . vcPath = this . vcvarsEnterprisePath ;
3837 }
3938
40- this . infPath = `${ this . buildDir } ${ this . driverName } inf ` ;
39+ this . makeCatPath = `${ this . buildDir } ${ this . driverName } cdf ` ;
4140 }
4241
4342 async all ( ) {
4443 console . log ( `Generating ${ this . driverName } ) ;
4544 await this . purge ( ) ;
4645 await this . generateCmakeFile ( ) ;
4746 await this . compile ( ) ;
48- await this . createInfFile ( ) ;
49- await this . stampInfFile ( ) ;
50- // optimization for inf2cat directory search
51- await this . copyToSignDir ( ) ;
47+ await this . createMakeCatFile ( ) ;
48+ await this . makeCatFile ( ) ;
5249 await this . signDriver ( ) ;
5350 await this . createDriverDatFile ( ) ;
5451 await this . install ( ) ;
@@ -104,56 +101,40 @@ export default class Context {
104101 fs . mkdirSync ( this . buildDir ) ;
105102 }
106103
107- const cmd = `"${ this . vcPath } ${ this . buildDir } 16 2019" "${ this . srcDir } ;
104+ const cmd = `"${ this . vcPath } ${ this . buildDir } 17 2022" -A x64 -T v143 "${ this . srcDir } ;
108105 await this . execute ( cmd , this . buildDir ) ;
109106 }
110107
111- async createInfFile ( ) {
112- console . log ( 'Creating inf file' ) ;
108+ async createMakeCatFile ( ) {
109+ console . log ( 'Creating makecat file' ) ;
113110 await this . templateToFile (
114- this . infTplPath ,
115- this . infPath , {
111+ this . makeCatTplPath ,
112+ this . makeCatPath , {
116113 DRIVER_NAME : this . driverName ,
117114 } ,
118115 ) ;
119116 }
120117
121- async stampInfFile ( ) {
122- console . log ( 'Stamping inf file' ) ;
123- const cmd = `"${ this . vcPath } stampinf .exe -f .\\${ this . driverName } inf -a "amd64" -k "1.15" -v "*" -d "*" `
118+ async makeCatFile ( ) {
119+ console . log ( 'Makeing cat file' ) ;
120+ const cmd = `"${ this . vcPath } MakeCat .exe -v .\\${ this . driverName } cdf `
124121 await this . execute ( cmd , this . buildDir ) ;
125122 }
126123
127- async copyToSignDir ( ) {
128- fs . mkdirSync ( this . signDir ) ;
129-
130- fs . copyFileSync (
131- `${ this . buildDir } ${ this . driverName } ,
132- `${ this . signDir } ${ this . driverName }
133- ) ;
134-
135- fs . copyFileSync (
136- `${ this . buildDir } ${ this . driverName } ,
137- `${ this . signDir } ${ this . driverName }
138- ) ;
139- }
140-
141124 async signDriver ( ) {
142125 console . log ( 'Signing driver' ) ;
143126 const openssl = `openssl req -nodes -newkey rsa:2048 -keyout ${ this . driverName } ${ this . driverName } ${ this . driverName } ${ this . driverName }
144127 const crt = `openssl x509 -signkey ${ this . driverName } ${ this . driverName } ${ this . driverName } ;
145128 const pfx = `openssl pkcs12 -export -out ${ this . driverName } ${ this . driverName } ${ this . driverName } ;
146- const inf2cat = `"${ this . inf2CatPath } ;
147129 const vc = `"${ this . vcPath } ;
148- const signtool = `signtool sign /fd SHA256 -f "./${ this . driverName } ${ this . signDir } ${ this . driverName } ;
130+ const signtool = `signtool sign /fd SHA256 -f "./${ this . driverName } ${ this . driverName } ;
149131
150- const cmd = `${ openssl } ${ crt } ${ pfx } ${ inf2cat } && ${ vc } ${ signtool } ;
132+ const cmd = `${ openssl } ${ crt } ${ pfx } ${ vc } ${ signtool } ;
151133
152134 await this . execute ( cmd , this . buildDir ) ;
153135 }
154136
155137 async execute ( cmd , cwd , params = [ ] ) {
156-
157138 console . log ( `!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!` ) ;
158139 console . log ( `Executing: ${ cmd } ) ;
159140
@@ -191,17 +172,12 @@ export default class Context {
191172 }
192173
193174 fs . copyFileSync (
194- `${ this . signDir } ${ this . driverName } ,
175+ `${ this . buildDir } ${ this . driverName } ,
195176 `${ this . distDir } ${ this . driverName }
196177 ) ;
197178
198179 fs . copyFileSync (
199- `${ this . signDir } ${ this . driverName } ,
200- `${ this . distDir } ${ this . driverName }
201- ) ;
202-
203- fs . copyFileSync (
204- `${ this . signDir } ${ this . driverName } ,
180+ `${ this . buildDir } ${ this . driverName } ,
205181 `${ this . distDir } ${ this . driverName }
206182 ) ;
207183
0 commit comments