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

Update the man page and the windows installer info #2124

Merged
merged 1 commit into from
Jun 29, 2015

Conversation

Umcaruje
Copy link
Member

The site info and version info was outdated.

@Wallacoloo
Copy link
Member

Looks fine to me. I wonder if we can extract the version info dynamically from the git tags to prevent that from getting outdated again.

@@ -63,7 +63,7 @@ Show version information and exit.
.IP "\fB\-h, --help
Show usage information and exit.
.SH SEE ALSO
.BR http://lmms.sf.net/
.BR http://lmms.sf.net/wiki/
.BR http://lmms.io/
Copy link
Contributor

Choose a reason for hiding this comment

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

*https

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed it 👍

@tresf
Copy link
Member

tresf commented Jun 21, 2015

I wonder if we can extract the version info dynamically from the git tags to prevent that from getting outdated again.

.in files normally are configured to do variable substitution automatically, so I would agree with this statement.

@tresf
Copy link
Member

tresf commented Jun 21, 2015

Actually, the proper sytax is used lower in the file, just copy that @VERSION line.

I think the idea here is that the .lmmsrc.xml file can be versioned itself. Matching the software version is probably ideal though. Might want to allow some convo first, but my vote is to replace it with @VERSION like below., appending the suffix for consistency.

@Wallacoloo
Copy link
Member

I don't know enough about this file to tell if this is important or not, but changing it from FILEVERSION 1,0,93,0 to FILEVERSION @VERSION@,0 would actually yield FILEVERSION 1.1.3,0 (notice, . instead of ,).

To retain the current format, but having it update dynamically, the proper fix would look something like FILEVERSION @VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_PATCH@,0.

These macros are defined in CMakeLists:16-18.

@Wallacoloo
Copy link
Member

Also, this file does indeed get variable substitution. See CMakeLists:371.

@tresf
Copy link
Member

tresf commented Jun 22, 2015

the proper fix would look something like

Agreed. 👍

@Umcaruje
Copy link
Member Author

Updated the fileversion line to FILEVERSION @VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_PATCH@,0

@tresf
Copy link
Member

tresf commented Jun 22, 2015

👍

@Umcaruje
Copy link
Member Author

The travis build passed, is there anything holding this from being merged?

@tresf
Copy link
Member

tresf commented Jun 29, 2015

It will conflict with #2131, so one or the other will likely need a hand-edit after this is merged. Merge it now if you like, you just might need to help the OP of #2131 to fix conflicts and squash some commits afterward. 👍

@Umcaruje
Copy link
Member Author

Ok, fair enough. Merging.

Umcaruje added a commit that referenced this pull request Jun 29, 2015
Update the man page and the windows installer info
@Umcaruje Umcaruje merged commit c3e3271 into LMMS:master Jun 29, 2015
@Umcaruje Umcaruje deleted the master-infiles branch July 11, 2015 18:34
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.

4 participants