feat: expand SWIFTFLAGS with full paths ensure CMD and PowerShell compatibility (#74)

* feat: expand SWIFTFLAGS with full paths

* test: assert SWIFTFLAGS on Windows

Author: stevapple

__tests__/installer/windows.test.ts

@@ -184,6 +184,7 @@ describe('windows toolchain installation verification', () => {
       'SDKs',
       'Windows.sdk'
     )
+    const swiftLibs = path.join(sdkroot, 'usr', 'lib', 'swift')
     const swiftPath = path.join(toolPath, 'usr', 'bin')
     const swiftDev = path.join(installation, 'Swift-development', 'bin')
     const icu67 = path.join(installation, 'icu-67', 'usr', 'bin')
@@ -192,6 +193,11 @@ describe('windows toolchain installation verification', () => {
     expect(process.env.PATH?.includes(swiftDev)).toBeTruthy()
     expect(process.env.PATH?.includes(icu67)).toBeTruthy()
     expect(process.env.SDKROOT).toBe(sdkroot)
+    expect(process.env.SWIFTFLAGS).toContain(`-sdk ${sdkroot}`)
+    expect(process.env.SWIFTFLAGS).toContain(`-I ${swiftLibs}`)
+    expect(process.env.SWIFTFLAGS).toContain(
+      `-L ${path.join(swiftLibs, 'windows')}`
+    )
   })
 
   it('tests installation with cache', async () => {

dist/index.js

@@ -48,7 +48,8 @@ export class WindowsToolchainInstaller extends VerifyingToolchainInstaller<Windo
     if (!installation) {
       return
     }
-    core.exportVariable('SDKROOT', installation.sdkroot)
+    const sdkroot = installation.sdkroot
+    core.exportVariable('SDKROOT', sdkroot)
     if (installation.devdir) {
       core.exportVariable('DEVELOPER_DIR', installation.devdir)
     }
@@ -71,8 +72,15 @@ export class WindowsToolchainInstaller extends VerifyingToolchainInstaller<Windo
     }
     core.debug(`Swift installed at "${swiftPath}"`)
     const visualStudio = await VisualStudio.setup(this.vsRequirement)
-    await visualStudio.update(installation.sdkroot)
-    const swiftFlags = `-sdk %SDKROOT% -I %SDKROOT%/usr/lib/swift -L %SDKROOT%/usr/lib/swift/windows`
+    await visualStudio.update(sdkroot)
+    const swiftFlags = [
+      '-sdk',
+      sdkroot,
+      '-I',
+      path.join(sdkroot, 'usr', 'lib', 'swift'),
+      '-L',
+      path.join(sdkroot, 'usr', 'lib', 'swift', 'windows')
+    ].join(' ')
     core.exportVariable('SWIFTFLAGS', swiftFlags)
   }
 }