Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix SCMRevGen by running system native CScript #3512

Merged
merged 1 commit into from
Jan 16, 2016

Conversation

jloehr
Copy link
Contributor

@jloehr jloehr commented Jan 13, 2016

Build Events are run in an 32 bit environment, therefore both program files environment strings resolve to the x86 program files folder on 64 Bit systems. If Git is 64 bit and installed into the x64 program files it can't be found by the script.

Build Events are run in an 32 bit environment, therefore both program files environment strings resolve to the x86 program files folder on 64 Bit systems. If Git is 64 bit and installed into the x64 program files it can't be found by the script.
@delroth
Copy link
Member

delroth commented Jan 14, 2016

@shuffle2 WDYT?

@delroth delroth added this to the Dolphin Release 5.0 milestone Jan 14, 2016
@shuffle2
Copy link
Contributor

Don't think it's the correct way to fix - although I did notice git is now installed to x64 program files on VS2015 update 1.
This way still breaks if git isn't present in the program files matching the cscript bitness, it's just inverse to how it currently is in master...

@jloehr
Copy link
Contributor Author

jloehr commented Jan 14, 2016

They moved from msysgit to Git-for-Windows.

IMO this works fine, regardless of the git bitness. Since Dolphin is only developed on 64 Bit systems, the CScript path is always resolved to the 64 Bit Version (though on 32 Bit, it would be the 32 Bit version). In the Script itself, both Program Files and Programs Files(x86) are searched for Git, therefore it works regardless of the Git bitness.

Even if someone tries to build Dolphin on a 32 bit system, this should hold, as at least one environment string is resolved to Program Files, which is only present once on 32 bit systems.

@shuffle2
Copy link
Contributor

In the Script itself, both Program Files and Programs Files(x86) are searched for Git, therefore it works regardless of the Git bitness.

Ah, OK. lgtm then, but i dont think this commit is really important for 5.0? This would matter for post-5.0 when we move to VS2015 Update 1 (or whatever).

shuffle2 added a commit that referenced this pull request Jan 16, 2016
Fix SCMRevGen by running system native CScript
@shuffle2 shuffle2 merged commit 799fce0 into dolphin-emu:master Jan 16, 2016
@shuffle2
Copy link
Contributor

meh

@Nucleoprotein
Copy link

I think this will not work on Windows 10 - I can't cd %windir%\Sysnative\ or execute %windir%\Sysnative\cscript.exe in (Win+R) Run dialog. Somebody should test if Sysnative is supported on Windows 10.

@jloehr
Copy link
Contributor Author

jloehr commented Jan 16, 2016

I did test it on Windows 10 and it works.

@delroth
Copy link
Member

delroth commented Jun 26, 2016

It however does not work when using a 64 bit msbuild to build Dolphin... :(

@Nucleoprotein
Copy link

Nucleoprotein commented Jun 26, 2016

I have tested this, it works ONLY when running from 32bit cmd.exe (ie. from SysWoW64) on my Windows 10 x64, does not work from x64 cmd.exe - The system can not find the path specified. So it will work in Visual Studio GUI because it's 32bit app so will hit WoW64 redirector.

@shuffle2
Copy link
Contributor

@delroth why are you using 64bit msbuild, anyways?

@jloehr jloehr deleted the Fix-SCMRevGen branch July 13, 2016 19:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
4 participants