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

Provide programmatic version information in all of our executables and dlls #6205

Merged
merged 6 commits into from Sep 1, 2016

Conversation

michaelDCurran
Copy link
Member

Fixes #6204

… major, minor, build. Build is conveyed to scons via a version_build argument. AppVeyor uses its own build number for this.
…eeded, plus it is misleading unless it is set with a string specific to each file.
@@ -30,9 +30,13 @@ controllerRPCHeader,controllerRPCClientSource=env.MSRPCStubs(

clientLibName="nvdaControllerClient%s"%('64' if env['TARGET_ARCH']=='x86_64' else '32')

rcFile=env.Command('nvda.rc',env['projectRCFile'],Copy('$TARGET','$SOURCE'))
RESFile=env.RES(rcFile)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason we can't use the same .res file for all of these dlls/exes, rather than having a separate one for each.

@jcsteh
Copy link
Contributor

jcsteh commented Aug 9, 2016

nvda.rc.subst has been saved as UCS-2 (16 bit), rather than ASCII. Is there any reason for this? It makes it show up as a binary file in GitHub, among other things.

@@ -72,9 +72,11 @@ nvdaInProcUtilsRPCHeader,nvdaInProcUtilsRPCServerSource=env.MSRPCStubs(

ia2utilsObj=env.Object("./ia2utils","../common/ia2utils.cpp")


Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Extraneous added white space.

@jcsteh
Copy link
Contributor

jcsteh commented Aug 17, 2016

All good. Incubate away.

@jcsteh jcsteh merged commit 438d022 into master Sep 1, 2016
@nvaccessAuto nvaccessAuto added this to the 2016.4 milestone Sep 1, 2016
@jcsteh jcsteh deleted the versionedBinaries branch September 1, 2016 05:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants