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

Generate windows version automatically #7908

Merged
merged 2 commits into from
Aug 24, 2015

Conversation

unknownbrackets
Copy link
Collaborator

NOTE: This makes the assumption that from now on, we'll stick with "x.y.z" versioning. That means if we use 1.0.1.1 or 1.0.2.5, it will break. Personally I think this is reasonable. Logarithmic versions don't help us or anyone else. A new version is a new version.

This allows for the same customization git-version.cpp allows.

Also, it improves messaging slightly during build if git is missing, and disallows reporting for builds generated without version info to make it clearer to users of such builds.

The changes to version.rc:

@@ -1,9 +1,12 @@

-//This file is encoded in UTF-16, which is not supported by git. It is included in ppsspp.rc with "include".
+// This file is encoded in UTF-16, which is not supported by git. It is included in ppsspp.rc with "include".
+
+// win-version.h is generated by git-version-gen.cmd.
+#include "win-version.h"

 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,1,0
- PRODUCTVERSION 1,0,1,0
+ FILEVERSION PPSSPP_WIN_VERSION_COMMA
+ PRODUCTVERSION PPSSPP_WIN_VERSION_COMMA
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -21,13 +24,13 @@
             VALUE "Comments", "PPSSPP PSP emulator"
             VALUE "CompanyName", "Henrik Rydgård"
             VALUE "FileDescription", "PPSSPP"
-            VALUE "FileVersion", "1, 0, 1, 0"
+            VALUE "FileVersion", PPSSPP_WIN_VERSION_STRING
             VALUE "InternalName", "PPSSPPEmu"
             VALUE "LegalCopyright", "Copyright (C) 2006-2015 by Henrik Rydgård"
             VALUE "LegalTrademarks", "All product names are trademarks of their respective owners."
             VALUE "OriginalFilename", "PPSSPP.exe"
             VALUE "ProductName", "PPSSPP"
-            VALUE "ProductVersion", "1, 0, 1, 0"
+            VALUE "ProductVersion", PPSSPP_WIN_VERSION_STRING
         END
     END
     BLOCK "VarFileInfo"

Closes #6406. This is really just an update of that pull to some degree.

-[Unknown]

This allows for the same customization git-version.cpp allows.

Also, improve messaging slightly during build if git is missing, and
disallow reporting for builds generated without version info to make it
clear to users.
hrydgard added a commit that referenced this pull request Aug 24, 2015
Generate windows version automatically
@hrydgard hrydgard merged commit 9a4c019 into hrydgard:master Aug 24, 2015
@unknownbrackets unknownbrackets deleted the win-version-gen branch August 25, 2015 04:07
pal1000 added a commit to pal1000/ppsspp that referenced this pull request Aug 26, 2015
hrydgard added a commit that referenced this pull request Aug 26, 2015
Ignore Windows/win-version.h created since #7908
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.

2 participants